修改机构范围

src/utils/operation.js

@@ -100,7 +100,23 @@ export function getOrganizationList(data) {
   }
   return list;
 }
-
+//机构列表
+export function getHospitalList(data) {
+  let list = [];
+  list[0] = {
+    value: 0,
+    label: '全部',
+  };
+  for(let i=0;i<data.length;i++) {
+    let obj = {
+      value: data[i].id,
+      label: data[i].name,
+    }
+    list.push(obj);
+  }
+  console.log(list);
+  return list;
+}
 
 //拼树
 export function changeTags(option) {

src/views/education/add-manager.vue

@@ -352,27 +352,30 @@
           <el-tab-pane label="设定人员" name="fourth">
             <el-form :inline="true" :model="formPerson" class="demo-form-inline">
               <el-form-item label>
-                <el-select size="mini" v-model="formPerson.hospital" placeholder="全部医院">
+                <el-select size="mini" v-model="formPerson.hospitalId" placeholder="全部医院">
                   <el-option
                     v-for="(item, index) in hospitalList"
                     :key="index"
                     :label="item.label"
-                    :value="item.id"
+                    :value="item.value"
                   ></el-option>
                 </el-select>
               </el-form-item>
               <el-form-item>
-                <el-select size="mini" v-model="formPerson.department" placeholder="全部科室">
+                <el-select size="mini" v-model="formPerson.departmentId" placeholder="全部科室">
                   <el-option
-                    v-for="(item, index) in departmentList"
-                    :key="index"
+                    v-for="item in departmentList"
+                    :key="item.value"
                     :label="item.label"
-                    :value="item.id"
+                    :value="item.value"
                   ></el-option>
                 </el-select>
               </el-form-item>
+              <el-form-item label>
+                <el-input size="mini" v-model="formPerson.name" placeholder="请输入人员名称"></el-input>
+              </el-form-item>
               <el-form-item>
-                <el-button size="small" type="primary" @click="getPeople">搜索</el-button>
+                <el-button size="small" type="primary" @click="searchPeople">搜索</el-button>
               </el-form-item>
               <el-form-item style="float:right;">
                 <el-button-group>
@@ -627,8 +630,9 @@ export default {
         return row.id;
       },
       formPerson: {
-        hospital: "",
-        department: "",
+        hospitalId: 0,
+        departmentId: 0,
+        name: "",
         pageNum: 1,
         pageSize: 10
       },
@@ -1411,12 +1415,12 @@ export default {
       } else {
         //编辑
         this.listLevels();
-        this.getCheckedTree();
         if (this.idType !== 2) {
           this.getAdministrative();
         } else {
           this.activeName = "second";
           this.getOrganization();
+          this.getCheckedTree();
         }
       }
     },
@@ -1436,9 +1440,8 @@ export default {
         // }
       } else if (tabName == "fourth") {
         //设定人员
+        this.getHospital();
         this.departmentList = this.getDepartmentList();
-        //console.log(this.tableDepartment);
-        //console.log(this.departmentList);
         this.getPeople();
       }
     },
@@ -1454,6 +1457,8 @@ export default {
       this.organizationRegion = operationData.getOrganizationList(
         this.tagsRegion
       );
+      console.log(this.organizationRegion);
+      //debugger;
     },
     //初始化范围树
     setTreeData(administrative) {
@@ -1484,6 +1489,7 @@ export default {
           this.treeData = [];
           this.treeData[0] = administrativeAll;
           this.setTreeData(administrative);
+          this.getCheckedTree();
           //console.log("treeData", this.treeData);
         }
       });
@@ -2016,6 +2022,33 @@ export default {
       scope = scope.substring(0, scope.length - 1);
       return scope;
     },
+    //获取医院
+    getHospital() {
+      let req = {
+        projectId: this.projectId,
+        setKindOfAdministrative: this.getKind("administrative"),
+        //scopeOfAdministrative: "000_110",
+        setKindOfOrganization: this.getKind("organization"),
+        //scopeOfOrganization: "2|3|4|5|6|7",
+
+        pageNum: this.formPerson.pageNum,
+        pageSize: this.formPerson.pageSize
+      };
+      if (req.setKindOfAdministrative == 3) {
+        req.scopeOfAdministrative = this.getScope("administrative");
+      }
+      if (req.setKindOfOrganization == 2 || req.setKindOfOrganization == 3) {
+        req.scopeOfOrganization = this.getScopeOrganization(
+          req.setKindOfOrganization
+        );
+      }
+      vm.POST("portal/scope/v1/hospital", req).then(res => {
+        if (res.code == "000000") {
+          console.log(res);
+          this.hospitalList = operationData.getHospitalList(res.data.organizationList);
+        }
+      })
+    },
     initPeopleStatus() {
       let tableStatus = this.tablePerson;
       tableStatus.forEach(row => {
@@ -2026,6 +2059,45 @@ export default {
         }
       });
     },
+    //选择搜索机构方式
+    searchPeople() {
+      let searchForm = this.formPerson;
+      if (
+        searchForm.hospitalId == "0" &&
+        searchForm.departmentId == "0" &&
+        searchForm.name == ""
+      ) {
+        this.getPeople();
+      } else {
+        this.getPeopleChoose();
+      }
+    },
+    //人员搜索
+    getPeopleChoose() {
+      // console.log('formOrganization',this.formOrganization);
+      let req = {
+        projectId: this.projectId,
+        setKind: this.getKind("administrative"),
+        // scope: "000_110",
+        administrativeId: this.formOrganization.administrativeId,
+        departmentLevel: this.formOrganization.level,
+        organizationName: this.formOrganization.name,
+        pageNum: this.formOrganization.pageNum,
+        pageSize: this.formOrganization.pageSize
+      };
+      if (req.setKind == 3) {
+        req.scope = this.getScope("administrative");
+      }
+      openLoading(vm);
+      vm.POST("portal/scope/v1/organization/choose", req).then(res => {
+        closeLoading(vm);
+        console.log(res);
+        if (res.code == "000000") {
+          this.tableOrganization = res.data.organizationList;
+          this.totalOrganization = res.data.total;
+        }
+      });
+    },
     //查询人员列表
     getPeople() {
       let req = {
@@ -2072,6 +2144,10 @@ export default {
     //设定人员中科室列表
     getDepartmentList() {
       let list = [];
+      list[0] = {
+        value: 0,
+        label: '全部',
+      };
       for (let i = 0; i < this.tableDepartment.length; i++) {
         if (this.tableDepartment[i].status == 1) {
           let obj = {