Browse Source

Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

jbb 2 years ago
parent
commit
fd10ef6ecd
1 changed files with 9 additions and 7 deletions
  1. 9 7
      src/views/reportForms/fabric-loss-table.vue

+ 9 - 7
src/views/reportForms/fabric-loss-table.vue

@@ -624,8 +624,9 @@ export default {
         { invoiceNum: '18TW-MYA-78', supplier: '供应商1', PurchaseinvoiceCost: '888.88', outData: '2018-05-18' },
         { invoiceNum: '18TW-MYA-34', supplier: '供应商1', PurchaseinvoiceCost: '888.88', outData: '2018-06-1' }
       ],
-      // 开票成本-成衣 表头动态,可能会隐藏人民币列
-      costInvoiceClothesColumns:[
+      costInvoiceClothesColumns:[],
+      // 开票成本-成衣 表头无美元
+      costInvoiceClothesColumnsM1:[
         { title: '发票号码', width: 120, dataIndex: 'cpbvcode', className: 'replacecolor' },
         { title: '委外供应商', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor' },
         { title: '成衣加工费(人民币)', width: 120, dataIndex: 'isum', className: 'replacecolor' },
@@ -757,11 +758,12 @@ export default {
             this.loading = false;
             if (res.success) {
               this.fabricLoss = res.result;
-              this.costInvoiceClothesColumns =JSON.parse(JSON.stringify(this.costInvoiceClothesColumnsAll));
               // 获取原币和本币金额是否完全相同,完全相同隐藏美元列
               var findList = this.fabricLoss.fabricCostClothesList.filter(e=>e.ioriSum!=e.isum);
               if (findList.length == 0)
-                this.costInvoiceClothesColumns.splice(3,1);
+                this.costInvoiceClothesColumns = this.costInvoiceClothesColumnsM1;
+              else
+                this.costInvoiceClothesColumns = this.costInvoiceClothesColumnsAll;
               // console.log('染损列表', this.dyeLossRateData)
             }else{
               this.fabricLoss = {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[]};
@@ -910,13 +912,13 @@ export default {
       )
     },
 
-    // 成衣-发票数量
+    // 开票成本成衣-弹框
     clInvoiceQuantityCustomCell(record) {
       return {
         on: {
           click: event => {
-            console.log('this:', this)
-            this.$refs.invoiceQuantityModal.invoiceQuantityModVis = true
+            this.$refs.invoiceQuantityModal.invoiceQuantityData = record.fabricCostClothesDetailList;
+            this.$refs.invoiceQuantityModal.invoiceQuantityModVis = true;
           }
         }
       }