优化

src/views/materialPlan/components/ProductModal.vue

@@ -120,7 +120,14 @@ export default {
           minWidth: 90
         },
 
+        {
+          prop: 'inventoryQuantity',
+          label: '库存',
+          showOverflowTooltip: true,
+
+        },
 
+        
 
 
 
@@ -149,7 +156,7 @@ export default {
 
         pageNum: page,
         size: limit,
-        categoryLevelId: 1,
+        categoryLevelId: this.categoryLevelId,
 
       });
       return res;
@@ -223,6 +230,7 @@ export default {
       if (this.type == 'add') {
        _arr = this.selection.map(m => {
           m.categoryId = m.id
+          m.unit = m.measuringUnit
           delete m.id
           return {
             ...m

src/views/materialPlan/components/plan-edit-dialog.vue

@@ -76,6 +76,11 @@
                 {{ $index }}
               </template>
 
+              <template v-slot:unit="{ row }">
+              {{  row.unit   }}
+              </template>
+
+
               <template v-slot:demandQuantity="{ row }">
                 <el-input v-model="row.demandQuantity" placeholder="请输入" @input="(value) =>
                 (row.demandQuantity = value.replace(
@@ -333,21 +338,21 @@ export default {
           align: 'center',
         },
 
-
-
         {
-          prop: 'measuringUnit',
-          label: '计量单位',
+          prop: 'inventoryQuantity',
+          label: '库存',
           showOverflowTooltip: true,
-     
+
         },
 
         {
-          prop: 'weightUnit',
-          label: '重量单位',
+          prop: 'unit',
+          label: '计量单位',
           showOverflowTooltip: true,
-       
+          action: 'unit',
+          slot: 'unit',
         },
+
         {
           label: '需求数量',
           slot: 'demandQuantity',

src/views/materialPlan/components/produce-edit-dialog.vue

@@ -202,7 +202,7 @@ export default {
           minWidth: 170
         },
         {
-          prop: 'salesOrderId',
+          prop: 'salesOrderCode',
           label: '销售订单号',
           align: 'center',
           minWidth: 110
@@ -254,15 +254,12 @@ export default {
           showOverflowTooltip: true
         },
         {
-          prop: 'contractNum',
-          label: '合同数量',
-          align: 'center'
-        },
-        {
-          prop: 'lackNum',
-          label: '欠交数量',
-          align: 'center'
+          prop: 'formingNum',
+          label: '要求成型数量',
+          align: 'center',
+          minWidth: 120
         },
+   
 
 
         {

src/views/materialPlan/components/workOrderPop.vue

@@ -52,7 +52,7 @@ export default {
                     minWidth: 110
                 },
                 {
-                    prop: 'salesOrderId',
+                    prop: 'salesOrderCode',
                     label: '销售订单号',
                     align: 'center',
                     minWidth: 110