From 508403e109aa9f8766b4caa05748afdec7103237 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期六, 11 十月 2025 15:40:55 +0800
Subject: [PATCH] 核磅记录的查询传参以及判断跳转页面的条件
---
pages/wareHouse/nuclearScale/index.vue | 79 +++++++++++++++++++++++++--------------
1 files changed, 51 insertions(+), 28 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index b554bd7..ab3838d 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -170,7 +170,7 @@
<view class="_label-name">鐩橀噸锛�</view>
</view>
<view class="_content">
- {{ item.trayWeight }}
+ {{ item.tareWeight }}
</view>
</view>
<view class="row-list">
@@ -302,11 +302,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 +317,7 @@
});
return;
}
-
+
let ScanCodeRecordList = {
outBatchNo: codeInfo.BN,
netWeight: codeInfo.NW,
@@ -328,21 +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 () {
- if (that.form.productType == "TG01") {
- that.$refs.saveForm.open(ScanCodeRecordList);
- } else {
- that.ScanCodeRecord.push(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 {
+ 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);
@@ -425,11 +446,12 @@
})
.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 || "缃戠粶寮傚父锛岃閲嶈瘯");
});
},
@@ -482,7 +504,7 @@
},
//鏍哥璁板綍
openNuclearScaleRecord() {
- if (this.form.verificationNo == "") {
+ if (!this.form.verificationNo) {
uni.showToast({
icon: "none",
title: "璇峰厛閫夋嫨鏍哥鍗曞彿锛�",
@@ -490,9 +512,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