fenghaifu 2 gadi atpakaļ
vecāks
revīzija
5ad48e78e5
1 mainītis faili ar 14 papildinājumiem un 8 dzēšanām
  1. 14 8
      src/views/reportForms/fabric-loss-table.vue

+ 14 - 8
src/views/reportForms/fabric-loss-table.vue

@@ -133,7 +133,13 @@
       <!-- 委外订单国内 -->
       <div class="outsource-orders-table" style="margin:40px 0">
         <h6 class="table-title">委外订单国内</h6>
-        <a-table :columns="outsourceOrderColumns" :data-source="fabricLoss.fabricOMOrderList1" bordered :pagination="false">
+        <a-table 
+          :row-key="record => record.id"
+          :columns="outsourceOrderColumns" 
+          :data-source="fabricLoss.fabricOMOrderList1" 
+          bordered 
+          :pagination="false" 
+          :loading="loading">
           <!-- 材料出库数量 -->
           <span slot="materialsOutQuantity" slot-scope="text">
             <a>{{ text }}</a>
@@ -152,7 +158,7 @@
         <a-table
           :row-key="record => record.id"
           :loading="loading"
-          :columns="outsourceOrderAbroadColumns"
+          :columns="outsourceOrderColumns"
           :data-source="fabricLoss.fabricOMOrderList2"
           bordered
           :pagination="false"
@@ -433,7 +439,7 @@ export default {
         {
           title: '材料出库数量',
           dataIndex: 'ioutQuantity',
-          width: 80,
+          width: 100,
           className: 'replacecolor',
           customCell: this.materialsOutQuantityCustomCell,
           scopedSlots: { customRender: 'materialsOutQuantity' }
@@ -461,15 +467,15 @@ export default {
         {
           title: '采购入库数量',
           dataIndex: 'purchaseInQuantity',
-          width: 80,
+          width: 100,
           className: 'replacecolor',
           customCell: this.purchaseInQuantityCustomCell,
           scopedSlots: { customRender: 'purchaseInQuantity' }
         },
-        { title: '物料编码', dataIndex: 'cinvCode', width: 100, className: 'replacecolor' },
-        { title: '货物名称', dataIndex: 'cinvName', width: 150, className: 'replacecolor' },
-        { title: '颜色', dataIndex: 'color', width: 80, className: 'replacecolor' },
-        { title: '计划数量', dataIndex: 'planQuantity', width: 80, className: 'replacecolor' },
+        { title: '物料编码', dataIndex: 'cinvCode', width: 120, className: 'replacecolor' },
+        { title: '货物名称', dataIndex: 'cinvName', width: 400, className: 'replacecolor' },
+        { title: '颜色', dataIndex: 'color', width: 120, className: 'replacecolor' },
+        { title: '计划数量', dataIndex: 'planQuantity', width: 100, className: 'replacecolor' },
         { title: '损耗', dataIndex: 'loss', wiclassName: 'replacecolor' },
         { title: '多发少发', dataIndex: 'moreOrLess', width: 100, className: 'replacecolor' }
       ],