From 8589e39be0ef35cb18de22effea6af35bb2f1c7b Mon Sep 17 00:00:00 2001
From: sunfengxiang <sun345347172@126.com>
Date: Fri, 7 Jun 2024 15:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=AB=99=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2=E5=88=B0=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/api/user.js           |  2 +-
 static/js/project/user/index.js |  3 ++-
 view/user/user.html             | 22 +++++++++-------------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/static/js/api/user.js b/static/js/api/user.js
index 959100c..ff7ace1 100644
--- a/static/js/api/user.js
+++ b/static/js/api/user.js
@@ -18,7 +18,7 @@ var userUpdate = '/transaction/member/edit'  //修改用户信息类接口
 @purl /activiti/process/listHistory
 @param
 */
-var listHistory = '/activiti/process/listHistory'  //审批历史查询
+var listHistory = '/approval/audit/historyList'  //审批历史查询
 
 /*
 @purl /getInfo
diff --git a/static/js/project/user/index.js b/static/js/project/user/index.js
index 62490be..53c8e85 100644
--- a/static/js/project/user/index.js
+++ b/static/js/project/user/index.js
@@ -325,7 +325,8 @@ define(['jquery', "template", "Tools", "user", "paging","cupload","kindeditor",
             //我的报名
             tools.doGet(getSignupByMemberId, {memberId:content.id,pageNum:module.data.pageNum,pageSize:module.data.pageSize}, module.application);
 
-            tools.doPost(listHistory, {processInstanceId:content.instanceId}, module.listHistory);
+            tools.doGet(listHistory + '/' + content.auditbatchNo, {}, module.listHistory);
+
             //个人资料提交
             $('#supplyAction').on('click', module.supplyAction)
             $('#releaseAction').on('click', module.releaseAction)
diff --git a/view/user/user.html b/view/user/user.html
index aca24b1..2b3c0c1 100644
--- a/view/user/user.html
+++ b/view/user/user.html
@@ -775,23 +775,19 @@
                     <table width="100%" cellspacing="0" cellpadding="0" id="listHistoryContent">
                         <script id="listHistoryData" type="text/html">
                             <tr>
-                                <td>活动名称</td>
-                                <td>办理人ID</td>
-                                <td>办理人</td>
+                                <td>批次号</td>
+                                <td>审批节点</td>
+                                <td>审批人</td>
                                 <td>审批意见</td>
-                                <td>开始时间</td>
-                                <td>结束时间</td>
-                                <td>耗时</td>
+                                <td>审批时间</td>
                             </tr>
                             {{each listHistory as value i}}
                             <tr>
-                                <td>{{value.activityName}}</td>
-                                <td>{{value.assignee}}</td>
-                                <td>{{value.assigneeName}}</td>
-                                <td>{{value.comment}}</td>
-                                <td>{{value.startTime}}</td>
-                                <td>{{value.endTime}}</td>
-                                <td>{{value.durationInMillis}}</td>
+                                <td>{{value.auditbatchNo}}</td>
+                                <td>{{value.nodeName}}</td>
+                                <td>{{value.auditBy}}</td>
+                                <td>{{value.auditRemark}}</td>
+                                <td>{{value.auditTime}}</td>
                             </tr>
                             {{/each}}
                         </script>