From 78e5ece58bf05ed6f344239f40b49dbe90956cce Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 14 一月 2025 17:54:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index aa1da93..adf4bc1 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -48,11 +48,6 @@
           >
           </el-table-column>
           <el-table-column
-            prop="processName"
-            label="娴佺▼鍚嶇О"
-          >
-          </el-table-column>
-          <el-table-column
             prop="promoterUnitName"
             label="鍙戣捣鍗曚綅"
           >
@@ -131,7 +126,7 @@
 } from "@/api/projectProcess/projectProcess";
 
 export default {
-  name: "index",
+  name: "Detail",
   data() {
     return {
       loading: false,
@@ -153,9 +148,17 @@
   },
   mounted() {
     console.log(this.$route.query, "鍙傛暟")
-    this.queryParams.projectId = this.$route.query.projectId
-    this.queryParams.processDefId = this.$route.query.processDefId
-    this.queryParams.processName = this.$route.query.processName
+
+    let params = JSON.parse(sessionStorage.getItem("projectProDetail"))
+    console.log(params, "鍙傛暟")
+    if (!params || ! params.projectId) {
+      this.queryParams.projectId = this.$route.query.projectId
+      this.queryParams.processDefId = this.$route.query.processDefId
+      this.queryParams.processName = this.$route.query.processName
+      sessionStorage.setItem("projectProDetail", JSON.stringify(this.queryParams))
+    } else {
+      this.queryParams = params
+    }
     this.loading = true
     this.getProjectProcessInfo()
   },
@@ -179,19 +182,21 @@
       }
     },
     finalFinishedFormatter(row) {
-      if (row.taskStatus === '鏈紑濮�') {
+      // 涓嶆槸宸插畬鎴愮殑鐘舵�佹病鏈夊疄闄呭鐞嗕汉锛屽凡瀹屾垚鐨勭姸鎬佸彧鏈変竴涓汉
+      if (row.taskStatus !== '宸插畬鎴�') {
         return null
+      } else {
+        return row.handlerName
       }
-      return row.handlerName.join('銆�')
     },
     showHandle(row) {
-      console.log(this.$store.state.user, "鐢ㄦ埛淇℃伅")
       if (row.taskStatus === '寰呭姙') {
         if (row.handlerType === "USER") {
-          return this.$store.state.user.id === row.handlerId
+          console.log(row.handlerId.indexOf(this.$store.state.user.id) !== -1, "鎴戞槸涓嶆槸")
+          return row.handlerId.indexOf(this.$store.state.user.id) !== -1
         } else if (row.handlerType === "DEPT") {
           console.log(this.$store.state.user.deptId, "閮ㄩ棬id", row.handlerUnitId)
-          return this.$store.state.user.deptId === row.handlerUnitId
+          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)
@@ -207,12 +212,16 @@
         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,
             taskId: row.taskId,
             showAuditing: res.data,
             goBackParams: this.queryParams
@@ -223,6 +232,8 @@
     goToProcessDetail(row) {
       this.$router.push({ path: '/flowable/task/myProcess/detail/index',
         query: {
+          projectName: this.detailData.projectName,
+          flowName: this.queryParams.processName,
           procInsId: row.processInsId,
           deployId: row.deployId,
           taskId: row.taskId,
@@ -231,13 +242,16 @@
     },
     search() {
       this.queryParams.currentPage = 1;
+      this.tableLoading = true
       this.getList()
     },
     sizeChange(pageSize) {
+      this.tableLoading = true
       this.queryParams.pageSize = pageSize;
       this.getList()
     },
     pageChange(pageNum) {
+      this.tableLoading = true
       this.queryParams.currentPage = pageNum;
       this.getList()
     },

--
Gitblit v1.8.0