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