From 12ea25865f385bbfa76c8a0cecb86de618d9b5f5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 21 十月 2024 16:47:06 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   48 ++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 116e5c1..0a9b59f 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -41,11 +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="desc">閲嶉噺锛�</view>
+						<view class="left-item">
+							<uni-tag :text="item.weight" type="warning"></uni-tag>
+						</view>
+					</view> -->
 					<view class="list-left-item">
 						<view class="desc">鏁伴噺锛�</view>
 						<view class="left-item">{{item.anfme}}</view>
@@ -76,14 +82,18 @@
 								style="background-color: #f7f7f7;padding: 0;color: #d5d5d5;">
 						</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="batch"></view>
+						<view class="popup-item-left">閲嶉噺:</view>
+						<view class="popup-item-right"><input type="text" v-model="weight"></view>
 					</view> -->
 					<view class="popup-item">
 						<view class="popup-item-left">鏁伴噺:</view>
 						<view class="popup-item-right" style="border: none;justify-content: center;">
-							<uni-number-box :value="count" :max="9999999" color="#747474" @change="changeValue" />
+							<uni-number-box :value="count" :step='0.01' :max="9999999" color="#747474" @change="changeValue" />
 						</view>
 					</view>
 					<view class="btn">
@@ -136,6 +146,7 @@
 				rowNum: '',
 				matnr: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
@@ -161,6 +172,7 @@
 			},
 			// barcode input 浜嬩欢
 			barcodeInput() {
+				this.barcode = this.barcode.replace(/^\{|\}$/g, '')
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(() => {
 					var len = this.barcode.length
@@ -187,7 +199,8 @@
 			},
 			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
-				this.focus = false;
+				this.barcodeFocus = false;
+				this.matFocus = false;
 				setTimeout(() => {
 					this.matnr = '';
 					this.matFocus = true;
@@ -196,10 +209,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')
@@ -226,9 +248,9 @@
 									},
 								},
 							});
-						} else if (res.code == 403) {
+						} else if (result.code == 403) {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -239,7 +261,7 @@
 							}, 1000);
 						} else {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -301,12 +323,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.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
 			},
@@ -335,6 +359,7 @@
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].weight = this.weight
 				this.matnr = ''
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
@@ -391,6 +416,9 @@
 							that.resst();
 							that.messageText = "缁勬墭鎴愬姛"
 							that.messageToggle('success')
+							const innerAudioContext = uni.createInnerAudioContext();
+							innerAudioContext.src = '/static/music/pakinOk.mp3';
+							innerAudioContext.play()
 						} else if (res.code == 403) {
 							that.messageText = res.msg
 							that.messageToggle('error')
@@ -482,6 +510,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