销售订单转生产计划 临时生产计划新增 要求生产数量跟要求生产数量单位字段

src/views/productionPlan/components/factoryAdd/index.vue

@@ -622,7 +622,7 @@
           {
             slot: 'factoriesId',
             prop: 'factoriesId',
-             headerSlot: 'headerProduceRoutingId',
+            headerSlot: 'headerProduceRoutingId',
             label: '所属工厂',
             align: 'center',
             minWidth: 140
@@ -770,6 +770,7 @@
       parameterGetByCode({
         code: 'production_plan_code'
       }).then((res) => {
+        console.log(res,'res 1')
         if (res) {
           this.processingRequired = res.value;
         }
@@ -1127,6 +1128,7 @@
           if (!valid) {
             return false;
           }
+          console.log(this.form.productInfoList, '1111111111');
 
           let flag = this.parameterVerification();
           // 必填参数校验
@@ -1134,6 +1136,20 @@
           if (!this.form.id) {
             if (this.form.productInfoList.length) {
               this.form.productInfoList.map((item, index) => {
+                if (
+                  item.weightUnit == 'G' ||
+                  item.weightUnit == 'g' ||
+                  item.weightUnit == '克'
+                ) {
+                  let total =
+                    ((item.requiredFormingNum - 0) * item.productUnitWeight) /
+                    1000;
+                    item.newSumOrderWeight = total.toFixed(2);
+                    item.newWeightUnit = 'KG'
+                }else{
+                  item.newWeightUnit = item.weightUnit;
+                  item.newSumOrderWeight = item.requiredFormingNum;
+                }
                 delete item.selectionRowShow;
                 if (item.bomVersionList && item.bomVersionList.length) {
                   item.bomCategoryName = item.bomVersionList[0].name;

src/views/productionPlan/index.vue

@@ -604,8 +604,12 @@
             prop: 'newSumOrderWeight',
             label: '要求生产重量',
             align: 'center',
-
-            slot: 'newSumOrderWeight'
+            slot: 'newSumOrderWeight',
+            formatter: (row) => {
+              if (row.newSumOrderWeight) {
+                return `${row.newSumOrderWeight}${row.newWeightUnit}`;
+              }
+            }
           },
 
           {

src/views/saleOrder/salesToProductionNewTwo.vue

@@ -1331,16 +1331,18 @@
             this.form.weightUnit == 'g' ||
             this.form.weightUnit == '克'
           ) {
-            this.form.newWeightUnit = 'kg';
-            _sumOrderWeight =
-              (this.form.salesOrders[0].requiredFormingNum *
-                Number(this.form.salesOrders[0].productUnitWeight || 1)) /
-              1000;
+            this.form.newWeightUnit = 'KG';
+            _sumOrderWeight = this.form.newSumOrderWeight / 1000;
+            // _sumOrderWeight =
+            //   (this.form.salesOrders[0].requiredFormingNum *
+            //     Number(this.form.salesOrders[0].productUnitWeight || 1)) /
+            //   1000;
           } else {
             this.form.newWeightUnit = this.form.weightUnit;
-            _sumOrderWeight =
-              this.form.salesOrders[0].requiredFormingNum *
-              Number(this.form.salesOrders[0].productUnitWeight || 1);
+             _sumOrderWeight = this.form.newSumOrderWeight
+            // _sumOrderWeight =
+            //   this.form.salesOrders[0].requiredFormingNum *
+            //   Number(this.form.salesOrders[0].productUnitWeight || 1);
           }
 
           productNum += Number(item.planProductNum);
@@ -1348,7 +1350,7 @@
         this.form.productNum = productNum;
         this.form.productUnitWeight =
           this.form.salesOrders[0]?.productUnitWeight;
-        // this.form.newSumOrderWeight = _sumOrderWeight.toFixed(2);
+        this.form.newSumOrderWeight = _sumOrderWeight.toFixed(2);
         this.form.requiredFormingNum = requiredFormingNum;
         const collection = deepClone(this.form.salesOrders);
         const sortedCollection = collection.sort(

vue.config.js

@@ -39,7 +39,7 @@ module.exports = {
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.211:18086',
         // target: 'http://192.168.1.251:18186',
-        target: 'http://192.168.1.251:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.116:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域