From edb0981afe11a939f9769ac44228dc79c504441f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期五, 01 八月 2025 17:02:39 +0800
Subject: [PATCH] 所有页面添加自动聚焦 修改打印格式

---
 pages/shengchanrukushengdan/form.vue     |   25 ++
 pages/xiaoshouchuku/form.vue             |   30 ++
 pages/qitaruku_v2/form.vue               |   63 +++-
 pages/shengchanlingliao/form.vue         |   13 +
 pages/xiaoshoutuihuo/form.vue            |   34 ++
 pages/shengchanruku/form.vue             |   15 +
 pages/qitachuku_v2/form.vue              |   30 ++
 pages/qitachukujiaoyan/detail.vue        |   46 +++
 pages/xiaoshouchukujiaoyan/form.vue      |   35 ++
 pages/weiwailingliaojiaoyan/form.vue     |   49 +++
 manifest.json                            |    4 
 pages/shengchanbuliaojiaoyan/form.vue    |   44 ++-
 pages/weiwailingliao/form.vue            |   25 ++
 pages/shengchandiaobo/form.vue           |   15 +
 utils/mpaasScan.js                       |   19 +
 pages/tiaomadaying/tiaomadaying.vue      |  192 +++------------
 pages/shengchanbuliao/form.vue           |   25 ++
 pages/shengchanlingliaoshengdan/form.vue |   23 -
 18 files changed, 450 insertions(+), 237 deletions(-)

diff --git a/manifest.json b/manifest.json
index e708629..2adc3b9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "鏅轰簯LMES",
     "appid" : "__UNI__B002F49",
     "description" : "",
-    "versionName" : "1.0.33",
-    "versionCode" : 133,
+    "versionName" : "1.0.34",
+    "versionCode" : 134,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/qitachuku_v2/form.vue b/pages/qitachuku_v2/form.vue
index 2abf239..d902196 100644
--- a/pages/qitachuku_v2/form.vue
+++ b/pages/qitachuku_v2/form.vue
@@ -64,7 +64,7 @@
 					<view class="right" v-show="showHSourceBillNo">
 						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
 							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
-						<input auto-focus @confirm="onHSourceBillNoConfirmHandler" type="text" name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+						<input :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" type="text" name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
 					</view>
 					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -311,6 +311,7 @@
 				reHSourceBillNo: true,
 				showHSupName: true,
 				BarCodeFocus: false,
+				HSourceBillNoFocus: false,
 
 				tabs: 0,
 				HMainSourceBillType: '鎵嬪伐褰曞叆',
@@ -396,10 +397,11 @@
 			if (e.HInterID) {
 				this.HInterID_Temp = e.HInterID
 				// this.btnType = 1
-				this.BarCodeFocus = true
 				this.RoadBillMain(e.HInterID)
+				this.refreshBarCodeState()
 			} else {
 				this.getNewData()
+				this.refreshHSourceBillState()
 			}
 			this.getHBaseList()
 			this.getHSupList()
