From 0c9f714c32e4bc9e8eaf972d860d2d9f2a1e6763 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 04 十一月 2025 10:24:05 +0800
Subject: [PATCH] 核磅录入磅差调整过大后增加弹框二次确认

---
 pages/wareHouse/nuclearScale/index.vue |  100 +++++++++++++++++++++++++-------------------------
 1 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index 60cdbf1..b3e7fba 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -130,7 +130,9 @@
             @click="cancelReport(item)"
           >
             <view class="content-header">
-              <view class="content-header-title">{{ index + 1 }}</view>
+              <view class="content-header-title">{{
+                ScanCodeRecord.length - index
+              }}</view>
             </view>
             <view class="content-body">
               <view class="row-list">
@@ -204,6 +206,7 @@
               </view>
               <view class="packing-registration-param-item-right">
                 <u-input
+                  type="number"
                   class="item-one item-two"
                   v-model="modalList.verificationWeight"
                 />
@@ -215,6 +218,7 @@
               </view>
               <view class="packing-registration-param-item-right">
                 <u-input
+                  type="number"
                   class="item-one item-two"
                   v-model="modalList.forkliftWeight"
                 />
@@ -330,51 +334,38 @@
           waivDevRejNo: codeInfo.WDR ? codeInfo.WDR : "*", // wdr鍙�
           productType: that.form.productType,
         };
-        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 {
-                  uni.showToast({
-                    icon: "none",
-                    title: "璇峰嬁閲嶅鎵爜锛�",
-                    duration: 2 * 1000,
-                  });
-                }
-              },
-            });
-          } else {
-            if (that.form.productType == "TG01") {
-              that.$refs.saveForm.open(ScanCodeRecordList);
-            } else {
-              that.ScanCodeRecord.push(ScanCodeRecordList);
-            }
-          }
+        if (that.form.productType == "TG01") {
+          that.$refs.saveForm.open(ScanCodeRecordList);
         } else {
-          if (that.form.productType == "TG01") {
-            that.$refs.saveForm.open(ScanCodeRecordList);
-          } else {
-            that.ScanCodeRecord.push(ScanCodeRecordList);
-          }
+          that.queryCustomName(codeInfo, ScanCodeRecordList);
         }
       }
     });
   },
   methods: {
+    queryCustomName(codeInfo, ScanCodeRecordList) {
+      // 鏌ヨ瀹㈡埛鍚嶇О
+      this.$u.api.NuclearScaleEntry.queryCustomName({
+        BN: codeInfo.BN,
+      }).then((res) => {
+        console.log("瀹㈡埛鍚嶇О锛�", res);
+        if (res.data != this.form.customerName1) {
+          let that = this;
+          // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+          uni.showModal({
+            title: "鎻愮ず",
+            content:
+              "瀹㈡埛涓嶄竴鑷达細" + res.data + " || " + that.form.customerName1,
+            showCancel: true,
+            success: function (res) {
+              that.ScanCodeRecord.unshift(ScanCodeRecordList);
+            },
+          });
+        } else {
+          this.ScanCodeRecord.unshift(ScanCodeRecordList);
+        }
+      });
+    },
     // 鍙栨秷鎵爜璁板綍
     cancelReport(item) {
       let that = this;
@@ -411,10 +402,16 @@
       this.form.forkliftWeight = this.modalList.forkliftWeight;
       switch (this.form.productType) {
         case "DT01":
-          if (magnetic >= 0 && magnetic <= 3) {
-            this.allSubmit();
+          if (magnetic >= -3 && magnetic <= 3) {
+            uni.showModal({
+              title: "鎻愮ず",
+              content: "纾呭樊:" + magnetic + "锛屾槸鍚︾‘璁ゆ彁浜わ紵",
+              success: function (res) {
+                  this.allSubmit();
+              },
+            });
           } else {
-            this.$u.toast("鐢熶骇鏍告煡");
+            this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
           }
           break;
         case "DT02":
@@ -422,7 +419,7 @@
             // this.ScanCodeRecord.push(this.form);
             this.allSubmit();
           } else {
-            this.$u.toast("鐢熶骇鏍告煡");
+            this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
           }
           break;
       }
@@ -443,9 +440,10 @@
         .then((res) => {
           this.$u.toast("鎻愪氦鎴愬姛");
           this.ScanCodeRecord = [];
+          // if (this.form.productTypeMap == "DT01") {
           this.modalList = {
             verificationWeight: "",
-            forkliftWeight: "",
+            // };
           };
         })
         .catch((err) => {
@@ -477,7 +475,8 @@
       this.$u.api.NuclearScaleEntry.createDetail(this.form)
         .then((res) => {
           this.$u.toast("鎻愪氦鎴愬姛");
-          this.ScanCodeRecord.push(Obj);
+          this.ScanCodeRecord = [];
+          // this.ScanCodeRecord.unshift(Obj);
           this.$refs.saveForm.cancel();
         })
         .catch(() => {
@@ -516,10 +515,11 @@
         });
         return;
       }
-       uni.navigateTo({
-         url: "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
-						encodeURIComponent(JSON.stringify(this.form.verificationNo)),
-       });
+      uni.navigateTo({
+        url:
+          "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
+          encodeURIComponent(JSON.stringify(this.form.verificationNo)),
+      });
     },
     // 瀛樿鍗曞彿
     setNo(val) {

--
Gitblit v1.9.3