From 46f36432517b2e6dbfd3626cb38761881ffae8bd Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期二, 27 一月 2026 09:33:28 +0800
Subject: [PATCH] Merge branches 'Dev' and 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
---
pages/ZLGL/mojianjianyan/ProcessCheckBill.vue | 165 +++++++++-------
pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue | 151 +++++++++------
pages/sanmaheyi/BarCodeCheck.vue | 31 ++
pages/simaheyi/BarCodeCheck_SN.vue | 32 ++
pages/ZLGL/QualityReportStep/QualityReportStepBill.vue | 18 +
pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue | 9
pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue | 153 +++++++++------
7 files changed, 349 insertions(+), 210 deletions(-)
diff --git a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
index 6145ffa..26da410 100644
--- a/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
+++ b/pages/MJGL/Sc_MouldRepairSendWork/Sc_MouldRepairSendWorkBill.vue
@@ -328,6 +328,7 @@
HRepairList: [],
hform: {
+ "HBillType":"3843",
"HBarCode": "",
"HBillNo": "",
"HInterID": "0",
@@ -375,9 +376,9 @@
"HUpDateDate": "",
"HDeleteMan": "",
"HDeleteDate": "",
- HMouldName: "",
- HMouldSpec: "",
- HMouldModel: "",
+ "HMouldName": "",
+ "HMouldSpec": "",
+ "HMouldModel": "",
"HStockOrgID": uni.getStorageSync("OrganizationID") || "0" // 鏂板
},
HDetailList: [{ // 鍚庣鎺ュ彛鎻愪氦闇�瑕� 鏄庣粏淇℃伅
@@ -905,7 +906,7 @@
</script>
<style lang="scss" scoped>
- // @import "@/pages/MJGL/style/MJBillStyle.scss";
+ @import "@/pages/MJGL/style/MJBillStyle.scss";
.picker-overlay {
position: absolute;
diff --git a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
index 6b5a7e6..2b82411 100644
--- a/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
+++ b/pages/ZLGL/QualityReportStep/QualityReportStepBill.vue
@@ -1045,9 +1045,24 @@
goBack() {
uni.navigateBack();
},
+ // 璁剧疆涓鸿嚜鍔�
+ setAuto() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.unlockOrientation();
+ }
+ },
+ // 璁剧疆涓虹珫灞�
+ setPortrait() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.lockOrientation('portrait');
+ }
+ },
},
async onLoad(e) {
+ this.setAuto();
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
@@ -1061,6 +1076,9 @@
await this.InitHGroup();
await this.loadCache();
},
+ onUnload(){
+ this.setPortrait();
+ }
};
</script>
diff --git a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
index 215a9d3..5a86d62 100644
--- a/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
+++ b/pages/ZLGL/lailiaojianyan/POStockInCheckBill.vue
@@ -274,7 +274,7 @@
@tap="subTabSelected = subTab.id">{{ subTab.name }}</view>
</view>
<!-- 瀛愯〃鍐呭 -->
- <view class="bill-main-contents">
+ <view class="bill-sub-content">
<!-- 妫�楠岄」鐩� 鍛堢幇 -->
<view v-if="subTabSelected == 1">
<!-- 闇�閫氳繃鏄惧紡璋冪敤蹇界暐$event鍙傛暟 -->
@@ -2265,8 +2265,23 @@
});
}
},
+ // 璁剧疆涓鸿嚜鍔�
+ setAuto() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.unlockOrientation();
+ }
+ },
+ // 璁剧疆涓虹珫灞�
+ setPortrait() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.lockOrientation('portrait');
+ }
+ },
},
async onLoad(e) {
+ this.setAuto();
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
console.log(this.hform.HFirstCheckEmp)
@@ -2281,6 +2296,9 @@
await this.InitHEmp();
await this.loadCache();
},
+ onUnload(){
+ this.setPortrait();
+ }
};
</script>
@@ -2323,62 +2341,68 @@
}
}
- .bill-main-content,
- .bill-sub-content {
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
- display: flex;
- flex-direction: column;
-
- .form-item {
- width: 100%;
- display: flex;
- align-items: center;
- font-size: 26rpx;
- padding: 6rpx 0;
-
- .left {
- width: 208rpx;
-
- text {
- color: red;
- font-weight: bold;
- }
- }
-
- .right {
- // width: 450rpx;
- padding: 8rpx 20rpx;
- font-size: 26rpx;
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
-
- .uni-combox {
- padding: 0;
- height: auto;
-
- .uni-input-placeholder,
- .uni-input-input {
- font-size: 26rpx;
- }
- }
-
- .uni-combox::v-deep input {
- height: inherit;
- font-size: 26rpx;
- }
- }
-
- .disabled {
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
-
- .none-border {
- border: none;
- }
- }
+ .bill-main-content{
+ box-sizing: border-box;
+ padding: 0 30rpx 0 30rpx;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap; /* 瓒呭嚭鑷姩鎹㈣ */
+ /* 鍙�夛細璁剧疆鎹㈣鍚庣殑瀵归綈鏂瑰紡 */
+ align-content: flex-start; /* 澶氳瀵归綈鏂瑰紡 */
+ .form-item {
+ width: 600rpx;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
+ margin-right: 20rpx;
+ .left {
+ width: 208rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ // width: 450rpx;
+ padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+
+ .uni-combox {
+ padding: 0;
+ height: auto;
+
+ .uni-input-placeholder,
+ .uni-input-input {
+ font-size: 26rpx;
+ }
+ }
+
+ .uni-combox::v-deep input {
+ height: inherit;
+ font-size: 26rpx;
+ }
+ }
+ .right-select {
+ //padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+
+ }
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ .none-border {
+ border: none;
+ }
+ }
}
.bottom-btn {
@@ -2456,12 +2480,17 @@
color: #fff;
}
}
-
+ ::v-deep .uni-card {
+ flex: 500rpx;
+ }
.list {
width: 100%;
-
+ display: flex; /* 娣诲姞flex甯冨眬 */
+ flex-wrap: wrap; /* 鍏佽鎹㈣ */
+ gap: 20rpx; /* 璁剧疆鍗＄墖闂磋窛 */
+
.card-detail {
- width: 100%;
+ width: 500rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
@@ -2469,7 +2498,7 @@
line-height: 120%;
padding: 20rpx 10rpx;
gap: 10rpx 0;
-
+
input {
font-size: 26rpx;
}
@@ -2505,7 +2534,7 @@
}
}
}
-
+
.icon-wrapper {
background-color: #3a78ff;
border-radius: 100%;
diff --git a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
index 5422f7c..e7dbd6e 100644
--- a/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
+++ b/pages/ZLGL/mojianjianyan/ProcessCheckBill.vue
@@ -2250,8 +2250,23 @@
});
}
},
+ // 璁剧疆涓鸿嚜鍔�
+ setAuto() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.unlockOrientation();
+ }
+ },
+ // 璁剧疆涓虹珫灞�
+ setPortrait() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.lockOrientation('portrait');
+ }
+ },
},
async onLoad(e) {
+ this.setAuto();
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
@@ -2285,6 +2300,9 @@
await this.InitHEmp();
await this.loadCache();
},
+ onUnload(){
+ this.setPortrait();
+ }
};
</script>
@@ -2327,62 +2345,68 @@
}
}
- .bill-main-content,
- .bill-sub-content {
- box-sizing: border-box;
- padding: 0 30rpx 0 30rpx;
- display: flex;
- flex-direction: column;
-
- .form-item {
- width: 100%;
- display: flex;
- align-items: center;
- font-size: 26rpx;
- padding: 6rpx 0;
-
- .left {
- width: 208rpx;
-
- text {
- color: red;
- font-weight: bold;
- }
- }
-
- .right {
- // width: 450rpx;
- padding: 8rpx 20rpx;
- font-size: 26rpx;
- flex: 1;
- border-radius: 22rpx;
- border: 1px solid #acacac;
-
- .uni-combox {
- padding: 0;
- height: auto;
-
- .uni-input-placeholder,
- .uni-input-input {
- font-size: 26rpx;
- }
- }
-
- .uni-combox::v-deep input {
- height: inherit;
- font-size: 26rpx;
- }
- }
-
- .disabled {
- border: 1px solid #e4e4e4;
- background-color: #e4e4e4;
- }
-
- .none-border {
- border: none;
- }
- }
+ .bill-main-content{
+ box-sizing: border-box;
+ padding: 0 30rpx 0 30rpx;
+ display: flex;
+ flex-direction: row;
+ flex-wrap: wrap; /* 瓒呭嚭鑷姩鎹㈣ */
+ /* 鍙�夛細璁剧疆鎹㈣鍚庣殑瀵归綈鏂瑰紡 */
+ align-content: flex-start; /* 澶氳瀵归綈鏂瑰紡 */
+ .form-item {
+ width: 600rpx;
+ display: flex;
+ align-items: center;
+ font-size: 26rpx;
+ padding: 6rpx 0;
+ margin-right: 20rpx;
+ .left {
+ width: 208rpx;
+
+ text {
+ color: red;
+ font-weight: bold;
+ }
+ }
+
+ .right {
+ // width: 450rpx;
+ padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+ border-radius: 22rpx;
+ border: 1px solid #acacac;
+
+ .uni-combox {
+ padding: 0;
+ height: auto;
+
+ .uni-input-placeholder,
+ .uni-input-input {
+ font-size: 26rpx;
+ }
+ }
+
+ .uni-combox::v-deep input {
+ height: inherit;
+ font-size: 26rpx;
+ }
+ }
+ .right-select {
+ //padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+
+ }
+ .disabled {
+ border: 1px solid #e4e4e4;
+ background-color: #e4e4e4;
+ }
+
+ .none-border {
+ border: none;
+ }
+ }
}
.bottom-btn {
@@ -2461,51 +2485,52 @@
}
}
+ ::v-deep .uni-card {
+ flex: 500rpx;
+ }
.list {
width: 100%;
-
+ display: flex; /* 娣诲姞flex甯冨眬 */
+ flex-wrap: wrap; /* 鍏佽鎹㈣ */
+ gap: 20rpx; /* 璁剧疆鍗＄墖闂磋窛 */
+
.card-detail {
- width: 100%;
+ width: 500rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
align-items: center;
line-height: 120%;
+ padding: 20rpx 10rpx;
gap: 10rpx 0;
-
+
input {
font-size: 26rpx;
}
-
+
.detail {
// width: 50%;
box-sizing: border-box;
font-size: 26rpx;
color: #555;
padding-right: 20rpx;
-
+
text {
color: #999;
font-size: 26rpx;
}
}
-
+
.editable {
width: 50%;
display: inline-flex;
flex-direction: row;
align-items: center;
-
+
text {
flex-shrink: 0;
}
-
- .sampleDestory {
- border: 1px solid #acacac;
- border-radius: 10%;
- padding: 0 12rpx;
- }
-
+
.editable-input {
border: 1px solid #acacac;
border-radius: 5rpx;
diff --git a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
index dc1a4a7..4f68437 100644
--- a/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
+++ b/pages/ZLGL/shengchanrukujiaoyan/QC_LastPieceCheckBill_v2.vue
@@ -1282,8 +1282,8 @@
url: "/Gy_Employee/list",
data: {
sWhere: ` and 缁勭粐鍚嶇О = '${uni.getStorageSync(
- "Organization"
- )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !='' order by 閮ㄩ棬浠ｇ爜`,
+ "Organization"
+ )}' and 绂佺敤鏍囪 = ''and 瀹℃牳浜� !=''`,
user: getUserInfo()["Czymc"],
Organization: uni.getStorageSync("Organization"),
},
@@ -2317,8 +2317,23 @@
});
}
},
+ // 璁剧疆涓鸿嚜鍔�
+ setAuto() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.unlockOrientation();
+ }
+ },
+ // 璁剧疆涓虹珫灞�
+ setPortrait() {
+ if (uni.getSystemInfoSync().platform === 'android' ||
+ uni.getSystemInfoSync().platform === 'ios') {
+ plus.screen.lockOrientation('portrait');
+ }
+ },
},
async onLoad(e) {
+ this.setAuto();
this.operationType = e.operationType || 1;
this.hform.HInterID = e.linterid || 0;
if (this.operationType == 1) {
@@ -2337,6 +2352,9 @@
await this.InitHEmp();
await this.loadCache()
},
+ onUnload(){
+ this.setPortrait();
+ }
};
</script>
@@ -2379,29 +2397,30 @@
}
}
- .bill-main-content,
- .bill-sub-content {
+ .bill-main-content{
box-sizing: border-box;
padding: 0 30rpx 0 30rpx;
display: flex;
- flex-direction: column;
-
+ flex-direction: row;
+ flex-wrap: wrap; /* 瓒呭嚭鑷姩鎹㈣ */
+ /* 鍙�夛細璁剧疆鎹㈣鍚庣殑瀵归綈鏂瑰紡 */
+ align-content: flex-start; /* 澶氳瀵归綈鏂瑰紡 */
.form-item {
- width: 100%;
+ width: 600rpx;
display: flex;
align-items: center;
font-size: 26rpx;
padding: 6rpx 0;
-
+ margin-right: 20rpx;
.left {
width: 208rpx;
-
+
text {
color: red;
font-weight: bold;
}
}
-
+
.right {
// width: 450rpx;
padding: 8rpx 20rpx;
@@ -2409,28 +2428,33 @@
flex: 1;
border-radius: 22rpx;
border: 1px solid #acacac;
-
+
.uni-combox {
padding: 0;
height: auto;
-
+
.uni-input-placeholder,
.uni-input-input {
font-size: 26rpx;
}
}
-
+
.uni-combox::v-deep input {
height: inherit;
font-size: 26rpx;
}
}
-
+ .right-select {
+ //padding: 8rpx 20rpx;
+ font-size: 26rpx;
+ flex: 1;
+
+ }
.disabled {
border: 1px solid #e4e4e4;
background-color: #e4e4e4;
}
-
+
.none-border {
border: none;
}
@@ -2513,52 +2537,59 @@
}
}
+ ::v-deep .uni-card {
+ flex: 500rpx;
+ }
.list {
- width: 100%;
-
- .card-detail {
- width: 100%;
- display: flex;
- flex-wrap: wrap;
- justify-content: space-between;
- align-items: center;
- line-height: 120%;
- gap: 10rpx 0;
-
- input {
- font-size: 26rpx;
- }
-
- .detail {
- // width: 50%;
- box-sizing: border-box;
- font-size: 26rpx;
- color: #555;
- padding-right: 20rpx;
-
- text {
- color: #999;
- font-size: 26rpx;
- }
- }
-
- .editable {
- width: 50%;
- display: inline-flex;
- flex-direction: row;
- align-items: center;
-
- text {
- flex-shrink: 0;
- }
-
- .editable-input {
- border: 1px solid #acacac;
- border-radius: 5rpx;
- padding: 0 12rpx;
- }
- }
- }
+ width: 100%;
+ display: flex; /* 娣诲姞flex甯冨眬 */
+ flex-wrap: wrap; /* 鍏佽鎹㈣ */
+ gap: 20rpx; /* 璁剧疆鍗＄墖闂磋窛 */
+
+ .card-detail {
+ width: 500rpx;
+ display: flex;
+ flex-wrap: wrap;
+ justify-content: space-between;
+ align-items: center;
+ line-height: 120%;
+ padding: 20rpx 10rpx;
+ gap: 10rpx 0;
+
+ input {
+ font-size: 26rpx;
+ }
+
+ .detail {
+ // width: 50%;
+ box-sizing: border-box;
+ font-size: 26rpx;
+ color: #555;
+ padding-right: 20rpx;
+
+ text {
+ color: #999;
+ font-size: 26rpx;
+ }
+ }
+
+ .editable {
+ width: 50%;
+ display: inline-flex;
+ flex-direction: row;
+ align-items: center;
+
+ text {
+ flex-shrink: 0;
+ }
+
+ .editable-input {
+ border: 1px solid #acacac;
+ border-radius: 5rpx;
+ padding: 0 12rpx;
+ }
+ }
+ }
}
.icon-wrapper {
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