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 # 从库数据源