From 6624afc7e320466a370e54fa4c34b37b2f92a7a2 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 05 四月 2024 17:51:32 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/stationDetl.vue | 32 ++++++++++++++++++++++++--------
pages/phyz/stationManage/stationManage.vue | 4 ++--
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index 1881917..92c98d1 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -17,7 +17,7 @@
<!-- 宸ヤ綔妗� -->
- <view class="wrkMast">
+ <view class="wrkMast" v-if="wrkMast">
<view class="wrkMast-wrkNo">
<view style="flex:3">宸ヤ綔鍙�: {{wrkMast.wrkNo}}</view>
<view style="flex:2;text-align: right;">{{wrkMast.ioTitle}}</view>
@@ -87,8 +87,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'">纭鍑哄簱</button>
- <button size="mini" type="primary" @click="pickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</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>
</view>
</view>
</template>
@@ -308,7 +308,7 @@
method: 'GET',
success(res) {
res = res.data
- if (res.code === 200) {
+ if (res.code === 200 && res.data.records.length > 0) {
if (res.data.records[0].ioType == 1) {
res.data.records[0]['ioTitle'] = '鍏ュ簱'
} else if (res.data.records[0].ioType == 10) {
@@ -320,6 +320,7 @@
_this.btnType = 'out'
} else if (res.data.records[0].ioType == 103) {
res.data.records[0]['ioTitle'] = '鎷ｆ枡鍑哄簱'
+ _this.btnType = 'pick'
} else if (res.data.records[0].ioType == 110) {
res.data.records[0]['ioTitle'] = '绌烘澘鍑哄簱'
}
@@ -349,6 +350,7 @@
}
})
},
+ // 鍏ㄦ澘鍑哄簱 纭鍑哄簱
containerMoveOut() {
let _this = this
let devNo = {devNo:[this.station.devNo]}
@@ -366,14 +368,28 @@
uni.showToast({ title: '纭瀹屾垚', icon: "success", position: 'top' })
} else {
uni.showToast({ title: res.msg, icon: "error", position: 'top' })
- setTimeout(()=> {
- _this.searchValue = ''
- _this.getBasDevp()
- },2000)
}
}
})
},
+ // 鎷ｆ枡鍑哄簱 纭鍚庡洖搴�
+ pickIn() {
+ let _this = this
+ uni.request({
+ url: `${_this.baseUrl}/agv/basDevp/visualized/container/pickIn`,
+ data: {devNo: _this.station.devNo},
+ method: 'POST',
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ _this.barcode = ''
+ _this.reloadStation()
+ } else {
+ uni.showToast({ title: res.msg, icon: "error", position: 'top' })
+ }
+ }
+ })
+ }
}
}
</script>
diff --git a/pages/phyz/stationManage/stationManage.vue b/pages/phyz/stationManage/stationManage.vue
index 4bc7cd2..4e774e9 100644
--- a/pages/phyz/stationManage/stationManage.vue
+++ b/pages/phyz/stationManage/stationManage.vue
@@ -122,6 +122,7 @@
this.baseUrl = uni.getStorageSync('baseUrl');
this.token = uni.getStorageSync('token');
this.getBasDevp('all')
+ this.searchValueFocus = true
},
methods: {
searchValueInput() {
@@ -384,8 +385,7 @@
events: {
// 涓烘寚瀹氫簨浠舵坊鍔犱竴涓洃鍚櫒锛岃幏鍙栬鎵撳紑椤甸潰浼犻�佸埌褰撳墠椤甸潰鐨勬暟鎹� 鍙﹀涓�涓〉闈紶杩囨潵鐨�
acceptDataFromOpenedPage: function(data) {
- // _this.matnr = data.data
- _this.input(_this.matnr)
+ _this.searchValueFocus = true
},
},
});
--
Gitblit v1.9.1