From c71fb9d02dc14f5dc12c2aa478c5ca19213d87a7 Mon Sep 17 00:00:00 2001
From: dai <851733175@qq.com>
Date: Wed, 14 Dec 2022 10:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequ/chaxun.vue | 57 +++++++++++++++++++-----------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index f4876d83c..1a850c53d 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -49,7 +49,7 @@
       </div>
     </div>
 
-    <div class="m-box">
+    <div class="m-box" v-if="searchStatus == 'ing'">
       <div
         class="m-tb"
         v-if="
@@ -60,10 +60,11 @@
       >
         <div class="tb">
           <el-table
+            v-loading="searchJumin.loading"
             :data="searchJumin.list"
             border
             style="width: 100%"
-            class="resi-table"
+            class="div_table_item"
             :max-height="1000"
           >
             <el-table-column
@@ -124,6 +125,7 @@
       >
         <div class="tb">
           <el-table
+            class="div_table_item"
             :data="searchFangwu.list"
             v-loading="searchFangwu.loading"
             border
@@ -201,6 +203,7 @@
       >
         <div class="tb">
           <el-table
+            class="div_table_item"
             :data="searchXuqiu.list"
             v-loading="searchXuqiu.loading"
             border
@@ -260,17 +263,6 @@
           </div>
         </div>
       </div>
-
-      <div
-        class="m-tb"
-        v-if="
-          searchData.type == 'xuqiu' &&
-          searchData.keyword != '' &&
-          searchStatus == 'ing'
-        "
-      >
-        <div class="tb"></div>
-      </div>
     </div>
 
     <people-more
@@ -322,6 +314,7 @@ import peopleMore from "@/views/modules/shequ/cpts/people-more";
 import fangwuInfo from "@/views/modules/shequ/cpts/fangwu-info";
 import xuqiuInfo from "@/views/modules/shequ/cpts/xuqiu-info";
 import scrollNotice from "@/views/modules/shequ/cpts/scroll-notice";
+import getQueryPara from "dai-js/modules/getQueryPara";
 
 export default {
   components: {
@@ -333,6 +326,17 @@ export default {
     scrollNotice,
   },
 
+  props: {
+    type: {
+      type: String,
+      default: "",
+    },
+    keyword: {
+      type: String,
+      default: "",
+    },
+  },
+
   data() {
     return {
       searchStatus: "ini", //ing over
@@ -374,6 +378,7 @@ export default {
       },
 
       searchJumin: {
+        loading: false,
         header: [],
         pageNo: 1,
         pageSize: window.localStorage.getItem("pageSize") || 20,
@@ -382,6 +387,7 @@ export default {
       },
 
       searchFangwu: {
+        loading: false,
         pageNo: 1,
         pageSize: window.localStorage.getItem("pageSize") || 20,
         total: 1,
@@ -389,6 +395,7 @@ export default {
       },
 
       searchXuqiu: {
+        loading: false,
         header: [
           {
             label: "状态",
@@ -577,10 +584,12 @@ export default {
   },
   mounted() {
     this.getApiData();
-    console.log(
-      "dynamicMenuRoutes----------------------------",
-      this.$store.state.sidebarMenuList
-    );
+
+    // const { type, keyword } = query;
+    // console.log("-------type", type, keyword);
+    this.searchData.keyword = getQueryPara("keyword");
+    this.searchData.type = getQueryPara("type");
+    this.handleClickSearchBtn();
   },
   methods: {
     changeCategoryCode({ code }) {
@@ -712,11 +721,11 @@ export default {
     },
 
     getApiData() {
-      this.getFuncList();
-      this.getWarningList();
-      this.getWarningTb();
+      // this.getFuncList();
+      // this.getWarningList();
+      // this.getWarningTb();
       this.getSearchJuminHeader();
-      this.getNoticeList();
+      // this.getNoticeList();
     },
 
     selectFuncItem(id) {
@@ -794,11 +803,13 @@ export default {
         searchData: { keyword },
         searchJumin: { pageSize, pageNo },
       } = this;
+      this.searchJumin.loading = true;
       const { data, code, msg } = await requestPost(url, {
         keyword,
         pageSize,
         pageNo,
       });
+      this.searchJumin.loading = false;
       if (code === 0) {
         console.log("列表请求成功！！！！！！！！！！！！！！");
         this.searchJumin.total = data.total || 0;
@@ -817,11 +828,13 @@ export default {
         searchData: { keyword },
         searchFangwu: { pageSize, pageNo },
       } = this;
+      this.searchFangwu.loading = true;
       const { data, code, msg } = await requestPost(url, {
         keyword,
         pageSize,
         pageNo,
       });
+      this.searchFangwu.loading = false;
       if (code === 0) {
         console.log("列表请求成功！！！！！！！！！！！！！！");
         this.searchFangwu.total = data.total || 0;
@@ -918,6 +931,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/modules/management/list-main.scss";
+
 .m-box {
   position: relative;
   padding: 24px 16px;