From 0e78823dd6ee8de811246e687298b17b28cd80c7 Mon Sep 17 00:00:00 2001 From: whycq <913841844@qq.com> Date: 星期四, 30 五月 2024 15:48:43 +0800 Subject: [PATCH] # --- pages/phyz/stationManage/stationDetl.vue | 16 +++++++++++----- pages/phyz/stationManage/pickAgain.vue | 17 ++++++++++++++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/pages/phyz/stationManage/pickAgain.vue b/pages/phyz/stationManage/pickAgain.vue index 2ddb41e..f4d44ab 100644 --- a/pages/phyz/stationManage/pickAgain.vue +++ b/pages/phyz/stationManage/pickAgain.vue @@ -155,12 +155,23 @@ // 鍒ゆ柇娣诲姞鐨勫晢鍝佹槸鍚﹀拰宸茬粡娣诲姞鐨勯噸澶� let dataList = this.dataList this.index = index + let orderCount = this.dataList[index].stock + let locCount = this.dataList[index].anfme + let pickedAnfme = this.dataList[index].pickedAnfme + // 棰勮鏈�澶ц鍑哄簱 + let ftCount = pickedAnfme + orderCount - if (this.dataList[index].stock > this.dataList[index].anfme) { - this.maxCount = this.dataList[index].anfme - this.dataList[index].pickedAnfme + if (orderCount > locCount) { + this.maxCount = locCount - pickedAnfme } else { - this.maxCount = this.dataList[index].stock + if (ftCount > locCount) { + this.maxCount = locCount -pickedAnfme + } else { + this.maxCount = orderCount + } + } + this.$refs.addItem.open() }, addClose() { diff --git a/pages/phyz/stationManage/stationDetl.vue b/pages/phyz/stationManage/stationDetl.vue index 9cb294c..3d4b81f 100644 --- a/pages/phyz/stationManage/stationDetl.vue +++ b/pages/phyz/stationManage/stationDetl.vue @@ -224,7 +224,7 @@ <button size="mini" type="primary" @click="allocationOut()" v-if="btnType == 'allocationOut'">璋冩嫧绂诲満</button> <button size="mini" type="primary" @click="allocationIn()" v-if="btnType == 'allocationIn'">璋冩嫧杩涘満</button> <button size="mini" type="primary" @click="empOut()" v-if="btnType == 'empOut'">绌烘灦绂诲満</button> - <button size="mini" type="primary" @click="empIn()" v-if="btnType == 'allocationIn'">绌烘灦杩涘満</button> + <button size="mini" type="primary" @click="empIn()" v-if="btnType == 'empIn'">绌烘灦杩涘満</button> </view> </view> </template> @@ -267,7 +267,7 @@ }) setInterval(()=> { let k = utils.checkSec() - console.log(k); + // console.log(k); if (k == 180) { this.dis = false this.sec = '' @@ -295,7 +295,11 @@ if (res.code === 200) { if (res.data.records[0].locSts == 'O') { if (res.data.records[0].devNo.substring(0, 2) == "DB") { - _this.btnType = 'allocationIn' + if (res.data.records[0].floor != 1) { + _this.btnType = 'allocationIn' + } else { + _this.btnType = 'empIn' + } } else { _this.btnType = 'emptyPakin' } @@ -496,8 +500,10 @@ wrkMast['ioTitle'] = '璋冩嫧鍏ュ簱' _this.btnType = 'null' } else if (wrkMast.ioType == 113) { - wrkMast['ioTitle'] = '璐ф灦鍥炴祦' - _this.btnType = 'empOut' + if (wrkMast.wrkSts == 212) { + wrkMast['ioTitle'] = '璐ф灦鍥炴祦' + _this.btnType = 'empOut' + } } if (wrkMast.barcode == barcode) { mast = wrkMast -- Gitblit v1.9.1