From 119cd8bd668a11118ff1bf52b4ca74ba64cf5f9d Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 02 六月 2021 20:58:02 +0800
Subject: [PATCH] fix(员工智搜请假查询): 请假类型增加了全部项查询
---
src/views/user/search.vue | 63 ++++++++++++++++++++-----------
1 files changed, 40 insertions(+), 23 deletions(-)
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index be5f023..0297565 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -565,7 +565,7 @@
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="160" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="220" />
- <el-table-column show-overflow-tooltip prop="sex" label="性别" width="80" :formatter="sexFormat" />
+ <el-table-column show-overflow-tooltip prop="sex" label="性别" width="80" />
<el-table-column show-overflow-tooltip prop="workUnit" label="工作单位" width="220" />
<el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="endDate" label="结束日期" width="150" />
@@ -731,10 +731,16 @@
<el-col :span="9">合同状态：
<el-select v-model="queryParams.contractStatus" style="width:200px">
<el-option value="" label="全部" />
- <el-option :value="1" label="有效" />
- <el-option :value="2" label="到期" />
- <el-option :value="3" label="续签" />
- <el-option :value="4" label="存档" />
+ <!-- <el-option :value="1" label="有效" />-->
+ <!-- <el-option :value="2" label="到期" />-->
+ <!-- <el-option :value="3" label="续签" />-->
+ <!-- <el-option :value="4" label="存档" />-->
+ <el-option
+ v-for="dict in contractStatusOptions"
+ :key="dict.dicItemCode"
+ :label="dict.dicItemName"
+ :value="dict.dicItemCode"
+ />
</el-select>
</el-col>
<el-col :span="6">
@@ -784,6 +790,7 @@
<el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
<el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" width="120" :formatter="contractStatusFormat" />
<el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="180" />
</el-table>
</div>
@@ -923,21 +930,28 @@
</el-col>
<el-col :span="4">请假类型：
<el-select v-model="queryParams.leaveType" style="width:100px">
+ <!-- <el-option value="" label="全部" />-->
+ <!-- <el-option value="05" label="事假" />-->
+ <!-- <el-option value="06" label="病假" />-->
+ <!-- <el-option value="07" label="公假" />-->
+ <!-- <el-option value="08" label="婚假" />-->
+ <!-- <el-option value="09" label="孕假" />-->
+ <!-- <el-option value="10" label="产假" />-->
+ <!-- <el-option value="11" label="陪产假" />-->
+ <!-- <el-option value="12" label="探亲假" />-->
+ <!-- <el-option value="13" label="探配偶假" />-->
+ <!-- <el-option value="14" label="丧假" />-->
+ <!-- <el-option value="15" label="工伤假" />-->
+ <!-- <el-option value="16" label="节育假" />-->
+ <!-- <el-option value="17" label="年休假" />-->
+ <!-- <el-option value="18" label="其它假" />-->
<el-option value="" label="全部" />
- <el-option value="05" label="事假" />
- <el-option value="06" label="病假" />
- <el-option value="07" label="公假" />
- <el-option value="08" label="婚假" />
- <el-option value="09" label="孕假" />
- <el-option value="10" label="产假" />
- <el-option value="11" label="陪产假" />
- <el-option value="12" label="探亲假" />
- <el-option value="13" label="探配偶假" />
- <el-option value="14" label="丧假" />
- <el-option value="15" label="工伤假" />
- <el-option value="16" label="节育假" />
- <el-option value="17" label="年休假" />
- <el-option value="18" label="其它假" />
+ <el-option
+ v-for="dict in leaveTypeOptions"
+ :key="dict.dicItemCode"
+ :label="dict.dicItemName"
+ :value="dict.dicItemCode"
+ />
</el-select>
</el-col>
<el-col :span="6">
@@ -1704,7 +1718,7 @@
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
<el-col :span="4">(部门)护卫点：
- <el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
+ <el-input v-model="queryParams.allDeptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">备注日期：
<el-date-picker
@@ -1908,7 +1922,7 @@
style="width: 350px;"
/>
</el-col>
- <el-col :span="4">离职类型：
+ <el-col :span="4">入离职类型：
<el-select v-model="queryParams.dimissionType" style="width:150px">
<el-option
v-for="dict in dimissionTypeOptions"
@@ -1956,7 +1970,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip prop="newDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="(部门)护卫点" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="newJobName" label="岗位" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
@@ -1993,6 +2007,7 @@
checkAll: false,
total: 0, // 总数量
queryParams: {
+ allDeptName: '',
vague: '',
sex: [],
education: [],
@@ -2008,7 +2023,8 @@
certificateNumb: '',
jobContent: '',
inOutType: [],
- certificateList: []
+ certificateList: [],
+ deptName: ''
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
@@ -2504,6 +2520,7 @@
baseKey: '',
empNumb: '',
empName: '',
+ deptName: '',
certificateNumb: '',
jobContent: '',
inOutType: [],
--
Gitblit v1.8.0