From 5f2221fbba40d0218e33f73489b3cdf61fa567de Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期二, 04 十一月 2025 16:41:03 +0800
Subject: [PATCH] 核磅录入弹框确认，磅差数字类型计算
---
pages/wareHouse/nuclearScale/index.vue | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index 5f7d6be..d004ed1 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -337,13 +337,13 @@
if (that.form.productType == "TG01") {
that.$refs.saveForm.open(ScanCodeRecordList);
} else {
- that.queryCustomName(codeInfo,ScanCodeRecordList);
+ that.queryCustomName(codeInfo, ScanCodeRecordList);
}
}
});
},
methods: {
- queryCustomName(codeInfo,ScanCodeRecordList) {
+ queryCustomName(codeInfo, ScanCodeRecordList) {
// 鏌ヨ瀹㈡埛鍚嶇О
this.$u.api.NuclearScaleEntry.queryCustomName({
BN: codeInfo.BN,
@@ -354,10 +354,15 @@
// 鎵弿鎶ュ伐鍗曚簩缁寸爜
uni.showModal({
title: "鎻愮ず",
- content: "瀹㈡埛涓嶄竴鑷达細" + res.data + " || " + that.form.customerName1,
+ content:
+ "瀹㈡埛涓嶄竴鑷达細" + res.data + " || " + that.form.customerName1,
showCancel: true,
success: function (res) {
+ if (res.confirm) {
that.ScanCodeRecord.unshift(ScanCodeRecordList);
+ } else if (res.cancel) {
+ return;
+ }
},
});
} else {
@@ -393,22 +398,34 @@
});
}
// 浣跨敤姝ｇ‘鐨勫瓧娈靛悕suppliedQuantity锛岃�屼笉鏄痸oltage
- const magnetic =
+ const magnetic = (
Number(this.modalList.verificationWeight) -
Number(this.modalList.forkliftWeight) -
- grossWeightSum;
+ grossWeightSum
+ ).toFixed(1);
this.form.verificationWeight = this.modalList.verificationWeight;
this.form.forkliftWeight = this.modalList.forkliftWeight;
switch (this.form.productType) {
case "DT01":
- if (magnetic >= -3 && magnetic <= 3) {
- this.allSubmit();
+ if (Number(magnetic) >= -3 && Number(magnetic) <= 3) {
+ let that = this;
+ uni.showModal({
+ title: "鎻愮ず",
+ content: "纾呭樊:" + magnetic + "锛屾槸鍚︾‘璁ゆ彁浜わ紵",
+ success: function (res) {
+ if (res.confirm) {
+ that.allSubmit();
+ } else if (res.cancel) {
+ return;
+ }
+ },
+ });
} else {
this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
}
break;
case "DT02":
- if (magnetic >= -0.5 && magnetic <= 0.5) {
+ if (Number(magnetic) >= -0.5 && Number(magnetic) <= 0.5) {
// this.ScanCodeRecord.push(this.form);
this.allSubmit();
} else {
@@ -418,6 +435,7 @@
}
},
allSubmit() {
+ console.log("杩涙潵浜�", this.ScanCodeRecord);
this.ScanCodeRecord.forEach((item) => {
item.batchNo = item.outBatchNo;
});
@@ -475,7 +493,12 @@
.catch(() => {
uni.hideLoading();
this.$refs.saveForm.cancel();
- this.$u.toast("缃戠粶寮傚父锛岃閲嶈瘯");
+ uni.showModal({
+ title: "鎻愮ず",
+ content: err.message || "缃戠粶寮傚父锛岃閲嶈瘯",
+ showCancel: true,
+ success: function (res) {},
+ });
});
},
// 鎻愪氦鎸夐挳
--
Gitblit v1.9.3