From 3248fb0c8bd02ae9fde9724b9c1f5d03216b0108 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 20 五月 2024 16:52:43 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/stationDetl.vue | 97 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 89 insertions(+), 8 deletions(-)
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 4319f7b..d6afba1 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()">纭鎷ｆ枡</view>
</view>
</view>
</uni-popup>
@@ -153,11 +153,29 @@
</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="allocationInClose">鍙栨秷</view>
+ <view class="btn-right" @click="allocationInConfirm()">纭杩涘満</view>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
+ <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>
<button size="mini" type="primary" @click="doContainerMoveOut2()" v-if="btnType == 'out'">璐ф灦绂诲満</button>
@@ -413,8 +431,11 @@
} else if (wrkMast.ioType == 110) {
wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
} else if (wrkMast.ioType == 111) {
- wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
+ wrkMast['ioTitle'] = '璋冩嫧鍑哄簱'
_this.btnType = 'allocationOut'
+ } else if (wrkMast.ioType == 112) {
+ wrkMast['ioTitle'] = '璋冩嫧鍏ュ簱'
+ _this.btnType = 'null'
}
if (wrkMast.barcode == barcode) {
mast = wrkMast
@@ -638,14 +659,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 +679,68 @@
});
},
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' })
+ }
+ }
+ });
+ },
+ doBack() {
+ 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/doBack',
+ 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