rr

src/views/productionPlan/index.vue

@@ -89,6 +89,13 @@
           </div>
         </template>
 
+        
+
+        <template v-slot:productNum="{ row }">
+          {{ row.productNum }} {{ row.unit }}
+        </template>
+
+
         <template v-slot:productWeight="{ row }">
           {{ row.productWeight }} {{ row.weightUnit }}
         </template>
@@ -333,13 +340,7 @@
 
           },
 
-          {
-            prop: 'scheduleStatusName',
-            label: '进度状态',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 100
-          },
+
 
           {
             prop: 'productCode',
@@ -396,9 +397,10 @@
 
           {
             prop: 'productNum',
-            label: '计划数量' + (this.clientEnvironmentId == '4' ? '(方)' : ''),
+            label: '计划数量' ,
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'productNum'
           },
           {
             prop: 'productWeight',
@@ -410,7 +412,7 @@
           {
             prop: 'requiredFormingNum',
             label:
-              '要求生产数量' + (this.clientEnvironmentId == '4' ? '(方)' : ''),
+              '要求生产数量',
             align: 'center',
             showOverflowTooltip: true,
             slot: 'requiredFormingNum'
@@ -424,6 +426,49 @@
             slot: 'newSumOrderWeight'
           },
 
+
+          {
+            prop: 'scheduleStatusName',
+            label: '进度状态',
+            align: 'center',
+            showOverflowTooltip: true,
+            minWidth: 100
+          },
+
+          {
+            prop: '',
+            label: '已排产数量',
+            align: 'center',
+            showOverflowTooltip: true,
+
+          },
+
+          {
+            prop: '',
+            label: '未排产数量',
+            align: 'center',
+            showOverflowTooltip: true,
+
+          },
+
+          {
+            prop: '',
+            label: '已生产数量',
+            align: 'center',
+            showOverflowTooltip: true,
+
+          },
+
+          {
+            prop: '',
+            label: '未生产数量',
+            align: 'center',
+            showOverflowTooltip: true,
+          },
+
+
+
+
           {
             prop: 'moCount',
             label: '模数',
@@ -576,7 +621,7 @@
             privateColumn.push({
               columnKey: 'action',
               label: '操作',
-              width: 220,
+              width: 148,
               align: 'center',
               resizable: false,
               fixed: 'right',

src/views/saleOrder/index.vue

@@ -234,18 +234,18 @@
             label: '欠交数量',
             align: 'center'
           },
-          // {
-          //   prop: 'moCount',
-          //   label: '模数',
-          //   align: 'center',
-          //   show: this.clientEnvironmentId == '4'
-          // },
-          // {
-          //   prop: 'blockCount',
-          //   label: '块数',
-          //   align: 'center',
-          //   show: this.clientEnvironmentId == '4'
-          // },
+          {
+            prop: 'moCount',
+            label: '模数',
+            align: 'center',
+            show: this.clientEnvironmentId == '4'
+          },
+          {
+            prop: 'blockCount',
+            label: '块数',
+            align: 'center',
+            show: this.clientEnvironmentId == '4'
+          },
           {
             prop: 'orderLibraryType',
             label: '按单按库',