From 7375ea60fa4c8fee428e1eae9c0692f5b09ae281 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期日, 02 十一月 2025 17:24:26 +0800
Subject: [PATCH] 导体计算磅差逻辑变更
---
pages/wareHouse/nuclearScale/index.vue | 38 +++++++++++++++++++++++---------------
1 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/pages/wareHouse/nuclearScale/index.vue b/pages/wareHouse/nuclearScale/index.vue
index ab3838d..812af4a 100644
--- a/pages/wareHouse/nuclearScale/index.vue
+++ b/pages/wareHouse/nuclearScale/index.vue
@@ -130,7 +130,7 @@
@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">
@@ -204,6 +204,7 @@
</view>
<view class="packing-registration-param-item-right">
<u-input
+ type="number"
class="item-one item-two"
v-model="modalList.verificationWeight"
/>
@@ -215,6 +216,7 @@
</view>
<view class="packing-registration-param-item-right">
<u-input
+ type="number"
class="item-one item-two"
v-model="modalList.forkliftWeight"
/>
@@ -258,9 +260,9 @@
modalList: {},
showModal: false,
productTypeMap: {
- 1: "瀵间綋",
- 2: "閾滄潌",
- 3: "瀵间綋2.6",
+ DTO1: "瀵间綋",
+ TG01: "閾滄潌",
+ DT02: "瀵间綋2.6",
},
ScanCodeRecord: [],
background: {
@@ -346,7 +348,7 @@
if (that.form.productType == "TG01") {
that.$refs.saveForm.open(ScanCodeRecordList);
} else {
- that.ScanCodeRecord.push(ScanCodeRecordList);
+ that.ScanCodeRecord.unshift(ScanCodeRecordList);
}
} else {
uni.showToast({
@@ -361,14 +363,14 @@
if (that.form.productType == "TG01") {
that.$refs.saveForm.open(ScanCodeRecordList);
} else {
- that.ScanCodeRecord.push(ScanCodeRecordList);
+ that.ScanCodeRecord.unshift(ScanCodeRecordList);
}
}
} else {
if (that.form.productType == "TG01") {
that.$refs.saveForm.open(ScanCodeRecordList);
} else {
- that.ScanCodeRecord.push(ScanCodeRecordList);
+ that.ScanCodeRecord.unshift(ScanCodeRecordList);
}
}
}
@@ -411,10 +413,10 @@
this.form.forkliftWeight = this.modalList.forkliftWeight;
switch (this.form.productType) {
case "DT01":
- if (magnetic >= 0 && magnetic <= 3) {
+ if (magnetic >= -3 && magnetic <= 3) {
this.allSubmit();
} else {
- this.$u.toast("鐢熶骇鏍告煡");
+ this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
}
break;
case "DT02":
@@ -422,7 +424,7 @@
// this.ScanCodeRecord.push(this.form);
this.allSubmit();
} else {
- this.$u.toast("鐢熶骇鏍告煡");
+ this.$u.toast("纾呭樊:" + magnetic + "锛岃杞﹂棿鏍告煡");
}
break;
}
@@ -443,6 +445,11 @@
.then((res) => {
this.$u.toast("鎻愪氦鎴愬姛");
this.ScanCodeRecord = [];
+ // if (this.form.productTypeMap == "DT01") {
+ this.modalList = {
+ verificationWeight: "",
+ // };
+ }
})
.catch((err) => {
uni.hideLoading();
@@ -473,7 +480,7 @@
this.$u.api.NuclearScaleEntry.createDetail(this.form)
.then((res) => {
this.$u.toast("鎻愪氦鎴愬姛");
- this.ScanCodeRecord.push(Obj);
+ this.ScanCodeRecord.unshift(Obj);
this.$refs.saveForm.cancel();
})
.catch(() => {
@@ -512,10 +519,11 @@
});
return;
}
- uni.navigateTo({
- url: "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
- encodeURIComponent(JSON.stringify(this.form.verificationNo)),
- });
+ uni.navigateTo({
+ url:
+ "/pages/wareHouse/nuclearScale/nuclearscalerecord?verificationNo=" +
+ encodeURIComponent(JSON.stringify(this.form.verificationNo)),
+ });
},
// 瀛樿鍗曞彿
setNo(val) {
--
Gitblit v1.9.3