From ae6fccae984271d6380567b22e0e5bdd8da9b52b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 09 八月 2024 14:38:32 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   83 ++++++++++++++++++++++++++++++-----------
 1 files changed, 61 insertions(+), 22 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index cd83df3..13b6f6e 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -4,7 +4,7 @@
 			<view class="item">
 				<view class="code-decs">鎵樼洏鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
-					@confirm="barcodeInput()">
+					@input="barcodeInput()">
 			</view>
 			<view class="item">
 				<view class="code-decs">鐗╂枡鐮�:</view>
@@ -47,6 +47,20 @@
 						</view>
 					</view>
 					<view class="list-left-item">
+						<view class="desc">琚嬪彿锛�</view>
+						<view class="left-item">{{item.units}}</view>
+					</view>
+					<view class="list-left-item">
+						<view class="desc">閲嶉噺澶囨敞锛�</view>
+						<view class="left-item">{{item.memo}}</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>
 					</view>
@@ -77,13 +91,25 @@
 						</view>
 					</view>
 					<view class="popup-item">
-						<view class="popup-item-left">鍚堝悓鍙�:</view>
+						<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">琚嬪彿:</view>
+						<view class="popup-item-right"><input type="text" v-model="units"></view>
+					</view>
+					<view class="popup-item">
+						<view class="popup-item-left">閲嶉噺澶囨敞:</view>
+						<view class="popup-item-right"><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 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">
@@ -98,7 +124,7 @@
 			<!-- 鎻愮ず绐楃ず渚� -->
 			<uni-popup ref="alertDialog" type="dialog">
 				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
-					@confirm="removeConfirm" @close="removeClose"></uni-popup-dialog>
+					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
 			</uni-popup>
 		</view>
 		<view>
@@ -136,6 +162,7 @@
 				rowNum: '',
 				matnr: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
@@ -143,8 +170,8 @@
 				content: '',
 				barcodeFocus: true,
 				matFocus: false,
-				matData: ''
-
+				matData: '',
+				removeNum: 0,
 			}
 		},
 		onLoad() {
@@ -187,14 +214,11 @@
 			},
 			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
 			focuss() {
-				// #ifdef APP
-				let that = this;
-				that.focus = false;
+				this.focus = false;
 				setTimeout(() => {
-					that.matnr = '';
-					that.focus = true;
+					this.matnr = '';
+					this.matFocus = true;
 				}, 100);
-				// #endif
 			},
 			// 鎼滅储鐗╂枡
 			findMat() {
@@ -225,12 +249,13 @@
 								events: {
 									matList: function(data) {
 										that.checkMat(data.data)
+										that.focuss()
 									},
 								},
 							});
-						} else if (res.code == 403) {
+						} else if (result.code == 403) {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -241,7 +266,7 @@
 							}, 1000);
 						} else {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -303,13 +328,15 @@
 				if (add) {
 					this.dataList.unshift(mat)
 				}
-				console.log(len);
 			},
 			// 淇敼鎵瑰彿
 			revise(item, i) {
 				this.matnr = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
 				this.batch = this.dataList[i].batch
+				this.units = this.dataList[i].units
+				this.memo = this.dataList[i].memo
+				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
 			},
@@ -319,16 +346,17 @@
 			},
 			// 鍒楄〃绉婚櫎鎸夐挳
 			remove(item, i, type) {
+				this.removeNum  = i
 				this.msgType = type
 				this.title = '璀﹀憡'
 				this.content = '鏄惁绉婚櫎褰撳墠鍟嗗搧!'
 				this.$refs.alertDialog.open(i)
 			},
 			// 纭绉婚櫎
-			removeConfirm(i) {
+			removeConfirm() {
 				this.messageText = "绉婚櫎鎴愬姛"
 				this.messageToggle('success')
-				this.dataList.splice(i, 1)
+				this.dataList.splice(this.removeNum, 1)
 			},
 			// 鍙栨秷绉婚櫎
 			removeClose() {
@@ -337,6 +365,10 @@
 			reviseConfirm() {
 				this.dataList[this.rowNum].anfme = this.count
 				this.dataList[this.rowNum].batch = this.batch
+				this.dataList[this.rowNum].units = this.units
+				this.dataList[this.rowNum].memo = this.memo
+				this.dataList[this.rowNum].weight = this.weight
+				this.matnr = ''
 				this.messageText = "淇敼鎴愬姛"
 				this.messageToggle('success')
 				this.$refs.revise.close()
@@ -392,6 +424,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')
@@ -435,11 +470,15 @@
 
 <style>
 	@import url('../../static/css/wms.css/wms.css');
+	
+	.list:first-child {
+		margin-top: 280rpx;
+	}
 
 	.code {
 		width: 100%;
 		position: fixed;
-		min-height: 200rpx;
+		min-height: 140rpx;
 		background-color: #FFF;
 		z-index: 10;
 	}
@@ -447,7 +486,7 @@
 	.item {
 		display: flex;
 		align-items: center;
-		height: 100rpx;
+		height: 70rpx;
 		margin-left: 20rpx;
 		border-bottom: 1px solid #DCDFE6;
 	}
@@ -479,10 +518,10 @@
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 200rpx;
+		margin-top: 140rpx;
 		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