diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 139a5c7fd..e57219008 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -1823,14 +1823,18 @@ export default { }, // 人员修改 async updatePeoDo () { - const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]); + if(this.peoForm.manageScopes){ + const targetAgencyIds =this.peoForm.manageScopes?this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]):this.peoForm.manageScopes; // 用于存储提取结果的 Set 对象 const result = new Set(); // 调用递归函数提取 level 与 agencyId 组合成的字符串 this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result); // 将 Set 对象转换为数组 + var manageScopeArray = Array.from(result); + console.log(this.peoForm,"查看"); + } - const manageScopeArray = Array.from(result); + const url = "/gov/org/staff/editstaff"; let params = { staffId: this.userStaffId, @@ -2118,7 +2122,6 @@ export default { this.gridTableFlag = false; this.agencyTableFlag = false; this.departmentTableFlag = false; - this.selDeptType = row.deptType; this.getDepartmentStaffListData(); this.assembleBreadcrumbArr(row.departmentId, "department"); @@ -2303,7 +2306,7 @@ export default { this.peoForm.post = data.workType; this.peoForm.idCard = data.idCard; this.peoForm.manageOrgIds = data.manageOrgIdStr?data.manageOrgIdStr.split(','):[]; - this.peoForm.orgLevels = data.orgLevels; + this.peoForm.orgLevels = data.manageLevelStr; this.manageOrgIds = data.manageOrgIdStr; // 已有的权限(角色) let existedRoleArr = []; @@ -2313,6 +2316,7 @@ export default { } }); this.peoForm.newRoles = existedRoleArr; + } else { this.$message.error(msg); } diff --git a/src/views/modules/shequzhili/event/cpts/event-info.vue b/src/views/modules/shequzhili/event/cpts/event-info.vue index d93b18d47..8db11604b 100644 --- a/src/views/modules/shequzhili/event/cpts/event-info.vue +++ b/src/views/modules/shequzhili/event/cpts/event-info.vue @@ -202,7 +202,7 @@
填报不合规诉求:
-
{{ irregularity.find(v => v.value ==item.irregularity).label }}
+
{{ binaryOptionList.find(v => v.value ==item.irregularity).label }}
不合规诉求类型:
@@ -252,7 +252,7 @@