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

项目审批列表增加字段

master
OathK1per 2022-07-22 10:20:26 +08:00
parent 3366735073
commit f25c4c6759
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/cn/palmte/work/controller/backend/ProjectController.java
View File

@ -369,6 +369,7 @@ public class ProjectController extends BaseController {
model.put("deptList", deptService.findAll()); model.put("deptList", deptService.findAll());
ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords, model); ConcurrentHashMap<String, String> searchInfo = getSearchInfo(keywords, model);
model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize)); model.put("pager", projectService.findMyApproveProjects(searchInfo, InterfaceUtil.getAdminId(), pageNumber, pageSize));
model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
return "admin/project_list_approve"; return "admin/project_list_approve";
} }

8
src/main/resources/templates/admin/project_list_approve.ftl
View File

@ -174,8 +174,12 @@
<thead> <thead>
<tr class="am-text-nowrap"> <tr class="am-text-nowrap">
<th class="table-title">序号</th> <th class="table-title">序号</th>
<th class="table-title">项目编号</th>
<th class="table-title">项目名称</th> <th class="table-title">项目名称</th>
<th class="table-title">项目类型</th> <th class="table-title">项目类型</th>
<th class="table-title">项目合同金额</th>
<th class="table-title">华智产品金额</th>
<th class="table-title">其他产品金额</th>
<th class="table-title">项目状态</th> <th class="table-title">项目状态</th>
<th class="table-title">审核状态</th> <th class="table-title">审核状态</th>
<th class="table-title">当前审核人</th> <th class="table-title">当前审核人</th>
@ -190,8 +194,12 @@
<#list pager.list as list> <#list pager.list as list>
<tr> <tr>
<td>${list.id!}</td> <td>${list.id!}</td>
<td>${list.projectNo!}</td>
<td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td> <td class="huanhang"><a style="cursor: pointer;text-decoration:none" onclick="location.href='${base}/project/approve?listFrom=list&type=1&id=${list.id}'">${list.name!}</a></td>
<td>${list.typeDesc!}</td> <td>${list.typeDesc!}</td>
<td>${Utils.format(list.contractAmount, "0.00")}</td>
<td>${Utils.format(list.huazhiProductAmount, "0.00")}</td>
<td>${Utils.format(list.ziguangOtherAmount, "0.00")}</td>
<td>${list.statusDesc!}</td> <td>${list.statusDesc!}</td>
<td>${list.approveStatusDesc!}</td> <td>${list.approveStatusDesc!}</td>
<td>${list.approveName!}</td> <td>${list.approveName!}</td>