From 1489f11a8575cf4315b5c11a26dc2bf82f737a80 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 09 三月 2021 20:22:04 +0800
Subject: [PATCH] fix(bug修复): 智搜的关键词查询与导出

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

diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index b78adc5..94b6c7c 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -59,7 +59,7 @@
               <br>
             </el-col>
             <el-col :span="7">
-              <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:200px" />
+              <el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:200px" />
               <span class="search-btn" @click="vagueSearch">查询</span>
               <span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
             </el-col>
@@ -401,17 +401,17 @@
                   </td>
                 </tr>
                 <tr>
-                  <td>员工类型</td>
+                  <td>家庭成员及关系</td>
                   <td>
-                    <el-checkbox label=""><span /></el-checkbox>
+                    <el-checkbox label="family"><span /></el-checkbox>
                   </td>
                   <td>员工状态</td>
                   <td>
-                    <el-checkbox label=""><span /></el-checkbox>
+                    <el-checkbox label="empStatusName"><span /></el-checkbox>
                   </td>
                   <td>离职日期</td>
                   <td>
-                    <el-checkbox label=""><span /></el-checkbox>
+                    <el-checkbox label="dimissionDate"><span /></el-checkbox>
                   </td>
                 </tr>
                 <tr>
@@ -455,16 +455,6 @@
                   <td>
                     <el-checkbox label="handbookStatusName"><span /></el-checkbox>
                   </td>
-                </tr>
-                <tr>
-                  <td>家庭成员及关系</td>
-                  <td>
-                    <el-checkbox label="family"><span /></el-checkbox>
-                  </td>
-                  <td />
-                  <td />
-                  <td />
-                  <td />
                 </tr>
               </el-checkbox-group>
             </table>
@@ -1932,7 +1922,7 @@
   },
   data() {
     return {
-      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatus', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family'],
+      cityOptions: ['archivesNumb', 'deptName', 'jobName', 'empName', 'certificateNumb', 'certificateValidity', 'sexName', 'nationName', 'age', 'marriageName', 'stature', 'birthdate', 'politicsName', 'empTypeName', 'educationName', 'nativePlaceName', 'censusAddress', 'currentAddress', 'guardNumb', 'returnReceipt', 'archivesStatusName', 'bankName', 'bankNumb', 'telePhone', 'entryDate', 'InsuranceTypeName', 'socialNumb', 'introducer', 'seniority', 'empCardStatusName', 'certificateList', 'urgencyPhone', 'handbookStatusName', 'family', 'empStatusName', 'dimissionDate'],
       dialogShowDcyg: false,
       isIndeterminate: false,
       checkedCities: [],
@@ -1948,7 +1938,11 @@
         insuranceType: [],
         empStatus: [],
         empType: [],
-        baseKey: ''
+        baseKey: '',
+        empNumb: '',
+        empName: '',
+        certificateNumb: '',
+        jobContent: ''
       }, // 查询参数
       sort: {}, // 排序
       pagination: { // 分页参数
@@ -2432,7 +2426,12 @@
         ageStr: [],
         archivesStatus: [],
         insuranceType: [],
-        empStatus: []
+        empStatus: [],
+        baseKey: '',
+        empNumb: '',
+        empName: '',
+        certificateNumb: '',
+        jobContent: ''
       }
       this.search()
     },
@@ -2456,8 +2455,8 @@
     },
     vagueSearch() {
       this.fetch({
-        baseKey: this.queryParams.vague,
-        delFlag: 0
+        baseKey: this.queryParams.baseKey
+        // delFlag: 0
       })
     },
     dialogIsShow() {

--
Gitblit v1.8.0