From c82b7a4583f57d7bbb2f0eb4a6c5846ce0308075 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 12 三月 2021 02:37:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/dashboard/qjUser.vue | 18
src/views/dashboard/ywUser.vue | 32 +-
src/views/user/archivesChange.vue | 52 ++--
src/views/dashboard/lzUser.vue | 16
src/views/dashboard/cqUser.vue | 14
src/views/user/inemployees.vue | 16
src/views/user/outemployess.vue | 28 +-
src/views/dashboard/blUser.vue | 6
src/views/dashboard/sbUser.vue | 14
src/views/dashboard/tgUser.vue | 8
src/views/dashboard/ctUser.vue | 28 +-
src/views/user/selectuser.vue | 39 +-
src/views/dashboard/yjUser.vue | 12
src/views/dashboard/sfzUser.vue | 12
src/views/user/archivesEdit.vue | 52 ++--
src/views/dashboard/ygUser.vue | 24
src/views/dashboard/HtUser.vue | 11
src/views/dashboard/gsUser.vue | 30 +-
src/views/user/Informationinput.vue | 310 ++++++++++++++---------
src/views/febs/system/dept/Index.vue | 2
src/views/dashboard/onTheJobUser.vue | 24
src/views/dashboard/tjUser.vue | 18
22 files changed, 417 insertions(+), 349 deletions(-)
diff --git a/src/views/dashboard/HtUser.vue b/src/views/dashboard/HtUser.vue
index 0e60b45..a664cb7 100644
--- a/src/views/dashboard/HtUser.vue
+++ b/src/views/dashboard/HtUser.vue
@@ -28,17 +28,18 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip prop="allDeptName" 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 type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<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="certificateNumb" label="身份证号码" width="140" />
<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-column show-overflow-tooltip prop="transactor" label="办理人" width="80" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/blUser.vue b/src/views/dashboard/blUser.vue
index 792c5c4..4710ce4 100644
--- a/src/views/dashboard/blUser.vue
+++ b/src/views/dashboard/blUser.vue
@@ -28,9 +28,9 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<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="身份证号码" />
diff --git a/src/views/dashboard/cqUser.vue b/src/views/dashboard/cqUser.vue
index af9bb9b..ae5e4d8 100644
--- a/src/views/dashboard/cqUser.vue
+++ b/src/views/dashboard/cqUser.vue
@@ -29,14 +29,14 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<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="certificateNumb" label="身份证号码" width="140" />
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="110" />
+ <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="80" />
<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" />
diff --git a/src/views/dashboard/ctUser.vue b/src/views/dashboard/ctUser.vue
index 087bb5d..8846878 100644
--- a/src/views/dashboard/ctUser.vue
+++ b/src/views/dashboard/ctUser.vue
@@ -25,26 +25,26 @@
stripe
border
:cell-style="{padding:'7px 0','text-align':'center'}"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="100" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<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="身份证号码" width="100" />
- <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="100" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="60" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="120" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="100" />
- <el-table-column show-overflow-tooltip prop="reporter" 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="reporter" label="汇报人" width="80" />
+ <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
+ <el-table-column show-overflow-tooltip prop="education" :formatter="educationFormat" label="最高学历" width="80" />
+ <el-table-column show-overflow-tooltip prop="empType" :formatter="empTypeFormat" label="员工类别" width="80" />
+ <el-table-column show-overflow-tooltip prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="80" />
<el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="100" />
<el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="100" />
- <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="100">
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="80">
<template slot-scope="scope">
<span>{{ gzdStateList[scope.row.empStatus] }} </span>
</template>
diff --git a/src/views/dashboard/gsUser.vue b/src/views/dashboard/gsUser.vue
index 70857e0..27b32af 100644
--- a/src/views/dashboard/gsUser.vue
+++ b/src/views/dashboard/gsUser.vue
@@ -28,27 +28,27 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<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="certificateNumb" label="身份证号码" width="120" />
<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="injuredDescribe" label="受伤经过描述" width="120" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="80" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="80" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="80" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" :formatter="hospitalizatioFlagFormat" width="80" />
+ <el-table-column show-overflow-tooltip prop="settleStatus" label="案结状态" width="80" :formatter="settleStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="80" />
<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-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="70" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+ <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="120" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/dashboard/lzUser.vue b/src/views/dashboard/lzUser.vue
index 4749cd6..8c058e8 100644
--- a/src/views/dashboard/lzUser.vue
+++ b/src/views/dashboard/lzUser.vue
@@ -28,19 +28,19 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" />
<el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
- <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" :formatter="arbitrationTypeFormat" width="100" />
+ <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" :formatter="arbitrationTypeFormat" width="80" />
<el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" width="100" />
<el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" width="100" />
- <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
- <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" :formatter="arbitrationStatusFormat" width="100" />
+ <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="120" />
+ <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" :formatter="arbitrationStatusFormat" width="80" />
<el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
</el-table>
<pagination
diff --git a/src/views/dashboard/onTheJobUser.vue b/src/views/dashboard/onTheJobUser.vue
index 7d87890..93eeec7 100644
--- a/src/views/dashboard/onTheJobUser.vue
+++ b/src/views/dashboard/onTheJobUser.vue
@@ -28,20 +28,20 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <el-table-column 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="allDeptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<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">
+ <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="60" />
+ <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
+ <el-table-column show-overflow-tooltip prop="education" :formatter="educationFormat" label="最高学历" width="80" />
+ <el-table-column show-overflow-tooltip prop="empType" :formatter="empTypeFormat" label="员工类别" width="80" />
+ <el-table-column show-overflow-tooltip prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="80" />
+ <el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="110" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="110" />
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="80">
<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 1d30d79..f914ebf 100644
--- a/src/views/dashboard/qjUser.vue
+++ b/src/views/dashboard/qjUser.vue
@@ -29,16 +29,16 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" label="护卫点" width="120" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<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="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="110" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="110" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
+ <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="80" :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="备注" />
diff --git a/src/views/dashboard/sbUser.vue b/src/views/dashboard/sbUser.vue
index d080dc3..847df27 100644
--- a/src/views/dashboard/sbUser.vue
+++ b/src/views/dashboard/sbUser.vue
@@ -28,14 +28,14 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" 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 type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" />
<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="proposer" label="申请人" width="80" />
<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" />
diff --git a/src/views/dashboard/sfzUser.vue b/src/views/dashboard/sfzUser.vue
index 037f2c3..3a890b9 100644
--- a/src/views/dashboard/sfzUser.vue
+++ b/src/views/dashboard/sfzUser.vue
@@ -28,14 +28,14 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" 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 type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="150" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <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="certificateValidity" label="身份证有效期" />
- <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="150">
+ <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/tgUser.vue b/src/views/dashboard/tgUser.vue
index 7a0c959..9e92b7d 100644
--- a/src/views/dashboard/tgUser.vue
+++ b/src/views/dashboard/tgUser.vue
@@ -28,10 +28,10 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <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="oldDeptName" label="原护卫点" width="100" />
<el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位" width="100" />
diff --git a/src/views/dashboard/tjUser.vue b/src/views/dashboard/tjUser.vue
index 4fbc907..79740a6 100644
--- a/src/views/dashboard/tjUser.vue
+++ b/src/views/dashboard/tjUser.vue
@@ -28,18 +28,18 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" 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 type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<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="physicalExamType" :formatter="typeFormat" label="体检类型" width="80" />
+ <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="60" />
+ <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="60" />
+ <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="60" />
<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="备注" />
diff --git a/src/views/dashboard/ygUser.vue b/src/views/dashboard/ygUser.vue
index ae71a83..0158034 100644
--- a/src/views/dashboard/ygUser.vue
+++ b/src/views/dashboard/ygUser.vue
@@ -28,20 +28,20 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="100" />
- <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100 " />
- <el-table-column show-overflow-tooltip prop="allDeptName" 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="身份证号码" width="100" />
- <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 type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80 " />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="140" />
+ <el-table-column show-overflow-tooltip prop="sex" :formatter="sexFormat" label="性别" width="60" />
+ <el-table-column show-overflow-tooltip prop="age" label="年龄" width="60" />
+ <el-table-column show-overflow-tooltip prop="education" :formatter="educationFormat" label="最高学历" width="80" />
+ <el-table-column show-overflow-tooltip prop="empType" :formatter="empTypeFormat" label="员工类别" width="80" />
+ <el-table-column show-overflow-tooltip prop="nativePlace" :formatter="nativePlaceFormat" label="籍贯" width="80" />
<el-table-column show-overflow-tooltip prop="telePhone" label="联系电话" width="100" />
<el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" width="100" />
- <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="100">
+ <el-table-column show-overflow-tooltip prop="empStatus" label="员工状态" width="80">
<template slot-scope="scope">
<span>{{ gzdStateList[scope.row.empStatus] }} </span>
</template>
diff --git a/src/views/dashboard/yjUser.vue b/src/views/dashboard/yjUser.vue
index f31d1fc..6fad693 100644
--- a/src/views/dashboard/yjUser.vue
+++ b/src/views/dashboard/yjUser.vue
@@ -28,16 +28,16 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<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="reporter" 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
diff --git a/src/views/dashboard/ywUser.vue b/src/views/dashboard/ywUser.vue
index eca7c97..7dbdf2e 100644
--- a/src/views/dashboard/ywUser.vue
+++ b/src/views/dashboard/ywUser.vue
@@ -28,27 +28,27 @@
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
- <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="allDeptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip type="index" width="55" label="序号" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<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="certificateNumb" label="身份证号码" width="120" />
<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 prop="injuredAddress" label="受伤地点" width="80" />
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="110" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="100" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="80" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="80" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column prop="settleStatus" label="案结状态" width="80" :formatter="settleStatusFormat" />
<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-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="110" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="70" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+ <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
</el-table>
<pagination
v-show="total>0"
diff --git a/src/views/febs/system/dept/Index.vue b/src/views/febs/system/dept/Index.vue
index fe7c1e3..a6c5b27 100644
--- a/src/views/febs/system/dept/Index.vue
+++ b/src/views/febs/system/dept/Index.vue
@@ -56,7 +56,7 @@
/>
</el-form-item>
<el-form-item :label="$t('table.dept.deptName')" prop="deptName">
- <el-input v-model="dept.deptName" />
+ <el-input v-model="dept.allDeptName" />
</el-form-item>
<el-form-item :label="$t('table.dept.orderNum')" prop="orderNum">
<el-input-number v-model="dept.orderNum" :min="0" :max="100" @change="handleNumChange" />
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 0e325f7..55adbe7 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -64,6 +64,7 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -99,18 +100,18 @@
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="50" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column show-overflow-tooltip prop="empType" label="员工类别" width="80" :formatter="empTypeFormat" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
<el-table-column show-overflow-tooltip prop="nation" label="民族" width="50" :formatter="nationFormat" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column show-overflow-tooltip prop="marriage" label="婚姻状况" width="80" :formatter="marriageFormat" />
<el-table-column show-overflow-tooltip prop="politics" label="政治面貌" width="80" :formatter="politicsFormat" />
<el-table-column show-overflow-tooltip prop="education" label="学历" width="50" :formatter="educationFormat" />
- <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
+ <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
prop="insuranceType"
show-overflow-tooltip
@@ -118,8 +119,8 @@
width="80"
:formatter="insuranceTypeFormat"
/>
- <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" />
- <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" />
+ <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" width="100" />
+ <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" width="100" />
<el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" width="80" />
<el-table-column prop="archivesStatusName" show-overflow-tooltip label="档案情况" />
</el-table>
@@ -132,6 +133,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -148,13 +150,13 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="empNumb" label="编号" width="100" />
- <el-table-column prop="empName" label="姓名" width="100" />
- <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
- <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
- <el-table-column prop="beginDate" label="开始日期" width="120" />
- <el-table-column prop="endDate" label="结束日期" width="120" />
- <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" />
+ <el-table-column prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" width="180" />
+ <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" width="160" />
+ <el-table-column prop="beginDate" label="开始日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column prop="endDate" label="结束日期" width="140" />
+ <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" min-width="120" />
</el-table>
<el-table
v-show="showArr[2].show"
@@ -165,6 +167,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -182,13 +185,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
- <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="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
- <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
+ <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" min-width="100" />
+ <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
show-overflow-tooltip
prop="physicalExamType"
@@ -199,8 +202,8 @@
<el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="60" />
<el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
<el-table-column prop="ecg" show-overflow-tooltip label="心电图" width="80" :formatter="ecgNameFormat" />
- <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" />
- <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查日期" />
+ <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" min-width="100" />
+ <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查日期" min-width="100" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
</el-table>
<el-table
@@ -212,6 +215,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -229,16 +233,16 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="150" />
- <el-table-column prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
- <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" />
- <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" />
- <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
- <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" />
+ <el-table-column prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="155" />
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
+ <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="100" />
</el-table>
<el-table
v-show="showArr[4].show"
@@ -249,6 +253,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -261,11 +266,11 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
- <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="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<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" />
@@ -284,6 +289,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -295,16 +301,16 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <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="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="110" />
<el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
<el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="80" :formatter="leaveTypeFormat" />
- <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="110" />
<el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -317,6 +323,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -328,12 +335,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="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="辞职申请日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -347,6 +354,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -358,12 +366,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="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="失业金申请日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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" />
@@ -378,6 +386,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -389,17 +398,17 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="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="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="80" />
- <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
+ <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" width="80" />
<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="100" />
+ <el-table-column prop="applayStatus" label="状态" width="80" :formatter="applayStatusFormat" />
+ <el-table-column prop="auditor" label="审核人" width="80" />
<el-table-column prop="remark" label="备注" />
</el-table>
<el-table
@@ -411,6 +420,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -422,13 +432,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="jobName" label="名称" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="90" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
- <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="80" />
<el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
<el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
<el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="120" />
@@ -457,6 +467,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -468,12 +479,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="90" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
<el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
<el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
@@ -504,6 +515,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -515,13 +527,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
- <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="arbitrationDate" label="仲裁日期" width="100" />
- <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="280" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
show-overflow-tooltip
prop="arbitrationType"
@@ -529,18 +540,18 @@
width="100"
:formatter="arbitrationTypeFormat"
/>
- <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
- <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
+ <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" min-width="100" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="70" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
<el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="120" />
<el-table-column
show-overflow-tooltip
prop="arbitrationStatus"
label="状态"
- width="80"
+ width="50"
:formatter="arbitrationStatusFormat"
/>
- <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
</el-table>
<el-table
v-show="showArr[12].show"
@@ -551,6 +562,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -567,13 +579,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" />
- <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
+ <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" min-width="120" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="120" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -586,6 +598,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -597,12 +610,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="180" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
</el-table>
<pagination
@@ -787,7 +800,7 @@
<el-form-item label="姓名" prop="empName">
<el-input v-model="empBaseInfoForm.empName" />
</el-form-item>
- <el-form-item label="部门(护卫点)" required message="请选择护卫点" prop="deptId">
+ <el-form-item label="部门(护卫点)" required message="请选择部门(护卫点)" prop="allDeptName">
<treeselect
v-model="empBaseInfoForm.deptId"
:multiple="false"
@@ -943,8 +956,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="workExperienceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="workExperienceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="workExperienceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="workExperienceForm.jobName" />
@@ -1044,8 +1057,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="physicalExamForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="physicalExamForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="physicalExamForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="physicalExamForm.jobName" />
@@ -1157,8 +1170,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="contractInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="contractInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="contractInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="contractInfoForm.jobName" />
@@ -1238,8 +1251,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="dimissionAttendForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="dimissionAttendForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="dimissionAttendForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="dimissionAttendForm.jobName" />
@@ -1322,8 +1335,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="leaveInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="leaveInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="leaveInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="leaveInfoForm.jobName" />
@@ -1395,8 +1408,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="resignForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="resignForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="resignForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="resignForm.jobName" />
@@ -1464,8 +1477,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="unemploymentForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="unemploymentForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="unemploymentForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="unemploymentForm.jobName" />
@@ -1547,8 +1560,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="insuranceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="insuranceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="insuranceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="insuranceForm.jobName" />
@@ -1622,8 +1635,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="accidentCasesForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="accidentCasesForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="accidentCasesForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="accidentCasesForm.jobName" />
@@ -1769,8 +1782,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="occupationalForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="occupationalForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="occupationalForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="occupationalForm.jobName" />
@@ -1970,8 +1983,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="laborTroubleForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="laborTroubleForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="laborTroubleForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="laborTroubleForm.jobName" />
@@ -2058,8 +2071,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="badRecordForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="badRecordForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="badRecordForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="badRecordForm.jobName" />
@@ -2124,8 +2137,8 @@
<el-form-item label="编号" prop="empNumb">
<el-input v-model="remarkInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="remarkInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="remarkInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="remarkInfoForm.jobName" />
@@ -2605,6 +2618,7 @@
JobId: '',
deptId: '',
deptName: '',
+ allDeptName: '',
jobName: '',
remarkContent: '',
remarkDate: '',
@@ -2626,6 +2640,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
arbitrationDate: '',
@@ -2654,6 +2669,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
injuredTime: '',
@@ -2702,6 +2718,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
injuredTime: '',
@@ -2741,6 +2758,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2768,6 +2786,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2793,6 +2812,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2817,6 +2837,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
beginTime: '',
@@ -2844,6 +2865,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
beginDate: '',
@@ -2870,6 +2892,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
certificateNumb: '',
@@ -2899,6 +2922,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
hospital: '',
@@ -2928,6 +2952,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
workUnit: '',
@@ -2947,8 +2972,9 @@
empId: '',
customerId: '',
archivesNumb: '',
- deptId: '1',
+ deptId: '',
deptName: '',
+ allDeptName: '',
empNumb: '',
empName: '',
sex: '1',
@@ -3004,6 +3030,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
badDate: '',
@@ -4209,6 +4236,7 @@
this.empBaseInfoForm.archivesNumb = ''
this.empBaseInfoForm.deptId = ''
this.empBaseInfoForm.deptName = ''
+ this.empBaseInfoForm.allDeptName = ''
this.empBaseInfoForm.empNumb = ''
this.empBaseInfoForm.empName = ''
this.empBaseInfoForm.sex = ''
@@ -4261,6 +4289,7 @@
this.empBaseInfoForm.archivesNumb = row.archivesNumb
this.empBaseInfoForm.deptId = row.deptId
this.empBaseInfoForm.deptName = row.deptName
+ this.empBaseInfoForm.allDeptName = row.allDeptName
this.empBaseInfoForm.empNumb = row.empNumb
this.empBaseInfoForm.empName = row.empName
this.empBaseInfoForm.sex = row.sex
@@ -4409,6 +4438,7 @@
this.workExperienceForm.archivesNumb = ''
this.workExperienceForm.deptId = ''
this.workExperienceForm.deptName = ''
+ this.workExperienceForm.allDeptName = ''
this.workExperienceForm.empNumb = ''
this.workExperienceForm.empName = ''
this.workExperienceForm.sex = ''
@@ -4436,6 +4466,7 @@
this.workExperienceForm.sexName = row.sex
this.workExperienceForm.deptId = row.deptId
this.workExperienceForm.deptName = row.deptName
+ this.workExperienceForm.allDeptName = row.allDeptName
this.workExperienceForm.JobId = row.JobId
this.workExperienceForm.jobName = row.jobName
this.workExperienceForm.workUnit = row.workUnit
@@ -4506,6 +4537,7 @@
this.physicalExamForm.archivesNumb = ''
this.physicalExamForm.deptId = ''
this.physicalExamForm.deptName = ''
+ this.physicalExamForm.allDeptName = ''
this.physicalExamForm.empNumb = ''
this.physicalExamForm.empName = ''
this.physicalExamForm.sex = ''
@@ -4532,6 +4564,7 @@
this.physicalExamForm.sex = row.sex
this.physicalExamForm.deptId = row.deptId
this.physicalExamForm.deptName = row.deptName
+ this.physicalExamForm.allDeptName = row.allDeptName
this.physicalExamForm.JobId = row.JobId
this.physicalExamForm.jobName = row.jobName
this.physicalExamForm.hospital = row.hospital
@@ -4608,6 +4641,7 @@
this.contractInfoForm.archivesNumb = ''
this.contractInfoForm.deptId = ''
this.contractInfoForm.deptName = ''
+ this.contractInfoForm.allDeptName = ''
this.contractInfoForm.empNumb = ''
this.contractInfoForm.empName = ''
this.contractInfoForm.sex = ''
@@ -4640,6 +4674,7 @@
this.contractInfoForm.sex = row.sex
this.contractInfoForm.deptId = row.deptId
this.contractInfoForm.deptName = row.deptName
+ this.contractInfoForm.allDeptName = row.allDeptName
this.contractInfoForm.JobId = row.JobId
this.contractInfoForm.jobName = row.jobName
this.contractInfoForm.beginDate = row.beginDate
@@ -4714,6 +4749,7 @@
this.dimissionAttendForm.archivesNumb = ''
this.dimissionAttendForm.deptId = ''
this.dimissionAttendForm.deptName = ''
+ this.dimissionAttendForm.allDeptName = ''
this.dimissionAttendForm.empNumb = ''
this.dimissionAttendForm.empName = ''
this.dimissionAttendForm.sex = ''
@@ -4745,6 +4781,7 @@
this.dimissionAttendForm.certificateNumb = row.certificateNumb
this.dimissionAttendForm.deptId = row.deptId
this.dimissionAttendForm.deptName = row.deptName
+ this.dimissionAttendForm.allDeptName = row.allDeptName
this.dimissionAttendForm.JobId = row.JobId
this.dimissionAttendForm.jobName = row.jobName
this.dimissionAttendForm.attendMonth = row.attendMonth
@@ -4818,6 +4855,7 @@
this.leaveInfoForm.archivesNumb = ''
this.leaveInfoForm.deptId = ''
this.leaveInfoForm.deptName = ''
+ this.leaveInfoForm.allDeptName = ''
this.leaveInfoForm.empNumb = ''
this.leaveInfoForm.empName = ''
this.leaveInfoForm.sex = ''
@@ -4850,6 +4888,7 @@
this.leaveInfoForm.certificateNumb = row.certificateNumb
this.leaveInfoForm.deptId = row.deptId
this.leaveInfoForm.deptName = row.deptName
+ this.leaveInfoForm.allDeptName = row.allDeptName
this.leaveInfoForm.JobId = row.JobId
this.leaveInfoForm.jobName = row.jobName
this.leaveInfoForm.beginTime = row.beginTime
@@ -4924,6 +4963,7 @@
this.resignForm.archivesNumb = ''
this.resignForm.deptId = ''
this.resignForm.deptName = ''
+ this.resignForm.allDeptName = ''
this.resignForm.empNumb = ''
this.resignForm.empName = ''
this.resignForm.sex = ''
@@ -4953,6 +4993,7 @@
this.resignForm.certificateNumb = row.certificateNumb
this.resignForm.deptId = row.deptId
this.resignForm.deptName = row.deptName
+ this.resignForm.allDeptName = row.allDeptName
this.resignForm.JobId = row.JobId
this.resignForm.jobName = row.jobName
this.resignForm.applayDate = row.applayDate
@@ -5024,6 +5065,7 @@
this.unemploymentForm.archivesNumb = ''
this.unemploymentForm.deptId = ''
this.unemploymentForm.deptName = ''
+ this.unemploymentForm.allDeptName = ''
this.unemploymentForm.empNumb = ''
this.unemploymentForm.empName = ''
this.unemploymentForm.sex = ''
@@ -5054,6 +5096,7 @@
this.unemploymentForm.certificateNumb = row.certificateNumb
this.unemploymentForm.deptId = row.deptId
this.unemploymentForm.deptName = row.deptName
+ this.unemploymentForm.allDeptName = row.allDeptName
this.unemploymentForm.JobId = row.JobId
this.unemploymentForm.jobName = row.jobName
this.unemploymentForm.applayDate = row.applayDate
@@ -5126,6 +5169,7 @@
this.insuranceForm.archivesNumb = ''
this.insuranceForm.deptId = ''
this.insuranceForm.deptName = ''
+ this.insuranceForm.allDeptName = ''
this.insuranceForm.empNumb = ''
this.insuranceForm.empName = ''
this.insuranceForm.sex = ''
@@ -5158,6 +5202,7 @@
this.insuranceForm.certificateNumb = row.certificateNumb
this.insuranceForm.deptId = row.deptId
this.insuranceForm.deptName = row.deptName
+ this.insuranceForm.allDeptName = row.allDeptName
this.insuranceForm.JobId = row.JobId
this.insuranceForm.jobName = row.jobName
this.insuranceForm.applayDate = row.applayDate
@@ -5231,6 +5276,7 @@
this.accidentCasesForm.archivesNumb = ''
this.accidentCasesForm.deptId = ''
this.accidentCasesForm.deptName = ''
+ this.accidentCasesForm.allDeptName = ''
this.accidentCasesForm.empNumb = ''
this.accidentCasesForm.empName = ''
this.accidentCasesForm.sex = ''
@@ -5261,7 +5307,7 @@
this.accidentCasesForm.creator = ''
this.accidentCasesForm.modifyTime = ''
this.accidentCasesForm.modifier = ''
- this.accidentCasesForm.delFlag = ''
+ this.accidentCasesForm.delFlag = '2'
this.accidentCasesForm.version = ''
},
editAccidentCases(row) {
@@ -5275,6 +5321,7 @@
this.accidentCasesForm.certificateNumb = row.certificateNumb
this.accidentCasesForm.deptId = row.deptId
this.accidentCasesForm.deptName = row.deptName
+ this.accidentCasesForm.allDeptName = row.allDeptName
this.accidentCasesForm.JobId = row.JobId
this.accidentCasesForm.jobName = row.jobName
this.accidentCasesForm.injuredTime = row.injuredTime
@@ -5361,6 +5408,7 @@
this.occupationalForm.archivesNumb = ''
this.occupationalForm.deptId = ''
this.occupationalForm.deptName = ''
+ this.occupationalForm.allDeptName = ''
this.occupationalForm.empNumb = ''
this.occupationalForm.empName = ''
this.occupationalForm.sex = ''
@@ -5399,7 +5447,7 @@
this.occupationalForm.creator = ''
this.occupationalForm.modifyTime = ''
this.occupationalForm.modifier = ''
- this.occupationalForm.delFlag = ''
+ this.occupationalForm.delFlag = '2'
this.occupationalForm.version = ''
this.occupationalForm.remark = ''
},
@@ -5414,6 +5462,7 @@
this.occupationalForm.certificateNumb = row.certificateNumb
this.occupationalForm.deptId = row.deptId
this.occupationalForm.deptName = row.deptName
+ this.occupationalForm.allDeptName = row.allDeptName
this.occupationalForm.JobId = row.JobId
this.occupationalForm.jobName = row.jobName
this.occupationalForm.injuredTime = row.injuredTime
@@ -5511,6 +5560,7 @@
this.laborTroubleForm.archivesNumb = ''
this.laborTroubleForm.deptId = ''
this.laborTroubleForm.deptName = ''
+ this.laborTroubleForm.allDeptName = ''
this.laborTroubleForm.empNumb = ''
this.laborTroubleForm.empName = ''
this.laborTroubleForm.sex = ''
@@ -5529,7 +5579,7 @@
this.laborTroubleForm.creator = ''
this.laborTroubleForm.modifyTime = ''
this.laborTroubleForm.modifier = ''
- this.laborTroubleForm.delFlag = ''
+ this.laborTroubleForm.delFlag = '2'
this.laborTroubleForm.version = ''
this.laborTroubleForm.remark = ''
},
@@ -5543,6 +5593,7 @@
this.laborTroubleForm.certificateNumb = row.certificateNumb
this.laborTroubleForm.deptId = row.deptId
this.laborTroubleForm.deptName = row.deptName
+ this.laborTroubleForm.allDeptName = row.allDeptName
this.laborTroubleForm.JobId = row.JobId
this.laborTroubleForm.jobName = row.jobName
this.laborTroubleForm.arbitrationDate = row.arbitrationDate
@@ -5573,6 +5624,7 @@
this.badRecordForm.archivesNumb = ''
this.badRecordForm.deptId = ''
this.badRecordForm.deptName = ''
+ this.badRecordForm.allDeptName = ''
this.badRecordForm.empNumb = ''
this.badRecordForm.empName = ''
this.badRecordForm.sex = ''
@@ -5587,7 +5639,7 @@
this.badRecordForm.creator = ''
this.badRecordForm.modifyTime = ''
this.badRecordForm.modifier = ''
- this.badRecordForm.delFlag = ''
+ this.badRecordForm.delFlag = '2'
this.badRecordForm.version = ''
this.badRecordForm.remark = ''
},
@@ -5646,6 +5698,7 @@
this.badRecordForm.certificateNumb = row.certificateNumb
this.badRecordForm.deptId = row.deptId
this.badRecordForm.deptName = row.deptName
+ this.badRecordForm.allDeptName = row.allDeptName
this.badRecordForm.JobId = row.JobId
this.badRecordForm.jobName = row.jobName
this.badRecordForm.badDate = row.badDate
@@ -5716,6 +5769,7 @@
this.remarkInfoForm.archivesNumb = ''
this.remarkInfoForm.deptId = ''
this.remarkInfoForm.deptName = ''
+ this.remarkInfoForm.allDeptName = ''
this.remarkInfoForm.empNumb = ''
this.remarkInfoForm.empName = ''
this.remarkInfoForm.sex = ''
@@ -5729,7 +5783,7 @@
this.remarkInfoForm.creator = ''
this.remarkInfoForm.modifyTime = ''
this.remarkInfoForm.modifier = ''
- this.remarkInfoForm.delFlag = ''
+ this.remarkInfoForm.delFlag = '2'
this.remarkInfoForm.version = ''
},
editRemarkInfo(row) {
@@ -5743,6 +5797,7 @@
this.remarkInfoForm.JobId = row.JobId
this.remarkInfoForm.deptId = row.deptId
this.remarkInfoForm.deptName = row.deptName
+ this.remarkInfoForm.allDeptName = row.allDeptName
this.remarkInfoForm.jobName = row.jobName
this.remarkInfoForm.remarkContent = row.remarkContent
this.remarkInfoForm.remarkDate = row.remarkDate
@@ -5873,6 +5928,11 @@
case '5':
return '（非深户）四险一档'
}
+ },
+ changeSort(val) {
+ this.sort.field = val.prop
+ this.sort.order = val.order
+ this.search()
}
}
}
diff --git a/src/views/user/archivesChange.vue b/src/views/user/archivesChange.vue
index a2cfad0..338b199 100644
--- a/src/views/user/archivesChange.vue
+++ b/src/views/user/archivesChange.vue
@@ -1269,8 +1269,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="workExperienceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="workExperienceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="workExperienceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="workExperienceForm.jobName" />
@@ -1371,8 +1371,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="physicalExamForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="physicalExamForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="physicalExamForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="physicalExamForm.jobName" />
@@ -1480,8 +1480,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="contractInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="contractInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="contractInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="contractInfoForm.jobName" />
@@ -1562,8 +1562,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="dimissionAttendForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="dimissionAttendForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="dimissionAttendForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="dimissionAttendForm.jobName" />
@@ -1651,8 +1651,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="leaveInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="leaveInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="leaveInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="leaveInfoForm.jobName" />
@@ -1730,8 +1730,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="resignForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="resignForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="resignForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="resignForm.jobName" />
@@ -1805,8 +1805,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="unemploymentForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="unemploymentForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="unemploymentForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="unemploymentForm.jobName" />
@@ -1894,8 +1894,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="insuranceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="insuranceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="insuranceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="insuranceForm.jobName" />
@@ -1975,8 +1975,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="accidentCasesForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="accidentCasesForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="accidentCasesForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="accidentCasesForm.jobName" />
@@ -2127,8 +2127,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="occupationalForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="occupationalForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="occupationalForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="occupationalForm.jobName" />
@@ -2334,8 +2334,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="laborTroubleForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="laborTroubleForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="laborTroubleForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="laborTroubleForm.jobName" />
@@ -2428,8 +2428,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="badRecordForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="badRecordForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="badRecordForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="badRecordForm.jobName" />
@@ -2500,8 +2500,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="remarkInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="remarkInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="remarkInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="remarkInfoForm.jobName" />
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index cc5eacd..142e8e6 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -1459,8 +1459,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="workExperienceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="workExperienceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="workExperienceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="workExperienceForm.jobName" />
@@ -1561,8 +1561,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="physicalExamForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="physicalExamForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="physicalExamForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="physicalExamForm.jobName" />
@@ -1670,8 +1670,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="contractInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="contractInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="contractInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="contractInfoForm.jobName" />
@@ -1752,8 +1752,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="dimissionAttendForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="dimissionAttendForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="dimissionAttendForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="dimissionAttendForm.jobName" />
@@ -1841,8 +1841,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="leaveInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="leaveInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="leaveInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="leaveInfoForm.jobName" />
@@ -1920,8 +1920,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="resignForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="resignForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="resignForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="resignForm.jobName" />
@@ -1995,8 +1995,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="unemploymentForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="unemploymentForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="unemploymentForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="unemploymentForm.jobName" />
@@ -2084,8 +2084,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="insuranceForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="insuranceForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="insuranceForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="insuranceForm.jobName" />
@@ -2165,8 +2165,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="accidentCasesForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="accidentCasesForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="accidentCasesForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="accidentCasesForm.jobName" />
@@ -2317,8 +2317,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="occupationalForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="occupationalForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="occupationalForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="occupationalForm.jobName" />
@@ -2524,8 +2524,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="laborTroubleForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="laborTroubleForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="laborTroubleForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="laborTroubleForm.jobName" />
@@ -2618,8 +2618,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="badRecordForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="badRecordForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="badRecordForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="badRecordForm.jobName" />
@@ -2690,8 +2690,8 @@
<el-form-item label="员工编号" prop="empNumb">
<el-input v-model="remarkInfoForm.empNumb" />
</el-form-item>
- <el-form-item label="部门(护卫点)" prop="deptName">
- <el-input v-model="remarkInfoForm.deptName" />
+ <el-form-item label="部门(护卫点)" prop="allDeptName">
+ <el-input v-model="remarkInfoForm.allDeptName" />
</el-form-item>
<el-form-item label="岗位" prop="jobName">
<el-input v-model="remarkInfoForm.jobName" />
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index f2c6cb7..3f83870 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -248,18 +248,18 @@
>编辑</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门（护卫点）" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="80" />
<el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="160" />
<el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="60" :formatter="sexFormat" />
<el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
<el-table-column show-overflow-tooltip="true" prop="education" label="学历" width="60" :formatter="educationFormat" />
<el-table-column show-overflow-tooltip="true" prop="nativePlace" label="籍贯" width="70" :formatter="nativePlaceFormat" />
<el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类型" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="140" />
- <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
+ <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
<template slot-scope="{row}">
{{ transEmpStatus(row.empStatus) }}
@@ -632,9 +632,9 @@
<el-radio-group v-model="gbdaForm.dimissionType" @change="changeDimissionType">
<el-radio :label="1">正常离职</el-radio>
<el-radio :label="2">自动离职</el-radio>
- <el-radio :label="3">公司劝退</el-radio>
- <el-radio :label="4">公司辞退</el-radio>
- <el-radio :label="5">试用期内</el-radio>
+ <!-- <el-radio :label="3">公司劝退</el-radio>-->
+ <el-radio :label="3">公司辞退</el-radio>
+ <!-- <el-radio :label="5">试用期内</el-radio>-->
</el-radio-group>
</el-form-item>
</el-col>
diff --git a/src/views/user/outemployess.vue b/src/views/user/outemployess.vue
index 2d87101..369d515 100644
--- a/src/views/user/outemployess.vue
+++ b/src/views/user/outemployess.vue
@@ -250,13 +250,13 @@
>编辑</span> -->
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门（护卫点）" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="60" :formatter="sexFormat" />
- <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="60" />
+ <el-table-column show-overflow-tooltip="true" prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="allDeptName" label="部门（护卫点）" width="280" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" width="160" />
+ <el-table-column show-overflow-tooltip="true" prop="sex" label="性别" width="50" :formatter="sexFormat" />
+ <el-table-column show-overflow-tooltip="true" prop="age" label="年龄" width="50" />
<el-table-column
show-overflow-tooltip="true"
prop="education"
@@ -272,9 +272,9 @@
width="80"
:formatter="empTypeFormat"
/>
- <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="telePhone" label="联系电话" width="110" />
+ <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" width="110" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip="true" prop="empStatus" label="员工状态" width="80">
<template slot-scope="{row}">
{{ transEmpStatus(row.empStatus) }}
@@ -1400,11 +1400,11 @@
case '2':
return '自动离职'
case '3':
- return '公司劝退'
- case '4':
return '公司辞退'
- case '5':
- return '试用期内'
+ // case '4':
+ // return '公司辞退'
+ // case '5':
+ // return '试用期内'
}
},
advancedQueryShowMethods() {
diff --git a/src/views/user/selectuser.vue b/src/views/user/selectuser.vue
index 8cca936..d6d934b 100644
--- a/src/views/user/selectuser.vue
+++ b/src/views/user/selectuser.vue
@@ -2,13 +2,13 @@
<div id="mainDiv">
<el-header :height="headerHeight">
<el-form>
- <el-row>
+ <el-row style="height: 45px;">
<el-col :span="10">
<el-form-item label="关键字">
<el-input v-model="queryParams.baseKey" placeholder="请输入内容" style="width:200px" />
</el-form-item>
</el-col>
- <el-col :span="10">
+ <el-col :span="10" style="height: 100%;">
<el-form-item label="员工状态">
<el-checkbox-group v-model="queryParams.empStatus">
<el-checkbox :label="0">在职</el-checkbox>
@@ -22,6 +22,10 @@
<el-button size="mini" class="hr-but" type="danger" @click="resetSearch">重置</el-button>
</el-col>
</el-row>
+ <el-row style="text-align: right;height: 45px;line-height: 45px">
+ <el-button type="primary" @click="sureChoose">确定</el-button>
+ <el-button type="danger" @click="cancleChoose">取消</el-button>
+ </el-row>
</el-form>
</el-header>
<el-main>
@@ -29,22 +33,26 @@
ref="multipleTable"
:data="list"
row-key="prop1"
- width="80%"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
+ stripe
+ border
+ style="width: 100%;color: #000;"
@selection-change="handleSelectionChange"
@row-dblclick="rowDblclick"
@sort-change="changeSort"
>
- <el-table-column type="selection" :reserve-selection="false" width="50" />
- <el-table-column v-if="show" prop="empId" label="员工Id" />
- <el-table-column prop="empNumb" label="编号" />
- <el-table-column prop="empName" label="姓名" />
- <el-table-column prop="certificateNumb" label="身份证号码" width="180" />
- <el-table-column v-if="show" prop="deptId" label="部门Id" />
- <el-table-column prop="allDeptName" label="护卫点" width="180" sortable="custom" :sort-orders="['ascending', 'descending']" />
- <el-table-column v-if="show" prop="jobId" label="岗位Id" />
- <el-table-column prop="jobName" label="岗位" />
- <el-table-column prop="empTypeName" label="员工类别" />
- <el-table-column prop="sexName" label="性别" width="50" />
+ <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="50" />
+ <el-table-column v-if="show" show-overflow-tooltip prop="empId" label="员工Id" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="110" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column v-if="show" show-overflow-tooltip prop="deptId" label="部门Id" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="400" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column v-if="show" show-overflow-tooltip prop="jobId" label="岗位Id" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empTypeName" label="员工类别" width="80" />
+ <el-table-column show-overflow-tooltip prop="sexName" label="性别" width="60" />
</el-table>
<!--
page.sync 当前页
@@ -58,8 +66,7 @@
:limit.sync="pagination.size"
@pagination="search"
/>
- <el-button type="primary" @click="sureChoose">确定</el-button>
- <el-button type="danger" @click="cancleChoose">取消</el-button>
+
</el-main>
</div>
</template>
--
Gitblit v1.8.0