From 2b1caeb8defa28b2dc769da5ca23c77873eb36d9 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期三, 13 八月 2025 11:30:25 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/weiwaigxIn/form.vue |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/pages/weiwaigxIn/form.vue b/pages/weiwaigxIn/form.vue
index f3ea476..5706239 100644
--- a/pages/weiwaigxIn/form.vue
+++ b/pages/weiwaigxIn/form.vue
@@ -4,16 +4,28 @@
 			<view class="form-item">
 				<view class="title"><text>*</text>鏉″舰鐮�:</view>
 				<view class="right" style="width: 380rpx;">
-					<input v-model="hform.HBarCode" disabled placeholder="璇锋壂鎻忔潯鐮�"/>
+					<input v-model="hform.HBarCode"  placeholder="璇锋壂鎻忔潯鐮�" @confirm="toInCode(e)"/>
 				</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>
 			<view class="form-item">
 				<view class="title"><text>*</text>娴佹按鍙�:</view>
 				<view class="right" style="width: 380rpx;">
-					<input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @confirm="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
+					<input v-model="hform.HProcNo" placeholder="璇疯緭鍏�(鎴栨壂鎻�)娴佹按鍙�" @blur="getHProcNoData(hform.HBarCode,hform.HProcNo)"/>
 				</view>
 				<uni-icons type="scan" style="margin-left: 10rpx;background-color: #3A78FF;padding: 6rpx;color: #fff;border-radius: 100%;" size="20" @click="toScanProcNo"></uni-icons>
+			</view>
+			<view class="form-item">
+			    <view class="title">宸ュ簭缂栫爜:</view>
+			    <view class="righton">
+			        <input disabled v-model="hform.HProcNumber" placeholder="璇疯緭鍏ュ伐搴忕紪鐮�" />
+			    </view>
+			</view>
+			<view class="form-item">
+				<view class="title">鏈彂鍑烘暟閲�:</view>
+				<view class="righton">
+					<input disabled v-model="hform.HNotReportQty" placeholder="璇疯緭鍏ュ悎鏍兼暟閲�" />
+				</view>
 			</view>
 			<view class="form-item">
 				<view class="title"><text>*</text>鍙戝嚭鏁伴噺:</view>
@@ -324,6 +336,8 @@
 					HBillNo:'',
 					HBarCode:'',
 					HProcNo:'',
+					HProcNumber: '',
+					HNotReportQty: 0,
 					HQty:'',
 					HEmpName:'',
 					HEmpID:'',
@@ -460,6 +474,18 @@
 						this.getHBarCodeData(ret.resp_result)
 					}
 				})
+			},
+			toInCode(e) {
+				var str = this.hform.HBarCode
+				if (str.includes('@')) {
+					const parts = str.split('@');
+					this.hform.HBarCode = parts[0]
+					this.hform.HProcNo = parts[1]
+					this.getHBarCodeData(parts[0], 1)
+					// this.getHProcNoData(parts[0],parts[1])
+				} else {
+					this.getHBarCodeData(this.hform.HBarCode)
+				}
 			},
 			//鎵祦姘村彿
 			toScanProcNo(){
@@ -804,6 +830,8 @@
 							this.hform.HProcID= data.HProcID
 							this.hform.HCenterName= data.宸ヤ綔涓績
 							this.hform.HCenterID= data.HCenterID
+							this.hform.HNotReportQty = data['鏈彂鍑烘暟閲�']
+							this.hform.HProcNumber = data['宸ュ簭浠g爜']
 							if(!this.hform.HSupName){
 								this.hform.HSupName= data.渚涘簲鍟�
 								this.hform.HSupID= data.HSupID
@@ -851,6 +879,9 @@
 				});
 			},
             submit() {
+				//鍘婚櫎鍒嗗彿浠ュ厤鍚庣鍒嗚В鎶ラ敊
+				this.hform.HMaterName= this.hform.HMaterName.replace(/;/g, '');
+				this.hform.HMaterModel = this.hform.HMaterModel.replace(/;/g, '');
             	if(!this.hform.HBarCode){
             		uni.showToast({
             			title:'璇锋壂鎻忚澶囨潯褰㈢爜',

--
Gitblit v1.9.1