From d2ef8d68317f9b8d900f08d78ddb202dcb7e56d1 Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Thu, 12 Sep 2024 14:20:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectOrderAllotCardComponents.vue | 19 ++++-- src/views/collect/CollectOrderNew.vue | 63 +++++++++++++++++-- src/views/collect/PanelOrderUpload.vue | 40 +++++++----- 3 files changed, 100 insertions(+), 22 deletions(-) diff --git a/src/views/collect/CollectOrderAllotCardComponents.vue b/src/views/collect/CollectOrderAllotCardComponents.vue index c4c87222..6dac1141 100644 --- a/src/views/collect/CollectOrderAllotCardComponents.vue +++ b/src/views/collect/CollectOrderAllotCardComponents.vue @@ -561,11 +561,22 @@ export default { }, linkPage(_this, row) { if (row != null && row.invAlert == 2) { - _this.$message.warning("工位存量不足，请及时上货！"); - return; + _this.$confirm("该订单目前工位存量不足，是否继续处理?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo + "&busType=" + row.busType + window.open(url, '_blank'); + }) + .catch(() => { + }); + }else { + let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo + "&busType=" + row.busType + window.open(url, '_blank'); } - let url = window.location.origin + `/UDI_WMS_NEW#/tagCodeBlank?workplaceId=` + row.workPlaceCode + "&billNo=" + row.billNo - window.open(url, '_blank'); + }, //置顶 orderTop(_this, row) { diff --git a/src/views/collect/CollectOrderNew.vue b/src/views/collect/CollectOrderNew.vue index accc42e1..6658c9b5 100644 --- a/src/views/collect/CollectOrderNew.vue +++ b/src/views/collect/CollectOrderNew.vue @@ -279,7 +279,38 @@ export default { }, data() { return { - + actDateRange: [], + pickerOptions: { + shortcuts: [ + { + text: "最近一周", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); + picker.$emit("pick", [start, end]); + }, + }, + { + text: "最近一个月", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); + picker.$emit("pick", [start, end]); + }, + }, + { + text: "最近三个月", + onClick(picker) { + const end = new Date(); + const start = new Date(); + start.setTime(start.getTime() - 3600 * 1000 * 24 * 90); + picker.$emit("pick", [start, end]); + }, + }, + ], + }, //界面配置相关 //患者处方 tableHeader: [], @@ -301,6 +332,8 @@ export default { billNo: null, busType: null, workPlaceCode: null, + startTime: null, + endTime: null, page: 1, limit: 10, }, @@ -401,9 +434,18 @@ export default { }) }, downloadData() { - if (this.filterQuery.workPlaceCode == null) { - return this.$message.error("请先选择工位") + // if (this.filterQuery.workPlaceCode == null) { + // return this.$message.error("请先选择工位") + // } + + if (this.actDateRange !== null) { + this.filterQuery.startTime = this.actDateRange[0]; + this.filterQuery.endTime = this.actDateRange[1]; + } else { + this.filterQuery.startTime = null; + this.filterQuery.endTime = null; } + downloadOrder(this.filterQuery).then(res => { if (res.code == 20000) { return this.$message.success(res.data) @@ -440,7 +482,13 @@ export default { getList() { this.loading = true; - console.log(this.filterQuery) + if (this.actDateRange !== null) { + this.filterQuery.startTime = this.actDateRange[0]; + this.filterQuery.endTime = this.actDateRange[1]; + } else { + this.filterQuery.startTime = null; + this.filterQuery.endTime = null; + } orderPage(this.filterQuery).then(res => { this.loading = false this.list = res.data.list || [] @@ -454,6 +502,13 @@ export default { , getList2(_this) { _this.loading = true; + if (_this.actDateRange !== null) { + _this.filterQuery.startTime = _this.actDateRange[0]; + _this.filterQuery.endTime = _this.actDateRange[1]; + } else { + _this.filterQuery.startTime = null; + _this.filterQuery.endTime = null; + } orderPage(_this.filterQuery).then(res => { _this.loading = false _this.list = res.data.list || [] diff --git a/src/views/collect/PanelOrderUpload.vue b/src/views/collect/PanelOrderUpload.vue index 351c19f3..43c6aa05 100644 --- a/src/views/collect/PanelOrderUpload.vue +++ b/src/views/collect/PanelOrderUpload.vue @@ -470,24 +470,36 @@ export default { }, orderUpload(_this, row){ let params = row; - orderUpload({billNo:params.billNo}) - .then((response) => { - if (response.code == 20000) { - this.getList(); - this.$message({ - type: "success", - message: "上传成功！", + _this.$confirm("该订单将上传到外部系统，是否继续?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning", + }) + .then(() => { + orderUpload({billNo:params.billNo}) + .then((response) => { + if (response.code == 20000) { + _this.getList(); + _this.$message({ + type: "success", + message: "上传成功！", + }); + } else if (response.code == 520) { + _this.$message.error(response.message); + _this.getList(); + } else { + _this.$message.error(response.message); + _this.getList(); + } + }) + .catch(() => { }); - } else if (response.code == 520) { - this.$message.error(response.message); - this.getList(); - } else { - this.$message.error(response.message); - this.getList(); - } }) .catch(() => { }); + + + } },