From 4cce4a5d09d5c8ed86f241cd70b6369344d2dfce Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 16 五月 2024 19:08:35 +0800
Subject: [PATCH] feat: 员工档案中意外险案件列表宽度调整
---
src/views/user/archivesEdit.vue | 365 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 287 insertions(+), 78 deletions(-)
diff --git a/src/views/user/archivesEdit.vue b/src/views/user/archivesEdit.vue
index f5e59da..eaefa79 100644
--- a/src/views/user/archivesEdit.vue
+++ b/src/views/user/archivesEdit.vue
@@ -153,7 +153,7 @@
<div class="item-node" />
<div>
<a href="javascript:void(0)" :class="item=='lzaj'?'light':''" @click="goAnchor('lzaj')">
- 劳资案件
+ 仲裁案件
</a>
</div>
</li>
@@ -222,7 +222,11 @@
<el-row style="width: 100%;">
<el-col :span="8">
<el-form-item label="编号" prop="empNumb">
- <el-input v-model="empBaseInfoForm.empNumb" style="width: 100%;" :disabled="readon ? false : true" />
+ <el-input
+ v-model="empBaseInfoForm.empNumb"
+ style="width: 100%;"
+ :disabled="readon ? false : true"
+ />
</el-form-item>
</el-col>
<el-col :span="8">
@@ -244,7 +248,11 @@
<el-row>
<el-col :span="8">
<el-form-item label="性别" prop="sex">
- <el-select v-model="empBaseInfoForm.sex" placeholder="请选择性别" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.sex"
+ placeholder="请选择性别"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in sexOptions"
:key="dict.dicItemCode"
@@ -284,7 +292,11 @@
<el-row>
<el-col :span="8">
<el-form-item label="员工类别" prop="empType">
- <el-select v-model="empBaseInfoForm.empType" placeholder="请选择员工类型" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.empType"
+ placeholder="请选择员工类型"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in empTypeOptions"
:key="dict.dicItemCode"
@@ -296,7 +308,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="民族" prop="nation">
- <el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.nation"
+ filterable
+ placeholder="请选择民族"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in nationOptions"
:key="dict.dicItemCode"
@@ -316,7 +333,11 @@
<el-row>
<el-col :span="8">
<el-form-item label="婚姻状态" prop="marriage">
- <el-select v-model="empBaseInfoForm.marriage" placeholder="请选择婚姻状态" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.marriage"
+ placeholder="请选择婚姻状态"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in marriageOptions"
:key="dict.dicItemCode"
@@ -347,7 +368,11 @@
<el-row>
<el-col :span="8">
<el-form-item label="政治面貌" prop="politics">
- <el-select v-model="empBaseInfoForm.politics" placeholder="请选择政治面貌" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.politics"
+ placeholder="请选择政治面貌"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in statusOptions"
:key="dict.dicItemCode"
@@ -370,7 +395,11 @@
</el-col>
<el-col :span="8">
<el-form-item label="最高学历" prop="education">
- <el-select v-model="empBaseInfoForm.education" placeholder="请选择最高学历" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.education"
+ placeholder="请选择最高学历"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in educationOptions"
:key="dict.dicItemCode"
@@ -385,7 +414,11 @@
<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"
@@ -420,7 +453,11 @@
</el-col>
<el-col :span="8">
<el-form-item label="档案情况" prop="archivesStatus">
- <el-select v-model="empBaseInfoForm.archivesStatus" placeholder="请选择档案情况" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.archivesStatus"
+ placeholder="请选择档案情况"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in archivesStatusOptions"
:key="dict.dicItemCode"
@@ -464,8 +501,12 @@
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="保险类型" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型" :disabled="readon ? false : true">
+ <el-form-item label="社保档位" prop="insuranceType">
+ <el-select
+ v-model="empBaseInfoForm.insuranceType"
+ placeholder="请选择社保档位"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in insuranceTypeOptions"
:key="dict.dicItemCode"
@@ -495,7 +536,11 @@
</el-col>
<el-col :span="8">
<el-form-item label="工作证" prop="empCardStatus">
- <el-select v-model="empBaseInfoForm.empCardStatus" placeholder="请选择工作证" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.empCardStatus"
+ placeholder="请选择工作证"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in empCardStatusOptions"
:key="dict.dicItemCode"
@@ -509,18 +554,22 @@
</el-row>
<el-row>
<el-col :span="8">
- <el-form-item label="家庭成员及关系" prop="family">
+ <el-form-item label="家庭成员及关系1" prop="family">
<el-input v-model="empBaseInfoForm.family" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
- <el-form-item label="紧急联系电话" prop="urgencyPhone">
+ <el-form-item label="家庭成员及关系2" prop="urgencyPhone">
<el-input v-model="empBaseInfoForm.urgencyPhone" :disabled="readon ? false : true" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="员工手册" prop="handbookStatus">
- <el-select v-model="empBaseInfoForm.handbookStatus" placeholder="请选择员工手册" :disabled="readon ? false : true">
+ <el-select
+ v-model="empBaseInfoForm.handbookStatus"
+ placeholder="请选择员工手册"
+ :disabled="readon ? false : true"
+ >
<el-option
v-for="dict in handbookStatusOptions"
:key="dict.dicItemCode"
@@ -532,7 +581,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" multiple 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"
@@ -579,7 +633,10 @@
<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>
+ <span
+ class="table-button"
+ @click="singleDelete(scope.row, 'workExperienceDataselection')"
+ >删除</span>
</template>
</el-table-column>
</el-table>
@@ -625,10 +682,22 @@
<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="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="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="备注" />
@@ -676,8 +745,14 @@
<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="contractStatus"
+ label="合同状态"
+ :formatter="contractStatusFormat"
+ />
<el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" />
+ <el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
<pagination
v-show="contractInfoDatatotal>0"
@@ -707,13 +782,18 @@
<span v-text="getIndex(scope.$index)" />
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="newDeptName" label="现部门" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" 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="changeType"
+ label="调岗类型"
+ :formatter="changeTypeFormat"
+ />
<el-table-column show-overflow-tooltip prop="changeReason" label="调岗理由" />
</el-table>
<pagination
@@ -845,7 +925,10 @@
<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>
+ <span
+ class="table-button"
+ @click="singleDelete(scope.row, 'dimissionAttendDataselection')"
+ >删除</span>
</template>
</el-table-column>
<el-table-column v-if="fsnumShow" show-overflow-tooltip prop="dimissionAttendId" label="" />
@@ -884,11 +967,18 @@
<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
+ </template>
+ EmpLeaveInfo
</el-table-column>
+ <el-table-column show-overflow-tooltip prop="deptName" 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="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="备注" />
@@ -981,9 +1071,24 @@
<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="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>
@@ -1023,25 +1128,40 @@
<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>
+ <span
+ class="table-button"
+ @click="singleDelete(scope.row, 'accidentCasesDataselection')"
+ >删除</span>
</template>
</el-table-column>
<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="injuredAddress" label="受伤地点" width="200" />
<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="injuredDescribe" label="受伤经过描述" width="300" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="150" />
+ <!-- <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="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-column
+ show-overflow-tooltip
+ prop="settleStatus"
+ label="是否结案"
+ width="120"
+ :formatter="settleStatusFormat"
+ />
</el-table>
<pagination
v-show="accidentCasesDatatotal>0"
@@ -1090,14 +1210,26 @@
<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="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-column
+ show-overflow-tooltip
+ prop="settleStatus"
+ label="是否结案"
+ width="120"
+ :formatter="settleStatusFormat"
+ />
</el-table>
<pagination
v-show="occupationalDatatotal>0"
@@ -1110,7 +1242,7 @@
</div>
<div ref="lzaj" class="lzaj">
<div class="jbxxTitle">
- 劳资案件
+ 仲裁案件
<el-button class="filter-item" type="primary" @click.native="gzadd(11)">
{{ $t('table.add') }}
</el-button>
@@ -1140,12 +1272,23 @@
</el-table-column>
<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="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="arbitrationStatus"
+ label="是否结案"
+ width="100"
+ :formatter="arbitrationStatusFormat"
+ />
<el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
</el-table>
<pagination
@@ -1383,12 +1526,28 @@
: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">
+ <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>
+ <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">
+ <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-image
style="width: 100px; height: 80px;margin-top: -10px;"
@@ -1396,7 +1555,10 @@
:preview-src-list="srcList"
@click="clickImg(node)"
/>
- <el-checkbox v-model="checkedArr[index * 8 + nodeIndex].isChecked" class="myRedCheckBox">
+ <el-checkbox
+ v-model="checkedArr[index * 8 + nodeIndex].isChecked"
+ class="myRedCheckBox"
+ >
{{ node.filesname }}
</el-checkbox>
@@ -2067,8 +2229,8 @@
placeholder="选择社保申请日期"
/>
</el-form-item>
- <el-form-item label="保险类型" prop="insuranceGaers">
- <el-select v-model="insuranceForm.insuranceGaers" placeholder="请选择保险类型">
+ <el-form-item label="社保档位" prop="insuranceGaers">
+ <el-select v-model="insuranceForm.insuranceGaers" placeholder="请选择社保档位">
<el-option
v-for="dict in insuranceGaersOptions"
:key="dict.dicItemCode"
@@ -2272,6 +2434,9 @@
:value="dict.dicItemCode"
/>
</el-select>
+ </el-form-item>
+ <el-form-item label="备注">
+ <el-input v-model="accidentCasesForm.remark" />
</el-form-item>
</el-col>
</el-row>
@@ -2478,7 +2643,7 @@
</div>
</el-dialog>
- <el-dialog title="劳资案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
+ <el-dialog title="仲裁案件" append-to-body :visible.sync="dialogshowArr[11].show" width="50%">
<el-form
ref="laborTroubleForm"
:model="laborTroubleForm"
@@ -2723,7 +2888,7 @@
</div>
</template>
<script>
-import { calculateSeniority, toCardGetUserInfo } from '@/utils/myUtil'
+import { calculateSeniority, dateDifference, toCardGetUserInfo } from '@/utils/myUtil'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import Pagination from '@/components/Pagination'
@@ -2874,7 +3039,7 @@
message: '长度不超过36个字符',
trigger: 'blur'
}],
- insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
+ insuranceType: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
@@ -2937,11 +3102,11 @@
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
contractInfoRules: {
- signingDate: [{ required: true, message: '请选择合同签订时间', trigger: 'change' }],
+ signingDate: [{ required: true, message: '请选择合同签订时间', trigger: 'change', validator: this.startDate }],
contractStatus: [{ required: true, message: '请选择合同状态', trigger: 'change' }],
transactor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
beginDate: [{ required: true, message: '请选择合同开始日期', trigger: 'change' }],
- endDate: [{ required: true, message: '请选择合同结束时间', trigger: 'change' }],
+ endDate: [{ required: true, message: '请选择合同结束时间', trigger: 'change', validator: this.endDate }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
dimissionAttendRules: {
@@ -2955,10 +3120,10 @@
pattern: /^\d{1,2}(\.\d{1,1})?$/,
message: '出勤天数精确到1位小数'
}],
- overtimeDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
- overtimeHour: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
- leaveDay: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
- absenteeism: [{ pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
+ overtimeDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（天）精确到1位小数' }],
+ overtimeHour: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '加班（小时）精确到1位小数' }],
+ leaveDay: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '请假（天）精确到1位小数' }],
+ absenteeism: [{ pattern: /^\d{1,3}(\.\d{1,1})?$/, message: '旷工（天）精确到1位小数' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
leaveInfoRules: {
@@ -2997,7 +3162,7 @@
message: '长度不超过40个字符',
trigger: 'blur'
}],
- insuranceGaers: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
+ insuranceGaers: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
auditor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
applayStatus: [{ required: true, message: '请选择申请状态', trigger: 'change' }]
@@ -4126,7 +4291,7 @@
}
const remarks = ''
val.remark = remarks
-
+ this.readon = false
this.empBaseInfoForm = { ...val }
this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + this.empBaseInfoForm.empId
this.fileDate.empId = this.empBaseInfoForm.empId
@@ -4300,7 +4465,7 @@
this.initunemploymentData() // 失业金领取
this.initinsuranceData() // 社保申请
this.initremarkInfoData() // 备注
- this.initlaborTroubleData() // 劳资案件
+ this.initlaborTroubleData() // 仲裁案件
this.initoccupationalData() // 工伤案件
this.initbadRecordData() // 不良记录
this.initaccidentCasesData() // 意外险案件
@@ -5931,6 +6096,39 @@
}
this.sysConfig = this.initSysConfig()
+ },
+ startDate(rule, value, callback) {
+ // 如果结束日期没选，cb
+ if (!this.contractInfoForm.endDate) {
+ callback()
+ } else {
+ // 结束日期有，进行判断
+ if (this.compareDate(value, this.contractInfoForm.endDate)) {
+ // 如果起始在结束之前
+ callback()
+ } else {
+ callback(new Error('开始日期不能在结束日期之后，请重新选择'))
+ }
+ }
+ },
+ // 验证合同结束日期
+ endDate(rule, value, callback) {
+ // 如果起始日期没选，cb
+ if (!this.contractInfoForm.signingDate) {
+ callback()
+ } else {
+ // 起始日期有，进行判断
+ if (this.compareDate(this.contractInfoForm.signingDate, value)) {
+ // 如果起始在结束之前
+ this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'o')
+ callback()
+ } else {
+ callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
+ }
+ }
+ },
+ compareDate(start, end) {
+ return new Date(end).getTime() > new Date(start).getTime()
}
}
}
@@ -5967,7 +6165,7 @@
height: 90vh;
overflow-y: scroll;
- .jbxxTitle,.jbxxTitle2 {
+ .jbxxTitle, .jbxxTitle2 {
height: 30px;
line-height: 30px;
padding-left: 15px;
@@ -5982,7 +6180,7 @@
}
.jbxxTitle::before,
- .jbxxTitle2::before{
+ .jbxxTitle2::before {
content: '';
position: absolute;
left: -10px;
@@ -6165,7 +6363,7 @@
.myRedCheckBox .el-checkbox__label {
width: 90%;
overflow: hidden;
- text-overflow:ellipsis;
+ text-overflow: ellipsis;
white-space: nowrap;
}
@@ -6225,7 +6423,7 @@
list-style: none;
padding-left: 10px !important;
- >li:last-of-type {
+ > li:last-of-type {
> div:first-of-type {
position: absolute;
left: 4px;
@@ -6254,10 +6452,12 @@
height: 35px;
box-sizing: border-box;
padding-left: 28px !important;
- &:hover {
- color: #a00515;
- cursor: pointer;
- }
+
+ &:hover {
+ color: #a00515;
+ cursor: pointer;
+ }
+
.light {
color: #a00515;
}
@@ -6287,38 +6487,46 @@
<style lang="scss">
.da-dialog {
button.el-dialog__headerbtn {
- height: 30px;
- width: 30px;
+ height: 30px;
+ width: 30px;
background-color: #a00515;
opacity: 0.8;
- line-height: 30px;
- border-radius: 50%;
+ line-height: 30px;
+ border-radius: 50%;
+
i {
color: #fff !important;
}
+
&:hover {
opacity: 0.5;
}
}
+
.el-pagination {
width: 98%;
text-align: right;
}
+
.el-aside {
height: 750px;
overflow: hidden;
}
+
li.el-timeline-item {
padding-bottom: 1px;
height: 35px;
}
-.el-dialog__title {
- font-weight: 700;
-}
+
+ .el-dialog__title {
+ font-weight: 700;
+ }
+
.el-dialog__body {
padding: 10px 20px;
}
}
+
.el-dialog.is-fullscreen {
overflow: hidden;
}
@@ -6329,6 +6537,7 @@
color: #333 !important;
}
}
+
.pri-del-btn {
background-color: rgb(64, 158, 255) !important;
border-color: rgb(64, 158, 255) !important;
--
Gitblit v1.8.0