From 7369fd5866a78cde7ecbb4721d9decdfa181fd39 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 15:34:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/outemployess.vue | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 89d9c0a..2d87101 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -7,7 +7,7 @@
<h3 class="bu-tian-jia-title">离职员工</h3>
</el-col>
<el-col :span="9" style="margin-top: 15px;">
- <el-input v-model="queryParams.vague" placeholder="请输入内容" style="width:300px" />
+ <el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:300px" />
<span class="search-btn" @click="vagueSearch">查询</span>
<span class="sup-search-btn" @click="advancedQueryShowMethods">高级查询</span>
</el-col>
@@ -226,6 +226,7 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
:cell-style="{padding:'7px 0','text-align':'center'}"
style="width: 100%;color: #000;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="70">
@@ -249,11 +250,11 @@
>编辑</span> -->
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="部门（护卫点）" />
+ <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门（护卫点）" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="60" :formatter="sexFormat" />
<el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
<el-table-column
@@ -272,8 +273,8 @@
:formatter="empTypeFormat"
/>
<el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="130" />
- <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="130" />
+ <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
<template slot-scope="{row}">
{{ transEmpStatus(row.empStatus) }}
@@ -1038,7 +1039,7 @@
<tr>
<td>部门(护卫点)</td>
<td>
- <el-checkbox label="deptName"><span /></el-checkbox>
+ <el-checkbox label="allDeptName"><span /></el-checkbox>
</td>
<td>所属岗位</td>
<td>
@@ -1264,7 +1265,7 @@
archivesStatusOptions: [],
sexOptions: [],
empTypeOptions: [],
- 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', 'empStatusName', 'dimissionDate'],
+ cityOptions: ['archivesNumb', 'allDeptName', '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'],
checkedCities: []
}
},
@@ -1357,7 +1358,7 @@
},
// 翻页方法
search() {
- this.queryParams.vague = ''
+ this.queryParams.baseKey = ''
this.fetch({
...this.queryParams,
...this.sort
@@ -1379,7 +1380,7 @@
},
vagueSearch() {
this.fetch({
- baseKey: this.queryParams.vague
+ baseKey: this.queryParams.baseKey
})
},
transEmpStatus(empStatus) {
@@ -1625,6 +1626,11 @@
})
break
}
+ },
+ changeSort(val) {
+ this.sort.field = val.prop
+ this.sort.order = val.order
+ this.search()
}
}
}
--
Gitblit v1.8.0