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

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

@@ -440,12 +440,12 @@ export default {
         {
           title: '材料出库数量',
           dataIndex: 'iquantityOut',
-          width: 100,
+          width: 120,
           className: 'replacecolor',
           customCell: this.materialsOutQuantityCustomCell,
           scopedSlots: { customRender: 'materialsOutQuantity' }
         },
-        { title: '计划数量', dataIndex: 'iquantity', width: 100, className: 'replacecolor' },
+        { title: '计划数量', dataIndex: 'iquantity', width: 120, className: 'replacecolor' },
 
         {
           title: '单位',
@@ -453,13 +453,13 @@ export default {
             {
               title: '根',
               dataIndex: 'iquantityPCS',
-              width: 100,
+              width: 120,
               className: 'replacecolor'
             },
             {
               title: '米',
               dataIndex: 'iquantityM',
-              width: 100,
+              width: 120,
               className: 'replacecolor'
             }
           ]
@@ -468,16 +468,16 @@ export default {
         {
           title: '采购入库数量',
           dataIndex: 'iquantityIn',
-          width: 100,
+          width: 120,
           className: 'replacecolor',
           customCell: this.purchaseInQuantityCustomCell,
           scopedSlots: { customRender: 'purchaseInQuantity' }
         },
         { title: '物料编码', dataIndex: 'cinvCode', width: 120, className: 'replacecolor' },
-        { title: '货物名称', dataIndex: 'cinvName', width: 400, className: 'replacecolor', align:'left' },
+        { title: '货物名称', dataIndex: 'cinvName', width: 340, className: 'replacecolor', align:'left' },
         { title: '颜色', dataIndex: 'ccolor', width: 120, className: 'replacecolor' },
         { title: '损耗', dataIndex: 'cquantityLoss', wiclassName: 'replacecolor' },
-        { title: '多发少发', dataIndex: 'iquantityMoreLess', width: 100, className: 'replacecolor' }
+        { title: '多发少发', dataIndex: 'iquantityMoreLess', width: 120, className: 'replacecolor' }
       ],
       outsourceOrderData: [
         {
@@ -630,7 +630,6 @@ export default {
         { title: '发票号码', width: 120, dataIndex: 'cpbvcode', className: 'replacecolor' },
         { title: '委外供应商', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor' },
         { title: '成衣加工费（人民币）', width: 120, dataIndex: 'isum', className: 'replacecolor' },
-        { title: '成衣加工费（美元）', width: 120, dataIndex: 'ioriSum', className: 'replacecolor' },
         
         { title: '出运日期', width: 120, dataIndex: 'cshipTime', className: 'replacecolor' },
         { title: '入库数量', width: 120, dataIndex: 'iquantity', className: 'replacecolor' },
@@ -662,39 +661,33 @@ export default {
           scopedSlots: { customRender: 'clInvoiceQuantity' }
         }
       ],
-      costInvoiceClothesData: [
-        {
-          clInvoiceNum: '18TW-PRU-G30C',
-          outsourceSupplier: '委外1',
-          clProcessCost: '19350',
-          outData: '2018-06-07',
-          inQuantity: '34',
-          clInvoiceQuantity: '8000'
-        },
+
+      // 开票成本-辅料 表头
+
+      costInvoiceIngredientColumns:[],
+      costInvoiceIngredientColumnsM1:[
+        { title: '账套号', width: 80, dataIndex: 'caccount', className: 'replacecolor' },
+        { title: '订单号', width: 140, dataIndex: 'cpoid', className: 'replacecolor' },
+        { title: '供应商', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor' },
+        { title: ' 类型', width: 330, dataIndex: 'cinvName', className: 'replacecolor',align:"left" },
         {
-          clInvoiceNum: '18TW-PRU-G31',
-          outsourceSupplier: '委外1',
-          clProcessCost: '99000',
-          outData: '2018-03-17',
-          inQuantity: '34',
-          clInvoiceQuantity: '8000'
+          title: '发票数量',
+          width: 120,
+          dataIndex: 'iquantityInvoice',
+          className: 'replacecolor',
+          customCell: this.ingredientsInvoiceQuantityCustomCell,
+          scopedSlots: { customRender: 'ingredientsInvoiceQuantity' }
         },
-        {
-          clInvoiceNum: '18TW-PRU-G32G',
-          outsourceSupplier: '委外1',
-          clProcessCost: '34650',
-          outData: '2018-06-07',
-          inQuantity: '34',
-          clInvoiceQuantity: '6000'
-        }
+        { title: '开票金额(人民币)', width: 120, dataIndex: 'isum', className: 'replacecolor' },
+        { title: '单位', width: 120, dataIndex: 'ccomUnitName', className: 'replacecolor' },
+        { title: '订单数', width: 120, dataIndex: 'iquantity', className: 'replacecolor' },
+        { title: '采购入库数', width: 120, dataIndex: 'iquantityIn', className: 'replacecolor' }
       ],
-
-      // 开票成本-辅料 表头
-      costInvoiceIngredientColumns: [
+      costInvoiceIngredientColumnsAll: [
         { title: '账套号', width: 80, dataIndex: 'caccount', className: 'replacecolor' },
-        { title: '订单号', width: 120, dataIndex: 'cpoid', className: 'replacecolor' },
+        { title: '订单号', width: 140, dataIndex: 'cpoid', className: 'replacecolor' },
         { title: '供应商', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor' },
-        { title: ' 类型', width: 350, dataIndex: 'cinvName', className: 'replacecolor',align:"left" },
+        { title: ' 类型', width: 330, dataIndex: 'cinvName', className: 'replacecolor',align:"left" },
         {
           title: '发票数量',
           width: 120,
@@ -757,16 +750,22 @@ export default {
           getFabricLossDatas({csocode:value}).then(res => {
             this.loading = false;
             if (res.success) {
-              this.fabricLoss = res.result;
-              // 获取原币和本币金额是否完全相同，完全相同隐藏美元列
+              
+              // 开票成本成衣：获取原币和本币金额是否完全相同，完全相同隐藏美元列
               var findList = this.fabricLoss.fabricCostClothesList.filter(e=>e.ioriSum!=e.isum);
               if (findList.length == 0)
                 this.costInvoiceClothesColumns = this.costInvoiceClothesColumnsM1;
               else
                 this.costInvoiceClothesColumns = this.costInvoiceClothesColumnsAll;
-              // console.log('染损列表', this.dyeLossRateData)
+              // 开票成本辅料：获取原币和本币金额是否完全相同，完全相同隐藏美元列
+              findList = this.fabricLoss.fabricCostAssistList.filter(e=>e.ioriSum!=e.isum);
+              if (findList.length == 0)
+                this.costInvoiceIngredientColumns = this.costInvoiceIngredientColumnsM1;
+              else
+                this.costInvoiceIngredientColumns = this.costInvoiceIngredientColumnsAll;
+              this.fabricLoss = res.result;
             }else{
-              this.fabricLoss = {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[]};
+              this.fabricLoss = {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[],fabricCostAssistList:[],fabricCostClothList:[],fabricCostClothesList:[],fabricCostInvoiceList:[],fabricExpensesList:[]};
               this.$message.error(res.message);
             }
           })