From 685a9aee9c681663b87b763c1210352c4e08e969 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 19:52:06 +0800
Subject: [PATCH] #

---
 pages/phyz/stationManage/stationDetl.vue |   63 ++++++++++++++++++++++++++++---
 1 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 4319f7b..0292fd0 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -36,7 +36,7 @@
 				<view>鍟嗗搧缂栫爜:{{wrkDetl.matnr}}</view>
 				<view>閿�鍞鍗曞彿:{{wrkDetl.threeCode ? wrkDetl.threeCode : ' --'}}</view>
 				<view>鑷敱椤�:{{wrkDetl.deadTime ? wrkDetl.deadTime : ' --'}}</view>
-				<view>鍑哄簱鏁伴噺:{{wrkDetl.anfme}}</view>
+				<view>浣滀笟鏁伴噺:{{wrkDetl.anfme}}</view>
 			</view>
 		</view>
 		
@@ -81,7 +81,7 @@
 			<uni-popup ref="doContainerMoveOut" type="dialog">
 				<view class="popup">
 					<!-- 鏍囬 -->
-					<view class="title">璇疯緭鍏ョ┖璐ф灦鐮�</view>
+					<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>
@@ -124,7 +124,7 @@
 					</view>
 					<view class="btn">
 						<view class="btn-left" @click="pickInClose">鍙栨秷</view>
-						<view class="btn-right" @click="pickIn()">鍏ュ簱</view>
+						<view class="btn-right" @click="pickIn()">纭鎷f枡</view>
 					</view>
 				</view>
 			</uni-popup>
@@ -153,6 +153,23 @@
 			</uni-popup>
 		</view>
 		
+		<!-- 寮圭獥 -->
+		<view>
+			<uni-popup ref="allocationIn" 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="pickInClose">鍙栨秷</view>
+						<view class="btn-right" @click="allocationInConfirm()">纭杩涘満</view>
+					</view>
+				</view>
+			</uni-popup>
+		</view>
 		
 		
 		
@@ -638,14 +655,14 @@
 				uni.request({
 					url: that.baseUrl + '/agvMobile/hand/control/allocationOut',
 					header: {'token': uni.getStorageSync('token')},
-					data: {devNo: this.station.devNo},
+					data: {devNo: that.station.devNo},
 					method: 'POST',
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
 							setTimeout(()=> {
-								_this.barcode = ''
-								_this.reloadStation()
+								that.barcode = ''
+								that.reloadStation()
 							},1000)
 							uni.showToast({ title: '绂诲満鎴愬姛', icon: "success", position: 'top' })
 						} else if (res.code == 403) {
@@ -658,8 +675,40 @@
 				});
 			},
 			allocationIn() {
-				
+				this.$refs.allocationIn.open()
+			},
+			allocationInClose() {
+				this.$refs.allocationIn.close()
+			},
+			allocationInConfirm() {
+				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/allocationIn',
+					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) {
+							that.$refs.allocationIn.close()
+							setTimeout(()=> {
+								that.barcode = ''
+								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);
+						} else {
+							uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+						}
+					}
+				});
 			}
+			
 		}
 	}
 </script>

--
Gitblit v1.9.1