From 5e4c4249dc0f4d457b30873f3a65a2ddb3d3f970 Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期五, 26 三月 2021 23:56:44 +0800
Subject: [PATCH] fix: 修改bug
---
src/views/user/archivesEdit.vue | 402 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 215 insertions(+), 187 deletions(-)
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index ec6da03..ad1cf46 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -5,7 +5,7 @@
width="100%"
height="100vh"
center
- fullscreen="true"
+ fullscreen
:close-on-click-modal="false"
:visible.sync="isVisible"
>
@@ -27,7 +27,7 @@
</el-upload>
<!-- <img src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1333074204,3035391839&fm=26&gp=0.jpg" class="jbxxImg">-->
<div class="title-da">
- 编号：{{ empBaseInfoForm.empNumb }}
+ 档案号：{{ empBaseInfoForm.archivesNumb }}
</div>
</div>
<ul class="jbxx-ul" style="height: 68vh;overflow: auto">
@@ -221,8 +221,8 @@
<el-form ref="empBaseInfoForm" :model="empBaseInfoForm" class="formjbxx" label-width="150px">
<el-row style="width: 100%;">
<el-col :span="8">
- <el-form-item label="档案号" prop="archivesNumb">
- <el-input v-model="empBaseInfoForm.archivesNumb" style="width: 100%;" :disabled="readon ? false : true" />
+ <el-form-item label="编号" prop="empNumb">
+ <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -385,7 +385,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="籍贯" prop="nativePlaceName">
- <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择最高学历" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.nativePlace" placeholder="请选择籍贯" :disabled="readon ? false : true">
<el-option
v-for="dict in nativePlaceOptions"
:key="dict.dicItemCode"
@@ -566,17 +566,17 @@
:highlight-current-row="true"
@selection-change="onworkExperienceDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="workExperienceId" label="工作单位" />
- <el-table-column show-overflow-tooltip="true" prop="beginDate" label="开始日期" />
- <el-table-column show-overflow-tooltip="true" prop="endDate" label="结束日期" />
- <el-table-column show-overflow-tooltip="true" prop="workUnit" label="工作单位" />
- <el-table-column show-overflow-tooltip="true" prop="jobContent" label="主要工作内容" />
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="workExperienceId" 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="workUnit" label="工作单位" />
+ <el-table-column show-overflow-tooltip prop="jobContent" label="主要工作内容" />
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editWorkExperience(scope.row,1)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'workExperienceDataselection')">删除</span>
@@ -611,27 +611,27 @@
style="width: 100%;"
@selection-change="onphysicalExamDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editPhysicalExam(scope.row,2)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'physicalExamDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="physicalExamId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="hospital" label="体检医院" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="140" />
- <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="140" :formatter="typeFormat" />
- <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="140" />
- <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="140" />
- <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="140" :formatter="ecgNameFormat" />
- <el-table-column show-overflow-tooltip="true" prop="conclusion" label="体检结论" />
- <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="140" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="physicalExamId" label="" />
+ <el-table-column show-overflow-tooltip prop="hospital" label="体检医院" width="150" />
+ <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="140" />
+ <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="140" :formatter="typeFormat" />
+ <el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="140" />
+ <el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="140" />
+ <el-table-column show-overflow-tooltip prop="ecg" label="心电图" width="140" :formatter="ecgNameFormat" />
+ <el-table-column show-overflow-tooltip prop="conclusion" label="体检结论" />
+ <el-table-column show-overflow-tooltip prop="reviewRecord" label="复查记录" width="140" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="physicalExamDatatotal>0"
@@ -661,23 +661,23 @@
style="width: 100%;"
@selection-change="oncontractInfoDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editContractInfo(scope.row,3)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'contractInfoDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="contractId" label="" />
- <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="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
- <el-table-column show-overflow-tooltip="true" prop="transactor" label="合同办理人" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="contractId" label="" />
+ <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>
<pagination
v-show="contractInfoDatatotal>0"
@@ -702,19 +702,19 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="newDeptName" label="现部门" />
- <el-table-column show-overflow-tooltip="true" prop="newJobName" label="现岗位" />
- <el-table-column show-overflow-tooltip="true" prop="empName" label="姓名" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="oldDeptName" label="原部门" />
- <el-table-column show-overflow-tooltip="true" prop="oldJobName" label="原岗位" />
- <el-table-column show-overflow-tooltip="true" prop="changeDate" label="调岗日期" />
- <el-table-column show-overflow-tooltip="true" prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
- <el-table-column show-overflow-tooltip="true" prop="changeReason" label="调岗理由" />
+ <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
+ <el-table-column show-overflow-tooltip prop="newJobName" label="现岗位" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="180" />
+ <el-table-column show-overflow-tooltip prop="oldDeptName" label="原部门" />
+ <el-table-column show-overflow-tooltip prop="oldJobName" label="原岗位" />
+ <el-table-column show-overflow-tooltip prop="changeDate" label="调岗日期" />
+ <el-table-column show-overflow-tooltip prop="changeType" label="调岗类型" :formatter="changeTypeFormat" />
+ <el-table-column show-overflow-tooltip prop="changeReason" label="调岗理由" />
</el-table>
<pagination
v-show="jobChangeDatatotal>0"
@@ -744,25 +744,25 @@
style="width: 100%;"
@selection-change="onleaveInfoDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editLeaveInfo(scope.row,5)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'onleaveInfoDataselection')">删除</span>
+ <span class="table-button" @click="singleDelete(scope.row, 'leaveInfoDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="leaveId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="beginTime" label="开始时间" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="endTime" label="结束时间" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假天数" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="leaveType" label="请假类型" :formatter="leaveTypeFormat" />
- <el-table-column show-overflow-tooltip="true" prop="returnDate" label="到岗时间" width="180" />
- <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 v-if="fsnumShow" show-overflow-tooltip prop="leaveId" label="" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="180" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="180" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="100" />
+ <el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" :formatter="leaveTypeFormat" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="180" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="leaveInfoDatatotal>0"
@@ -792,22 +792,22 @@
style="width: 100%;"
@selection-change="onresignDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editResign(scope.row,5)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'onresignDataselection')">删除</span>
+ <span class="table-button" @click="singleDelete(scope.row, 'resignDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="resignId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="applayDate" label="辞职申请日期" />
- <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="resignId" label="" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" />
+ <el-table-column show-overflow-tooltip prop="reason" label="辞职事由" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="resignDatatotal>0"
@@ -837,26 +837,26 @@
style="width: 100%;"
@selection-change="ondimissionAttendDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editDimissionAttend(scope.row,6)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'dimissionAttendDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="dimissionAttendId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="attendMonth" label="离职考勤月份" />
- <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班（天）" width="150" />
- <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班（小时）" />
- <el-table-column show-overflow-tooltip="true" prop="deduct" label="有无代扣款项" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="leaveDay" label="请假（天）" />
- <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工（天）" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="dimissionAttendId" label="" />
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" />
+ <el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="150" />
+ <el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="150" />
+ <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" />
+ <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="180" />
+ <el-table-column show-overflow-tooltip prop="leaveDay" label="请假（天）" />
+ <el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="dimissionAttendDatatotal>0"
@@ -881,17 +881,17 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
style="width: 100%;"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>EmpLeaveInfo
</el-table-column>
- <el-table-column show-overflow-tooltip="true" prop="entryDate" label="入职日期" />
- <el-table-column show-overflow-tooltip="true" prop="dimissionDate" label="离职日期" />
- <el-table-column show-overflow-tooltip="true" prop="dimissionType" label="离职类型" :formatter="dimissionTypeFormat" />
- <el-table-column show-overflow-tooltip="true" prop="selfLeaveDay" label="自离天数" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="entryDate" label="入职日期" />
+ <el-table-column show-overflow-tooltip prop="dimissionDate" label="离职日期" />
+ <el-table-column show-overflow-tooltip prop="dimissionType" label="离职类型" :formatter="dimissionTypeFormat" />
+ <el-table-column show-overflow-tooltip prop="selfLeaveDay" label="自离天数" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="dimissionLogDatatotal>0"
@@ -921,23 +921,23 @@
style="width: 100%;"
@selection-change="onunemploymentDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editUnemployment(scope.row,7)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'unemploymentDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="unemploymentId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="applayDate" label="失业金申请日期" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="applayReason" label="申报事由" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="auditor" label="审核人" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="unemploymentId" label="" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180" />
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="unemploymentDatatotal>0"
@@ -967,25 +967,25 @@
style="width: 100%;"
@selection-change="oninsuranceDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editInsurance(scope.row,8)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'oninsuranceDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="insuranceId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="applayDate" label="社保申请日期" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="proposer" label="申请人" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
- <el-table-column show-overflow-tooltip="true" prop="reportStatus" label="是否已报告" :formatter="reportStatusFormat" />
- <el-table-column show-overflow-tooltip="true" prop="applayStatus" label="状态" :formatter="applayStatusFormat" />
- <el-table-column show-overflow-tooltip="true" prop="auditor" label="审核人" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="insuranceId" label="" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="180" />
+ <el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" />
+ <el-table-column show-overflow-tooltip prop="reportStatus" label="是否已报告" :formatter="reportStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="applayStatus" label="状态" :formatter="applayStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="insuranceDatatotal>0"
@@ -1015,33 +1015,33 @@
style="width: 100%;"
@selection-change="onaccidentCasesDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editAccidentCases(scope.row,9)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'accidentCasesDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="accidentId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="意外险诊断" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
- <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="60" />
- <el-table-column show-overflow-tooltip="true" prop="reprotTime" label="报案时间" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="innsureFee" label="保险赔付费用" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="accidentId" label="" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+ <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" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="100" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="100" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+ <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="100" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="100" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+ <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="120" />
+ <el-table-column show-overflow-tooltip prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
</el-table>
<pagination
v-show="accidentCasesDatatotal>0"
@@ -1071,33 +1071,33 @@
style="width: 100%;"
@selection-change="onoccupationalDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editOccupational(scope.row,10)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'occupationalDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="occupationalId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="injuredTime" label="受伤日期" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="injuredAddress" label="受伤地点" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="injuredPart" label="受伤部位" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDescribe" label="受伤经过描述" width="140" />
- <el-table-column show-overflow-tooltip="true" prop="injuredDiacrisis" label="工伤诊断" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalName" label="就诊医院" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="treatmentName" label="就诊科室" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
- <el-table-column show-overflow-tooltip="true" prop="bedNumb" label="床号" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="reportTime" label="报案时间" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="submitTime" label="递交资料时间" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="sbumitBy" label="递交人" width="80" />
- <el-table-column show-overflow-tooltip="true" prop="expensesFee" label="医疗总费用" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="compensated" label="已赔付医药费用" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="occupationalId" label="" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="100" />
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="100" />
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="140" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" width="80" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="120" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="100" />
+ <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="80" :formatter="hospitalizatioFlagFormat" />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="80" />
+ <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="100" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="80" />
+ <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="100" />
+ <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="120" />
+ <el-table-column show-overflow-tooltip prop="settleStatus" label="是否结案" width="120" :formatter="settleStatusFormat" />
</el-table>
<pagination
v-show="occupationalDatatotal>0"
@@ -1127,26 +1127,26 @@
style="width: 100%;"
@selection-change="onlaborTroubleDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editLaborTrouble(scope.row,11)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'laborTroubleDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="arbitrationId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationDate" label="仲裁日期" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationType" label="仲裁类型" :formatter="arbitrationTypeFormat" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationReason" label="仲裁事由" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="报备人" width="100" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationPay" label="仲裁赔付（元）" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="arbitrationStatus" label="是否结案" width="100" :formatter="arbitrationStatusFormat" />
- <el-table-column show-overflow-tooltip="true" prop="settleDate" label="案结日期" width="100" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="arbitrationId" label="" />
+ <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" :formatter="arbitrationTypeFormat" />
+ <el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="100" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
+ <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="180" />
+ <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="是否结案" width="100" :formatter="arbitrationStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
</el-table>
<pagination
v-show="laborTroubleDatatotal>0"
@@ -1176,22 +1176,22 @@
style="width: 100%;"
@selection-change="onbadRecordDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<span class="table-button" @click="editBadRecord(scope.row,12)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'onbadRecordDataselection')">删除</span>
+ <span class="table-button" @click="singleDelete(scope.row, 'badRecordDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="badId" label="" />
- <el-table-column show-overflow-tooltip="true" prop="badDate" label="不良记录日期" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="badContent" label="不良记录描述" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
+ <el-table-column v-if="fsnumShow" show-overflow-tooltip prop="badId" label="" />
+ <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="180" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="badRecordDatatotal>0"
@@ -1221,12 +1221,12 @@
style="width: 100%;"
@selection-change="onremarkInfoDataselection"
>
- <el-table-column show-overflow-tooltip="true" type="index" label="序号" align="center" width="55">
+ <el-table-column show-overflow-tooltip type="index" label="序号" align="center" width="55">
<template slot-scope="scope">
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
+ <el-table-column show-overflow-tooltip fixed="right" label="操作" width="120">
<template slot-scope="scope">
<!-- <el-button type="text" size="small" @click="editRemarkInfo(scope.row)">编辑</el-button>-->
<!-- <el-button-->
@@ -1236,12 +1236,12 @@
<!-- >删除-->
<!-- </el-button>-->
<span class="table-button" @click="editRemarkInfo(scope.row,13)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'onremarkInfoDataselection')">删除</span>
+ <span class="table-button" @click="singleDelete(scope.row, 'remarkInfoDataselection')">删除</span>
</template>
</el-table-column>
- <el-table-column v-if="fsnumShow" show-overflow-tooltip="true" prop="remarkId" 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 v-if="fsnumShow" show-overflow-tooltip prop="remarkId" 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="remarkInfoDatatotal>0"
@@ -1273,13 +1273,6 @@
</div>
<div class="jbxxCon">
<div class="zs-main">
- <!-- <el-row class="search-title">-->
- <!-- <el-col :span="18" class="title">-->
- <!-- <!– <div class="zs-title">上传附件</div>–>-->
- <!-- <p />-->
- <!-- </el-col>-->
-
- <!-- </el-row>-->
<el-container style="background-color: #fff;">
<el-aside width="210px" style="background-color: #fff;text-align: center;padding-top: 0">
<h4 style="margin-top: 0">{{ empBaseInfoForm.empName }}：{{ empBaseInfoForm.deptName }}</h4>
@@ -1378,21 +1371,34 @@
<el-main style="background-color: #fff;margin-top: 5%;">
<el-row v-for="(data, index) in filesUploadData" :key="index">
<template v-for="(node, nodeIndex) in data.node">
- <el-col v-if="node.isUpload === false" :key="node.filesid" :span="3">
+ <el-col v-if="node.isUpload === false" :key="node.accessoryid" :span="3">
<el-card
shadow="never"
@click.native="clickCard(index * 8 + nodeIndex)"
>
- <img
+ <el-image
+ v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1"
:src="showFileImg(node.filesformat)"
class="uploading-image"
- >
- <el-tooltip class="item" effect="dark" :content="node.filesname" placement="bottom">
+ :preview-src-list="srcList"
+ @click="clickImg(node)"
+ />
+ <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) == -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
+ <div style="padding-top: 14px;text-align: center">
+ <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">{{ node.filesname }}</el-checkbox>
+ </div>
+ </el-tooltip>
+ <el-tooltip v-if="'tif,bmp,jpg,png,gif'.indexOf(node.filesformat) != -1" class="item" effect="dark" :content="node.filesname" placement="bottom">
<div style="padding-top: 14px;">
- <el-checkbox
- v-model="checkedArr[index * 8 + nodeIndex].isChecked"
- class="myRedCheckBox"
- >{{ node.filesname }}
+ <el-image
+ style="width: 100px; height: 80px;margin-top: -10px;"
+ :src="getImg+node.accessoryid"
+ :preview-src-list="srcList"
+ @click="clickImg(node)"
+ />
+ <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">
+
+ {{ node.filesname }}
</el-checkbox>
</div>
</el-tooltip>
@@ -3186,7 +3192,6 @@
creator: '',
modifyTime: '',
modifier: '',
-
empStatus: 0,
version: ''
},
@@ -3618,7 +3623,9 @@
arbitrationTypeOptions: [],
changeTypeOptions: [],
dimissionTypeOptions: [],
- sexOptions: []
+ sexOptions: [],
+ srcList: [],
+ getImg: pages.getAccessoryImage
}
},
computed: {
@@ -3709,6 +3716,12 @@
})
},
methods: {
+ clickImg(node) {
+ this.srcList = []
+ if ('tif,bmp,jpg,png,gif'.indexOf(node.filesformat) >= 0) {
+ this.srcList.push(this.getImg + node.accessoryid)
+ }
+ },
typeFormat(row, column) {
return this.selectDictLabel(this.physicalExamTypeOptions, row.physicalExamType)
},
@@ -3793,6 +3806,10 @@
},
showFileImg(type) {
switch (type) {
+ case 'xls':
+ return require('../../assets/uploading/xls.png')
+ case 'xlsx':
+ return require('../../assets/uploading/xls.png')
case 'txt':
return require('../../assets/uploading/txt.png')
case 'apk':
@@ -4108,6 +4125,8 @@
certificateList = val.certificateList.split(',')
val.certificateList = certificateList
}
+ const remarks = ''
+ val.remark = remarks
this.empBaseInfoForm = { ...val }
this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
this.fileDate.empId = this.empBaseInfoForm.empId
@@ -4160,6 +4179,8 @@
params.pageNum = this.pagination.num
params.certificateNumb = this.empBaseInfoForm.certificateNumb
params.delFlag = '0'
+ params.field = 'changeDate'
+ params.order = 'ascending'
this.$get('hr/empJobChange/list', {
...params
}).then((r) => {
@@ -4171,9 +4192,12 @@
initdimissionLogData(params = {}) {
params.pageSize = this.pagination.size
params.pageNum = this.pagination.num
- params.certificateNumb = this.empBaseInfoForm.certificateNumb
+ params.empStatus = this.empBaseInfoForm.empStatus
+ params.empId = this.empBaseInfoForm.empId
params.dimissionType = ''
params.delFlag = '0'
+ params.field = 'entryDate'
+ params.order = 'ascending'
this.$get('hr/empDimissionlog/list', {
...params
}).then((r) => {
@@ -4199,11 +4223,13 @@
this.readon = true
},
gzupdate1() {
- const empBaseInfoForm = this.empBaseInfoForm
- if (empBaseInfoForm.imagePath.indexOf('data:image/jpeg') === -1) {
- this.empBaseInfoForm.imagePath = ''
- }
+ // const empBaseInfoForm = this.empBaseInfoForm
+ // if (empBaseInfoForm.imagePath.indexOf('data:image/jpeg') === -1) {
+ // this.empBaseInfoForm.imagePath = ''
+ // }
this.$put('hr/empBaseInfo', { ...this.empBaseInfoForm }).then(() => {
+ this.readon = false
+ this.$emit('success')
this.$message({
message: this.$t('tips.updateSuccess'),
type: 'success'
@@ -4997,7 +5023,6 @@
this.remarkInfoForm.version = ''
},
dialogIsShow() {
- debugger
this.workExperienceModal = false
this.isAdd = true
this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
@@ -5433,7 +5458,7 @@
this.remarkInfoForm.deptId = row.deptId
this.remarkInfoForm.deptName = row.deptName
this.remarkInfoForm.jobName = row.jobName
- this.remarkInfoForm.remarkContent = row.remarkContent
+ this.$set(this.remarkInfoForm, 'remarkContent', row.remarkContent)
this.remarkInfoForm.remarkDate = row.remarkDate
this.remarkInfoForm.createTime = row.createTime
this.remarkInfoForm.creator = row.creator
@@ -5445,6 +5470,7 @@
this.dialogshowArr[13].show = true
},
gzadd(index) {
+ debugger
this.isAdd = true
this.thisShowIndex = index
this.dialogshowArr[index].show = true
@@ -5522,9 +5548,9 @@
message: this.$t('tips.deleteSuccess'),
type: 'success'
})
- if (selection === 'onremarkInfoDataselection') {
+ if (selection === 'remarkInfoDataselection') {
this.initremarkInfoData()
- } else if (selection === 'onbadRecordDataselection') {
+ } else if (selection === 'badRecordDataselection') {
this.initbadRecordData()
} else if (selection === 'laborTroubleDataselection') {
this.initlaborTroubleData()
@@ -5676,7 +5702,7 @@
singleDelete(row, names) {
let ids = ''
let urls = ''
- if (names === 'onremarkInfoDataselection') {
+ if (names === 'remarkInfoDataselection') {
ids = row.remarkId
urls = 'empRemarkInfo'
} else if (names === 'onbadRecordDataselection') {
@@ -5754,8 +5780,11 @@
this.$emit('close')
},
reset() {
- this.$refs.form.clearValidate()
- this.$refs.form.resetFields()
+ if (undefined !== this.$refs.form) {
+ this.$refs.form.clearValidate()
+ this.$refs.form.resetFields()
+ }
+
this.sysConfig = this.initSysConfig()
}
}
@@ -6160,4 +6189,3 @@
border-color: rgb(64, 158, 255) !important;
}
</style>
-
--
Gitblit v1.8.0