diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 62c117226..dcbee211b 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -452,7 +452,7 @@ - - + --> @@ -578,7 +578,7 @@ - - + --> - + + + + + + item.selected).map(item => item.roleId); - // 已有的权限(职责) - let existedDutyArr = []; - data.roleList.forEach(function (sysDuty) { - if (sysDuty.selected === true) { - existedDutyArr.push(sysDuty.roleId); - } - }); - this.peoForm.dutyList = existedDutyArr; // 已有的权限(角色) let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) { @@ -2161,14 +2142,6 @@ export default { // this.peoForm.gender = data.gender === 1 ? '男' : '女' this.peoForm.gender = data.gender; this.peoForm.idCard = data.idCard; - // 已有的权限(职责) - let existedDutyArr = []; - data.roleList.forEach(function (sysDuty) { - if (sysDuty.selected === true) { - existedDutyArr.push(sysDuty.roleId); - } - }); - this.peoForm.duty = existedDutyArr; // 已有的权限(角色) let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) { @@ -2234,14 +2207,6 @@ export default { this.peoForm.gender = data.gender; this.peoForm.post = data.workType; this.peoForm.idCard = data.idCard; - // 已有的权限(职责) - let existedDutyArr = []; - data.roleList.forEach(function (sysDuty) { - if (sysDuty.selected === true) { - existedDutyArr.push(sysDuty.roleId); - } - }); - this.peoForm.duty = existedDutyArr; // 已有的权限(角色) let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) { @@ -2295,15 +2260,16 @@ export default { }; const { data, code, msg } = await requestPost(url, params); - debugger if (code === 0) { this.peoForm.name = data.name; this.peoForm.mobile = data.mobile.substr(0, 3) + "****" + data.mobile.substr(7); this.peoForm.activeTime = data.activeTime; - this.peoForm.duty = data.roles; this.peoForm.idCard = data.idCard; this.peoForm.zuzhi = data.orgName; + let existedRoleArr = []; + this.peoForm.szsqRoles = data.szsqRoles; + this.peoForm.newRoles = existedRoleArr; if (data.enableFlag === "enable") { this.peoForm.disableFlag = "已启用"; } else {