diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index e6211572c..d3cd78337 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -21,11 +21,11 @@
-
+
新增
@@ -97,7 +97,7 @@
+ height="350">
@@ -142,7 +142,7 @@
-
@@ -168,7 +168,7 @@
+ height="350">
@@ -697,6 +697,13 @@ export default {
currentDepartmentId:'14f572e724eecf7668b655505d789cab',
// 当前被操作的网格的ID
currentGridOrgId:'63d5ff92ea981b1c58e4914ac894c610',
+
+ // 当前被操作的组织的级别
+ currentAgencyLevel: localStorage.getItem("level"),
+ currentAreaCode: '',
+ parentAreaCode: '',
+ parentAgencyId: localStorage.getItem("agencyId"),
+ parentAgencyLevel: localStorage.getItem("level"),
// 经纬度坐标
lat:'11',
@@ -793,12 +800,6 @@ export default {
agencyId:'',
customerId:''
},
- // 当前用户信息,用于获取组织区划
- userForm:{
- areaCode:'',
- level:'',
- parentAgencyId:''
- },
// 组织详细信息
OrgDetailsForm:{
level:'',
@@ -850,7 +851,7 @@ export default {
dutyList:[],
// 修改操作是否展示
modifyPeo:false,
- submitOrgid:'',
+
// 级联数据
options:[
{
@@ -1165,7 +1166,7 @@ export default {
gender:this.peoForm.gender,
workType:this.peoForm.post,
roles:this.peoForm.duty,
- orgId:this.submitOrgid
+ orgId:this.currentAgencyId
}
const { data, code, msg } = await requestPost(url,params)
@@ -1195,7 +1196,7 @@ export default {
gender:this.peoForm.gender === '男' ? 1 : 0,
workType:this.peoForm.post,
roles:this.peoForm.duty,
- agencyId:this.userAgencyId,
+ agencyId:this.currentAgencyId,
}
const { data, code, msg } = await requestPost(url,params)
@@ -1472,27 +1473,27 @@ export default {
addPeo(row){
this.dialogVisiblePeo = true
this.peoForm.orgType = 'agency'
- this.submitOrgid = this.currentAgencyId
+
},
// 新增社区人员
addCommunityPeo(){
this.dialogVisiblePeo = true
this.peoForm.orgType = 'dept'
- this.submitOrgid = this.currentDepartmentId
+
},
// 新增网格人员
addGridPeo(){
this.dialogVisiblePeo = true
this.peoForm.orgType = 'grid'
- this.submitOrgid = this.currentGridOrgId
+
},
// 修改网格人员
async xiuGridPeo(row){
this.modifyPeo = true
this.peoForm.orgType = 'grid'
- this.submitOrgid = this.currentGridOrgId
+
this.userStaffId = row.staffId
const url = "/gov/org/staff/editstaffinit"
@@ -1523,7 +1524,7 @@ export default {
async xiuPeo(row){
this.modifyPeo = true
this.peoForm.orgType = 'agency'
- this.submitOrgid = this.currentAgencyId
+
this.userStaffId = row.staffId
const url = "/gov/org/staff/editstaffinit"
@@ -1558,7 +1559,7 @@ export default {
async xiuCommunityPeo(row){
this.modifyPeo = true
this.peoForm.orgType = 'dept'
- this.submitOrgid = this.currentDepartmentId
+
this.userStaffId = row.staffId
const url = '/gov/org/staff/editstaffinit'
@@ -1747,6 +1748,13 @@ export default {
const { data, code, msg } = await requestPost(url, params)
if(code === 0){
// 社区级为最低级组织，不展示下级组织列表
+ this.currentAgencyLevel = data.level
+ this.currentAreaCode = data.areaCode
+ if (data.parentList && data.parentList.length > 0) {
+ this.parentAreaCode = data.parentList[data.parentList.length-1].areaCode
+ this.parentAgencyId = data.parentList[data.parentList.length-1].id
+ this.parentAgencyLevel = data.parentList[data.parentList.length-1].level
+ }
if (data.level === 'community') {
this.agencyTableFlag = false
} else {
@@ -1892,33 +1900,14 @@ export default {
this.assembleBreadcrumbArr(orgId, 'grid')
} */
},
- // 获取当前用户信息
- async getUser(){
- const url = '/gov/org/agency/agencydetail'
-
- let params = {
- agencyId: this.currentAgencyId
- }
-
- const { data, code, msg } = await requestPost(url,params)
-
- if(code === 0){
- this.userForm.areaCode = data.areaCode
- this.userForm.level = data.level
- this.userForm.parentAgencyId = data.agencyId
- this.getZoning()
- }else{
- this.$message.error(msg)
- }
- },
// 获取组织区划信息
- async getZoning(){
+ async getZoning(areaCode, parentAgencyId, parentAgencyLevel){
const url = '/data/aggregator/org/nextlevelareacodelist'
let params = {
- areaCode:this.userForm.areaCode,
- level:this.userForm.level,
- parentAgencyId:this.userForm.parentAgencyId
+ areaCode: areaCode,
+ level: parentAgencyLevel,
+ parentAgencyId: parentAgencyId
}
const { data, code, msg } = await requestPost(url,params)
@@ -1950,27 +1939,27 @@ export default {
})
},
- addAgency(row){
+ addAgency(){
this.createAgencyDialogFlag = true
this.addNewAgencyRest()
- this.getUser()
+ this.getZoning(this.currentAreaCode, this.currentAgencyId, this.currentAgencyLevel)
},
// 新增组织确定按钮
async submitaddNewAgency(){
const url = '/gov/org/agency/addagency-v2'
let params = {
- parentAgencyId:this.userForm.parentAgencyId,
- agencyName:this.agencyForm.agencyName,
- level:this.agencyForm.level,
- areaCodeSwitch:'closed',
- areaCode:this.agencyForm.areaCode,
- areaName:this.agencyForm.areaName,
- contacts:this.agencyForm.contacts,
- mobile:this.agencyForm.mobile,
- code:this.agencyForm.code,
- latitude:this.latitude,
- longitude:this.longitude
+ parentAgencyId: this.parentAgencyId,
+ agencyName: this.agencyForm.agencyName,
+ level: this.agencyForm.level,
+ areaCodeSwitch: 'closed',
+ areaCode: this.agencyForm.areaCode,
+ areaName: this.agencyForm.areaName,
+ contacts: this.agencyForm.contacts,
+ mobile: this.agencyForm.mobile,
+ code: this.agencyForm.code,
+ latitude: this.latitude,
+ longitude: this.longitude
}
const { data, code, msg } = await requestPost(url,params)
@@ -1990,16 +1979,15 @@ export default {
// 修改面包屑
modifyOrgInfo(){
this.judgeOrgInfoLevel = this.breadcrumbArr[this.breadcrumbArr.length-1]
- console.log(this.judgeOrgInfoLevel)
if(this.judgeOrgInfoLevel.type === "agency"){
this.getOrgDetailsById()
setTimeout(() => {
if(this.OrgDetailsForm.level === "district"){
/** 修改市区级弹窗 */
this.modifyCityOrgPop = true
- }else {
+ } else {
/** 街道级和社区级弹窗 */
- this.getUser()
+ this.getZoning(this.parentAreaCode, this.parentAgencyId, this.parentAgencyLevel)
this.streetOrCommunity = true
}
}, 1000);
@@ -2026,6 +2014,15 @@ export default {
const { data, code, msg } = await requestPost(url,params)
if(code === 0){
+
+ this.currentAgencyLevel = data.level
+ this.currentAreaCode = data.areaCode
+ if (data.parentList && data.parentList.length > 0) {
+ this.parentAreaCode = data.parentList[data.parentList.length-1].areaCode
+ this.parentAgencyId = data.parentList[data.parentList.length-1].id
+ this.parentAgencyLevel = data.parentList[data.parentList.length-1].level
+ }
+
this.OrgDetailsForm.level = data.level
this.OrgDetailsForm.agencyName = data.agencyName
this.OrgDetailsForm.code = data.code