From 39b3680a9bc3e7c29a4bbf3b277c14de1e1283d0 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 06 三月 2025 10:52:37 +0800
Subject: [PATCH] 容缺接口

---
 src/views/projectProcess/detail/index.vue |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/views/projectProcess/detail/index.vue b/src/views/projectProcess/detail/index.vue
index 412ab09..00e54ed 100644
--- a/src/views/projectProcess/detail/index.vue
+++ b/src/views/projectProcess/detail/index.vue
@@ -329,7 +329,7 @@
       this.superviseForm.content ='';
       this.superviseForm.taskId = row.taskId;
       this.superviseForm.projectId = this.$route.query.projectId;
-      this.superviseForm.processInsId = row.taskId;
+      this.superviseForm.processInsId = row.processInsId;
       this.superviseForm.superviseType = "SUPERVISE";
       this.superviseForm.receiverType = row.handlerType;
       if (row.handlerType === 'USER') {
@@ -417,12 +417,9 @@
     showHandle(row) {
       if (row.taskStatus === '寰呭姙' || row.taskStatus === '鎸傝捣') {
         if (row.handlerType === "USER") {
-          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 row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1
-          // return this.$store.state.user.name === '甯傚彂灞曟敼闈╁' || this.$store.state.user.name === '甯備綇寤哄眬'
+          return row.handlerUnitId.indexOf(this.$store.state.user.deptId) !== -1 || row.handlerUnitId.some(id => this.$store.state.user.childDeptIds.indexOf(id) !== -1)
         } else if (row.handlerType === "ROLE") {
           return row.handlerUnitId.some(roleId => this.$store.state.user.roleIds.indexOf(roleId) !== -1)
         }
@@ -491,9 +488,19 @@
         this.total = res.total
       })
     },
+    isProject(id) {
+      const numericPattern = /^\d+(\.\d+)?$/;
+      return numericPattern.test(id)
+    },
     // 鏌ヨ璇︽儏
     getProjectProcessInfo() {
-      getProjectProcessDetail(this.queryParams.projectId, this.queryParams.processDefId).then(res => {
+      const projectType = this.isProject(this.queryParams.projectId) ? "PROJECT" : "ENGINEERING"
+      const param = {
+        projectId: this.queryParams.projectId,
+        processDefId: this.queryParams.processDefId,
+        projectType: projectType
+      }
+      getProjectProcessDetail(param).then(res => {
         this.detailData = res.data
         this.taskList = res.taskList
         this.total = res.total

--
Gitblit v1.8.0