From 78ac5f8d886678bbc8ab2063e9d57bf88147e361 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 19 九月 2025 08:40:57 +0800
Subject: [PATCH] 核磅录入对接完成
---
pages/wareHouse/nuclearScale/saveForm.vue | 117 +++++++++++++++--------------
pages/wareHouse/nuclearScale/index.vue | 96 ++++++++++++++---------
2 files changed, 119 insertions(+), 94 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index cedb44e..4f8a5c4 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -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,11 @@
</view>
</view>
</u-modal>
- <u-button type="primary" class="bottom-button" @click="submit"
+ <u-button
+ type="primary"
+ class="bottom-button"
+ @click="submit"
+ v-show="form.productType != 'TG01'"
>鎻愪氦</u-button
>
<u-modal
@@ -233,11 +237,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>
@@ -269,19 +269,7 @@
backgroundRepeat: "no-repeat",
},
show: false,
- form: {
- value0: "",
- verificationNo: "",
- productType: "",
- licensePlate: "",
- shippingNoticeNo1: "",
- customerName1: "",
- weighingOperator: "",
- forkliftOperator: "",
- value8: "",
- shippingNoticeNo2: "",
- customerName2: "",
- },
+ form: {},
rules: {
verificationNo: [
{
@@ -328,11 +316,11 @@
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) {
// 鎵弿鎶ュ伐鍗曚簩缁寸爜
@@ -379,22 +367,32 @@
},
// 瀵间綋鎻愪氦
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("鐢熶骇鏍告煡");
}
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 {
@@ -404,18 +402,20 @@
}
},
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("鎻愪氦鎴愬姛");
})
.catch(() => {
uni.hideLoading();
@@ -428,11 +428,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 +462,7 @@
confirm() {
console.log("淇濆瓨", this.form.verificationNo);
// 璇锋眰鎺ュ彛锛屾牴鎹伐鍗曞彿鏌ヨ鍏朵粬淇℃伅骞惰祴鍊�
+ // this.allSubmit();
},
// 閫夋嫨璁㈠崟鍙�
openList() {
@@ -466,6 +487,7 @@
// 瀛樿鍗曞彿
setNo(val) {
this.form = val;
+ this.ScanCodeRecord = [];
},
// 鍥炴樉鎵爜鐨勪俊鎭�-鎶ュ伐鍗�
// saveForm(val) {
diff --git a/pages/wareHouse/nuclearScale/saveForm.vue b/pages/wareHouse/nuclearScale/saveForm.vue
index 2984361..b0c7883 100644
--- a/pages/wareHouse/nuclearScale/saveForm.vue
+++ b/pages/wareHouse/nuclearScale/saveForm.vue
@@ -18,7 +18,7 @@
<view class="packing-registration-param-item-right">
<u-input
class="item-one item-two"
- v-model="form.overallLength"
+ v-model="form.outBatchNo"
disabled
/>
</view>
@@ -30,7 +30,7 @@
<view class="packing-registration-param-item-right">
<u-input
class="item-one item-two"
- v-model="form.proposedLocation"
+ v-model="form.partName"
disabled
/>
</view>
@@ -42,7 +42,7 @@
<view class="packing-registration-param-item-right">
<u-input
class="item-one item-two"
- v-model="form.reelNumber"
+ v-model="form.partNo"
disabled
/>
</view>
@@ -54,7 +54,7 @@
<view class="packing-registration-param-item-right">
<u-input
class="item-one item-two"
- v-model="form.reelWeight"
+ v-model="form.grossWeight"
disabled
/>
</view>
@@ -66,7 +66,7 @@
<view class="packing-registration-param-item-right">
<u-input
class="item-one item-two"
- v-model="form.grossWeight"
+ v-model="form.tareWeight"
disabled
/>
</view>
@@ -96,7 +96,7 @@
<text class="item-one">鍙夎溅閲嶉噺</text>
</view>
<view class="packing-registration-param-item-right">
- <u-input class="item-one item-two" v-model="form.outerDiameter" />
+ <u-input class="item-one item-two" v-model="form.forkliftWeight" />
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -104,7 +104,7 @@
<text class="item-one">闀垮害</text>
</view>
<view class="packing-registration-param-item-right">
- <u-input class="item-one item-two" v-model="form.voltage" />
+ <u-input class="item-one item-two" v-model="form.originalLength" disabled />
</view>
</view>
<view class="packing-registration-param-item param-extra">
@@ -112,7 +112,7 @@
<text class="item-one">鐩樺彿</text>
</view>
<view class="packing-registration-param-item-right">
- <u-input class="item-one item-two" v-model="form.speed" />
+ <u-input class="item-one item-two" v-model="form.palletNo" disabled />
</view>
</view>
</view>
@@ -143,7 +143,7 @@
this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
return;
}
- if (!this.form.voltage) {
+ if (!this.form.forkliftWeight) {
this.$u.toast("璇疯緭鍏ュ弶杞﹂噸閲�");
this.$refs.uModal.clearLoading(); // 娓呴櫎鍔犺浇鐘舵��
return;
@@ -170,96 +170,99 @@
//纾呭樊璁＄畻锛氭牳姒�-鍙夎溅鐩�-姣涢噸
Number(this.form.h);
const magnetic =
- Number(this.form.verificationWeight) - Number(this.form.voltage) - Number(this.form.reelWeight);
+ Number(this.form.verificationWeight) - Number(this.form.forkliftWeight) - Number(this.form.grossWeight);
+ let productType = this.operationTaskList.productType;
+ let formList = this.form;
+ let self = this; // 淇濆瓨缁勪欢瀹炰緥寮曠敤
uni.showModal({
title: "鎻愮ず",
content: "纾呭樊涓猴細" + magnetic,
showCancel: false,
success: function () {
- switch (this.operationTaskList.productType) {
- case "閾滄潌":
- if (magnetic > 0 && magnetic < 3) {
- this.verifySubmission(this.form);
+ switch (productType) {
+ case "TG01":
+ if (magnetic >= 0 && magnetic <= 3) {
+ self.verifySubmission(formList);
}
if (magnetic == 4) {
- this.form.grossWeight = Number(this.form.grossWeight) + 2;
- this.form.netWeight = Number(this.form.netWeight) + 2;
- this.$u.toast(
+ formList.grossWeight = Number(formList.grossWeight) + 2;
+ formList.netWeight = Number(formList.netWeight) + 2;
+ self.$u.toast(
"鏇存敼鍚堟牸璇佹瘺閲嶄负锛�" +
- this.form.grossWeight +
+ formList.grossWeight +
"鍑�閲嶄负锛�" +
- this.form.netWeight
+ formList.netWeight
);
- this.verifySubmission(this.form);
+ self.verifySubmission(formList);
}
if (magnetic == 5) {
- this.form.grossWeight = Number(this.form.grossWeight) + 3;
- this.form.netWeight = Number(this.form.netWeight) + 3;
- this.$u.toast(
+ formList.grossWeight = Number(formList.grossWeight) + 3;
+ formList.netWeight = Number(formList.netWeight) + 3;
+ self.$u.toast(
"鏇存敼鍚堟牸璇佹瘺閲嶄负锛�" +
- this.form.grossWeight +
+ formList.grossWeight +
"鍑�閲嶄负锛�" +
- this.form.netWeight
+ formList.netWeight
);
- this.verifySubmission(this.form);
+ self.verifySubmission(formList);
}
if (magnetic == 6) {
- this.form.grossWeight = Number(this.form.grossWeight) + 4;
- this.form.netWeight = Number(this.form.netWeight) + 4;
- this.$u.toast(
+ formList.grossWeight = Number(formList.grossWeight) + 4;
+ formList.netWeight = Number(formList.netWeight) + 4;
+ self.$u.toast(
"鏇存敼鍚堟牸璇佹瘺閲嶄负锛�" +
- this.form.grossWeight +
+ formList.grossWeight +
"鍑�閲嶄负锛�" +
- this.form.netWeight
+ formList.netWeight
);
- this.verifySubmission(this.form);
+ self.verifySubmission(formList);
}
if (magnetic == 7) {
- this.form.grossWeight = Number(this.form.grossWeight) + 5;
- this.form.netWeight = Number(this.form.netWeight) + 5;
- this.$u.toast(
+ formList.grossWeight = Number(formList.grossWeight) + 5;
+ formList.netWeight = Number(formList.netWeight) + 5;
+ self.$u.toast(
"鏇存敼鍚堟牸璇佹瘺閲嶄负锛�" +
- this.form.grossWeight +
+ formList.grossWeight +
"鍑�閲嶄负锛�" +
- this.form.netWeight
+ formList.netWeight
);
- this.verifySubmission(this.form);
+ self.verifySubmission(formList);
}
if (magnetic == 8) {
- this.form.grossWeight = Number(this.form.grossWeight) + 6;
- this.form.netWeight = Number(this.form.netWeight) + 6;
- this.$u.toast(
+ formList.grossWeight = Number(formList.grossWeight) + 6;
+ formList.netWeight = Number(formList.netWeight) + 6;
+ self.$u.toast(
"鏇存敼鍚堟牸璇佹瘺閲嶄负锛�" +
- this.form.grossWeight +
+ formList.grossWeight +
"鍑�閲嶄负锛�" +
- this.form.netWeight
+ formList.netWeight
);
- this.verifySubmission(this.form);
+ self.verifySubmission(formList);
}
if (magnetic == 9) {
- this.form.grossWeight = Number(this.form.grossWeight) + 7;
- this.form.netWeight = Number(this.form.netWeight) + 7;
- this.$u.toast(
+ formList.grossWeight = Number(formList.grossWeight) + 7;
+ formList.netWeight = Number(formList.netWeight) + 7;
+ self.$u.toast(
"鏇存敼鍚堟牸璇佹瘺閲嶄负锛�" +
- this.form.grossWeight +
+ formList.grossWeight +
"鍑�閲嶄负锛�" +
- this.form.netWeight
+ formList.netWeight
);
- this.verifySubmission(this.form);
+ self.verifySubmission(formList);
}
if (magnetic == 10) {
- this.form.grossWeight = Number(this.form.grossWeight) + 8;
- this.form.netWeight = Number(this.form.netWeight) + 8;
- this.$u.toast(
+ formList.grossWeight = Number(formList.grossWeight) + 8;
+ formList.netWeight = Number(formList.netWeight) + 8;
+ self.$u.toast(
"鏇存敼鍚堟牸璇佹瘺閲嶄负锛�" +
- this.form.grossWeight +
+ formList.grossWeight +
"鍑�閲嶄负锛�" +
- this.form.netWeight
+ formList.netWeight
);
- this.verifySubmission(this.form);
+ self.verifySubmission(formList);
}
if (magnetic > 10) {
- this.$u.toast("鐢熶骇鏍告煡");
+ self.$u.toast("鐢熶骇鏍告煡");
}
break;
// case "瀵间綋":
--
Gitblit v1.9.3