From a5446235a2ddf61c842f79890b78b27440b9a1a1 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 26 二月 2021 02:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/search.vue | 35 ++++++++++-------
src/views/yunpan/fujian.vue | 5 ++
src/views/user/inemployees.vue | 22 ++++++-----
src/views/user/outemployess.vue | 23 ++++++++---
4 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index 8af8bd1..c6a3853 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -187,9 +187,9 @@
<el-table-column prop="nativePlaceName" label="籍贯" />
<el-table-column prop="telePhone" label="联系电话" />
<el-table-column prop="entryDate" label="入职日期" width="100" />
- <el-table-column prop="delFlag" label="员工状态">
+ <el-table-column prop="empStatus" label="员工状态">
<template slot-scope="{row}">
- {{ transDelFlag(row.delFlag) }}
+ {{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
</el-table>
@@ -1773,14 +1773,16 @@
deptName: this.queryParams.vague
})
},
- transDelFlag(delFlag) {
- switch (delFlag) {
- case 0:
- return '正常'
- case 1:
- return '删除'
- case 2:
- return '暂存'
+ transEmpStatus(empStatus) {
+ switch (empStatus) {
+ case '0':
+ return '在职'
+ case '1':
+ return '正常离职'
+ case '2':
+ return '自动离职'
+ case '3':
+ return '公司辞退'
}
},
initDept() {
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index e0e7d42..d32cb1a 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -201,7 +201,7 @@
<el-table-column prop="entryDate" label="入职日期" width="100" />
<el-table-column prop="empStatus" label="员工状态">
<template slot-scope="{row}">
- {{ transDelFlag(row.empStatus) }}
+ {{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
<el-table-column prop="dimissionType" label="离职类型">
@@ -909,7 +909,12 @@
（主要对已退休员工返聘）
</el-form-item>
<el-form-item label="打开日期">
- <el-input v-model="baseicInformationForm.openDate" />
+ <el-date-picker
+ v-model="baseicInformationForm.openDate"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="选择打开日期"
+ />
</el-form-item>
<el-form-item label="备注说明">
<el-input v-model="baseicInformationForm.remark" type="textarea" :rows="4" />
@@ -962,7 +967,9 @@
dialogShowXzyg: false,
dialogShowXzbm: false,
tableData: [],
- baseicInformationForm: {}
+ baseicInformationForm: {
+ openDate: new Date()
+ }
}
},
mounted() {
@@ -997,7 +1004,7 @@
params.pageSize = this.pagination.size
params.pageNum = this.pagination.num
params.delFlag = 0
- params.empStatus = 1
+ params.empStatus = '1,2,3'
this.$get('hr/empBaseInfo/zslist', {
...params
}).then((r) => {
@@ -1013,14 +1020,16 @@
deptName: this.queryParams.vague
})
},
- transDelFlag(empStatus) {
+ transEmpStatus(empStatus) {
switch (empStatus) {
case '0':
return '在职'
case '1':
- return '离职'
+ return '正常离职'
case '2':
- return '退休'
+ return '自动离职'
+ case '3':
+ return '公司辞退'
}
},
transDimissionType(dimissionType) {
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index b9288d6..8425d82 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -217,10 +217,10 @@
</table>
</div>
<el-row style="margin-bottom: 10px;">
- <el-col :span="22">
- <p />
+ <el-col :span="21">
+ 已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
- <el-col :span="2">
+ <el-col :span="3">
<el-button size="mini" class="hr-but" type="success" @click.native="exportExcel">
{{ $t('table.export') }}
</el-button>
@@ -452,7 +452,7 @@
<el-table-column prop="deptName" label="护卫点" width="180" />
<el-table-column prop="jobName" label="岗位" width="180" />
<el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="signingDate" label="合同签订日期" width="180" />
<el-table-column prop="endDate" label="合同结束日期" width="180" />
<el-table-column prop="contractPeriod" label="合同期限(年)" width="180" />
@@ -527,7 +527,7 @@
<el-table-column prop="deptName" label="护卫点" width="180" />
<el-table-column prop="jobName" label="岗位名称" width="180" />
<el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="attendMonth" label="离职考勤月份" width="180" />
<el-table-column prop="attendDays" label="出勤天数" width="180" />
<el-table-column prop="overtimeDay" label="加班（天）" width="180" />
@@ -664,7 +664,7 @@
<el-table-column prop="jobName" label="岗位名" width="180" />
<el-table-column prop="empNumb" label="员工编号" width="180" />
<el-table-column prop="empName" label="员工姓名" width="180" />
- <el-table-column prop="certificateNumb" label="证件号码" width="180" />
+ <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column prop="applayDate" label="辞职申请日期" width="180" />
<el-table-column prop="reason" label="辞职事由" width="180" />
<el-table-column prop="reporter" label="汇报人" width="180" />
@@ -863,8 +863,8 @@
<el-col :span="4">是否住院：
<el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
<el-option value="" label="全部" />
- <el-option value="1" label="是" />
- <el-option value="2" label="否" />
+ <el-option label="未住院" value="0" />
+ <el-option label="已住院" value="1" />
</el-select>
</el-col>
<el-col :span="4">案结状态：
@@ -969,8 +969,8 @@
<el-col :span="4">是否住院：
<el-select v-model="queryParams.hospitalizatioFlag" style="width:100px">
<el-option value="" label="全部" />
- <el-option value="1" label="是" />
- <el-option value="2" label="否" />
+ <el-option label="未住院" value="0" />
+ <el-option label="已住院" value="1" />
</el-select>
</el-col>
<el-col :span="4">案结状态：
@@ -1025,7 +1025,6 @@
{{ transArbitrationStatus(row.settleStatus) }}
</template>
</el-table-column>
- <el-table-column prop="settleDate" label="案结日期" width="180" />
</el-table>
</div>
@@ -1296,7 +1295,7 @@
<el-table-column prop="changeDate" label="调岗日期" />
<el-table-column prop="changeType" label="调岗类型">
<template slot-scope="{row}">
- {{ row.changeType==='3'?'调动':'升职' }}
+ {{ transChangeType(row.changeType) }}
</template>
</el-table-column>
</el-table>
@@ -2123,9 +2122,17 @@
transHospitalizatioFlag(hospitalizatioFlag) {
switch (hospitalizatioFlag) {
case 1:
- return '是'
+ return '已住院'
+ case 0:
+ return '未住院'
+ }
+ },
+ transChangeType(changeType) {
+ switch (changeType) {
case 2:
- return '否'
+ return '升职'
+ case 3:
+ return '调动'
}
}
}
diff --git a/src/views/yunpan/fujian.vue b/src/views/yunpan/fujian.vue
index dc33ae4..82ba8ba 100644
--- a/src/views/yunpan/fujian.vue
+++ b/src/views/yunpan/fujian.vue
@@ -270,6 +270,11 @@
<el-dialog title="附件管理" :visible.sync="dialogShowUploadfj" width="80%" class="fjgl-class" top="10px" @close="closeDialog()">
<uploadfj v-if="dialogShowUploadfj" :rowitem="rowitem" />
</el-dialog>
+ <el-row>
+ <el-col :span="21" style="line-height: 50px;">
+ 已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
+ </el-col>
+ </el-row>
<el-table ref="empAccessoryTable" :data="tableData" class="fj-table" style="width: 100%;color: #000;">
<el-table-column
type="selection"
--
Gitblit v1.8.0