mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_1.0.0' into dev_1.0.0

dev_1.0.1
chenh 2026-01-12 17:49:48 +08:00
parent ec3e34ad21 0d14477705
commit 31a8de5569
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
oms_web/oms_vue/src/views/project/info/index.vue
View File

@ -540,6 +540,11 @@ export default {
}, },
/** 项目会审状态修改 */ /** 项目会审状态修改 */
handleJoinTrialChange(row) { handleJoinTrialChange(row) {
if (!row.canGenerate){
row.jointTrial='1'
this.$modal.msgError("该项目已存在订单,无法取消会审");
return;
}
if (row.jointTrial === '0'){ if (row.jointTrial === '0'){
if (!row.canGenerate){ if (!row.canGenerate){
this.$modal.alertWarning("该项目已存在订单,无法取消会审"); this.$modal.alertWarning("该项目已存在订单,无法取消会审");

2
ruoyi-admin/src/main/resources/application-prod.yml
View File

@ -13,7 +13,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: 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 username: root
password: unis@db password: unis@db
# 从库数据源 # 从库数据源