From 361a3366bc740f94ebea8f81de33bf2a68defaa5 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 15:37:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/search.vue | 675 ++++++++++++++++++++++++++++++++-----------------------
src/views/user/inemployees.vue | 6
src/views/user/outemployess.vue | 2
3 files changed, 399 insertions(+), 284 deletions(-)
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index ab7d082..689fedd 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -193,7 +193,7 @@
style="width: 100%;color: #000;"
>
<el-table-column type="selection" width="55" />
- <el-table-column label="操作" width="120">
+ <el-table-column label="操作" width="130">
<template slot-scope="scope">
<!-- <el-button-->
<!-- type="text"-->
@@ -204,11 +204,11 @@
<!-- <el-button type="text" size="small" @click="editEmpBase(scope.row)">编辑</el-button>-->
<span
- style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
+ style="color: #a00515;display: inline-block;width: 40%;cursor: pointer"
@click="editArchives(scope.row)"
>档案</span>
<span
- style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
+ style="color: #a00515;display: inline-block;width: 40%;cursor: pointer"
@click="editEmpBase(scope.row)"
>编辑</span>
</template>
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 511e620..15352e6 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -202,7 +202,7 @@
<!-- </el-button>-->
<span
- style="color: #a00515;display: inline-block;width: 100%;cursor: pointer"
+ style="color: #a00515;display: inline-block;width: 90%;cursor: pointer"
@click="editArchives(scope.row)"
>档案</span>
<!-- <span
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index 905ea8c..94367b7 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -111,7 +111,7 @@
/>
</el-col>
<el-col :span="8">
- <el-button size="mini" class="hr-but-all" type="primary" @click="search">查询</el-button>
+ <span class="search-btn" @click="search">查询</span>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -268,8 +268,8 @@
{{ transEmpStatus(row.empStatus) }}
</template>
</el-table-column>
- <el-table-column prop="entryDate" label="入职日期" />
- <el-table-column prop="dimissionDate" label="离职日期" />
+ <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" />
+ <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" />
</el-table>
<el-dialog title="导出员工 请勾选需要导出的字段" :visible.sync="dialogShowDcyg" width="40%">
<table id="dcygTable" width="100%">
@@ -468,7 +468,7 @@
<el-input v-model="queryParams.jobContent" size="small" maxlength="18" style="width:140px" />
</el-col>
<el-col :span="3">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -477,12 +477,18 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="gzjlexportExcel">
- 导出EXCEL
+ <el-button class="hr-but" type="success" @click.native="gzjlexportExcel">
+ {{ $t('table.export') }}
</el-button>
</el-col>
</el-row>
- <el-table ref="workExperienceTable" :data="workExperienceData" style="width: 100%;height: 70%;">
+ <el-table
+ ref="workExperienceTable"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :data="workExperienceData"
+ style="width: 100%;height: 70%;"
+ >
<el-table-column type="index" label="序号" width="50" align="center" />
<el-table-column prop="empNumb" label="员工编号" width="100" />
<el-table-column prop="empName" label="姓名" width="100" />
@@ -553,28 +559,34 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="tjexportExcel">
+ <el-button class="hr-but" type="success" @click.native="tjexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="physicalExamTable" :data="physicalExamData" style="width: 100%;height: 70%;">
- <el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="150" />
- <el-table-column prop="jobName" label="岗位" />
- <el-table-column prop="empName" label="姓名" width="100" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="sex" label="性别" width="50" :formatter="sexFormat" />
- <el-table-column prop="hospital" label="体检医院" width="150" />
- <el-table-column prop="physicalExamDate" label="体检日期" width="100" />
- <el-table-column prop="physicalExamType" label="体检类型" :formatter="typeFormat" />
- <el-table-column prop="bloodPressure" label="血压" />
- <el-table-column prop="transaminase" label="转氨酶" />
- <el-table-column prop="ecg" label="心电图" :formatter="ecgNameFormat" />
- <el-table-column prop="conclusion" label="体检结论" />
- <el-table-column prop="reviewRecord" label="复查记录" />
- <el-table-column prop="remark" label="备注" />
+ <el-table
+ ref="physicalExamTable"
+ :data="physicalExamData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
+ <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="150" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
+ <el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="150" />
+ <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" :formatter="typeFormat" />
+ <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" />
+ <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" />
+ <el-table-column show-overflow-tooltip prop="ecg" label="心电图" :formatter="ecgNameFormat" />
+ <el-table-column show-overflow-tooltip prop="conclusion" label="体检结论" />
+ <el-table-column show-overflow-tooltip prop="reviewRecord" label="复查记录" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
</div>
@@ -634,7 +646,7 @@
</el-select>
</el-col>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -643,23 +655,29 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="htexportExcel">
+ <el-button class="hr-but" type="success" @click.native="htexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="contractInfoTable" :data="contractInfoData" style="width: 100%;height: 70%;">
- <el-table-column type="index" label="序号" width="50" align="center" />
- <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="deptName" label="(部门)护卫点" width="180" />
- <!-- <el-table-column prop="jobName" 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" />
- <el-table-column prop="contractStatus" label="合同状态" width="180" :formatter="contractStatusFormat" />
- <el-table-column prop="transactor" label="合同办理人" width="180" />
+ <el-table
+ ref="contractInfoTable"
+ :data="contractInfoData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
+ <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="180" />
+ <!-- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="180" /> -->
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="180" />
+ <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" width="180" :formatter="contractStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="180" />
</el-table>
</div>
@@ -707,7 +725,7 @@
</el-row>
<el-row>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -716,31 +734,37 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="kqexportExcel">
+ <el-button class="hr-but" type="success" @click.native="kqexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="dimissionAttendTable" :data="dimissionAttendData" style="width: 100%;height: 70%;">
- <el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <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="attendMonth" label="离职考勤年月" width="180" />
- <el-table-column prop="attendDays" label="出勤天数" width="180" />
- <el-table-column prop="overtimeDay" label="加班（天）" width="180" />
- <el-table-column prop="overtimeHour" label="加班（小时）" width="180" />
- <el-table-column prop="deduct" label="有无代扣款项" width="180" />
- <el-table-column prop="leaveDay" label="请假（天）" width="180" />
- <el-table-column prop="absenteeism" label="旷工（天）" width="180" />
- <el-table-column prop="remark" label="备注" width="180" />
+ <el-table
+ ref="dimissionAttendTable"
+ :data="dimissionAttendData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
+ <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="180" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="180" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤年月" width="180" />
+ <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="180" />
+ <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="180" />
+ <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="180" />
+ <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="180" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假（天）" width="180" />
+ <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="180" />
- <!-- <el-table-column prop="deptName" label="(部门)护卫点" width="180" />
+ <!-- <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="empName" label="员工姓名" width="180" />
<el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="attendMonth" label="离职考勤月份" width="180" /> -->
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="180" /> -->
</el-table>
</div>
@@ -793,7 +817,7 @@
</el-select>
</el-col>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -802,24 +826,31 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="qjexportExcel">
+ <el-button class="hr-but" type="success" @click.native="qjexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table v-show="showArr[5].show" ref="leaveInfoTable" :data="leaveInfoData" style="width: 100%;height: 70%;">
+ <el-table
+ v-show="showArr[5].show"
+ ref="leaveInfoTable"
+ :data="leaveInfoData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="180" />
- <el-table-column prop="jobName" label="名称" width="100" />
- <el-table-column prop="empName" label="姓名" width="100" />
- <el-table-column prop="beginTime" label="开始时间" width="180" />
- <el-table-column prop="endTime" label="结束时间" width="180" />
- <el-table-column prop="leaveDay" label="请假天数" />
- <el-table-column prop="leaveType" label="请假类型" width="180" :formatter="leaveTypeFormat" />
- <el-table-column prop="returnDate" label="到岗时间" width="180" />
- <el-table-column prop="reporter" label="报备人" width="180" />
- <el-table-column prop="remark" label="备注" width="280" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="180" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="180" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="180" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" />
+ <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="180" :formatter="leaveTypeFormat" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="180" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="280" />
</el-table>
</div>
@@ -856,7 +887,7 @@
<el-input v-model="queryParams.reason" size="small" maxlength="18" style="width:140px" />
</el-col>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -865,22 +896,28 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="czexportExcel">
+ <el-button class="hr-but" type="success" @click.native="czexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="resignTable" :data="resignData" style="width: 100%;height: 70%;">
- <el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="150" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="180" />
- <el-table-column prop="jobName" label="岗位" width="100" />
- <el-table-column prop="empName" label="姓名" width="150" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="applayDate" label="辞职申请日期" width="180" />
- <el-table-column prop="reason" label="辞职事由" width="200" />
- <el-table-column prop="reporter" label="汇报人" width="150" />
- <el-table-column prop="remark" label="备注" width="200" />
+ <el-table
+ ref="resignTable"
+ :data="resignData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
+ <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="150" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="180" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="150" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="200" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="150" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="200" />
</el-table>
</div>
@@ -917,7 +954,7 @@
<el-input v-model="queryParams.applayReason" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -926,23 +963,29 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="syjexportExcel">
+ <el-button class="hr-but" type="success" @click.native="syjexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="unemploymentTable" :data="unemploymentData" style="width: 100%;height: 70%;">
- <el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="120" />
- <el-table-column prop="jobName" label="岗位" width="120" />
- <el-table-column prop="empNumb" label="员工编号" width="150" />
- <el-table-column prop="empName" label="姓名" width="120" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="applayDate" label="失业金申请日期" width="180" />
- <el-table-column prop="applayReason" label="申报事由" width="180" />
- <el-table-column prop="reporter" label="汇报人" width="180" />
- <el-table-column prop="auditor" label="审核人" width="180" />
- <el-table-column prop="remark" label="备注" width="280" />
+ <el-table
+ ref="unemploymentTable"
+ :data="unemploymentData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
+ <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="180" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180" />
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="280" />
</el-table>
</div>
@@ -986,7 +1029,7 @@
</el-select>
</el-col>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -995,24 +1038,30 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="sbexportExcel">
+ <el-button class="hr-but" type="success" @click.native="sbexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="insuranceTable" :data="insuranceData" style="width: 100%;height: 70%;">
- <el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="150" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="150" />
- <el-table-column prop="empName" label="姓名" width="150" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="applayDate" label="社保申请日期" width="150" />
- <el-table-column prop="proposer" label="申请人" />
- <el-table-column prop="insuranceGaers" label="社保档位" width="180" :formatter="insuranceGaersFormat" />
- <el-table-column prop="reportStatus" label="是否已报告" width="100" :formatter="reportStatusFormat" />
- <el-table-column prop="applayStatus" label="状态" width="100" :formatter="applayStatusFormat" />
- <el-table-column prop="auditor" label="审核人" width="180" />
- <el-table-column prop="remark" label="备注" width="280" />
+ <el-table
+ ref="insuranceTable"
+ :data="insuranceData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
+ <el-table-column show-overflow-tooltip type="index" label="序号" width="50" align="center" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="150" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="150" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="proposer" label="申请人" />
+ <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" width="180" :formatter="insuranceGaersFormat" />
+ <el-table-column show-overflow-tooltip prop="reportStatus" label="是否已报告" width="100" :formatter="reportStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="applayStatus" label="状态" width="100" :formatter="applayStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="280" />
</el-table>
</div>
@@ -1078,7 +1127,7 @@
</el-select>
</el-col>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -1087,36 +1136,42 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="ywxexportExcel">
+ <el-button class="hr-but" type="success" @click.native="ywxexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="accidentCasesTable" :data="accidentCasesData" style="width: 100%;height: 70%;">
+ <el-table
+ ref="accidentCasesTable"
+ :data="accidentCasesData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="150" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="120" />
- <el-table-column prop="jobName" label="岗位" width="120" />
- <el-table-column prop="empName" label="姓名" width="120" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="injuredTime" label="受伤日期" width="180" />
- <el-table-column prop="injuredAddress" label="受伤地点" width="180" />
- <el-table-column prop="injuredPart" label="受伤部位" width="180" />
- <el-table-column prop="injuredDescribe" label="受伤经过描述" width="180" />
- <el-table-column prop="injuredDiacrisis" label="意外险诊断" width="180" />
- <el-table-column prop="hospitalName" label="就诊医院" width="180" />
- <el-table-column prop="treatmentName" label="就诊科室" width="180" />
- <el-table-column prop="hospitalizatioFlag" label="是否住院" width="100" :formatter="hospitalizatioFlagFormat" />
- <el-table-column prop="bedNumb" label="床号" />
- <el-table-column prop="reprotTime" label="报案时间" width="150" />
- <el-table-column prop="submitTime" label="递交资料时间" width="150" />
- <el-table-column prop="sbumitBy" label="递交人" width="120" />
- <el-table-column prop="expensesFee" label="医疗总费用" width="180" />
- <el-table-column prop="innsureFee" label="保险赔付费用" width="180" />
- <el-table-column prop="expenseReport" label="保单" width="180" />
- <el-table-column prop="hrDoDate" label="人事处理时间" width="180" />
- <el-table-column prop="settleStatus" label="状态" width="100" :formatter="settleStatusFormat" />
- <el-table-column prop="settleDate" label="结案时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="150" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="180" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="180" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="180" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="100" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" />
+ <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="120" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="180" />
+ <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="180" />
+ <el-table-column show-overflow-tooltip prop="expenseReport" label="保单" width="180" />
+ <el-table-column show-overflow-tooltip prop="hrDoDate" label="人事处理时间" width="180" />
+ <el-table-column show-overflow-tooltip prop="settleStatus" label="状态" width="100" :formatter="settleStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="结案时间" width="150" />
</el-table>
</div>
@@ -1185,7 +1240,7 @@
</el-select>
</el-col>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -1194,35 +1249,41 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="gsexportExcel">
+ <el-button class="hr-but" type="success" @click.native="gsexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="occupationalTable" :data="occupationalData" style="width: 100%;height: 70%;">
+ <el-table
+ ref="occupationalTable"
+ :data="occupationalData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="150" />
- <el-table-column prop="jobName" label="岗位" width="150" />
- <el-table-column prop="empName" label="姓名" width="150" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="injuredTime" label="受伤日期" width="180" />
- <el-table-column prop="injuredAddress" label="受伤地点" width="180" />
- <el-table-column prop="injuredPart" label="受伤部位" width="180" />
- <el-table-column prop="injuredDescribe" label="受伤经过描述" width="180" />
- <el-table-column prop="injuredDiacrisis" label="工伤诊断" width="180" />
- <el-table-column prop="hospitalName" label="就诊医院" width="180" />
- <el-table-column prop="treatmentName" label="就诊科室" width="180" />
- <el-table-column prop="hospitalizatioFlag" label="是否住院" width="100" :formatter="hospitalizatioFlagFormat" />
- <el-table-column prop="bedNumb" label="床号" width="100" />
- <el-table-column prop="reportTime" label="报案时间" width="150" />
- <el-table-column prop="submitTime" label="递交资料时间" width="150" />
- <el-table-column prop="sbumitBy" label="递交人" width="180" />
- <el-table-column prop="expensesFee" label="医疗总费用" width="100" />
- <el-table-column prop="innsureFee" label="保险赔付费用" width="100" />
- <el-table-column prop="hrDoDate" label="人事处理时间" width="150" />
- <el-table-column prop="settleStatus" label="状态" width="100" :formatter="settleStatusFormat" />
- <el-table-column prop="settleDate" label="结案时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="150" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="150" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="180" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="180" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="180" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="180" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="100" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="100" />
+ <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="180" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+ <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="100" />
+ <el-table-column show-overflow-tooltip prop="hrDoDate" label="人事处理时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="settleStatus" label="状态" width="100" :formatter="settleStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="结案时间" width="150" />
</el-table>
</div>
@@ -1279,7 +1340,7 @@
</el-select>
</el-col>
<el-col :span="4">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -1295,20 +1356,40 @@
</el-row>
<el-table ref="laborTroubleTable" :data="laborTroubleData" style="width: 100%;height: 70%;">
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="150" />
- <el-table-column prop="empName" label="姓名" width="150" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="arbitrationDate" label="仲裁日期" width="150" />
- <el-table-column prop="arbitrationType" label="仲裁类型" width="150" :formatter="arbitrationTypeFormat" />
- <el-table-column prop="arbitrationReason" label="仲裁事由" width="150" />
- <el-table-column prop="reporter" label="汇报人" width="150" />
- <el-table-column prop="remark" label="备注" width="200" />
- <el-table-column prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
- <el-table-column prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
- <el-table-column prop="settleDate" label="案结日期" width="150" />
- </el-table>
- </div>
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="150" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" width="150" :formatter="arbitrationTypeFormat" />
+ <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" width="150" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="150" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="200" />
+ <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
+ <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="150" />
+ <el-table
+ ref="laborTroubleTable"
+ :data="laborTroubleData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
+ <el-table-column show-overflow-tooltip="true" type="index" label="序号" width="50" align="center" />
+ <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="150" />
+ <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="150" />
+ <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip="true" prop="arbitrationDate" label="仲裁日期" width="150" />
+ <el-table-column show-overflow-tooltip="true" prop="arbitrationType" label="仲裁类型" width="150" :formatter="arbitrationTypeFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="arbitrationReason" label="仲裁事由" width="150" />
+ <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="150" />
+ <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" width="200" />
+ <el-table-column show-overflow-tooltip="true" prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="arbitrationStatus" label="状态" width="100" :formatter="arbitrationStatusFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="settleDate" label="案结日期" width="150" />
+ </el-table>
+ </el-table></div>
<div v-show="showArr[12].show">
<el-row>
@@ -1343,7 +1424,7 @@
<el-input v-model="queryParams.badContent" size="small" maxlength="18" style="width:140px" />
</el-col>
<el-col :span="3.5">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -1359,16 +1440,32 @@
</el-row>
<el-table ref="badRecordTable" :data="badRecordData" style="width: 100%;height: 70%;">
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="140" />
- <el-table-column prop="empName" label="姓名" width="140" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column prop="badDate" label="不良记录日期" width="140" />
- <el-table-column prop="badContent" label="不良记录描述" width="280" />
- <el-table-column prop="reporter" label="汇报人" width="100" />
- <el-table-column prop="remark" label="备注" width="280" />
- </el-table>
- </div>
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="140" />
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" width="280" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="280" />
+ <el-table
+ ref="badRecordTable"
+ :data="badRecordData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
+ <el-table-column show-overflow-tooltip="true" type="index" label="序号" width="50" align="center" />
+ <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="140" />
+ <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="140" />
+ <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip="true" prop="badDate" label="不良记录日期" width="140" />
+ <el-table-column show-overflow-tooltip="true" prop="badContent" label="不良记录描述" width="280" />
+ <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" width="280" />
+ </el-table>
+ </el-table></div>
<div v-show="showArr[13].show">
<el-row>
@@ -1403,7 +1500,7 @@
<el-input v-model="queryParams.remarkContent" size="small" maxlength="18" style="width:140px" />
</el-col>
<el-col :span="3.5">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -1417,14 +1514,20 @@
</el-button>
</el-col>
</el-row>
- <el-table ref="remarkInfoTable" :data="remarkInfoData" style="width: 100%;height: 70%;">
+ <el-table
+ ref="remarkInfoTable"
+ :data="remarkInfoData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="deptName" label="(部门)护卫点" width="140" />
- <el-table-column prop="jobName" label="岗位" width="140" />
- <el-table-column prop="empName" label="姓名" width="140" />
- <el-table-column prop="remarkDate" label="备注日期" width="180" />
- <el-table-column prop="remarkContent" label="备注信息" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" width="140" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="140" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="140" />
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
</el-table>
</div>
<div v-show="showArr[14].show">
@@ -1469,7 +1572,7 @@
</el-select>
</el-col>
<el-col :span="6">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -1478,23 +1581,29 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="tgexportExcel">
+ <el-button class="hr-but" type="success" @click.native="tgexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="jobChangeTable" :data="jobChangeData" style="width: 100%;height: 70%;">
+ <el-table
+ ref="jobChangeTable"
+ :data="jobChangeData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
<el-table-column type="selection" width="55" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <!-- <el-table-column prop="certificateNumb" label="身份证号码" width="180" /> -->
- <el-table-column prop="newDeptName" label="现部门" />
- <el-table-column prop="newJobName" label="现岗位" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="oldDeptName" label="原部门" />
- <el-table-column prop="oldJobName" label="原岗位" />
- <el-table-column prop="changeDate" label="调岗日期" />
- <el-table-column prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
- <el-table-column prop="changeReason" label="调岗理由描述" width="380" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <!-- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" /> -->
+ <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
+ <el-table-column show-overflow-tooltip prop="newJobName" label="现岗位" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
+ <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门" />
+ <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位" />
+ <el-table-column show-overflow-tooltip prop="changeDate" label="调岗日期" />
+ <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
+ <el-table-column show-overflow-tooltip prop="changeReason" label="调岗理由描述" width="380" />
</el-table>
</div>
<div v-show="showArr[15].show">
@@ -1552,7 +1661,7 @@
</el-select>
</el-col>
<el-col :span="3.5">
- <el-button size="mini" class="danger" type="danger" @click="search">查询</el-button>
+ <el-button size="mini" class="hr-but-all" type="danger" @click="search">查询</el-button>
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
@@ -1561,22 +1670,28 @@
已为您搜索出<span style="color:red">{{ total }}</span>条符合条件的记录
</el-col>
<el-col :span="3">
- <el-button class="filter-item" type="success" @click.native="rlzexportExcel">
+ <el-button class="hr-but" type="success" @click.native="rlzexportExcel">
导出EXCEL
</el-button>
</el-col>
</el-row>
- <el-table ref="dimissionLogTable" :data="dimissionLogData" style="width: 100%;height: 70%;">
+ <el-table
+ ref="dimissionLogTable"
+ :data="dimissionLogData"
+ stripe
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ style="width: 100%;height: 70%;"
+ >
<el-table-column type="selection" width="55" />
- <el-table-column prop="newDeptName" label="(部门)护卫点" width="180" />
- <el-table-column prop="newJobName" label="岗位" />
- <el-table-column prop="empNumb" label="员工编号" width="180" />
- <el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="entryDate" label="入职日期" />
- <el-table-column prop="dimissionDate" label="离职日期" />
- <el-table-column prop="selfLeaveDay" label="自离天数" />
- <el-table-column prop="reporter" label="报告人" />
- <el-table-column prop="remark" label="备注" width="280" />
+ <el-table-column show-overflow-tooltip prop="newDeptName" label="(部门)护卫点" width="180" />
+ <el-table-column show-overflow-tooltip prop="newJobName" label="岗位" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" />
+ <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" />
+ <el-table-column show-overflow-tooltip prop="selfLeaveDay" label="自离天数" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报告人" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" width="280" />
</el-table>
</div>
<pagination
@@ -2546,28 +2661,28 @@
</script>
<style lang="scss">
-.fj-checkbox{
- .el-checkbox__input.is-checked .el-checkbox__inner {
+ .fj-checkbox{
+ .el-checkbox__input.is-checked .el-checkbox__inner {
border-color: #a32c30;;
background: #a32c30;;
+ }
+ .el-checkbox__label {
+ color: #000 !important;
+ }
}
- .el-checkbox__label {
- color: #000 !important;
- }
-}
</style>
<style lang="scss" scoped>
-#dcygTable {
- border-collapse: collapse;
-}
+ #dcygTable {
+ border-collapse: collapse;
+ }
-#dcygTable td {
- width: 130px;
- text-align: center;
- border: 1px solid darkgray;
- height: 30px;
- font-size: 15px;
-}
+ #dcygTable td {
+ width: 130px;
+ text-align: center;
+ border: 1px solid darkgray;
+ height: 30px;
+ font-size: 15px;
+ }
.el-container {
height: 86.7vh;
background-color: white;
@@ -2590,22 +2705,22 @@
}
}
- .searchTable {
- margin-top: 10px;
- border-collapse: collapse;
- width: 100%;
- tr {
- border-bottom: 1px dashed #d9dadb;
- }
+ .searchTable {
+ margin-top: 10px;
+ border-collapse: collapse;
+ width: 100%;
+ tr {
+ border-bottom: 1px dashed #d9dadb;
+ }
- .td {
- width: 90px;
- text-align: right;
+ .td {
+ width: 90px;
+ text-align: right;
+ }
+ .td-group {
+ padding-left: 20px;
+ }
}
- .td-group {
- padding-left: 20px;
- }
-}
.searchTable td,
.searchTable th {
@@ -2663,31 +2778,31 @@
width: 100%;
}
-.search-btn {
- display: inline-block;
- width: 3.64vw;
- height: 3.2vh;
- line-height: 3.2vh;
- text-align: center;
- background-color: #a00515;
- color: #fff;
- margin-left: 1vw;
- box-sizing: border-box;
- cursor: pointer;
- vertical-align: middle;
-}
+ .search-btn {
+ display: inline-block;
+ width: 3.64vw;
+ height: 3.2vh;
+ line-height: 3.2vh;
+ text-align: center;
+ background-color: #a00515;
+ color: #fff;
+ margin-left: 1vw;
+ box-sizing: border-box;
+ cursor: pointer;
+ vertical-align: middle;
+ }
-.sup-search-btn {
- display: inline-block;
- width: 5.2vw;
- height: 3.2vh;
- line-height: 3.2vh;
- text-align: center;
- margin-left: 1vw;
- color: #a00515;
- border: 1px solid #a00515;
- box-sizing: border-box;
- cursor: pointer;
- vertical-align: middle;
-}
+ .sup-search-btn {
+ display: inline-block;
+ width: 5.2vw;
+ height: 3.2vh;
+ line-height: 3.2vh;
+ text-align: center;
+ margin-left: 1vw;
+ color: #a00515;
+ border: 1px solid #a00515;
+ box-sizing: border-box;
+ cursor: pointer;
+ vertical-align: middle;
+ }
</style>
--
Gitblit v1.8.0