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

Dev eduadmin 20190222



See merge request !14

src/views/education/add-manager.vue

@@ -2148,15 +2148,13 @@ export default {
             this.lookedOrganization,
             idList
           );
-          this.changedOrganization2 = operationData.getDifference(
-            this.lookedOrganization,
-            this.changedOrganization
-          );
+
           //console.log('全部看过的：',this.lookedOrganization);
           if (vm.checkTableState.multipleOrganization === "") {
             if (intersect.length == 0) {
               this.initOrganizationStatus();
             }
+            // this.initOrganizationChoose();
           } else if (vm.checkTableState.multipleOrganization === true) {
             let intersect2 = operationData.getIntersect(
               idList,
@@ -2167,6 +2165,10 @@ export default {
               this.$refs.multipleOrganization.toggleAllSelection();
             }
           }
+          // this.changedOrganization2 = operationData.getDifference(
+          //   this.lookedOrganization,
+          //   this.changedOrganization
+          // );
         }
       });
     },
@@ -2508,9 +2510,10 @@ export default {
     updateOrganizationAndPerson(allSelectedKeys) {
       this.tableOrganization = [];
       this.tablePerson = [];
-      // this.lookedOrganization = [];
-      // this.changedOrganization = [];
-      // this.changedOrganization2 = [];
+      this.$refs.multipleOrganization.clearSelection();
+      this.lookedOrganization = [];
+      this.changedOrganization = [];
+      this.changedOrganization2 = [];
       // this.lookedPerson = [];
       // this.changedPerson = [];
       // this.changedPerson2 = [];