From 9551c97e1c47c75d7de945337f4c6bf2026bdb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Fri, 14 Jul 2023 16:17:18 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=20=E8=BF=91=E6=95=88=E6=9C=9F=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E6=8F=90=E9=86=92=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogCreateOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index a931fd32..02243d94 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -1128,7 +1128,7 @@ export default { } else if (response.code == 505) { this.$confirm(response.message, "提示", { confirmButtonText: "确定", - cancelButtonText: "忽略", + cancelButtonText: "取消", type: "warning", }) .then(() => { From 179002c209569e583c328d145fdd90e818d875d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Fri, 14 Jul 2023 16:55:01 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BE=85=E9=85=8D=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E2=80=94=E2=80=94=E7=BC=96=E8=BE=91=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=BE=80=E6=9D=A5=E4=BF=A1=E6=81=AF=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9C=89=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/inout/DialogCreateOrder.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 90f717a3..97a3e8b8 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -146,7 +146,7 @@ " > Date: Fri, 14 Jul 2023 17:55:15 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/basic/business/stockOrder.vue | 4 ++-- src/views/inventory/inner/innerOrderSelectProduct.vue | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/basic/business/stockOrder.vue b/src/views/basic/business/stockOrder.vue index 2c8aed38..7bd21122 100644 --- a/src/views/basic/business/stockOrder.vue +++ b/src/views/basic/business/stockOrder.vue @@ -408,7 +408,7 @@ export default { this.query.startTime = null; this.query.endTime = null; } - this.query.vueType = "supDelivery"; + this.query.vueType = "stock"; filterOrder(this.query) .then(response => { this.loading = false; @@ -469,7 +469,7 @@ export default { getBusType() { let query = { enabled: true, - vueType: "supDelivery", + vueType: "stock", }; getLocalJoinByUser(query) .then((response) => { diff --git a/src/views/inventory/inner/innerOrderSelectProduct.vue b/src/views/inventory/inner/innerOrderSelectProduct.vue index 78942bc3..ff4aaed3 100644 --- a/src/views/inventory/inner/innerOrderSelectProduct.vue +++ b/src/views/inventory/inner/innerOrderSelectProduct.vue @@ -128,6 +128,7 @@ import {addApplyDetail, addApply} from "../../../api/purchase/purApply"; import store from "../../../store"; import udiRlDetailDialog from "./../../purchase/purApply/purUdiRlDetailDialog"; import {addOrderDetail} from "@/api/inventory/innerOrder"; +import {isBlank} from "@/utils/strUtil"; export default { name: "stockOrderNewSelectProduct", @@ -324,7 +325,7 @@ export default { } } let str = this.multipleSelection.zczbhhzbapzbh; - if (str.search(",") != -1) { + if (!isBlank(str) && str.search(",") != -1) { this.currentCert = null; this.certList = str.split(','); this.dialogFormVisible = true;