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; }