From 4a01b5f1b111885aa0cadf3d5f96fee78413be16 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 26 九月 2025 15:09:29 +0800
Subject: [PATCH] 1

---
 pages/pakin/pakin.vue |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 21fd78a..6fc7fc9 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -41,17 +41,17 @@
 						<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>
 					</view>
-					<view class="list-left-item">
+					<!-- <view class="list-left-item">
 						<view class="desc">閲嶉噺锛�</view>
 						<view class="left-item">
 							<uni-tag :text="item.weight" type="warning"></uni-tag>
 						</view>
-					</view>
+					</view> -->
 					<view class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
@@ -82,14 +82,14 @@
 								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="memo"></view>
+					</view>
+					<!-- <view class="popup-item">
 						<view class="popup-item-left">閲嶉噺:</view>
 						<view class="popup-item-right"><input type="text" v-model="weight"></view>
-					</view>
+					</view> -->
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
@@ -141,6 +141,7 @@
 				baseUrl: '',
 				token: '',
 				barcode: '',
+				mome: '',
 				dataList: [],
 				count: 0,
 				rowNum: '',
@@ -172,6 +173,7 @@
 			},
 			// barcode input 浜嬩欢
 			barcodeInput() {
+				this.barcode = this.barcode.replace(/^\{|\}$/g, '')
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
 					var len = this.barcode.length
@@ -198,7 +200,8 @@
 			},
 			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
-				this.focus = false;
+				this.barcodeFocus = false;
+				this.matFocus = false;
 				setTimeout(() => {
 					this.matnr = '';
 					this.matFocus = true;
@@ -207,10 +210,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')
@@ -237,9 +249,9 @@
 									},
 								},
 							});
-						} else if (res.code == 403) {
+						} else if (result.code == 403) {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -250,7 +262,7 @@
 							}, 1000);
 						} else {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -312,12 +324,14 @@
 				if (add) {
 					this.dataList.unshift(mat)
 				}
+				this.$forceUpdate() // 寮哄埗鍒锋柊
 			},
 			// 淇敼鎵瑰彿
 			revise(item, i) {
 				this.matnr = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
+				this.memo = this.dataList[i].memo
 				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
@@ -498,6 +512,6 @@
 		z-index: 9;
 		/* border-top: 1px solid #DCDFE6; */
 		text-align: center;
-		box-shadow: 0px 0px 30px 0px rgba(0, 0, 0, 0.5);
+		box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.2);
 	}
 </style>

--
Gitblit v1.9.1