@@ -417,6 +419,24 @@
 			uni.$off('BillSelectComplete')
 		},
 		methods: {
+			async refreshHSourceBillState() {
+				this.HSourceBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourceBillNoFocus = true
+				})
+				console.log('this.hform.HMainSourceBillType: ',this.hform.HMainSourceBillType);
+				if (this.hform.HMainSourceBillType == -1) {
+					await this.refreshBarCodeState()
+				}
+			},
+			async refreshBarCodeState() {
+				this.BarCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.BarCodeFocus = true
+				})
+			},
 			onHSourceBillNoConfirmHandler() {
 				if(this.hform.HMainSourceBillType == -1) {
 					this.playSound(1)
@@ -899,6 +919,7 @@
 							this.DisBillEntryList()
 						} else {
 							this.playSound(0)
+							this.refreshHSourceBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -907,6 +928,7 @@
 					},
 					fail: (res) => {
 						this.playSound(0)
+						this.refreshHSourceBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -959,6 +981,7 @@
 									this.DisBillEntryList()
 								} else {
 									this.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -967,6 +990,7 @@
 							},
 							fail: (res) => {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -1065,6 +1089,7 @@
 								this.hform.HQty = ''
 							} else {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -1073,6 +1098,7 @@
 						},
 						fail: (res) => {
 							this.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/qitachukujiaoyan/detail.vue b/pages/qitachukujiaoyan/detail.vue
index a337a83..a9d4663 100644
--- a/pages/qitachukujiaoyan/detail.vue
+++ b/pages/qitachukujiaoyan/detail.vue
@@ -46,7 +46,7 @@
 				<view class="form-item" v-show="showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="right" style="width: 380rpx;">
-						<input name="HBillNo" auto-focus v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+						<input name="HBillNo" :focus="HBillNoFocus" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
 							@confirm="GetMeesageByBillNo(hform.HBarCode)" />
 					</view>
 					<uni-icons type="scan"
@@ -193,6 +193,7 @@
 				ModRightName: 'CE_OtherOutCheck',
 				OperationType: 1,
 
+				HBillNoFocus: false,
 				barCodeFocus: false,
 				showHStockPlaceName: false,
 				showHBillNo: true,
@@ -244,22 +245,38 @@
 			this.OperationType = e.OperationType
 			if (e.HBillNo) {
 				this.hform.HBillNo = e.HBillNo
-				this.barCodeFocus = true
 				this.GetMeesageByBillNo(e.HBillNo)
+				this.refreshBarCodeState()
 			} else {
 				// this.getNewData()
+				this.refreshHBillState()
 			}
 			this.getHBaseList()
 		},
 		methods: {
+			async refreshHBillState(){
+				this.HBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBillNo = ""
+					this.HBillNoFocus = true
+					
+				})
+			},
+			async refreshBarCodeState(){
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.barCodeFocus = true
+				})
+			},
 			//鎵爜
 			toScanCode() {
 				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
 				mpaasScanModule.mpaasScan({
 					'hideAlbum': true,
-					'timeoutInterval':'10', //瓒呮椂鏃堕棿
-					'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				},(ret) => {
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
 					console.log(ret.resp_result)
 					// if(this.hform.HBarCode == '*'){
 					// 	this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
@@ -275,16 +292,16 @@
 				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
 				mpaasScanModule.mpaasScan({
 					'hideAlbum': true,
-					'timeoutInterval':'10', //瓒呮椂鏃堕棿
-					'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				},(ret) => {
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
 					console.log(ret.resp_result)
 					// if(this.hform.HBarCode == '*'){
 					// 	this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
 					// }else{
 					// 	this.hform.HBarCode = ret.resp_result
 					// }
-					
+
 					this.hform.HBillNo = ret.resp_result
 					this.GetMeesageByBillNo(this.hform.HBillNo)
 				})
@@ -318,6 +335,7 @@
 							this.DisBillEntryList();
 						} else {
 							CommonUtils.playSound(0);
+							this.refreshHBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -327,6 +345,7 @@
 					},
 					fail: (res) => {
 						CommonUtils.playSound(0);
+						this.refreshHBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -461,7 +480,10 @@
 								if (res.data.count == 1) {
 									this.hform.HQty = ''
 									this.DisBillEntryList()
+									CommonUtils.playSound(1)
 								} else {
+									CommonUtils.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -470,6 +492,7 @@
 							},
 							fail: (res) => {
 								CommonUtils.playSound(0);
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -595,7 +618,8 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							} else {
-								CommonUtils.playSound(0)
+								CommonUtils.playSound(0);
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -604,6 +628,7 @@
 						},
 						fail: (res) => {
 							CommonUtils.playSound(0);
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
@@ -672,6 +697,7 @@
 					success: (res) => {
 						if (res.confirm) {
 							uni.request({
+								
 								url: this.serverUrl +
 									'/WEBSController/set_SaveOtherOutBill_BillCheck_Json',
 								data: {
diff --git a/pages/qitaruku_v2/form.vue b/pages/qitaruku_v2/form.vue
index fcd4d48..812d58b 100644
--- a/pages/qitaruku_v2/form.vue
+++ b/pages/qitaruku_v2/form.vue
@@ -4,7 +4,8 @@
 			<view class="form-item">
 				<view class="title">鏉$爜:</view>
 				<view class="right" style="width: 380rpx;">
-					<input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="getCode(hform.HBarCode)" />
+					<input :focus="barCodeFocus" v-model="hform.HBarCode" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+						@confirm="getCode(hform.HBarCode)" />
 				</view>
 				<view class="icon-wrapper">
 					<uni-icons type="scan" size="20" @click="toScanCode"></uni-icons>
@@ -64,7 +65,8 @@
 					<view class="right" v-show="showHSourceBillNo">
 						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
 							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
-						<input auto-focus @confirm="onHSourceBillNoConfirmHandler" type="text" name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+						<input :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" type="text"
+							name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
 					</view>
 					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -75,18 +77,18 @@
 						<input name="HSourceBillNo" disabled v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 					</view>
 				</view>
-				
+
 				<view class="form-item">
 					<view class="title">鍗曟嵁瀛愮被鍨�:</view>
 					<view class="right">
 						<picker :range="arrayHBillSubType" v-model="hform.HBillSubType" @change="HBillSubTypeChange">
-				
+
 							<input disabled name="HMainSourceBillType" v-model="HBillSubType" placeholder="璇烽�夋嫨鍗曟嵁瀛愮被鍨�" />
 							<view class="picker-overlay"></view>
 						</picker>
 					</view>
 				</view>
-				
+
 				<view class="form-item">
 					<view class="title">鍏堣繘鍏堝嚭浠�:</view>
 					<view class="right">
@@ -294,7 +296,9 @@
 	import {
 		getUserInfo
 	} from "@/utils/auth.js";
-	import { CommonUtils } from '../../utils/common';
+	import {
+		CommonUtils
+	} from '../../utils/common';
 	import BillListPopupVue from '../../components/BillListPopup/BillListPopup.vue';
 	export default {
 		data() {
@@ -312,7 +316,8 @@
 				reHSourceBillNo: true,
 				showHSupName: true,
 				barCodeFocus: false,
-				
+				HSourceBillNoFocus: false,
+
 
 				tabs: 0,
 				HMainSourceBillType: '鎵嬪伐褰曞叆',
@@ -329,7 +334,7 @@
 				HStockPlaceNameList: [],
 				arrayHSourceBillNo: [], //婧愬崟鍗曞彿
 				HSourceBillNoList: [],
-				
+
 				arrayHBillSubType: [],
 				arrayHBillSubTypeValue: [],
 				HBillSubType: '',
@@ -397,10 +402,11 @@
 			if (e.HInterID) {
 				this.HInterID_Temp = e.HInterID
 				// this.btnType = 1
-				this.barCodeFocus = true
+				this.refreshBarCodeState()
 				this.RoadBillMain(e.HInterID)
 			} else {
 				this.getNewData()
+				this.refreshHSourceBillState()
 			}
 			this.getHBaseList()
 			this.getHSupList()
@@ -418,11 +424,28 @@
 			uni.$off('BillSelectComplete')
 		},
 		methods: {
+			async refreshHSourceBillState() {
+				this.HSourceBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourceBillNoFocus = true
+				})
+				if (this.hform.HMainSourceBillType == -1) {
+					await this.refreshBarCodeState()
+				}
+			},
+			async refreshBarCodeState() {
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.barCodeFocus = true
+				})
+			},
 			onHSourceBillNoConfirmHandler() {
-				if(this.hform.HMainSourceBillType == -1) {
+				if (this.hform.HMainSourceBillType == -1) {
 					this.playSound(1)
 					this.barCodeFocus = true
-					return 
+					return
 				}
 				this.getHBarCodeData(this.hform.HSourceBillNo)
 			},
@@ -435,7 +458,7 @@
 				}
 				innerAudioContext.play(); // 鎾斁闊抽
 			},
-			set_InitBillSubType(){
+			set_InitBillSubType() {
 				this.arrayHBillSubType = []
 				this.arrayHBillSubTypeValue = []
 				CommonUtils.doRequest(
@@ -454,7 +477,7 @@
 								this.arrayHBillSubType.push(item['HName'])
 								this.arrayHBillSubTypeValue.push(item['HNumber'])
 							})
-							
+
 							this.HBillSubType = this.arrayHBillSubType[0]
 							this.hform.HBillSubType = this.arrayHBillSubTypeValue[0]
 						} else {
@@ -471,16 +494,16 @@
 				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
 				mpaasScanModule.mpaasScan({
 					'hideAlbum': true,
-					'timeoutInterval':'10', //瓒呮椂鏃堕棿
-					'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				},(ret) => {
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
 					console.log(ret.resp_result)
 					if (this.hform.HBarCode == '*') {
 						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
 					} else {
 						this.hform.HBarCode = ret.resp_result
 					}
-					
+
 					this.getCode(this.hform.HBarCode)
 				})
 			},
@@ -900,6 +923,7 @@
 							this.DisBillEntryList()
 						} else {
 							this.playSound(0)
+							this.refreshHSourceBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -908,6 +932,7 @@
 					},
 					fail: (res) => {
 						this.playSound(0)
+						this.refreshHSourceBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -960,6 +985,7 @@
 									this.DisBillEntryList()
 								} else {
 									this.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -968,6 +994,7 @@
 							},
 							fail: (res) => {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -1066,6 +1093,7 @@
 								this.hform.HQty = ''
 							} else {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -1074,6 +1102,7 @@
 						},
 						fail: (res) => {
 							this.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/shengchanbuliao/form.vue b/pages/shengchanbuliao/form.vue
index ca73e47..c2851f5 100644
--- a/pages/shengchanbuliao/form.vue
+++ b/pages/shengchanbuliao/form.vue
@@ -65,7 +65,7 @@
 					<view class="right" v-show="showHSourceBillNo">
 						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
 							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
-						<input auto-focus @confirm="onHSourceBillNoConfirmHandler" type="text" name="HSourceBillNo"
+						<input :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" type="text" name="HSourceBillNo"
 							v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
 					</view>
@@ -300,6 +300,7 @@
 				reHSourceBillNo: true,
 				showHSupName: true,
 				barCodeFocus: false,
+				HSourceBillNoFocus: false,
 
 				tabs: 0,
 				HMainSourceBillType: '鐢熶骇鐢ㄦ枡娓呭崟',
@@ -383,6 +384,7 @@
 				this.barCodeFocus = true
 			} else {
 				this.getNewData()
+				this.HSourceBillNoFocus = true
 			}
 			this.getHBaseList()
 			this.getHSupList()
@@ -399,6 +401,21 @@
 			uni.$off('BillSelectComplete')
 		},
 		methods: {
+			async refreshHSourceBillState(){
+				this.HSourceBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourceBillNoFocus = true
+					
+				})
+			},
+			async refreshBarCodeState(){
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.barCodeFocus = true
+				})
+			},
 			onHSourceBillNoConfirmHandler() {
 				this.getHBarCodeData(this.hform.HSourceBillNo)
 			},
@@ -840,6 +857,7 @@
 							this.DisBillEntryList()
 						} else {
 							this.playSound(0)
+							this.refreshHSourceBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -848,6 +866,7 @@
 					},
 					fail: (res) => {
 						this.playSound(0)
+						this.refreshHSourceBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -900,6 +919,7 @@
 									this.DisBillEntryList()
 								} else {
 									this.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -908,6 +928,7 @@
 							},
 							fail: (res) => {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -1006,6 +1027,7 @@
 								this.hform.HQty = ''
 							} else {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -1014,6 +1036,7 @@
 						},
 						fail: (res) => {
 							this.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/shengchanbuliaojiaoyan/form.vue b/pages/shengchanbuliaojiaoyan/form.vue
index 9e81dc5..4435039 100644
--- a/pages/shengchanbuliaojiaoyan/form.vue
+++ b/pages/shengchanbuliaojiaoyan/form.vue
@@ -46,7 +46,7 @@
 				<view class="form-item" v-show="showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="right" style="width: 380rpx;">
-						<input name="HBillNo" auto-focus v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鍗曟嵁鍙�"
+						<input name="HBillNo" :focus="HBillNoFocus" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鍗曟嵁鍙�"
 							@confirm="GetMeesageByBillNo(hform.HBillNo)" />
 					</view>
 					<uni-icons type="scan"
@@ -193,6 +193,7 @@
 				ModRightName: 'CE_MateReplenishOutCheck',
 				OperationType: 1,
 
+				HBillNoFocus: false,
 				BarCodeFocus: false,
 				showHStockPlaceName: false,
 				showHBillNo: true,
@@ -245,27 +246,29 @@
 			if (e.HBillNo) {
 				this.hform.HBillNo = e.HBillNo
 				this.GetMeesageByBillNo(e.HBillNo)
+				this.refreshBarCodeState()
 			} else {
 				// this.getNewData()
+				this.refreshHBillState()
 			}
-
-
-			this.getHBaseList()
-		},
-		onLoad(e) {
-			console.log(e, this.userInfo)
-			this.OperationType = e.OperationType
-			if (e.HBillNo) {
-				this.hform.HBillNo = e.HBillNo
-				this.GetMeesageByBillNo(e.HBillNo)
-			} else {
-				// this.getNewData()
-			}
-
-
 			this.getHBaseList()
 		},
 		methods: {
+			async refreshHBillState(){
+				this.HBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBillNo = ""
+					this.HBillNoFocus = true
+					
+				})
+			},
+			async refreshBarCodeState(){
+				this.BarCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.BarCodeFocus = true
+				})
+			},
 			//鏉$爜鍙锋壂鐮�
 			toScanCode() {
 				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
@@ -331,6 +334,7 @@
 							this.DisBillEntryList();
 						} else {
 							CommonUtils.playSound(0)
+							this.refreshHBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -340,6 +344,7 @@
 					},
 					fail: (res) => {
 						CommonUtils.playSound(0)
+						this.refreshHBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -474,7 +479,10 @@
 								if (res.data.count == 1) {
 									this.hform.HQty = ''
 									this.DisBillEntryList()
+									CommonUtils.playSound(1)
 								} else {
+									CommonUtils.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -483,6 +491,8 @@
 							},
 							fail: (res) => {
 								console.log(res);
+								this.refreshBarCodeState()
+								CommonUtils.playSound(0)
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
 									icon: 'none'
@@ -607,6 +617,7 @@
 								this.hform.HQty = ''
 							} else {
 								CommonUtils.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -615,6 +626,7 @@
 						},
 						fail: (res) => {
 							CommonUtils.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/shengchandiaobo/form.vue b/pages/shengchandiaobo/form.vue
index 7537e8e..f463bc5 100644
--- a/pages/shengchandiaobo/form.vue
+++ b/pages/shengchandiaobo/form.vue
@@ -11,7 +11,7 @@
 				<view class="form-item" v-show="showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="right" style="width: 380rpx;">
-						<input auto-focus name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo(hform.HBarCode)"/>
+						<input :focus="HBillNoFocus" name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo(hform.HBarCode)"/>
 					</view>
 					<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
 				</view>
@@ -180,6 +180,8 @@
     export default {
         data() {
             return {
+				HBillNoFocus: false,
+				
 				userInfo:getUserInfo(),
 				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
 				HModName:'Kf_MoveStockBill_Check_PDA',
@@ -236,9 +238,18 @@
 			if(e.HBillNo){
 				this.hform.HBillNo = e.HBillNo
 				this.GetMeesageByBillNo(e.HBillNo)
+			}else {
+				this.refreshHBillNoFocus()
 			}
 		},
         methods: {
+			async refreshHBillNoFocus() {
+				this.HBillNoFocus = false
+				await this.$nextTick(() => {
+					this.HBillNoFocus = true
+					this.hform.HBillNo = ""
+				})
+			},
 			playSound(e){
 				const innerAudioContext = uni.createInnerAudioContext();
 				if(e == 1){
@@ -288,6 +299,7 @@
 							this.DisBillEntryList();
 						}else{
 							this.playSound(0)
+							this.refreshHBillNoFocus()
 							uni.showToast({
 								title:res.data.Message,
 								icon:'none'
@@ -297,6 +309,7 @@
 					},
 					fail: (res) => {
 						this.playSound(0)
+						this.refreshHBillNoFocus()
 						console.log(res);
 						uni.showToast({
 							title:'鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/shengchanlingliao/form.vue b/pages/shengchanlingliao/form.vue
index fc7e038..6124b50 100644
--- a/pages/shengchanlingliao/form.vue
+++ b/pages/shengchanlingliao/form.vue
@@ -39,7 +39,7 @@
 				<view class="form-item" v-show="showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="right" style="width: 380rpx;">
-						<input name="HBillNo" auto-focus v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo()"/>
+						<input name="HBillNo" :focus="HBillNoFocus" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo()"/>
 					</view>
 					<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
 				</view>
@@ -169,6 +169,7 @@
 				ModRightName:'CE_MateOutCheck',
 				OperationType: 1,
 				
+				HBillNoFocus: false,
 				showHBillNo:true,
 				tabs:1,
 				linterid:'',
@@ -221,10 +222,18 @@
 				this.GetMeesageByBillNo(e.HBillNo)
 			}else{
 				// this.getNewData()
+				this.refreshHBillNoFocus()
 			}
 			// this.getHBaseList()
 		},
         methods: {
+			async refreshHBillNoFocus() {
+				this.HBillNoFocus = false
+				await this.$nextTick(() => {
+					this.HBillNoFocus = true
+					this.hform.HBillNo = ""
+				})
+			},
 			playSound(e){
 				const innerAudioContext = uni.createInnerAudioContext();
 				if(e == 1){
@@ -275,6 +284,7 @@
 							this.DisBillEntryList();
 						}else{
 							this.playSound(0)
+							this.refreshHBillNoFocus()
 							uni.showToast({
 								title:res.data.Message,
 								icon:'none'
@@ -285,6 +295,7 @@
 					fail: (res) => {
 						console.log(res);
 						this.playSound(0)
+						this.refreshHBillNoFocus()
 						uni.showToast({
 							title:'鎺ュ彛璇锋眰澶辫触',
 							icon:'none'
diff --git a/pages/shengchanlingliaoshengdan/form.vue b/pages/shengchanlingliaoshengdan/form.vue
index cfdf137..f163a83 100644
--- a/pages/shengchanlingliaoshengdan/form.vue
+++ b/pages/shengchanlingliaoshengdan/form.vue
@@ -64,8 +64,8 @@
 					<view class="right" v-show="showHSourceBillNo">
 						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
 							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
-						<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo" v-model="hform.HSourceBillNo"
-							@confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+						<input :focus="HSourceBillNoFocus" type="text" name="HSourceBillNo"
+							v-model="hform.HSourceBillNo" @confirm="onSourceBillBlurHandler" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
 					</view>
 					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -323,6 +323,9 @@
 				arrayHSourceBillNo: [], //婧愬崟鍗曞彿
 				HSourceBillNoList: [],
 
+				HSourceBillNoFocus: false,
+				barCodeFocus: false,
+
 				arrayHEmpName: [], //鎿嶄綔鍛�
 				HEmpNameList: [],
 				arrayHDeptName: [], //閮ㄩ棬
@@ -333,9 +336,6 @@
 				Materlist: [],
 				FIFOlist: [],
 				hform: {
-					HSourceBillNoFocus: false,
-					barCodeFocus: false,
-					
 					HBillType: 1204,
 					HBillerID: uni.getStorageSync('HBillerID'),
 					HRedBlueFlag: false,
@@ -409,15 +409,14 @@
 			uni.$off('BillSelectComplete')
 		},
 		methods: {
-			async refreshHSourceBillState(){
-				console.log('鎵ц鍒锋柊鍗曟嵁鐘舵�佸嚱鏁�');
+			async refreshHSourceBillState() {
 				this.HSourceBillNoFocus = false
 				await this.$nextTick(() => {
 					this.hform.HSourceBillNo = ""
 					this.HSourceBillNoFocus = true
 				})
 			},
-			async refreshBarCodeState(){
+			async refreshBarCodeState() {
 				this.barCodeFocus = false
 				await this.$nextTick(() => {
 					this.hform.HBarCode = ""
@@ -444,16 +443,16 @@
 				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
 				mpaasScanModule.mpaasScan({
 					'hideAlbum': true,
-					'timeoutInterval':'10', //瓒呮椂鏃堕棿
-					'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				},(ret) => {
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
 					console.log(ret.resp_result)
 					if (this.hform.HBarCode == '*') {
 						this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
 					} else {
 						this.hform.HBarCode = ret.resp_result
 					}
-					
+
 					this.getCode(this.hform.HBarCode)
 				})
 			},
diff --git a/pages/shengchanruku/form.vue b/pages/shengchanruku/form.vue
index fade64e..7cc600e 100644
--- a/pages/shengchanruku/form.vue
+++ b/pages/shengchanruku/form.vue
@@ -11,7 +11,7 @@
 				<view class="form-item" v-show="showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="right" style="width: 380rpx;">
-						<input auto-focus name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo(hform.HBarCode)"/>
+						<input :focus="HBillNoFocus" name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜" @confirm="GetMeesageByBillNo(hform.HBarCode)"/>
 					</view>
 					<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCode"></uni-icons>
 				</view>
@@ -162,6 +162,7 @@
 				ModRightName:'CE_ProductInCheck',
 				OperationType: 1,
 				
+				HBillNoFocus: false,
 				showHBillNo:true,
 				tabs:1,
 				linterid:'',
@@ -207,9 +208,19 @@
 			if(e.HBillNo){
 				this.hform.HBillNo = e.HBillNo
 				this.GetMeesageByBillNo(e.HBillNo)
+			}else {
+				this.refreshHBillState()
 			}
 		},
         methods: {
+			async refreshHBillState(){
+				this.HBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBillNo = ""
+					this.HBillNoFocus = true
+					
+				})
+			},
 			playSound(e){
 				const innerAudioContext = uni.createInnerAudioContext();
 				if(e == 1){
@@ -255,6 +266,7 @@
 							this.DisBillEntryList();
 						}else{
 							this.playSound(0)
+							this.refreshHBillState()
 							uni.showToast({
 								title:res.data.Message,
 								icon:'none'
@@ -264,6 +276,7 @@
 					},
 					fail: (res) => {
 						this.playSound(0)
+						this.refreshHBillState()
 						console.log(res);
 						uni.showToast({
 							title:'鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/shengchanrukushengdan/form.vue b/pages/shengchanrukushengdan/form.vue
index 026afef..3222a15 100644
--- a/pages/shengchanrukushengdan/form.vue
+++ b/pages/shengchanrukushengdan/form.vue
@@ -65,7 +65,7 @@
 					<view class="right" v-show="showHSourceBillNo">
 						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
 							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
-						<input type="text" auto-focus name="HSourceBillNo" @confirm="onHSourceBillNoConfirmHandler"
+						<input type="text" :focus="HSourceBillNoFocus" name="HSourceBillNo" @confirm="onHSourceBillNoConfirmHandler"
 							v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
 					</view>
@@ -301,6 +301,7 @@
 				reHSourceBillNo: true,
 				showHSupName: true,
 				barCodeFocus: false,
+				HSourceBillNoFocus: false,
 
 				tabs: 0,
 				HMainSourceBillType: '鐢熶骇璁㈠崟',
@@ -383,6 +384,7 @@
 				this.barCodeFocus = true
 				this.RoadBillMain(e.HInterID)
 			} else {
+				this.HSourceBillNoFocus = true
 				this.getNewData()
 			}
 			this.getHBaseList()
@@ -400,6 +402,21 @@
 			uni.$off('BillSelectComplete')
 		},
 		methods: {
+			async refreshHSourceBillState(){
+				this.HSourceBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourceBillNoFocus = true
+					
+				})
+			},
+			async refreshBarCodeState(){
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.barCodeFocus = true
+				})
+			},
 			onHSourceBillNoConfirmHandler() {
 				this.getHBarCodeData(this.hform.HSourceBillNo)
 			},
@@ -847,6 +864,7 @@
 							this.DisBillEntryList()
 						} else {
 							this.playSound(0)
+							this.refreshHSourceBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -855,6 +873,7 @@
 					},
 					fail: (res) => {
 						this.playSound(0)
+						this.refreshHSourceBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -907,6 +926,7 @@
 									this.DisBillEntryList()
 								} else {
 									this.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -915,6 +935,7 @@
 							},
 							fail: (res) => {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -1021,6 +1042,7 @@
 								this.hform.HQty = ''
 							} else {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -1029,6 +1051,7 @@
 						},
 						fail: (res) => {
 							this.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/tiaomadaying/tiaomadaying.vue b/pages/tiaomadaying/tiaomadaying.vue
index 27268d4..9dfc35b 100644
--- a/pages/tiaomadaying/tiaomadaying.vue
+++ b/pages/tiaomadaying/tiaomadaying.vue
@@ -137,7 +137,7 @@
 					HSubID: '',
 					HOrderBillNo: '',
 					HMaterID: '',
-					barCodeNo: '',
+					// barCodeNo: '',
 					HBillNo: '',
 					HBillLineNo: '',
 					HMaterNumber: '',
@@ -154,6 +154,9 @@
 					HSupID: '',
 					HUnitID: '',
 					HDate: '',
+					HSourceBillNo: '',
+					HMaker: getUserInfo()["Czymc"],
+					HSupNumber: '',
 				}
 			};
 		},
@@ -175,162 +178,41 @@
 				if (this.$printer.isConnected() === false) {
 					this.$refs.labelPrinter.openPopup()
 				} else {
-					// this.printInfo = async () => {
-					//     let cpcl = await this.$printer.cpcl().clear()
-					//         .page(new CPage({
-					//             width: 608,
-					//             height: 400
-					//         }))
-					//         .qrcode(new CQRCode({
-					//             x: 500,
-					//             y: 30,
-					//             width: 3,
-					//             content: this.generatedBarCode,
-					//             codeRotation: CCodeRotation.ROTATION_0,
-					//             level: CCorrectLevel.L
-					//         }))
-					//         .text(new CText({
-					//             x: 30,
-					//             y: 30,
-					//             content: "渚涘簲鍟�: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 30,
-					//             y: 80,
-					//             content: "渚涘簲鍟嗘枡鍙�: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 30,
-					//             y: 130,
-					//             content: "鐗╂枡缂栫爜: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 30,
-					//             y: 180,
-					//             content: "鐗╂枡鍒嗙粍: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 300,
-					//             y: 180,
-					//             content: "瑙勬牸鍨嬪彿: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 30,
-					//             y: 230,
-					//             content: "鏁伴噺: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 300,
-					//             y: 230,
-					//             content: "鏃ユ湡: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 30,
-					//             y: 280,
-					//             content: "妫�楠屽憳: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 300,
-					//             y: 280,
-					//             content: "璁″垝璺熻釜鍙�: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .text(new CText({
-					//             x: 30,
-					//             y: 330,
-					//             content: "妫�楠岀粨鏋�: ",
-					//             font: CFont.TSS24
-					//         }))
-					//         .box(new CBox({
-					//             topLeftX: 260,
-					//             topLeftY: 320,
-					//             bottomRightX: 280,
-					//             bottomRightY: 340,
-					//             lineWidth: 4,
-					//         }))
-					//         .text(new CText({
-					//             x: 290,
-					//             y: 320,
-					//             content: "鍚堟牸",
-					//             font: CFont.TSS24
-					//         }))
-					//         .box(new CBox({
-					//             topLeftX: 360,
-					//             topLeftY: 320,
-					//             bottomRightX: 380,
-					//             bottomRightY: 340,
-					//             lineWidth: 4,
-					//         }))
-					//         .text(new CText({
-					//             x: 390,
-					//             y: 320,
-					//             content: "涓嶅悎鏍�",
-					//             font: CFont.TSS24
-					//         }))
-					//         .box(new CBox({
-					//             topLeftX: 480,
-					//             topLeftY: 320,
-					//             bottomRightX: 500,
-					//             bottomRightY: 340,
-					//             lineWidth: 4,
-					//         }))
-					//         .text(new CText({
-					//             x: 510,
-					//             y: 320,
-					//             content: "鐗归噰",
-					//             font: CFont.TSS24
-					//         }))
-					//         .form(new CForm())
-					//         .print();
-					//     console.log(cpcl.command().string())
-					//     return cpcl.command().binary()
-					// }
-					// await this.$nextTick(() => {
-					//     this.$refs.labelPrinter.execPrint()
-					// })
-					// T 24 0 300 280 璁″垝璺熻釜鍙�: ${this.lailiaoInfo.HMTONo || ''}
 					let HBarCodeNoStr =
-						`${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${this.lailiaoInfo.HQty || ''}@${this.lailiaoInfo.HSupID || ''}`
-					
-					let pcsInfo = this.lailiaoInfo.HPcsName ? '(' + this.lailiaoInfo.HPcsName +')' : ''
+						`${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${parseFloat(this.lailiaoInfo.HQty||0).toFixed(10)}@${this.lailiaoInfo.HSupNumber || ''}`
+
+					let pcsInfo = this.lailiaoInfo.HPcsName ? '(' + this.lailiaoInfo.HPcsName + ')' : ''
+
 					this.printInfo = `! 0 200 200 400 1
 PAGE-WIDTH 608
 SETQRVER 3
-B QR 490 30 M 4 U 3
+B QR 470 30 Q 0 U 3
 LA,${HBarCodeNoStr}
 ENDQR
-T 24 0 10 30 渚涘簲鍟�: ${this.lailiaoInfo.HSupName}
-T 55 0 10 55 (Supplier)
-T 24 0 10 75 渚涘簲鍟嗘枡鍙�:  ${this.lailiaoInfo.HMaterNumber}
-T 55 0 10 100 (Supplier Sku No.)
-T 24 0 10 120 鐗╂枡鍚嶇О: ${this.lailiaoInfo.HMaterName}
-T 55 0 10 145 (Material Code)
-T 24 0 10 165 娆惧彿: 
-T 55 0 10 190 (Style No.)
+T 24 0 0 30 渚涘簲鍟�: ${this.lailiaoInfo.HSupName}
+T 55 0 0 55 (Supplier)
+T 24 0 0 75 渚涘簲鍟嗘枡鍙�:  ${this.lailiaoInfo.HMaterNumber}
+T 55 0 0 100 (Supplier Sku No.)
+T 24 0 0 120 鐗╂枡鍚嶇О: ${this.lailiaoInfo.HMaterName}
+T 55 0 0 145 (Material Code)
+T 24 0 0 165 娆惧彿: 
+T 55 0 0 190 (Style No.)
 T 24 0 300 165 瀹㈡埛缂栧彿: 
 T 55 0 300 190 (Consumer No.)
-T 24 0 10 210 鍒嗙粍: ${this.lailiaoInfo.HBatchNo} 
-T 55 0 10 235 (Group) 
+T 24 0 0 210 鍒嗙粍: 
+T 55 0 0 235 (Group) 
 T 24 0 300 210 瑙勬牸: ${this.lailiaoInfo.HMaterModel}
 T 55 0 300 235 (SKU NO.) 
-T 24 0 10 255 鏁伴噺:  ${this.lailiaoInfo.HQty} ${pcsInfo}
-T 55 0 10 280 (Quantity) 
+T 24 0 0 255 鏁伴噺:  ${this.lailiaoInfo.HQty} ${pcsInfo}
+T 55 0 0 280 (Quantity) 
 T 24 0 300 255 鏃ユ湡: ${this.lailiaoInfo.HDate || ''}
 T 55 0 300 280 (Date) 
-T 24 0 10 300 妫�楠屽憳: 
-T 55 0 10 325 (QC)  
+T 24 0 0 300 妫�楠屽憳: 
+T 55 0 0 325 (QC)  
 T 24 0 300 300 閲囪喘鍗曞彿: ${this.lailiaoInfo.HBillNo || ''}
 T 55 0 300 325 (Purchase Order No.)  
-T 24 0 10 345 妫�楠岀粨鏋�: 
-T 55 0 10 370 (Inspection status) 
+T 24 0 0 345 妫�楠岀粨鏋�: 
+T 55 0 0 370 (Inspection status) 
 BOX 240 345 260 365 4
 T 24 0 270 345 鍚堟牸
 T 55 0 250 370 (Pass) 
@@ -342,9 +224,6 @@
 T 55 0 440 370 (Spec. accepted) 
 FORM
 PRINT`
-
-
-
 					await this.$nextTick(() => {
 						this.$refs.labelPrinter.execPrint()
 					})
@@ -360,15 +239,17 @@
 
 				}
 				let d = data[row - 1]
+				console.log('鏁伴噺: ', parseFloat(d['鏁伴噺']).toFixed(10));
 				this.lailiaoInfo = Object.assign(this.lailiaoInfo, {
 					HMaterNumber: d['鐗╂枡缂栫爜'],
 					HMaterName: d['鐗╂枡鍚嶇О'],
 					HMaterModel: d['瑙勬牸鍨嬪彿'],
-					HBatchNo: d['鎵瑰彿'],
+					// HBatchNo: d['鎵瑰彿'],
 					HQty: d['鏁伴噺'],
 					HMinQty: d['鏁伴噺'],
 					HBQty: d['鏁伴噺'],
 					HSupID: d['HSupID'],
+					HSupNumber: d['渚涘簲鍟嗕唬鐮�'],
 					HSupName: d['渚涘簲鍟�'],
 					HUnitID: d['HUnitID'],
 					HPcsName: d['璁¢噺鍗曚綅'],
@@ -377,7 +258,7 @@
 					HMainID: d['hmainid'],
 					HSubID: d['HEntryID'],
 					HMaterID: d['HMaterID'],
-					HDate: d['鏃ユ湡']
+					HDate: d['鏃ユ湡'],
 				})
 				CommonUtils.playSound(1)
 				this.buttonStatus.btn2 = true
@@ -394,6 +275,7 @@
 					HMaterNumber: '',
 					HMaterName: '',
 					HMaterModel: '',
+					HPcsName: '',
 					HBatchNo: '',
 					HQty: '',
 					HMTONo: '',
@@ -401,12 +283,19 @@
 					HSupNameShort: '',
 					HMinQty: '',
 					HBQty: '',
+					HSupID: '',
+					HUnitID: '',
+					HDate: '',
+					HSourceBillNo: '',
+					HSupNumber: '',
 				}
 
 				this.buttonStatus = {
 					btn1: true,
 					btn2: false
 				}
+				
+				this.refreshBarcodeState()
 			},
 			barCodeEntryHandler(barCode) {
 				if (CommonUtils.isEmpty(barCode) === false) {
@@ -423,8 +312,9 @@
 					}
 					let barCodeInfo = barCode.split("@")
 					let [PurchaseBillNo, Row] = barCodeInfo
-					this.lailiaoInfo.HBillNo = PurchaseBillNo,
-						this.lailiaoInfo.HBillLineNo = Row
+					this.lailiaoInfo.HBillNo = PurchaseBillNo
+					this.lailiaoInfo.HSourceBillNo = PurchaseBillNo
+					this.lailiaoInfo.HBillLineNo = Row
 					console.log({
 						sWhere: ` and 鍗曟嵁鍙� = '${PurchaseBillNo}'`,
 						user: this.userInfo.Czymc,
@@ -522,7 +412,7 @@
 			},
 			GenereateBarCode() {
 				let HBarCodeNoStr =
-					`${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${this.lailiaoInfo.HQty || ''}@${this.lailiaoInfo.HSupID || ''}`
+					`${this.lailiaoInfo.HBillNo}@${this.lailiaoInfo.HBillLineNo}@${this.lailiaoInfo.HMaterNumber || ''}@${this.lailiaoInfo.HMTONo || ''}@${parseFloat(this.lailiaoInfo.HQty || 0).toFixed(10)}@${this.lailiaoInfo.HSupNumber  || ''}`
 				let sMain = []
 				sMain[0] = this.lailiaoInfo
 				let sMainStr = JSON.stringify(sMain);
diff --git a/pages/weiwailingliao/form.vue b/pages/weiwailingliao/form.vue
index ffa1ad2..bdf3c00 100644
--- a/pages/weiwailingliao/form.vue
+++ b/pages/weiwailingliao/form.vue
@@ -63,7 +63,7 @@
 					<view class="right" v-show="showHSourceBillNo">
 						<!-- <uni-combox v-if="reHSourceBillNo" :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�"
 							v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox> -->
-						<input auto-focus @confirm="getHBarCodeData(hform.HSourceBillNo)" type="text" name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
+						<input :focus="HSourceBillNoFocus" @confirm="getHBarCodeData(hform.HSourceBillNo)" type="text" name="HSourceBillNo" v-model="hform.HSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" />
 
 					</view>
 					<view class="icon-wrapper" v-show="showHSourceBillNo" :disabled="hform.HMainSourceBillType === -1">
@@ -298,6 +298,7 @@
 				reHSourceBillNo: true,
 				showHSupName: true,
 				barCodeFocus: false,
+				HSourceBillNoFocus: false,
 
 				tabs: 0,
 				HMainSourceBillType: '濮斿鐢ㄦ枡娓呭崟',
@@ -381,6 +382,7 @@
 				this.barCodeFocus = true
 			} else {
 				this.getNewData()
+				this.HSourceBillNoFocus = true;
 			}
 			this.getHBaseList()
 			this.getHSupList()
@@ -397,6 +399,21 @@
 			uni.$off('BillSelectComplete')
 		},
 		methods: {
+			async refreshHSourceBillState(){
+				this.HSourceBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourceBillNoFocus = true
+					
+				})
+			},
+			async refreshBarCodeState(){
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.barCodeFocus = true
+				})
+			},
 			playSound(e) {
 				const innerAudioContext = uni.createInnerAudioContext();
 				if (e == 1) {
@@ -834,6 +851,7 @@
 							this.DisBillEntryList()
 						} else {
 							this.playSound(0)
+							this.refreshHSourceBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -842,6 +860,7 @@
 					},
 					fail: (res) => {
 						this.playSound(0)
+						this.refreshHSourceBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -894,6 +913,7 @@
 									this.DisBillEntryList()
 								} else {
 									this.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -902,6 +922,7 @@
 							},
 							fail: (res) => {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -1000,6 +1021,7 @@
 								this.hform.HQty = ''
 							} else {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -1008,6 +1030,7 @@
 						},
 						fail: (res) => {
 							this.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/weiwailingliaojiaoyan/form.vue b/pages/weiwailingliaojiaoyan/form.vue
index 359b5a1..390ba8f 100644
--- a/pages/weiwailingliaojiaoyan/form.vue
+++ b/pages/weiwailingliaojiaoyan/form.vue
@@ -46,7 +46,7 @@
 				<view class="form-item" v-show="showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="right" style="width: 380rpx;">
-						<input auto-focus name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+						<input :focus="HBillNoFocus" name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
 							@confirm="GetMeesageByBillNo(hform.HBarCode)" />
 					</view>
 					<uni-icons type="scan"
@@ -197,6 +197,7 @@
 				ModRightName: 'CE_EntrustOutCheck',
 				OperationType: 1,
 
+				HBillNoFocus: false,
 				barCodeFocus: false,
 				showHStockPlaceName: false,
 				showHBillNo: true,
@@ -249,21 +250,37 @@
 			if (e.HBillNo) {
 				this.hform.HBillNo = e.HBillNo
 				this.GetMeesageByBillNo(e.HBillNo)
-				this.barCodeFocus = true;
+				this.refreshBarCodeState()
 			} else {
 				// this.getNewData()
+				this.refreshHBillState()
 			}
 			this.getHBaseList()
 		},
 		methods: {
+			async refreshHBillState(){
+				this.HBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBillNo = ""
+					this.HBillNoFocus = true
+					
+				})
+			},
+			async refreshBarCodeState(){
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.barCodeFocus = true
+				})
+			},
 			//鎵爜
 			toScanCode() {
 				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
 				mpaasScanModule.mpaasScan({
 					'hideAlbum': true,
-					'timeoutInterval':'10', //瓒呮椂鏃堕棿
-					'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				},(ret) => {
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
 					console.log(ret.resp_result)
 					// if(this.hform.HBarCode == '*'){
 					// 	this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
@@ -279,16 +296,16 @@
 				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
 				mpaasScanModule.mpaasScan({
 					'hideAlbum': true,
-					'timeoutInterval':'10', //瓒呮椂鏃堕棿
-					'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
-				},(ret) => {
+					'timeoutInterval': '10', //瓒呮椂鏃堕棿
+					'timeoutText': '鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+				}, (ret) => {
 					console.log(ret.resp_result)
 					// if(this.hform.HBarCode == '*'){
 					// 	this.hform.HBarCode = this.hform.HBarCode + ret.resp_result
 					// }else{
 					// 	this.hform.HBarCode = ret.resp_result
 					// }
-					
+
 					this.hform.HBillNo = ret.resp_result
 					this.GetMeesageByBillNo(this.hform.HBillNo)
 				})
@@ -322,6 +339,7 @@
 							this.DisBillEntryList();
 						} else {
 							CommonUtils.playSound(0);
+							this.refreshHBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -331,6 +349,7 @@
 					},
 					fail: (res) => {
 						CommonUtils.playSound(0);
+						this.refreshHBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -446,6 +465,7 @@
 				console.log(this.hform.HSourceBillNo, HSourceFlag)
 				if (HDeleteFlag == "*") {
 					if (sBarCode == "") {
+						CommonUtils.playSound(0)
 						uni.showToast({
 							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
 							icon: 'none'
@@ -464,7 +484,10 @@
 								if (res.data.count == 1) {
 									this.hform.HQty = ''
 									this.DisBillEntryList()
+									CommonUtils.playSound(1)
 								} else {
+									CommonUtils.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -472,6 +495,8 @@
 								}
 							},
 							fail: (res) => {
+								CommonUtils.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -597,7 +622,8 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							} else {
-								CommonUtils.playSound(0);
+								CommonUtils.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -605,7 +631,8 @@
 							}
 						},
 						fail: (res) => {
-							CommonUtils.playSound(0);
+							CommonUtils.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/xiaoshouchuku/form.vue b/pages/xiaoshouchuku/form.vue
index ba69c21..d58be89 100644
--- a/pages/xiaoshouchuku/form.vue
+++ b/pages/xiaoshouchuku/form.vue
@@ -52,7 +52,7 @@
 					<view class="title">婧愬崟鍗曞彿:</view>
 					<view class="right" v-show="showHSourceBillNo">
 						<uni-combox v-if="reHSourceBillNo"
-						 :isAutoFocus="true" ref="uniComboxSourceBill" :confirm-call="onSourceBillConfirmHandler"
+						 :isFocus="HSourceBillNoFocus" ref="uniComboxSourceBill" :confirm-call="onSourceBillConfirmHandler"
 						 :candidates="arrayHSourceBillNo" placeholder="璇疯緭鍏ユ簮鍗曞崟鍙�" v-model="hform.HSourceBillNo" @input="HSourceBillNoChange"></uni-combox>
 					</view>
 					<view class="righton" v-show="!showHSourceBillNo">
@@ -271,6 +271,7 @@
 				reHSourceBillNo:true,
 				showHSupName:true,
 				BarCodeFocus: false,
+				HSourceBillNoFocus: false,
 				
 				tabs:0,
 				HMainSourceBillType:'鍙戣揣閫氱煡鍗�',
@@ -347,9 +348,10 @@
 			if(e.HInterID){
 				this.HInterID_Temp = e.HInterID
 				// this.btnType = 1
-				this.BarCodeFocus = true
+				this.refreshBarCodeState()
 				this.RoadBillMain(e.HInterID)
 			}else{
+				this.refreshHSourceBillState()
 				this.getNewData()
 			}
 			this.getHBaseList()
@@ -358,6 +360,23 @@
 			this.getHDeptList()
 		},
         methods: {
+			async refreshHSourceBillState() {
+				this.HSourceBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourceBillNoFocus = true
+				})
+				if (this.hform.HMainSourceBillType == -1) {
+					await this.refreshBarCodeState()
+				}
+			},
+			async refreshBarCodeState() {
+				this.BarCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.BarCodeFocus = true
+				})
+			},
 			playSound(e){
 				const innerAudioContext = uni.createInnerAudioContext();
 				if(e == 1){
@@ -767,6 +786,7 @@
 							this.DisBillEntryList()
 						}else{
 							this.playSound(0)
+							this.refreshHSourceBillState()
 							uni.showToast({
 								title:res.data.Message,
 								icon:'none'
@@ -775,6 +795,7 @@
 					},
 					fail: (res) => {
 						this.playSound(0)
+						this.refreshHSourceBillState()
 						console.log(res);
 						uni.showToast({
 							title:'鎺ュ彛璇锋眰澶辫触',
@@ -806,6 +827,7 @@
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
 						this.playSound(0)
+						this.refreshBarCodeState()
                         uni.showToast({
                         	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
 							icon:'none'
@@ -823,6 +845,7 @@
 									this.DisBillEntryList()
 								}else{
 									this.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title:res.data.Message,
 										icon:'none'
@@ -831,6 +854,7 @@
 							},
 							fail: (res) => {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title:'鎺ュ彛璇锋眰澶辫触',
@@ -916,6 +940,7 @@
 								this.hform.HQty = ''
 							}else{
 								this.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title:res.data.Message,
 									icon:'none'
@@ -924,6 +949,7 @@
 						},
 						fail: (res) => {
 							this.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title:'鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/xiaoshouchukujiaoyan/form.vue b/pages/xiaoshouchukujiaoyan/form.vue
index 65d6ccf..75b8335 100644
--- a/pages/xiaoshouchukujiaoyan/form.vue
+++ b/pages/xiaoshouchukujiaoyan/form.vue
@@ -45,7 +45,7 @@
 				<view class="form-item" v-show="showHBillNo">
 					<view class="title">鍗曟嵁鍙�:</view>
 					<view class="right" style="width: 380rpx;">
-						<input auto-focus name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
+						<input :focus="HBillNoFocus" name="HBillNo" v-model="hform.HBillNo" placeholder="璇锋壂鎻�(鎴栬緭鍏�)鏉$爜"
 							@confirm="GetMeesageByBillNo(hform.HBarCode)" />
 					</view>
 					<uni-icons type="scan"
@@ -201,6 +201,7 @@
 				linterid: '',
 				HBillNo: '',
 				barCodeFocus: false,
+				HBillNoFocus: false,
 
 				arrayHWHName: [], //浠撳簱
 				HWHNameList: [],
@@ -248,13 +249,29 @@
 			if (e.HBillNo) {
 				this.hform.HBillNo = e.HBillNo
 				this.GetMeesageByBillNo(e.HBillNo)
-				this.barCodeFocus = true
+				this.refreshBarCodeState()
 			} else {
 				// this.getNewData()
+				this.refreshHBillState()
 			}
 			this.getHBaseList()
 		},
 		methods: {
+			async refreshHBillState(){
+				this.HBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBillNo = ""
+					this.HBillNoFocus = true
+					
+				})
+			},
+			async refreshBarCodeState(){
+				this.barCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.barCodeFocus = true
+				})
+			},
 			//鎵爜
 			toScanCode() {
 				var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
@@ -321,6 +338,7 @@
 							this.DisBillEntryList();
 						} else {
 							CommonUtils.playSound(0);
+							this.refreshHBillState()
 							uni.showToast({
 								title: res.data.Message,
 								icon: 'none'
@@ -330,6 +348,7 @@
 					},
 					fail: (res) => {
 						CommonUtils.playSound(0);
+						this.refreshHBillState()
 						console.log(res);
 						uni.showToast({
 							title: '鎺ュ彛璇锋眰澶辫触',
@@ -445,6 +464,7 @@
 				console.log(this.hform.HSourceBillNo, HSourceFlag)
 				if (HDeleteFlag == "*") {
 					if (sBarCode == "") {
+						CommonUtils.playSound(0)
 						uni.showToast({
 							title: '璇疯緭鍏ヨ鍒犻櫎鐨勬潯鐮�',
 							icon: 'none'
@@ -463,7 +483,10 @@
 								if (res.data.count == 1) {
 									this.hform.HQty = ''
 									this.DisBillEntryList()
+									CommonUtils.playSound(1)
 								} else {
+									CommonUtils.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title: res.data.Message,
 										icon: 'none'
@@ -471,6 +494,8 @@
 								}
 							},
 							fail: (res) => {
+								CommonUtils.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title: '鎺ュ彛璇锋眰澶辫触',
@@ -595,7 +620,8 @@
 								//娓呯┖鏁伴噺
 								this.hform.HQty = ''
 							} else {
-								CommonUtils.playSound(0);
+								CommonUtils.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title: res.data.Message,
 									icon: 'none'
@@ -603,7 +629,8 @@
 							}
 						},
 						fail: (res) => {
-							CommonUtils.playSound(0);
+							CommonUtils.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title: '鎺ュ彛璇锋眰澶辫触',
diff --git a/pages/xiaoshoutuihuo/form.vue b/pages/xiaoshoutuihuo/form.vue
index eb9bbcb..4f7648f 100644
--- a/pages/xiaoshoutuihuo/form.vue
+++ b/pages/xiaoshoutuihuo/form.vue
@@ -50,7 +50,7 @@
 				<view class="form-item">
 					<view class="title">婧愬崟鍗曞彿:</view>
 					<view class="right" style="width: 380rpx;" v-show="showHSourceBillNo">
-						<input v-model="hform.HSourceBillNo" auto-focus @confirm="onHSourceBillNoConfirmHandler" placeholder="璇锋壂鎻�(鎴栬緭鍏�)婧愬崟鍗曞彿"/>
+						<input v-model="hform.HSourceBillNo" :focus="HSourceBillNoFocus" @confirm="onHSourceBillNoConfirmHandler" placeholder="璇锋壂鎻�(鎴栬緭鍏�)婧愬崟鍗曞彿"/>
 					</view>
 					<uni-icons v-show="showHSourceBillNo" type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanCodeA()"></uni-icons>
 					<view class="righton" v-show="!showHSourceBillNo">
@@ -232,6 +232,7 @@
 				reHSourceBillNo:true,
 				showHSupName:true,
 				BarCodeFocus: false,
+				HSourceBillNoFocus: false,
 				
 				
 				tabs:0,
@@ -307,9 +308,10 @@
 				this.HInterID_Temp = e.HInterID
 				// this.btnType = 1
 				this.RoadBillMain(e.HInterID)
-				this.BarCodeFocus = true
+				this.refreshBarCodeState()
 			}else{
 				this.getNewData()
+				this.refreshHSourceBillState()
 			}
 			this.getHBaseList()
 			this.getHSupList()
@@ -317,6 +319,23 @@
 			this.getHDeptList()
 		},
         methods: {
+			async refreshHSourceBillState() {
+				this.HSourceBillNoFocus = false
+				await this.$nextTick(() => {
+					this.hform.HSourceBillNo = ""
+					this.HSourceBillNoFocus = true
+				})
+				if (this.hform.HMainSourceBillType == -1) {
+					await this.refreshBarCodeState()
+				}
+			},
+			async refreshBarCodeState() {
+				this.BarCodeFocus = false
+				await this.$nextTick(() => {
+					this.hform.HBarCode = ""
+					this.BarCodeFocus = true
+				})
+			},
 			playSound(e){
 				const innerAudioContext = uni.createInnerAudioContext();
 				if(e == 1){
@@ -637,7 +656,8 @@
 							this.BarCodeFocus = true
 							this.DisBillEntryList()
 						}else{
-							this.playSound(1)
+							this.playSound(0)
+							this.refreshHSourceBillState()
 							uni.showToast({
 								title:res.data.Message,
 								icon:'none'
@@ -645,7 +665,8 @@
 						}
 					},
 					fail: (res) => {
-						this.playSound(1)
+						this.playSound(0)
+						this.refreshHSourceBillState()
 						console.log(res);
 						uni.showToast({
 							title:'鎺ュ彛璇锋眰澶辫触',
@@ -677,6 +698,7 @@
                 if (HDeleteFlag == "*") {
                     if (sBarCode == "") {
 						this.playSound(0)
+						this.refreshBarCodeState()
                         uni.showToast({
                         	title:'璇锋壂鎻忚鍒犻櫎鐨勬潯鐮�',
 							icon:'none'
@@ -694,6 +716,7 @@
 									this.DisBillEntryList()
 								}else{
 									this.playSound(0)
+									this.refreshBarCodeState()
 									uni.showToast({
 										title:res.data.Message,
 										icon:'none'
@@ -702,6 +725,7 @@
 							},
 							fail: (res) => {
 								this.playSound(0)
+								this.refreshBarCodeState()
 								console.log(res);
 								uni.showToast({
 									title:'鎺ュ彛璇锋眰澶辫触',
@@ -787,6 +811,7 @@
 								this.hform.HQty = ''
 							}else{
 								this.playSound(0)
+								this.refreshBarCodeState()
 								uni.showToast({
 									title:res.data.Message,
 									icon:'none'
@@ -795,6 +820,7 @@
 						},
 						fail: (res) => {
 							this.playSound(0)
+							this.refreshBarCodeState()
 							console.log(res);
 							uni.showToast({
 								title:'鎺ュ彛璇锋眰澶辫触',
diff --git a/utils/mpaasScan.js b/utils/mpaasScan.js
new file mode 100644
index 0000000..deb1ca1
--- /dev/null
+++ b/utils/mpaasScan.js
@@ -0,0 +1,19 @@
+class mpaasScan {
+	mpaasScanModule
+	constructor() {
+		this.mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+	}
+
+	scanCode(callback) {
+		mpaasScanModule.mpaasScan({
+			'hideAlbum': true,
+			'timeoutInterval':'10', //瓒呮椂鏃堕棿
+			'timeoutText':'鏈瘑鍒埌浜岀淮鐮�' //瓒呮椂鎻愰啋            
+		},(ret) => {
+			console.log("璇嗗埆鐨勫唴瀹�: ", ret.resp_result)
+			callback.call(null ,ret.resp_result)
+		})
+	}
+}
+
+export let MpaasScan = Object.freeze(new mpaasScan())

--
Gitblit v1.9.1