流程公共模块优化
pengqiang
parent
2c7e244401
commit
a26432c950
|
|
@ -101,6 +101,7 @@ public class ActTaskDefController extends BaseController {
|
|||
public String taskList(@PathVariable String procInsId, Map<String, Object> model) {
|
||||
List<ActHisTask> list = actTaskDefService.hisTaskList(procInsId);
|
||||
model.put("taskList", list);
|
||||
model.put("procInsId", procInsId);
|
||||
return "/admin/act_his_task_list";
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,85 +6,66 @@
|
|||
<div class="am-cf am-padding" style="padding:1rem 1.6rem 1.6rem 1rem;margin:0px;">
|
||||
<!-- padding:1px 2px 3px 4px;上、右、下,和左 -->
|
||||
<div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">工作流程</strong> /
|
||||
<small>审批过程</small>
|
||||
<small>审批过程和流程图</small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="am-g">
|
||||
<div class="am-u-sm-12 am-scrollable-horizontal">
|
||||
<!-- padding:1px 2px 3px 4px;上、右、下,和左 -->
|
||||
<table class="am-table am-table-striped am-table-hover table-main">
|
||||
<thead>
|
||||
<tr class="am-text-nowrap">
|
||||
<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-date">用时</th>
|
||||
<th class="table-set am-text-center">意见</th>
|
||||
<th class="table-set am-text-center">操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<#if (taskList)?exists>
|
||||
<#list taskList as list>
|
||||
<tr>
|
||||
<td>${list_index+1!}</td>
|
||||
<td>${list.taskName!}</td>
|
||||
<td>${list.assign!}</td>
|
||||
<td>${list.startTime?datetime}</td>
|
||||
<td><#if list.endTime??>
|
||||
${list.endTime?datetime}
|
||||
</#if></td>
|
||||
<td>${list.duration!}</td>
|
||||
<td>${list.comments!}</td>
|
||||
|
||||
<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>
|
||||
|
||||
<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>
|
||||
<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">
|
||||
<!-- padding:1px 2px 3px 4px;上、右、下,和左 -->
|
||||
<table class="am-table am-table-striped am-table-hover table-main">
|
||||
<thead>
|
||||
<tr class="am-text-nowrap">
|
||||
<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-date">用时</th>
|
||||
<th class="table-set am-text-center">意见</th>
|
||||
</tr>
|
||||
</#list>
|
||||
</#if>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div class="am-cf">
|
||||
<!-- 分页 -->
|
||||
<#if (pager.list)?exists && (pager.list?size>0) >
|
||||
<div class="am-fr">
|
||||
<#include "../common/common_pager.ftl">
|
||||
</div>
|
||||
<#else>
|
||||
<div class="am-kai" align="center">
|
||||
<h3>没有找到任何记录!</h3>
|
||||
</div>
|
||||
</#if>
|
||||
</thead>
|
||||
<tbody>
|
||||
<#if (taskList)?exists>
|
||||
<#list taskList as list>
|
||||
<tr>
|
||||
<td>${list_index+1!}</td>
|
||||
<td>${list.taskName!}</td>
|
||||
<td>${list.assign!}</td>
|
||||
<td>${list.startTime?datetime}</td>
|
||||
<td><#if list.endTime??>
|
||||
${list.endTime?datetime}
|
||||
</#if></td>
|
||||
<td>${list.duration!}</td>
|
||||
<td>${list.comments!}</td>
|
||||
</tr>
|
||||
</#list>
|
||||
</#if>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="am-tabs-bd">
|
||||
<div class="am-tab-panel am-fade am-in" id="tab3">
|
||||
<img id="img" name="img" style="width: 950px" src="${base}/actProcIns/procInsPng/${procInsId}">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<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"
|
||||
onclick="location.href='${base}/actProcIns/list'">返回
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -49,13 +49,6 @@
|
|||
</button>
|
||||
|
||||
</#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"
|
||||
class="am-btn am-btn-default am-btn-xs am-text-secondary"
|
||||
|
|
|
|||
Loading…
Reference in New Issue