From 07fb9e07d1a5901a692a027a66469c59d0f71491 Mon Sep 17 00:00:00 2001 From: Harry Yang Date: Wed, 4 Jan 2023 10:11:40 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=84=E4=BB=B6=E9=AA=8C=E8=AF=81=E5=90=8E?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/admin/business/process-edit.ftl | 11 ++++++----- .../templates/admin/business/process-new.ftl | 9 +++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/resources/templates/admin/business/process-edit.ftl b/src/main/resources/templates/admin/business/process-edit.ftl index d204022..7711efa 100644 --- a/src/main/resources/templates/admin/business/process-edit.ftl +++ b/src/main/resources/templates/admin/business/process-edit.ftl @@ -822,13 +822,14 @@ let validStatus = !needValid if (needValid) { // 校验表单 - if (fileList && fileList.length === 0) { - this.$message.error("未上传附件"); - return false - } - this.$refs["contractProcessForm"].validate((valid) => { if (valid) { + + if (fileList && fileList.length === 0) { + this.$message.error("未上传附件"); + return false + } + if (processType === saleContract) { if (!this.checkExpirationDate()) { return false diff --git a/src/main/resources/templates/admin/business/process-new.ftl b/src/main/resources/templates/admin/business/process-new.ftl index 54aef32..3835f95 100644 --- a/src/main/resources/templates/admin/business/process-new.ftl +++ b/src/main/resources/templates/admin/business/process-new.ftl @@ -989,14 +989,15 @@ } let validStatus = !needValid if (needValid) { - if (fileList && fileList.length === 0) { - this.$message.error("未上传附件"); - return false - } // 校验表单 this.$refs["contractProcessForm"].validate((valid) => { if (valid) { + if (fileList && fileList.length === 0) { + this.$message.error("未上传附件"); + return false + } + if (processType === saleContract) { if (!this.checkExpirationDate()) { return false