From 0d144777055e8588e136063940df5f131b5e020c Mon Sep 17 00:00:00 2001 From: chenhao Date: Fri, 9 Jan 2026 13:14:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(project):=20=E4=BF=AE=E5=A4=8D=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E4=BC=9A=E5=AE=A1=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加 canGenerate 检查防止已存在订单的项目取消会审 - 在无法生成订单时设置 jointTrial 为 '1' - 显示错误消息提示用户操作被阻止 - 确保会审状态在订单存在时不被意外修改 --- oms_web/oms_vue/src/views/project/info/index.vue | 5 +++++ ruoyi-admin/src/main/resources/application-prod.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/oms_web/oms_vue/src/views/project/info/index.vue b/oms_web/oms_vue/src/views/project/info/index.vue index 1e00887b..cbf51ba7 100644 --- a/oms_web/oms_vue/src/views/project/info/index.vue +++ b/oms_web/oms_vue/src/views/project/info/index.vue @@ -540,6 +540,11 @@ export default { }, /** 项目会审状态修改 */ handleJoinTrialChange(row) { + if (!row.canGenerate){ + row.jointTrial='1' + this.$modal.msgError("该项目已存在订单,无法取消会审"); + return; + } if (row.jointTrial === '0'){ if (!row.canGenerate){ this.$modal.alertWarning("该项目已存在订单,无法取消会审"); diff --git a/ruoyi-admin/src/main/resources/application-prod.yml b/ruoyi-admin/src/main/resources/application-prod.yml index d2ba4715..aaf12b95 100644 --- a/ruoyi-admin/src/main/resources/application-prod.yml +++ b/ruoyi-admin/src/main/resources/application-prod.yml @@ -13,7 +13,7 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://121.199.168.157:3306/unis_sip_pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true + url: jdbc:mysql://121.199.168.157:3306/unis_sip_pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&nullCatalogMeansCurrent=true username: root password: unis@db # 从库数据源