Merge branch '09/26smallFuction' into 11/24SAAS

src/views/categroyManager/insideSetting/branchManager.vue

@@ -5,7 +5,7 @@
       合作单位
     </h2>
     <transition name="el-fade-in-linear">
-    <div class="m-core" v-if="(tableList.length>0 || pageInfo.page>1)&&contextFlag">
+    <div class="m-core" v-if="(tableList.length>0 || pageInfo.page>1)&&contextFlag || !isSearch">
       <!-- 搜索类型 -->
       <save-form
         :inline="true"
@@ -141,7 +141,7 @@
       </div>
     </div>
 
-    <emptyPage @submit="openTeaching('create')" title='合作单位' btnTitle='新建合作单位' :context='context' v-if="!(tableList.length>0 || pageInfo.page>1)&&contextFlag" />
+    <emptyPage @submit="openTeaching('create')" title='合作单位' btnTitle='新建合作单位' :context='context' v-if="!(tableList.length>0 || pageInfo.page>1)&&contextFlag&&isSearch" />
     </transition>
     <el-dialog
       :title="formTitle[formActionTitle]"
@@ -369,6 +369,7 @@ import { Export } from "@/utils/downLoadFile";
 import { getOrganRole } from "@/api/buildTeam";
 import emptyPage from '@/components/emptyPage'
 import qs from "qs";
+import { isBoolean } from '@rongcloud/engine';
 let validPhone = (rule, value, callback) => {
   if (!value) {
     callback(new Error("请输入电话号码"));
@@ -483,6 +484,7 @@ export default {
       this.searchForm = {
         organId: null,
         isEnable: null,
+        search: null,
       };
       this.search();
     },
@@ -671,6 +673,12 @@ export default {
       }
     },
   },
+  computed:{
+    isSearch(){
+
+      return !this.searchForm.search&&!this.searchForm.organId&& !isBoolean(this.searchForm.isEnable)&&!this.searchForm.isEnable
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>