From 130d4d7a0a9cf22d0e6d891308fbe5e5df4b5e22 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Fri, 8 Nov 2024 15:26:55 +0800 Subject: [PATCH] =?UTF-8?q?11/8=20=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E6=89=AB=E7=A0=81=E5=89=94=E9=99=A4=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=961?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/workplace/cargowWorkplaceManage.vue | 4 -- src/views/collect/IoCreateOrder.vue | 39 +++++++++++++------ src/views/collect/PanelCreateCodeDetail.vue | 11 ++++++ 3 files changed, 39 insertions(+), 15 deletions(-) diff --git a/src/views/basic/workplace/cargowWorkplaceManage.vue b/src/views/basic/workplace/cargowWorkplaceManage.vue index 02245230..70326a25 100644 --- a/src/views/basic/workplace/cargowWorkplaceManage.vue +++ b/src/views/basic/workplace/cargowWorkplaceManage.vue @@ -1136,10 +1136,6 @@ export default { } this.addWorkplaceDialogVisible = false this.$message.success('新增成功') - // this.query.code = this.groupData.code - // if (this.query.code == 1001) { - // this.query.code = null - // } this.getList() }).catch(() => { diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index 3436b645..bffbe689 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -9,8 +9,8 @@ > - 请先扫货位码 - {{ curQueueName }} + 请先扫取货槽编码 + {{curQueueName }} @@ -284,8 +284,10 @@ :curAction="curAction" :refreshPanel="refreshCodesPanel" :viewType="viewType" + :status="orderStatus" v-if="isCodeDetailAlive" @clearBillNo="clearBillNo" + @getOrderData="getOrderData" > @@ -439,7 +441,8 @@ export default { this.$refs.inputRef.focus() }, 'orderFormData.billNo'(newValue) { - if (newValue === null) { + if (newValue == null) { + this.overdeleteCode() this.scanDeleteType = true; } } @@ -635,6 +638,8 @@ export default { curQueue: null, redMesg: false, redMesgOld: false, + productName: null, + orderStatus:false,//是否调用子组件 } }, components: { @@ -708,6 +713,7 @@ export default { this.corpOrderIdDisabled = false this.curQueueName = ''; this.redMesg = this.redMesgOld + this.orderStatus = false this.refreshCodesPanel() }, //获取用户仓库列表 @@ -1184,7 +1190,7 @@ export default { if (this.curSpaceShow) { if (this.$isBlank(this.orderFormData.curSpaceCode)) { - this.$message.warning('请选择当前货位！') + this.$message.warning('请选择当前取货槽！') return } } @@ -1387,6 +1393,8 @@ export default { this.warnVisible = false this.errVisible = false + + this.isCodeAlive = false this.isBizDetailAlive = false this.isCodeDetailAlive = false @@ -1414,8 +1422,14 @@ export default { clearBillNo(data) { if (data) { this.orderFormData.billNo = null + this.orderStatus = false } }, + getOrderData(orderDetail){ + this.productName = orderDetail.coName + this.curQueueName = "当前取货槽:" + this.productName + "(" + this.curQueue.code + ")" + this.orderStatus = true + }, refreshOrder(orderQuery) { this.orderFormData = orderQuery @@ -1532,6 +1546,7 @@ export default { this.submitLoading = true } this.overdeleteCode() + this.orderStatus = false if (this.viewType == 2) { //扫码单据立即提交 submitCodes(tQuery).then((response) => { if (val == 1) { @@ -1747,6 +1762,7 @@ export default { this.$message.success('保存成功') this.successCloseData() this.result = '' + this.orderStatus = false this.$refs.inputRef.focus() } else { this.$message.error(response.message) @@ -1804,19 +1820,19 @@ export default { if (this.splitType == 'out') { if (!this.scanCode.includes("DMQ")) { if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) { - this.$message.warning('当前工位无需按货位上架') + this.$message.warning('当前工位无需按取货槽上架') return; } else if (this.queueStatus == "1" && isBlank(this.orderFormData.workPlaceQueueCode)) { this.scanCode = '' - this.$message.warning('当前工位需按货位上架') + this.$message.warning('当前工位需按取货槽上架') return; } } else { if (this.queueStatus == "0" && this.orderFormData.workPlaceQueueCode) { - this.$message.warning('当前工位无需按货位上架') + this.$message.warning('当前工位无需按取货槽上架') return; } else if (this.queueStatus == "1" && !this.orderFormData.workPlaceQueueCode) { - this.$message.warning('当前工位需按货位上架') + this.$message.warning('当前工位需按取货槽上架') return; } } @@ -1854,6 +1870,7 @@ export default { this.codeFormData.code = response.data.code this.scanCode = '' this.addCode() + } else { if (response.code == 502) { this.checkSuccess = false @@ -1999,7 +2016,7 @@ export default { } if (this.queueStatus == "0") { this.scanCode = '' - return this.$message.warning('当前工位无需按货位上架') + return this.$message.warning('当前工位无需按取货槽上架') } // if (!isBlank(this.orderFormData.billNo)){ // this.scanCode = '' @@ -2016,7 +2033,7 @@ export default { this.loading = false; if (response.code == 20000) { this.curQueue = response.data; - this.curQueueName = "当前货位:" + this.curQueue.name + "(" + this.curQueue.code + ")" + this.curQueueName = "当前取货槽:" + this.curQueue.code this.redMesg = false this.orderFormData.workPlaceQueueCode = this.curQueue.code this.scanCode = ''; @@ -2281,7 +2298,7 @@ export default { } } else if (this.queueStatus == "1" && this.orderFormData.workPlaceQueueCode != null) { if (fullScanData != null && fullScanData[0].includes("DMQ")) { - this.$message.warning('当前上货已绑定货位，请勿重复绑定！'); + this.$message.warning('当前上货已绑定取货槽，请勿重复绑定！'); return; } } diff --git a/src/views/collect/PanelCreateCodeDetail.vue b/src/views/collect/PanelCreateCodeDetail.vue index 9dd4d097..78f3cf6c 100644 --- a/src/views/collect/PanelCreateCodeDetail.vue +++ b/src/views/collect/PanelCreateCodeDetail.vue @@ -64,6 +64,11 @@ export default { type: Object, required: true, }, + status: { + type: Object, + required: true, + }, + }, data() { return { @@ -79,6 +84,8 @@ export default { selectRlVisible: false, dialogTableVisible: false, editCodeVisible: false, + orderDetail:null, + } }, @@ -99,6 +106,10 @@ export default { this.detailList = response.data.list || []; this.total = response.data.total || 0; this.loading = false; + if (this.detailList.length > 0 && this.status == false){ + this.orderDetail = this.detailList[0] + this.$emit('getOrderData', this.orderDetail) + } this.$emit('clearBillNo', this.detailList.length > 0? false : true); }) .catch(() => {