From 7dfb9ee5dac9d661773947d3665232f0bf37617a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 22 九月 2025 09:17:36 +0800
Subject: [PATCH] 新增解绑

---
 pages/pakin/pakin.vue |   51 ++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 1035979..3c5544a 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -7,6 +7,11 @@
 					@input="barcodeInput()">
 			</view>
 			<view class="item">
+				<view class="code-decs">绔欑偣鐮�:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="staNo" :focus="staNoFocus"
+					@input="staNoInput()">
+			</view>
+			<view class="item">
 				<view class="code-decs">鐗╂枡鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
 				<view class="item-right">
@@ -41,7 +46,7 @@
 						<view class="left-item">{{item.specs}}</view>
 					</view>
 					<view class="list-left-item">
-						<view class="desc">鎵瑰彿锛�</view>
+						<view class="desc" style="width: 38%;">鎯呭喌璇存槑锛�</view>
 						<view class="left-item">
 							<uni-tag :text="item.batch" type="warning"></uni-tag>
 						</view>
@@ -82,10 +87,10 @@
 								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
 						</view>
 					</view>
-					<!-- <view class="popup-item">
-						<view class="popup-item-left">鎵瑰彿:</view>
-						<view class="popup-item-right"><input type="text" v-model="batch"></view>
-					</view> -->
+					<view class="popup-item">
+						<view class="popup-item-left" style="width: 20vw;">鎯呭喌璇存槑:</view>
+						<view class="popup-item-right" style="width: 46vw;"><input type="text" v-model="batch"></view>
+					</view>
 					<!-- <view class="popup-item">
 						<view class="popup-item-left">閲嶉噺:</view>
 						<view class="popup-item-right"><input type="text" v-model="weight"></view>
@@ -141,6 +146,7 @@
 				baseUrl: '',
 				token: '',
 				barcode: '',
+				staNo: '',
 				dataList: [],
 				count: 0,
 				rowNum: '',
@@ -154,6 +160,7 @@
 				content: '',
 				barcodeFocus: true,
 				matFocus: false,
+				staNoFocus: false,
 				matData: '',
 				removeNum: 0,
 			}
@@ -172,6 +179,7 @@
 			},
 			// barcode input 浜嬩欢
 			barcodeInput() {
+				this.barcode = this.barcode.replace(/^\{|\}$/g, '')
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
 					var len = this.barcode.length
@@ -187,6 +195,11 @@
 					this.focuss()
 				}, 200)
 			},
+			
+			// staNo input 浜嬩欢
+			staNoInput() {
+				this.staNofocuss()
+			},
 			// 鎵樼洏鐮佹湁璇噸缃�
 			barcodeFocuss() {
 				let that = this;
@@ -198,7 +211,20 @@
 			},
 			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
-				this.focus = false;
+				this.barcodeFocus = false;
+				this.matFocus = false;
+				this.staNoFocus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.staNo = '';
+					this.staNoFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			staNofocuss() {
+				this.barcodeFocus = false;
+				this.matFocus = false;
+				this.staNoFocus = false;
 				setTimeout(() => {
 					this.matnr = '';
 					this.matFocus = true;
@@ -207,10 +233,19 @@
 			// 鎼滅储鐗╂枡
 			findMat() {
 				let that = this
+				var mat = that.matnr
+				let submitMat 
+				let newMatnr
+				if (mat.includes(';')) {
+					newMatnr = mat.split(';')
+					submitMat = newMatnr[1]
+				} else {
+					submitMat = mat
+				}
 				uni.request({
 					url: that.baseUrl + '/mat/auth',
 					data: {
-						matnr: that.matnr
+						matnr: submitMat
 					},
 					header: {
 						'token': uni.getStorageSync('token')
@@ -312,6 +347,7 @@
 				if (add) {
 					this.dataList.unshift(mat)
 				}
+				this.$forceUpdate() // 寮哄埗鍒锋柊
 			},
 			// 淇敼鎵瑰彿
 			revise(item, i) {
@@ -391,6 +427,7 @@
 				uni.request({
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
+						staNo: that.staNo,
 						barcode: that.barcode,
 						combMats: that.dataList
 					}),

--
Gitblit v1.9.1