From aca46a03226d908a96b074010633e15ce4df1a4d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 25 三月 2024 16:55:52 +0800
Subject: [PATCH] #

---
 pages/pakin/pakin.vue |  349 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 276 insertions(+), 73 deletions(-)

diff --git a/pages/pakin/pakin.vue b/pages/pakin/pakin.vue
index f94aef4..1035979 100644
--- a/pages/pakin/pakin.vue
+++ b/pages/pakin/pakin.vue
@@ -3,13 +3,15 @@
 		<view class="code">
 			<view class="item">
 				<view class="code-decs">鎵樼洏鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆">
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="barcode" :focus="barcodeFocus"
+					@input="barcodeInput()">
 			</view>
 			<view class="item">
 				<view class="code-decs">鐗╂枡鐮�:</view>
-				<input type="text" placeholder=" 鎵爜 / 杈撳叆">
+				<input type="text" placeholder=" 鎵爜 / 杈撳叆" v-model="matnr" :focus="matFocus" @input="findMat()">
 				<view class="item-right">
-					<text style="text-align: right;color: #409EFF;">鎻愬彇+</text>
+					<button></button>
+					<text style="text-align: right;color: #409EFF;" @click="selectMat()">鎻愬彇+</text>
 					<uni-icons type="right" color="#c1c1c1"></uni-icons>
 				</view>
 			</view>
@@ -26,7 +28,9 @@
 					</view>
 					<view class="list-left-item">
 						<view class="desc">缂栫爜锛�</view>
-						<view class="left-item">{{item.matnr}}</view>
+						<view class="left-item">
+							<uni-tag :text="item.matnr" type="primary"></uni-tag>
+						</view>
 					</view>
 					<view class="list-left-item">
 						<view class="desc">鍝佸悕锛�</view>
@@ -38,16 +42,24 @@
 					</view>
 					<view class="list-left-item">
 						<view class="desc">鎵瑰彿锛�</view>
-						<view class="left-item">{{item.batch}}</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>
 					</view>
 				</view>
 				<view class="list-right">
-					<uni-icons type="compose" color="#c1c1c1" size="24" @click="revise(item,i)"></uni-icons>
-					<uni-icons type="trash" color="#c1c1c1" size="24" @click="remove(item,i,'warn')"></uni-icons>
+					<uni-icons type="compose" color="#9add8b" size="24" @click="revise(item,i)"></uni-icons>
+					<uni-icons type="trash" color="#f58a8a" size="24" @click="remove(item,i,'warn')"></uni-icons>
 				</view>
 			</view>
 		</scroll-view>
@@ -64,13 +76,24 @@
 					<!-- 鏍囬 -->
 					<view class="title">淇敼</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="matnr" disabled="true"
+								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">閲嶉噺:</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">
@@ -84,8 +107,8 @@
 		<view>
 			<!-- 鎻愮ず绐楃ず渚� -->
 			<uni-popup ref="alertDialog" type="dialog">
-				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content" @confirm="removeConfirm"
-					@close="removeClose"></uni-popup-dialog>
+				<uni-popup-dialog :type="msgType" confirmText="绉婚櫎" :title="title" :content="content"
+					@confirm="removeConfirm()" @close="removeClose"></uni-popup-dialog>
 			</uni-popup>
 		</view>
 		<view>
@@ -98,7 +121,7 @@
 		<view>
 			<uni-popup ref="combConfirm" type="dialog">
 				<uni-popup-dialog :type="msgType" cancelText="鍙栨秷" confirmText="纭" :title="title" :content="content"
-					@confirm="comb" @close="close"></uni-popup-dialog>
+					@confirm="comb" @close="combClose"></uni-popup-dialog>
 			</uni-popup>
 		</view>
 		<!-- 纭閲嶇疆 -->
