From 5386a70600dc4e0d28af9fb81c16667d2b850af8 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期三, 24 三月 2021 22:41:38 +0800
Subject: [PATCH] feat(员工档案-入离职记录): 员工档案中入离职按记录顺序显示
---
src/views/user/archivesEdit.vue | 342 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 202 insertions(+), 140 deletions(-)
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index 87b5a19..314ba93 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -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">
@@ -532,7 +532,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件" :disabled="readon ? false : true">
+ <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件" :disabled="readon ? false : true">
<el-option
v-for="dict in certificateListOptions"
:key="dict.dicItemCode"
@@ -578,7 +578,7 @@
<el-table-column show-overflow-tooltip="true" prop="jobContent" label="主要工作内容" />
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editWorkExperience(scope.row)">编辑</span>
+ <span class="table-button" @click="editWorkExperience(scope.row,1)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'workExperienceDataselection')">删除</span>
</template>
</el-table-column>
@@ -618,19 +618,19 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editPhysicalExam(scope.row)">编辑</span>
+ <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="体检医院" />
- <el-table-column show-overflow-tooltip="true" prop="physicalExamDate" label="体检日期" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="physicalExamType" label="体检类型" width="120" :formatter="typeFormat" />
- <el-table-column show-overflow-tooltip="true" prop="bloodPressure" label="血压" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="transaminase" label="转氨酶" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="ecg" label="心电图" width="120" :formatter="ecgNameFormat" />
+ <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="120" />
+ <el-table-column show-overflow-tooltip="true" prop="reviewRecord" label="复查记录" width="140" />
<el-table-column show-overflow-tooltip="true" prop="remark" label="备注" />
</el-table>
<pagination
@@ -668,7 +668,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editContractInfo(scope.row)">编辑</span>
+ <span class="table-button" @click="editContractInfo(scope.row,3)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'contractInfoDataselection')">删除</span>
</template>
</el-table-column>
@@ -714,6 +714,7 @@
<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>
<pagination
v-show="jobChangeDatatotal>0"
@@ -750,8 +751,8 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editLeaveInfo(scope.row)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'onleaveInfoDataselection')">删除</span>
+ <span class="table-button" @click="editLeaveInfo(scope.row,5)">编辑</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="" />
@@ -798,14 +799,14 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editResign(scope.row)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'onresignDataselection')">删除</span>
+ <span class="table-button" @click="editResign(scope.row,5)">编辑</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="辞职申请日期" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="reason" label="辞职事由" width="180" />
- <el-table-column show-overflow-tooltip="true" prop="reporter" label="汇报人" width="180" />
+ <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>
<pagination
@@ -843,18 +844,18 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editDimissionAttend(scope.row)">编辑</span>
+ <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="离职考勤月份" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="attendDays" label="出勤天数" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="overtimeDay" label="加班（天）" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="overtimeHour" label="加班（小时）" width="120" />
+ <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="请假（天）" width="120" />
- <el-table-column show-overflow-tooltip="true" prop="absenteeism" label="旷工（天）" width="120" />
+ <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>
<pagination
@@ -927,7 +928,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editUnemployment(scope.row)">编辑</span>
+ <span class="table-button" @click="editUnemployment(scope.row,7)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'unemploymentDataselection')">删除</span>
</template>
</el-table-column>
@@ -973,7 +974,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editInsurance(scope.row)">编辑</span>
+ <span class="table-button" @click="editInsurance(scope.row,8)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'oninsuranceDataselection')">删除</span>
</template>
</el-table-column>
@@ -1021,7 +1022,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editAccidentCases(scope.row)">编辑</span>
+ <span class="table-button" @click="editAccidentCases(scope.row,9)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'accidentCasesDataselection')">删除</span>
</template>
</el-table-column>
@@ -1040,6 +1041,7 @@
<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>
<pagination
v-show="accidentCasesDatatotal>0"
@@ -1076,7 +1078,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editOccupational(scope.row)">编辑</span>
+ <span class="table-button" @click="editOccupational(scope.row,10)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'occupationalDataselection')">删除</span>
</template>
</el-table-column>
@@ -1095,6 +1097,7 @@
<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>
<pagination
v-show="occupationalDatatotal>0"
@@ -1131,7 +1134,7 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editLaborTrouble(scope.row)">编辑</span>
+ <span class="table-button" @click="editLaborTrouble(scope.row,11)">编辑</span>
<span class="table-button" @click="singleDelete(scope.row, 'laborTroubleDataselection')">删除</span>
</template>
</el-table-column>
@@ -1142,7 +1145,7 @@
<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="arbitrationStatus" label="是否结案" width="100" :formatter="arbitrationStatusFormat" />
<el-table-column show-overflow-tooltip="true" prop="settleDate" label="案结日期" width="100" />
</el-table>
<pagination
@@ -1180,8 +1183,8 @@
</el-table-column>
<el-table-column show-overflow-tooltip="true" fixed="right" label="操作" width="120">
<template slot-scope="scope">
- <span class="table-button" @click="editBadRecord(scope.row)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'onbadRecordDataselection')">删除</span>
+ <span class="table-button" @click="editBadRecord(scope.row,12)">编辑</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="" />
@@ -1232,8 +1235,8 @@
<!-- @click="singleDelete(scope.row, 'onremarkInfoDataselection')"-->
<!-- >删除-->
<!-- </el-button>-->
- <span class="table-button" @click="editRemarkInfo(scope.row)">编辑</span>
- <span class="table-button" @click="singleDelete(scope.row, 'onremarkInfoDataselection')">删除</span>
+ <span class="table-button" @click="editRemarkInfo(scope.row,13)">编辑</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="" />
@@ -1270,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>
@@ -1327,6 +1323,7 @@
>下载
</el-button>
<el-button
+ class="pri-del-btn"
type="primary"
icon="el-icon-search"
size="mini"
@@ -1334,7 +1331,7 @@
>删除
</el-button>
<el-popconfirm title="是否移动附件？" @onConfirm="mvdialogFormVisible = true">
- <el-button slot="reference" class="hr-but" type="danger">转存</el-button>
+ <el-button slot="reference" type="danger">转存</el-button>
</el-popconfirm>
</el-col>
</el-row>
@@ -1374,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>
@@ -1457,8 +1467,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" />
@@ -1504,7 +1514,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putWorkExperience('workExperienceForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="体检信息" append-to-body :visible.sync="dialogshowArr[2].show" width="50%">
@@ -1559,8 +1569,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" />
@@ -1608,7 +1618,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putPhysicalExam('physicalExamForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="合同信息" append-to-body :visible.sync="dialogshowArr[3].show" width="50%">
@@ -1668,8 +1678,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" />
@@ -1697,7 +1707,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putContractInfo('contractInfoForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="离职当月考勤" append-to-body :visible.sync="dialogshowArr[4].show" width="50%">
@@ -1750,8 +1760,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" />
@@ -1779,7 +1789,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putDimissionAttend('dimissionAttendForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="请假记录" append-to-body :visible.sync="dialogshowArr[5].show" width="50%">
@@ -1839,8 +1849,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" />
@@ -1880,7 +1890,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putLeaveInfo('leaveInfoForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="辞职申请" append-to-body :visible.sync="dialogshowArr[6].show" width="50%">
@@ -1918,8 +1928,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" />
@@ -1946,7 +1956,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putResign('resignForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="失业金领取" append-to-body :visible.sync="dialogshowArr[7].show" width="50%">
@@ -1993,8 +2003,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" />
@@ -2018,7 +2028,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putUnemployment('unemploymentForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="社保申请" append-to-body :visible.sync="dialogshowArr[8].show" width="50%">
@@ -2082,8 +2092,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" />
@@ -2116,7 +2126,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putInsurance('insuranceForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="意外险案件" append-to-body :visible.sync="dialogshowArr[9].show" width="50%">
@@ -2163,8 +2173,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" />
@@ -2268,7 +2278,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="工伤案件" append-to-body :visible.sync="dialogshowArr[10].show" width="50%">
@@ -2315,8 +2325,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" />
@@ -2465,7 +2475,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putOccupational('occupationalForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="劳资案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
@@ -2507,7 +2517,7 @@
<el-form-item label="汇报人" prop="reporter">
<el-input v-model="laborTroubleForm.reporter" />
</el-form-item>
- <el-form-item label="状态" prop="arbitrationStatus">
+ <el-form-item label="是否结案" prop="arbitrationStatus">
<el-select v-model="laborTroubleForm.arbitrationStatus" placeholder="">
<el-option
v-for="dict in settleStatusOptions"
@@ -2522,8 +2532,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" />
@@ -2572,7 +2582,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putLaborTrouble('laborTroubleForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="不良记录" append-to-body :visible.sync="dialogshowArr[12].show" width="50%">
@@ -2616,8 +2626,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" />
@@ -2644,7 +2654,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putBadRecord('badRecordForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
<el-dialog title="备注信息" append-to-body :visible.sync="dialogshowArr[13].show" width="50%">
@@ -2688,8 +2698,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" />
@@ -2706,7 +2716,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putRemarkInfo('remarkInfoForm')">保 存</el-button>
- <el-button @click="dialogIsShow()">取 消</el-button>
+
</div>
</el-dialog>
</el-dialog>
@@ -2771,6 +2781,33 @@
},
readon: false,
workExperienceModal: true,
+ restaurJob: [{ value: '总经理', code: '2942725270000031' },
+ { value: '总秘', code: '2942725270000032' },
+ { value: '总助', code: '2942725270000033' },
+ { value: '经理', code: '2942725270000022' },
+ { value: '副经理', code: '2942725270000015' },
+ { value: '助理', code: '2942725270000030' },
+ { value: '项目经理', code: '2942725270000027' },
+ { value: '大队长', code: '2942725270000006' },
+ { value: '大队长兼内勤', code: '2942725270000007' },
+ { value: '中队长', code: '2942725270000029' },
+ { value: '队长', code: '2942725270000011' },
+ { value: '分队长', code: '2942725270000013' },
+ { value: '副队长', code: '2942725270000014' },
+ { value: '班长', code: '2942725270000002' },
+ { value: '保安员', code: '2942725270000003' },
+ { value: '内勤', code: '2942725270000024' },
+ { value: '保洁', code: '2942725270000004' },
+ { value: '电工', code: '2942725270000010' },
+ { value: '绿化工', code: '2942725270000023' },
+ { value: '出纳', code: '2942725270000005' },
+ { value: '人事专员', code: '2942725270000025' },
+ { value: '司机', code: '2942725270000026' },
+ { value: '购买保险', code: '2942725270000016' },
+ { value: '广州燃气中队长', code: '2942725270000018' },
+ { value: '管理员', code: '2942725270000017' },
+ { value: '监控员', code: '2942725270000021' },
+ { value: '员工', code: '2942725270000028' }],
dialogshowArr: [
{
show: false
@@ -3087,33 +3124,6 @@
{ value: '台湾省', code: '710000' },
{ value: '香港特别行政区', code: '810000' },
{ value: '澳门特别行政区', code: '820000' }],
- restaurJob: [{ value: '总经理', code: '2942725270000031' },
- { value: '总秘', code: '2942725270000032' },
- { value: '总助', code: '2942725270000033' },
- { value: '经理', code: '2942725270000022' },
- { value: '副经理', code: '2942725270000015' },
- { value: '助理', code: '2942725270000030' },
- { value: '项目经理', code: '2942725270000027' },
- { value: '大队长', code: '2942725270000006' },
- { value: '大队长兼内勤', code: '2942725270000007' },
- { value: '中队长', code: '2942725270000029' },
- { value: '队长', code: '2942725270000011' },
- { value: '分队长', code: '2942725270000013' },
- { value: '副队长', code: '2942725270000014' },
- { value: '班长', code: '2942725270000002' },
- { value: '保安员', code: '2942725270000003' },
- { value: '内勤', code: '2942725270000024' },
- { value: '保洁', code: '2942725270000004' },
- { value: '电工', code: '2942725270000010' },
- { value: '绿化工', code: '2942725270000023' },
- { value: '出纳', code: '2942725270000005' },
- { value: '人事专员', code: '2942725270000025' },
- { value: '司机', code: '2942725270000026' },
- { value: '购买保险', code: '2942725270000016' },
- { value: '广州燃气中队长', code: '2942725270000018' },
- { value: '管理员', code: '2942725270000017' },
- { value: '监控员', code: '2942725270000021' },
- { value: '员工', code: '2942725270000028' }],
types: '',
physicalExamData: [],
physicalExamDataselection: [],
@@ -3614,7 +3624,9 @@
arbitrationTypeOptions: [],
changeTypeOptions: [],
dimissionTypeOptions: [],
- sexOptions: []
+ sexOptions: [],
+ srcList: [],
+ getImg: pages.getAccessoryImage
}
},
computed: {
@@ -3705,6 +3717,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)
},
@@ -3740,6 +3758,9 @@
},
arbitrationStatusFormat(row, column) {
return this.selectDictLabel(this.settleStatusOptions, row.arbitrationStatus)
+ },
+ settleStatusFormat(row, column) {
+ return this.selectDictLabel(this.settleStatusOptions, row.settleStatus)
},
beforeAvatarUpload(file) {
this.fileDate.labelid = this.activities[this.beforeIndex].id
@@ -3786,6 +3807,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':
@@ -4096,6 +4121,13 @@
})
},
setArchives(val) {
+ let certificateList = []
+ if (val.certificateList && typeof val.certificateList === 'string') {
+ 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
@@ -4159,8 +4191,12 @@
initdimissionLogData(params = {}) {
params.pageSize = this.pagination.size
params.pageNum = this.pagination.num
+ params.empStatus = this.empBaseInfoForm.empStatus
+ params.empId = this.empBaseInfoForm.empId
params.dimissionType = ''
params.delFlag = '0'
+ params.field = 'createTime'
+ params.order = 'ascending'
this.$get('hr/empDimissionlog/list', {
...params
}).then((r) => {
@@ -4186,7 +4222,13 @@
this.readon = true
},
gzupdate1() {
+ // 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'
@@ -5057,6 +5099,7 @@
this.workExperienceForm.modifier = row.modifier
this.workExperienceForm.delFlag = row.delFlag
this.workExperienceForm.version = row.version
+ this.thisShowIndex = 1
this.dialogshowArr[1].show = true
},
editPhysicalExam(row) {
@@ -5086,7 +5129,7 @@
this.physicalExamForm.modifier = row.modifier
this.physicalExamForm.delFlag = row.delFlag
this.physicalExamForm.version = row.version
-
+ this.thisShowIndex = 2
this.dialogshowArr[2].show = true
},
editContractInfo(row) {
@@ -5115,7 +5158,7 @@
this.contractInfoForm.modifier = row.modifier
this.contractInfoForm.delFlag = row.delFlag
this.contractInfoForm.version = row.version
-
+ this.thisShowIndex = 3
this.dialogshowArr[3].show = true
},
editDimissionAttend(row) {
@@ -5143,6 +5186,7 @@
this.dimissionAttendForm.delFlag = row.delFlag
this.dimissionAttendForm.version = row.version
this.dimissionAttendForm.remark = row.remark
+ this.thisShowIndex = 4
this.dialogshowArr[4].show = true
},
editLeaveInfo(row) {
@@ -5171,7 +5215,7 @@
this.leaveInfoForm.delFlag = row.delFlag
this.leaveInfoForm.version = row.version
this.leaveInfoForm.remark = row.remark
-
+ this.thisShowIndex = 5
this.dialogshowArr[5].show = true
},
editResign(row) {
@@ -5197,7 +5241,7 @@
this.resignForm.delFlag = row.delFlag
this.resignForm.version = row.version
this.resignForm.remark = row.remark
-
+ this.thisShowIndex = 6
this.dialogshowArr[6].show = true
},
editUnemployment(row) {
@@ -5224,7 +5268,7 @@
this.unemploymentForm.modifier = row.modifier
this.unemploymentForm.delFlag = row.delFlag
this.unemploymentForm.version = row.version
-
+ this.thisShowIndex = 7
this.dialogshowArr[7].show = true
},
editInsurance(row) {
@@ -5252,7 +5296,7 @@
this.insuranceForm.delFlag = row.delFlag
this.insuranceForm.version = row.version
this.insuranceForm.remark = row.remark
-
+ this.thisShowIndex = 8
this.dialogshowArr[8].show = true
},
editAccidentCases(row) {
@@ -5293,7 +5337,7 @@
this.accidentCasesForm.modifier = row.modifier
this.accidentCasesForm.delFlag = row.delFlag
this.accidentCasesForm.version = row.version
-
+ this.thisShowIndex = 9
this.dialogshowArr[9].show = true
},
editOccupational(row) {
@@ -5343,7 +5387,7 @@
this.occupationalForm.delFlag = row.delFlag
this.occupationalForm.version = row.version
this.occupationalForm.remark = row.remark
-
+ this.thisShowIndex = 10
this.dialogshowArr[10].show = true
},
editLaborTrouble(row) {
@@ -5373,7 +5417,7 @@
this.laborTroubleForm.delFlag = row.delFlag
this.laborTroubleForm.version = row.version
this.laborTroubleForm.remark = row.remark
-
+ this.thisShowIndex = 11
this.dialogshowArr[11].show = true
},
editBadRecord(row) {
@@ -5398,6 +5442,7 @@
this.badRecordForm.delFlag = row.delFlag
this.badRecordForm.version = row.version
this.badRecordForm.remark = row.remark
+ this.thisShowIndex = 12
this.dialogshowArr[12].show = true
},
editRemarkInfo(row) {
@@ -5420,10 +5465,11 @@
this.remarkInfoForm.modifier = row.modifier
this.remarkInfoForm.delFlag = row.delFlag
this.remarkInfoForm.version = row.version
-
+ this.thisShowIndex = 13
this.dialogshowArr[13].show = true
},
gzadd(index) {
+ debugger
this.isAdd = true
this.thisShowIndex = index
this.dialogshowArr[index].show = true
@@ -5501,9 +5547,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()
@@ -5547,6 +5593,11 @@
const results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants
// 调用 callback 返回建议列表的数据
cb(results)
+ },
+ createFilter(queryString) {
+ return (restaurant) => {
+ return (restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0)
+ }
},
jobNameSelect(items) {
this.empBaseInfoForm.jobName = items.value
@@ -5650,7 +5701,7 @@
singleDelete(row, names) {
let ids = ''
let urls = ''
- if (names === 'onremarkInfoDataselection') {
+ if (names === 'remarkInfoDataselection') {
ids = row.remarkId
urls = 'empRemarkInfo'
} else if (names === 'onbadRecordDataselection') {
@@ -5923,9 +5974,10 @@
}
.uploading-image {
- width: 100%;
- height: 100%;
+ width: 70%;
+ height: 70%;
display: block;
+ margin: 0 auto;
}
}
@@ -5959,6 +6011,13 @@
/* 设置鼠标经过对勾框，对勾框边框的颜色 */
.myRedCheckBox .el-checkbox__inner:hover {
border-color: #a32c30;
+}
+
+.myRedCheckBox .el-checkbox__label {
+ width: 90%;
+ overflow: hidden;
+ text-overflow:ellipsis;
+ white-space: nowrap;
}
.avatar-uploader .el-upload {
@@ -6081,8 +6140,8 @@
button.el-dialog__headerbtn {
height: 30px;
width: 30px;
- background-color: #333;
- opacity: 0.4;
+ background-color: #a00515;
+ opacity: 0.8;
line-height: 30px;
border-radius: 50%;
i {
@@ -6121,5 +6180,8 @@
color: #333 !important;
}
}
+.pri-del-btn {
+ background-color: rgb(64, 158, 255) !important;
+ border-color: rgb(64, 158, 255) !important;
+}
</style>
-
--
Gitblit v1.8.0