From fe57493c734a3d2be03a6f30b91a613cf55dc43a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Mon, 20 Feb 2023 16:56:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=91=98=E5=B7=A5=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui-management-ui/src/styles/index.scss | 15 ++++++--
 .../src/views/sysstaffinfo/yuangongguanli.vue | 38 ++++++++-----------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/anrui-management/anrui-management-ui/src/styles/index.scss b/anrui-management/anrui-management-ui/src/styles/index.scss
index 27872b95c0..735e5ae84d 100644
--- a/anrui-management/anrui-management-ui/src/styles/index.scss
+++ b/anrui-management/anrui-management-ui/src/styles/index.scss
@@ -105,6 +105,7 @@ div:focus {
 .app-container {margin: 5px;
   background-color: #fff;
 }
+.main-content{ overflow-x: hidden;overflow-y: auto;height: calc(100vh - 200px);padding: 0 20px;}
 .listcon{height: calc(100vh - 425px);overflow-y: auto;overflow-x: hidden;}
 .listconadd{height: calc(100vh - 200px);overflow-y: auto;overflow-x: hidden;}
 .listconsub{height: calc(100vh - 310px);overflow-y: auto;overflow-x: hidden;}
@@ -222,9 +223,17 @@ div:focus {
 }
 .titcon .baocun{text-align: right;flex: 2;padding: 5px 20px;}
 .addinputwda{width: 600px;}
-.searchcon{margin: 0px 0 10px 0;}
-.searchcon .searchbtn{margin: 10px 0;}
-
+//.searchcon{margin: 0px 0 10px 0;}
+//.searchcon .searchbtn{margin: 10px 0;}
+.main-content {
+  .searchcon {
+    .searchbtn {
+      margin: 5px 0;
+      border: #2cab69 1px solid;
+      color: #2cab69;
+    }
+  }
+}
 
 
 // 弹出窗口按钮
diff --git a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
index b63133f6e1..6ce921faca 100644
--- a/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
+++ b/anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongguanli.vue
@@ -2,11 +2,11 @@
   <div class="app-container">
     <div v-show="viewState == 1">
       <button-bar ref="btnbar" view-title="员工管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
-      <div class="searchcon">
-        <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? "隐藏查询条件" : "显示藏查询条件" }}</el-button>
-        <div v-show="isSearchShow" class="search">
-          <el-form :inline="true" class="tab-header">
-            <el-row>
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="isSearchShow = !isSearchShow">{{ isSearchShow ? "隐藏查询条件" : "显示藏查询条件" }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" label-width="100px" :model="queryParams" class="tab-header">
               <el-form-item label="员工姓名">
                 <el-input v-model="queryParams.params.name" placeholder="请输入员工姓名" clearable class="addinputw"/>
               </el-form-item>
@@ -26,27 +26,19 @@
                   <el-option v-for="(item) in postSid_list" :key="item.sid" :label="item.name" :value="item.sid"/>
                 </el-select>
               </el-form-item>
-            </el-row>
-            <el-row>
               <el-form-item label="入职日期">
-<!--                <el-date-picker v-model="queryParams.params.joinCompnyDateStart" type="date" class="addinputw" placeholder="选择日期" value-format="yyyy-MM-dd"/>-->
-                <div class="block" style="float: left;">
-                  <el-date-picker v-model="queryParams.params.joinCompnyDateStart" type="date" value-format="yyyy-MM-dd" placeholder="开始日期">
-                  </el-date-picker>
-                </div>
-                <div style="float: left;margin: 0 5px">至</div>
-                <div class="block" style="float: left;">
-                  <el-date-picker v-model="queryParams.params.joinCompnyDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="结束日期">
-                  </el-date-picker>
-                </div>
+                <el-date-picker v-model="queryParams.params.joinCompnyDateStart" type="date" value-format="yyyy-MM-dd" placeholder="开始日期">
+                </el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="queryParams.params.joinCompnyDateEnd" type="date" value-format="yyyy-MM-dd" placeholder="结束日期">
+                </el-date-picker>
               </el-form-item>
-            </el-row>
-            <el-divider/>
-            <div style="text-align: center; position: relative; margin-left: -75px">
-              <el-button type="primary" @click="dosearch">查询</el-button>
-              <el-button type="primary" @click="resetQuery">重置</el-button>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="dosearch">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
             </div>
-          </el-form>
+          </div>
         </div>
       </div>
       <div class="listtop">