From e01dae65d8ea58d2cf8519aaac4ceba79b9c82a0 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 22 七月 2024 10:10:51 +0800
Subject: [PATCH] #

---
 pages/phyz/orderOut/orderOutSelect.vue |    3 +
 pages/phyz/orderOut/orderCheck.vue     |   82 ++++++++++++++++++++++++----------------
 manifest.json                          |    4 +-
 3 files changed, 53 insertions(+), 36 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0bbd0ff..a2d3303 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "涓壃WMS",
     "appid" : "__UNI__DA5854D",
     "description" : "",
-    "versionName" : "20240701A",
-    "versionCode" : 121,
+    "versionName" : "20240722A",
+    "versionCode" : 122,
     "transformPx" : false,
     /* 5+App鐗规湁鐩稿叧 */
     "app-plus" : {
diff --git a/pages/phyz/orderOut/orderCheck.vue b/pages/phyz/orderOut/orderCheck.vue
index 3052f9e..8691a34 100644
--- a/pages/phyz/orderOut/orderCheck.vue
+++ b/pages/phyz/orderOut/orderCheck.vue
@@ -1,31 +1,33 @@
 <template>
 	<view>
-		<view class="list shop-car">
+		<view class="list shop-car" v-for="item in dataList">
 			<view class="list-left">
-				<view class="detl-threeCode" style="padding: 16rpx 0;">{{data.csocode}}</view>
-				<view>搴撲綅锛歿{data.locNo}}</view>
-				<view>缂栧彿锛歿{data.matnr}}</view>
-				<view>鍚嶇О锛歿{data.maktx}}</view>
-				<view>鑷敱椤癸細{{data.containerCode}}</view>
-				<view>瑙勬牸锛歿{data.specs}}</view>
-				<view>鎵瑰彿锛歿{data.batch}}</view>
-				<view>搴撳瓨鏁伴噺锛歿{count}}</view>
+				<view class="detl-threeCode" style="padding: 16rpx 0;">{{item.csocode}}</view>
+				<view>搴撲綅锛歿{item.locNo}}</view>
+				<view>缂栧彿锛歿{item.matnr}}</view>
+				<view>鍚嶇О锛歿{item.maktx}}</view>
+				<view>鑷敱椤癸細{{item.containerCode}}</view>
+				<view>瑙勬牸锛歿{item.specs}}</view>
+				<view>鎵瑰彿锛歿{item.batch}}</view>
+				<view>搴撳瓨鏁伴噺锛歿{item.count}}</view>
 				<view class="detl-threeCode" style="display: flex;padding: 32rpx 0;align-items: center;font-size: 24px;">
-					<view>鍑哄簱鏁伴噺锛歿{data.anfme}}</view>
-					<view style="margin-left: 50rpx;" @click="revise()">
+					<view>鍑哄簱鏁伴噺锛歿{item.anfme}}</view>
+					<view style="margin-left: 50rpx;" @click="revise(item)">
 						<uni-icons type="compose" size="30" color="#fff"></uni-icons>
 					</view>
 				</view>
 				
 				<view class="detl-threeCode" style="display: flex;padding: 0 0 32rpx 0;font-size: 24px;">鍑哄簱绔欙細
-					<view class="dropdown" @click="toggleDropdown(data)">
-						<input type="text" style="width: 270rpx;font-size: 20px;" v-model="data.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
-						<uni-icons :type="data.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
-						<scroll-view scroll-y="ture" class="dropdown-content" v-if="data.isOpen">
-							<view class="dropdown-item" v-for="option in data.agvStaNos" @click="selected(option,data)">{{option}}</view>
+					<view class="dropdown" @click="toggleDropdown(item)">
+						<view style="height: 100%;width: 100%; position: fixed;background-color: rgba(0,0,0,.4);left:0;top:0" v-if = "item.isOpen"></view>
+						<input type="text" style="width: 270rpx;font-size: 20px;" v-model="item.agvStaNo" placeholder="璇烽�夋嫨鍑哄簱绔�" placeholder-style="color: #fff">
+						<uni-icons :type="item.isOpen ? 'top' : 'bottom'" color="#fff" style="margin-left: 10rpx;"></uni-icons>
+						<scroll-view scroll-y="ture" class="dropdown-content" v-if="item.isOpen">
+							<view class="dropdown-item" v-for="option in options" @click="selected(option,item)">{{option}}</view>
 						</scroll-view>
 					</view>
 				</view>
+				<button @click="combConfirm(item)" :disabled="combDis">绔嬪嵆鍑哄簱</button>
 			</view>
 		</view>
 		<!-- 寮圭獥 -->