@@ -115,75 +138,187 @@
 	export default {
 		data() {
 			return {
-				dataList: 
-				[
-				{
-					matnr: "whycq19950222222-232321111",
-					maktx: "wusuowei",
-					specs: "涓�",
-					batch: "鎵瑰彿",
-					anfme: "100"
-				}, {
-					matnr: "whycq19950520",
-					maktx: "wusuowei",
-					specs: "涓�",
-					batch: "鎵瑰彿",
-					anfme: "12"
-				},{
-					matnr: "whycq19950520",
-					maktx: "wusuowei",
-					specs: "涓�",
-					batch: "鎵瑰彿",
-					anfme: "12"
-				},{
-					matnr: "whycq19950520",
-					maktx: "wusuowei",
-					specs: "涓�",
-					batch: "鎵瑰彿",
-					anfme: "12"
-				},{
-					matnr: "whycq19950520",
-					maktx: "wusuowei",
-					specs: "涓�",
-					batch: "鎵瑰彿",
-					anfme: "12"
-				},{
-					matnr: "whycq19950520",
-					maktx: "wusuowei",
-					specs: "涓�",
-					batch: "鎵瑰彿",
-					anfme: "12"
-				},{
-					matnr: "whycq19950520",
-					maktx: "wusuowei",
-					specs: "涓�",
-					batch: "鎵瑰彿",
-					anfme: "12"
-				}
-				],
+				baseUrl: '',
+				token: '',
+				barcode: '',
+				dataList: [],
 				count: 0,
 				rowNum: '',
+				matnr: '',
 				batch: '',
+				weight: '',
 				msgType1: 'success',
 				msgType: 'success',
 				messageText: '',
 				title: '',
 				content: '',
-				
+				barcodeFocus: true,
+				matFocus: false,
+				matData: '',
+				removeNum: 0,
 			}
 		},
 		onLoad() {
-	
+
+		},
+		onShow() {
+			this.baseUrl = uni.getStorageSync('baseUrl');
+			this.token = uni.getStorageSync('token');
 		},
 		methods: {
 			messageToggle(type) {
 				this.msgType1 = type
 				this.$refs.message.open()
 			},
+			// barcode input 浜嬩欢
+			barcodeInput() {
+				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
+				setTimeout(() => {
+					var len = this.barcode.length
+					if (len != 8) {
+						uni.showToast({
+							title: '鎵樼洏鐮佹湁璇閲嶈瘯',
+							icon: "none",
+							position: 'top'
+						});
+						this.barcodeFocuss()
+						return;
+					}
+					this.focuss()
+				}, 200)
+			},
+			// 鎵樼洏鐮佹湁璇噸缃�
+			barcodeFocuss() {
+				let that = this;
+				that.barcodeFocus = false;
+				setTimeout(() => {
+					that.barcode = '';
+					that.barcodeFocus = true;
+				}, 100);
+			},
+			// 鍟嗗搧鍏夋爣娓呯┖閲嶇疆
+			focuss() {
+				this.focus = false;
+				setTimeout(() => {
+					this.matnr = '';
+					this.matFocus = true;
+				}, 100);
+			},
+			// 鎼滅储鐗╂枡
+			findMat() {
+				let that = this
+				uni.request({
+					url: that.baseUrl + '/mat/auth',
+					data: {
+						matnr: that.matnr
+					},
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						result = result.data
+						if (result.code === 200 && result.data) {
+							that.matData = result.data
+							that.matnr = ''
+							that.matData['batch'] = ''
+							uni.navigateTo({
+								url: "../mat/matSelected",
+								// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+								success: function(res) {
+									res.eventChannel.emit('mat', {
+										data: result.data
+									})
+								},
+								// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+								events: {
+									matList: function(data) {
+										that.checkMat(data.data)
+										that.focuss()
+									},
+								},
+							});
+						} else if (result.code == 403) {
+							uni.showToast({
+								title: result.msg,
+								icon: "none",
+								position: 'top'
+							})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({
+								title: result.msg,
+								icon: "none",
+								position: 'top'
+							})
+						}
+
+					}
+				});
+
+			},
+			selectMat() {
+				let that = this
+				uni.navigateTo({
+					url: "../mat/matQuery",
+					success: function(res) {
+						// 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
+						res.eventChannel.emit('commonUrl', {
+							commonUrl: ''
+						})
+					},
+					events: {
+						// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
+						acceptDataFromOpenedPage: function(data) {
+							that.matnr = data.data
+							that.findMat(that.matnr)
+						},
+					},
+
+
+				});
+				that.matnr = ''
+			},
+			checkMat(mat) {
+				var len = this.dataList.length
+				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
+							}
+						}
+						// 鐩稿悓鐗╂枡 涓嶅悓鎵瑰彿  鏂板姞鍒楄〃
+						if (mat.batch != this.dataList[i].batch) {
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							if (sameItem) {
+								add = false
+							} else {
+								add = true
+							}
+							
+						} else {
+							// 鐩稿悓鐗╂枡鐩稿悓鎵瑰彿 鏁伴噺绱姞
+							this.dataList[i].anfme += mat.anfme
+							this.$forceUpdate() // 寮哄埗鍒锋柊
+							add = false
+						}
+					}
+				}
+				if (add) {
+					this.dataList.unshift(mat)
+				}
+			},
 			// 淇敼鎵瑰彿
