From 7fc7bffeadb3cc75f3fa600ca56a6872e569c16c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 23 八月 2022 08:18:47 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |  114 +++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 75 insertions(+), 39 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 093b904..06603a2 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -9,7 +9,7 @@
 				<view class="square-content">
 					<view class="content-input">
 						<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" 
-						:focus="barcodeFocus" @input="barcodeInput()" placeholder-style="line-height:  85rpx;">
+						:focus="barcodeFocus" @confirm="barcodeInput()" placeholder-style="line-height:  85rpx;">
 						<uni-icons type="closeempty" size="20" color="#dadada" @click="removeBarcode()"></uni-icons>
 					</view>
 				</view>
@@ -91,14 +91,11 @@
 			<view class="revise-box">
 				<view class="revise-box-top">
 					<view class="color-block-blue"></view>
-					<text class="title">缁勬墭鏁伴噺</text>
-				</view>
-				<view class="text-box">
-					<text>鍙粍鏁伴噺锛歿{enableQty}}</text>
+					<text class="title">淇敼鏁伴噺</text>
 				</view>
 				<view class="changeBox">
 					<view class="num-box">
-						<uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474"  @change="changeValue"/>
+						<uni-number-box :value="count" :max="9999" color="#747474"  @change="changeValue"/>
 					</view> 
 				</view>
 				<view class="revise-box-buttom">
@@ -158,7 +155,6 @@
 			},
 			// barcode input 浜嬩欢
 			barcodeInput() {
-				console.log(1)
 				// 涓嶈缃畾鏃跺櫒 浼氬嚭鐜版壂鍏ョ殑瀛楃涓蹭笉鍏�
 				setTimeout(()=>{
 					var len = this.barcode.length
@@ -167,10 +163,8 @@
 						this.barcodeFocuss()
 						return;
 					}
-					if (len == 8) {
-						this.focuss()
-					}
-				},100)
+					this.focuss()
+				},200)
 			},
 			// 鎵樼洏鐮佹湁璇噸缃�
 			barcodeFocuss() {
@@ -214,14 +208,9 @@
 					this.focus = true;
 				});
 			},
-			remove() {
-				// this.matList.splice(index,1)
-				for (var i = 0; i < this.matList.length; i++) {
-					if (this.matList[i].checked == true) {
-						this.matList.splice(i,1)
-					}
-				}
-				this.checkList();
+			// 鍒楄〃鍒犻櫎鎸夐挳
+			remove(item,index) {
+				this.matList.splice(index,1)
 				uni.vibrateShort();
 			},
 			comb() {
@@ -234,6 +223,12 @@
 				if (that.matList.length === 0) {
 					uni.showToast({title: '璇锋坊鍔犲晢鍝佸垪琛�', icon: "none", position: 'top'});
 					return;
+				}
+				for (var i = 0; i < that.matList.length; i++) {
+					if (that.matList[i].anfme == 0 || that.matList[i].anfme == '') {
+						uni.showToast({title: that.matList[i].matnr + '缁勬墭鏁伴噺涓嶈兘涓�0', icon: "none", position: 'top'});
+						return;
+					}
 				}
 				uni.showLoading();
 				uni.request({
@@ -283,7 +278,7 @@
 					},
 					success: function(res) {
 					    // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
-					    res.eventChannel.emit('acceptDataFromOpenerPage', {commonUrl:that.commonUrl })
+					    res.eventChannel.emit('commonUrl', {commonUrl:that.commonUrl })
 					},
 					
 				});
@@ -310,7 +305,8 @@
 								events: {
 								    // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								    matList: function(data) {
-										that.matList.push(data.data)
+										that.checkMat(data.data)
+										// that.matList.push(data.data)
 									},
 								},
 								success: function(res) {
@@ -318,6 +314,15 @@
 									res.eventChannel.emit('matData', { data: that.matData })
 								},
 							});
+						} else if (res.code == 403) {
+							uni.showToast({title: res.msg, icon: "none", position: 'top'})
+							setTimeout(() => {
+								uni.reLaunch({
+									url: '../login/login'
+								});
+							}, 1000);
+						} else {
+							uni.showToast({title: res.msg, icon: "none",position: 'top'})
 						}
 						
 					}
@@ -325,6 +330,24 @@
 				
 			},
 		
+			// 娣诲姞鍟嗗搧
+			addMat(mat) {
+				this.matList.unshift(mat)
+			},
+			checkMat(mat) {
+				var len = this.matList.length
+				var add = true
+				for (var i = 0; i < len; i++) {
+					if (mat.matnr == this.matList[i].matnr) {
+						this.matList[i].anfme += mat.anfme 
+						this.$forceUpdate() // 寮哄埗鍒锋柊
+						add = false
+					}
+				}
+				if (add) {
+					this.matList.unshift(mat)
+				}
+			},
 			change(e) {
 				console.log('褰撳墠妯″紡锛�' + e.type + ',鐘舵�侊細' + e.show);
 			},
@@ -355,13 +378,14 @@
 				uni.vibrateShort();
 			},
 			revise(item,index) {
-				var maxCount = this.matList[index].maxCount
-				if (maxCount == undefined ) {
-					this.matList[index]["maxCount"] = item.enableQty
-				} 
-				this.enableQty = item.enableQty
-				this.count = this.minCount
-				this.maxCount = item.maxCount
+				this.count = this.matList[index].anfme
+				// var maxCount = this.matList[index].maxCount
+				// if (maxCount == undefined ) {
+				// 	this.matList[index]["maxCount"] = item.enableQty
+				// } 
+				// this.enableQty = item.enableQty
+				// this.count = this.minCount
+				// this.maxCount = item.maxCount
 				this.rowNum = index
 				this.eject()
 			},
@@ -370,12 +394,13 @@
 				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
 				this.$refs.revise.open(type)
 			},
-			changeValue() {
-				
+			changeValue(value) {
+				this.count = value
 			},
 			confirm() {
 				this.matList[this.rowNum].anfme = this.count
 				this.$refs.revise.close()
+				this.$forceUpdate() // 寮哄埗鍒锋柊
 			},
 			// 鍒楄〃鍙嶉��
 			reChecked() { 
@@ -420,14 +445,6 @@
 				}
 				uni.vibrateShort();
 			},
-			// 妫�楠屽垪琛ㄩ暱搴� 绛変簬0 鏄剧ず鍏ㄩ��  
-			checkList() {
-				if (this.matList.length == 0) {
-					this.check = false
-					this.checkText = "鍏ㄩ��"
-					return;
-				}
-			}
 		}
 	}
 </script>
@@ -435,7 +452,26 @@
 <style>
 	/* @import "../../colorui/main.css";
 	@import "../../colorui/icon.css"; */
-	
+	.revise-box {
+		width: 400rpx;
+		height: 300rpx;
+		border-radius: 25px;
+	}
+	.revise-box-top {
+		width: 400rpx;
+		height: 120rpx;
+		border-radius: 25px;
+	}
+	.changeBox {
+		width: 400rpx;
+		height: 100rpx;
+	}
+	.num-box {
+		margin-left: 100rpx;
+	}
+	.revise-box-buttom{
+		margin-left: 130rpx;
+	}
 	.pak-seach-box {
 		background-color: #FFFFFF;
 		margin: 15rpx 15rpx 0rpx 15rpx;

--
Gitblit v1.9.1