From 7375ea60fa4c8fee428e1eae9c0692f5b09ae281 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期日, 02 十一月 2025 17:24:26 +0800
Subject: [PATCH] 导体计算磅差逻辑变更
---
pages/wareHouse/nuclearScale/index.vue | 101 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 66 insertions(+), 35 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index b554bd7..812af4a 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -130,7 +130,7 @@
@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 +170,7 @@
<view class="_label-name">鐩橀噸锛�</view>
</view>
<view class="_content">
- {{ item.trayWeight }}
+ {{ item.tareWeight }}
</view>
</view>
<view class="row-list">
@@ -204,6 +204,7 @@
</view>
<view class="packing-registration-param-item-right">
<u-input
+ type="number"
class="item-one item-two"
v-model="modalList.verificationWeight"
/>
@@ -215,6 +216,7 @@
</view>
<view class="packing-registration-param-item-right">
<u-input
+ type="number"
class="item-one item-two"
v-model="modalList.forkliftWeight"
/>
@@ -258,9 +260,9 @@
modalList: {},
showModal: false,
productTypeMap: {
- 1: "瀵间綋",
- 2: "閾滄潌",
- 3: "瀵间綋2.6",
+ DTO1: "瀵间綋",
+ TG01: "閾滄潌",
+ DT02: "瀵间綋2.6",
},
ScanCodeRecord: [],
background: {
@@ -302,11 +304,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 +319,7 @@
});
return;
}
-
+
let ScanCodeRecordList = {
outBatchNo: codeInfo.BN,
netWeight: codeInfo.NW,
@@ -328,26 +332,45 @@
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.unshift(ScanCodeRecordList);
+ }
+ } else {
+ uni.showToast({
+ icon: "none",
+ title: "璇峰嬁閲嶅鎵爜锛�",
+ duration: 2 * 1000,
+ });
+ }
+ },
+ });
+ } else {
+ if (that.form.productType == "TG01") {
+ that.$refs.saveForm.open(ScanCodeRecordList);
+ } else {
+ that.ScanCodeRecord.unshift(ScanCodeRecordList);
+ }
+ }
} else {
if (that.form.productType == "TG01") {
that.$refs.saveForm.open(ScanCodeRecordList);
} else {
- that.ScanCodeRecord.push(ScanCodeRecordList);
+ that.ScanCodeRecord.unshift(ScanCodeRecordList);
}
}
}
@@ -390,10 +413,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 +424,7 @@
// this.ScanCodeRecord.push(this.form);
this.allSubmit();
} else {
- this.$u.toast("鐢熶骇鏍告煡");
+ this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
}
break;
}
@@ -422,14 +445,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 +480,7 @@
this.$u.api.NuclearScaleEntry.createDetail(this.form)
.then((res) => {
this.$u.toast("鎻愪氦鎴愬姛");
- this.ScanCodeRecord.push(Obj);
+ this.ScanCodeRecord.unshift(Obj);
this.$refs.saveForm.cancel();
})
.catch(() => {
@@ -482,7 +511,7 @@
},
//鏍哥璁板綍
openNuclearScaleRecord() {
- if (this.form.verificationNo == "") {
+ if (!this.form.verificationNo) {
uni.showToast({
icon: "none",
title: "璇峰厛閫夋嫨鏍哥鍗曞彿锛�",
@@ -491,7 +520,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