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 | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index ef48e0d..14543ed 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -201,26 +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
type="number"
- class="item-one item-two"
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
type="number"
- class="item-one item-two"
v-model="modalList.forkliftWeight"
+ :custom-style="{
+ fontSize: '16px',
+ height: '40px',
+ lineHeight: '40px'
+ }"
+ :input-style="{
+ fontSize: '16px',
+ height: '40px',
+ lineHeight: '40px'
+ }"
/>
</view>
</view>
@@ -337,6 +355,9 @@
if (that.form.productType == "TG01") {
that.$refs.saveForm.open(ScanCodeRecordList);
} else {
+ if (that.form.workshop == "ZF01") {
+ that.$refs.saveForm.open(ScanCodeRecordList);
+ }
that.queryCustomName(codeInfo, ScanCodeRecordList);
}
}
@@ -358,7 +379,11 @@
"瀹㈡埛涓嶄竴鑷达細" + res.data + " || " + that.form.customerName1,
showCancel: true,
success: function (res) {
- that.ScanCodeRecord.unshift(ScanCodeRecordList);
+ if (res.confirm) {
+ that.ScanCodeRecord.unshift(ScanCodeRecordList);
+ } else if (res.cancel) {
+ return;
+ }
},
});
} else {
@@ -394,21 +419,26 @@
});
}
// 浣跨敤姝ｇ‘鐨勫瓧娈靛悕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) {
+ 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 {
@@ -416,7 +446,7 @@
}
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 {
@@ -464,7 +494,6 @@
this.showModal = false;
},
handleUpdate(Obj) {
- console.log("1111111111111111閾滄潌", Obj);
Obj.batchNo = Obj.outBatchNo;
this.form = {
...this.form,
@@ -484,12 +513,21 @@
.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();
--
Gitblit v1.9.3