提交 e7864bb2 编写于 作者: zhentian.jia's avatar zhentian.jia

fix tree bug

上级 08415f64
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</div> </div>
<div class="second-step" v-else-if="active === 1"> <div class="second-step" v-else-if="active === 1">
<el-tabs v-model="activeName" @tab-click="handleClickTabs"> <el-tabs v-model="activeName" @tab-click="handleClickTabs">
<el-tab-pane v-if="idTypeValue == 1" label="设定行政范围" name="first"> <el-tab-pane v-if="idType == 1" label="设定行政范围" name="first">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col class="rim" :span="12"> <el-col class="rim" :span="12">
<!-- <!--
...@@ -448,7 +448,7 @@ export default { ...@@ -448,7 +448,7 @@ export default {
district: "长宁区" district: "长宁区"
}; };
return { return {
idTypeValue: "", idTypeValue: 1,
itemOrganization: itemOrganization, itemOrganization: itemOrganization,
itemPerson: itemPerson, itemPerson: itemPerson,
projectId: null, projectId: null,
...@@ -647,10 +647,10 @@ export default { ...@@ -647,10 +647,10 @@ export default {
this.editManager(); this.editManager();
this.changeOnStep(this.active); this.changeOnStep(this.active);
this.getComponentInfo(); this.getComponentInfo();
this.idTypeValue = vm.idType;
this.$nextTick(function() { this.$nextTick(function() {
//this.getDepartment(); //this.getDepartment();
this.idTypeValue = vm.idType;
//this.idTypeValue = 2; //this.idTypeValue = 2;
if (this.idTypeValue == 2) { if (this.idTypeValue == 2) {
console.log("idType:", vm.idType, " idTypeValue:", this.idTypeValue); console.log("idType:", vm.idType, " idTypeValue:", this.idTypeValue);
...@@ -729,6 +729,7 @@ export default { ...@@ -729,6 +729,7 @@ export default {
let editData = res.data; let editData = res.data;
this.setEditData(editData); this.setEditData(editData);
this.projectStatus = res.data.projectData.projectStatus; this.projectStatus = res.data.projectData.projectStatus;
//console.log('projectStatus:',this.projectStatus)
} else { } else {
console.log(res); console.log(res);
} }
...@@ -793,6 +794,7 @@ export default { ...@@ -793,6 +794,7 @@ export default {
this.stepData = [false, true, false]; this.stepData = [false, true, false];
this.projectId = res.data.id; this.projectId = res.data.id;
this.projectStatus = res.data.projectStatus; this.projectStatus = res.data.projectStatus;
//console.log('projectStatus:',this.projectStatus)
this.initRange(); this.initRange();
this.getDepartment(); this.getDepartment();
} }
...@@ -883,7 +885,7 @@ export default { ...@@ -883,7 +885,7 @@ export default {
//暂存步骤2 //暂存步骤2
let req = { let req = {
projectId: this.projectId, projectId: this.projectId,
setKindOfAdministrative: this.getKind("administrative"), setKindOfAdministrative: this.getKind("administrativeScope"),
setKindOfOrganization: this.getKind("organization"), setKindOfOrganization: this.getKind("organization"),
setKindOfDepartment: this.getKind("department"), setKindOfDepartment: this.getKind("department"),
setKindOfPeople: this.getKind("person") setKindOfPeople: this.getKind("person")
...@@ -963,13 +965,13 @@ export default { ...@@ -963,13 +965,13 @@ export default {
} }
} }
} else if (this.active == 1) { } else if (this.active == 1) {
if (this.idTypeValue == 1) { if (this.idType == 1) {
//内部管理员 //内部管理员
if (this.tagsRegion.length > 0) { if (this.tagsRegion.length > 0) {
//选择了范围 //选择了范围
let req = { let req = {
projectId: this.projectId, projectId: this.projectId,
setKindOfAdministrative: this.getKind("administrative"), setKindOfAdministrative: this.getKind("administrativeScope"),
//scopeOfAdministrative: "000:2|000_110:1", //scopeOfAdministrative: "000:2|000_110:1",
setKindOfOrganization: this.getKind("organization"), setKindOfOrganization: this.getKind("organization"),
//scopeOfOrganization: "2|3|4|5|6|7", //scopeOfOrganization: "2|3|4|5|6|7",
...@@ -1180,7 +1182,7 @@ export default { ...@@ -1180,7 +1182,7 @@ export default {
//新建 //新建
} else { } else {
//编辑 //编辑
if(this.idTypeValue == 1) { if(this.idType == 1) {
this.getAdministrative(); this.getAdministrative();
} }
} }
...@@ -1492,6 +1494,10 @@ export default { ...@@ -1492,6 +1494,10 @@ export default {
if (this.tagsRegion.length > 0 && this.updatedTree == true) { if (this.tagsRegion.length > 0 && this.updatedTree == true) {
kind = 3; kind = 3;
} }
} else if (type == "administrativeScope") {
if (this.tagsRegion.length > 0) {
kind = 3;
}
} else if (type == "organization") { } else if (type == "organization") {
if (this.checkTableState.multipleOrganization == true) { if (this.checkTableState.multipleOrganization == true) {
//设置机构类别0:无 1:全选 2:去掉 3:选中 //设置机构类别0:无 1:全选 2:去掉 3:选中
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册