From 7fc578dc2032fac935267e92208f7f11384e3800 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 28 十一月 2024 08:36:36 +0800
Subject: [PATCH] 修改了相关bug

---
 ruoyi-ui/src/views/search/index.vue  |   10 +++++++---
 ruoyi-ui/src/views/healthy/index.vue |   10 +++++-----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index ef253a2..c4a7f37 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -20,7 +20,7 @@
       <el-form-item label="鏁戠梾鍖婚櫌" prop="hospital" >
         <el-input
           v-model="queryParams.hospital"
-          placeholder="璇疯緭鍏ュ氨鐥呭尰闄�"
+          placeholder="璇疯緭鍏ユ晳鐥呭尰闄�"
           clearable
           style="width: 200px;
                    height: 35px;
@@ -134,7 +134,7 @@
         <template slot-scope="scope">{{scope.row.checkTime? scope.row.checkTime: '鈥斺�斺�斺��'}}</template>
       </el-table-column>
 
-      <el-table-column label="灏辩梾鍖婚櫌" prop="hospital" sortable width="120" >
+      <el-table-column label="鏁戠梾鍖婚櫌" prop="hospital" sortable width="120" >
 
       </el-table-column>
       <el-table-column label="棰樺悕" prop="title" sortable width="150" />
@@ -214,8 +214,8 @@
         </el-form-item>
 
 
-        <el-form-item label="灏辩梾鍖婚櫌" prop="hospital">
-          <el-input v-model="formDat.hospital" placeholder="璇疯緭鍏ュ氨鐥呭尰闄�" clearable :style="{width: '100%'}" >
+        <el-form-item label="鏁戠梾鍖婚櫌" prop="hospital">
+          <el-input v-model="formDat.hospital" placeholder="璇疯緭鍏ユ晳鐥呭尰闄�" clearable :style="{width: '100%'}" >
           </el-input>
         </el-form-item>
         <el-form-item label="棰樺悕" prop="title">
@@ -468,7 +468,7 @@
 
         hospital: [{
           required: true,
-          message: '璇疯緭鍏ュ氨鐥呭尰闄�',
+          message: '璇疯緭鍏ユ晳鐥呭尰闄�',
           trigger: 'blur'
         }],
         type: [{
diff --git a/ruoyi-ui/src/views/search/index.vue b/ruoyi-ui/src/views/search/index.vue
index 3ce25fe..f99cc28 100644
--- a/ruoyi-ui/src/views/search/index.vue
+++ b/ruoyi-ui/src/views/search/index.vue
@@ -30,7 +30,7 @@
       </el-form-item>
 
       <el-form-item>
-        <el-button size="mini" @click="getList" style=" width: 67px;height: 27px;background: #FFDDE3;
+        <el-button size="mini" @click="handleQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
             border-radius: 7px 7px 7px 7px;opacity: 1; " >鎼滅储</el-button>
         <el-button  size="mini" @click="resetQuery" style=" width: 67px;height: 27px;background: #FFDDE3;
             border-radius: 7px 7px 7px 7px;opacity: 1; ">閲嶇疆</el-button>
@@ -239,13 +239,17 @@
     /** 鎼滅储鎸夐挳鎿嶄綔 */
     handleQuery() {
       this.queryParams.pageNum = 1;
-      this.getList();
+
+	  if(this.keyword!=''||this.dateRange.length!=0)
+		this.getList();
     },
     /** 閲嶇疆鎸夐挳鎿嶄綔 */
     resetQuery() {
       this.dateRange = [];
       this.keyword = '';
-      this.getList();
+	  this.queryParams.pageNum = 1;
+	         this.searchList = []
+     // this.getList();
     },
     // 澶氶�夋閫変腑鏁版嵁
     handleSelectionChange(selection) {

--
Gitblit v1.9.1