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

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

@@ -528,6 +528,7 @@ export default {
       // 成本发票 表头
       costInvoiceColumns: [
         { title: '类型', width: 120, dataIndex: 'cvcname', className: 'replacecolor' },
+        { title: '采购类型', width: 120, dataIndex: 'cbusType', className: 'replacecolor' },
         { title: '工厂', width: 120, dataIndex: 'cvenAbbName', className: 'replacecolor' },
         { title: '成本金额', dataIndex: 'imoney', width: 120, className: 'replacecolor' }
       ],

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

@@ -103,6 +103,13 @@ export default {
           key: '',
           className: 'replacecolor'
         },
+        {
+          title: '仓库',
+          dataIndex: 'cwhName',
+          width: 120,
+          key: '',
+          className: 'replacecolor'
+        },
         {
           title: '批号',
           dataIndex: 'cbatch',