From e563871312e934fedf153c4b83ca5ba3b147c36c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 一月 2025 11:47:42 +0800
Subject: [PATCH] 流程推进详情,办理按钮的权限判断完善,转办传递项目id、流程实例id

---
 src/views/projectProcess/detail/index.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 1393f20..2929716 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -18,7 +18,7 @@
       </div>
       <div class="search-warp">
         <div @click="changeTab(1, 'all')" :class="{'item-warm': true, 'all-color': true, 'active': 1 === selectTabId}">鍏ㄩ儴浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.totalTaskNum}}锛�</span></div>
-        <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">浠e姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
+        <div @click="changeTab(2, 'todo')" :class="{'item-warm': true, 'all-color': true, 'active': 2 === selectTabId}">寰呭姙浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.todoTaskNum}}锛�</span></div>
         <div @click="changeTab(3, 'todo')" :class="{'item-warm': true, 'current-color': true, 'active': 3 === selectTabId}">褰撳墠鐜妭</div>
         <div @click="changeTab(4, 'remaining')" :class="{'item-warm': true, 'remaining-color': true, 'active': 4 === selectTabId}">鍓╀綑浜嬮」<span v-if="detailData && detailData.statistics">锛坽{detailData.statistics.remainingTaskNum}}锛�</span></div>
         <div @click="changeTab(5, 'timely')" :class="{'item-warm': true, 'timely-color': true, 'active': 5 === selectTabId}">鎸夋椂瀹屾垚锛�0锛�</div>
@@ -148,7 +148,6 @@
   },
   mounted() {
     console.log(this.$route.query, "鍙傛暟")
-
     let params = JSON.parse(sessionStorage.getItem("projectProDetail"))
     console.log(params, "鍙傛暟")
     if (!params || ! params.projectId) {
@@ -186,7 +185,7 @@
       if (row.taskStatus !== '宸插畬鎴�') {
         return null
       } else {
-        return row.handlerName
+        return row.actualHandlerUserName
       }
     },
     showHandle(row) {
@@ -199,7 +198,7 @@
           return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1
           // return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
         } else if (row.handlerType === "ROLE") {
-          return this.$auth.hasRole(row.handlerUnitName)
+          return row.handlerUnitId.some(roleId => this.$store.state.user.roleIds.indexOf(roleId) !== -1)
         }
       } else {
         return false
@@ -212,11 +211,13 @@
         taskId: row.taskId
       }
       getTaskIsAuditing(params).then(res => {
+        console.log("row",row)
         this.$router.push({
           path: '/flowable/task/myProcess/send/index',
           query: {
             deployId: row.deployId,
             procDefId: row.processDefId,
+            procInsId: row.processInsId,
             processName: row.taskName,
             flowName: this.queryParams.processName,
             projectName: this.detailData.projectName,
@@ -254,11 +255,12 @@
       this.getList()
     },
     getList() {
+      this.tableLoading = true
       // 鑾峰彇浠诲姟鍒楄〃
       getProjectProcessDetailTaskList(this.queryParams).then(res => {
+        this.tableLoading =false
         this.taskList = res.data
         this.total = res.total
-        this.tableLoading =false
       })
     },
     // 鏌ヨ璇︽儏
@@ -271,14 +273,12 @@
       })
     },
     changeTab(id, event) {
-      this.tableLoading = true
       let beforeId = this.selectTabId
       this.selectTabId = id
       this.queryParams.taskType = event
       if (beforeId !== id) {
         this.getList()
       }
-
     }
   }
 }

--
Gitblit v1.8.0