From a88181e93822696476e4f680348f6209e097bbe2 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 13 六月 2024 09:22:37 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/stationDetl.vue |  162 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 137 insertions(+), 25 deletions(-)

diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 3d4b81f..55257fa 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -28,6 +28,7 @@
 			<view>宸ヤ綔鐘舵��: {{wrkMast.wrkSts$}}</view>
 			<view>婧愬簱浣�: {{wrkMast.sourceLocNo}}</view>
 			<view>璐ф灦鐮�: {{wrkMast.barcode}}</view>
+			<view v-if="wrkMast.ioType == 111">鐩爣妤煎眰: {{wrkMast.crnNo}}</view>
 		</view>
 		
 		<!-- 鏄庣粏 -->
@@ -71,8 +72,8 @@
 						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="emptyPakinClose">鍙栨秷</view>
-						<view class="btn-right" @click="emptyPakinConfirm()">鍏ュ簱</view>
+						<button class="btn-left" @click="emptyPakinClose">鍙栨秷</button>
+						<button class="btn-right" @click="emptyPakinConfirm()" :disabled="emptyPakinDis">绌烘灦鍏ュ簱</button>
 					</view>
 				</view>
 			</uni-popup>
@@ -88,8 +89,8 @@
 						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="doBackClose">鍙栨秷</view>
-						<view class="btn-right" @click="doBackConfirm()">閫�搴�</view>
+						<button class="btn-left" @click="doBackClose">鍙栨秷</button>
+						<button class="btn-right" @click="doBackConfirm()" :disabled="doBackDis">閫�搴�</button>
 					</view>
 				</view>
 			</uni-popup>
@@ -106,8 +107,8 @@
 						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="containerMoveOutClose">鍙栨秷</view>
-						<view class="btn-right" @click="containerMoveOut()">纭鍑哄簱</view>
+						<button class="btn-left" @click="containerMoveOutClose">鍙栨秷</button>
+						<button class="btn-right" @click="containerMoveOut()" :disabled="containerMoveOutDis">纭鍑哄簱</button>
 					</view>
 				</view>
 			</uni-popup>
@@ -124,8 +125,8 @@
 						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="containerMoveOutClose">鍙栨秷</view>
-						<view class="btn-right" @click="containerMoveOut2()">纭绂诲満</view>
+						<button class="btn-left" @click="containerMoveOutClose">鍙栨秷</button>
+						<button class="btn-right" @click="containerMoveOut2()" :disabled="containerMoveOut2Dis">纭绂诲満</button>
 					</view>
 				</view>
 			</uni-popup>
@@ -142,8 +143,8 @@
 						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="pickInClose">鍙栨秷</view>
-						<view class="btn-right" @click="pickIn()">纭鎷f枡</view>
+						<button class="btn-left" @click="pickInClose">鍙栨秷</button>
+						<button class="btn-right" @click="pickIn()" :disabled="pickInDis">纭鎷f枡</button>
 					</view>
 				</view>
 			</uni-popup>
@@ -165,8 +166,8 @@
 						</view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="emptyOutClose">鍙栨秷</view>
-						<view class="btn-right" @click="emptyOutConfirm()">鍑哄簱</view>
+						<button class="btn-left" @click="emptyOutClose">鍙栨秷</button>
+						<button class="btn-right" @click="emptyOutConfirm()" :disabled="emptyOutDis">鍑哄簱</button>
 					</view>
 				</view>
 			</uni-popup>
@@ -183,8 +184,26 @@
 						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="allocationInClose">鍙栨秷</view>
-						<view class="btn-right" @click="allocationInConfirm()">纭杩涘満</view>
+						<button class="btn-left" @click="allocationInClose">鍙栨秷</button>
+						<button class="btn-right" @click="allocationInConfirm()" :disabled="allocationInDis">纭杩涘満</button>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		
+		<!-- 寮圭獥 -->
+		<view>
+			<uni-popup ref="allocationOut" type="dialog">
+				<view class="popup">
+					<!-- 鏍囬 -->
+					<view class="title">璇疯緭鍏ヨ揣鏋剁爜</view>
+					<view class="popup-item">
+						<view class="popup-item-left">璐ф灦鐮�:</view>
+						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
+					</view>
+					<view class="btn">
+						<view class="btn-left" @click="allocationOutClose">鍙栨秷</view>
+						<view class="btn-right" @click="allocationOutConfirm()" :disabled="allocationOutDis">纭绂诲満</view>
 					</view>
 				</view>
 			</uni-popup>
@@ -201,8 +220,26 @@
 						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="empInClose">鍙栨秷</view>
