From e4cf3f20750bbd50f086c40c08a18c719a332b0c Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Thu, 10 Apr 2025 13:18:08 +0800
Subject: [PATCH] 2025-04-10

---
 src/api/project/project.js                    |  1 +
 .../com_projectInfo-add-or-update.vue         | 43 ++++++++++++++++---
 2 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/src/api/project/project.js b/src/api/project/project.js
index 41a7043..fc93a7d 100644
--- a/src/api/project/project.js
+++ b/src/api/project/project.js
@@ -14,6 +14,7 @@ export const searchProjectTeamStr = data => createAPI(`/project/searchProjectTea
 
 export const searchUserRoll = data => createAPI(`/project/searchUserRoll`,'Post',data)
 
+export const searchSelectionUserRole = data => createAPI(`/project/searchSelectionUserRole`,'post',data)
 
 export const saveProjectInfo = data => createAPI(`/project/saveProjectInfo`,'Post',data)
 
diff --git a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
index 3fd2f5d..fba07f8 100644
--- a/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
+++ b/src/views/modules/project/projectInfo/com_projectInfo-add-or-update.vue
@@ -157,11 +157,13 @@
           <el-input v-model="userRoleForm.userDisplay" placeholder=" "></el-input>
         </el-form-item>
         <el-form-item label=" ">
-          <el-button type="primary" @click="searchUserRoll()">查询</el-button>
+<!--          <el-button type="primary" @click="searchUserRoll()">查询</el-button>-->
+          <el-button type="primary" @click="loadView">查询</el-button>
         </el-form-item>
       </el-form>
       <el-table
-        :data="userRoleList"
+        ref="table"
+        :data="copyUserRoleList"
         border
         :height="300"
         v-loading="queryUserRoleListLoading"
@@ -257,6 +259,7 @@
     searchOperatorWithSite,
     searchProjectTeamStr,
     searchUserRoll,
+    searchSelectionUserRole,
     saveProjectInfo,
   } from "@/api/project/project.js"
   import Chooselist from '@/views/modules/common/Chooselist'
@@ -388,6 +391,9 @@
         saveCheckAll:'N',
 
         queryUserRoleListLoading:false,
+        filterParams:{
+
+        },
       }
     },
     created () {
@@ -431,8 +437,30 @@
           }
         })
       },
+      copyUserRoleList:{
+        get(){
+          let arr = this.userRoleList.filter(item=>{
+            if (!!this.filterParams.username && !!this.filterParams.userDisplay){
+              return item.username.includes(this.filterParams.username) && item.userDisplay.includes(this.filterParams.userDisplay)
+            }
+            if (!!this.filterParams.username){
+              return item.username.includes(this.filterParams.username)
+            }
+            if (!!this.filterParams.userDisplay){
+              return item.userDisplay.includes(this.filterParams.userDisplay)
+            }
+            return true
+          })
+          return arr
+        }
+      }
     },
     methods: {
+      loadView(){
+        this.filterParams = {
+          ...this.userRoleForm
+        }
+      },
       // 获取基础数据列表S
       getBaseList (val, type) {
         this.tagNo = val
@@ -608,9 +636,14 @@
           site:this.dataForm.site,
           projectId:this.dataForm.projectId,
         }
-        searchUserRoll(inData3).then(({data}) => {
-          this.dataForm.userRoleList=data.rows;
-          // this.userRollModal();
+        // searchUserRoll(inData3).then(({data}) => {
+        //   this.dataForm.userRoleList=data.rows;
+        //   // this.userRollModal();
+        // })
+        searchSelectionUserRole(inData3).then(({data})=>{
+          if (data && data.code === 0){
+            this.dataForm.userRoleList = data.rows;
+          }
         })
       },
       managerChooseModal(){