diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 47bab968..fb06c708 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -49,9 +49,9 @@
-
@@ -73,9 +73,9 @@
-
@@ -98,9 +98,9 @@
-
@@ -123,16 +123,15 @@
-
-
-
-
-
-
@@ -571,25 +568,41 @@ export default {
data(){
return{
// 新增组织弹窗
- addNewAgency:false,
- // 本级人员是否显示
- levelPeo:true,
- // 部门人员是否显示
- deptPeo:false,
- // 网格人员是否显示
- GridWorkPeo:false,
- // 机关人员列表
- ListOfOrganPersonnel:false,
- // 网格人员列表
- GridWorkPeoList:false,
- // 组织列表
- OrganizationList:true,
- // 本级工作人员列表
- levelWorkPeoList:true,
- // 网格列表
- GridList:true,
- // 机关列表
- officeList:true,
+ createAgencyDialogFlag: false,
+
+ // 组织列表展示标识
+ agencyTableFlag: true,
+ // 组织工作人员列表展示标识
+ currentAgencyStaffTableFlag: true,
+ // 组织列表数据
+ agencyTableListData: [],
+ // 组织工作人员列表数据
+ agencyStaffTableListData:[],
+
+ // 部门列表（机关、科室列表）列表展示标识
+ departmentTableFlag: true,
+ // 部门人员列表展示标识
+ departmentStaffTableFlag: false,
+ // 部门列表数据
+ departmentTableListData: [],
+ // 部门工作人员列表数据
+ departmentStaffTableListData:[],
+
+ // 网格列表展示标识
+ gridTableFlag:true,
+ // 网格人员列表展示标识
+ gridStaffTableFlag: false,
+ // 网格列表数据
+ gridTableListData: [],
+ // 网格工作人员列表数据
+ gridStaffTableListData:[],
+
+ agencyId: localStorage.getItem("agencyId"),
+ gridOrgId:'',
+ departmentOrgId:'',
+
+ anId:localStorage.getItem("agencyId"),
+
// 经纬度坐标
lat:'11',
lng:'11',
@@ -614,12 +627,6 @@ export default {
// 表格树数据
deptList: [],
- // 社区列表
- tableData:[],
- // 社区列表
- communityData:[],
- // 网格列表
- gridData:[],
// 弹窗开关
dialogVisible:false,
dialogVisibleGrid:false,
@@ -721,20 +728,7 @@ export default {
{value: 'grid_member' , label: '网格员'},
],
// angencuId
- agencyId: localStorage.getItem("agencyId"),
-
- gridOpen: false,
- communityOpen:false,
-
- gridOrgId:'',
- communityOrgId:'',
- // 网格工作人员列表
- gridDataPeo:[],
- // 社区工作人员列表
- communityDataPeo:[],
- // 本级工作人员列表
- agencyDataPeo:[],
- anId:localStorage.getItem("agencyId"),
+
// 新增操作是否展示
entry:false,
// 修改操作是否展示
@@ -780,7 +774,7 @@ export default {
},
created(){
this.getAgencyList()
- this.getCommunityList()
+ this.getDepartmentList()
this.getGridList()
this.agencyPeo()
// this.getNavigation()
@@ -797,7 +791,7 @@ export default {
}, 1000);
}
},
- addNewAgency(val) {
+ createAgencyDialogFlag(val) {
if (val) {
setTimeout(() => {
let _t = this
@@ -839,13 +833,13 @@ export default {
const { data, code, msg } = await requestPost(url,params)
if(code === 0){
- this.tableData = data
+ this.agencyTableListData = data
}else{
this.$message.error(msg)
}
},
/** 查询社区列表 */
- async getCommunityList(){
+ async getDepartmentList(){
const url = "/gov/org/department/departmentlist"
let params = {
@@ -855,7 +849,7 @@ export default {
const { data, code, msg } = await requestPost(url,params)
if(code === 0){
- this.communityData = data
+ this.departmentTableListData = data
}else{
this.$message.error(msg)
@@ -872,7 +866,7 @@ export default {
const { data, code, msg } = await requestPost(url,params)
if(code === 0){
- this.gridData = data
+ this.gridTableListData = data
}else{
this.$message.error(msg)
}
@@ -892,7 +886,7 @@ export default {
const { data, code, msg } = await requestPost(url,params)
if(code === 0){
- this.gridDataPeo = data.staffList
+ this.gridStaffTableListData = data.staffList
} else {
this.$message.error(msg)
}
@@ -911,7 +905,7 @@ export default {
const { data, code, msg } = await requestPost(url,params)
if(code === 0) {
- this.agencyDataPeo = data.staffList
+ this.agencyStaffTableListData = data.staffList
} else {
this.$message.error(msg)
}
@@ -922,7 +916,7 @@ export default {
const url = "/data/aggregator/org/stafflist"
let params = {
- orgId:this.communityOrgId,
+ orgId:this.departmentOrgId,
orgType:'dept',
pageNo:1,
pageSize:100
@@ -931,7 +925,7 @@ export default {
const { data, code, msg } = await requestPost(url,params)
if(code === 0){
- this.communityDataPeo = data.staffList
+ this.departmentStaffTableListData = data.staffList
} else {
this.$message.error(msg)
}
@@ -957,7 +951,7 @@ export default {
this.dialogVisible = false
this.insertForm = []
this.getAgencyList()
- this.getCommunityList()
+ this.getDepartmentList()
this.getGridList()
this.agencyPeo()
}else{
@@ -987,7 +981,7 @@ export default {
this.dialogVisibleGrid = false
this.GridForm = []
this.getAgencyList()
- this.getCommunityList()
+ this.getDepartmentList()
this.getGridList()
this.agencyPeo()
} else {
@@ -1017,7 +1011,7 @@ export default {
this.dialogVisiblePeo = false
this.peoForm = []
this.getAgencyList()
- this.getCommunityList()
+ this.getDepartmentList()
this.getGridList()
this.agencyPeo()
} else {
@@ -1046,7 +1040,7 @@ export default {
this.dialogVisiblePeo = false
this.peoForm = []
this.getAgencyList()
- this.getCommunityList()
+ this.getDepartmentList()
this.getGridList()
this.agencyPeo()
} else {
@@ -1182,62 +1176,53 @@ export default {
// 新增组织取消按钮
canceladdNewAgency(){
this.addNewAgencyRest()
- this.addNewAgency = false
+ this.createAgencyDialogFlag = false
},
// 进入网格，查询网格所属人员
entryGrid(gridId){
- this.gridDataPeo = []
- this.communityDataPeo =[]
- this.agencyDataPeo = []
+ this.gridStaffTableListData = []
+ this.departmentStaffTableListData =[]
+ this.agencyStaffTableListData = []
this.gridOrgId = gridId
- this.deptPeo = false
- this.GridWorkPeo = true
- this.levelPeo = false
- this.GridWorkPeoList = true
- this.ListOfOrganPersonnel = false
- this.levelWorkPeoList = false
- this.OrganizationList = false
- this.officeList = false
- this.GridList = false
+ this.gridStaffTableFlag = true
+ this.departmentStaffTableFlag = false
+ this.currentAgencyStaffTableFlag = false
+ this.agencyTableFlag = false
+ this.departmentTableFlag = false
+ this.gridTableFlag = false
this.GridPeo()
this.assembleBreadcrumbArr(gridId, 'grid')
},
// 进入社区，查询社区所属人员
entryDepartment(departmentId){
- this.gridDataPeo = []
- this.communityDataPeo = []
- this.agencyDataPeo = []
- this.communityOrgId = departmentId
- this.levelPeo = false
- this.deptPeo = true
- this.GridWorkPeo = false
- this.ListOfOrganPersonnel = true
- this.levelWorkPeoList = false
- this.GridWorkPeoList = false
- this.GridList = false
- this.OrganizationList = false
- this.officeList = false
+ this.gridStaffTableListData = []
+ this.departmentStaffTableListData = []
+ this.agencyStaffTableListData = []
+ this.departmentOrgId = departmentId
+ this.departmentStaffTableFlag = true
+ this.currentAgencyStaffTableFlag = false
+ this.gridStaffTableFlag = false
+ this.gridTableFlag = false
+ this.agencyTableFlag = false
+ this.departmentTableFlag = false
this.communityPeo()
this.assembleBreadcrumbArr(departmentId, 'department')
},
// 进入组织，重新渲染
entryAgency(agencyId){
- this.tableData = []
- this.communityData = []
- this.gridData = []
- this.gridDataPeo = []
- this.agencyDataPeo = []
- this.communityDataPeo = []
+ this.agencyTableListData = []
+ this.departmentTableListData = []
+ this.gridTableListData = []
+ this.gridStaffTableListData = []
+ this.agencyStaffTableListData = []
+ this.departmentStaffTableListData = []
this.agencyId = agencyId
- this.getCommunityList()
+ this.getDepartmentList()
this.getGridList()
- this.communityOpen = true
- this.gridOpen = true
this.anId = agencyId
this.agencyPeo()
this.entry = true
- this.levelPeo = true
this.agencyId = agencyId
this.getAgencyList()
this.assembleBreadcrumbArr(agencyId, 'agency')
@@ -1280,13 +1265,13 @@ export default {
addCommunityPeo(){
this.dialogVisiblePeo = true
this.peoForm.orgType = 'dept'
- this.submitOrgid = this.communityOrgId
+ this.submitOrgid = this.departmentOrgId
},
// 修改社区人员
xiuCommunityPeo(row){
this.modifyPeo = true
this.peoForm.orgType = 'dept'
- this.submitOrgid = this.communityOrgId
+ this.submitOrgid = this.departmentOrgId
this.peoForm.name = row.name
this.peoForm.mobile = row.mobile
this.peoForm.gender = row.gender
@@ -1336,7 +1321,7 @@ export default {
this.$message.success("禁用成功")
this.Disable = false
this.getAgencyList()
- this.getCommunityList()
+ this.getDepartmentList()
this.getGridList()
this.agencyPeo()
} else {
@@ -1387,7 +1372,7 @@ export default {
this.options[0].value = data.agencyId
let depart = Array.from(data.departmentList)
- let gr = Array.from(data.gridList)
+ let gr = Array.from(data.gridTableFlag)
depart.forEach(item => {
const ob = {
@@ -1431,7 +1416,7 @@ export default {
this.transferRest()
this.transferPeo = false
this.getAgencyList()
- this.getCommunityList()
+ this.getDepartmentList()
this.getGridList()
this.agencyPeo()
@@ -1465,9 +1450,9 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if(code === 0){
if (data.level === 'community') {
- this.OrganizationList = false
+ this.agencyTableFlag = false
} else {
- this.OrganizationList = true
+ this.agencyTableFlag = true
}
if (this.breadcrumbArr.length === 0) {
this.breadcrumbArr = [{id: data.agencyId, name: data.agencyName, type: orgType}]
@@ -1545,11 +1530,59 @@ export default {
const orgType = selectOrg.type
if (orgType === 'agency') {
- this.entryAgency(orgId)
+ this.agencyTableListData = []
+ this.agencyStaffTableListData = []
+ this.departmentTableListData = []
+ this.departmentStaffTableListData = []
+ this.gridTableListData = []
+ this.gridStaffTableListData = []
+ this.agencyId = orgId
+ this.anId = orgId
+
+ this.agencyTableFlag = true
+ this.currentAgencyStaffTableFlag = true
+ this.departmentTableFlag = true
+ this.departmentStaffTableFlag = false
+ this.gridTableFlag = true
+ this.gridStaffTableFlag = false
+
+ this.getDepartmentList()
+ this.getGridList()
+ this.agencyPeo()
+ this.entry = true
+ this.getAgencyList()
+ this.assembleBreadcrumbArr(orgId, 'agency')
} else if (orgType === 'department') {
- this.entryDepartment(orgId)
+ this.agencyStaffTableListData = []
+ this.departmentStaffTableListData = []
+ this.gridStaffTableListData = []
+
+ this.departmentOrgId = orgId
+
+ this.agencyTableFlag = false
+ this.currentAgencyStaffTableFlag = false
+ this.departmentTableFlag = false
+ this.departmentStaffTableFlag = true
+ this.gridTableFlag = false
+ this.gridStaffTableFlag = false
+
+ this.communityPeo()
+ this.assembleBreadcrumbArr(orgId, 'department')
} else if (orgType === 'grid') {
- this.entryGrid(orgId)
+ this.agencyStaffTableListData = []
+ this.departmentStaffTableListData =[]
+ this.gridStaffTableListData = []
+
+ this.gridOrgId = orgId
+
+ this.agencyTableFlag = false
+ this.currentAgencyStaffTableFlag = false
+ this.departmentTableFlag = false
+ this.departmentStaffTableFlag = false
+ this.gridTableFlag = false
+ this.gridStaffTableFlag = true
+ this.GridPeo()
+ this.assembleBreadcrumbArr(orgId, 'grid')
}
},
// 获取当前用户信息
@@ -1597,7 +1630,7 @@ export default {
},
addAgency(row){
- this.addNewAgency = true
+ this.createAgencyDialogFlag = true
this.getUser()
},
// 新增组织确定按钮