bug
This commit is contained in:
parent
dd6c70f1ab
commit
60b52b53b3
@ -188,6 +188,7 @@
|
|||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</span>
|
</span>
|
||||||
<span v-else>
|
<span v-else>
|
||||||
|
<span v-if="isAdd">
|
||||||
<span v-if="!parentDeptType">
|
<span v-if="!parentDeptType">
|
||||||
<el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
|
<el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
|
||||||
<el-radio
|
<el-radio
|
||||||
@ -237,6 +238,17 @@
|
|||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</span>
|
</span>
|
||||||
</span>
|
</span>
|
||||||
|
<span v-else>
|
||||||
|
<el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
|
||||||
|
<el-radio
|
||||||
|
v-for="dict in judgementNodeType(dict.type.node_type)"
|
||||||
|
:key="dict.value"
|
||||||
|
:label="dict.value"
|
||||||
|
v-if="dict.value==ruleForm.deptType"
|
||||||
|
>{{dict.label}}</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
|
|
||||||
@ -808,6 +820,7 @@ export default {
|
|||||||
isEditDept:true,
|
isEditDept:true,
|
||||||
isTopDept:true,
|
isTopDept:true,
|
||||||
parentDeptType:"",
|
parentDeptType:"",
|
||||||
|
isAdd:false,
|
||||||
|
|
||||||
|
|
||||||
timeFrame:[],
|
timeFrame:[],
|
||||||
@ -1107,6 +1120,8 @@ export default {
|
|||||||
submitForm1: function() {
|
submitForm1: function() {
|
||||||
this.$refs["form1"].validate(valid => {
|
this.$refs["form1"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
|
console.log(this.deptType)
|
||||||
|
this.form1.deptType = this.deptType
|
||||||
if (this.form1.dutyId) {
|
if (this.form1.dutyId) {
|
||||||
this.form1.menuIds = this.getMenuAllCheckedKeys();
|
this.form1.menuIds = this.getMenuAllCheckedKeys();
|
||||||
updateRole(this.form1).then(response => {
|
updateRole(this.form1).then(response => {
|
||||||
@ -1318,6 +1333,7 @@ export default {
|
|||||||
|
|
||||||
console.log('点树',data)
|
console.log('点树',data)
|
||||||
|
|
||||||
|
this.isAdd = false
|
||||||
this.cleanUp()
|
this.cleanUp()
|
||||||
|
|
||||||
let flag = true
|
let flag = true
|
||||||
@ -1465,7 +1481,7 @@ export default {
|
|||||||
this.addNode(data.id,data.label,data.deptType)
|
this.addNode(data.id,data.label,data.deptType)
|
||||||
// console.log(this.pdinfo)
|
// console.log(this.pdinfo)
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
|
this.isAdd = true
|
||||||
// 新增树
|
// 新增树
|
||||||
},
|
},
|
||||||
cleanRuleForm() {
|
cleanRuleForm() {
|
||||||
|
@ -140,7 +140,7 @@ public class BackendDutyController extends BaseController {
|
|||||||
String token = request.getHeader("Access-Token");
|
String token = request.getHeader("Access-Token");
|
||||||
List<Integer> menuIds = (List) param.get("menuIds");
|
List<Integer> menuIds = (List) param.get("menuIds");
|
||||||
String name = param.get("roleName").toString();
|
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 status = param.get("status").toString();
|
||||||
String description = param.get("description").toString();
|
String description = param.get("description").toString();
|
||||||
if (ObjectUtil.isEmpty(param.get("storeId"))){
|
if (ObjectUtil.isEmpty(param.get("storeId"))){
|
||||||
|
Loading…
Reference in New Issue
Block a user