From a9bf429ca5886ec03d4a3205f0425a7a421b6b8b Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 29 五月 2024 13:21:56 +0800
Subject: [PATCH] #
---
pages/phyz/stationManage/stationDetl.vue | 37 +++++++++++++++++++++++++++++++++++--
pages/phyz/stationManage/pickAgain.vue | 7 ++++++-
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/pages/phyz/stationManage/pickAgain.vue b/pages/phyz/stationManage/pickAgain.vue
index 3c22660..2ddb41e 100644
--- a/pages/phyz/stationManage/pickAgain.vue
+++ b/pages/phyz/stationManage/pickAgain.vue
@@ -155,7 +155,12 @@
// 鍒ゆ柇娣诲姞鐨勫晢鍝佹槸鍚﹀拰宸茬粡娣诲姞鐨勯噸澶�
let dataList = this.dataList
this.index = index
- this.maxCount = this.dataList[index].stock
+
+ if (this.dataList[index].stock > this.dataList[index].anfme) {
+ this.maxCount = this.dataList[index].anfme - this.dataList[index].pickedAnfme
+ } else {
+ this.maxCount = this.dataList[index].stock
+ }
this.$refs.addItem.open()
},
addClose() {
diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue
index ca329e8..6f39747 100644
--- a/pages/phyz/stationManage/stationDetl.vue
+++ b/pages/phyz/stationManage/stationDetl.vue
@@ -11,7 +11,9 @@
<view>绔欑偣鐘舵�侊細{{station.locSts$}}</view>
<view class="mt-flex">
<view class="station-barcode" style="flex: 1">璐ф灦鐮侊細<text>{{station.barcode ? station.barcode : '--'}}</text></view>
- <view v-if="station.barcode && station.locSts == 'F'"><button size="mini" type="warn" @click="unbind()">瑙ｉ櫎缁戝畾</button></view>
+ <view v-if="station.barcode && station.locSts == 'F'">
+ <!-- <button size="mini" type="warn" @click="unbind()">瑙ｉ櫎缁戝畾</button> -->
+ </view>
</view>
</view>
@@ -193,9 +195,11 @@
<!-- 搴曢儴鎿嶄綔鎸夐挳 -->
<view class="buttom">
<button size="mini" :disabled="dis" type="warn" @click="doBack()" v-if="btnType == 'out' || btnType == 'pick'">閫�搴搟{sec}}</button>
+ <button size="mini" type="primary" @click="handBack()" v-if="btnType == 'handBack'">杞墜鍔�</button>
+ <!-- <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>
+ <!-- <button size="mini" type="primary" @click="doContainerMoveOut2()" v-if="btnType == 'out'">璐ф灦绂诲満</button> -->
<button size="mini" type="primary" @click="doContainerMoveOut()" v-if="btnType == 'out'">纭鍑哄簱</button>
<button size="mini" type="primary" @click="doPickIn()" v-if="btnType == 'pick'">宸叉嫞鏂欏洖搴�</button>
<button size="mini" type="primary" @click="doPickIn2()" v-if="btnType == 'pick'">鍐嶆鎷ｆ枡</button>
@@ -461,6 +465,9 @@
} else if (wrkMast.ioType == 103) {
wrkMast['ioTitle'] = '鎷ｆ枡鍑哄簱'
_this.btnType = 'pick'
+ } else if (wrkMast.ioType == 109) {
+ wrkMast['ioTitle'] = '鑷姩鍥炴祦'
+ _this.btnType = 'handBack'
} else if (wrkMast.ioType == 110) {
wrkMast['ioTitle'] = '绌烘澘鍑哄簱'
} else if (wrkMast.ioType == 111) {
@@ -782,6 +789,32 @@
}
}
});
+ },
+ handBack() {
+ 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/handBack',
+ 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) {
+ setTimeout(()=> {
+ 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' })
+ }
+ }
+ });
}
}
--
Gitblit v1.9.1