From d57f0f17e7daed9a14cee89a4a38154aed9f6e74 Mon Sep 17 00:00:00 2001
From: whycq <whycq>
Date: 星期一, 20 六月 2022 14:05:20 +0800
Subject: [PATCH] #

---
 pages/basics/pakin.vue |  127 ++++++++++++++++++++++++++++--------------
 1 files changed, 84 insertions(+), 43 deletions(-)

diff --git a/pages/basics/pakin.vue b/pages/basics/pakin.vue
index 7a5ff5a..5f62d7d 100644
--- a/pages/basics/pakin.vue
+++ b/pages/basics/pakin.vue
@@ -15,18 +15,6 @@
 				</view>
 			</view>
 			
-			<!-- <view class="pak-seach-box">
-				<view class="box-top">
-					<view class="color-block-blue"></view>
-					<text class="title">鎵樼洏鏉$爜</text>
-				</view>
-				<view class="box-buttom">
-					<input v-model="barcode" type="text" placeholder="鎵爜 / 杈撳叆" maxlength="8">
-					<view class="search-icon">
-						<uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeBarcode()"></uni-icons>
-					</view>
-				</view>
-			</view> -->
 			
 			<view class="square-2">
 				<view class="square-title">
@@ -45,19 +33,6 @@
 				</view>
 			</view>
 			
-			<!-- <view class="pak-seach-box">
-				<view class="box-top">
-					<view class="color-block-blue"></view>
-					<text class="title">妫�绱㈠晢鍝�</text>
-				</view>
-				<view class="box-buttom">
-					<input v-model="matnr" type="text" placeholder="鎵爜 / 杈撳叆" @input="findMat()">
-					<view class="search-icon">
-						<uni-icons type="closeempty" size="20" color="#a5a5a5" @click="removeMatnr()"></uni-icons>
-					</view>
-				</view>
-				<button class="cu-btn bg-blue" @click="selectMat()">+鎻愬彇</button>
-			</view> -->
 			
 			<view class="square-1">
 				<view class="square-title">
@@ -69,22 +44,19 @@
 				<view class="v-show">鏆傛棤鏇村鏁版嵁...</view>
 			</view>
 			
-			<!-- <view class="pak-data-box">
-				<view class="box-top">
-					<view class="color-block-blue"></view>
-					<text class="title">鍟嗗搧鍒楄〃</text>
-				</view>
-			</view>
-			<view class="pak-data-box"  v-show="matList.length === 0">
-				<view style="text-align: center;">鏆傛棤鏇村鏁版嵁</view>
-			</view> -->
 			<checkbox-group @change="checkbox">
 				<view v-for="(item,index) in matList" :key="index" class="data-list bg-false" :class="'bg-'+item.checked" >
 					<view class="data-list-left">
-						<view class="matnr">{{item.barcode}}</view>
+						<view class="matnr"><text style="width: 400rpx;">缂栫爜锛歿{item.matnr}}</text></view>
+						<view><text style="width: 400rpx;">鍝佸悕锛歿{item.maktx}}</text></view>
+						<view><text style="width: 400rpx;">鎵瑰彿锛歿{item.batch}}</text></view>
+						<view>
+							<text style="width: 400rpx;">鏁伴噺锛歿{item.anfme}}</text>
+						</view>
 					</view>
 					<view class="data-list-right">
-						<uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons>
+						<label><uni-icons type="compose" size="20" color="#a5a5a5" @click="revise(item,index)"></uni-icons></label>
+						<label><uni-icons type="trash" size="25" color="#a5a5a5" @click="remove(item,index)"></uni-icons></label>
 					</view>
 				</view>
 			</checkbox-group>
@@ -97,6 +69,29 @@
 				<button class="cu-btn lg pakin-btn bg-blue" @click="comb()">缁勬墭</button>
 			</view>
 		</view>
+		<!-- 淇敼鏁伴噺 -->
+		<uni-popup ref="revise" background-color="#fff" @change="change">
+			<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>
+				</view>
+				<view class="changeBox">
+					<view class="num-box">
+						<uni-number-box v-model="count" :min="minCount" :max="maxCount" color="#747474"  @change="changeValue"/>
+					</view> 
+				</view>
+				<view class="revise-box-buttom">
+					<view>
+						<button class="cu-btn bg-blue" @click="confirm()">纭</button>
+					</view>
+				</view>
+				
+			</view>
+		</uni-popup>
 	</view>
 </template>
 
@@ -113,7 +108,12 @@
 				pick:'hide',
 				matnr:'',
 				matList:[],
-				result: ''
+				result: '',
+				enableQty:'',
+				count:'',
+				minCount:0,
+				maxCount:'',
+				rowNum:'',
 			}
 		},
 		mounted(){
@@ -124,7 +124,14 @@
 		},
 		methods: {
 			focuss() {
-				uni.hideKeyboard()
+				// #ifdef APP
+				let that = this;
+				that.focus = false;
+				setTimeout(()=>{
+					that.matnrId = '';
+					that.focus = true;
+				}, 100);
+				// #endif
 			},
 			resst() {
 				this.matList = []
@@ -175,9 +182,10 @@
 						'token':uni.getStorageSync('token')
 				    },
 					success(result) {
-						uni.showLoading();
+						uni.hideLoading();
 						var res = result.data
 						if (res.code === 200) {
+							that.resst();
 							uni.showToast({
 								title: res.msg,
 								position: 'bottom',
@@ -199,18 +207,17 @@
 			selectMat() {
 				let that = this
 				uni.vibrateShort();
-				uni.showLoading();
 				uni.navigateTo({
 					url: "matSelect",
 					events: {
-					    // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
+					    // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�  鍙﹀涓�涓〉闈紶杩囨潵鐨�
 					    acceptDataFromOpenedPage: function(data) {
 							that.matnr = data.data
 							that.findMat(that.matnr)
 					    },
 					  },
 					  success: function(res) {
-					    // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�
+					    // 閫氳繃eventChannel鍚戣鎵撳紑椤甸潰浼犻�佹暟鎹�   鍚戝彟澶栦竴涓〉闈紶閫掑�肩殑
 					    res.eventChannel.emit('acceptDataFromOpenerPage', {baseIP:that.baseIP, basePORT:that.basePORT })
 					  }
 				});
@@ -237,6 +244,7 @@
 								    // 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
 								    matList: function(data) {
 										that.matList.push(data.data)
+										console.log(that.matList)
 								    },
 								  },
 								  success: function(res) {
@@ -278,6 +286,29 @@
 					this.checkText = "鍏ㄩ��"
 				}
 				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.rowNum = index
+				this.eject()
+			},
+			eject(type) {
+				this.type = type
+				// open 鏂规硶浼犲叆鍙傛暟 绛夊悓鍦� uni-popup 缁勪欢涓婄粦瀹� type灞炴��
+				this.$refs.revise.open(type)
+			},
+			changeValue() {
+				
+			},
+			confirm() {
+				this.matList[this.rowNum].anfme = this.count
+				this.$refs.revise.close()
 			},
 		}
 	}
@@ -416,6 +447,16 @@
 		float: right;
 		height: 180rpx;
 		line-height: 180rpx;
-		margin-right: 10%;
+	}
+	/* display: inline-block;
+	float: right;
+	width: 200rpx;
+	height: 180rpx;
+	line-height: 180rpx; */
+	.data-list-right label {
+		display: inline-block;
+		float: left;
+		width: 80rpx;
+		height: 180rpx;
 	}
 </style>
\ No newline at end of file

--
Gitblit v1.9.1