From dc06f58d8ed537555fd529551180f43a0586ec3f Mon Sep 17 00:00:00 2001
From: helongyang <647556386@qq.com>
Date: 星期日, 22 六月 2025 11:44:43 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn
---
代码管理/淮安PDA/pages/stash/boxing.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 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 3c901cb..06517fe 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"
@@ -8,11 +8,11 @@
<uni-forms label-width="180">
<uni-forms-item label="鎵樼洏鏉＄爜:">
<uni-easyinput type="text" placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' :focus="!focus"
- v-model="barcode" @input="barcodeInput" />
+ v-model="barcode" @confirm="barcodeInput" />
</uni-forms-item>
<uni-forms-item label="鍐呯鏍囩:">
<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="focus"
- v-model="materSn" @input="snInput" />
+ v-model="materSn" @confirm="snInput" />
</uni-forms-item>
<uni-forms-item :label="Testlabel" v-if="Test">
<uni-easyinput type="text" :placeholder="Testplaceholder" ref='midInput'
@@ -61,7 +61,7 @@
<uni-forms label-width="120">
<uni-forms-item label="鎵樼洏鏉＄爜">
<uni-easyinput type="text" :focus="!addressFocus" v-model="inboundBarcode"
- placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @input="inputChangebarcode" />
+ placeholder="璇锋壂鎻忔墭鐩樻潯鐮�" ref='midInput' @confirm="inputChangebarcode" />
</uni-forms-item>
<uni-forms-item label="鍦板潃鏉＄爜">
<uni-easyinput type="text" v-model="address" :disabled="addressdisabled"
@@ -105,7 +105,7 @@
<uni-forms label-width="180">
<uni-forms-item label="鍐呯鏍囩:">
<uni-easyinput type="text" placeholder="璇锋壂鎻忓唴绠辨爣绛�" ref='midInput' :focus="pkfocus"
- v-model="pkmaterSn" @input="pksnInput" />
+ v-model="pkmaterSn" @confirm="pksnInput" />
</uni-forms-item>
<uni-forms-item>
<button @click="pksubmit" type="primary" size="default" style="margin-top: 2%;">鍏ュ钩搴�</button>
@@ -205,10 +205,10 @@
this.getData();
},
methods: {
- voiceSpeech(src) {
- innerAudioContext.src = src; // '../../static/success.mp3';
- innerAudioContext.play();
- },
+ // voiceSpeech(src) {
+ // innerAudioContext.src = src; // '../../static/success.mp3';
+ // innerAudioContext.play();
+ // },
//wms鍏ュ钩搴�
pksubmit() {
if (this.pkmatInfos.length == 0) {
@@ -254,23 +254,23 @@
title: res.message,
type: "error"
})
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
return;
}
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/success.mp3');
+ // }, 100);
return;
} else {
this.$refs.uToast.show({
title: res.message,
type: "error"
})
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
}
})
}
@@ -424,6 +424,9 @@
}
if (this.materSn != "") {
this.focus = false;
+ if(this.warehouseId==11){
+ this.materSn=this.materSn.replace(/,SC.*/, '');
+ }
if (this.materSn.split(',').length != 6) {
this.materSn = "";
return;
@@ -448,22 +451,22 @@
title: res.message,
type: "error"
})
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
return;
}
- setTimeout(() => {
- this.voiceSpeech('../../static/success.mp3');
- }, 100);
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/success.mp3');
+ // }, 100);
} else {
this.$refs.uToast.show({
title: res.message,
type: "error"
})
- setTimeout(() => {
- this.voiceSpeech('../../static/fail.mp3');
- }, 100);
+ // setTimeout(() => {
+ // this.voiceSpeech('../../static/fail.mp3');
+ // }, 100);
}
})
}
--
Gitblit v1.9.3