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

Merge remote-tracking branch 'origin/master'

master
xxssyyyyssxx 2021-11-17 16:46:09 +08:00
parent 33bcca7d67 cacafd874f
commit f97c24c4f2
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/resources/templates/admin/act_model_list.ftl
View File

@ -191,16 +191,18 @@
var deploy = function (id) { var deploy = function (id) {
var params = {id: id}; if (window.confirm('部署后请在流程定义里配置任务审批人，新发起的审批将按最新的流程定义运行，确定要部署吗？ ')) {
$.ajax({ var params = {id: id};
url: '${base}/actModel/deploy', $.ajax({
data: params, url: '${base}/actModel/deploy',
dataType: "json", data: params,
async: false, dataType: "json",
success: function (data) { async: false,
layer.msg(data.msg); success: function (data) {
} layer.msg(data.msg);
}); }
});
}
} }

4
src/main/resources/templates/admin/project_list.ftl
View File

@ -230,8 +230,8 @@
</button> </button>
</#if> </#if>
<#-- 项目为结算状态 并且结算审批通过 才能发起决算--> <#-- 项目为结算状态 并且结算审批通过 或者 结算审批不通过 才能发起决算-->
<#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)>
<button type="button" <button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary" class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="location.href='${base}/project/final/edit?id=${list.id}'"><span onclick="location.href='${base}/project/final/edit?id=${list.id}'"><span