diff --git a/.env.development b/.env.development index 5539ad6..2554ec7 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,6 @@ VUE_APP_TITLE = 供应商自助管理平台 # 开发环境配置 ENV = 'development' -# 若依管理系统/开发环境 VUE_APP_BASE_API = 'http://192.168.0.166:9993' # 应用访问路径 例如使用前缀 /admin/ diff --git a/.env.production b/.env.production index 035a00e..09677fb 100644 --- a/.env.production +++ b/.env.production @@ -14,10 +14,10 @@ ENV = 'production' # VUE_APP_BASE_API = 'http://116.204.106.103:9150/UDI_SPMS_SERVER/' # 平潭 -# VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' +VUE_APP_BASE_API = 'http://121.204.169.96:9150/UDI_SPMS_SERVER/' # 文明懂 -VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' +# VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_SPMS_SERVER/' # 林淑波 # VUE_APP_BASE_API = 'http://192.168.0.231:9150/UDI_SPMS_SERVER/' diff --git a/src/views/inout/DialogcChangeNewOrder.vue b/src/views/inout/DialogcChangeNewOrder.vue index 8e98084..c227cd2 100644 --- a/src/views/inout/DialogcChangeNewOrder.vue +++ b/src/views/inout/DialogcChangeNewOrder.vue @@ -260,29 +260,27 @@ export default { this.$message.warning("请选择单据类型!"); return; } - if ((this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit)) && this.$isBlank(this.formData.fromCorp)) { - this.$message.error('当前往来信息不能为空'); - return; - } if (this.$isBlank(this.formData.invCode)) { this.$message.error("当前分库不能为空"); return; } - - if (this.curAction.corpType === 0 || this.curAction.corpType === 2 || (this.curAction.corpType === 1 && !this.curAction.genUnit && this.$isBlank(this.formData.fromCorp))) { + if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) { + this.$message.error('往来单位不能为空'); + return; + } + if ((this.curAction.corpType === 2 && this.$isBlank(this.formData.fromCorp))) { this.$message.error("往来单位不能为空"); return; } - - if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) { + if ((this.curAction.corpType === 4 && this.$isBlank(this.formData.fromCorp))) { this.$message.error("往来单位不能为空"); return; } - - if (this.curAction.corpType === 1 && this.$isBlank(this.formData.fromCorp)) { - this.$message.error('往来单位不能为空'); + if (this.curAction.corpType == 3 && this.$isBlank(this.formData.fromInvCode)) { + this.$message.error("往来单位不能为空"); return; } + if (this.detailList.length == 0) { this.$message.error("产品列表不能为空"); return; diff --git a/src/views/supplier/company/basicProductEdit.vue b/src/views/supplier/company/basicProductEdit.vue index fabd745..8c0741d 100644 --- a/src/views/supplier/company/basicProductEdit.vue +++ b/src/views/supplier/company/basicProductEdit.vue @@ -866,7 +866,6 @@ export default { }, methods: { - onAddSubmit() { this.relevanceEdit.isDisable = this.editQuery.isDisable; this.relevanceEdit.isLock = this.editQuery.isLock;