From 288046d7f0e0e309b5929779d924b25e30bdc47c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 16 五月 2024 17:24:16 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/stationDetl.vue | 51 ++++++++++++++++++++-----
pages.json | 8 ++++
pages/phyz/wrkMast/locMoveMast.vue | 22 +++++++++++
3 files changed, 71 insertions(+), 10 deletions(-)
diff --git a/pages.json b/pages.json
index 54b496b..057eefd 100644
--- a/pages.json
+++ b/pages.json
@@ -721,6 +721,14 @@
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/phyz/wrkMast/locMoveMast",
+ "style" :
+ {
+ "navigationBarTitleText" : "璋冩嫧浠诲姟绠＄悊",
+ "enablePullDownRefresh" : false
+ }
}
],
"globalStyle": {
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index a4d6060..4319f7b 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -165,6 +165,8 @@
<button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</button>
<button size="mini" type="primary" @click="doPickIn2()" v-if="btnType == 'pick'">鍐嶆鎷ｆ枡</button>
<button size="mini" type="primary" @click="startPakin()" v-if="btnType == 'start'">鍚姩鍏ュ簱</button>
+ <button size="mini" type="primary" @click="allocationOut()" v-if="btnType == 'allocationOut'">璋冩嫧绂诲満</button>
+ <button size="mini" type="primary" @click="allocationIn()" v-if="btnType == 'allocationIn'">璋冩嫧杩涘満</button>
</view>
</view>
</template>
@@ -218,21 +220,16 @@
res = res.data
if (res.code === 200) {
if (res.data.records[0].locSts == 'O') {
- _this.btnType = 'emptyPakin'
+ if (res.data.records[0].devNo.substring(0, 2) == "DB") {
+ _this.btnType = 'allocationIn'
+ } else {
+ _this.btnType = 'emptyPakin'
+ }
} else if (res.data.records[0].locSts == 'F') {
_this.btnType = 'pakin'
} else {
_this.btnType = 'working'
}
- // if (res.data.records[0].locSts == 'O') {
- // res.data.records[0].locSts$ = '娌℃湁璐ф灦'
- // } else if (res.data.records[0].locSts == 'F') {
- // res.data.records[0].locSts$ = '璐ф灦鍦ㄥ簱'
- // } else if (res.data.records[0].locSts == 'S') {
- // res.data.records[0].locSts$ = '璐ф灦杩涘叆涓�'
- // } else if (res.data.records[0].locSts == 'R') {
- // res.data.records[0].locSts$ = '璐ф灦绂诲紑涓�'
- // }
setTimeout(()=>{
for (let k of res.data.records) {
@@ -415,6 +412,9 @@
_this.btnType = 'pick'
} else if (wrkMast.ioType == 110) {
wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
+ } else if (wrkMast.ioType == 111) {
+ wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
+ _this.btnType = 'allocationOut'
}
if (wrkMast.barcode == barcode) {
mast = wrkMast
@@ -629,6 +629,37 @@
}
});
},
+ // 璋冩嫧绂诲満
+ allocationOut() {
+ 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/allocationOut',
+ header: {'token': uni.getStorageSync('token')},
+ data: {devNo: this.station.devNo},
+ method: 'POST',
+ success(result) {
+ var res = result.data
+ if (res.code === 200) {
+ setTimeout(()=> {
+ _this.barcode = ''
+ _this.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' })
+ }
+ }
+ });
+ },
+ allocationIn() {
+
+ }
}
}
</script>
diff --git a/pages/phyz/wrkMast/locMoveMast.vue b/pages/phyz/wrkMast/locMoveMast.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/phyz/wrkMast/locMoveMast.vue
@@ -0,0 +1,22 @@
+<template>
+ <view>
+
+ </view>
+</template>
+
+<script>
+ export default {
+ data() {
+ return {
+
+ }
+ },
+ methods: {
+
+ }
+ }
+</script>
+
+<style>
+
+</style>
--
Gitblit v1.9.1