Merge remote-tracking branch 'origin/master'

base-manager-ui/admin/src/pages/basicset/dept/department.vue

@@ -357,13 +357,13 @@ export default {
       }
     },
   },
-  // watch: {
-  //   deptSearchVal(newVal) {
-  //     if (newVal === "") {
-  //       this.getDeptListData();
-  //     }
-  //   },
-  // },
+  watch: {
+    deptSearchVal(newVal) {
+      if (newVal === "") {
+        this.getDeptListData();
+      }
+    },
+  },
   // 进入路由前
   beforeRouteEnter(to, from, next) {
     if (from.path === "/department/adddepartment") {
@@ -564,8 +564,10 @@ export default {
       this.getWindowListData();
     },
     // 左边搜索
-    onSearch() {
-      this.getDeptListData();
+    onSearch(val) {
+      if (val != "") {
+        this.getDeptListData();
+      }
     },
     // 右边搜索
     onSearchRight() {