From 5f2221fbba40d0218e33f73489b3cdf61fa567de Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 04 十一月 2025 16:41:03 +0800
Subject: [PATCH] 核磅录入弹框确认,磅差数字类型计算

---
 pages/wareHouse/nuclearScale/index.vue |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index b3e7fba..d004ed1 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -358,7 +358,11 @@
               "瀹㈡埛涓嶄竴鑷达細" + res.data + " || " + that.form.customerName1,
             showCancel: true,
             success: function (res) {
-              that.ScanCodeRecord.unshift(ScanCodeRecordList);
+              if (res.confirm) {
+                that.ScanCodeRecord.unshift(ScanCodeRecordList);
+              } else if (res.cancel) {
+                return;
+              }
             },
           });
         } else {
@@ -394,20 +398,26 @@
         });
       }
       // 浣跨敤姝g‘鐨勫瓧娈靛悕suppliedQuantity锛岃�屼笉鏄痸oltage
-      const magnetic =
+      const magnetic = (
         Number(this.modalList.verificationWeight) -
         Number(this.modalList.forkliftWeight) -
-        grossWeightSum;
+        grossWeightSum
+      ).toFixed(1);
       this.form.verificationWeight = this.modalList.verificationWeight;
       this.form.forkliftWeight = this.modalList.forkliftWeight;
       switch (this.form.productType) {
         case "DT01":
-          if (magnetic >= -3 && magnetic <= 3) {
+          if (Number(magnetic) >= -3 && Number(magnetic) <= 3) {
+            let that = this;
             uni.showModal({
               title: "鎻愮ず",
               content: "纾呭樊:" + magnetic + "锛屾槸鍚︾‘璁ゆ彁浜わ紵",
               success: function (res) {
-                  this.allSubmit();
+                if (res.confirm) {
+                  that.allSubmit();
+                } else if (res.cancel) {
+                  return;
+                }
               },
             });
           } else {
@@ -415,7 +425,7 @@
           }
           break;
         case "DT02":
-          if (magnetic >= -0.5 && magnetic <= 0.5) {
+          if (Number(magnetic) >= -0.5 && Number(magnetic) <= 0.5) {
             // this.ScanCodeRecord.push(this.form);
             this.allSubmit();
           } else {
@@ -425,6 +435,7 @@
       }
     },
     allSubmit() {
+      console.log("杩涙潵浜�", this.ScanCodeRecord);
       this.ScanCodeRecord.forEach((item) => {
         item.batchNo = item.outBatchNo;
       });
@@ -482,7 +493,12 @@
         .catch(() => {
           uni.hideLoading();
           this.$refs.saveForm.cancel();
-          this.$u.toast("缃戠粶寮傚父锛岃閲嶈瘯");
+          uni.showModal({
+            title: "鎻愮ず",
+            content: err.message || "缃戠粶寮傚父锛岃閲嶈瘯",
+            showCancel: true,
+            success: function (res) {},
+          });
         });
     },
     // 鎻愪氦鎸夐挳

--
Gitblit v1.9.3