From c48093016b1511ce8b33ffb49062a3bf7a1aed16 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 06 六月 2024 08:24:10 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs

---
 pages/phyz/stationManage/stationDetl.vue |   81 ++++++++++++++++++++++++++++++++--------
 1 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 332ecef..73d66cf 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -72,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>
@@ -89,7 +89,7 @@
 						<view class="popup-item-right"><input type="text" v-model="barcode"></view>
 					</view>
 					<view class="btn">
-						<view class="btn-left" @click="doBackClose">鍙栨秷</view>
+						<button class="btn-left" @click="doBackClose">鍙栨秷</button>
 						<button class="btn-right" @click="doBackConfirm()" :disabled="doBackDis">閫�搴�</button>
 					</view>
 				</view>
@@ -107,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>
@@ -125,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>
@@ -143,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>
@@ -166,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>
@@ -184,8 +184,8 @@
 						<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>
@@ -220,8 +220,8 @@
 						<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>
@@ -271,6 +271,13 @@
 				waitPakins: [],
 				dis: true,
 				sec: '',
+				emptyPakinDis: false,
+				containerMoveOutDis: false,
+				containerMoveOut2Dis: false,
+				pickInDis: false,
+				emptyOutDis: false,
+				allocationInDis: false,
+				empInDis: false,
 				doBackDis: false
 			}
 		},
@@ -387,6 +394,7 @@
 			},
 			emptyPakinConfirm() {
 				let _this = this;
+				_this.emptyPakinDis = true
 				if (this.barcode.length != 6) {
 					uni.showToast({ title: '璐ф灦鏉$爜寮傚父', icon: "error", position: 'top' })
 					return
@@ -402,6 +410,7 @@
 					header: { 'token': uni.getStorageSync('token') },
 					success(res) {
 						var res = res.data
+						_this.emptyPakinDis = false
 						if (res.code === 200) {
 							setTimeout(()=> {
 								_this.barcode = ''
@@ -414,6 +423,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.emptyPakinDis = false
 					}
 				});
 			},
@@ -425,6 +437,7 @@
 			},
 			emptyOutConfirm() {
 				this.emptyOutClose()
+				this.emptyOutDis = true
 				let _this = this;
 				let params = []
 				let param = { devNo: this.station.devNo, containerType: this.containerType, }
@@ -436,6 +449,7 @@
 					header: { 'token': uni.getStorageSync('token') },
 					success(res) {
 						var res = res.data
+						_this.emptyOutDis = false
 						if (res.code === 200) {
 							setTimeout(()=> {
 								_this.containerType = ''
@@ -448,6 +462,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.emptyOutDis = false
 					}
 				});
 			},
@@ -606,6 +623,7 @@
 				this.$refs.doContainerMoveOut.close()
 			},
 			containerMoveOut() {
+				this.containerMoveOutDis = true
 				let _this = this
 				let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
 				uni.request({
@@ -615,6 +633,7 @@
 					method: 'POST',
 					success(res) {
 						res = res.data
+						_this.containerMoveOutDis = false
 						if (res.code === 200) {
 							_this.$refs.doContainerMoveOut.close()
 							setTimeout(()=> {
@@ -628,6 +647,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.containerMoveOutDis = false
 					}
 				})
 			},
@@ -640,6 +662,7 @@
 				this.$refs.doContainerMoveOut2.close()
 			},
 			containerMoveOut2() {
+				this.containerMoveOut2Dis = true
 				let _this = this
 				let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
 				uni.request({
@@ -649,6 +672,7 @@
 					method: 'POST',
 					success(res) {
 						res = res.data
+						_this.containerMoveOut2Dis = false
 						if (res.code === 200) {
 							_this.$refs.doContainerMoveOut2.close()
 							setTimeout(()=> {
@@ -662,6 +686,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.containerMoveOut2Dis = false
 					}
 				})
 			},
@@ -692,6 +719,7 @@
 				this.$refs.doPickIn.close()
 			},
 			pickIn() {
+				this.pickInDis = true
 				let _this = this
 				uni.request({
 					url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
@@ -699,6 +727,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()
@@ -710,6 +739,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						_this.pickInDis = false
 					}
 				})
 			},
@@ -738,7 +770,8 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
-					}
+					},
+					
 				});
 			},
 			allocationOut() {
@@ -769,7 +802,7 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
-					}
+					},
 				});
 			},
 			// 绌烘灦绂诲満
@@ -807,6 +840,7 @@
 				this.$refs.allocationIn.close()
 			},
 			allocationInConfirm() {
+				this.allocationInDis = true
 				let that = this
 				let params = []
 				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -817,6 +851,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()
@@ -831,6 +866,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						that.allocationInDis = false
 					}
 				});
 			},
@@ -841,6 +879,7 @@
 				this.$refs.empIn.close()
 			},
 			empInConfirm() {
+				this.empInDis = true
 				let that = this
 				let params = []
 				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -851,6 +890,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()
@@ -865,6 +905,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						that.empInDis = false
 					}
 				});
 			},
@@ -886,6 +929,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()
@@ -901,6 +945,9 @@
 						} else {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 						}
+					},
+					fail(res) {
+						that.doBackDis = false
 					}
 				});
 			},

--
Gitblit v1.9.1