From 35a6571ff25e5da94784d228d6bb73df768013d7 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 11 四月 2024 19:51:31 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/stationDetl.vue | 61 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 2d13aed..9fa6b9d 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -76,6 +76,42 @@
<!-- 寮圭獥 -->
<view>
+ <uni-popup ref="doContainerMoveOut" 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="containerMoveOutClose">鍙栨秷</view>
+ <view class="btn-right" @click="containerMoveOut()">鍏ュ簱</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+
+ <!-- 寮圭獥 -->
+ <view>
+ <uni-popup ref="doPickIn" 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="pickIn()">鍏ュ簱</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+
+ <!-- 寮圭獥 -->
+ <view>
<uni-popup ref="emptyOut" type="dialog">
<view class="popup">
<!-- 鏍囬 -->
@@ -104,8 +140,8 @@
<view class="buttom">
<button size="mini" type="primary" @click="emptyPakin()" v-if="btnType == 'emptyPakin'">绌烘澘鍏ュ簱</button>
<button size="mini" type="primary" @click="emptyOut()" v-if="btnType == 'emptyPakin'">鍛煎彨绌烘澘</button>
- <button size="mini" type="primary" @click="containerMoveOut()" v-if="btnType == 'out' && station.locSts == 'F'">纭鍑哄簱</button>
- <button size="mini" type="primary" @click="pickIn()" v-if="btnType == 'pick' && station.locSts == 'F'">宸叉嫞鏂欏洖搴�</button>
+ <button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out' && station.locSts == 'F'">纭鍑哄簱</button>
+ <button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick' && station.locSts == 'F'">宸叉嫞鏂欏洖搴�</button>
<button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start' && station.locSts == 'F'">鍚姩鍏ュ簱</button>
</view>
</view>
@@ -157,7 +193,6 @@
success(res) {
res = res.data
if (res.code === 200) {
-
if (res.data.records[0].locSts == 'O') {
_this.btnType = 'emptyPakin'
} else if (res.data.records[0].locSts == 'F') {
@@ -179,8 +214,8 @@
_this.reload.loadingText = '鏇存柊鐘舵��'
_this.getContainerType()
},500)
-
_this.getWrkMast(res.data.records[0].barcode)
+ uni.showToast({ title: '鏇存柊鎴愬姛锛�', icon: "none", position: 'top' })
} else if (res.code == 403) {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
setTimeout(() => { uni.reLaunch({ url: '../login/login' }); }, 1000);
@@ -422,9 +457,15 @@
})
},
// 鍏ㄦ澘鍑哄簱 纭鍑哄簱
+ doContainerMoveOut() {
+ this.$refs.doContainerMoveOut.open()
+ },
+ containerMoveOutClose() {
+ this.$refs.doContainerMoveOut.close()
+ },
containerMoveOut() {
let _this = this
- let devNo = {devNo:[this.station.devNo]}
+ let devNo = {devNo:[this.station.devNo],barcode: _this.barcode}
uni.request({
url: `${_this.baseUrl}/agv/basDevp/visualized/container/moveOut`,
data: JSON.stringify(devNo),
@@ -432,6 +473,7 @@
success(res) {
res = res.data
if (res.code === 200) {
+ _this.$refs.doContainerMoveOut.close()
setTimeout(()=> {
_this.barcode = ''
_this.reloadStation()
@@ -447,15 +489,22 @@
})
},
// 鎷ｆ枡鍑哄簱 纭鍚庡洖搴�
+ doPickIn() {
+ this.$refs.doPickIn.open()
+ },
+ pickInClose() {
+ this.$refs.doPickIn.close()
+ },
pickIn() {
let _this = this
uni.request({
url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
- data: {devNo: _this.station.devNo},
+ data: {devNo: _this.station.devNo,barcode: _this.barcode},
method: 'POST',
success(res) {
res = res.data
if (res.code === 200) {
+ _this.$refs.doPickIn.close()
_this.barcode = ''
_this.reloadStation()
} else if (res.code == 403) {
--
Gitblit v1.9.1