From 37b4d97b99c3919906f1f4a90cd2f42a36e32e5b Mon Sep 17 00:00:00 2001 From: anthonywj Date: Tue, 2 Jan 2024 09:16:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/permission.js | 6 +++--- src/views/inout/DialogCreateOrder.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/store/modules/permission.js b/src/store/modules/permission.js index 521d96d1..b09c8095 100644 --- a/src/store/modules/permission.js +++ b/src/store/modules/permission.js @@ -123,12 +123,12 @@ export function filterDynamicRoutes(routes) { export const loadView = (view) => { if (process.env.NODE_ENV === 'development') { - return (resolve) => require([`@/views/${view}.vue`], resolve) + return (resolve) => require([`@/views/${view}`], resolve) } else { // 使用 import 实现生产环境的路由懒加载 -// return () => import(`@/views/${view}`) - return (resolve) => require([`@/views/${view}.vue`], resolve) + return () => import(`@/views/${view}`) } } + export default permission diff --git a/src/views/inout/DialogCreateOrder.vue b/src/views/inout/DialogCreateOrder.vue index 50874fa8..250856c3 100644 --- a/src/views/inout/DialogCreateOrder.vue +++ b/src/views/inout/DialogCreateOrder.vue @@ -1144,7 +1144,7 @@ export default { return; } if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) { - if (this.$isBlank(this.orderFormData.fromCorp)) { + if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) { this.$message.warning("请选择往来单位！"); return; } @@ -1435,7 +1435,7 @@ export default { return } if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) { - if (this.$isBlank(this.orderFormData.fromCorp)) { + if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) { this.$message.warning("请选择往来单位！"); return; } @@ -1447,7 +1447,7 @@ export default { } } if (this.curAction.corpType === 1 && this.curAction.genUnit) { - if (this.$isBlank(this.orderFormData.fromCorp)) { + if (this.$isBlank(this.orderFormData.fromCorp) && this.$isBlank(this.orderFormData.sickerAdNum)) { this.$message.warning("请选择往来单位！"); return; }