diff --git a/src/views/modules/plugins/power/poweraxis-add-or-update.vue b/src/views/modules/plugins/power/poweraxis-add-or-update.vue index 610a68c5..3897c394 100644 --- a/src/views/modules/plugins/power/poweraxis-add-or-update.vue +++ b/src/views/modules/plugins/power/poweraxis-add-or-update.vue @@ -9,7 +9,7 @@ @@ -128,7 +128,8 @@ export default { longitude: 36.0722275, //经度 latitude: 120.38945519 //纬度 }, - tagCategoryArr: [], // 查询动力主轴标签类别 + structCategoryArr: [], // 查询动力主轴标签类别 + leaderCategoryArr: [], // 查询动力主轴负责人标签类别 agencytree: [], // 绑定组织列表 GridPartyBranchList:[], // 上级网格党支部列表 PartyCommList:[], // 党委列表 @@ -178,14 +179,18 @@ export default { }, // 获取动力主轴标签 async getTagCategoryArr(){ - const url = '/pli/power/axisTag/listSimple/struct' - + const url = '/pli/power/axisTag/listSimpleAll' let params = {} - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - this.tagCategoryArr = data + data.forEach((item) => { + if (item.tagCategory === 'struct') { + this.structCategoryArr = item.tagList + } + if (item.tagCategory === 'leader') { + this.leaderCategoryArr = item.tagList + } + }) } else { this.$message.error(msg) } diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue index d341f857..f42975d8 100644 --- a/src/views/modules/plugins/power/poweraxis.vue +++ b/src/views/modules/plugins/power/poweraxis.vue @@ -46,14 +46,14 @@ - + @@ -86,9 +86,11 @@ export default { }, agencytree: [], // 所属组织 dataList:[], // 列表 - tagCategoryArr: [], // 查询动力主轴标签类别 + structCategoryArr: [], // 查询动力主轴标签类别 + leaderCategoryArr: [], // 查询动力主轴负责人标签类别 leaderVisible: false, axisStructId: '', // 动力主轴id 添加负责人的时候用 + structLevel: null, // 动力主轴节点级别 添加负责人的时候用 leaderId: '' } }, @@ -167,21 +169,28 @@ export default { }, // 获取动力主轴标签 async getTagCategoryArr(){ - const url = '/pli/power/axisTag/listSimple/struct' + const url = '/pli/power/axisTag/listSimpleAll' let params = {} const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.tagCategoryArr = data + data.forEach((item) => { + if (item.tagCategory === 'struct') { + this.structCategoryArr = item.tagList + } + if (item.tagCategory === 'leader') { + this.leaderCategoryArr = item.tagList + } + }) } else { this.$message.error(msg) } }, categoryCodeFormatter (row) { let ca = '' - this.tagCategoryArr.forEach((tagCategory) => { + this.structCategoryArr.forEach((tagCategory) => { if (tagCategory.categoryCode === row.categoryCode) { ca = tagCategory.categoryName } @@ -209,9 +218,10 @@ export default { } }, // 添加负责人 - addLeader(axisStructId, leaderId) { + addLeader(axisStructId, leaderId, structLevel) { this.leaderVisible = true this.axisStructId = axisStructId + this.structLevel = structLevel this.leaderId = leaderId }, getDataListLeader() { diff --git a/src/views/modules/plugins/power/poweraxis_add_leader.vue b/src/views/modules/plugins/power/poweraxis_add_leader.vue index 0f69433c..05e46f0d 100644 --- a/src/views/modules/plugins/power/poweraxis_add_leader.vue +++ b/src/views/modules/plugins/power/poweraxis_add_leader.vue @@ -1,7 +1,10 @@