-						<view class="btn-right" @click="empInConfirm()">纭杩涘満</view>
+						<button class="btn-left" @click="empInClose">鍙栨秷</button>
+						<button class="btn-right" @click="empInConfirm()" :disabled="empInDis">纭杩涘満</button>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
+		
+		<!-- 寮圭獥 -->
+		<view>
+			<uni-popup ref="empOut" type="dialog">
+				<view class="popup">
+					<!-- 鏍囬 -->
+					<view class="title">璇疯緭鍏ヨ揣鏋剁爜</view>
+					<view class="popup-item">
+						<view class="popup-item-left">璐ф灦鐮�:</view>
+						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
+					</view>
+					<view class="btn">
+						<button class="btn-left" @click="empOutClose">鍙栨秷</button>
+						<button class="btn-right" @click="empOutConfirm()" :disabled="empOutDis">纭绂诲満</button>
 					</view>
 				</view>
 			</uni-popup>
@@ -211,8 +248,8 @@
 		
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
-			<button size="mini" :disabled="dis" type="warn" @click="doBack()" v-if="btnType == 'out' || btnType == 'pick'">閫�搴搟{sec}}</button>
-			<button size="mini" type="primary" @click="handBack()" v-if="btnType == 'handBack'">杞墜鍔�</button>
+			<button size="mini" :disabled="dis" type="warn" @click="doBack()"  v-if="btnType == 'out' || btnType == 'pick'">閫�搴搟{sec}}</button>
+			<!-- <button size="mini" type="primary" @click="handBack()" v-if="btnType == 'handBack'">杞墜鍔�</button> -->
 			<!-- <button size="mini" type="warn" @click="doBack()" v-if="btnType == 'out' || btnType == 'pick'">閫�搴�</button> -->
 			<button size="mini" type="primary" @click="emptyPakin()" v-if="btnType == 'emptyPakin'">绌烘澘鍏ュ簱</button>
 			<button size="mini" type="primary" @click="emptyOut()" v-if="btnType == 'emptyPakin'">鍛煎彨绌烘澘</button>
@@ -251,7 +288,17 @@
 				wrkDetls: [],
 				waitPakins: [],
 				dis: true,
-				sec: ''
+				sec: '',
+				emptyPakinDis: false,
+				containerMoveOutDis: false,
+				containerMoveOut2Dis: false,
+				pickInDis: false,
+				emptyOutDis: false,
+				allocationInDis: false,
+				allocationOutDis:false,
+				empInDis: false,
+				empOutDis: false,
+				doBackDis: false
 			}
 		},
 		onShow() {
@@ -364,10 +411,13 @@
 			},
 			emptyPakinClose() {
 				this.$refs.emptyPakin.close()
+				this.emptyPakinDis = false
 			},
 			emptyPakinConfirm() {
 				let _this = this;
+				_this.emptyPakinDis = true
 				if (this.barcode.length != 6) {
+					_this.emptyPakinDis = false
 					uni.showToast({ title: '璐ф灦鏉$爜寮傚父', icon: "error", position: 'top' })
 					return
 				}
@@ -382,6 +432,7 @@
 					header: { 'token': uni.getStorageSync('token') },
 					success(res) {
 						var res = res.data
+						_this.emptyPakinDis = false
 						if (res.code === 200) {
 							setTimeout(()=> {
 								_this.barcode = ''
@@ -394,6 +445,12 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+						setTimeout(()=> {
+							
+						},100)
+					},
+					fail(res) {
+						_this.emptyPakinDis = false
 					}
 				});
 			},
@@ -405,6 +462,7 @@
 			},
 			emptyOutConfirm() {
 				this.emptyOutClose()
+				this.emptyOutDis = true
 				let _this = this;
 				let params = []
 				let param = { devNo: this.station.devNo, containerType: this.containerType, }
@@ -416,6 +474,7 @@
 					header: { 'token': uni.getStorageSync('token') },
 					success(res) {
 						var res = res.data
+						_this.emptyOutDis = false
 						if (res.code === 200) {
 							setTimeout(()=> {
 								_this.containerType = ''
@@ -428,6 +487,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.emptyOutDis = false
 					}
 				});
 			},
@@ -586,6 +648,7 @@
 				this.$refs.doContainerMoveOut.close()
 			},
 			containerMoveOut() {
+				this.containerMoveOutDis = true
 				let _this = this
 				let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
 				uni.request({
@@ -595,6 +658,7 @@
 					method: 'POST',
 					success(res) {
 						res = res.data
+						_this.containerMoveOutDis = false
 						if (res.code === 200) {
 							_this.$refs.doContainerMoveOut.close()
 							setTimeout(()=> {
@@ -608,6 +672,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.containerMoveOutDis = false
 					}
 				})
 			},
@@ -620,6 +687,7 @@
 				this.$refs.doContainerMoveOut2.close()
 			},
 			containerMoveOut2() {
+				this.containerMoveOut2Dis = true
 				let _this = this
 				let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
 				uni.request({
@@ -629,6 +697,7 @@
 					method: 'POST',
 					success(res) {
 						res = res.data
+						_this.containerMoveOut2Dis = false
 						if (res.code === 200) {
 							_this.$refs.doContainerMoveOut2.close()
 							setTimeout(()=> {
@@ -642,6 +711,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.containerMoveOut2Dis = false
 					}
 				})
 			},
@@ -672,6 +744,7 @@
 				this.$refs.doPickIn.close()
 			},
 			pickIn() {
+				this.pickInDis = true
 				let _this = this
 				uni.request({
 					url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
@@ -679,6 +752,7 @@
 					data: {devNo: _this.station.devNo,barcode: _this.barcode},
 					method: 'POST',
 					success(res) {
+						_this.pickInDis = false
 						res = res.data 
 						if (res.code === 200) {
 							_this.$refs.doPickIn.close()
@@ -690,6 +764,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.pickInDis = false
 					}
 				})
 			},
@@ -718,23 +795,31 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
-					}
+					},
+					
 				});
 			},
