From c3bc05a070c2f76389d466d48e2d6b06f65ef34f Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期三, 03 三月 2021 00:58:51 +0800
Subject: [PATCH] 修改bug
---
src/views/user/inemployees.vue | 2
src/views/user/archivesEdit.vue | 16
src/views/user/Informationinput.vue | 617 +++++++++++++++++++++++++++++++++++++++----------------
3 files changed, 446 insertions(+), 189 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 16c7501..c724345 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -52,6 +52,8 @@
<el-col :span="24">
<el-button class="commonBtn" @click.native="dialogIsShow()">新增</el-button>
<el-button class="commonBtn" @click.native="butDelete()">删除</el-button>
+ <el-button class="hr-but-all" @click.native="showDcyg(0)">导出员工</el-button>
+ <el-button class="hr-but-all" @click.native="showDryg(0)">导入员工</el-button>
<el-button class="commonBtn" style="float: right">导入员工信息</el-button>
</el-col>
</el-row>
@@ -79,23 +81,23 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="50" />
- <el-table-column show-overflow-tooltip="true" prop="empTypeName" label="员工类别" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="sexName" label="性别" width="50" />
- <el-table-column show-overflow-tooltip="true" prop="nationName" label="民族" width="50" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="marriageName" label="婚姻状况" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="politicsName" label="政治面貌" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="educationName" label="最高学历" width="80" />
- <el-table-column prop="entryDate" show-overflow-tooltip="true" label="入职日期" width="80" />
- <el-table-column prop="insuranceType" show-overflow-tooltip="true" label="保险类型" width="80" />
- <el-table-column prop="socialNumb" show-overflow-tooltip="true" label="社保电脑号" />
- <el-table-column prop="guardNumb" show-overflow-tooltip="true" label="保安员证号" />
- <el-table-column prop="archivesNumb" show-overflow-tooltip="true" label="档案编号" />
- <el-table-column prop="archivesStatusName" show-overflow-tooltip="true" label="档案情况" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
+ <el-table-column show-overflow-tooltip prop="empTypeName" label="员工类别" width="80" />
+ <el-table-column show-overflow-tooltip prop="sexName" label="性别" width="50" />
+ <el-table-column show-overflow-tooltip prop="nationName" label="民族" width="50" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="marriageName" label="婚姻状况" width="80" />
+ <el-table-column show-overflow-tooltip prop="politicsName" label="政治面貌" width="80" />
+ <el-table-column show-overflow-tooltip prop="educationName" label="最高学历" width="80" />
+ <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
+ <el-table-column prop="insuranceType" show-overflow-tooltip label="保险类型" width="80" />
+ <el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" />
+ <el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" />
+ <el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" />
+ <el-table-column prop="archivesStatusName" show-overflow-tooltip label="档案情况" />
</el-table>
<el-table
v-show="showArr[1].show"
@@ -122,11 +124,11 @@
</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="true" label="身份证号码" />
- <el-table-column prop="workUnit" show-overflow-tooltip="true" label="工作单位" />
+ <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="true" label="主要工作内容" />
+ <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" />
</el-table>
<el-table
v-show="showArr[2].show"
@@ -152,20 +154,20 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="80" />
- <el-table-column prop="hospital" show-overflow-tooltip="true" label="体检医院" />
- <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="physicalExamTypeName" label="体检类型" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="80" />
- <el-table-column prop="ecgName" show-overflow-tooltip="true" label="心电图" width="80" />
- <el-table-column prop="conclusion" show-overflow-tooltip="true" label="体检结论" />
- <el-table-column prop="reviewRecord" show-overflow-tooltip="true" label="复查记录" />
- <el-table-column prop="remark" show-overflow-tooltip="true" label="备注" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" 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="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="physicalExamTypeName" label="体检类型" width="80" />
+ <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="ecgName" show-overflow-tooltip label="心电图" width="80" />
+ <el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" />
+ <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查记录" />
+ <el-table-column prop="remark" show-overflow-tooltip label="备注" />
</el-table>
<el-table
v-show="showArr[3].show"
@@ -191,16 +193,16 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="150" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
<el-table-column prop="empName" label="员工姓名" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="signingDate" label="合同签订日期" />
- <el-table-column show-overflow-tooltip="true" prop="endDate" label="合同结束日期" />
- <el-table-column show-overflow-tooltip="true" prop="contractPeriod" label="合同期限(年)" />
- <el-table-column show-overflow-tooltip="true" prop="contractStatusName" label="合同状态" />
- <el-table-column show-overflow-tooltip="true" prop="transactor" label="合同办理人" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <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="contractStatusName" label="合同状态" />
+ <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" />
</el-table>
<el-table
v-show="showArr[4].show"
@@ -221,19 +223,19 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="attendMonth" label="离职考勤月份" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班（天）" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班（小时）" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="deduct" label="有无代扣款项" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假（天）" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工（天）" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" 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="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="100" />
+ <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
+ <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="100" />
+ <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="80" />
+ <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="80" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假（天）" width="100" />
+ <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<el-table
v-show="showArr[5].show"
@@ -253,18 +255,18 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位名称" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="员工姓名" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="beginTime" label="开始时间" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="endTime" label="结束时间" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假天数" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="leaveTypeName" label="请假类型" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="returnDate" label="到岗时间" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
+ <el-table-column show-overflow-tooltip prop="deptName" 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="beginTime" label="开始时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
+ <el-table-column show-overflow-tooltip prop="leaveTypeName" label="请假类型" width="80" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<el-table
v-show="showArr[6].show"
@@ -284,15 +286,15 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位名" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="员工姓名" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="applayDate" label="辞职申请日期" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位名" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
+ <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="reason" label="辞职事由" width="150" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<el-table
v-show="showArr[7].show"
@@ -312,16 +314,16 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位名称" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="applayDate" label="失业金申请日期" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="applayReason" label="申报事由" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="auditor" label="审核人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="100" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<el-table
v-show="showArr[8].show"
@@ -341,14 +343,14 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位名称" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="applayDate" label="社保申请日期" />
- <el-table-column show-overflow-tooltip="true" prop="proposer" label="申请人" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="insuranceGaers" label="社保档位">
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
+ <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="80" />
+ <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位">
<template slot-scope="{row}">
{{ transinsuranceGaers(row.insuranceGaers) }}
</template>
@@ -384,29 +386,29 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位名称" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" />
- <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" />
- <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="意外险诊断" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" />
- <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="60">
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
+ <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="意外险诊断" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="60">
<template slot-scope="scope">
{{ scope.row.hospitalizatioFlag ===1?'已住院':'未住院' }}
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="40" />
- <el-table-column show-overflow-tooltip="true" prop="reprotTime" label="报案时间" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" />
- <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="innsureFee" label="保险赔付费用" width="60" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="40" />
+ <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="60" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="60" />
+ <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="60" />
</el-table>
<el-table
v-show="showArr[10].show"
@@ -426,29 +428,29 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" />
- <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" />
- <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="工伤诊断" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" />
- <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="50">
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
+ <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="工伤诊断" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="50">
<template slot-scope="scope">
{{ scope.row.hospitalizatioFlag ===1?'已住院':'未住院' }}
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="40" />
- <el-table-column show-overflow-tooltip="true" prop="reportTime" label="报案时间" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" />
- <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="compensated" label="已赔付医药费用" width="60" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="40" />
+ <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="60" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="60" />
+ <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="60" />
</el-table>
<el-table
v-show="showArr[11].show"
@@ -468,20 +470,20 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="70" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationDate" label="仲裁日期" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationDate" label="仲裁日期" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationTypeName" label="仲裁类型" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationReason" label="仲裁事由" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationStatus" label="状态" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="settleDate" label="案结日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="70" />
+ <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="arbitrationTypeName" label="仲裁类型" width="100" />
+ <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="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
+ <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" width="80" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="120" />
</el-table>
<el-table
v-show="showArr[12].show"
@@ -506,15 +508,15 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="badDate" label="不良记录日期" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="badContent" label="不良记录描述" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="120" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <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="reporter" label="汇报人" width="120" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<el-table
v-show="showArr[13].show"
@@ -534,13 +536,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="empNumb" label="员工编号" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="deptName" label="护卫点" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="jobName" label="岗位" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip="true" prop="remarkDate" label="备注日期" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="remarkContent" label="备注信息" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="180" />
+ <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
</el-table>
<pagination
v-show="total>0"
@@ -557,6 +559,215 @@
</el-col>
</el-main>
</el-container>
+ <el-dialog title="导出员工 请勾选需要导出的字段" :visible.sync="dialogShowDcyg" width="40%">
+ <table id="dcygTable" width="100%">
+ <tr>
+ <td colspan="6" style="text-align: left;">
+ <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange" />
+ 全部字段
+ </td>
+ </tr>
+ <el-checkbox-group v-model="checkedCities" @change="handleCheckedCitiesChange">
+ <tr>
+ <td>档案号</td>
+ <td>
+ <el-checkbox label="archivesNumb"><span /></el-checkbox>
+ </td>
+ <td>姓名</td>
+ <td>
+ <el-checkbox label="empName"><span /></el-checkbox>
+ </td>
+ <td>性别</td>
+ <td>
+ <el-checkbox label="sexName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>部门(护卫点)</td>
+ <td>
+ <el-checkbox label="deptName"><span /></el-checkbox>
+ </td>
+ <td>所属岗位</td>
+ <td>
+ <el-checkbox label="jobName"><span /></el-checkbox>
+ </td>
+ <td>员工类别</td>
+ <td>
+ <el-checkbox label="empTypeName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>民族</td>
+ <td>
+ <el-checkbox label="nationName"><span /></el-checkbox>
+ </td>
+ <td>身份证号码</td>
+ <td>
+ <el-checkbox label="certificateNumb"><span /></el-checkbox>
+ </td>
+ <td>年龄</td>
+ <td>
+ <el-checkbox label="age"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>婚姻状况</td>
+ <td>
+ <el-checkbox label="marriageName"><span /></el-checkbox>
+ </td>
+ <td>身份证有效期</td>
+ <td>
+ <el-checkbox label="certificateValidity"><span /></el-checkbox>
+ </td>
+ <td>身高</td>
+ <td>
+ <el-checkbox label="stature"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>政治面貌</td>
+ <td>
+ <el-checkbox label="politicsName"><span /></el-checkbox>
+ </td>
+ <td>出生日期</td>
+ <td>
+ <el-checkbox label="birthdate"><span /></el-checkbox>
+ </td>
+ <td>最高学历</td>
+ <td>
+ <el-checkbox label="educationName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>籍贯</td>
+ <td>
+ <el-checkbox label="nativePlaceName"><span /></el-checkbox>
+ </td>
+ <td>户籍地址</td>
+ <td>
+ <el-checkbox label="censusAddress"><span /></el-checkbox>
+ </td>
+ <td>现住址</td>
+ <td>
+ <el-checkbox label="currentAddress"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>保安员证号</td>
+ <td>
+ <el-checkbox label="guardNumb"><span /></el-checkbox>
+ </td>
+ <td>保安员回执</td>
+ <td>
+ <el-checkbox label="returnReceipt"><span /></el-checkbox>
+ </td>
+ <td>档案情况</td>
+ <td>
+ <el-checkbox label="archivesStatusName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>银行名称</td>
+ <td>
+ <el-checkbox label="bankName"><span /></el-checkbox>
+ </td>
+ <td>银行账号</td>
+ <td>
+ <el-checkbox label="bankNumb"><span /></el-checkbox>
+ </td>
+ <td>电话号码</td>
+ <td>
+ <el-checkbox label="telePhone"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>入职日期</td>
+ <td>
+ <el-checkbox label="entryDate"><span /></el-checkbox>
+ </td>
+ <td>保险类型</td>
+ <td>
+ <el-checkbox label="InsuranceTypeName"><span /></el-checkbox>
+ </td>
+ <td>社保电脑号</td>
+ <td>
+ <el-checkbox label="socialNumb"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>招聘介绍人</td>
+ <td>
+ <el-checkbox label="introducer"><span /></el-checkbox>
+ </td>
+ <td>入司工龄</td>
+ <td>
+ <el-checkbox label="seniority"><span /></el-checkbox>
+ </td>
+ <td>工作证</td>
+ <td>
+ <el-checkbox label="empCardStatus"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>相关证件</td>
+ <td>
+ <el-checkbox label="certificateList"><span /></el-checkbox>
+ </td>
+ <td>紧急联系电话</td>
+ <td>
+ <el-checkbox label="urgencyPhone"><span /></el-checkbox>
+ </td>
+ <td>员工手册</td>
+ <td>
+ <el-checkbox label="handbookStatusName"><span /></el-checkbox>
+ </td>
+ </tr>
+ <tr>
+ <td>家庭成员及关系</td>
+ <td>
+ <el-checkbox label="family"><span /></el-checkbox>
+ </td>
+ <td />
+ <td />
+ <td />
+ <td />
+ </tr>
+ </el-checkbox-group>
+ </table>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="showDcyg(1)">取 消</el-button>
+ <el-button type="primary" @click="showDcyg(2)">确 定</el-button>
+ </div>
+ </el-dialog>
+ <el-dialog title="导入员工信息" :visible.sync="dialogShowDryg" width="50%">
+ <el-form :model="baseicInformationForm" label-position="right" label-width="120px">
+ <el-row>
+ <el-col span="24">
+ <el-form-item label="员工模板下载" prop="region">
+ <a href="/员工信息.xls" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
+ <span style="margin-left: 100px;">点击下载</span>
+ </el-form-item>
+ <el-form-item label="导入员工">
+ <el-upload
+ ref="upload"
+ class="upload-demo"
+ action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
+ accept=".xls, .xlsx, .excel"
+ :headers="headers()"
+ :file-list="fileList"
+ :auto-upload="false"
+ >
+ <el-button slot="trigger" size="small" type="primary">选取文件</el-button>
+ </el-upload>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="showDryg(1)">取 消</el-button>
+ <el-button type="primary" @click="showDryg(2)">确 定</el-button>
+ </div>
+ </el-dialog>
<el-dialog title="基本信息" top="8vh" :visible.sync="dialogshowArr[0].show" width="60%" class="baseinfo">
<el-container style="height: 70vh;">
<el-aside width="200px">
@@ -1985,11 +2196,19 @@
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Pagination from '@/components/Pagination'
import { pages } from '@/settings'
+import { getToken } from '@/utils/auth'
export default {
components: { Treeselect, Pagination },
data() {
return {
+ baseicInformationForm: {
+ },
+ dialogShowDryg: false,
+ dialogShowDcyg: false,
+ isIndeterminate: false,
+ checkedCities: [],
+ checkAll: false,
empBaseInfoImageUrl: '',
total: 0, // 总数量
queryParams: {}, // 查询参数
@@ -2757,6 +2976,58 @@
this.isShow(false, 0)
},
methods: {
+ headers() {
+ const token = getToken()
+ if (token) {
+ return {
+ Authorization: 'bearer ' + token
+ }
+ } else {
+ return null
+ }
+ },
+ handleCheckedCitiesChange(value) {
+ const checkedCount = value.length
+ this.checkAll = checkedCount === this.cityOptions.length
+ this.isIndeterminate = checkedCount > 0 && checkedCount < this.cityOptions.length
+ },
+ handleCheckAllChange(val) {
+ this.checkedCities = val ? this.cityOptions : []
+ this.isIndeterminate = false
+ },
+ showDryg(operate) {
+ switch (operate) {
+ case 0:
+ this.dialogShowDryg = true
+ break
+ case 1:
+ this.dialogShowDryg = false
+ break
+ case 2:
+ this.$refs.upload.submit()
+ break
+ }
+ },
+ showDcyg(operate) {
+ switch (operate) {
+ case 0:
+ this.dialogShowDcyg = true
+ break
+ case 1:
+ this.dialogShowDcyg = false
+ break
+ case 2:
+ var params = this.queryParams
+ params.exportField = this.checkedCities.join(',')
+ this.$download('hr/empBaseInfo/exportWithField', { ...params }, '在职员工列表.xls').then(() => {
+ this.$message({
+ message: '下载成功!',
+ type: 'success'
+ })
+ })
+ break
+ }
+ },
// 获取图片的Blob值
getImageBlob(url, cb) {
var xhr = new XMLHttpRequest()
@@ -4566,8 +4837,8 @@
this.insuranceForm.applayDate = row.applayDate
this.insuranceForm.proposer = row.proposer
this.insuranceForm.insuranceGaers = row.insuranceGaers
- this.insuranceForm.reportStatus = row.reportStatus
- this.insuranceForm.applayStatus = row.applayStatus
+ this.insuranceForm.reportStatus = row.reportStatus + ''
+ this.insuranceForm.applayStatus = row.applayStatus + ''
this.insuranceForm.auditor = row.auditor
this.insuranceForm.createTime = row.createTime
this.insuranceForm.creator = row.creator
@@ -4576,7 +4847,7 @@
this.insuranceForm.delFlag = row.delFlag
this.insuranceForm.version = row.version
this.insuranceForm.remark = row.remark
-
+ debugger
this.dialogshowArr[8].show = true
},
selectAccidentCases() {
@@ -5319,20 +5590,6 @@
}
}
- }
-}
-
-.info-input-form {
- .el-form-item {
- height: 35px;
- margin-bottom: 20px;
- width: 95%;
- div {
- height: 35px;
- }
- .el-input__inner {
- height: 35px;
- }
}
}
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index faa0bed..de16d5a 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -1315,10 +1315,10 @@
>
<el-select v-model="labelfrom.labelid" placeholder="请选择移动的标签">
<el-option
- v-for="item in activities"
- :key="item.id"
- :value="item.id"
- :label="item.timestamp"
+ v-for="items in activities"
+ :key="items.id"
+ :value="items.id"
+ :label="items.timestamp"
/>
</el-select>
</el-form-item>
@@ -1472,10 +1472,10 @@
>
<el-select v-model="labelfrom.labelid" placeholder="请选择移动的标签">
<el-option
- v-for="item in activities"
- :key="item.id"
- :value="item.id"
- :label="item.timestamp"
+ v-for="items in activities"
+ :key="items.id"
+ :value="items.id"
+ :label="items.timestamp"
/>
</el-select>
</el-form-item>
diff --git a/src/views/user/inemployees.vue b/src/views/user/inemployees.vue
index f7f6973..06b2969 100644
--- a/src/views/user/inemployees.vue
+++ b/src/views/user/inemployees.vue
@@ -165,7 +165,7 @@
<el-button type="danger" class="hr-but-all" @click="showXzyg(0)">新增员工</el-button>
<el-button type="primary" class="hr-but-all" @click="delEmp">删除员工</el-button>
<el-button type="danger" class="hr-but-all" @click="showYgdg(0)">员工调岗</el-button>
- <el-button type="danger" class="hr-but-all" @click="showDryg(0)">导入员工</el-button>
+ <!-- <el-button type="danger" class="hr-but-all" @click="showDryg(0)">导入员工</el-button> -->
<el-button type="danger" class="hr-but-all" @click="showDcyg(0)">导出员工</el-button>
<el-button type="danger" class="hr-but-all" @click="doDcda">导出档案</el-button>
<el-button type="danger" class="hr-but-all" @click="showGbda(0)">关闭档案</el-button>
--
Gitblit v1.8.0