Merge branch 'dev-eduadmin-20190222' into 'release'

更新搜索后的状态情况



See merge request !16

src/views/education/add-manager.vue

@@ -2051,7 +2051,7 @@ export default {
         //debugger;
         if(intersect.length > 0) {
           //选中
-          this.$refs.multipleOrganization.toggleRowSelection(row);
+          //this.$refs.multipleOrganization.toggleRowSelection(row);
         } else if (intersect2.length > 0) {
           //不选
         } else {
@@ -2156,12 +2156,13 @@ export default {
             idList,
             this.changedOrganization2
           );
-          //debugger;
+          // debugger;
           //console.log('全部看过的：',this.lookedOrganization);
           if (vm.checkTableState.multipleOrganization === "") {
-            if (intersect.length == 0 && difference.length > 0) {
-              this.initOrganizationStatus();
-            }
+            // if (intersect.length == 0 && difference.length > 0) {
+            //   this.initOrganizationStatus();
+            // }
+            this.initOrganizationChoose();
           } else if (vm.checkTableState.multipleOrganization === true) {
             let intersect2 = operationData.getIntersect(
               idList,
@@ -2315,7 +2316,7 @@ export default {
         // debugger;
         if(intersect.length > 0) {
           //选中
-          this.$refs.multiplePerson.toggleRowSelection(row);
+          //this.$refs.multiplePerson.toggleRowSelection(row);
         } else if (intersect2.length > 0) {
           //不选
         } else {
@@ -2392,7 +2393,6 @@ export default {
       });
     },
     initPeopleStatus() {
-      
       let tableStatus = this.tablePerson;
       tableStatus.forEach(row => {
         if (row.status == 1) {
@@ -2453,10 +2453,10 @@ export default {
           );
           //console.log('全部看过的：',this.lookedPerson);
           if (vm.checkTableState.multiplePerson === "") {
-            // console.log('intersect',intersect);
-            if (intersect.length == 0 && difference.length > 0) {
-              this.initPeopleStatus();
-            }
+            // if (intersect.length == 0 && difference.length > 0) {
+            //   this.initPeopleStatus();
+            // }
+            this.initPeopleChoose();
           } else if (vm.checkTableState.multiplePerson === true) {
             let intersect2 = operationData.getIntersect(
               idList,