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

项目详情里的审核意见

master
pengqiang 2021-11-15 17:34:28 +08:00
parent fa29d77234
commit 1b47962e67
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,6 +333,8 @@ public class ProjectController extends BaseController {
model.put("finalBean", new FinalBean()); model.put("finalBean", new FinalBean());
//freemarker可以利用的静态方法 //freemarker可以利用的静态方法
model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils")); model.put("Utils", FreeMarkerUtil.fromStaticPackage("cn.palmte.work.utils.Utils"));
List<ProjectTaskRecord> list = projectTaskRecordService.list(id);
model.put("taskRecords", list);
return "admin/project_detail"; return "admin/project_detail";
} }

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

@ -20,10 +20,10 @@
<th class="table-title">任务名称</th> <th class="table-title">任务名称</th>
<#--<th class="table-title">任务类型</th>--> <#--<th class="table-title">任务类型</th>-->
<th class="table-date">回退任务</th> <th class="table-date">回退任务</th>
<th class="table-set am-text-center">审批人</th> <th class="table-set ">按人员设置审批人</th>
<th class="table-set am-text-center">审批角色</th> <th class="table-set ">按角色设置审批人</th>
<th class="table-set am-text-center">审批通过脚本</th> <th class="table-set ">审批通过脚本</th>
<th class="table-set am-text-center">审批驳回脚本</th> <th class="table-set ">审批驳回脚本</th>
<th class="table-set am-text-center">操作</th> <th class="table-set am-text-center">操作</th>
</tr> </tr>
</thead> </thead>

11
src/main/resources/templates/admin/project_detail.ftl
View File

@ -1338,13 +1338,14 @@
<div class="am-tab-panel am-fade am-in am-active" id="tab1"> <div class="am-tab-panel am-fade am-in am-active" id="tab1">
<div class="am-g am-form-group am-margin-top" style="display: flex;"> <div class="am-g am-form-group am-margin-top" style="display: flex;">
<div class="am-u-sm-4 am-u-md-2 am-text-right"> <div class="am-u-sm-4 am-u-md-2 am-text-right">
<span style="color: red;">*</span>审核意见：</div> 审核意见
<div class="am-u-sm-4 am-u-md-2 am-text-right">
<div class="am-u-sm-6 am-u-md-6">
<span>${project.name}</span>
</div> </div>
<div class="am-u-sm-4 am-u-md-4 am-text-left">
<#list taskRecords as node>
<span>${node.assigneeName} : ${node.taskComment} &nbsp;&nbsp; ${node.createTime}</span>
<hr/>
</#list>
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div>
</div> </div>
</div> </div>
</div> </div>