From 8e60a2ba47e5094538bda44bceab1a64211a22f9 Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 26 一月 2026 20:21:55 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/sanmaheyi/BarCodeCheck.vue | 31 ++++++++++++---
pages/simaheyi/BarCodeCheck_SN.vue | 32 ++++++++++++---
2 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/pages/sanmaheyi/BarCodeCheck.vue b/pages/sanmaheyi/BarCodeCheck.vue
index 2c8b502..fe05c3a 100644
--- a/pages/sanmaheyi/BarCodeCheck.vue
+++ b/pages/sanmaheyi/BarCodeCheck.vue
@@ -5,7 +5,7 @@
<view class="title">鏍堟澘鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodePallet ? 'disabled' : ''">
- <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet"
+ <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_Pallet,1)" :disabled="disableBarCodePallet" />
</view>
<view class="right-icon">
@@ -18,7 +18,7 @@
<view class="title">鐩殑浠撶爜</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeDest ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination"
+ <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_Destination,2)" :disabled="disableBarCodeDest" />
</view>
<view class="right-icon">
@@ -31,7 +31,7 @@
<view class="title">涓鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeMiddle ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox "
+ <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_MiddleBox,3)" :disabled="disableBarCodeMiddle" />
</view>
<view class="right-icon">
@@ -235,6 +235,11 @@
// ==================== 鏂规硶 ====================
methods: {
+ //鐐瑰嚮鏂囨湰妗嗭紝鑷姩鍏ㄩ�夋枃鏈鍐呭
+ selectAll(e){
+ event.target.select();
+ },
+
// 澶嶉�夋鍙樺寲澶勭悊
checkboxGroupChangeHandler(e) {
let checkBoxValues = Array.from(e.detail.value)
@@ -318,7 +323,8 @@
HBarCodeType: HBarCodeType,
HInterID: this.hform.HInterID,
HBillNo: this.hform.HBillNo,
- HMaker: this.hform.HMaker
+ HMaker: this.hform.HMaker,
+ HBillType: "涓夌爜鍚堜竴"
},
resFunction: (res) => {
let {
@@ -331,14 +337,16 @@
CommonUtils.playSound(1)
if(HBarCodeType == 1){
+ disableBarCodePallet: false, // 鏍堟澘鐮佺鐢ㄧ姸鎬�
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌鐩殑浠撶爜杈撳叆妗�
this.HBarCodeDestFocusRefresh()
}else if(HBarCodeType == 2){
+ disableBarCodeDest: false, // 鐩殑浠撶爜绂佺敤鐘舵��
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌涓鐮佽緭鍏ユ
this.HBarCodeMiddleFocusRefresh()
}else if(HBarCodeType == 3){
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌SN鐮佽緭鍏ユ
- this.HBarCodeFocusRefresh()
+ this.HBarCodeMiddleFocusRefresh()
}
@@ -356,7 +364,14 @@
}
} else {
CommonUtils.playSound(0)
- this.HBarCodePalletFocusRefresh()
+ if(HBarCodeType == 1){
+ this.HBarCodePalletFocusRefresh()
+ }else if(HBarCodeType == 2){
+ this.HBarCodeDestFocusRefresh()
+ }else if(HBarCodeType == 3){
+ this.HBarCodeMiddleFocusRefresh()
+ }
+ //this.HBarCodePalletFocusRefresh()
uni.showToast({
icon: 'none',
title: Message
@@ -628,7 +643,8 @@
url: '/CheckBarcodeController/Save_BarCode_BarcodeCheck',
data: {
"HInterID": this.hform.HInterID,
- "HBillNo": this.hform.HBillNo
+ "HBillNo": this.hform.HBillNo,
+ "HBillType": "涓夌爜鍚堜竴"
},
resFunction: (res) => {
let {
@@ -657,6 +673,7 @@
}
})
} else {
+ this.EnableSubmit = true
uni.showToast({
icon: 'none',
title: Message
diff --git a/pages/simaheyi/BarCodeCheck_SN.vue b/pages/simaheyi/BarCodeCheck_SN.vue
index baa67c8..a03b968 100644
--- a/pages/simaheyi/BarCodeCheck_SN.vue
+++ b/pages/simaheyi/BarCodeCheck_SN.vue
@@ -5,7 +5,7 @@
<view class="title">鏍堟澘鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodePallet ? 'disabled' : ''">
- <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet"
+ <input type="text" :focus="HBarCodePalletFocus" v-model="HBarCode_Pallet" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_Pallet,1)" :disabled="disableBarCodePallet" />
</view>
<view class="right-icon">
@@ -18,7 +18,7 @@
<view class="title">鐩殑浠撶爜</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeDest ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination"
+ <input type="text" :focus="HBarCodeDestFocus" v-model="HBarCode_Destination" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_Destination,2)" :disabled="disableBarCodeDest" />
</view>
<view class="right-icon">
@@ -31,7 +31,7 @@
<view class="title">涓鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeMiddle ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox "
+ <input type="text" :focus="HBarCodeMiddleFocus" v-model="HBarCode_MiddleBox" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_MiddleBox,3)" :disabled="disableBarCodeMiddle" />
</view>
<view class="right-icon">
@@ -44,7 +44,7 @@
<view class="title">浜у搧鐮�</view>
<!-- 鎸夌収婧愬崟鐗╂枡鏍峰紡娣诲姞disabled绫诲拰绂佺敤灞炴�� -->
<view class="right" :class="disableBarCodeSN ? 'disabled' : ''">
- <input type="text" :focus="HBarCodeSNFocus" v-model="HBarCode_SN"
+ <input type="text" :focus="HBarCodeSNFocus" v-model="HBarCode_SN" v-on:click="selectAll"
@confirm="CheckBarcode(HBarCode_SN,4)" :disabled="disableBarCodeSN" />
</view>
<view class="right-icon">
@@ -235,6 +235,11 @@
// ==================== 鏂规硶 ====================
methods: {
+ //鐐瑰嚮鏂囨湰妗嗭紝鑷姩鍏ㄩ�夋枃鏈鍐呭
+ selectAll(e){
+ event.target.select();
+ },
+
// 澶嶉�夋鍙樺寲澶勭悊
checkboxGroupChangeHandler(e) {
let checkBoxValues = Array.from(e.detail.value)
@@ -326,7 +331,8 @@
HBarCodeType: HBarCodeType,
HInterID: this.hform.HInterID,
HBillNo: this.hform.HBillNo,
- HMaker: this.hform.HMaker
+ HMaker: this.hform.HMaker,
+ HBillType: "鍥涚爜鍚堜竴"
},
resFunction: (res) => {
let {
@@ -339,9 +345,11 @@
CommonUtils.playSound(1)
if(HBarCodeType == 1){
+ disableBarCodePallet: false, // 鏍堟澘鐮佺鐢ㄧ姸鎬�
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌鐩殑浠撶爜杈撳叆妗�
this.HBarCodeDestFocusRefresh()
}else if(HBarCodeType == 2){
+ disableBarCodeDest: false, // 鐩殑浠撶爜绂佺敤鐘舵��
//澶勭悊鎴愬姛鍚庤仛鐒﹀埌涓鐮佽緭鍏ユ
this.HBarCodeMiddleFocusRefresh()
}else if(HBarCodeType == 3){
@@ -366,7 +374,15 @@
}
} else {
CommonUtils.playSound(0)
- this.HBarCodePalletFocusRefresh()
+ if(HBarCodeType == 1){
+ this.HBarCodePalletFocusRefresh()
+ }else if(HBarCodeType == 2){
+ this.HBarCodeDestFocusRefresh()
+ }else if(HBarCodeType == 3){
+ this.HBarCodeMiddleFocusRefresh()
+ }else if(HBarCodeType == 4){
+ this.HBarCodeSNFocusRefresh()
+ }
uni.showToast({
icon: 'none',
title: Message
@@ -630,7 +646,8 @@
url: '/CheckBarcodeController/Save_BarCode_BarcodeCheck',
data: {
"HInterID": this.hform.HInterID,
- "HBillNo": this.hform.HBillNo
+ "HBillNo": this.hform.HBillNo,
+ "HBillType": "鍥涚爜鍚堜竴"
},
resFunction: (res) => {
let {
@@ -659,6 +676,7 @@
}
})
} else {
+ this.EnableSubmit = true
uni.showToast({
icon: 'none',
title: Message
--
Gitblit v1.9.1