From ce08db7fdb31a61c6ee672d89d6c4b4b66c1f6d6 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期四, 16 一月 2025 14:41:51 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/淮安PDA/pages/stash/boxing.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
index ad6852b..4a56381 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/boxing.vue"
@@ -64,7 +64,7 @@
placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
</uni-forms-item>
<uni-forms-item label="鍦板潃鏉＄爜">
- <uni-easyinput type="text" v-model="address" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
+ <uni-easyinput type="text" v-model="address" :disabled="addressdisabled" placeholder="璇锋壂鎻忓湴鍧�鏉＄爜" ref='midInput'
:focus="addressFocus" />
</uni-forms-item>
<uni-forms-item>
@@ -209,7 +209,8 @@
Testplaceholder: "",
Testcheck: false,
Summmary:0,
- stockInfoDetail:[]
+ stockInfoDetail:[],
+ addressdisabled: false
}
},
onShow() {},
@@ -229,6 +230,9 @@
this.Initiallife = 16;
} else if (this.warehouseId == 5) { //杈呮枡浠撳簱鍖篒D
this.address = "8005";
+ }else if (this.warehouseId == 3) { //杈呮枡浠撳簱鍖篒D
+ this.address = "1011";
+ this.addressdisabled = true;
}
this.label = "鍗曟嵁缂栧彿锛�" + this.orderNo;
this.getData();
@@ -379,28 +383,32 @@
},
snInput() {
this.$nextTick(() => {
- if (this.warehouseId == 6 || this.warehouseId == 2) {
+ if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId == 3) {
if (this.sns.length > 0) {
this.sns = [];
}
}
if (this.materSn != "") {
this.focus = false;
- var matSn = this.materSn;
- setTimeout(() => {
+ if(this.materSn.split(',').length != 6){
this.materSn = "";
- }, 10);
+ return;
+ }
+ var matSn = this.materSn;
+ //setTimeout(() => {
+ this.materSn = "";
+ //}, 10);
this.$u.post('/api/MaterielInfo/CodeAnalysis?serNum=' + matSn, {}).then((res) => {
this.Testcheck = false;
if (res.status) {
this.sns.push(res.data.serialNumber);
- if (this.warehouseId == 6 || this.warehouseId == 2) {
+ if (this.warehouseId == 6 || this.warehouseId == 2 || this.warehouseId == 3) {
if (this.matInfos.length > 0) {
this.matInfos = [];
}
}
this.matInfos.push(res.data);
- if (res.message) {
+ if (!res.status) {
this.$refs.uToast.show({
title: res.message,
type: "error"
--
Gitblit v1.9.3