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 @@
- 查询
+
+ 查询
{
+ 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(){