diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index f8415ea..6da4777 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -278,7 +278,7 @@ if ($("#startUpdateDate").val()) keywordsObj.startUpdateDate = $("#startUpdateDate").val(); if ($("#endUpdateDate").val()) - keywordsObj.endDate = $("#endUpdateDate").val(); + keywordsObj.endUpdateDate = $("#endUpdateDate").val(); var keywords = ""; if (!$.isEmptyObject(keywordsObj)) { keywords = JSON.stringify(keywordsObj); diff --git a/src/main/resources/templates/admin/project_list_approve.ftl b/src/main/resources/templates/admin/project_list_approve.ftl new file mode 100644 index 0000000..d1d726f --- /dev/null +++ b/src/main/resources/templates/admin/project_list_approve.ftl @@ -0,0 +1,310 @@ +<#assign base=request.contextPath /> +<#import "../common/defaultLayout.ftl" as defaultLayout> +<@defaultLayout.layout> + +
序号 | +项目名称 | +项目类型 | +项目状态 | +审核状态 | +当前审核人 | +项目创建者 | +部门名称 | +项目周期 | +最后更新时间 | +操作 | +
---|---|---|---|---|---|---|---|---|---|---|
${list.id!} | +${list.name!} | +${list.typeDesc!} | +${list.statusDesc!} | +${list.approveStatusDesc!} | +${list.approveName!} | +${list.creatorName!} | +${list.deptName!} | +${list.startDate?string("yyyy-MM")} ~ ${list.endDate?string("yyyy-MM")} | +${list.lastUpdateTime?string("yyyy-MM-dd HH:mm:ss")} ~ ${list.endDate?string("yyyy-MM-dd HH:mm:ss")} | ++ | + + +