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

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

@@ -639,7 +639,7 @@ export default {
               this.fabricLoss = res.result;
             }else{
               this.fabricLoss = {fabricPoOrderList:[],fabricOMOrderList1:[],fabricOMOrderList2:[],fabricCostAssistList:[],fabricCostClothList:[],fabricCostClothesList:[],fabricCostInvoiceList:[],fabricExpensesList:[]};
-              this.$message.error(res.message);
+              this.$message.info(res.message);
             }
           })
         })
@@ -683,6 +683,7 @@ export default {
       return {
         on: {
           click: event => {
+            this.$refs.materialsOutQuantityModal.materialsOutQuantityData = record.fabricMoOrderCKList;
             this.$refs.materialsOutQuantityModal.materialsOutQuantityModVis = true
           }
         }
@@ -694,24 +695,13 @@ export default {
       return {
         on: {
           click: event => {
+            this.$refs.purchaseInQuantityModal.purchaseInQuantityData = record.fabricMoOrderRKList;
             this.$refs.purchaseInQuantityModal.purchaseInQuantityModVis = true
           }
         }
       }
     },
 
-    // 委外 【材料出库数量】
-    materialsOutQuantityAbroadCustomCell(record) {
-      return {
-        on: {
-          click: event => {
-            console.log('this:', this)
-            this.$refs.materialsOutQuantityModal.materialsOutQuantityModVis = true
-          }
-        }
-      }
-    },
-
 
     // 开票成本-面料弹框
     invoiceNumCustomCell(record) {

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

@@ -88,30 +88,51 @@ export default {
     return {
       // 表头
       materialsOutQuantityColumns: [
+        {
+          title: '入库类型',
+          dataIndex: 'cbusType',
+          width: 80,
+          key: '',
+          className: 'replacecolor'
+        },
         {
           title: '供应商',
-          dataIndex: 'supplier',
+          dataIndex: 'cvenAbbName',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '入库单号',
-          dataIndex: 'inOrderNum',
+          dataIndex: 'ccode',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '物料编码',
-          dataIndex: 'materialCode',
+          dataIndex: 'cinvCodeOut',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
+        {
+          title: '物料名称',
+          dataIndex: 'cinvNameOut',
+          width: 300,
+          key: '',
+          className: 'replacecolor'
+        },
+        {
+          title: '颜色',
+          dataIndex: 'ccolorOut',
+          width: 100,
+          key: '',
+          className: 'replacecolor'
+        },
         {
           title: '批号',
-          dataIndex: 'batchNum',
+          dataIndex: 'cbatchOut',
           width: 120,
           key: '',
           className: 'replacecolor'
@@ -119,21 +140,21 @@ export default {
         
         {
           title: '单价',
-          dataIndex: 'price',
+          dataIndex: 'iprice',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '数量',
-          dataIndex: 'quantity',
+          dataIndex: 'iquantity',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '金额',
-          dataIndex: 'money',
+          dataIndex: 'imoney',
           width: 120,
           key: '',
           className: 'replacecolor'

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

@@ -78,42 +78,42 @@ export default {
       purchaseInQuantityColumns: [
         {
           title: '批号',
-          dataIndex: '',
+          dataIndex: 'cbatch',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '委外订单号',
-          dataIndex: 'purchaseAboardOrderNum',
+          dataIndex: 'ccode',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '采购入库数量',
-          dataIndex: 'purchaseInQuantity',
+          dataIndex: 'iquantityIn',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '单个物料成本',
-          dataIndex: 'costPerMaterial',
+          dataIndex: 'iprice',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '开票数',
-          dataIndex: 'invoicedQuantity',
+          dataIndex: 'isumBillQuantity',
           width: 120,
           key: '',
           className: 'replacecolor'
         },
         {
           title: '未开票数',
-          dataIndex: 'notInvoicedQuantity',
+          dataIndex: 'isumBillQuantityN',
           width: 120,
           key: '',
           className: 'replacecolor'
@@ -127,7 +127,7 @@ export default {
         },
         {
           title: '未结算数量',
-          dataIndex: 'notIsquantity',
+          dataIndex: 'isquantityN',
           width: 120,
           key: '',
           className: 'replacecolor'