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

src/views/cost-allocation-total/modal/fabInQuaModal.vue

@@ -42,7 +42,7 @@ export default {
       columns: [
         {
           title: '存货名称',
-          dataIndex: 'inventoryName',
+          dataIndex: 'goodsName',
           width: 120,
           className: 'replacecolor'
         },
@@ -54,13 +54,13 @@ export default {
         },
         {
           title: '计划单号',
-          dataIndex: 'planNum',
+          dataIndex: 'planCode',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '转入数量',
-          dataIndex: 'transferQuantity',
+          dataIndex: 'number',
           width: 120,
           className: 'replacecolor'
         },
@@ -72,7 +72,7 @@ export default {
         },
         {
           title: '总成本',
-          dataIndex: 'totalCost',
+          dataIndex: 'cost',
           width: 120,
           className: 'replacecolor'
         }

src/views/cost-allocation-total/modal/fabRemQuaModal.vue

@@ -41,7 +41,7 @@ export default {
       columns: [
         {
           title: '存货名称',
-          dataIndex: 'a',
+          dataIndex: 'goodsName',
           width: 120,
           className: 'replacecolor'
         },
@@ -53,13 +53,13 @@ export default {
         },
         {
           title: '计划单号',
-          dataIndex: 'planNum',
+          dataIndex: 'planCode',
           width: 120,
           className: 'replacecolor'
         },
         {
           title: '使用数量',
-          dataIndex: 'usageQuantity',
+          dataIndex: 'number',
           width: 120,
           className: 'replacecolor'
         },
@@ -71,7 +71,7 @@ export default {
         },
         {
           title: '总成本',
-          dataIndex: 'totalCost',
+          dataIndex: 'cost',
           width: 120,
           className: 'replacecolor'
         }