优化

src/views/saleOrder/components/plan-submit.vue

@@ -55,7 +55,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 要求生产重量 </template>
-          {{ info.requiredFormingWeight }}
+          {{ info.newSumOrderWeight }} {{  info.newWeightUnit }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 成型完成日期 </template>

src/views/saleOrder/index.vue

@@ -130,7 +130,8 @@
             align: 'center',
             showOverflowTooltip: true,
             minWidth: 150,
-            slot: 'code'
+            slot: 'code',
+          
           },
           {
             prop: 'lineNumber',
@@ -143,7 +144,8 @@
             label: '产品编码',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 140
+            minWidth: 140,
+            sortable: true
           },
 
           {
@@ -169,7 +171,8 @@
             prop: 'model',
             label: '型号',
             align: 'center',
-            minWidth: 120
+            minWidth: 120,
+            sortable: true
           },
           {
             prop: 'productSumWeight',

src/views/saleOrder/salesToProduction.vue

@@ -77,7 +77,7 @@
               <span>{{ scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="销售订单号" align="center" prop="code" width="120">
+          <el-table-column label="销售订单号" align="center" prop="code" width="120" sortable>
           </el-table-column>
           <el-table-column label="行号" align="center" prop="lineNumber">
           </el-table-column>
@@ -337,14 +337,20 @@ export default {
     // 对比日期，计算要求生产重量
     mapList() {
 
-      var requiredFormingWeight = 0;
+      var _sumOrderWeight = 0
       var requiredFormingNum = 0;
       var productNum = 0;
       this.form.salesOrders.map((item, index) => {
-        requiredFormingWeight =
-          requiredFormingWeight +
-          Number(item.productUnitWeight) * Number(item.requiredFormingNum);
-        requiredFormingNum = Number( requiredFormingNum) +Number(item.requiredFormingNum);
+       
+        requiredFormingNum = Number(requiredFormingNum) + Number(item.requiredFormingNum);
+
+        if(this.form.weightUnit == 'G' || this.form.weightUnit == 'g') {
+           this.form.newWeightUnit = 'kg'
+           _sumOrderWeight = (this.form.sumOrderWeight * Number(this.form.marginCoefficient || 1))/ 1000
+        } else {
+           this.form.newWeightUnit = this.form.weightUnit
+           _sumOrderWeight = this.form.sumOrderWeight * Number(this.form.marginCoefficient || 1)
+        }
 
 
         productNum += Number(item.planProductNum);
@@ -352,7 +358,7 @@ export default {
       this.form.productNum = productNum;
       this.form.productUnitWeight =
         this.form.salesOrders[0]?.productUnitWeight;
-      this.form.requiredFormingWeight = requiredFormingWeight.toFixed(2);
+      this.form.newSumOrderWeight = _sumOrderWeight.toFixed(2);
       this.form.requiredFormingNum = requiredFormingNum;
       const collection = deepClone(this.form.salesOrders);
       const sortedCollection = collection.sort(
@@ -507,9 +513,7 @@ export default {
                 data.workOrder.productionPlanId = params.id;
               }
 
-             console.log(data)
-                
-             return false
+
 
               await releaseSave(data)
                 .then((res) => {
@@ -553,8 +557,7 @@ export default {
             ? updateSaleToPlan
             : saveSaleToPlan;
           
-            console.log(params)
-            return false
+    
 
         request(params)
           .then(async (res) => {