diff --git a/src/views/modules/eam/eamProjectInfo.vue b/src/views/modules/eam/eamProjectInfo.vue index 289723f..f70e0ef 100644 --- a/src/views/modules/eam/eamProjectInfo.vue +++ b/src/views/modules/eam/eamProjectInfo.vue @@ -1390,7 +1390,7 @@ import {updateColumnSize} from "../../../api/table"; updateBy: this.$store.state.user.name, }, searchBusinessData:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -1399,7 +1399,7 @@ import {updateColumnSize} from "../../../api/table"; limit: 10, }, searchBusinessData1:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -1408,7 +1408,7 @@ import {updateColumnSize} from "../../../api/table"; limit: 10, }, searchBusinessData2:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -1417,7 +1417,7 @@ import {updateColumnSize} from "../../../api/table"; limit: 10, }, searchBusinessData3:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -1426,7 +1426,7 @@ import {updateColumnSize} from "../../../api/table"; limit: 10, }, searchBusinessData4:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -1435,7 +1435,7 @@ import {updateColumnSize} from "../../../api/table"; limit: 10, }, searchBusinessData5:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -1444,7 +1444,7 @@ import {updateColumnSize} from "../../../api/table"; limit: 10, }, searchBusinessData6:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -1453,7 +1453,7 @@ import {updateColumnSize} from "../../../api/table"; limit: 10, }, searchBusinessData7:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -1462,7 +1462,7 @@ import {updateColumnSize} from "../../../api/table"; limit: 10, }, searchBusinessData8:{ - site: this.$store.state.user.site, + site: '', username: '', roleDesc: '', userDisplay: '', @@ -2990,9 +2990,11 @@ import {updateColumnSize} from "../../../api/table"; getSiteAndBuByUserName(tempData).then(({data}) => { if (data.code === 0) { this.userBuList = data.rows - const defaultBuNo = this.userBuList.length > 0 ? this.getBuNoByJoinedValue(this.userBuList[0].buNo) : '' + const defaultBuValue = this.userBuList.length > 0 ? this.userBuList[0].buNo : '' + const defaultBuNo = this.getBuNoByJoinedValue(defaultBuValue) + const defaultSite = this.getSiteByJoinedBuValue(defaultBuValue) || this.$store.state.user.site this.loadSearchProjectCategory('') - this.loadModalProjectCategory(defaultBuNo) + this.loadModalProjectCategory(defaultBuNo, '', defaultSite) } else { this.userBuList = [] this.searchProjectCategoryList = [] @@ -3037,10 +3039,52 @@ import {updateColumnSize} from "../../../api/table"; } return this.getBuNoByJoinedValue(matchBu.buNo) }, + // 根据 BU 描述获取 site + getSiteByBuDesc (buDesc) { + if (!buDesc) { + return '' + } + let matchBu = this.userBuList.find(item => item.buDesc === buDesc) + if (!matchBu) { + return '' + } + return this.getSiteByJoinedBuValue(matchBu.buNo) + }, + // 获取查询区当前 site(优先取 BU 对应 site) + getCurrentSearchSite () { + return this.getSiteByBuDesc(this.searchData.buDesc) || this.$store.state.user.site + }, + // 获取当前弹窗对应 site(优先取项目/BU 对应 site) + getCurrentModalSite () { + let siteByBu = this.getSiteByJoinedBuValue(this.modalData.bu) + if (siteByBu) { + return siteByBu + } + if (this.modalData && this.modalData.site) { + return this.modalData.site + } + if (this.projectPartCurrentRow && this.projectPartCurrentRow.site) { + return this.projectPartCurrentRow.site + } + return this.$store.state.user.site + }, + // 同步人员查询弹窗 site + syncBusinessSearchSite (site) { + let currentSite = site || this.getCurrentModalSite() + this.searchBusinessData.site = currentSite + this.searchBusinessData1.site = currentSite + this.searchBusinessData2.site = currentSite + this.searchBusinessData3.site = currentSite + this.searchBusinessData4.site = currentSite + this.searchBusinessData5.site = currentSite + this.searchBusinessData6.site = currentSite + this.searchBusinessData7.site = currentSite + this.searchBusinessData8.site = currentSite + }, // 加载查询区项目分类 loadSearchProjectCategory (buNo) { let inData = { - site: this.$store.state.user.site, + site: this.getCurrentSearchSite(), buNo: buNo || '' } getProjectCategoryByBu(inData).then(({data}) => { @@ -3054,9 +3098,9 @@ import {updateColumnSize} from "../../../api/table"; }) }, // 加载弹窗项目分类 - loadModalProjectCategory (buNo, currentProjectCategory) { + loadModalProjectCategory (buNo, currentProjectCategory, site) { let inData = { - site: this.$store.state.user.site, + site: site || this.getCurrentModalSite(), buNo: buNo || '' } getProjectCategoryByBu(inData).then(({data}) => { @@ -3078,6 +3122,7 @@ import {updateColumnSize} from "../../../api/table"; // 查询区 BU 变化后刷新项目分类 searchBuChangeHandle (buDesc) { this.searchData.projectCategory = '' + this.searchData.site = this.getCurrentSearchSite() let buNo = this.getBuNoByBuDesc(buDesc) this.loadSearchProjectCategory(buNo) }, @@ -3088,6 +3133,7 @@ import {updateColumnSize} from "../../../api/table"; this.modalData.customerDesc = '' this.modalData.projectCategory = '' let buNo = this.getBuNoByJoinedValue(buValue) + this.syncBusinessSearchSite(this.modalData.site) this.loadModalProjectCategory(buNo) }, @@ -3126,6 +3172,7 @@ import {updateColumnSize} from "../../../api/table"; /* 列表方法的回调 */ getBaseData (val) { + this.syncBusinessSearchSite() if (this.tagNo === 509) { this.modalData.customerNo = val.customer_no this.modalData.customerDesc = val.customer_desc @@ -3468,6 +3515,7 @@ import {updateColumnSize} from "../../../api/table"; this.selectTypeFlag = params this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex + this.searchData.site = this.getCurrentSearchSite() eamProjectInfoSearch(this.searchData).then(({data}) => { if (data.code === 0) { this.dataList = data.page.list @@ -3541,10 +3589,12 @@ import {updateColumnSize} from "../../../api/table"; this.selectTypeFlag = params this.searchData.limit = this.pageSize this.searchData.page = this.pageIndex + this.searchData.site = this.getCurrentSearchSite() if (params !== null && params !== undefined) { + const queryBuDesc = params.buDesc !== undefined ? params.buDesc : this.searchData.buDesc params.limit = this.pageSize params.page = this.pageIndex - params.site = this.$store.state.user.site + params.site = this.getSiteByBuDesc(queryBuDesc) || this.$store.state.user.site params.userName = this.$store.state.user.name } else { params = this.searchData @@ -3700,10 +3750,12 @@ import {updateColumnSize} from "../../../api/table"; }, addModal () { + let defaultBuValue = this.userBuList.length > 0 ? this.userBuList[0].buNo : '' + let defaultSite = this.getSiteByJoinedBuValue(defaultBuValue) || this.$store.state.user.site this.modalData = { flag: '1', - bu: this.userBuList[0].buNo, - site: this.$store.state.user.site, + bu: defaultBuValue, + site: defaultSite, customerNo:'', customerDesc:'', projectCategory:'', @@ -3757,6 +3809,7 @@ import {updateColumnSize} from "../../../api/table"; } let defaultBuNo = this.getBuNoByJoinedValue(this.modalData.bu) this.loadModalProjectCategory(defaultBuNo) + this.syncBusinessSearchSite(defaultSite) this.modalDisableFlag = false this.modalPartDisableFlag = false this.clearButtonFlag = false @@ -3842,6 +3895,7 @@ import {updateColumnSize} from "../../../api/table"; } let editBuNo = this.getBuNoByJoinedValue(this.modalData.bu) this.loadModalProjectCategory(editBuNo, this.modalData.projectCategory) + this.syncBusinessSearchSite(this.modalData.site) this.modalDisableFlag = true this.modalPartDisableFlag = false this.clearButtonFlag = true @@ -4350,6 +4404,7 @@ import {updateColumnSize} from "../../../api/table"; } }, searchBusinessInfoList1 () { + this.syncBusinessSearchSite() searchBusinessInfo1(this.searchBusinessData1).then(({data}) => { if (data && data.code === 0){ this.businessDataList1 = data.rows; @@ -4357,6 +4412,7 @@ import {updateColumnSize} from "../../../api/table"; }) }, searchBusinessInfoList () { + this.syncBusinessSearchSite() searchBusinessInfo(this.searchBusinessData).then(({data}) => { if (data && data.code === 0){ this.businessDataList = data.rows; @@ -4364,6 +4420,7 @@ import {updateColumnSize} from "../../../api/table"; }) }, searchBusinessInfoList2 () { + this.syncBusinessSearchSite() searchBusinessInfo2(this.searchBusinessData2).then(({data}) => { if (data && data.code === 0){ this.businessDataList2 = data.rows; @@ -4371,6 +4428,7 @@ import {updateColumnSize} from "../../../api/table"; }) }, searchBusinessInfoList3 () { + this.syncBusinessSearchSite() searchBusinessInfo3(this.searchBusinessData3).then(({data}) => { if (data && data.code === 0){ this.businessDataList3 = data.rows; @@ -4378,6 +4436,7 @@ import {updateColumnSize} from "../../../api/table"; }) }, searchBusinessInfoList4 () { + this.syncBusinessSearchSite() searchBusinessInfo4(this.searchBusinessData4).then(({data}) => { if (data && data.code === 0){ this.businessDataList4 = data.rows; @@ -4385,6 +4444,7 @@ import {updateColumnSize} from "../../../api/table"; }) }, searchBusinessInfoList5 () { + this.syncBusinessSearchSite() searchBusinessInfo5(this.searchBusinessData5).then(({data}) => { if (data && data.code === 0){ this.businessDataList5 = data.rows; @@ -4392,6 +4452,7 @@ import {updateColumnSize} from "../../../api/table"; }) }, searchBusinessInfoList6 () { + this.syncBusinessSearchSite() searchBusinessInfo6(this.searchBusinessData6).then(({data}) => { if (data && data.code === 0){ this.businessDataList6 = data.rows; @@ -4399,6 +4460,7 @@ import {updateColumnSize} from "../../../api/table"; }) }, searchBusinessInfoList7 () { + this.syncBusinessSearchSite() searchBusinessInfo7(this.searchBusinessData7).then(({data}) => { if (data && data.code === 0){ this.businessDataList7 = data.rows; @@ -4406,6 +4468,7 @@ import {updateColumnSize} from "../../../api/table"; }) }, searchBusinessInfoList8 () { + this.syncBusinessSearchSite() searchBusinessInfo8(this.searchBusinessData8).then(({data}) => { if (data && data.code === 0){ this.businessDataList8 = data.rows; @@ -4743,6 +4806,7 @@ import {updateColumnSize} from "../../../api/table"; } else { this.modalData.eeEngineer = '' } + this.syncBusinessSearchSite(this.modalData.site) this.modalDisableFlag = true this.modalPartDisableFlag = true this.modalFlag = true @@ -4827,6 +4891,7 @@ import {updateColumnSize} from "../../../api/table"; if (row.eeEngineer != null && row.eeEngineer !== ''){ this.modalData.eeEngineerName = row.eeEngineer.split('-')[1] // 截取用户名 } + this.syncBusinessSearchSite(this.modalData.site) this.modalDisableFlag = true this.modalPartDisableFlag = true this.clearButtonFlag = true