-			// 璋冩嫧绂诲満
 			allocationOut() {
+				this.$refs.allocationOut.open()
+			},
+			allocationOutClose() {
+				this.$refs.allocationOut.close()
+			},
+			// 璋冩嫧绂诲満
+			allocationOutConfirm() {
 				let that = this
 				let params = []
-				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
+				let param = { devNo: this.station.devNo, barcode: this.barcode, }
 				params.push(param)
 				uni.request({
 					url: that.baseUrl + '/agvMobile/hand/control/allocationOut',
 					header: {'token': uni.getStorageSync('token')},
-					data: {devNo: that.station.devNo},
+					data: param,
 					method: 'POST',
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
+							that.$refs.allocationOut.close()
 							setTimeout(()=> {
 								that.barcode = ''
 								that.reloadStation()
@@ -746,11 +831,18 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
-					}
+					},
 				});
 			},
 			// 绌烘灦绂诲満
 			empOut() {
+				this.$refs.empOut.open()
+			},
+			empOutClose() {
+				this.$refs.empOut.close()
+			},
+			empOutConfirm() {
+				this.empOutDis = true
 				let that = this
 				let params = []
 				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -758,10 +850,12 @@
 				uni.request({
 					url: that.baseUrl + '/agvMobile/hand/control/empOut',
 					header: {'token': uni.getStorageSync('token')},
-					data: {devNo: that.station.devNo},
+					data: {devNo: that.station.devNo,barcode: that.barcode},
 					method: 'POST',
 					success(result) {
 						var res = result.data
+						that.$refs.empOut.close()
+						that.empOutDis = false
 						if (res.code === 200) {
 							setTimeout(()=> {
 								that.barcode = ''
@@ -774,6 +868,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						that.empOutDis = false
 					}
 				});
 			},
@@ -784,6 +881,7 @@
 				this.$refs.allocationIn.close()
 			},
 			allocationInConfirm() {
+				this.allocationInDis = true
 				let that = this
 				let params = []
 				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -794,6 +892,7 @@
 					data: {devNo: that.station.devNo, barcode: that.barcode},
 					method: 'POST',
 					success(result) {
+						that.allocationInDis = false
 						var res = result.data
 						if (res.code === 200) {
 							that.$refs.allocationIn.close()
@@ -808,6 +907,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						that.allocationInDis = false
 					}
 				});
 			},
@@ -818,6 +920,7 @@
 				this.$refs.empIn.close()
 			},
 			empInConfirm() {
+				this.empInDis = true
 				let that = this
 				let params = []
 				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -828,6 +931,7 @@
 					data: {devNo: that.station.devNo, barcode: that.barcode},
 					method: 'POST',
 					success(result) {
+						that.empInDis = false
 						var res = result.data
 						if (res.code === 200) {
 							that.$refs.empIn.close()
@@ -842,6 +946,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						that.empInDis = false
 					}
 				});
 			},
@@ -852,6 +959,7 @@
 				this.$refs.doBack.close()
 			},
 			doBackConfirm() {
+				this.doBackDis = true
 				let that = this
 				let params = []
 				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -862,6 +970,7 @@
 					data: {devNo: that.station.devNo, barcode: that.barcode},
 					method: 'POST',
 					success(result) {
+						that.doBackDis = false
 						var res = result.data
 						if (res.code === 200) {
 							that.$refs.doBack.close()
@@ -877,6 +986,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						that.doBackDis = false
 					}
 				});
 			},

--
Gitblit v1.9.1