From 69c67ff5acedc217a07a18b847ed22284e80a56d Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 03 十一月 2025 17:49:04 +0800
Subject: [PATCH] 核磅录入增加根据接口查询客户名称校验是否一致

---
 pages/wareHouse/nuclearScale/index.vue |   98 +++++++++++++++++++++++++++++-------------------
 1 files changed, 59 insertions(+), 39 deletions(-)

diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index b554bd7..5f7d6be 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">
@@ -170,7 +172,7 @@
                   <view class="_label-name">鐩橀噸锛�</view>
                 </view>
                 <view class="_content">
-                  {{ item.trayWeight }}
+                  {{ item.tareWeight }}
                 </view>
               </view>
               <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"
                 />
@@ -258,9 +262,9 @@
       modalList: {},
       showModal: false,
       productTypeMap: {
-        1: "瀵间綋",
-        2: "閾滄潌",
-        3: "瀵间綋2.6",
+        DTO1: "瀵间綋",
+        TG01: "閾滄潌",
+        DT02: "瀵间綋2.6",
       },
       ScanCodeRecord: [],
       background: {
@@ -302,11 +306,13 @@
       console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
       if (data.code) {
         let codeInfo = JSON.parse(data.code);
-        
+
         // 娣诲姞閲嶅鎵爜妫�鏌�
         const batchNo = codeInfo.BN;
-        const isDuplicate = that.ScanCodeRecord.some(item => item.outBatchNo === batchNo);
-        
+        const isDuplicate = that.ScanCodeRecord.some(
+          (item) => item.outBatchNo === batchNo
+        );
+
         if (isDuplicate) {
           uni.showToast({
             icon: "none",
@@ -315,7 +321,7 @@
           });
           return;
         }
-        
+
         let ScanCodeRecordList = {
           outBatchNo: codeInfo.BN,
           netWeight: codeInfo.NW,
@@ -328,32 +334,37 @@
           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 () {
-              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;
@@ -390,10 +401,10 @@
       this.form.forkliftWeight = this.modalList.forkliftWeight;
       switch (this.form.productType) {
         case "DT01":
-          if (magnetic >= 0 && magnetic <= 3) {
+          if (magnetic >= -3 && magnetic <= 3) {
             this.allSubmit();
           } else {
-            this.$u.toast("鐢熶骇鏍告煡");
+            this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
           }
           break;
         case "DT02":
@@ -401,7 +412,7 @@
             // this.ScanCodeRecord.push(this.form);
             this.allSubmit();
           } else {
-            this.$u.toast("鐢熶骇鏍告煡");
+            this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
           }
           break;
       }
@@ -422,14 +433,20 @@
         .then((res) => {
           this.$u.toast("鎻愪氦鎴愬姛");
           this.ScanCodeRecord = [];
+          // if (this.form.productTypeMap == "DT01") {
+          this.modalList = {
+            verificationWeight: "",
+            // };
+          };
         })
         .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 || "缃戠粶寮傚父锛岃閲嶈瘯");
         });
     },
 
@@ -451,7 +468,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(() => {
@@ -482,7 +500,7 @@
     },
     //鏍哥璁板綍
     openNuclearScaleRecord() {
-      if (this.form.verificationNo == "") {
+      if (!this.form.verificationNo) {
         uni.showToast({
           icon: "none",
           title: "璇峰厛閫夋嫨鏍哥鍗曞彿锛�",
@@ -491,7 +509,9 @@
         return;
       }
       uni.navigateTo({
-        url: "/pages/wareHouse/nuclearScale/nuclearscalerecord",
+        url:
+          "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
+          encodeURIComponent(JSON.stringify(this.form.verificationNo)),
       });
     },
     // 瀛樿鍗曞彿

--
Gitblit v1.9.3