From a26432c950a941e5f041b0f3da3358540ad1f183 Mon Sep 17 00:00:00 2001
From: pengqiang <pengqiang.it@ciic.com.cn>
Date: Wed, 17 Nov 2021 18:07:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=85=AC=E5=85=B1=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/ActTaskDefController.java         |   1 +
 .../templates/admin/act_his_task_list.ftl     | 115 ++++++++----------
 .../templates/admin/act_proc_ins_list.ftl     |   7 --
 3 files changed, 49 insertions(+), 74 deletions(-)

diff --git a/src/main/java/cn/palmte/work/controller/backend/ActTaskDefController.java b/src/main/java/cn/palmte/work/controller/backend/ActTaskDefController.java
index c7c5bb6..882a093 100644
--- a/src/main/java/cn/palmte/work/controller/backend/ActTaskDefController.java
+++ b/src/main/java/cn/palmte/work/controller/backend/ActTaskDefController.java
@@ -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";
     }
 
diff --git a/src/main/resources/templates/admin/act_his_task_list.ftl b/src/main/resources/templates/admin/act_his_task_list.ftl
index c63137d..d723d59 100644
--- a/src/main/resources/templates/admin/act_his_task_list.ftl
+++ b/src/main/resources/templates/admin/act_his_task_list.ftl
@@ -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>
diff --git a/src/main/resources/templates/admin/act_proc_ins_list.ftl b/src/main/resources/templates/admin/act_proc_ins_list.ftl
index ede550a..1fde6f3 100644
--- a/src/main/resources/templates/admin/act_proc_ins_list.ftl
+++ b/src/main/resources/templates/admin/act_proc_ins_list.ftl
@@ -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"