ysy пре 2 година
родитељ
комит
a48930f5aa
2 измењених фајлова са 24 додато и 5 уклоњено
  1. 10 1
      src/views/productionPlan/index.vue
  2. 14 4
      src/views/workOrder/index.vue

+ 10 - 1
src/views/productionPlan/index.vue

@@ -28,6 +28,14 @@
           </el-link>
         </template>
 
+        
+        <template v-slot:productWeight="{ row }">
+      
+      {{ row.productWeight }} {{ row.weightUnit }}
+  
+  </template>
+
+
         <template v-slot:newSumOrderWeight="{ row }">
       
             {{ row.newSumOrderWeight }} {{ row.newWeightUnit }}
@@ -223,7 +231,8 @@
             prop: 'productWeight',
             label: '计划重量',
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'productWeight'
           },
           {
             prop: 'requiredFormingNum',

+ 14 - 4
src/views/workOrder/index.vue

@@ -14,10 +14,18 @@
         cache-key="workOrderTable"
       >
         <template v-slot:code="{ row }">
-          <!-- <el-link type="primary" :underline="false" @click="goDetail(row)"> -->
           {{ row.code }}
-          <!-- </el-link> -->
         </template>
+
+
+        <template v-slot:formingWeight="{ row }">
+          {{ row.formingWeight }} {{ row.newWeightUnit }}
+        </template>
+
+
+
+        
+
         <template v-slot:status="{ row }">
           <span :class="{ 'ele-text-danger': row.status == 3 }">
             {{ statusFormatter(row.status) }}
@@ -139,14 +147,16 @@
             label: '要求生产数量',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 110,
+          
           },
           {
             prop: 'formingWeight',
             label: '要求生产重量',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 110,
+            slot: 'formingWeight'
           },
           {
             prop: 'planStartTime',