面损表更新

src/views/reportForms/fabric-loss-table.vue

@@ -287,7 +287,7 @@
           :row-key="record => record.id"
           :loading="loading"
           :columns="accidentListColumns"
-          :data-source="fabricLoss.accidentListData"
+          :data-source="fabricLoss.fabricAccidentList"
           bordered
           :pagination="false"
         >
@@ -415,7 +415,7 @@ export default {
   },
   data() {
     return {
-      fabricLoss: {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[],fabricCostAssistList:[],fabricCostClothList:[],fabricCostClothesList:[],fabricCostInvoiceList:[],fabricExpensesList:[]}, // 主表信息
+      fabricLoss: {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[],fabricCostAssistList:[],fabricCostClothList:[],fabricCostClothesList:[],fabricCostInvoiceList:[],fabricExpensesList:[],fabricAccidentList:[]}, // 主表信息
       loading: false, // 表格加载
       validatorRules: {
         planNum: [{ required: true, message: '请输入计划单号进行搜索', trigger: 'blur' }]
@@ -495,12 +495,12 @@ export default {
         {
           title: '材料出库数量',
           dataIndex: 'iquantityOut',
-          width: 170,
+          width: 100,
           className: 'replacecolor',
           customCell: this.materialsOutQuantityCustomCell,
           scopedSlots: { customRender: 'materialsOutQuantity' }
         },
-        { title: '计划数量', dataIndex: 'iquantity', width: 120, className: 'replacecolor' },
+        { title: '计划数量', dataIndex: 'iquantity', width: 100, className: 'replacecolor' },
 
         {
           title: '单位',
@@ -508,13 +508,13 @@ export default {
             {
               title: '根',
               dataIndex: 'iquantityPCS',
-              width: 120,
+              width: 100,
               className: 'replacecolor'
             },
             {
               title: '米',
               dataIndex: 'iquantityM',
-              width: 120,
+              width: 100,
               className: 'replacecolor'
             }
           ]
@@ -523,17 +523,18 @@ export default {
         {
           title: '采购入库数量',
           dataIndex: 'iquantityIn',
-          width: 120,
+          width: 100,
           className: 'replacecolor',
           customCell: this.purchaseInQuantityCustomCell,
           scopedSlots: { customRender: 'purchaseInQuantity' }
         },
+        { title: '染厂色号', dataIndex: 'ccolorNumber', width: 120, className: 'replacecolor' },
         { title: '物料编码', dataIndex: 'cinvCode', width: 120, className: 'replacecolor' },
         { title: '货物名称', dataIndex: 'cinvName', width: 200, className: 'replacecolor', align:'left' },
         { title: '颜色', dataIndex: 'ccolor', width: 110, className: 'replacecolor' },
-        { title: '损耗', dataIndex: 'cquantityLoss',  width: 120,className: 'replacecolor' },
-        { title: '多发少发', dataIndex: 'iquantityMoreLess', width: 120, className: 'replacecolor' },
-        { title: '附件', dataIndex: 'enclosure', width: 120, className: 'replacecolor', scopedSlots: { customRender: 'enclosure' }}
+        { title: '损耗', dataIndex: 'cquantityLoss',  width: 100,className: 'replacecolor' },
+        { title: '多发少发', dataIndex: 'iquantityMoreLess', width: 100, className: 'replacecolor' },
+        { title: '附件', dataIndex: 'enclosure', width: 100, className: 'replacecolor', scopedSlots: { customRender: 'enclosure' }}
       ],
 
       // 成本发票 表头
@@ -680,13 +681,13 @@ export default {
         {
           title: '单号',
           width: 120,
-          dataIndex: 'accidentNum',
+          dataIndex: 'cpbvcode',
           className: 'replacecolor',
           customCell: this.accidentListCustomCell,
-          scopedSlots: { customRender: 'accidentNum' }
+          scopedSlots: { customRender: 'cpbvcode' }
         },
-        { title: '事故承担方', width: 120, dataIndex: 'accidentUndertaker', className: 'replacecolor' },
-        { title: '金额', dataIndex: 'amount', width: 120, className: 'replacecolor' }
+        { title: '事故承担方', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor' },
+        { title: '金额', dataIndex: 'ioriSum', width: 120, className: 'replacecolor' }
       ],
       accidentListData: [{ accidentNum: '1100011' }, { accidentNum: '3540011' }],
 
@@ -775,8 +776,11 @@ export default {
               this.fabricLoss.fabricPoOrderList.map(item => {
                 item["omcVenAbbNameArray"] = item.omcVenAbbName ? (item.omcVenAbbName.split(",")) : ''
               })
+              if (this.fabricLoss.fabricAccidentList == null){
+                this.fabricLoss.fabricAccidentList = [];
+              }
             }else{
-              this.fabricLoss = {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[],fabricCostAssistList:[],fabricCostClothList:[],fabricCostClothesList:[],fabricCostInvoiceList:[],fabricExpensesList:[]};
+              this.fabricLoss = {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[],fabricCostAssistList:[],fabricCostClothList:[],fabricCostClothesList:[],fabricCostInvoiceList:[],fabricExpensesList:[],fabricAccidentList:[]};
               this.$message.info(res.message);
             }
           })