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

fix bug

上级 1cb6756b
...@@ -1457,8 +1457,7 @@ export default { ...@@ -1457,8 +1457,7 @@ export default {
this.organizationRegion = operationData.getOrganizationList( this.organizationRegion = operationData.getOrganizationList(
this.tagsRegion this.tagsRegion
); );
console.log(this.organizationRegion); //console.log(this.organizationRegion);
//debugger;
}, },
//初始化范围树 //初始化范围树
setTreeData(administrative) { setTreeData(administrative) {
...@@ -1770,7 +1769,7 @@ export default { ...@@ -1770,7 +1769,7 @@ export default {
let kind = 0; let kind = 0;
if (type == "administrative") { if (type == "administrative") {
//console.log("this.updatedTree", this.updatedTree); //console.log("this.updatedTree", this.updatedTree);
if (this.tagsRegion.length > 0 && this.updatedTree == true) { if (this.updatedTree == true) {
kind = 3; kind = 3;
} }
} else if (type == "administrativeScope") { } else if (type == "administrativeScope") {
...@@ -2077,24 +2076,36 @@ export default { ...@@ -2077,24 +2076,36 @@ export default {
// console.log('formOrganization',this.formOrganization); // console.log('formOrganization',this.formOrganization);
let req = { let req = {
projectId: this.projectId, projectId: this.projectId,
setKind: this.getKind("administrative"), setKindOfAdministrative: this.getKind("administrative"),
// scope: "000_110", //scopeOfAdministrative: "000_110",
administrativeId: this.formOrganization.administrativeId, setKindOfOrganization: this.getKind("organization"),
departmentLevel: this.formOrganization.level, //scopeOfOrganization: "2|3|4|5|6|7",
organizationName: this.formOrganization.name, setKindOfDepartment: this.getKind("department"),
pageNum: this.formOrganization.pageNum, //scopeOfDepartment: 54,
pageSize: this.formOrganization.pageSize pageNum: this.formPerson.pageNum,
pageSize: this.formPerson.pageSize,
hospitalId: this.formPerson.hospitalId,
departmentId: this.formPerson.departmentId,
name: this.formPerson.name,
}; };
if (req.setKind == 3) { if (req.setKindOfAdministrative == 3) {
req.scope = this.getScope("administrative"); req.scopeOfAdministrative = this.getScope("administrative");
}
if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
req.scopeOfOrganization = this.getScopeOrganization(
req.setKindOfOrganization
);
}
if (req.setKindOfDepartment == 3) {
req.scopeOfDepartment = this.getScopeDepartment();
} }
openLoading(vm); openLoading(vm);
vm.POST("portal/scope/v1/organization/choose", req).then(res => { vm.POST("portal/scope/v1/people/choose", req).then(res => {
closeLoading(vm); closeLoading(vm);
console.log(res); console.log(res);
if (res.code == "000000") { if (res.code == "000000") {
this.tableOrganization = res.data.organizationList; this.tablePerson = res.data.organizationList;
this.totalOrganization = res.data.total; this.totalPerson = res.data.total;
} }
}); });
}, },
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册