Merge remote-tracking branch 'origin/master'

zkqy-ui/src/views/orderMange/approve.vue

@@ -1195,10 +1195,10 @@ export default {
           amountTotal += Number(item.productNumber);
           singlTotal += Number(item.productUnitPrice);
           moneyTotal += Number(item.productAmounts);
-          let productData = this.productionOptions.find(
+          let productData = this.allProductionOptions.find(
             (pro) => pro.productNo == item.productNo
           );
-          console.log(this.productionOptions);
+          console.log(this.allProductionOptions);
           console.log("productData", productData);
           item.sliceTypeLabel =
             this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)

zkqy-ui/src/views/orderMange/financeApprove.vue

@@ -725,7 +725,7 @@ export default {
           amountTotal += Number(item.productNumber);
           singlTotal += Number(item.productUnitPrice);
           moneyTotal += Number(item.productAmounts);
-          let productData = this.productionOptions.find(
+          let productData = this.allProductionOptions.find(
             (pro) => pro.productNo == item.productNo
           );
           console.log("item", item);

zkqy-ui/src/views/orderMange/index.vue

@@ -1258,14 +1258,16 @@ export default {
         ) {
           sums[index] = "";
         } else if (!values.every((value) => isNaN(value))) {
-          sums[index] = values.reduce((prev, curr) => {
-            const value = Number(curr);
-            if (!isNaN(value)) {
-              return prev + curr;
-            } else {
-              return prev;
-            }
-          }, 0);
+          sums[index] = values
+            .reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0)
+            ?.toFixed(2);
           if (index == 4) {
             this.totalMoney = sums[index];
           }