Browse Source

bug 修复

lilei 4 years ago
parent
commit
4981bc2ce3

+ 2 - 1
src/views/allocationManagement/storeTransferOut/edit.vue

@@ -245,7 +245,8 @@ export default {
         { title: '成本价(¥)', dataIndex: 'outCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '成本价(¥)', dataIndex: 'outCost', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓库', dataIndex: 'warehouseName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '仓位', dataIndex: 'warehouseLocationName', width: 140, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
+        // { title: '调出数量', scopedSlots: { customRender: 'outQty' }, width: 140, align: 'center' },
+        { title: '调出数量', dataIndex: 'outQty', width: 140, align: 'center' },
         { title: '成本小计(¥)', dataIndex: 'costSubtotal', width: 115, align: 'center' },
         { title: '成本小计(¥)', dataIndex: 'costSubtotal', width: 115, align: 'center' },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
         { title: '操作', scopedSlots: { customRender: 'action' }, width: 100, align: 'center', fixed: 'right' }
       ],
       ],

+ 1 - 1
src/views/financialManagement/warehousingAudit/detail.vue

@@ -22,7 +22,7 @@
             <a-descriptions-item label="采购单号">{{ basicInfoData&&basicInfoData.purchaseBillNo ? basicInfoData.purchaseBillNo : '--' }}</a-descriptions-item>
             <a-descriptions-item label="采购单号">{{ basicInfoData&&basicInfoData.purchaseBillNo ? basicInfoData.purchaseBillNo : '--' }}</a-descriptions-item>
           </a-descriptions>
           </a-descriptions>
           <a-descriptions :column="3" bordered>
           <a-descriptions :column="3" bordered>
-            <a-descriptions-item label="采购总款数">{{ (basicInfoData&&basicInfoData.totalQty!=0) ? basicInfoData.totalQty : 0 }}</a-descriptions-item>
+            <a-descriptions-item label="采购总款数">{{ (basicInfoData&&basicInfoData.totalCategory!=0) ? basicInfoData.totalCategory : 0 }}</a-descriptions-item>
             <a-descriptions-item label="采购总数量">{{ (basicInfoData&&basicInfoData.totalQty!=0) ? basicInfoData.totalQty : 0 }}</a-descriptions-item>
             <a-descriptions-item label="采购总数量">{{ (basicInfoData&&basicInfoData.totalQty!=0) ? basicInfoData.totalQty : 0 }}</a-descriptions-item>
             <a-descriptions-item label="采购总成本">¥{{ (basicInfoData&&basicInfoData.totalAmount!=0) ? basicInfoData.totalAmount : 0 }}</a-descriptions-item>
             <a-descriptions-item label="采购总成本">¥{{ (basicInfoData&&basicInfoData.totalAmount!=0) ? basicInfoData.totalAmount : 0 }}</a-descriptions-item>
             <a-descriptions-item label="入库总款数">{{ (basicInfoData&&basicInfoData.totalQty!=0) ? basicInfoData.totalQty : 0 }}</a-descriptions-item>
             <a-descriptions-item label="入库总款数">{{ (basicInfoData&&basicInfoData.totalQty!=0) ? basicInfoData.totalQty : 0 }}</a-descriptions-item>