From 6fdf1bc4b692b7466c57bfc08bfc56735e96286b Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 24 十一月 2025 13:43:53 +0800
Subject: [PATCH] 核磅录入增加直发类型得选择和磅差计算
---
pages/wareHouse/nuclearScale/index.vue | 164 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 109 insertions(+), 55 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index 61643e5..14543ed 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -130,7 +130,9 @@
@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">
@@ -199,24 +201,44 @@
<view class="packing-registration-param">
<view class="packing-registration-param-view">
<view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">鏍哥閲嶉噺锛�</text>
+ <view style=" min-width: 80px;">
+ <text style="font-size:16px">鏍哥閲嶉噺锛�</text>
</view>
<view class="packing-registration-param-item-right">
<u-input
- class="item-one item-two"
+ type="number"
v-model="modalList.verificationWeight"
+ :custom-style="{
+ fontSize: '16px',
+ height: '40px',
+ lineHeight: '40px'
+ }"
+ :input-style="{
+ fontSize: '16px',
+ height: '40px',
+ lineHeight: '40px'
+ }"
/>
</view>
</view>
<view class="packing-registration-param-item param-extra">
- <view class="packing-registration-param-item-left">
- <text class="item-one">鍙夎溅鐩橀噸锛�</text>
+ <view style=" min-width: 80px;">
+ <text style="font-size:16px">鍙夎溅鐩橀噸锛�</text>
</view>
<view class="packing-registration-param-item-right">
<u-input
- class="item-one item-two"
+ type="number"
v-model="modalList.forkliftWeight"
+ :custom-style="{
+ fontSize: '16px',
+ height: '40px',
+ lineHeight: '40px'
+ }"
+ :input-style="{
+ fontSize: '16px',
+ height: '40px',
+ lineHeight: '40px'
+ }"
/>
</view>
</view>
@@ -258,9 +280,9 @@
modalList: {},
showModal: false,
productTypeMap: {
- 1: "瀵间綋",
- 2: "閾滄潌",
- 3: "瀵间綋2.6",
+ DTO1: "瀵间綋",
+ TG01: "閾滄潌",
+ DT02: "瀵间綋2.6",
},
ScanCodeRecord: [],
background: {
@@ -330,43 +352,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 (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,
- });
- }
- },
- });
+ if (that.form.productType == "TG01") {
+ that.$refs.saveForm.open(ScanCodeRecordList);
} else {
- if (that.form.productType == "TG01") {
+ if (that.form.workshop == "ZF01") {
that.$refs.saveForm.open(ScanCodeRecordList);
- } else {
- that.ScanCodeRecord.push(ScanCodeRecordList);
}
+ that.queryCustomName(codeInfo, ScanCodeRecordList);
}
}
});
},
methods: {
+ queryCustomName(codeInfo, ScanCodeRecordList) {
+ // 鏌ヨ瀹㈡埛鍚嶇О
+ this.$u.api.NuclearScaleEntry.queryCustomName({
+ BN: codeInfo.BN,
+ }).then((res) => {
+ console.log("瀹㈡埛鍚嶇О锛�", res);
+ if (res.data != this.form.customerName1) {
+ let that = this;
+ // 鎵弿鎶ュ伐鍗曚簩缁寸爜
+ uni.showModal({
+ title: "鎻愮ず",
+ content:
+ "瀹㈡埛涓嶄竴鑷达細" + res.data + " || " + that.form.customerName1,
+ showCancel: true,
+ success: function (res) {
+ if (res.confirm) {
+ that.ScanCodeRecord.unshift(ScanCodeRecordList);
+ } else if (res.cancel) {
+ return;
+ }
+ },
+ });
+ } else {
+ this.ScanCodeRecord.unshift(ScanCodeRecordList);
+ }
+ });
+ },
// 鍙栨秷鎵爜璁板綍
cancelReport(item) {
let that = this;
@@ -395,31 +419,44 @@
});
}
// 浣跨敤姝ｇ‘鐨勫瓧娈靛悕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 >= 0 && 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("鐢熶骇鏍告煡");
+ 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 {
- this.$u.toast("鐢熶骇鏍告煡");
+ this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
}
break;
}
},
allSubmit() {
+ console.log("杩涙潵浜�", this.ScanCodeRecord);
this.ScanCodeRecord.forEach((item) => {
item.batchNo = item.outBatchNo;
});
@@ -435,14 +472,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 +494,6 @@
this.showModal = false;
},
handleUpdate(Obj) {
- console.log("1111111111111111閾滄潌", Obj);
Obj.batchNo = Obj.outBatchNo;
this.form = {
...this.form,
@@ -464,18 +506,28 @@
this.$u.api.NuclearScaleEntry.createDetail(this.form)
.then((res) => {
this.$u.toast("鎻愪氦鎴愬姛");
- this.ScanCodeRecord.push(Obj);
+ this.ScanCodeRecord = [];
+ // this.ScanCodeRecord.unshift(Obj);
this.$refs.saveForm.cancel();
})
.catch(() => {
uni.hideLoading();
this.$refs.saveForm.cancel();
- this.$u.toast("缃戠粶寮傚父锛岃閲嶈瘯");
+ uni.showModal({
+ title: "鎻愮ず",
+ content: err.message || "缃戠粶寮傚父锛岃閲嶈瘯",
+ showCancel: true,
+ success: function (res) {},
+ });
});
},
// 鎻愪氦鎸夐挳
submit() {
if (this.form.productType != "TG01") {
+ this.modalList = {
+ verificationWeight: "",
+ forkliftWeight: this.form.productType == "DT01" ? "" : 0,
+ };
this.showModal = true;
} else {
this.allSubmit();
@@ -495,7 +547,7 @@
},
//鏍哥璁板綍
openNuclearScaleRecord() {
- if (this.form.verificationNo == "") {
+ if (!this.form.verificationNo) {
uni.showToast({
icon: "none",
title: "璇峰厛閫夋嫨鏍哥鍗曞彿锛�",
@@ -504,7 +556,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