From 5b01f7c23749f410c705ec7b59d8b59e5b06c819 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期四, 06 十一月 2025 10:57:10 +0800
Subject: [PATCH] 叉车重量校验问题,导体和导体2叉车盘重的默认显示

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

diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index ef48e0d..3ca5ea6 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,21 +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) {
+                if (res.confirm) {
                   that.allSubmit();
+                } else if (res.cancel) {
+                  return;
+                }
               },
             });
           } else {
@@ -416,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 {
@@ -484,12 +493,21 @@
         .catch(() => {
           uni.hideLoading();
           this.$refs.saveForm.cancel();
-          this.$u.toast("缃戠粶寮傚父锛岃閲嶈瘯");
+          uni.showModal({
+            title: "鎻愮ず",
+            content: err.message || "缃戠粶寮傚父锛岃閲嶈瘯",
+            showCancel: true,
+            success: function (res) {},
+          });
         });
     },
     // 鎻愪氦鎸夐挳
     submit() {
       if (this.form.productType != "TG01") {
+        this.modalList = {
+          verificationWeight: "",
+          forkliftWeight: this.form.productType == "DT01" ? "" : 0,
+        };
         this.showModal = true;
       } else {
         this.allSubmit();

--
Gitblit v1.9.3