ysy hace 2 años
padre
commit
bbcaf2ced3

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

@@ -51,7 +51,7 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 要求生产数量 </template>
-          {{ info.requiredFormingNum }}
+          {{ Number(info.requiredFormingNum) }}
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 要求生产重量 </template>

+ 22 - 5
src/views/saleOrder/salesToProduction.vue

@@ -84,6 +84,9 @@
           <el-table-column label="合同数量" align="center" prop="contractNum">
           </el-table-column>
           <el-table-column label="合同重量" align="center" prop="productSumWeight">
+            <template slot-scope="scope">
+              {{  scope.row.productSumWeight }} {{ form.weightUnit  }}
+             </template>
           </el-table-column>
           <el-table-column label="欠交数量" align="center" prop="lackNum">
           </el-table-column>
@@ -224,7 +227,7 @@ export default {
         stockCountBase: '',
         salesOrders: [],
         produceRoutingName: '',
-        marginCoefficient: '1',
+        marginCoefficient: '1.0',
       },
 
       // 表单验证规则
@@ -306,7 +309,7 @@ export default {
 
     itemChange() {
       this.form.salesOrders.map((item, index) => {
-        this.$set(item, 'requiredFormingNum',  (item.planProductNum * (this.form.marginCoefficient || 1)).toFixed(0))
+        this.$set(item, 'requiredFormingNum', (item.planProductNum * (this.form.marginCoefficient || 1)).toFixed(0))
       
     })
 
@@ -333,6 +336,7 @@ export default {
     },
     // 对比日期,计算要求生产重量
     mapList() {
+
       var requiredFormingWeight = 0;
       var requiredFormingNum = 0;
       var productNum = 0;
@@ -340,7 +344,8 @@ export default {
         requiredFormingWeight =
           requiredFormingWeight +
           Number(item.productUnitWeight) * Number(item.requiredFormingNum);
-        requiredFormingNum = requiredFormingNum + item.requiredFormingNum;
+        requiredFormingNum = Number( requiredFormingNum) +Number(item.requiredFormingNum);
+
 
         productNum += Number(item.planProductNum);
       });
@@ -450,9 +455,11 @@ export default {
     changeData() {
       var planProductNum = 0;
       var productWeight = 0;
+
       this.form.salesOrders.map((item, index) => {
+
         item.priority = index + 1;
-        planProductNum = planProductNum + item.contractNum;
+        planProductNum = planProductNum + item.requiredFormingNum;
         productWeight = productWeight + Number(item.productSumWeight);
       });
       this.$set(this.form, 'codeNum', this.form.salesOrders.length);
@@ -467,6 +474,8 @@ export default {
       if (this.$route.query.type != 'edit') {
         delete params.id;
       }
+
+      
       if (type === 2) {
         this.$confirm('发布工单后不可撤回,确定发布吗?', '发布确认').then(
           async () => {
@@ -482,7 +491,8 @@ export default {
                 workOrder: {
                   productionPlanCode: params.code,
                   code: code,
-                  formingNum: params.contractNum,
+                  // formingNum: params.contractNum,
+                  formingNum: this.form.requiredFormingNum,
                   formingWeight: params.sumOrderWeight,
                   produceRoutingId: params.produceRoutingId,
                   status: 4,
@@ -497,6 +507,10 @@ export default {
                 data.workOrder.productionPlanId = params.id;
               }
 
+             console.log(data)
+                
+             return false
+
               await releaseSave(data)
                 .then((res) => {
                   if (res === 1) {
@@ -538,6 +552,9 @@ export default {
           this.$route.query.type == 'edit'
             ? updateSaleToPlan
             : saveSaleToPlan;
+          
+            console.log(params)
+            return false
 
         request(params)
           .then(async (res) => {