diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue index b99ba7486..98acbdbe3 100644 --- a/fuintAdmin_zt/src/views/Site/index.vue +++ b/fuintAdmin_zt/src/views/Site/index.vue @@ -188,53 +188,65 @@ - - - {{dict.label}} - + + + + {{dict.label}} + + + + + {{dict.label}} + + + + + {{dict.label}} + + + + + {{dict.label}} + + + + + {{dict.label}} + + - + - {{dict.label}} - - - - - {{dict.label}} - - - - - {{dict.label}} - - - - - {{dict.label}} - + {{dict.label}} + @@ -808,6 +820,7 @@ export default { isEditDept:true, isTopDept:true, parentDeptType:"", + isAdd:false, timeFrame:[], @@ -1107,6 +1120,8 @@ export default { submitForm1: function() { this.$refs["form1"].validate(valid => { if (valid) { + console.log(this.deptType) + this.form1.deptType = this.deptType if (this.form1.dutyId) { this.form1.menuIds = this.getMenuAllCheckedKeys(); updateRole(this.form1).then(response => { @@ -1318,6 +1333,7 @@ export default { console.log('点树',data) + this.isAdd = false this.cleanUp() let flag = true @@ -1465,7 +1481,7 @@ export default { this.addNode(data.id,data.label,data.deptType) // console.log(this.pdinfo) event.stopPropagation(); - + this.isAdd = true // 新增树 }, cleanRuleForm() { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java index 25312d548..a32b45a18 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/role/controller/BackendDutyController.java @@ -140,7 +140,7 @@ public class BackendDutyController extends BaseController { String token = request.getHeader("Access-Token"); List menuIds = (List) param.get("menuIds"); String name = param.get("roleName").toString(); - String type = param.get("roleType").toString(); + String type = param.get("deptType").toString(); String status = param.get("status").toString(); String description = param.get("description").toString(); if (ObjectUtil.isEmpty(param.get("storeId"))){