From 14d2e539f18307ecab4ea415d16c54fff012a1c2 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 25 五月 2024 15:05:31 +0800
Subject: [PATCH] Merge branch 'phyzasrs' of http://47.97.1.152:5880/r/wms_app into phyzasrs

---
 pages/phyz/stationManage/stationDetl.vue |   60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index d6afba1..b1c321e 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -75,6 +75,23 @@
 				</view>
 			</uni-popup>
 		</view>
+		<!-- 寮圭獥 -->
+		<view>
+			<uni-popup ref="doBack" 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="doBackClose">鍙栨秷</view>
+						<view class="btn-right" @click="doBackConfirm()">閫�搴�</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 		
 		<!-- 寮圭獥 -->
 		<view>
@@ -175,6 +192,7 @@
 		
 		<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
 		<view class="buttom">
+			<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>
@@ -428,6 +446,9 @@
 								} else if (wrkMast.ioType == 103) {
 									wrkMast['ioTitle'] = '鎷ｆ枡鍑哄簱'
 									_this.btnType = 'pick'
+								} else if (wrkMast.ioType == 109) {
+									wrkMast['ioTitle'] = '鑷姩鍥炴祦'
+									_this.btnType = 'handBack'
 								} else if (wrkMast.ioType == 110) {
 									wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
 								} else if (wrkMast.ioType == 111) {
@@ -522,6 +543,7 @@
 				let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
 				uni.request({
 					url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut`,
+					header: { 'token': uni.getStorageSync('token')},
 					data: JSON.stringify(devNo),
 					method: 'POST',
 					success(res) {
@@ -555,6 +577,7 @@
 				let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
 				uni.request({
 					url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut2`,
+					header: { 'token': uni.getStorageSync('token')},
 					data: JSON.stringify(devNo),
 					method: 'POST',
 					success(res) {
@@ -605,6 +628,7 @@
 				let _this = this
 				uni.request({
 					url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
+					header: { 'token': uni.getStorageSync('token')},
 					data: {devNo: _this.station.devNo,barcode: _this.barcode},
 					method: 'POST',
 					success(res) {
@@ -713,6 +737,12 @@
 				});
 			},
 			doBack() {
+				this.$refs.doBack.open()
+			},
+			doBackClose() {
+				this.$refs.doBack.close()
+			},
+			doBackConfirm() {
 				let that = this
 				let params = []
 				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
@@ -725,12 +755,38 @@
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
-							// that.$refs.allocationIn.close()
+							that.$refs.doBack.close()
 							setTimeout(()=> {
 								that.barcode = ''
 								that.reloadStation()
 							},1000)
-							uni.showToast({ title: '杩涘満鎴愬姛', icon: "success", position: 'top' })
+							uni.showToast({ title: '閫�搴撲换鍔＄敵璇锋垚鍔�', icon: "success", position: 'top' })
+						} else if (res.code == 403) {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+						}
+					}
+				});
+			},
+			handBack() {
+				let that = this
+				let params = []
+				let param = { devNo: this.station.devNo, containerCode: this.station.barcode, }
+				params.push(param)
+				uni.request({
+					url: that.baseUrl + '/agvMobile/hand/control/handBack',
+					header: {'token': uni.getStorageSync('token')},
+					data: {devNo: that.station.devNo, barcode: that.barcode},
+					method: 'POST',
+					success(result) {
+						var res = result.data
+						if (res.code === 200) {
+							setTimeout(()=> {
+								that.reloadStation()
+							},1000)
+							uni.showToast({ title: '杞崲鎴愬姛', icon: "success", position: 'top' })
 						} else if (res.code == 403) {
 							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
 							setTimeout(() => { uni.reLaunch({ url: '../../login/login' }); }, 1000);

--
Gitblit v1.9.1