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

流程公共模块优化

master
pengqiang 2021-11-17 18:07:02 +08:00
parent 2c7e244401
commit a26432c950
3 changed files with 49 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -101,6 +101,7 @@ public class ActTaskDefController extends BaseController {
public String taskList(@PathVariable String procInsId, Map<String, Object> model) { public String taskList(@PathVariable String procInsId, Map<String, Object> model) {
List<ActHisTask> list = actTaskDefService.hisTaskList(procInsId); List<ActHisTask> list = actTaskDefService.hisTaskList(procInsId);
model.put("taskList", list); model.put("taskList", list);
model.put("procInsId", procInsId);
return "/admin/act_his_task_list"; return "/admin/act_his_task_list";
} }

57
src/main/resources/templates/admin/act_his_task_list.ftl
View File

@ -6,11 +6,20 @@
<div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;"> <div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;">
<!-- padding:1px 2px 3px 4px;上、右、下,和左 --> <!-- padding:1px 2px 3px 4px;上、右、下,和左 -->
<div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">工作流程</strong> / <div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">工作流程</strong> /
<small>审批过程</small> <small>审批过程和流程图</small>
</div> </div>
</div> </div>
<div class="am-g">
<div class="am-tabs am-margin" data-am-tabs>
<ul class="am-tabs-nav am-nav am-nav-tabs">
<li class="am-active" ><a href="#tab2">审批过程</a></li>
<li><a href="#tab3">流程图</a></li>
</ul>
<div class="am-tabs-bd">
<div class="am-tab-panel am-fade am-in am-active" id="tab2">
<div class="am-u-sm-12 am-scrollable-horizontal"> <div class="am-u-sm-12 am-scrollable-horizontal">
<!-- padding:1px 2px 3px 4px;上、右、下,和左 --> <!-- padding:1px 2px 3px 4px;上、右、下,和左 -->
<table class="am-table am-table-striped am-table-hover table-main"> <table class="am-table am-table-striped am-table-hover table-main">
@ -23,7 +32,6 @@
<th class="table-date">结束时间</th> <th class="table-date">结束时间</th>
<th class="table-date">用时</th> <th class="table-date">用时</th>
<th class="table-set am-text-center">意见</th> <th class="table-set am-text-center">意见</th>
<th class="table-set am-text-center">操作</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -39,52 +47,25 @@
</#if></td> </#if></td>
<td>${list.duration!}</td> <td>${list.duration!}</td>
<td>${list.comments!}</td> <td>${list.comments!}</td>
<td>
<#if !list.endTime??>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="completeTask('${list.procInsId}', '${list.taskId}', 2)">
<span class="am-icon-pencil-square-o"></span>
审批通过
</button>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="completeTask('${list.procInsId}', '${list.taskId}', 3)">
<span class="am-icon-pencil-square-o"></span>
驳回
</button>
</#if>
</td>
</tr> </tr>
</#list> </#list>
</#if> </#if>
</tbody> </tbody>
</table> </table>
</div>
</div>
</div>
<div class="am-cf"> <div class="am-tabs-bd">
<!-- 分页 --> <div class="am-tab-panel am-fade am-in" id="tab3">
<#if (pager.list)?exists && (pager.list?size>0) > <img id="img" name="img" style="width: 950px" src="${base}/actProcIns/procInsPng/${procInsId}">
<div class="am-fr">
<#include "../common/common_pager.ftl">
</div>
<#else>
<div class="am-kai" align="center">
<h3>没有找到任何记录!</h3>
</div>
</#if>
</div> </div>
</div> </div>
</div> </div>
<div class="am-margin"> <div class="am-margin">
<#--<button type="submit" class="am-btn am-btn-primary am-btn-xs">提交保存</button>-->
<button type="button" class="am-btn am-btn-warning am-btn-xs" <button type="button" class="am-btn am-btn-warning am-btn-xs"
onclick="location.href='${base}/actProcIns/list'">返回 onclick="location.href='${base}/actProcIns/list'">返回
</button> </button>

7
src/main/resources/templates/admin/act_proc_ins_list.ftl
View File

@ -49,13 +49,6 @@
</button> </button>
</#if> </#if>
<button type="button"
class="am-btn am-btn-default am-btn-xs am-text-secondary"
onclick="window.open('${base}/actProcIns/procInsPng/${list.procInsId!}')">
<span class="am-icon-pencil-square-o"></span>
流程图
</button>
<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"