From 0fc13e17d0d508fda80860c29cb9540ca7fc104b Mon Sep 17 00:00:00 2001
From: huanghongfeng <huanghongfeng@hnkhzn.com>
Date: 星期二, 25 六月 2024 15:25:29 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/SuZhouGuanHong/TaiYuanTaiZhong

---
 代码管理/太重PDA/pages/feeding/feeding.vue |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\252\351\207\215PDA/pages/feeding/feeding.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\252\351\207\215PDA/pages/feeding/feeding.vue"
index 4b54a7e..d3b4a09 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\252\351\207\215PDA/pages/feeding/feeding.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\345\244\252\351\207\215PDA/pages/feeding/feeding.vue"
@@ -4,7 +4,7 @@
 			class="login__info__item__input tn-flex tn-flex-direction-row tn-flex-nowrap tn-flex-col-center tn-flex-row-left">
 			<view class="login__info__item__input__content">
 				<input maxlength="500" :disabled="isfill" v-model="barcode" placeholder-class="input-placeholder"
-					focus="true" @input="barcodeInput" placeholder="璇锋壂鎻忔潯鐮�"   />
+					focus="focu" @input="barcodeInput" placeholder="璇蜂粠涓嬪線涓婃壂鎻忔潯鐮�"   />
 					
 			</view>
 			<button class="" size="mini" @click="clearSN" > 娓呯┖</button>
@@ -35,6 +35,7 @@
 				show: false,
 				station: '',
 				stationNo: '',
+				focu:true,
 				selectorObj: [{
 						cateName: '1鍙蜂笅鏂欏彛',
 						id: "W01001004"
@@ -55,7 +56,7 @@
 					if (len <= 4) {
 						this.barcode = this.barcode + ',';
 					}
-					else if(len < 5){
+					else if(len < 5){ 
 						this.barcode = this.barcode;
 					}
 					 else {
@@ -72,12 +73,17 @@
 				this.stationNo = x.id
 			},
 			clearSN:function(e){
+				
 				this.barcode="";
 				this.isfill=false;
 			},
 			submit() {
 				if (this.barcode == '') {
-					this.$t.message.toast('鏉$爜涓嶈兘涓虹┖')
+					this.$t.message.toast('鏉$爜涓嶈兘涓虹┖锛�')
+					return;
+				}
+				if(this.station==''){
+					this.$t.message.toast('璇烽�夋嫨涓嬫枡鍙o紒')
 					return;
 				}
 

--
Gitblit v1.9.3