From c31428bb0d2b193489f4b90415c7b1f230752d3e Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 20 十月 2025 08:46:59 +0800
Subject: [PATCH] 提交后都清空核磅重量，又车盘重量:铜杆跟导体 2.6 保留上一次的数量导体不保留)
---
pages/wareHouse/nuclearScale/index.vue | 204 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 133 insertions(+), 71 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index cedb44e..01b5619 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">
@@ -186,7 +186,7 @@
</u-cell-group>
</scroll-view>
</view>
- <!-- 瀵间綋 -->
+ <!-- 閾滄潌 -->
<u-modal
v-model="showModal"
title=""
@@ -216,7 +216,7 @@
<view class="packing-registration-param-item-right">
<u-input
class="item-one item-two"
- v-model="modalList.suppliedQuantity"
+ v-model="modalList.forkliftWeight"
/>
</view>
</view>
@@ -224,7 +224,12 @@
</view>
</view>
</u-modal>
- <u-button type="primary" class="bottom-button" @click="submit"
+ <u-button
+ type="primary"
+ class="bottom-button"
+ @click="submit"
+ :disabled="ScanCodeRecord.length == 0"
+ v-show="form.productType != 'TG01'"
>鎻愪氦</u-button
>
<u-modal
@@ -233,11 +238,7 @@
content="鏄惁纭鎻愪氦"
show-cancel-button
></u-modal>
- <saveForm
- ref="saveForm"
- :operationTaskList="this.form"
- @update="handleUpdate"
- />
+ <saveForm ref="saveForm" :operationTaskList="form" @update="handleUpdate" />
<scan></scan>
</div>
</template>
@@ -257,9 +258,9 @@
modalList: {},
showModal: false,
productTypeMap: {
- 1: "瀵间綋",
- 2: "閾滄潌",
- 3: "瀵间綋2.6",
+ DTO1: "瀵间綋",
+ TG01: "閾滄潌",
+ DT02: "瀵间綋2.6",
},
ScanCodeRecord: [],
background: {
@@ -269,19 +270,7 @@
backgroundRepeat: "no-repeat",
},
show: false,
- form: {
- value0: "",
- verificationNo: "",
- productType: "",
- licensePlate: "",
- shippingNoticeNo1: "",
- customerName1: "",
- weighingOperator: "",
- forkliftOperator: "",
- value8: "",
- shippingNoticeNo2: "",
- customerName2: "",
- },
+ form: {},
rules: {
verificationNo: [
{
@@ -313,42 +302,68 @@
console.log("椤甸潰鎵爜缁撴灉锛�", data.code);
if (data.code) {
let codeInfo = JSON.parse(data.code);
- // try {
- // } catch (e) {
- // uni.showToast({
- // icon: "none",
- // title: "鎵爜鏁版嵁瑙ｆ瀽澶辫触锛岃閲嶈瘯锛�",
- // duration: 2 * 1000,
- // });
- // return;
- // }
+
+ // 娣诲姞閲嶅鎵爜妫�鏌�
+ const batchNo = codeInfo.BN;
+ const isDuplicate = that.ScanCodeRecord.some(
+ (item) => item.outBatchNo === batchNo
+ );
+
+ if (isDuplicate) {
+ uni.showToast({
+ icon: "none",
+ title: "璇峰嬁閲嶅鎵爜锛�",
+ duration: 2 * 1000,
+ });
+ return;
+ }
+
let ScanCodeRecordList = {
outBatchNo: codeInfo.BN,
netWeight: codeInfo.NW,
tareWeight: codeInfo.TR, // 鐨噸
partNo: codeInfo.PN,
grossWeight: codeInfo.TW,
- partNo: codeInfo.partNo,
partName: codeInfo.ST,
originalLength: codeInfo.LN, // 闀垮害
palletNo: codeInfo.PNO, // 鐩樺彿
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);
@@ -379,47 +394,70 @@
},
// 瀵间綋鎻愪氦
confirmDt() {
+ // 璁＄畻grossWeight鎬诲拰
+ let grossWeightSum = 0;
+ // 纭繚ScanCodeRecord鏄暟缁�
+ if (Array.isArray(this.ScanCodeRecord)) {
+ this.ScanCodeRecord.forEach((item) => {
+ grossWeightSum += Number(item.grossWeight) || 0;
+ });
+ }
+ // 浣跨敤姝ｇ‘鐨勫瓧娈靛悕suppliedQuantity锛岃�屼笉鏄痸oltage
const magnetic =
- Number(this.form.verificationWeight) -
- Number(this.form.voltage) -
- Number(this.form.reelWeight);
- console.log("淇濆瓨", this.form.verificationNo);
+ Number(this.modalList.verificationWeight) -
+ Number(this.modalList.forkliftWeight) -
+ grossWeightSum;
+ this.form.verificationWeight = this.modalList.verificationWeight;
+ this.form.forkliftWeight = this.modalList.forkliftWeight;
switch (this.form.productType) {
- case "瀵间綋":
- if (magnetic > 0 && magnetic < 3) {
+ case "DT01":
+ if (magnetic >= 0 && magnetic <= 3) {
this.allSubmit();
- // this.ScanCodeRecord.push(this.form);
} else {
- this.$u.toast("鐢熶骇鏍告煡");
+ this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
}
break;
- case "瀵间綋2.6":
- if (magnetic > -0.5 && magnetic < 0.5) {
+ case "DT02":
+ if (magnetic >= -0.5 && magnetic <= 0.5) {
// this.ScanCodeRecord.push(this.form);
this.allSubmit();
} else {
- this.$u.toast("鐢熶骇鏍告煡");
+ this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
}
break;
}
},
allSubmit() {
+ this.ScanCodeRecord.forEach((item) => {
+ item.batchNo = item.outBatchNo;
+ });
this.form = {
...this.form,
weighingVerificationList: this.ScanCodeRecord,
+ verificationWeight: this.modalList.verificationWeight,
+ forkliftWeight: this.modalList.forkliftWeight,
};
+ console.log("11111111111", this.form);
// 澶勭悊鎻愪氦閫昏緫
this.$u.api.NuclearScaleEntry.createDetail(this.form)
.then((res) => {
- if (res.success) {
- this.$u.toast("鎻愪氦鎴愬姛");
- } else {
- this.$u.toast(res.message || "鎻愪氦澶辫触");
+ this.$u.toast("鎻愪氦鎴愬姛");
+ this.ScanCodeRecord = [];
+ if (this.form.productTypeMap == "DT01") {
+ this.modalList = {
+ verificationWeight: "",
+ forkliftWeight: "",
+ };
}
})
- .catch(() => {
+ .catch((err) => {
uni.hideLoading();
- this.$u.toast("缃戠粶寮傚父锛岃閲嶈瘯");
+ uni.showModal({
+ title: "鎻愮ず",
+ content: err.message || "缃戠粶寮傚父锛岃閲嶈瘯",
+ showCancel: true,
+ success: function (res) {},
+ });
});
},
@@ -428,11 +466,31 @@
this.showModal = false;
},
handleUpdate(Obj) {
- this.ScanCodeRecord.push(Obj);
+ console.log("1111111111111111閾滄潌", Obj);
+ Obj.batchNo = Obj.outBatchNo;
+ this.form = {
+ ...this.form,
+ weighingVerificationList: [Obj],
+ verificationWeight: Obj.verificationWeight,
+ forkliftWeight: Obj.forkliftWeight,
+ };
+ console.log("11111111111", this.form);
+ // 澶勭悊鎻愪氦閫昏緫
+ this.$u.api.NuclearScaleEntry.createDetail(this.form)
+ .then((res) => {
+ this.$u.toast("鎻愪氦鎴愬姛");
+ this.ScanCodeRecord.push(Obj);
+ this.$refs.saveForm.cancel();
+ })
+ .catch(() => {
+ uni.hideLoading();
+ this.$refs.saveForm.cancel();
+ this.$u.toast("缃戠粶寮傚父锛岃閲嶈瘯");
+ });
},
// 鎻愪氦鎸夐挳
submit() {
- if (that.form.productType != "TG01") {
+ if (this.form.productType != "TG01") {
this.showModal = true;
} else {
this.allSubmit();
@@ -442,6 +500,7 @@
confirm() {
console.log("淇濆瓨", this.form.verificationNo);
// 璇锋眰鎺ュ彛锛屾牴鎹伐鍗曞彿鏌ヨ鍏朵粬淇℃伅骞惰祴鍊�
+ // this.allSubmit();
},
// 閫夋嫨璁㈠崟鍙�
openList() {
@@ -451,7 +510,7 @@
},
//鏍哥璁板綍
openNuclearScaleRecord() {
- if (this.form.verificationNo == "") {
+ if (!this.form.verificationNo) {
uni.showToast({
icon: "none",
title: "璇峰厛閫夋嫨鏍哥鍗曞彿锛�",
@@ -460,12 +519,15 @@
return;
}
uni.navigateTo({
- url: "/pages/wareHouse/nuclearScale/nuclearscalerecord",
+ url:
+ "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
+ encodeURIComponent(JSON.stringify(this.form.verificationNo)),
});
},
// 瀛樿鍗曞彿
setNo(val) {
this.form = val;
+ this.ScanCodeRecord = [];
},
// 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
// saveForm(val) {
--
Gitblit v1.9.3