From b404b9c8ad1082d03e947c3cffacc2b3cef3587a Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 20 十月 2025 08:42:18 +0800
Subject: [PATCH] 在磅差内的直接提交不在磅差内的提示磅差，请车间核香 行

---
 pages/wareHouse/nuclearScale/index.vue |   88 +++++++++++++++++++++++++------------------
 1 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index 61643e5..b742e7c 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -258,9 +258,9 @@
       modalList: {},
       showModal: false,
       productTypeMap: {
-        1: "瀵间綋",
-        2: "閾滄潌",
-        3: "瀵间綋2.6",
+        DTO1: "瀵间綋",
+        TG01: "閾滄潌",
+        DT02: "瀵间綋2.6",
       },
       ScanCodeRecord: [],
       background: {
@@ -330,32 +330,40 @@
           waivDevRejNo: codeInfo.WDR ? codeInfo.WDR : "*", // wdr鍙�
           productType: that.form.productType,
         };
-        if (codeInfo.CN != that.form.customerName1) {
-          // 鎵弿鎶ュ伐鍗曚簩缁寸爜
-          uni.showModal({
-            title: "鎻愮ず",
-            content:
-              "瀹㈡埛涓嶄竴鑷达細" + codeInfo.CN + "||" + that.form.customerName1,
-            showCancel: true,
-            success: function (res) {
-              const isDuplicate = that.ScanCodeRecord.some(
-                (item) => item.outBatchNo === codeInfo.BN
-              );
-              if (!isDuplicate) {
-                if (that.form.productType == "TG01") {
-                  that.$refs.saveForm.open(ScanCodeRecordList);
+        if (codeInfo.CN != "") {
+          if (codeInfo.CN != that.form.customerName1) {
+            // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+            uni.showModal({
+              title: "鎻愮ず",
+              content:
+                "瀹㈡埛涓嶄竴鑷达細" + codeInfo.CN + "||" + that.form.customerName1,
+              showCancel: true,
+              success: function (res) {
+                const isDuplicate = that.ScanCodeRecord.some(
+                  (item) => item.outBatchNo === codeInfo.BN
+                );
+                if (!isDuplicate) {
+                  if (that.form.productType == "TG01") {
+                    that.$refs.saveForm.open(ScanCodeRecordList);
+                  } else {
+                    that.ScanCodeRecord.push(ScanCodeRecordList);
+                  }
                 } else {
-                  that.ScanCodeRecord.push(ScanCodeRecordList);
+                  uni.showToast({
+                    icon: "none",
+                    title: "璇峰嬁閲嶅鎵爜锛�",
+                    duration: 2 * 1000,
+                  });
                 }
-              } else {
-                uni.showToast({
-                  icon: "none",
-                  title: "璇峰嬁閲嶅鎵爜锛�",
-                  duration: 2 * 1000,
-                });
-              }
-            },
-          });
+              },
+            });
+          } else {
+            if (that.form.productType == "TG01") {
+              that.$refs.saveForm.open(ScanCodeRecordList);
+            } else {
+              that.ScanCodeRecord.push(ScanCodeRecordList);
+            }
+          }
         } else {
           if (that.form.productType == "TG01") {
             that.$refs.saveForm.open(ScanCodeRecordList);
@@ -406,7 +414,7 @@
           if (magnetic >= 0 && magnetic <= 3) {
             this.allSubmit();
           } else {
-            this.$u.toast("鐢熶骇鏍告煡");
+            this.$u.toast('纾呭樊:' + magnetic + '锛岃杞﹂棿鏍告煡');
           }
           break;
         case "DT02":
@@ -414,7 +422,7 @@
             // this.ScanCodeRecord.push(this.form);
             this.allSubmit();
           } else {
-            this.$u.toast("鐢熶骇鏍告煡");
+            this.$u.toast('纾呭樊:' + magnetic + '锛岃杞﹂棿鏍告煡');
           }
           break;
       }
@@ -435,14 +443,19 @@
         .then((res) => {
           this.$u.toast("鎻愪氦鎴愬姛");
           this.ScanCodeRecord = [];
+          this.modalList = {
+            verificationWeight: "",
+            forkliftWeight: "",
+          };
         })
         .catch((err) => {
           uni.hideLoading();
-          uni.showToast({
-            title: err.message || "缃戠粶寮傚父锛岃閲嶈瘯",
-            icon: "none",
+          uni.showModal({
+            title: "鎻愮ず",
+            content: err.message || "缃戠粶寮傚父锛岃閲嶈瘯",
+            showCancel: true,
+            success: function (res) {},
           });
-          // this.$u.toast(err.message || "缃戠粶寮傚父锛岃閲嶈瘯");
         });
     },
 
@@ -495,7 +508,7 @@
     },
     //鏍哥璁板綍
     openNuclearScaleRecord() {
-      if (this.form.verificationNo == "") {
+      if (!this.form.verificationNo) {
         uni.showToast({
           icon: "none",
           title: "璇峰厛閫夋嫨鏍哥鍗曞彿锛�",
@@ -503,9 +516,10 @@
         });
         return;
       }
-      uni.navigateTo({
-        url: "/pages/wareHouse/nuclearScale/nuclearscalerecord",
-      });
+       uni.navigateTo({
+         url: "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
+						encodeURIComponent(JSON.stringify(this.form.verificationNo)),
+       });
     },
     // 瀛樿鍗曞彿
     setNo(val) {

--
Gitblit v1.9.3