Browse Source

pjmList应该从access_role表取role_no是R002的全部人员

ecss-tx
han\hanst 3 weeks ago
parent
commit
402b0cd01f
  1. 36
      src/views/modules/eam/eamProjectInfoForUploads.vue

36
src/views/modules/eam/eamProjectInfoForUploads.vue

@ -1887,6 +1887,22 @@ export default {
list[i].projectLeader = this.resolveProjectLeaderByResponsibleDepartment(list[i]) list[i].projectLeader = this.resolveProjectLeaderByResponsibleDepartment(list[i])
} }
}, },
buildPjmUserIdList (pjmUserList) {
if (!Array.isArray(pjmUserList) || pjmUserList.length === 0) {
return []
}
// PjM access_role(role_no='R002')
const pjmUserIdSet = new Set()
pjmUserList.forEach((item) => {
const userId = item && item.userId !== undefined && item.userId !== null
? String(item.userId).trim()
: ''
if (userId !== '') {
pjmUserIdSet.add(userId)
}
})
return Array.from(pjmUserIdSet)
},
// bu // bu
getSiteAndBuByUserName () { getSiteAndBuByUserName () {
let tempData = { let tempData = {
@ -2088,14 +2104,8 @@ export default {
requestPromise = searchAllProjectUploadsDocumentList(this.searchData).then(({data}) => { requestPromise = searchAllProjectUploadsDocumentList(this.searchData).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.allDataList = data.list this.allDataList = data.list
let pjmList = []
// data.page.list
data.list.forEach((item) => {
if (!pjmList.includes(item.projectOwner.split('-')[0])) {
pjmList.push(item.projectOwner.split('-')[0])
}
})
if (pjmList.includes(this.$store.state.user.name) || this.$store.state.user.name === 'admin') {
const pjmUserIdList = this.buildPjmUserIdList(data.pjmUserList)
if (pjmUserIdList.includes(String(this.$store.state.user.id)) || this.$store.state.user.name === 'admin') {
this.warnFlag = true this.warnFlag = true
this.dataList = data.page.list this.dataList = data.page.list
this.allPersonnelInfoList = data.list this.allPersonnelInfoList = data.list
@ -2296,14 +2306,8 @@ export default {
requestPromise = queryAllProjectUploadsDocumentList(params).then(({data}) => { requestPromise = queryAllProjectUploadsDocumentList(params).then(({data}) => {
if (data.code === 0) { if (data.code === 0) {
this.allDataList = data.list this.allDataList = data.list
let pjmList = []
// data.page.list
data.list.forEach((item) => {
if (!pjmList.includes(item.projectOwner.split('-')[0])) {
pjmList.push(item.projectOwner.split('-')[0])
}
})
if (pjmList.includes(this.$store.state.user.name)){
const pjmUserIdList = this.buildPjmUserIdList(data.pjmUserList)
if (pjmUserIdList.includes(String(this.$store.state.user.id))){
this.warnFlag = true this.warnFlag = true
this.dataList = data.page.list this.dataList = data.page.list
this.allPersonnelInfoList = data.list this.allPersonnelInfoList = data.list

Loading…
Cancel
Save