fix 20:11

src/utils/operation.js

@@ -42,6 +42,10 @@ export function getAdministrative(data) {
 }
 export function getLevelList(data) {
   let level = [];
+  level[0] = {
+    id: '0',
+    label: '全部',
+  }
   for (let i = 0; i < data.length; i++) {
     let obj = {
       id: data[i].no,
@@ -310,6 +314,10 @@ export function getTreeData(data,tags) {
 }
 export function organizationList(data) {
   let list = [];
+  list[0] = {
+    value: '0',
+    label: '全部',
+  };
   for(let i=0;i<data.length;i++) {
     let obj = {
       value: data[i].key,

src/views/education/add-manager.vue

@@ -237,12 +237,16 @@
           <el-tab-pane label="设定机构" name="second">
             <el-form :inline="true" :model="formOrganization" class="demo-form-inline">
               <el-form-item label>
-                <el-select size="mini" v-model="formOrganization.region" placeholder="全部地区">
+                <el-select
+                  size="mini"
+                  v-model="formOrganization.administrativeId"
+                  placeholder="全部地区"
+                >
                   <el-option
-                    v-for="(item, index) in organizationRegion"
-                    :key="index"
+                    v-for="item in organizationRegion"
+                    :key="item.id"
                     :label="item.label"
-                    :value="item.id"
+                    :value="item.value"
                   ></el-option>
                 </el-select>
                 <!-- <el-cascader
@@ -253,7 +257,7 @@
                 ></el-cascader>-->
               </el-form-item>
               <el-form-item>
-                <el-select size="mini" v-model="formOrganization.grade" placeholder="全部医院级别">
+                <el-select size="mini" v-model="formOrganization.level" placeholder="全部医院级别">
                   <el-option
                     v-for="(item, index) in organizationRank"
                     :key="index"
@@ -266,7 +270,7 @@
                 <el-input size="mini" v-model="formOrganization.name" placeholder="请输入机构名称"></el-input>
               </el-form-item>
               <el-form-item>
-                <el-button size="small" type="primary" @click="getOrganization()">搜索</el-button>
+                <el-button size="small" type="primary" @click="searchOrganization()">搜索</el-button>
               </el-form-item>
               <el-form-item style="float:right;">
                 <el-button-group>
@@ -579,15 +583,15 @@ export default {
         return row.id;
       },
       checkTableState: {
-        multipleOrganization: '',
-        multipleDepartment: '',
-        multiplePerson: ''
+        multipleOrganization: "",
+        multipleDepartment: "",
+        multiplePerson: ""
       },
       updatedOrganization: false,
       formOrganization: {
         name: "",
-        region: [],
-        grade: "",
+        administrativeId: "0",
+        level: "0",
         chechAll: true,
         pageNum: 1,
         pageSize: 10
@@ -600,7 +604,9 @@ export default {
       currentOrganization: 1,
       totalOrganization: 10,
       pageSizeOrganization: 2,
+      lookedOrganization: [],
       changedOrganization: [],
+      changedOrganization2: [],
       //设定科室 数据
       firstDepartment: true,
       formDepartment: {
@@ -980,14 +986,6 @@ export default {
         this.stepData = [false, false, true];
       }
     },
-    //选择范围选中所有table被选中
-    checkAllTable() {
-      this.$nextTick(function() {
-        this.$refs.multipleOrganization.toggleAllSelection();
-        this.$refs.multipleDepartment.toggleAllSelection();
-        this.$refs.multiplePerson.toggleAllSelection();
-      });
-    },
     //点击暂存
     storage() {
       console.log("暂存步骤" + (this.active + 1));
@@ -1641,6 +1639,7 @@ export default {
     //改变 设定机构选项
     selectionChangeOrganization(rows) {
       this.changedOrganization = [];
+      this.changedOrganization2 = [];
       if (rows) {
         rows.forEach(row => {
           if (row) {
@@ -1648,7 +1647,16 @@ export default {
           }
         });
       }
-      console.log(this.changedOrganization);
+      this.changedOrganization2 = operationData.getDifference(
+        this.lookedOrganization,
+        this.changedOrganization
+      );
+      console.log(
+        "选",
+        this.changedOrganization,
+        "没",
+        this.changedOrganization2
+      );
     },
     //改变机构 table 的check状态
     selectionChangeDepartment(val) {
@@ -1671,20 +1679,31 @@ export default {
     checkAll(flag, name) {
       //console.log(flag + " " + name);
       if (name == "multipleOrganization") {
+        //机构
         this.changedOrganization = [];
+        if (flag === true) {
+          let checkItem = this.checkTableState[name];
+          if (checkItem !== true) {
+            console.log(this.tableOrganization);
+            this.checkTableState[name] = true;
+          }
+        } else {
+          this.$refs[name].clearSelection();
+          this.checkTableState[name] = false;
+        }
       } else if (name == "multiplePerson") {
+        //人员
         this.changedPerson = [];
-      }
-      if (flag === true) {
-        console.log('flag',flag,'name',name);
-        if (this.checkTableState[name] === false) {
-          //console.log('flag',flag,'name',name);
-          this.$refs[name].toggleAllSelection();
-          this.checkTableState[name] = true;
+        if (flag === true) {
+          let checkItem = this.checkTableState[name];
+          if (checkItem !== true) {
+            this.$refs[name].toggleAllSelection();
+            this.checkTableState[name] = true;
+          }
+        } else {
+          this.$refs[name].clearSelection();
+          this.checkTableState[name] = false;
         }
-      } else {
-        this.$refs[name].clearSelection();
-        this.checkTableState[name] = false;
       }
     },
     //获取用户类型
@@ -1778,6 +1797,45 @@ export default {
         }
       });
     },
+    //选择搜索机构方式
+    searchOrganization() {
+      let searchForm = this.formOrganization;
+      if (
+        searchForm.administrativeId == "0" &&
+        searchForm.level == "0" &&
+        searchForm.name == ""
+      ) {
+        this.getOrganization();
+      } else {
+        this.getOrganizationChoose();
+      }
+    },
+    //机构搜索
+    getOrganizationChoose() {
+      // 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;
+        }
+      });
+    },
     //查询机构列表
     getOrganization() {
       let req = {
@@ -1799,9 +1857,20 @@ export default {
           this.totalOrganization = res.data.total;
           //console.log("changedOrganization", this.changedOrganization);
           let idList = operationData.getIdList(this.tableOrganization);
-          let intersect = operationData.getIntersect(idList,this.changedOrganization);
-          if(intersect.length == 0) {
-            this.initOrganizationStatus();
+          let intersect = operationData.getIntersect(
+            idList,
+            this.changedOrganization
+          );
+          this.lookedOrganization = operationData.getUnion(
+            this.lookedOrganization,
+            idList
+          );
+          //console.log('全部看过的：',this.lookedOrganization);
+          if (vm.checkTableState.multipleOrganization == "") {
+            if (intersect.length == 0) {
+              this.initOrganizationStatus();
+            }
+          } else if (vm.checkTableState.multipleOrganization == true) {
           }
         }
       });
@@ -1859,6 +1928,16 @@ export default {
       scope = scope.substring(0, scope.length - 1);
       return scope;
     },
+    initPeopleStatus() {
+      let tableStatus = this.tablePerson;
+      tableStatus.forEach(row => {
+        if (row.status == 1) {
+          this.$nextTick(function() {
+            this.$refs.multiplePerson.toggleRowSelection(row);
+          });
+        }
+      });
+    },
     //查询人员列表
     getPeople() {
       let req = {
@@ -1891,6 +1970,14 @@ export default {
           this.tablePerson = res.data.people;
           this.totalPerson = res.data.total;
 
+          let idList = operationData.getIdList(this.tablePerson);
+          let intersect = operationData.getIntersect(
+            idList,
+            this.changedPerson
+          );
+          if (intersect.length == 0) {
+            this.initPeopleStatus();
+          }
         }
       });
     },