@@ -36,7 +38,7 @@
 					<view class="title">鍑哄簱鏁伴噺</view>
 					<view class="popup-item">
 						<view>
-							<uni-number-box :value="data.anfme" :step='1' :min="0" :max="count" color="#747474" @change="changeValue" />
+							<uni-number-box :value="data.anfme" :step='1' :min="0" :max="maxCount" color="#747474" @change="changeValue" />
 						</view>
 						
 					</view>
@@ -53,11 +55,12 @@
 				</view>
 			</uni-popup>
 		</view>
+		<view style="height: 100rpx;"></view>
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
-		<view class="buttom">
+		<!-- <view class="buttom">
 			<button size="mini" @click="reset('warn')">绋嶅悗澶勭悊</button>
 			<button size="mini" type="primary" @click="combConfirm('warn')" :disabled="combDis">绔嬪嵆鍑哄簱</button>
-		</view>
+		</view> -->
 	</view>
 </template>
 
@@ -68,9 +71,11 @@
 				baseUrl: '',
 				token: '',
 				data: {},
+				dataList: [],
 				option: '',
-				count: 0,
-				combDis: false
+				options: [],
+				combDis: false,
+				maxCount: 0
 			}
 		},
 		onShow() {
@@ -80,17 +85,27 @@
 			// const eventChannel = this.$scope.eventChannel; // 鍏煎APP-NVUE
 			const eventChannel = this.getOpenerEventChannel();
 			// 鐩戝惉acceptDataFromOpenerPage浜嬩欢锛岃幏鍙栦笂涓�椤甸潰閫氳繃eventChannel浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹�
-			eventChannel.on('mat', function(data) {
-				let ids = [data.mat.id]
-				_this.getPakoutList(ids,data.mat.locNo)
+			// eventChannel.on('mat', function(data) {
+			// 	let ids = [data.mat.id]
+			// 	_this.getPakoutList(ids,data.mat.locNo)
+			// })
+			eventChannel.on('item', function(data) {
+				let ids = [data.item.id]
+				_this.getPakoutList(ids)
 			})
 		},
 		methods: {
 			max() {
-				 this.data.anfme = this.count
+				this.data.anfme = this.data.count
 			},
 			toggleDropdown(item) {
+				this.options = []
 				item.isOpen = !item.isOpen;
+				for	(let k of item.agvStaNos) {
+					console.log(k);
+					this.options.push(k)
+				}
+				console.log(this.options);
 			},
 			selected(option,item) {
 				item.agvStaNo = option
@@ -105,17 +120,16 @@
 					method: 'POST',
 					success(res) {
 						res = res.data
-						console.log(res);
 						if (res.code === 200) {
 							for (let k of res.data) {
-								if (locNo == k.locNo) {
+								if (k.locNo != null) {
 									k['isOpen'] = false
-									_this.count = k.anfme
+									k['count'] = k.anfme
 									k.anfme = 0
-									_this.data = k
-									return
+									_this.dataList.push(k)
 								}
 							}
+							console.log(_this.dataList);
 						} else if (res.code == 403) {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
@@ -125,7 +139,9 @@
 					}
 				})
 			},
-			revise() {
+			revise(item) {
+				this.data = item
+				this.maxCount = item.count 
 				this.$refs.addItem.open()
 			},
 			addClose() {
@@ -138,7 +154,7 @@
 			changeValue(value) {
 				this.data.anfme = value
 			},
-			combConfirm() {
+			combConfirm(item) {
 				let _this = this
 				_this.combDis = true
 				if (_this.data.anfme == 0) {
@@ -147,7 +163,7 @@
 				}
 				uni.showLoading({})
 				let combList = []
-				combList.push(_this.data)
+				combList.push(item)
 				uni.request({
 					url: `${_this.baseUrl}/out/pakout/auth`,
 					header: {'token': uni.getStorageSync('token')},
diff --git a/pages/phyz/orderOut/orderOutSelect.vue b/pages/phyz/orderOut/orderOutSelect.vue
index 049e5de..b5bd2bc 100644
--- a/pages/phyz/orderOut/orderOutSelect.vue
+++ b/pages/phyz/orderOut/orderOutSelect.vue
@@ -203,7 +203,8 @@
 				}
 				let _this = this
 				uni.navigateTo({
-					url: './orderList',
+					// url: './orderList',
+					url: './orderCheck',
 					success(res) {
 						res.eventChannel.emit('item', {
 							item: item

--
Gitblit v1.9.1