From 7085267711a041282b03b06ec647e17d6d6ba49a Mon Sep 17 00:00:00 2001
From: QI_YUJIE <2878090898@qq.com>
Date: Mon, 8 Apr 2024 13:41:07 +0800
Subject: [PATCH] =?UTF-8?q?task=20=E4=BA=A7=E6=9D=83=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=20=E4=BC=9A=E5=91=98=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=96=B0=E7=89=88=E5=AE=A1=E6=89=B9=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user/index.js    |  9 +++++++
 src/views/user/index.vue | 52 ++++++++++++++++++++++++++++++++--------
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/src/api/user/index.js b/src/api/user/index.js
index 6ad33398..5965ca6d 100644
--- a/src/api/user/index.js
+++ b/src/api/user/index.js
@@ -193,6 +193,15 @@ export function realtimeList(query){
   })
 }
 
+// 查询审批历史
+export function auditHistoryList(params) {
+  return request({
+    url: '/transaction/website/auditHistory/list',
+    method: 'get',
+    params: params
+  });
+}
+
 export const options = [
   {
     "value": "北京",
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index b73eaba7..44947d50 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -39,13 +39,30 @@
     <van-dialog v-model="openView" title="审核记录">
       <div style="height: 50vh;overflow-y: scroll;padding: 0 5PX;">
         <van-cell-group :title="'进度'+(index+1)" v-for="(item,index) in historyList">
-          <van-cell title="活动名称" v-model="item.activityName" :border="false" />
+          <!-- <van-cell title="活动名称" v-model="item.activityName" :border="false" />
           <van-cell title="办理人ID" v-model="item.assignee" :border="false" />
           <van-cell title="办理人"   v-model="item.assigneeName" :border="false" />
           <van-cell title="审批意见" v-model="item.comment" :border="false" />
           <van-cell title="开始时间" v-model="item.startTime" :border="false" />
           <van-cell title="结束时间" v-model="item.endTime" :border="false" />
-          <van-cell title="耗时" v-model="item.durationInMillis" :border="false" />
+          <van-cell title="耗时" v-model="item.durationInMillis" :border="false" /> -->
+
+          <van-cell title="批次号" v-model="item.auditbatchNo" :border="false" value-class="cell_value" />
+          <van-cell title="节点名称" v-model="item.nodeName" :border="false" value-class="cell_value" />
+          <van-cell title="审批状态" :border="false" value-class="cell_value">
+            {{ auditStatusFormat(item.auditStatus) }}
+          </van-cell>
+          <van-cell title="审批对象" :border="false" value-class="cell_value">
+            <span v-if="item.auditType === '1'">
+              角色: {{ item.roleName }}
+            </span>
+            <span v-else-if="item.auditType === '2'">
+              用户: {{ item.nickName }}
+            </span>
+          </van-cell>
+          <van-cell title="审批人" v-model="item.auditBy" :border="false" value-class="cell_value" />
+          <van-cell title="审批时间" v-model="item.auditTime" :border="false" value-class="cell_value" />
+          <van-cell title="审批意见" v-model="item.auditRemark" :border="false" value-class="cell_value" />
         </van-cell-group>
 
       </div>
@@ -54,7 +71,7 @@
 </template>
 
 <script>
-import { getMember , supplyList , deleteSupply} from "@/api/user/index";
+import { getMember , supplyList , deleteSupply, auditHistoryList} from "@/api/user/index";
 import { logout ,getInfo } from "@/api/login/index";
 import Cookies from "js-cookie";
 import request from "@/utils/request";
@@ -68,15 +85,20 @@ export default {
       instanceId:'',
       historyList:[],
       openView:false,
-      memberType:0
+      memberType:0,
+      auditbatchNo: null,
+      auditStatusOptions: [],
     };
   },
   created() {
     this.getInfo();
+    this.getDicts("a_audit_status").then(response => {
+      this.auditStatusOptions = response.data;
+    });
   },
   methods: {
     getHistoryList: function () {
-      this.loading = true;
+      /* this.loading = true;
       var queryParams = {
         processInstanceId: this.instanceId
       };
@@ -97,7 +119,10 @@ export default {
           this.total = response.total;
           this.loading = false;
         })
-        .then(() => {});
+        .then(() => {}); */
+      auditHistoryList({ auditbatchNo: this.auditbatchNo,  }).then(response => {
+        this.historyList = response.rows;
+      });
     },
     loginOut(){
       logout().then(response => {
@@ -111,22 +136,26 @@ export default {
     },
     getInfo(){
       getInfo().then(response => {
-        console.log(response)
         this.user = response.user;
         getMember(response.user.userId).then(response => {
-          console.log(response)
           Cookies.set('memberId',response.data.id)
           this.phone = response.data.phone;
           this.activitiStatus = response.data.activitiStatus;
-          this.instanceId = response.data.instanceId;
           this.memberType = response.data.memberType;
+          /* this.instanceId = response.data.instanceId;
           if(this.instanceId !== "" && this.instanceId != null){
             this.getHistoryList()
+          } */
+          this.auditbatchNo = response.data.auditbatchNo;
+          if (this.auditbatchNo != null && this.auditbatchNo !== "") {
+            this.getHistoryList();
           }
-
         });
       });
     },
+    auditStatusFormat(value) {
+      return this.selectDictLabel(this.auditStatusOptions, value);
+    },
     format(time, format) {
       var t = new Date(time);
       var tf = function (i) { return (i < 10 ? '0' : '') + i };
@@ -246,4 +275,7 @@ export default {
     width: 94%;
     margin-left: 3%;
   }
+  .cell_value {
+    min-width: 70%;
+  }
 </style>