From a0bd9c3ae6e274ffa1adfe9466f23d6b1f809322 Mon Sep 17 00:00:00 2001
From: miaojiale <1123971748@qq.com>
Date: Fri, 12 May 2023 11:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/FormComponents/index.vue |  5 ++++-
 src/views/Home/index.vue                | 13 +++++++++----
 src/views/followupquery/index.vue       | 10 ++++++++--
 src/views/screening/index.vue           |  1 +
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/components/FormComponents/index.vue b/src/components/FormComponents/index.vue
index 20413cd..b1c4971 100644
--- a/src/components/FormComponents/index.vue
+++ b/src/components/FormComponents/index.vue
@@ -283,7 +283,7 @@ export default {
     },
 
     // 表单赋值
-    initforms(formEdit) {
+    initforms(formEdit, flag) {
       this.$nextTick(() => {
         const form = {}
         this.forms.forEach((item) => {
@@ -309,6 +309,9 @@ export default {
         if (this.$refs.form && this.$refs.form.clearValidate) {
           this.$refs.form.clearValidate()
         }
+        if (flag) {
+          this.$emit("handleSearch", this.form)
+        }
       })
     },
 
diff --git a/src/views/Home/index.vue b/src/views/Home/index.vue
index c1a4495..0f7b134 100644
--- a/src/views/Home/index.vue
+++ b/src/views/Home/index.vue
@@ -100,7 +100,9 @@
                     }"
                   >
                     <div>{{ index + 1 }}</div>
-                    <div>{{ item.unionName }}</div>
+                    <div class="tooLong">
+                      {{ item.unionName }}
+                    </div>
                     <div>{{ item.nums }}</div>
                   </li>
                 </ul>
@@ -158,7 +160,7 @@
       </div> -->
 
       <!--  科学研究 -->
-      <div class="scientificresearch">
+      <!-- <div class="scientificresearch">
         <div class="title_box">
           <div class="title">科学研究</div>
           <div class="empty"></div>
@@ -177,7 +179,7 @@
             {{ item }}
           </li>
         </ul>
-      </div>
+      </div> -->
       <!-- 粘性定位 -->
       <div v-show="showFixed" class="fixed_box">
         <ul class="f_list">
@@ -430,6 +432,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 #con {
+  .tooLong {
+    white-space: nowrap;
+  }
   .flex {
     height: 100%;
     display: flex;
@@ -599,7 +604,7 @@ export default {
             flex-direction: column;
             flex-wrap: wrap;
             li {
-              width: 40%;
+              width: 46%;
               margin-bottom: 15px;
               display: flex;
               justify-content: space-between;
diff --git a/src/views/followupquery/index.vue b/src/views/followupquery/index.vue
index 07a565e..96db87a 100644
--- a/src/views/followupquery/index.vue
+++ b/src/views/followupquery/index.vue
@@ -310,7 +310,13 @@ export default {
     },
     checkStatus(val) {
       if (val) {
-        this.handleSearch()
+        this.$refs.form.initforms(
+          {
+            checkStatus: val,
+          },
+          true
+        )
+        // this.handleSearch()
       }
     },
   },
@@ -417,7 +423,7 @@ export default {
         ...this.$refs.form.form,
         ...form,
       }
-      params = Object.assign(this.cacheForm, params)
+      // params = Object.assign(this.cacheForm, params)
       for (let key in params) {
         if (params[key] !== "" && params[key] !== null) {
           if (key.includes("Time") && params[key]) {
diff --git a/src/views/screening/index.vue b/src/views/screening/index.vue
index ff327c1..e1adce8 100644
--- a/src/views/screening/index.vue
+++ b/src/views/screening/index.vue
@@ -374,6 +374,7 @@ export default {
         this.initForm = {
           checkStatus: this.$route.query.checkStatus + "",
         }
+        this.cacheForm = {}
         //   console.log(this.searchForm)
         this.handleSearch(this.initForm)
       }
-- 
2.22.0