2 Коміти 56d2212e4b ... de2e1210bd

Автор SHA1 Опис Дата
  shiyanyu de2e1210bd Merge branch 'master' of http://1.71.9.215:3000/feiyi/cbjsxt-front-master 1 тиждень тому
  shiyanyu 018a6aad7a fix: 修改bug 1 тиждень тому

+ 3 - 2
src/views/costAudit/projectInfo/auditTaskManage/taskCustomizedRelease/index.js

@@ -7,7 +7,7 @@ import {
   getCostProjectNodeTmpleteGetDetail,
   getCostProjectSurveyPageList,
 } from '@/api/taskCustomizedRelease.js'
-import { getAllUserList } from '@/api/uc'
+import { getAllUserList, getTaskUserList } from '@/api/uc'
 import { getCostSurveyTemplates } from '@/api/catalogManage.js'
 import { getWhCateList, getDocList } from '@/api/auditReviewDocManage.js'
 // 引入地区选择混入
@@ -523,7 +523,8 @@ export const taskMixin = {
     },
     // 获取用户信息
     getUser() {
-      getAllUserList()
+      // getAllUserList()
+      getTaskUserList()
         .then((res) => {
           this.userList = res.value || []
         })

+ 20 - 17
src/views/costAudit/projectInfo/auditTaskManage/taskCustomizedRelease/workflowTab.vue

@@ -400,6 +400,8 @@
       },
     },
     mounted() {
+      // 预加载用户列表(来自 taskMixin/index.js 的 this.userList)
+      this.getUser()
       this.getWorkflow()
     },
 
@@ -531,24 +533,25 @@
         }
 
         // 防御性编程,确保project.projectMembers存在且为字符串
-        if (
-          !this.project ||
-          !this.project.projectMembers ||
-          typeof this.project.projectMembers !== 'string'
-        ) {
-          return this.userList // 返回全部用户作为后备方案
-        }
+        // if (
+        //   !this.project ||
+        //   !this.project.projectMembers ||
+        //   typeof this.project.projectMembers !== 'string'
+        // ) {
+        //   return this.userList // 返回全部用户作为后备方案
+        // }
 
-        try {
-          // 分割项目组成员ID并过滤用户列表
-          const projectMemberIds = this.project.projectMembers.split(',')
-          const filteredUsers = this.userList.filter((item) =>
-            projectMemberIds.includes(item.userId)
-          )
-          return filteredUsers
-        } catch (error) {
-          return this.userList // 出错时返回全部用户作为后备方案
-        }
+        // try {
+        //   // 分割项目组成员ID并过滤用户列表
+        //   const projectMemberIds = this.project.projectMembers.split(',')
+        //   const filteredUsers = this.userList.filter((item) =>
+        //     projectMemberIds.includes(item.userId)
+        //   )
+        //   return filteredUsers
+        // } catch (error) {
+        //   return this.userList // 出错时返回全部用户作为后备方案
+        // }
+        return this.userList
       },
       // 获取日期选择器的配置选项,动态设置最小可选日期
       getPickerOptions(row) {