From 43b6803df4bf99a383f0d34074f3b236c1127841 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Sat, 17 Aug 2024 17:15:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=B7=A5=E4=BD=8D=E4=B8=8A?= =?UTF-8?q?=E8=B4=A7=E9=A1=B5=E9=9D=A2=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/collect/IoCreateOrder.vue | 76 +++++++++++++++++++++++++---- 1 file changed, 66 insertions(+), 10 deletions(-) diff --git a/src/views/collect/IoCreateOrder.vue b/src/views/collect/IoCreateOrder.vue index c7dff581..f4234e40 100644 --- a/src/views/collect/IoCreateOrder.vue +++ b/src/views/collect/IoCreateOrder.vue @@ -495,7 +495,35 @@ export default { DialogSelectUnit, DialogSelectSpace, selectRlDialog, dialogInvProduct }, methods: { - + successCloseData(){ + let workPlaceCode = this.orderFormData.workPlaceCode + this.orderFormData ={ + billNo: null, + corpOrderId: null, + action: null, + invCode: null, + fromCorp: null, + fromCorpName: null, + fromName: null, + fromInvCode: null, + remark: null, + fromType: 2, + errMsg: null, + checkPreInOrders: null, + checkPreInInvCode: null, + checkPreInSpaceCode: null, + curSpaceCode: null, + preSpaceCode: null, + preCurSpaceCode: null, //单据 + sickerAdNum: null, + workPlaceCode: null, + fifoSplit: 1, + } + this.orderFormData.workPlaceCode = workPlaceCode + this.scanCode= ""; + this.corpOrderIdDisabled = false; + this.refreshCodesPanel() + }, //获取用户仓库列表 findInvListByUser() { this.curInvOptions = []; @@ -616,7 +644,9 @@ export default { if (response.code === 20000) { // this.$message.success("成功"); const codeDetailComponent = this.$refs.IoCreateOrderCodeDetail.getOrderDetails(); - this.closeDialog(); + if(this.closeDialog != undefined){ + this.closeDialog(); + } this.clearOrder(); } else { // this.$message.error(response.message); @@ -890,6 +920,10 @@ export default { //添加条码 addCode() { + if (this.$isBlank(this.orderFormData.workPlaceCode)) { + this.$message.warning("请选择工位！"); + return; + } this.originCode = ""; this.sictomText = ""; this.orderFormData.corpOrderId = this.orderFormData.corpOrderId.trim(); @@ -1156,7 +1190,9 @@ export default { this.retractLoading = false if (response.code == 20000) { this.$message.success("撤回成功！"); - this.closeDialog(); + if(this.closeDialog != undefined){ + this.closeDialog(); + } } else { this.$message.error(response.message); } @@ -1182,7 +1218,9 @@ export default { this.codeLoading = false if (response.code === 20000) { this.$message.success("提交成功"); - this.closeDialog(); + if(this.closeDialog != undefined){ + this.closeDialog(); + } } else { this.$message.error(response.message); } @@ -1195,7 +1233,9 @@ export default { this.checkLoading = false if (response.code === 20000) { this.$message.success("提交成功"); - this.closeDialog(); + if(this.closeDialog != undefined){ + this.closeDialog(); + } } else { this.$message.error(response.message); } @@ -1254,7 +1294,11 @@ export default { } if (response.code === 20000) { this.$message.success("提交成功,等待处理，请刷新后查看！"); - this.closeDialog(); + this.successCloseData() + console.log(this.closeDialog()) + if(this.closeDialog != undefined){ + this.closeDialog(); + } } else { this.$message.error(response.message); } @@ -1276,7 +1320,10 @@ export default { } if (response.code === 20000) { this.$message.success("提交成功"); - this.closeDialog(); + this.successCloseData() + if(this.closeDialog != undefined){ + this.closeDialog(); + } } else { this.$message.error(response.message); } @@ -1295,7 +1342,10 @@ export default { if (response.code === 20000) { this.$message.success("提交成功"); - this.closeDialog(); + this.successCloseData() + if(this.closeDialog != undefined){ + this.closeDialog(); + } } else { this.$message.error(response.message); } @@ -1335,7 +1385,11 @@ export default { this.submitLoading = false if (response.code === 20000) { this.$message.success("提交成功"); - this.closeDialog(); + this.successCloseData() + if(this.closeDialog != undefined){ + this.closeDialog(); + } + } else { this.$message.error(response.message); } @@ -1357,7 +1411,9 @@ export default { saveOrderWeb(tQuery).then((response) => { this.saveLoading = false if (response.code === 20000) { - this.closeDialog(); + if(this.closeDialog != undefined){ + this.closeDialog(); + } } else { this.$message.error(response.message); } From 8a2c150945e4c47463ae6b61c7288303b5392527 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 17 Aug 2024 19:01:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=B7=A5=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/collect/collectOrder.js | 8 ++++++++ src/views/collect/CollectOrderAllotComponents.vue | 4 ---- src/views/collect/DealOrder.vue | 1 + src/views/collect/bindWorkDialog.vue | 6 +++--- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/api/collect/collectOrder.js b/src/api/collect/collectOrder.js index cca41bd3..cda2cb7b 100644 --- a/src/api/collect/collectOrder.js +++ b/src/api/collect/collectOrder.js @@ -75,6 +75,14 @@ export function autoCodeResult(query) { } +export function bindWork(query) { + return axios({ + url: "/udiwms/basic/collect/order/bindWork", + method: "post", + data: query + }); +} + diff --git a/src/views/collect/CollectOrderAllotComponents.vue b/src/views/collect/CollectOrderAllotComponents.vue index a1ffa5aa..67723803 100644 --- a/src/views/collect/CollectOrderAllotComponents.vue +++ b/src/views/collect/CollectOrderAllotComponents.vue @@ -376,10 +376,6 @@ export default { }, bindWorkPlace(_this,row) { - // if (this.multiplePreSelection.length == 0) { - // this.$message.warning('请先选择处方!'); - // return - // } _this.prescribeListData = row _this.bindWorkPlaceVisible = true; diff --git a/src/views/collect/DealOrder.vue b/src/views/collect/DealOrder.vue index dc6d6510..95d77011 100644 --- a/src/views/collect/DealOrder.vue +++ b/src/views/collect/DealOrder.vue @@ -473,6 +473,7 @@ export default { if (res.code == 20000) { this.formData.tagStatus = 2; this.formData = res.data; + this.refreshCodesPanel(this); } else { this.$message.error(res.message) } diff --git a/src/views/collect/bindWorkDialog.vue b/src/views/collect/bindWorkDialog.vue index 80f70091..3e037d77 100644 --- a/src/views/collect/bindWorkDialog.vue +++ b/src/views/collect/bindWorkDialog.vue @@ -53,7 +53,7 @@ import { deleteWorkplace, createWorkplaceId } from '@/api/basic/sysWorkplaceManage' -import {bindWork} from "@/api/basic/sicker/prescribeApi"; +import {bindWork} from "@/api/collect/collectOrder"; export default { @@ -71,7 +71,7 @@ export default { data() { return { query: { - invCode: this.$store.getters.locInvCode, + invCode: null,//this.$store.getters.locInvCode page: 1, limit: 20 }, @@ -201,7 +201,7 @@ export default { bindWork() { let query = { - prescribeListData: this.prescribeListData, + collOrder: this.prescribeListData, workplaceCode: this.currentRow.workplaceId } bindWork(query).then(res => {