diff --git a/src/main/resources/templates/admin/act_model_list.ftl b/src/main/resources/templates/admin/act_model_list.ftl index 76e5b9a..220c877 100644 --- a/src/main/resources/templates/admin/act_model_list.ftl +++ b/src/main/resources/templates/admin/act_model_list.ftl @@ -191,16 +191,18 @@ var deploy = function (id) { - var params = {id: id}; - $.ajax({ - url: '${base}/actModel/deploy', - data: params, - dataType: "json", - async: false, - success: function (data) { - layer.msg(data.msg); - } - }); + if (window.confirm('部署后请在流程定义里配置任务审批人,新发起的审批将按最新的流程定义运行,确定要部署吗? ')) { + var params = {id: id}; + $.ajax({ + url: '${base}/actModel/deploy', + data: params, + dataType: "json", + async: false, + success: function (data) { + layer.msg(data.msg); + } + }); + } } diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 9355f28..ccd7e2d 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -230,8 +230,8 @@ - <#-- 项目为结算状态 并且结算审批通过 才能发起决算--> - <#if list.status== 10 && list.approveStatusSettle== 2 > + <#-- 项目为结算状态 并且结算审批通过 或者 结算审批不通过 才能发起决算--> + <#if (list.status== 10 && list.approveStatusSettle== 2) || (list.status== 15 && list.approveStatusFinal== 0) || (list.status== 15 && list.approveStatusFinal== 3)>