diff --git a/epmet-oper-web/src/views/modules/yantai/certify.vue b/epmet-oper-web/src/views/modules/yantai/certify.vue index 4c2dbbb..d9f570c 100644 --- a/epmet-oper-web/src/views/modules/yantai/certify.vue +++ b/epmet-oper-web/src/views/modules/yantai/certify.vue @@ -153,7 +153,7 @@ @dialogCancle="dialogCancle"> @@ -305,6 +305,7 @@ export default { this.showDetail = false }, dialogOk () { + debugger this.showEdit = false this.loadTable() }, diff --git a/epmet-oper-web/src/views/modules/yantai/detailForm.vue b/epmet-oper-web/src/views/modules/yantai/detailForm.vue index 9df5f82..48fed25 100644 --- a/epmet-oper-web/src/views/modules/yantai/detailForm.vue +++ b/epmet-oper-web/src/views/modules/yantai/detailForm.vue @@ -135,12 +135,12 @@ export default { } if (this.peoForm.roles && this.peoForm.roles.length > 0) { - this.peoForm.rolesShow = this.peoForm.roles.join(',') + this.peoForm.rolesShow = this.peoForm.roles.join(',') } else { this.peoForm.rolesShow = '--' } if (this.peoForm.szsqRoles && this.peoForm.szsqRoles.length > 0) { - this.peoForm.szsqRolesShow = this.peoForm.szsqRoles.join(',') + this.peoForm.szsqRolesShow = this.peoForm.szsqRoles.join(',') } else { this.peoForm.szsqRolesShow = '--' } diff --git a/epmet-oper-web/src/views/modules/yantai/editForm.vue b/epmet-oper-web/src/views/modules/yantai/editForm.vue index d9a4ac5..0b72483 100644 --- a/epmet-oper-web/src/views/modules/yantai/editForm.vue +++ b/epmet-oper-web/src/views/modules/yantai/editForm.vue @@ -32,7 +32,7 @@ :props="optionProps" @change="handleChangeAgency" clearable> - {{peoForm.orgName||'--'}} + {{peoForm.agencyName||'--'}} @@ -189,6 +189,14 @@ export default { // 添加人员 async submitPeoDo () { + if (this.peoForm.roles.length === 0) { + this.$message.error("请选择职责"); + return false + } + if (this.peoForm.newRoles.length === 0) { + this.$message.error("请选择角色"); + return false + } const url = "/gov/org/staff/addstaffv2"; // console.log('this.peoForm', this.peoForm) // return false @@ -207,6 +215,15 @@ export default { // 人员修改 async updatePeoDo () { + + if (this.peoForm.roles.length === 0) { + this.$message.error("请选择职责"); + return false + } + if (this.peoForm.newRoles.length === 0) { + this.$message.error("请选择角色"); + return false + } const url = "/gov/org/staff/editstaff"; let params = { @@ -224,7 +241,7 @@ export default { if (code === 0) { this.$message.success("操作成功"); - + this.dialogOk() } else { this.$message.error(msg); @@ -249,14 +266,14 @@ export default { this.peoForm = { ...data }; // 已有的权限(职责) - this.peoForm.roles = []; + let existedDutyArr = []; data.roleList.forEach(function (sysDuty) { if (sysDuty.selected === true) { this.peoForm.roles.push(sysDuty.roleId) existedDutyArr.push(sysDuty.roleId); } }); - // this.peoForm.roles = [...existedDutyArr]; + this.peoForm.roles = existedDutyArr; // 已有的权限(角色) let existedRoleArr = []; data.newRoleList.forEach(function (sysRole) {