From b2b9bc40c27157534e66aa60acce0495e2c37766 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期三, 24 二月 2021 20:07:14 +0800
Subject: [PATCH] 档案,以及首页bug的修改

---
 src/views/user/search.vue |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 182bc06..a14182d 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -110,9 +110,12 @@
                   style="width: 400px;"
                 />
               </el-col>
-              <el-col :span="3">
-                <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-col :span="8">
+                <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
                 <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
+                <el-button size="mini" class="hr-but" type="success" @click.native="exportExcel">
+                  {{ $t('table.export') }}
+                </el-button>
               </el-col>
             </el-row>
             <table class="searchTable">
@@ -216,17 +219,6 @@
               </tr>
             </table>
           </div>
-          <br>
-          <el-row>
-            <el-col :span="21" style="line-height: 50px;">
-              已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
-            </el-col>
-            <el-col :span="3">
-              <el-button class="filter-item" type="success" @click.native="exportExcel">
-                {{ $t('table.export') }}
-              </el-button>
-            </el-col>
-          </el-row>
           <el-table ref="empBaseInfoTable" :data="basicInformationData" style="width: 100%;height: 70%;">
             <el-table-column type="index" label="序号" width="50" align="center" />
             <el-table-column prop="empNumb" label="员工编号" />
@@ -336,7 +328,7 @@
               <el-input v-model="queryParams.conclusion" size="small" maxlength="20" style="width:100px" />
             </el-col>
             <el-col :span="3">
-              <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+              <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
               <el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
             </el-col>
           </el-row>

--
Gitblit v1.8.0