From e527858f21f3a6cbde63bfcfefe80f00f6d46676 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 26 Dec 2023 15:34:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/customerReturn/job/returnDetail.vue | 7 ++++--- static/config.json | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pages/customerReturn/job/returnDetail.vue b/pages/customerReturn/job/returnDetail.vue index 04b46221..93c2d3e4 100644 --- a/pages/customerReturn/job/returnDetail.vue +++ b/pages/customerReturn/job/returnDetail.vue @@ -274,12 +274,12 @@ if (itemDetail.inventoryStatus != result.balance.inventoryStatus) { if(this.jobContent.allowModifyInventoryStatus=="TRUE"){ - this.showQuestionMessage('任务中允许修改库存状态,实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + - ']不一致,是否继续上架?', res => { + this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus + + ']不一致,是否继续退货?', res => { if (res) { itemDetail.scaned = true; itemDetail.handleQty = Number(result.balance.qty) - itemDetail.toInventoryStatus = result.balance.inventoryStatus; + itemDetail.inventoryStatus = result.balance.inventoryStatus; itemDetail.balance = result.balance; itemDetail.balance.balanceQty = Number(result.balance.qty) itemDetail.balance.stdPackQty = Number(result.package.stdPackQty) @@ -403,6 +403,7 @@ detail.toContainerNumber = detail.containerNumber; detail.toBatch = info.batch; detail.toLocationCode = detail.toLocationCode; + detail.toInventoryStatus = 'HOLD'; subList.push(detail) } }) diff --git a/static/config.json b/static/config.json index 7426682e..310a012c 100644 --- a/static/config.json +++ b/static/config.json @@ -18,9 +18,9 @@ "request_url": { "name": "request_url", - "value": "http://dev.ccwin-in.com:25100/api/admin-api", + "value": "http://192.168.0.176:12080/admin-api", "dev2": "http://192.168.0.157:12080/admin-api", - "chefang": "http://192.168.0.180:12080/admin-api", + "chefang": "http://192.168.0.176:12080/admin-api", "chenxinming": "http://192.168.0.230:12080/admin-api", "liuchen": "http://192.168.0.159:12080/admin-api", "xuebing": "http://192.168.0.106:12080/admin-api", From 69913f06c25a3d3f47ca1b1ca5af104769383b60 Mon Sep 17 00:00:00 2001 From: niexiting <85552560@qq.com> Date: Tue, 26 Dec 2023 17:39:29 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/balance/moveStatus.vue | 21 ++++++++++++++------- mycomponents/status/status.vue | 13 ++++++++++++- pages/inventoryMove/coms/comMovebalance.vue | 4 ++-- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/mycomponents/balance/moveStatus.vue b/mycomponents/balance/moveStatus.vue index a626435b..0122e4ce 100644 --- a/mycomponents/balance/moveStatus.vue +++ b/mycomponents/balance/moveStatus.vue @@ -1,14 +1,18 @@ @@ -18,8 +22,11 @@ getInventoryStatusStyle, getInventoryStatusName } from '@/common/directory.js'; + import status from '@/mycomponents/status/status.vue' export default { - components: {}, + components: { + status + }, data() { return { diff --git a/mycomponents/status/status.vue b/mycomponents/status/status.vue index e884b25e..b771d9e5 100644 --- a/mycomponents/status/status.vue +++ b/mycomponents/status/status.vue @@ -2,6 +2,9 @@ • + + {{statusDesc(status)}} + @@ -9,6 +12,7 @@ diff --git a/pages/inventoryMove/coms/comMovebalance.vue b/pages/inventoryMove/coms/comMovebalance.vue index 12142f4f..03089c58 100644 --- a/pages/inventoryMove/coms/comMovebalance.vue +++ b/pages/inventoryMove/coms/comMovebalance.vue @@ -15,12 +15,12 @@ + - - + - - - —> - - - + + + + —> + + + @@ -43,6 +37,10 @@ type: String, default: '' }, + showToInventoryStatus: { + type: Boolean, + default: false + }, }, watch: { diff --git a/mycomponents/qty/balanceQtyEdit.vue b/mycomponents/qty/balanceQtyEdit.vue index e59f0b90..726c2d80 100644 --- a/mycomponents/qty/balanceQtyEdit.vue +++ b/mycomponents/qty/balanceQtyEdit.vue @@ -165,8 +165,11 @@ }, callback() { let qty = Number(this.allQty); - this.dataContent.toInventoryStatus = this.inventoryStatus; this.dataContent.handleQty = qty; + if (this.allowEditStatus) //只有编辑了库存状态,才给库存状态赋值 + { + this.dataContent.toInventoryStatus = this.inventoryStatus; + } this.$emit("confirm", qty); this.closeEditPopup(); }, diff --git a/pages/inventoryMove/coms/comInventoryDetailCard.vue b/pages/inventoryMove/coms/comInventoryDetailCard.vue index d456c28e..39d33afc 100644 --- a/pages/inventoryMove/coms/comInventoryDetailCard.vue +++ b/pages/inventoryMove/coms/comInventoryDetailCard.vue @@ -124,8 +124,7 @@ }); }, confirm(qty) { - // this.editItem.handleQty=qty; - //this.editItem.qty = qty; + this.editItem.handleQty=qty; this.$emit('updateData') }, showLocation(item) { diff --git a/pages/inventoryMove/coms/comMove.vue b/pages/inventoryMove/coms/comMoveRecord.vue similarity index 97% rename from pages/inventoryMove/coms/comMove.vue rename to pages/inventoryMove/coms/comMoveRecord.vue index 36c83977..07d38a1c 100644 --- a/pages/inventoryMove/coms/comMove.vue +++ b/pages/inventoryMove/coms/comMoveRecord.vue @@ -147,7 +147,7 @@ methods: { updateTitle() { - if (this.businessTypeCode == "InventoryMove") { + if (this.businessTypeCode == "Move") { this.title = "库存转移记录"; this.toInventoryStatus = "OK" } else if (this.businessTypeCode == "HoldToOk") { @@ -210,7 +210,7 @@ var itemp = createItemInfo(balance, pack); let newDetail = createDetailInfo(balance, pack); // newDetail.inventoryStatus = balance.inventoryStatus; - newDetail.toInventoryStatus = this.toInventoryStatus + newDetail.toInventoryStatus = this.toInventoryStatus; itemp.subList.push(newDetail); this.detailSource.push(itemp) } else { @@ -358,7 +358,6 @@ return itemList; }, setParams() { - var subList = [] var creator = this.$store.state.user.id this.detailSource.forEach(item => { @@ -384,10 +383,10 @@ detail.fromLocationCode = detail.locationCode; - if (this.businessType != '') { - detail.toLocationCode = this.toLocationCode; - detail.toInventoryStatus = this.toInventoryStatus; - } + // if (this.businessType != '') { + // detail.toLocationCode = this.toLocationCode; + // detail.toInventoryStatus = this.toInventoryStatus; + // } subList.push(detail) } diff --git a/pages/inventoryMove/coms/comMoveRecordCard.vue b/pages/inventoryMove/coms/comMoveRecordCard.vue index 74ddf94b..1241f426 100644 --- a/pages/inventoryMove/coms/comMoveRecordCard.vue +++ b/pages/inventoryMove/coms/comMoveRecordCard.vue @@ -14,10 +14,10 @@ + :right-options="item.scaned?scanOptions:detailOptions"> + :isShowLocation="true" :allowEditStatus='allowEditStatus'> diff --git a/pages/inventoryMove/coms/comMovebalance.vue b/pages/inventoryMove/coms/comMovebalance.vue index 03089c58..ec725afb 100644 --- a/pages/inventoryMove/coms/comMovebalance.vue +++ b/pages/inventoryMove/coms/comMovebalance.vue @@ -15,25 +15,10 @@ - - - - - + + - - - - @@ -104,38 +89,15 @@ type: String, default: "" }, + allowEditStatus: { + type: Boolean, + default: false + }, }, watch: { }, methods: { - copy(){ - // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100 - var content = "HPQ;V1.0;I"+this.detail.itemCode+";P"+this.detail.packingNumber+";B"+this.detail.batch+";Q"+this.detail.qty - this.$copyText(content).then( - res => { - uni.showToast({ - title: '复制成功', - icon: 'none' - }) - } - ) - }, - copyPro(){ - // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100 - var content = "HMQ;V1.0;I"+this.detail.itemCode+";P"+this.detail.packingNumber+";B"+this.detail.batch+";Q"+this.detail.qty - this.$copyText(content).then( - res => { - uni.showToast({ - title: '复制成功', - icon: 'none' - }) - } - ) - }, - isDevlement(){ - return getApp().globalData.isDevelopment; - } } } diff --git a/pages/inventoryMove/job/inventoryMoveDetail.vue b/pages/inventoryMove/job/inventoryMoveDetail.vue index 5affa16e..80676816 100644 --- a/pages/inventoryMove/job/inventoryMoveDetail.vue +++ b/pages/inventoryMove/job/inventoryMoveDetail.vue @@ -167,23 +167,23 @@ } else if (this.businessTypeCode == "HoldToOk") { name = "隔离转合格"; this.toLocationCode = ''; - this.toinventoryStatus = 'Ok'; + this.toinventoryStatus = 'OK'; } else if (this.businessTypeCode == "HoldToScrap") { name = "隔离转报废"; - this.toLocationCode = 'Scrap'; - this.toinventoryStatus = 'Scrap'; + this.toLocationCode = 'SCRAP'; + this.toinventoryStatus = 'SCRAP'; } else if (this.businessTypeCode == "OkToHold") { name = "合格转隔离"; - this.toLocationCode = 'Hold'; - this.toinventoryStatus = 'Hold'; + this.toLocationCode = 'HOLD'; + this.toinventoryStatus = 'HOLD'; } else if (this.businessTypeCode == "OktoScrap") { name = "合格转报废"; - this.toLocationCode = 'Scrap'; - this.toinventoryStatus = 'Scrap'; + this.toLocationCode = 'SCRAP'; + this.toinventoryStatus = 'SCRAP'; } else if (this.businessTypeCode == "ScrapToHold") { name = "报废转隔离"; - this.toLocationCode = 'Hold'; - this.toinventoryStatus = 'Hold'; + this.toLocationCode = 'HOLD'; + this.toinventoryStatus = 'HOLD'; } uni.setNavigationBarTitle({ diff --git a/pages/inventoryMove/record/holdToOkRecord.vue b/pages/inventoryMove/record/holdToOkRecord.vue index 6efc0d0a..72d3dc7b 100644 --- a/pages/inventoryMove/record/holdToOkRecord.vue +++ b/pages/inventoryMove/record/holdToOkRecord.vue @@ -1,15 +1,15 @@