From 59c46888d53c7e79022dd9a50262d4a3a10ae8dc Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 九月 2024 12:35:19 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |   79 +++++++++++++++++++++++++++++++--------
 1 files changed, 62 insertions(+), 17 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index 1b57437..f8808aa 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -6,6 +6,7 @@
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
 					@input="barcodeInput()">
 			</view>
+			
 			<view class="item">
 				<view class="code-decs">鐗╂枡鐮�:</view>
 				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
@@ -14,6 +15,11 @@
 					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
 					<uni-icons type="right" color="#c1c1c1"></uni-icons>
 				</view>
+			</view>
+			<view class="item">
+				<view class="code-decs">澶囨敞:</view>
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="locname" :focus="barcodeFocus"
+					>
 			</view>
 		</view>
 		<view class="mat-list-title">
@@ -47,6 +53,16 @@
 						</view>
 					</view>
 					<view class="list-left-item">
+						<view class="desc">鍖呰鍙凤細</view>
+						<view class="left-item">{{item.itemNum}}</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 +93,22 @@
 						</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="itemNum"></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">
@@ -136,6 +161,7 @@
 				rowNum: '',
 				matnr: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
@@ -145,6 +171,8 @@
 				matFocus: false,
 				matData: '',
 				removeNum: 0,
+				locname:'',
+				itemNum:''
 			}
 		},
 		onLoad() {
@@ -226,9 +254,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 +267,7 @@
 							}, 1000);
 						} else {
 							uni.showToast({
-								title: res.msg,
+								title: result.msg,
 								icon: "none",
 								position: 'top'
 							})
@@ -276,13 +304,13 @@
 				var add = true ,sameItem = false
 				for (var i = 0; i < len; i++) {
 					if (mat.matnr == this.dataList[i].matnr) {
-						for (var j = 0; j < len; j++) {
-							if (mat.batch == this.dataList[j].batch) {
-								sameItem = true
-							}
-						}
+						// for (var j = 0; j < len; j++) {
+						// 	if (mat.batch == this.dataList[j].batch) {
+						// 		sameItem = true
+						// 	}
+						// }
 						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
-						if (mat.batch != this.dataList[i].batch) {
+						if (mat.batch != this.dataList[i].batch || mat.itemNum != this.dataList[i].itemNum) {
 							this.$forceUpdate() // 寮哄埗鍒锋柊
 							if (sameItem) {
 								add = false
@@ -306,7 +334,9 @@
 			revise(item, i) {
 				this.matnr = this.dataList[i].matnr
 				this.count = this.dataList[i].anfme
-				this.batch = this.dataList[i].batch
+				this.batch = this.dataList[i].batch				
+				this.itemNum = this.dataList[i].itemNum
+				this.weight = this.dataList[i].weight
 				this.rowNum = i
 				this.eject()
 			},
@@ -335,6 +365,9 @@
 			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')
@@ -379,6 +412,7 @@
 					url: that.baseUrl + '/mobile/comb/auth',
 					data: JSON.stringify({
 						barcode: that.barcode,
+						locname: that.locname,
 						combMats: that.dataList
 					}),
 					method: 'POST',
@@ -391,6 +425,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')
@@ -415,6 +452,9 @@
 			// 纭閲嶇疆
 			resetConfirm() {
 				this.dataList = []
+				this.barcode = ''
+				this.locname = ''
+				this.matnr = ''
 				this.messageText = "閲嶇疆瀹屾垚"
 				this.messageToggle('success')
 			},
@@ -426,6 +466,7 @@
 			resst() {
 				this.dataList = []
 				this.barcode = ''
+				this.locname = ''
 				this.barcodeFocuss()
 			},
 		}
@@ -434,6 +475,10 @@
 
 <style>
 	@import url('../../static/css/wms.css/wms.css');
+	
+	.list:first-child {
+		margin-top: 300rpx;
+	}
 
 	.code {
 		width: 100%;
@@ -446,7 +491,7 @@
 	.item {
 		display: flex;
 		align-items: center;
-		height: 100rpx;
+		height: 70rpx;
 		margin-left: 20rpx;
 		border-bottom: 1px solid #DCDFE6;
 	}
@@ -473,15 +518,15 @@
 	}
 
 	.mat-list-title {
-		height: 80rpx;
-		line-height: 80rpx;
+		height: 60rpx;
+		line-height: 60rpx;
 		width: 100%;
 		background-color: white;
 		position: fixed;
-		margin-top: 200rpx;
+		margin-top: 210rpx;
 		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