bug
This commit is contained in:
parent
19ca4609da
commit
9f0d8f7ca2
@ -187,34 +187,45 @@
|
|||||||
>{{dict.label}}</el-radio>
|
>{{dict.label}}</el-radio>
|
||||||
</el-radio-group>
|
</el-radio-group>
|
||||||
</span>
|
</span>
|
||||||
<span v-else-if="ruleForm.deptType==='1'">
|
|
||||||
<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!='4'"
|
|
||||||
>{{dict.label}}</el-radio>
|
|
||||||
</el-radio-group>
|
|
||||||
</span>
|
|
||||||
<span v-else-if="ruleForm.deptType">
|
|
||||||
<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 v-else>
|
<span v-else>
|
||||||
<el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
|
<span v-if="!ruleForm.deptType">
|
||||||
<el-radio
|
<el-radio-group :disabled="isTopDept" v-model="ruleForm.deptType">
|
||||||
v-for="dict in judgementNodeType(dict.type.node_type)"
|
<el-radio
|
||||||
:key="dict.value"
|
v-for="dict in judgementNodeType(dict.type.node_type)"
|
||||||
:label="dict.value"
|
:key="dict.value"
|
||||||
>{{dict.label}}</el-radio>
|
:label="dict.value"
|
||||||
</el-radio-group>
|
>{{dict.label}}</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</span>
|
||||||
|
<span v-else-if="ruleForm.deptType==='1'">
|
||||||
|
<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!='4'"
|
||||||
|
>{{dict.label}}</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</span>
|
||||||
|
<span v-else-if="ruleForm.deptType==='4'">
|
||||||
|
<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"
|
||||||
|
>{{dict.label}}</el-radio>
|
||||||
|
</el-radio-group>
|
||||||
|
</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>
|
</span>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|
||||||
@ -223,7 +234,7 @@
|
|||||||
<template v-if="ruleForm.deptType !== '3'">
|
<template v-if="ruleForm.deptType !== '3'">
|
||||||
<el-row >
|
<el-row >
|
||||||
<el-col :span="20">
|
<el-col :span="20">
|
||||||
<el-form-item label="计费方式" prop="">
|
<el-form-item label="计费方式" prop="turnoverType">
|
||||||
<span v-if="isTopDept">
|
<span v-if="isTopDept">
|
||||||
<el-radio-group :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
|
<el-radio-group :disabled="isTopDept" v-model="ruleForm.turnoverType" @input="changeTheBillingRule">
|
||||||
<el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio>
|
<el-radio v-if="ruleForm.turnoverType=='1'" label=1>无限制</el-radio>
|
||||||
@ -943,6 +954,12 @@ export default {
|
|||||||
mobile: [
|
mobile: [
|
||||||
{ required: true, message: '手机号不能为空', trigger: 'blur' },
|
{ required: true, message: '手机号不能为空', trigger: 'blur' },
|
||||||
],
|
],
|
||||||
|
deptType: [
|
||||||
|
{ required: true, message: '机构类型不能为空', trigger: 'blur' },
|
||||||
|
],
|
||||||
|
turnoverType: [
|
||||||
|
{ required: true, message: '计费方式不能为空', trigger: 'blur' },
|
||||||
|
],
|
||||||
|
|
||||||
deptName: [
|
deptName: [
|
||||||
{ required: true, message: '请输入机构名称', trigger: 'blur' },
|
{ required: true, message: '请输入机构名称', trigger: 'blur' },
|
||||||
@ -1401,13 +1418,10 @@ export default {
|
|||||||
// },
|
// },
|
||||||
handleClick(tab, event) {
|
handleClick(tab, event) {
|
||||||
console.log(this.activeName)
|
console.log(this.activeName)
|
||||||
if (this.activeName=="list"){
|
if (this.activeName==="list"){
|
||||||
this.onlyGetUser()
|
this.onlyGetUser()
|
||||||
}
|
}
|
||||||
if (this.activeName=="duty"){
|
if (this.activeName==="duty"){
|
||||||
this.getDutyList()
|
|
||||||
}
|
|
||||||
if (this.activeName=="info"){
|
|
||||||
this.getDutyList()
|
this.getDutyList()
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -1423,7 +1437,7 @@ export default {
|
|||||||
this.beginTime = ""
|
this.beginTime = ""
|
||||||
this.endTime = ""
|
this.endTime = ""
|
||||||
|
|
||||||
this.addNode(data.id,data.label)
|
this.addNode(data.id,data.label,data.deptType)
|
||||||
// console.log(this.pdinfo)
|
// console.log(this.pdinfo)
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
|
|
||||||
@ -1444,13 +1458,13 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
// 新增数据
|
// 新增数据
|
||||||
addNode(id,label) {
|
addNode(id,label,deptType) {
|
||||||
let _this = this
|
let _this = this
|
||||||
// 默认类型
|
// 默认类型
|
||||||
this.isClick = false
|
this.isClick = false
|
||||||
this.ruleForm.deptType = "3"
|
this.ruleForm.deptType = deptType
|
||||||
this.$nextTick(() => {
|
this.$nextTick(() => {
|
||||||
console.log("新增树的返回222", this.ruleForm);
|
console.log("新增树的返回222", this.ruleForm,id,label);
|
||||||
});
|
});
|
||||||
|
|
||||||
// _this.ruleForm.deptType = '1'
|
// _this.ruleForm.deptType = '1'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user