From 77e2acfbd772e5fb173114874c48a7a5e6f753d0 Mon Sep 17 00:00:00 2001
From: yz_08 <yz_0812@outlook.com>
Date: 星期五, 05 三月 2021 15:04:29 +0800
Subject: [PATCH] 修改bug
---
src/views/dashboard/qjUser.vue | 26 +-
src/views/dashboard/ywUser.vue | 40 ++--
src/views/dashboard/cqUser.vue | 28 +-
src/views/dashboard/blUser.vue | 20 +-
src/views/dashboard/sbUser.vue | 26 +-
src/views/dashboard/tgUser.vue | 26 +-
src/views/user/search.vue | 130 ++++++++-----
src/views/dashboard/yjUser.vue | 22 +-
src/views/yunpan/fujian.vue | 2
src/views/dashboard/sfzUser.vue | 16
src/views/dashboard/ygUser.vue | 38 ++--
src/views/dashboard/HtUser.vue | 22 +-
src/views/dashboard/gsUser.vue | 42 ++--
src/views/yunpan/zhishou.vue | 2
src/views/dashboard/onTheJobUser.vue | 26 +-
src/views/dashboard/tjUser.vue | 30 +-
16 files changed, 261 insertions(+), 235 deletions(-)
diff --git a/src/views/dashboard/HtUser.vue b/src/views/dashboard/HtUser.vue
index 9671b73..26c94fd 100644
--- a/src/views/dashboard/HtUser.vue
+++ b/src/views/dashboard/HtUser.vue
@@ -26,17 +26,17 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" 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="contractStatus" label="合同状态" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="signingDate" label="合同签订日期" />
- <el-table-column show-overflow-tooltip="true" prop="beginDate" label="开始日期" />
- <el-table-column show-overflow-tooltip="true" prop="endDate" label="结束日期" />
- <el-table-column show-overflow-tooltip="true" prop="contractPeriod" label="合同期限(年)" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="transactor" label="办理人" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" width="100" />
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
+ <el-table-column show-overflow-tooltip prop="beginDate" label="开始日期" />
+ <el-table-column show-overflow-tooltip prop="endDate" label="结束日期" />
+ <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
+ <el-table-column show-overflow-tooltip prop="transactor" label="办理人" width="100" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/blUser.vue b/src/views/dashboard/blUser.vue
index 5a54fad..4b322f9 100644
--- a/src/views/dashboard/blUser.vue
+++ b/src/views/dashboard/blUser.vue
@@ -26,16 +26,16 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <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="badDate" label="不良记录日期" />
- <el-table-column show-overflow-tooltip="true" prop="badContent" label="不良记录描述" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <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="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" />
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/cqUser.vue b/src/views/dashboard/cqUser.vue
index 128085e..d700c59 100644
--- a/src/views/dashboard/cqUser.vue
+++ b/src/views/dashboard/cqUser.vue
@@ -27,20 +27,20 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位名称" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="证件号码" />
- <el-table-column show-overflow-tooltip="true" prop="attendMonth" label="离职考勤月份" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班（天）" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班（小时）" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="deduct" label="有无代扣款项" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假（天）" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工（天）" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
+ <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
+ <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="100" />
+ <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="120" />
+ <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="120" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假（天）" width="100" />
+ <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/gsUser.vue b/src/views/dashboard/gsUser.vue
index f488ee6..bd5e9f9 100644
--- a/src/views/dashboard/gsUser.vue
+++ b/src/views/dashboard/gsUser.vue
@@ -26,27 +26,27 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" />
- <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="工伤诊断" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" :formatter="hospitalizatioFlagFormat" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="案结状态" width="60" :formatter="settleStatusFormat" />
- <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="reportTime" label="报案时间" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="compensated" label="已赔付医药费用" width="80" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="80" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="60" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="60" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="60" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" :formatter="hospitalizatioFlagFormat" width="60" />
+ <el-table-column show-overflow-tooltip prop="settleStatus" label="案结状态" width="60" :formatter="settleStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+ <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="80" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="80" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="80" />
+ <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="80" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/onTheJobUser.vue b/src/views/dashboard/onTheJobUser.vue
index 748dbfd..2081972 100644
--- a/src/views/dashboard/onTheJobUser.vue
+++ b/src/views/dashboard/onTheJobUser.vue
@@ -27,19 +27,19 @@
style="width: 100%;"
>
<el-table-column type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <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="sex" :formatter="sexFormat" label="性别" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="education" :formatter="educationFormat" label="最高学历" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empType" :formatter="empTypeFormat" label="员工类别" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" />
- <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" />
- <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="100">
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <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="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="100" />
+ <el-table-column show-overflow-tooltip prop="age" label="年龄" width="100" />
+ <el-table-column show-overflow-tooltip prop="education" :formatter="educationFormat" label="最高学历" width="100" />
+ <el-table-column show-overflow-tooltip prop="empType" :formatter="empTypeFormat" label="员工类别" width="100" />
+ <el-table-column show-overflow-tooltip prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="100" />
+ <el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" />
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="100">
<template slot-scope="scope">
<span>{{ gzdStateList[scope.row.empStatus] }} </span>
</template>
diff --git a/src/views/dashboard/qjUser.vue b/src/views/dashboard/qjUser.vue
index 4bd2f5b..675c215 100644
--- a/src/views/dashboard/qjUser.vue
+++ b/src/views/dashboard/qjUser.vue
@@ -27,19 +27,19 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位名称" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="证件号码" />
- <el-table-column show-overflow-tooltip="true" prop="beginTime" label="开始时间" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="endTime" label="结束时间" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假天数" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="leaveType" label="请假类型" width="100" :formatter="leaveTypeFormat" />
- <el-table-column show-overflow-tooltip="true" prop="returnDate" label="到岗时间" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="100" />
+ <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="100" :formatter="leaveTypeFormat" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/sbUser.vue b/src/views/dashboard/sbUser.vue
index 669c18d..1b7cd1a 100644
--- a/src/views/dashboard/sbUser.vue
+++ b/src/views/dashboard/sbUser.vue
@@ -26,19 +26,19 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <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="applayDate" label="社保申请日期" />
- <el-table-column show-overflow-tooltip="true" prop="proposer" label="申请人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="insuranceGaers" :formatter="insuranceGaersFormat" label="社保档位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="reportStatus" :formatter="reportStatusFormat" label="是否已报告" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="applayStatus" :formatter="applayStatusFormat" label="状态" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="auditor" label="审核人" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <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="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
+ <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="100" />
+ <el-table-column show-overflow-tooltip prop="insuranceGaers" :formatter="insuranceGaersFormat" label="社保档位" width="100" />
+ <el-table-column show-overflow-tooltip prop="reportStatus" :formatter="reportStatusFormat" label="是否已报告" width="100" />
+ <el-table-column show-overflow-tooltip prop="applayStatus" :formatter="applayStatusFormat" label="状态" width="80" />
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="80" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/sfzUser.vue b/src/views/dashboard/sfzUser.vue
index be3fab9..c11b18e 100644
--- a/src/views/dashboard/sfzUser.vue
+++ b/src/views/dashboard/sfzUser.vue
@@ -26,14 +26,14 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="certificateValidity" label="身份证有效期" />
- <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="150">
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <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="jobName" label="岗位" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="150" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="certificateValidity" label="身份证有效期" />
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="150">
<template slot-scope="scope">
<span>{{ gzdStateList[scope.row.empStatus] }} </span>
</template>
diff --git a/src/views/dashboard/tgUser.vue b/src/views/dashboard/tgUser.vue
index 930fe50..7ea87e6 100644
--- a/src/views/dashboard/tgUser.vue
+++ b/src/views/dashboard/tgUser.vue
@@ -26,19 +26,19 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" 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="oldDeptName" label="原护卫点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="oldJobName" label="原岗位名称" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="newDeptName" label="新护卫点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="newJobName" label="新岗位名称" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="证件号码" />
- <el-table-column show-overflow-tooltip="true" prop="changeType" :formatter="changeTypeFormat" label="调岗类型" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="changeDate" label="调岗位日期" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="changeReason" label="调岗原因" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="oldDeptName" label="原护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="newDeptName" label="新护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="newJobName" label="新岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="证件号码" />
+ <el-table-column show-overflow-tooltip prop="changeType" :formatter="changeTypeFormat" label="调岗类型" width="100" />
+ <el-table-column show-overflow-tooltip prop="changeDate" label="调岗位日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="changeReason" label="调岗原因" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/tjUser.vue b/src/views/dashboard/tjUser.vue
index a45951e..44b5d7c 100644
--- a/src/views/dashboard/tjUser.vue
+++ b/src/views/dashboard/tjUser.vue
@@ -26,21 +26,21 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" 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="jobName" label="岗位" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="physicalExamType" :formatter="typeFormat" label="体检类型" />
- <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="conclusion" label="体检结论" />
- <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="100" />
+ <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="physicalExamType" :formatter="typeFormat" label="体检类型" />
+ <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="80" />
+ <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
+ <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="80" />
+ <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>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/ygUser.vue b/src/views/dashboard/ygUser.vue
index 7b5f9b6..99d4352 100644
--- a/src/views/dashboard/ygUser.vue
+++ b/src/views/dashboard/ygUser.vue
@@ -26,29 +26,29 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="80 " />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="sex" :formatter="sexFormat" label="性别" width="50" />
- <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="50" />
- <el-table-column show-overflow-tooltip="true" prop="education" :formatter="educationFormat" label="最高学历" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="empType" :formatter="empTypeFormat" label="员工类别" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="50">
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80 " />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="50" />
+ <el-table-column show-overflow-tooltip prop="age" label="年龄" width="50" />
+ <el-table-column show-overflow-tooltip prop="education" :formatter="educationFormat" label="最高学历" width="60" />
+ <el-table-column show-overflow-tooltip prop="empType" :formatter="empTypeFormat" label="员工类别" width="60" />
+ <el-table-column show-overflow-tooltip prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="60" />
+ <el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="80" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="80" />
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="50">
<template slot-scope="scope">
<span>{{ gzdStateList[scope.row.empStatus] }} </span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="dimissionTypeName" label="离职类别" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="applayDate" label="辞职申请日期" />
- <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="60" />
+ <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" width="80" />
+ <el-table-column show-overflow-tooltip prop="dimissionTypeName" label="离职类别" width="60" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" />
+ <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="60" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="60" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/yjUser.vue b/src/views/dashboard/yjUser.vue
index f251628..3ef5dca 100644
--- a/src/views/dashboard/yjUser.vue
+++ b/src/views/dashboard/yjUser.vue
@@ -26,17 +26,17 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <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="applayDate" label="失业金申请日期" />
- <el-table-column show-overflow-tooltip="true" prop="applayReason" label="申报事由" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="auditor" label="审核人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <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="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" />
+ <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/ywUser.vue b/src/views/dashboard/ywUser.vue
index 5814787..4b04447 100644
--- a/src/views/dashboard/ywUser.vue
+++ b/src/views/dashboard/ywUser.vue
@@ -26,27 +26,27 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="selection" :reserve-selection="false" width="55" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位名称" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="意外险诊断" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="50" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="55" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="80" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="60" />
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="60" />
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="80" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="60" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="60" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="50" :formatter="hospitalizatioFlagFormat" />
<el-table-column prop="settleStatus" label="案结状态" width="180" :formatter="settleStatusFormat" />
- <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="reprotTime" label="报案时间" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="innsureFee" label="保险赔付费用" width="80" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+ <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="80" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="80" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="80" />
+ <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="80" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/user/search.vue b/src/views/user/search.vue
index b134ec3..905ea8c 100644
--- a/src/views/user/search.vue
+++ b/src/views/user/search.vue
@@ -75,7 +75,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">入职日期：
@@ -217,6 +217,21 @@
</el-checkbox-group>
</td>
</tr>
+ <tr>
+ <td class="td">员工类型：</td>
+ <td class="td-group">
+ <el-checkbox-group v-model="queryParams.empType" class="fj-checkbox">
+ <el-checkbox label="" @change="selectAllEmpType">全部</el-checkbox>
+ <el-checkbox
+ v-for="data in empTypeOptions"
+ :key="data.dicItemName"
+ :label="data.dicItemCode"
+ >
+ {{ data.dicItemName }}
+ </el-checkbox>
+ </el-checkbox-group>
+ </td>
+ </tr>
</table>
</div>
<el-row style="margin-bottom: 10px;">
@@ -225,7 +240,7 @@
</el-col>
<el-col :span="3" style="text-align: right;padding-right: 10px">
<el-button size="mini" class="hr-but" type="success" @click.native="showDcyg(0)">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</el-row>
@@ -238,7 +253,7 @@
>
<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="护卫点" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="(部门)护卫点" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
@@ -246,6 +261,7 @@
<el-table-column show-overflow-tooltip prop="age" label="年龄" width="50" />
<el-table-column show-overflow-tooltip prop="education" label="学历" :formatter="educationFormat" />
<el-table-column show-overflow-tooltip prop="nativePlace" label="籍贯" :formatter="nativePlaceFormat" />
+ <el-table-column show-overflow-tooltip prop="empType" label="员工类型" :formatter="empTypeFormat" />
<el-table-column show-overflow-tooltip prop="telePhone" label="电话" />
<el-table-column show-overflow-tooltip prop="empStatus" label="员工状态">
<template slot-scope="{row}">
@@ -462,14 +478,14 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="gzjlexportExcel">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</el-row>
<el-table ref="workExperienceTable" :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" />
+ <el-table-column prop="empName" label="姓名" width="100" />
<el-table-column prop="certificateNumb" label="身份证号码" width="170" />
<el-table-column prop="sex" label="性别" width="50" :formatter="sexFormat" />
<el-table-column prop="workUnit" label="工作单位" width="220" />
@@ -490,7 +506,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">体检日期：
@@ -538,16 +554,16 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="tjexportExcel">
- {{ $t('table.export') }}
+ 导出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="deptName" label="(部门)护卫点" width="150" />
<el-table-column prop="jobName" label="岗位" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
+ <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" />
@@ -573,7 +589,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">合同签订日期：
@@ -628,16 +644,16 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="htexportExcel">
- {{ $t('table.export') }}
+ 导出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="empName" label="姓名" width="180" />
<el-table-column prop="certificateNumb" 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="signingDate" label="合同签订日期" width="180" />
<el-table-column prop="endDate" label="合同结束日期" width="180" />
@@ -658,7 +674,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="2.5">考勤年月
@@ -701,13 +717,15 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="kqexportExcel">
- {{ $t('table.export') }}
+ 导出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" />
@@ -718,9 +736,9 @@
<el-table-column prop="absenteeism" label="旷工（天）" width="180" />
<el-table-column 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>
@@ -737,7 +755,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="8">请假日期：
@@ -785,14 +803,14 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="qjexportExcel">
- {{ $t('table.export') }}
+ 导出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-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="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" />
@@ -816,7 +834,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">辞职申请日期：
@@ -848,16 +866,16 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="czexportExcel">
- {{ $t('table.export') }}
+ 导出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="deptName" label="(部门)护卫点" width="180" />
<el-table-column prop="jobName" label="岗位" width="100" />
- <el-table-column prop="empName" 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="180" />
<el-table-column prop="reason" label="辞职事由" width="200" />
@@ -877,7 +895,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">失业金领取日期：
@@ -909,13 +927,13 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="syjexportExcel">
- {{ $t('table.export') }}
+ 导出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="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" />
@@ -939,7 +957,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">社保申请日期：
@@ -978,16 +996,16 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="sbexportExcel">
- {{ $t('table.export') }}
+ 导出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="deptName" label="护卫点" width="150" />
<el-table-column prop="applayDate" label="社保申请日期" width="150" />
<el-table-column prop="proposer" label="申请人" />
<el-table-column prop="insuranceGaers" label="社保档位" width="180" :formatter="insuranceGaersFormat" />
@@ -1009,7 +1027,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">受伤日期：
@@ -1070,14 +1088,14 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="ywxexportExcel">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</el-row>
<el-table ref="accidentCasesTable" :data="accidentCasesData" 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="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" />
@@ -1113,7 +1131,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">受伤日期：
@@ -1177,15 +1195,15 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="gsexportExcel">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</el-row>
<el-table ref="occupationalTable" :data="occupationalData" style="width: 100%;height: 70%;">
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="deptName" label="护卫点" width="150" />
- <el-table-column prop="jobName" label="岗位" width="150" />
<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" />
@@ -1219,7 +1237,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">仲裁日期：
@@ -1271,14 +1289,14 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="lzexportExcel">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</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="deptName" label="护卫点" width="150" />
<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" />
@@ -1303,7 +1321,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">不良记录日期：
@@ -1335,14 +1353,14 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="blexportExcel">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</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="deptName" label="护卫点" width="140" />
<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" />
@@ -1363,7 +1381,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">备注日期：
@@ -1395,14 +1413,14 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="bzexportExcel">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</el-row>
<el-table ref="remarkInfoTable" :data="remarkInfoData" 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="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" />
@@ -1420,7 +1438,7 @@
<el-col :span="6">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:200px" />
</el-col>
- <el-col :span="6">护卫点：
+ <el-col :span="6">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:200px" />
</el-col>
</el-row>
@@ -1461,7 +1479,7 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="tgexportExcel">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</el-row>
@@ -1490,7 +1508,7 @@
<el-col :span="4">身份证号：
<el-input v-model="queryParams.certificateNumb" size="small" maxlength="18" style="width:140px" />
</el-col>
- <el-col :span="3">护卫点：
+ <el-col :span="3">(部门)护卫点：
<el-input v-model="queryParams.deptName" size="small" maxlength="20" style="width:100px" />
</el-col>
<el-col :span="9">入职日期：
@@ -1544,13 +1562,13 @@
</el-col>
<el-col :span="3">
<el-button class="filter-item" type="success" @click.native="rlzexportExcel">
- {{ $t('table.export') }}
+ 导出EXCEL
</el-button>
</el-col>
</el-row>
<el-table ref="dimissionLogTable" :data="dimissionLogData" style="width: 100%;height: 70%;">
<el-table-column type="selection" width="55" />
- <el-table-column prop="newDeptName" label="护卫点" width="180" />
+ <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" />
@@ -1595,7 +1613,8 @@
ageStr: [],
archivesStatus: [],
insuranceType: [],
- empStatus: []
+ empStatus: [],
+ empType: []
}, // 查询参数
sort: {}, // 排序
pagination: { // 分页参数
@@ -2273,6 +2292,13 @@
this.queryParams.insuranceType = []
}
},
+ selectAllEmpType(val) {
+ if (val) {
+ this.queryParams.insuranceType = ['1', '2']
+ } else {
+ this.queryParams.insuranceType = []
+ }
+ },
selectAllEmpStatus(val) {
if (val) {
this.queryParams.empStatus = ['0', '1', '2', '3']
diff --git a/src/views/yunpan/fujian.vue b/src/views/yunpan/fujian.vue
index abe39ab..58c52a6 100644
--- a/src/views/yunpan/fujian.vue
+++ b/src/views/yunpan/fujian.vue
@@ -296,7 +296,7 @@
<span
style="color: #a00515;display: inline-block;width: 50%;cursor: pointer"
- @click.native.prevent="dialogShow(scope.$index, scope.row)"
+ @click="dialogShow(scope.$index, scope.row)"
>上传</span>
</template>
</el-table-column>
diff --git a/src/views/yunpan/zhishou.vue b/src/views/yunpan/zhishou.vue
index 72a00f4..d1950a4 100644
--- a/src/views/yunpan/zhishou.vue
+++ b/src/views/yunpan/zhishou.vue
@@ -102,7 +102,7 @@
@click="delFile()"
>删除</el-button>
<el-popconfirm title="是否移动文件？" @onConfirm="mvdialogFormVisible = true">
- <el-button slot="reference" class="hr-but" type="danger">移动</el-button>
+ <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
</el-popconfirm>
</el-col>
</el-row>
--
Gitblit v1.8.0