From 7369fd5866a78cde7ecbb4721d9decdfa181fd39 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 15:34:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/Informationinput.vue | 643 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 475 insertions(+), 168 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index f31c346..031f11e 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -60,7 +60,9 @@
ref="empBaseInfoTable"
:data="basicInformationData"
stripe
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ border
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -78,36 +80,57 @@
编辑
</span>
</template>
- </el-table-column>
- <el-table-column label="照片" width="80">
- <template slot-scope="scope" width="90">
- <img :src="scope.row.imagePath">
- </template>
- </el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
+ </el-table-column>-->
+ <!-- <el-table-column label="照片" width="60">-->
+ <!-- <template slot-scope="scope">-->
+ <!-- <!– <img :src="scope.row.imagePath">–>-->
+ <!-- <el-image-->
+ <!-- v-if="scope.row.imagePath && scope.row.imagePath != ''"-->
+ <!-- style="width: 30px; height: 30px"-->
+ <!-- :src="scope.row.imagePath"-->
+ <!-- fit="cover"-->
+ <!-- />-->
+
+ <!-- <el-image-->
+ <!-- v-else-->
+ <!-- style="width: 30px; height: 30px"-->
+ <!-- :src="defaultImg"-->
+ <!-- fit="cover"-->
+ <!-- />-->
+ <!-- </template>-->
+ <!-- </el-table-column>-->
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="50" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
<el-table-column show-overflow-tooltip prop="empType" label="员工类别" width="80" :formatter="empTypeFormat" />
<el-table-column show-overflow-tooltip prop="sex" label="性别" width="50" :formatter="sexFormat" />
<el-table-column show-overflow-tooltip prop="nation" label="民族" width="50" :formatter="nationFormat" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
<el-table-column show-overflow-tooltip prop="marriage" label="婚姻状况" width="80" :formatter="marriageFormat" />
<el-table-column show-overflow-tooltip prop="politics" label="政治面貌" width="80" :formatter="politicsFormat" />
- <el-table-column show-overflow-tooltip prop="education" label="学历" width="80" :formatter="educationFormat" />
+ <el-table-column show-overflow-tooltip prop="education" label="学历" width="50" :formatter="educationFormat" />
<el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
- <el-table-column prop="insuranceType" show-overflow-tooltip label="保险类型" width="80" :formatter="insuranceTypeFormat" />
+ <el-table-column
+ prop="insuranceType"
+ show-overflow-tooltip
+ label="保险类型"
+ width="80"
+ :formatter="insuranceTypeFormat"
+ />
<el-table-column prop="socialNumb" show-overflow-tooltip label="社保电脑号" />
<el-table-column prop="guardNumb" show-overflow-tooltip label="保安员证号" />
- <el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" />
+ <el-table-column prop="archivesNumb" show-overflow-tooltip label="档案编号" width="80" />
<el-table-column prop="archivesStatusName" show-overflow-tooltip label="档案情况" />
</el-table>
<el-table
v-show="showArr[1].show"
ref="workExperienceTable"
:data="workExperienceData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="55" />
@@ -126,7 +149,7 @@
</template>
</el-table-column>
<el-table-column prop="empNumb" label="编号" width="100" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column prop="empName" label="姓名" width="100" />
<el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
<el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
<el-table-column prop="beginDate" label="开始日期" width="120" />
@@ -137,8 +160,10 @@
v-show="showArr[2].show"
ref="physicalExamTable"
:data="physicalExamData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -158,26 +183,34 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
<el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
- <el-table-column show-overflow-tooltip prop="physicalExamType" label="体检类型" width="80" :formatter="typeFormat" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="physicalExamType"
+ label="体检类型"
+ width="80"
+ :formatter="typeFormat"
+ />
<el-table-column show-overflow-tooltip prop="bloodPressure" label="血压" width="60" />
<el-table-column show-overflow-tooltip prop="transaminase" label="转氨酶" width="80" />
<el-table-column prop="ecg" show-overflow-tooltip label="心电图" width="80" :formatter="ecgNameFormat" />
<el-table-column prop="conclusion" show-overflow-tooltip label="体检结论" />
- <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查记录" />
+ <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查日期" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
</el-table>
<el-table
v-show="showArr[3].show"
ref="contractInfoTable"
:data="contractInfoData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="55" />
@@ -197,8 +230,8 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="150" />
- <el-table-column prop="empName" label="员工姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="150" />
+ <el-table-column prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
@@ -211,8 +244,10 @@
v-show="showArr[4].show"
ref="dimissionAttendTable"
:data="dimissionAttendData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -227,15 +262,15 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
+ <el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
<el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
<el-table-column show-overflow-tooltip prop="overtimeDay" label="加班（天）" width="100" />
- <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="80" />
- <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="80" />
+ <el-table-column show-overflow-tooltip prop="overtimeHour" label="加班（小时）" width="120" />
+ <el-table-column show-overflow-tooltip prop="deduct" label="有无代扣款项" width="120" />
<el-table-column show-overflow-tooltip prop="leaveDay" label="请假（天）" width="100" />
<el-table-column show-overflow-tooltip prop="absenteeism" label="旷工（天）" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -244,8 +279,10 @@
v-show="showArr[5].show"
ref="leaveInfoTable"
:data="leaveInfoData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -258,16 +295,16 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="80" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="80" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="150" />
- <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="150" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="120" />
<el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
<el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="80" :formatter="leaveTypeFormat" />
- <el-table-column show-overflow-tooltip prop="returnDate" label="到岗时间" width="120" />
+ <el-table-column show-overflow-tooltip prop="returnDate" label="返岗时间" width="120" />
<el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -275,8 +312,10 @@
v-show="showArr[6].show"
ref="resignTable"
:data="resignData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -289,10 +328,10 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名" width="100" />
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="empName" label="员工姓名" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
@@ -303,8 +342,10 @@
v-show="showArr[7].show"
ref="unemploymentTable"
:data="unemploymentData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -317,13 +358,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" />
- <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" width="100" />
+ <el-table-column show-overflow-tooltip prop="applayReason" label="申报事由" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="auditor" label="审核人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -332,8 +373,10 @@
v-show="showArr[8].show"
ref="insuranceTable"
:data="insuranceData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -346,9 +389,9 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="100" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" />
@@ -363,8 +406,10 @@
v-show="showArr[9].show"
ref="accidentCasesTable"
:data="accidentCasesData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -378,31 +423,39 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位名称" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="名称" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
<el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
- <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="60" />
- <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" />
- <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" />
- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" />
- <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="60" :formatter="hospitalizatioFlagFormat" />
- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="40" />
- <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="60" />
- <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" />
- <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
- <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="60" />
- <el-table-column show-overflow-tooltip prop="innsureFee" label="保险赔付费用" width="60" />
+ <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="80" />
+ <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" width="120" />
+ <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="意外险诊断" width="120" />
+ <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" width="80" />
+ <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="80" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="hospitalizatioFlag"
+ label="是否住院"
+ width="80"
+ :formatter="hospitalizatioFlagFormat"
+ />
+ <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+ <el-table-column show-overflow-tooltip prop="reprotTime" label="报案时间" width="80" />
+ <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" width="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="innsureFee" label="保险赔付费用" width="120" />
</el-table>
<el-table
v-show="showArr[10].show"
ref="occupationalTable"
:data="occupationalData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -416,31 +469,40 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="60" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" />
- <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" />
- <el-table-column show-overflow-tooltip prop="injuredPart" label="受伤部位" width="60" />
- <el-table-column show-overflow-tooltip prop="injuredDescribe" label="受伤经过描述" />
- <el-table-column show-overflow-tooltip prop="injuredDiacrisis" label="工伤诊断" />
- <el-table-column show-overflow-tooltip prop="hospitalName" label="就诊医院" />
- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" />
- <el-table-column show-overflow-tooltip prop="hospitalizatioFlag" label="是否住院" width="50" :formatter="hospitalizatioFlagFormat" />
- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="40" />
- <el-table-column show-overflow-tooltip prop="reportTime" label="报案时间" width="60" />
- <el-table-column show-overflow-tooltip prop="submitTime" label="递交资料时间" />
- <el-table-column show-overflow-tooltip prop="sbumitBy" label="递交人" width="60" />
- <el-table-column show-overflow-tooltip prop="expensesFee" label="医疗总费用" width="60" />
- <el-table-column show-overflow-tooltip prop="compensated" label="已赔付医药费用" width="60" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
+ <el-table-column show-overflow-tooltip prop="injuredTime" label="受伤日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="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="80" />
+ <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="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="settleStatusName" label="是否结案" width="80" />
</el-table>
<el-table
v-show="showArr[11].show"
ref="laborTroubleTable"
:data="laborTroubleData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -453,27 +515,41 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
- <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="70" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="80" />
+ <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="80" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
<el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
<el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
- <el-table-column show-overflow-tooltip prop="arbitrationType" label="仲裁类型" width="100" :formatter="arbitrationTypeFormat" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="arbitrationType"
+ label="仲裁类型"
+ width="100"
+ :formatter="arbitrationTypeFormat"
+ />
<el-table-column show-overflow-tooltip prop="arbitrationReason" label="仲裁事由" />
<el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="80" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
- <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="100" />
- <el-table-column show-overflow-tooltip prop="arbitrationStatus" label="状态" width="80" :formatter="arbitrationStatusFormat" />
+ <el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="120" />
+ <el-table-column
+ show-overflow-tooltip
+ prop="arbitrationStatus"
+ label="状态"
+ width="80"
+ :formatter="arbitrationStatusFormat"
+ />
<el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="120" />
</el-table>
<el-table
v-show="showArr[12].show"
ref="badRecordTable"
:data="badRecordData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="55" />
@@ -491,8 +567,8 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="120" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -505,8 +581,10 @@
v-show="showArr[13].show"
ref="remarkInfoTable"
:data="remarkInfoData"
- :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
+ :cell-style="{padding:'7px 0','text-align':'center'}"
+ :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
stripe
+ border
style="width: 100%;"
>
<el-table-column type="selection" width="50" />
@@ -520,7 +598,7 @@
</template>
</el-table-column>
<el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="180" />
- <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="120" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="120" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
<el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
@@ -547,14 +625,14 @@
<el-row>
<el-col span="24">
<el-form-item label="员工模板下载" prop="region">
- <a href="http://120.24.23.155:8000/员工信息.xls" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
+ <a :href="downloadEmpExcel" target="_blank" style="color: #3A8EE6;">员工信息.xlxs</a>
<span style="margin-left: 100px;">点击下载</span>
</el-form-item>
<el-form-item label="导入员工">
<el-upload
ref="upload"
class="upload-demo"
- action="http://120.24.23.155:8301/hr/empBaseInfo/importEmp"
+ :action="uploadEmpExcel"
accept=".xls, .xlsx, .excel"
:headers="headers()"
:on-success="importHandleAvatarSuccess"
@@ -589,7 +667,14 @@
</el-upload>
</el-aside>
<el-main>
- <el-form ref="empBaseInfoForm" class="info-input-form" :model="empBaseInfoForm" :rules="rules" label-position="right" label-width="120px">
+ <el-form
+ ref="empBaseInfoForm"
+ class="info-input-form"
+ :model="empBaseInfoForm"
+ :rules="rules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="11">
<el-form-item label="档案号" prop="archivesNumb">
@@ -615,7 +700,7 @@
</el-select>
</el-form-item>
<el-form-item label="民族" prop="nation">
- <el-select v-model="empBaseInfoForm.nation" placeholder="请选择民族">
+ <el-select v-model="empBaseInfoForm.nation" filterable placeholder="请选择民族">
<el-option
v-for="dict in nationOptions"
:key="dict.dicItemCode"
@@ -832,7 +917,13 @@
</div>
</el-dialog>
<el-dialog title="工作经历" :visible.sync="dialogshowArr[1].show" width="50%">
- <el-form ref="workExperienceForm" :model="workExperienceForm" :rules="workExperienceRules" label-position="right" label-width="120px">
+ <el-form
+ ref="workExperienceForm"
+ :model="workExperienceForm"
+ :rules="workExperienceRules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -843,8 +934,8 @@
v-model="workExperienceForm.certificateNumb"
/>
</el-form-item>
- <el-form-item label="性别" prop="sex">
- <el-input v-model="workExperienceForm.sex" />
+ <el-form-item label="性别" prop="sexName">
+ <el-input v-model="workExperienceForm.sexName" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -908,7 +999,13 @@
</div>
</el-dialog>
<el-dialog title="体检信息" :visible.sync="dialogshowArr[2].show" width="50%">
- <el-form ref="physicalExamForm" :model="physicalExamForm" :rules="physicalExamRules" label-position="right" label-width="120px">
+ <el-form
+ ref="physicalExamForm"
+ :model="physicalExamForm"
+ :rules="physicalExamRules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -980,8 +1077,13 @@
<el-form-item label="体检结论" prop="conclusion">
<el-input v-model="physicalExamForm.conclusion" />
</el-form-item>
- <el-form-item label="复查记录" prop="reviewRecord">
- <el-input v-model="physicalExamForm.reviewRecord" />
+ <el-form-item label="复查日期" prop="reviewRecord">
+ <el-date-picker
+ v-model="physicalExamForm.reviewRecord"
+ value-format="yyyy-MM-dd"
+ type="date"
+ placeholder="选择复查日期"
+ />
</el-form-item>
</el-col>
</el-row>
@@ -1005,7 +1107,13 @@
</div>
</el-dialog>
<el-dialog title="合同信息" :visible.sync="dialogshowArr[3].show" width="50%">
- <el-form ref="contractInfoForm" :model="contractInfoForm" :rules="contractInfoRules" label-position="right" label-width="120px">
+ <el-form
+ ref="contractInfoForm"
+ :model="contractInfoForm"
+ :rules="contractInfoRules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -1087,7 +1195,13 @@
</div>
</el-dialog>
<el-dialog title="离职当月考勤" :visible.sync="dialogshowArr[4].show" width="50%">
- <el-form ref="dimissionAttendForm" :model="dimissionAttendForm" :rules="dimissionAttendRules" label-position="right" label-width="120px">
+ <el-form
+ ref="dimissionAttendForm"
+ :model="dimissionAttendForm"
+ :rules="dimissionAttendRules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -1152,12 +1266,19 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putDimissionAttend('dimissionAttendForm')">保 存</el-button>
- <el-button v-if="isAdd" type="primary" @click="putDimissionAttendContinue('dimissionAttendForm')">保存并继续新增</el-button>
+ <el-button v-if="isAdd" type="primary" @click="putDimissionAttendContinue('dimissionAttendForm')">保存并继续新增
+ </el-button>
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="请假记录" :visible.sync="dialogshowArr[5].show" width="50%">
- <el-form ref="leaveInfoForm" :model="leaveInfoForm" :rules="leaveInfoRules" label-position="right" label-width="120px">
+ <el-form
+ ref="leaveInfoForm"
+ :model="leaveInfoForm"
+ :rules="leaveInfoRules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -1220,12 +1341,12 @@
<el-input v-model="leaveInfoForm.leaveDay" />
</el-form-item>
- <el-form-item label="到岗时间" prop="returnDate">
+ <el-form-item label="返岗时间" prop="returnDate">
<el-date-picker
v-model="leaveInfoForm.returnDate"
value-format="yyyy-MM-dd"
type="date"
- placeholder="选择到岗时间"
+ placeholder="选择返岗时间"
/>
</el-form-item>
@@ -1306,7 +1427,13 @@
</div>
</el-dialog>
<el-dialog title="失业金领取" :visible.sync="dialogshowArr[7].show" width="50%">
- <el-form ref="unemploymentForm" :model="unemploymentForm" :rules="unemploymentRules" label-position="right" label-width="120px">
+ <el-form
+ ref="unemploymentForm"
+ :model="unemploymentForm"
+ :rules="unemploymentRules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -1366,7 +1493,13 @@
</div>
</el-dialog>
<el-dialog title="社保申请" :visible.sync="dialogshowArr[8].show" width="50%">
- <el-form ref="insuranceForm" :model="insuranceForm" :rules="insuranceRules" label-position="right" label-width="120px">
+ <el-form
+ ref="insuranceForm"
+ :model="insuranceForm"
+ :rules="insuranceRules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -1452,7 +1585,13 @@
</div>
</el-dialog>
<el-dialog title="意外险案件" :visible.sync="dialogshowArr[9].show" width="50%">
- <el-form ref="accidentCasesForm" :model="accidentCasesForm" :rules="accidentCasesRules" label-position="right" label-width="120px">
+ <el-form
+ ref="accidentCasesForm"
+ :model="accidentCasesForm"
+ :rules="accidentCasesRules"
+ label-position="right"
+ label-width="120px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -1587,12 +1726,19 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="putAccidentCases('accidentCasesForm')">保 存</el-button>
- <el-button v-if="isAdd" type="primary" @click="putAccidentCasesContinue('accidentCasesForm')">保存并继续新增</el-button>
+ <el-button v-if="isAdd" type="primary" @click="putAccidentCasesContinue('accidentCasesForm')">保存并继续新增
+ </el-button>
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="工伤案件" :visible.sync="dialogshowArr[10].show" width="50%">
- <el-form ref="occupationalForm" :model="occupationalForm" :rules="occupationalRules" label-position="right" label-width="140px">
+ <el-form
+ ref="occupationalForm"
+ :model="occupationalForm"
+ :rules="occupationalRules"
+ label-position="right"
+ label-width="140px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -1777,7 +1923,13 @@
</div>
</el-dialog>
<el-dialog title="劳资案件" :visible.sync="dialogshowArr[11].show" width="50%">
- <el-form ref="laborTroubleForm" :model="laborTroubleForm" :rules="laborTroubleRules" label-position="right" label-width="140px">
+ <el-form
+ ref="laborTroubleForm"
+ :model="laborTroubleForm"
+ :rules="laborTroubleRules"
+ label-position="right"
+ label-width="140px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -1834,7 +1986,11 @@
</el-select>
</el-form-item>
<el-form-item label="仲裁赔付（元）" prop="'arbitrationPay">
- <el-input v-model="laborTroubleForm.arbitrationPay" oninput="value=value.replace(/^\.+|[^\d.]/g,'')" @blur="arbitrationPayChange" />
+ <el-input
+ v-model="laborTroubleForm.arbitrationPay"
+ oninput="value=value.replace(/^\.+|[^\d.]/g,'')"
+ @blur="arbitrationPayChange"
+ />
</el-form-item>
<el-form-item label="案结日期" prop="settleDate">
<el-date-picker
@@ -1868,7 +2024,13 @@
</div>
</el-dialog>
<el-dialog title="不良记录" :visible.sync="dialogshowArr[12].show" width="50%">
- <el-form ref="badRecordForm" :model="badRecordForm" :rules="badRecordRules" label-position="right" label-width="140px">
+ <el-form
+ ref="badRecordForm"
+ :model="badRecordForm"
+ :rules="badRecordRules"
+ label-position="right"
+ label-width="140px"
+ >
<el-row>
<el-col :span="12">
<el-form-item label="姓名" prop="empName">
@@ -2001,8 +2163,10 @@
components: { Treeselect, Pagination },
data() {
return {
- baseicInformationForm: {
- },
+ downloadEmpExcel: pages.downloadEmpExcel,
+ uploadEmpExcel: pages.uploadEmpExcel,
+ defaultImg: require('../../assets/avatar/20180414165936.jpg'),
+ baseicInformationForm: {},
dialogShowDryg: false,
empBaseInfoImageUrl: '',
total: 0, // 总数量
@@ -2021,7 +2185,7 @@
message: this.$t('rules.noMoreThan20'),
trigger: 'blur'
}],
- empName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' },
+ empName: [{ required: true, message: '请输入姓名', trigger: 'blur' },
{ min: 2, max: 50, message: this.$t('rules.noMoreThan50'), trigger: 'blur' }],
empNumb: [{ required: true, message: '请输入编号', trigger: 'blur' },
{ min: 2, max: 20, message: this.$t('rules.noMoreThan20'), trigger: 'blur' }],
@@ -2031,12 +2195,20 @@
certificateNumb: [{ required: true, message: '请输入身份证号', trigger: 'blur' }],
jobName: [{ required: true, message: '请选择岗位', trigger: 'change' }],
nativePlaceName: [{ required: true, message: '请选择籍贯', trigger: 'change' }],
- bankName: [{ required: true, message: '请输入银行名称', trigger: 'blur' }, { max: 36, message: '长度不超过36个字符', trigger: 'blur' }],
+ bankName: [{ required: true, message: '请输入银行名称', trigger: 'blur' }, {
+ max: 36,
+ message: '长度不超过36个字符',
+ trigger: 'blur'
+ }],
insuranceType: [{ required: true, message: '请选择保险类型', trigger: 'change' }],
entryDate: [{ required: true, message: '请选择入职日期', trigger: 'change' }],
seniority: [{ required: true, message: '请输入入司工龄', trigger: 'blur' }],
archivesStatus: [{ required: true, message: '请选择档案情况', trigger: 'change' }],
- bankNumb: [{ required: true, message: '请输入银行账号', trigger: 'blur' }, { max: 32, message: '长度不超过32个字符', trigger: 'blur' }],
+ bankNumb: [{ required: true, message: '请输入银行账号', trigger: 'blur' }, {
+ max: 32,
+ message: '长度不超过32个字符',
+ trigger: 'blur'
+ }],
empType: [{ required: true, message: '请选择员工类型', trigger: 'change' }],
censusAddress: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
currentAddress: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
@@ -2050,21 +2222,38 @@
urgencyPhone: [{ max: 30, message: '长度不超过30个字符', trigger: 'blur' }]
},
workExperienceRules: {
- empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
- workUnit: [{ required: true, message: '请输入工作单位', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
- beginDate: [{ required: true, validator: this.startDate }],
- endDate: [{ required: true, validator: this.endDate }],
+ empName: [{ required: true, message: '请选择员工' }],
+ workUnit: [{ required: true, message: '请输入工作单位', trigger: 'blur' }, {
+ max: 128,
+ message: '长度不超过128个字符',
+ trigger: 'blur'
+ }],
+ beginDate: [{ required: true, trigger: 'blur', validator: this.startDate }],
+ endDate: [{ required: true, trigger: 'blur', validator: this.endDate }],
jobContent: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
physicalExamRules: {
- empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
- physicalExamDate: [{ required: true, message: '请选择体检日期', trigger: 'change' }],
- hospital: [{ required: true, message: '请输入体检医院', trigger: 'blur' }, { max: 64, message: '长度不超过64个字符', trigger: 'blur' }],
- physicalExamType: [{ required: true, message: '请选择体检类型', trigger: 'change' }],
- bloodPressure: [{ required: true, message: '请输入血压', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
- transaminase: [{ required: true, message: '请输入转氨酶', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
- ecg: [{ required: true, message: '请选择心电图', trigger: 'change' }, { max: 16, message: '长度不超过16个字符', trigger: 'blur' }],
- conclusion: [{ required: true, message: '请输入体检结论', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
+ empName: [{ required: true, message: '请选择员工' }],
+ physicalExamDate: [{ required: true, message: '请选择体检日期' }],
+ hospital: [{ required: true, message: '请输入体检医院' }, {
+ max: 64,
+ message: '长度不超过64个字符'
+ }],
+ physicalExamType: [{ required: true, message: '请选择体检类型' }],
+ bloodPressure: [{ required: true, message: '请输入血压' }, {
+ max: 40,
+ message: '长度不超过40个字符'
+ }],
+ transaminase: [{ required: true, message: '请输入转氨酶' }, {
+ max: 40,
+ message: '长度不超过40个字符'
+ }],
+ ecg: [{ required: true, message: '请选择心电图' }],
+ conclusion: [{ required: true, message: '请输入体检结论', trigger: 'blur' }, {
+ max: 128,
+ message: '长度不超过128个字符',
+ trigger: 'blur'
+ }],
reviewRecord: [{ max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
@@ -2080,8 +2269,15 @@
dimissionAttendRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
attendMonth: [{ required: true, message: '请选择出勤月份', trigger: 'change' }],
- deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }, { max: 100, message: '长度不超过100个字符', trigger: 'blur' }],
- attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }, { pattern: /^\d{1,2}(\.\d{1,1})?$/, message: '出勤天数精确到1位小数' }],
+ deduct: [{ required: true, message: '请输入代扣填款项', trigger: 'blur' }, {
+ max: 100,
+ message: '长度不超过100个字符',
+ trigger: 'blur'
+ }],
+ attendDays: [{ required: true, message: '请输入出勤天数', trigger: 'blur' }, {
+ 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位小数' }],
@@ -2093,21 +2289,29 @@
beginTime: [{ required: true, validator: this.startDate }],
leaveType: [{ required: true, message: '请选择请假类型', trigger: 'change' }],
endTime: [{ required: true, validator: this.endDate }],
- returnDate: [{ required: true, message: '请选择到岗时间', trigger: 'change' }],
+ returnDate: [{ required: true, message: '请选择返岗时间', trigger: 'change' }],
reporter: [{ required: true, message: '请输入报备人', trigger: 'blur' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
},
resignRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
- reason: [{ required: true, message: '请输入事由', trigger: 'blur' }, { max: 256, message: '长度不超过256个字符', trigger: 'blur' }],
+ reason: [{ required: true, message: '请输入事由', trigger: 'blur' }, {
+ max: 256,
+ message: '长度不超过256个字符',
+ trigger: 'blur'
+ }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }]
},
unemploymentRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
- applayReason: [{ required: true, message: '请输入申报事由', trigger: 'blur' }, { max: 128, message: '长度不超过128个字符', trigger: 'blur' }],
+ applayReason: [{ required: true, message: '请输入申报事由', trigger: 'blur' }, {
+ max: 128,
+ message: '长度不超过128个字符',
+ trigger: 'blur'
+ }],
reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
auditor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }]
@@ -2115,7 +2319,11 @@
insuranceRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
applayDate: [{ required: true, message: '请选择申请日期', trigger: 'change' }],
- proposer: [{ required: true, message: '请输入申请人', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+ proposer: [{ required: true, message: '请输入申请人', trigger: 'blur' }, {
+ max: 40,
+ message: '长度不超过40个字符',
+ trigger: 'blur'
+ }],
insuranceGaers: [{ required: true, message: '请选择社保档位', trigger: 'change' }],
auditor: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
@@ -2124,10 +2332,26 @@
accidentCasesRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
injuredTime: [{ required: true, message: '请选择受伤时间', trigger: 'blur' }],
- injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
- injuredAddress: [{ required: true, message: '请输入受伤地点', trigger: 'blur' }, { max: 64, message: '长度不超过64个字符', trigger: 'blur' }],
- injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, { max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
- hospitalName: [{ required: true, message: '请输入就诊医院', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+ injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, {
+ max: 40,
+ message: '长度不超过40个字符',
+ trigger: 'blur'
+ }],
+ injuredAddress: [{ required: true, message: '请输入受伤地点', trigger: 'blur' }, {
+ max: 64,
+ message: '长度不超过64个字符',
+ trigger: 'blur'
+ }],
+ injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, {
+ max: 512,
+ message: '长度不超过512个字符',
+ trigger: 'blur'
+ }],
+ hospitalName: [{ required: true, message: '请输入就诊医院', trigger: 'blur' }, {
+ max: 40,
+ message: '长度不超过40个字符',
+ trigger: 'blur'
+ }],
hospitalizatioFlag: [{ required: true, message: '请选择是否住院', trigger: 'blur' }],
innsureFee: [{ required: true, message: '请输入保险赔付费用', trigger: 'blur' }],
expensesFee: [{ required: true, message: '请输入医疗总费用', trigger: 'blur' }],
@@ -2140,9 +2364,21 @@
occupationalRules: {
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
injuredTime: [{ required: true, message: '请选择受伤时间', trigger: 'blur' }],
- injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
- injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, { max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
- hospitalName: [{ required: true, message: '请输入就诊医院', trigger: 'blur' }, { max: 40, message: '长度不超过40个字符', trigger: 'blur' }],
+ injuredPart: [{ required: true, message: '请输入受伤部位', trigger: 'blur' }, {
+ max: 40,
+ message: '长度不超过40个字符',
+ trigger: 'blur'
+ }],
+ injuredDescribe: [{ required: true, message: '请输入受伤经过描述', trigger: 'blur' }, {
+ max: 512,
+ message: '长度不超过512个字符',
+ trigger: 'blur'
+ }],
+ hospitalName: [{ required: true, message: '请输入就诊医院', trigger: 'blur' }, {
+ max: 40,
+ message: '长度不超过40个字符',
+ trigger: 'blur'
+ }],
hospitalizatioFlag: [{ required: true, message: '请选择是否住院', trigger: 'blur' }],
innsureFee: [{ required: true, message: '请输入保险赔付费用', trigger: 'blur' }],
settleDate: [{ required: true, message: '请选择案结时间', trigger: 'change' }],
@@ -2156,7 +2392,11 @@
empName: [{ required: true, message: '请选择员工', trigger: 'change' }],
arbitrationType: [{ required: true, message: '请选择仲裁类型', trigger: 'change' }],
arbitrationDate: [{ required: true, message: '请选择仲裁日期', trigger: 'change' }],
- arbitrationReason: [{ required: true, message: '请输入仲裁事由', trigger: 'blur' }, { max: 1024, message: '长度不超过1024个字符', trigger: 'blur' }],
+ arbitrationReason: [{ required: true, message: '请输入仲裁事由', trigger: 'blur' }, {
+ max: 1024,
+ message: '长度不超过1024个字符',
+ trigger: 'blur'
+ }],
arbitrationStatus: [{ required: true, message: '请选择结案状态', trigger: 'change' }],
remark: [{ max: 512, message: '长度不超过512个字符', trigger: 'blur' }],
reporter: [{ max: 40, message: '长度不超过40个字符', trigger: 'blur' }]
@@ -2359,6 +2599,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
certificateNumb: '',
JobId: '',
deptId: '',
@@ -2380,6 +2621,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
certificateNumb: '',
deptId: '',
deptName: '',
@@ -2407,6 +2649,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
certificateNumb: '',
deptId: '',
deptName: '',
@@ -2454,6 +2697,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
certificateNumb: '',
deptId: '',
deptName: '',
@@ -2482,7 +2726,7 @@
creator: '',
modifyTime: '',
modifier: '',
- delFlag: '',
+ delFlag: '2',
empStatus: 0,
version: ''
},
@@ -2492,6 +2736,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
certificateNumb: '',
deptId: '',
deptName: '',
@@ -2518,6 +2763,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
certificateNumb: '',
deptId: '',
deptName: '',
@@ -2542,6 +2788,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
certificateNumb: '',
deptId: '',
deptName: '',
@@ -2565,6 +2812,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
certificateNumb: '',
deptId: '',
deptName: '',
@@ -2592,6 +2840,7 @@
empName: '',
certificateNumb: '',
sex: '',
+ sexName: '',
deptId: '',
deptName: '',
JobId: '',
@@ -2617,6 +2866,7 @@
empNumb: '',
empName: '',
sex: '',
+ sexName: '',
deptId: '',
deptName: '',
JobId: '',
@@ -2645,6 +2895,7 @@
empName: '',
certificateNumb: '',
sex: '',
+ sexName: '',
deptId: '',
deptName: '',
JobId: '',
@@ -2673,6 +2924,7 @@
empName: '',
certificateNumb: '',
sex: '',
+ sexName: '',
deptId: '',
deptName: '',
JobId: '',
@@ -2699,6 +2951,7 @@
empNumb: '',
empName: '',
sex: '1',
+ sexName: '男',
JobId: '',
jobName: '',
empType: '01',
@@ -2746,6 +2999,7 @@
empName: '',
empNumb: '',
sex: '',
+ sexName: '',
certificateNumb: '',
deptId: '',
deptName: '',
@@ -2865,6 +3119,7 @@
this.initDept()
this.thisShowIndex = 1
this.isShow(false, 0)
+ this.initJob()
},
methods: {
importHandleAvatarError() {
@@ -2874,7 +3129,7 @@
})
},
importHandleAvatarSuccess(res, file) {
- if (res.data === null) {
+ if (res.data === null || res.data.length === 0) {
this.$notify({
title: '成功',
message: '导入成功!',
@@ -2974,10 +3229,50 @@
})
},
dialogIsShow(val) {
- if (val === '0') {
- this.isAdd = true
- } else {
- this.isAdd = false
+ this.isAdd = val === '0'
+ switch (this.thisShowIndex) {
+ case 0:
+ this.cleanEmpBase()
+ break
+ case 1:
+ this.cleanWorkExperience()
+ break
+ case 2:
+ this.cleanPhysicalExam()
+ break
+ case 3:
+ this.cleanContractInfo()
+ break
+ case 4:
+ this.cleanDimissionAttend()
+ break
+ case 5:
+ this.cleanLeaveInfo()
+ break
+ case 6:
+ this.cleanResign()
+ break
+ case 7:
+ this.cleanUnemployment()
+ break
+ case 8:
+ this.cleanInsurance()
+ break
+ case 9:
+ this.cleanAccidentCases()
+ break
+ case 10:
+ this.cleanOccupational()
+ break
+ case 11:
+ this.cleanLaborTrouble()
+ break
+ case 12:
+ this.cleanBadRecord()
+ break
+ case 13:
+ this.cleanRemarkInfo()
+ break
}
this.dialogshowArr[this.thisShowIndex].show = !this.dialogshowArr[this.thisShowIndex]
.show
@@ -3094,6 +3389,11 @@
},
resetDeptTree() {
this.$refs.deptTree.setCheckedKeys([])
+ },
+ initJob() {
+ this.$get('system/position/dicJob').then((r) => {
+ this.restaurJob = r.data.data
+ })
},
butDelete() {
let selected
@@ -3325,7 +3625,7 @@
}
break
case 11:
- selected = this.$refs.occupationalTable.selection
+ selected = this.$refs.laborTroubleTable.selection
if (selected.length > 0) {
const delIds = []
selected.forEach((j) => {
@@ -4060,6 +4360,7 @@
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.isAdd) {
+ this.workExperienceForm.delFlag = '2'
this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
this.buttonLoading = false
this.$message({
@@ -4088,6 +4389,7 @@
this.$refs[formName].validate((valid) => {
if (valid) {
if (this.isAdd) {
+ this.workExperienceForm.delFlag = '2'
this.$post('hr/empWorkExperience', { ...this.workExperienceForm }).then(() => {
this.buttonLoading = false
this.$message({
@@ -4130,7 +4432,7 @@
this.workExperienceForm.empNumb = row.empNumb
this.workExperienceForm.empName = row.empName
this.workExperienceForm.certificateNumb = row.certificateNumb
- this.workExperienceForm.sex = row.sex
+ this.workExperienceForm.sexName = row.sex
this.workExperienceForm.deptId = row.deptId
this.workExperienceForm.deptName = row.deptName
this.workExperienceForm.JobId = row.JobId
@@ -4991,7 +5293,7 @@
this.accidentCasesForm.innsureFee = row.innsureFee
this.accidentCasesForm.hrDoDate = row.hrDoDate
this.accidentCasesForm.settleDate = row.settleDate
- this.accidentCasesForm.settleStatus = row.settleStatus
+ this.accidentCasesForm.settleStatus = row.settleStatus + ''
this.accidentCasesForm.remark = row.remark
this.accidentCasesForm.createTime = row.createTime
this.accidentCasesForm.creator = row.creator
@@ -5139,7 +5441,7 @@
this.occupationalForm.companySubsidy = row.companySubsidy
this.occupationalForm.companyCompensation = row.companyCompensation
this.occupationalForm.jobSubsidy = row.jobSubsidy
- this.occupationalForm.settleStatus = row.settleStatus
+ this.occupationalForm.settleStatus = row.settleStatus + ''
this.occupationalForm.createTime = row.createTime
this.occupationalForm.creator = row.creator
this.occupationalForm.modifyTime = row.modifyTime
@@ -5510,7 +5812,8 @@
this[this.inputForName].deptName = data.deptName
this[this.inputForName].JobId = data.jobId
this[this.inputForName].jobName = data.jobName
- this[this.inputForName].sex = data.sex === '0' ? '男' : '女'
+ this[this.inputForName].sex = data.sex === '1' ? '男' : '女'
+ this[this.inputForName].sexName = data.sex === '1' ? '男' : '女'
}
this.dialogShowXzyg = false
},
@@ -5570,8 +5873,8 @@
}
</script>
<style lang="scss" scoped>
-.baseinfo .el-container{
- .el-aside {
+.baseinfo .el-container {
+ .el-aside {
background-color: #fff;
}
@@ -5580,6 +5883,7 @@
}
}
+
.el-container {
height: 86.7vh;
background-color: #fff;
@@ -5594,12 +5898,14 @@
.el-main {
color: #333;
height: 100%;
- .el-table{
+
+ .el-table {
margin-top: 10px;
}
}
- .el-timeline-item{
- padding-bottom: 5px;
+
+ .el-timeline-item {
+ padding-bottom: 5px;
}
}
@@ -5656,6 +5962,7 @@
color: #a00515;
cursor: pointer;
top: -5px;
+
.el-timeline-item__content {
&:hover {
color: #a00515;
--
Gitblit v1.8.0