-			revise(item,i) {
+			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()
 			},
@@ -192,17 +327,18 @@
 				this.$refs.revise.open(type)
 			},
 			// 鍒楄〃绉婚櫎鎸夐挳
-			remove(item,i,type) {
+			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() {
@@ -211,6 +347,8 @@
 			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')
 				this.$refs.revise.close()
@@ -227,9 +365,62 @@
 				this.content = '鏄惁鐜板湪缁勬墭!'
 				this.$refs.combConfirm.open()
 			},
+			combClose() {
+				this.$refs.combConfirm.close()
+			},
 			comb() {
-				this.messageText = "缁勬墭鎴愬姛"
-				this.messageToggle('success')
+				uni.vibrateShort();
+				let that = this;
+				if (that.barcode === '') {
+					this.messageText = "璇锋壂鎻忔墭鐩樻潯鐮�"
+					this.messageToggle('error')
+					return;
+				}
+				if (that.dataList.length === 0) {
+					this.messageText = "璇锋坊鍔犲晢鍝佸垪琛�"
+					this.messageToggle('error')
+					return;
+				}
+				for (var i = 0; i < that.dataList.length; i++) {
+					if (that.dataList[i].anfme == 0 || that.dataList[i].anfme == '') {
+						this.messageText = that.dataList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0'
+						this.messageToggle('error')
+						return;
+					}
+				}
+				uni.request({
+					url: that.baseUrl + '/mobile/comb/auth',
+					data: JSON.stringify({
+						barcode: that.barcode,
+						combMats: that.dataList
+					}),
+					method: 'POST',
+					header: {
+						'token': uni.getStorageSync('token')
+					},
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							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')
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							that.messageText = res.msg
+							that.messageToggle('error')
+						}
+					}
+				});
 			},
 			reset(type) {
 				this.msgType = type
@@ -239,20 +430,27 @@
 			},
 			// 纭閲嶇疆
 			resetConfirm() {
-				this.dataList = ''
+				this.dataList = []
 				this.messageText = "閲嶇疆瀹屾垚"
 				this.messageToggle('success')
 			},
 			// 鍙栨秷閲嶇疆
 			resetClose() {
-				
-			}
+
+			},
+			// 娓呯┖
+			resst() {
+				this.dataList = []
+				this.barcode = ''
+				this.barcodeFocuss()
+			},
 		}
 	}
 </script>
 
 <style>
 	@import url('../../static/css/wms.css/wms.css');
+
 	.code {
 		width: 100%;
 		position: fixed;
@@ -260,6 +458,7 @@
 		background-color: #FFF;
 		z-index: 10;
 	}
+
 	.item {
 		display: flex;
 		align-items: center;
@@ -267,6 +466,7 @@
 		margin-left: 20rpx;
 		border-bottom: 1px solid #DCDFE6;
 	}
+
 	.item input {
 		height: 50rpx;
 		line-height: 50rpx;
@@ -274,17 +474,20 @@
 		font-size: 36upx;
 		font-family: PingFang SC;
 		width: 55vw;
-		
+
 	}
+
 	.code-decs {
 		width: 20vw;
 		font-size: 18px;
 		color: #303133;
 	}
+
 	.item-right {
 		margin-left: auto;
 		margin-right: 20rpx;
 	}
+
 	.mat-list-title {
 		height: 80rpx;
 		line-height: 80rpx;
@@ -295,6 +498,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>
\ No newline at end of file
+</style>

--
Gitblit v1.9.1