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/Informationinput.vue | 472 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 301 insertions(+), 171 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 3ce260f..e5f74dd 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -3,53 +3,53 @@
<el-container>
<el-aside width="175px">
<el-timeline style="padding-left: 15px">
- <el-timeline-item @click.native="isShow(showArr[0].show, 0)">
+ <el-timeline-item v-show="timelineShow('empBaseinfo:list')" @click.native="isShow(showArr[0].show, 0)">
<span :class="thisShowIndex===0?'selectedTimeline':''">基本信息</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[1].show, 1)">
+ <el-timeline-item v-show="timelineShow('empWorkexperience:list')" @click.native="isShow(showArr[1].show, 1)">
<span :class="thisShowIndex===1?'selectedTimeline':''">工作经历</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[2].show, 2)">
+ <el-timeline-item v-show="timelineShow('empPhysicalexam:list')" @click.native="isShow(showArr[2].show, 2)">
<span :class="thisShowIndex===2?'selectedTimeline':''">体检信息</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[3].show, 3)">
+ <el-timeline-item v-show="timelineShow('empContractinfo:list')" @click.native="isShow(showArr[3].show, 3)">
<span :class="thisShowIndex===3?'selectedTimeline':''">合同信息</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[4].show, 4)">
+ <el-timeline-item v-show="timelineShow('empDimissionattend:list')" @click.native="isShow(showArr[4].show, 4)">
<span :class="thisShowIndex===4?'selectedTimeline':''">离职当月考勤</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[5].show, 5)">
+ <el-timeline-item v-show="timelineShow('empLeaveinfo:list')" @click.native="isShow(showArr[5].show, 5)">
<span :class="thisShowIndex===5?'selectedTimeline':''">请假记录</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[6].show, 6)">
+ <el-timeline-item v-show="timelineShow('empResign:list')" @click.native="isShow(showArr[6].show, 6)">
<span :class="thisShowIndex===6?'selectedTimeline':''">辞职申请</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[7].show, 7)">
+ <el-timeline-item v-show="timelineShow('empUnemployment:list')" @click.native="isShow(showArr[7].show, 7)">
<span :class="thisShowIndex===7?'selectedTimeline':''">失业金领取</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[8].show, 8)">
+ <el-timeline-item v-show="timelineShow('empInsurance:list')" @click.native="isShow(showArr[8].show, 8)">
<span :class="thisShowIndex===8?'selectedTimeline':''">社保申请</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[9].show, 9)">
+ <el-timeline-item v-show="timelineShow('empAccidentcases:list')" @click.native="isShow(showArr[9].show, 9)">
<span :class="thisShowIndex===9?'selectedTimeline':''">意外险案件</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[10].show, 10)">
+ <el-timeline-item v-show="timelineShow('empOccupational:list')" @click.native="isShow(showArr[10].show, 10)">
<span :class="thisShowIndex===10?'selectedTimeline':''">工伤案件</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[11].show, 11)">
- <span :class="thisShowIndex===11?'selectedTimeline':''">劳资案件</span>
+ <el-timeline-item v-show="timelineShow('empLabortrouble:list')" @click.native="isShow(showArr[11].show, 11)">
+ <span :class="thisShowIndex===11?'selectedTimeline':''">仲裁案件</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[12].show, 12)">
+ <el-timeline-item v-show="timelineShow('empBadrecord:list')" @click.native="isShow(showArr[12].show, 12)">
<span :class="thisShowIndex===12?'selectedTimeline':''">不良记录</span>
</el-timeline-item>
- <el-timeline-item @click.native="isShow(showArr[13].show, 13)">
+ <el-timeline-item v-show="timelineShow('empRemarkinfo:list')" @click.native="isShow(showArr[13].show, 13)">
<span :class="thisShowIndex===13?'selectedTimeline':''">备注信息</span>
</el-timeline-item>
</el-timeline>
</el-aside>
<el-main>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-button class="commonBtn" @click.native="dialogIsShow('0')">新增</el-button>
<el-button class="commonBtn" style="background-color: #409EFF" @click.native="butDelete()">删除</el-button>
<el-button class="commonBtn" style="float: right" @click.native="showDryg(0)">导入员工信息</el-button>
@@ -64,6 +64,7 @@
:cell-style="{padding:'7px 0','text-align':'center'}"
:header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6','text-align':'center'}"
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -99,10 +100,10 @@
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="50" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="50" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="50" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
<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" />
@@ -110,11 +111,11 @@
<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="50" :formatter="educationFormat" />
- <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="80" />
+ <el-table-column prop="entryDate" show-overflow-tooltip label="入职日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
prop="insuranceType"
show-overflow-tooltip
- label="保险类型"
+ label="社保档位"
width="80"
:formatter="insuranceTypeFormat"
/>
@@ -132,6 +133,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -148,13 +150,13 @@
</span>
</template>
</el-table-column>
- <el-table-column prop="empNumb" label="编号" width="100" />
- <el-table-column prop="empName" label="姓名" width="100" />
- <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" />
- <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" />
- <el-table-column prop="beginDate" label="开始日期" width="120" />
- <el-table-column prop="endDate" label="结束日期" width="120" />
- <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" />
+ <el-table-column prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column prop="certificateNumb" show-overflow-tooltip label="身份证号码" width="180" />
+ <el-table-column prop="workUnit" show-overflow-tooltip label="工作单位" width="160" />
+ <el-table-column prop="beginDate" label="开始日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column prop="endDate" label="结束日期" width="140" />
+ <el-table-column prop="jobContent" show-overflow-tooltip label="主要工作内容" min-width="120" />
</el-table>
<el-table
v-show="showArr[2].show"
@@ -165,6 +167,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -182,13 +185,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
- <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" />
- <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="100" />
+ <el-table-column prop="hospital" show-overflow-tooltip label="体检医院" min-width="100" />
+ <el-table-column show-overflow-tooltip prop="physicalExamDate" label="体检日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
show-overflow-tooltip
prop="physicalExamType"
@@ -199,8 +202,8 @@
<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="conclusion" show-overflow-tooltip label="体检结论" min-width="100" />
+ <el-table-column prop="reviewRecord" show-overflow-tooltip label="复查日期" min-width="100" />
<el-table-column prop="remark" show-overflow-tooltip label="备注" />
</el-table>
<el-table
@@ -212,6 +215,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -229,16 +233,16 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
- <el-table-column prop="empName" label="姓名" width="100" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
- <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" />
- <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" />
- <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" />
- <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" />
- <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" />
+ <el-table-column prop="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="155" />
+ <el-table-column show-overflow-tooltip prop="signingDate" label="合同签订日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="endDate" label="合同结束日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="contractPeriod" label="合同期限(年)" width="120" />
+ <el-table-column show-overflow-tooltip prop="contractStatus" label="合同状态" :formatter="contractStatusFormat" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="transactor" label="合同办理人" width="100" />
</el-table>
<el-table
v-show="showArr[4].show"
@@ -249,6 +253,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -261,10 +266,10 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
<el-table-column show-overflow-tooltip prop="attendMonth" label="离职考勤月份" width="120" />
<el-table-column show-overflow-tooltip prop="attendDays" label="出勤天数" width="100" />
@@ -284,6 +289,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -295,12 +301,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
- <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="110" />
+ <el-table-column show-overflow-tooltip prop="beginTime" label="开始时间" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="endTime" label="结束时间" width="110" />
<el-table-column show-overflow-tooltip prop="leaveDay" label="请假天数" width="80" />
<el-table-column show-overflow-tooltip prop="leaveType" label="请假类型" width="80" :formatter="leaveTypeFormat" />
@@ -317,6 +323,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -328,12 +335,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="160" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="辞职申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="reason" label="辞职事由" width="150" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="100" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
@@ -347,6 +354,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -358,12 +366,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="150" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="失业金申请日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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" />
@@ -378,6 +386,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -389,18 +398,18 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="empName" label="姓名" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
- <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="120" />
+ <el-table-column show-overflow-tooltip prop="applayDate" label="社保申请日期" width="140" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="proposer" label="申请人" width="80" />
<el-table-column show-overflow-tooltip prop="insuranceGaers" label="社保档位" :formatter="insuranceGaersFormat" width="80" />
<el-table-column prop="reportStatus " label="是否已报告" width="100" :formatter="reportStatusFormat" />
<el-table-column prop="applayStatus" label="状态" width="80" :formatter="applayStatusFormat" />
<el-table-column prop="auditor" label="审核人" width="80" />
- <el-table-column prop="remark" label="备注" />
+ <el-table-column prop="remark" label="备注" width="300" />
</el-table>
<el-table
v-show="showArr[9].show"
@@ -411,6 +420,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -422,18 +432,18 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="90" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="injuredTime" label="受伤日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="injuredAddress" label="受伤地点" width="80" />
<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="hospitalName" label="就诊医院" width="80" />-->
+<!-- <el-table-column show-overflow-tooltip prop="treatmentName" label="就诊科室" width="80" />-->
<el-table-column
show-overflow-tooltip
prop="hospitalizatioFlag"
@@ -441,10 +451,10 @@
width="80"
:formatter="hospitalizatioFlagFormat"
/>
- <el-table-column show-overflow-tooltip prop="bedNumb" label="床号" width="60" />
+<!-- <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="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>
@@ -457,6 +467,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -468,12 +479,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="90" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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="injuredTime" label="受伤日期" width="130" sortable="custom" :sort-orders="['ascending', 'descending']" />
<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" />
@@ -504,6 +515,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -515,12 +527,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="60" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="280" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="280" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="60" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="80" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="120" />
- <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="100" />
+ <el-table-column show-overflow-tooltip prop="arbitrationDate" label="仲裁日期" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column
show-overflow-tooltip
prop="arbitrationType"
@@ -528,8 +540,8 @@
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="arbitrationReason" label="仲裁事由" min-width="100" />
+ <el-table-column show-overflow-tooltip prop="reporter" label="报备人" width="70" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
<el-table-column show-overflow-tooltip prop="arbitrationPay" label="仲裁赔付（元）" width="120" />
<el-table-column
@@ -539,7 +551,7 @@
width="50"
:formatter="arbitrationStatusFormat"
/>
- <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="110" />
+ <el-table-column show-overflow-tooltip prop="settleDate" label="案结日期" width="100" />
</el-table>
<el-table
v-show="showArr[12].show"
@@ -550,6 +562,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="55" />
<el-table-column label="操作" width="100">
@@ -566,13 +579,13 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" />
- <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" min-width="120" />
+ <el-table-column show-overflow-tooltip prop="badDate" label="不良记录日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="badContent" label="不良记录描述" min-width="120" />
<el-table-column show-overflow-tooltip prop="reporter" label="汇报人" width="120" />
<el-table-column show-overflow-tooltip prop="remark" label="备注" />
</el-table>
@@ -585,6 +598,7 @@
stripe
border
style="width: 100%;"
+ @sort-change="changeSort"
>
<el-table-column type="selection" width="50" />
<el-table-column label="操作" width="80">
@@ -596,12 +610,12 @@
</span>
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" />
- <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" />
+ <el-table-column show-overflow-tooltip prop="empNumb" label="编号" width="100" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="allDeptName" label="部门(护卫点)" width="300" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="120" />
- <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" />
- <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" />
- <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="180" />
+ <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="120" sortable="custom" :sort-orders="['ascending', 'descending']" />
+ <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="180" />
+ <el-table-column show-overflow-tooltip prop="remarkDate" label="备注日期" width="150" sortable="custom" :sort-orders="['ascending', 'descending']" />
<el-table-column show-overflow-tooltip prop="remarkContent" label="备注信息" />
</el-table>
<pagination
@@ -611,7 +625,7 @@
:limit.sync="pagination.size"
@pagination="search"
/>
- <el-col :span="24">
+ <el-col>
<div style="width: 250px;margin: 20px auto 0;">
<el-button class="nomalBtn" @click="deleteFrom()">取消</el-button>
<el-button class="commonBtn" @click="submitTo()">提交</el-button>
@@ -636,7 +650,6 @@
:headers="headers()"
:on-success="importHandleAvatarSuccess"
:on-error="importHandleAvatarError"
- :file-list="fileList"
:auto-upload="false"
>
<el-button slot="trigger" size="small" type="primary">选取文件</el-button>
@@ -759,11 +772,11 @@
<el-form-item label="招聘介绍人" prop="introducer">
<el-input v-model="empBaseInfoForm.introducer" />
</el-form-item>
- <el-form-item label="银行名称" prop="bankName">
+ <el-form-item label="银行名称">
<el-input v-model="empBaseInfoForm.bankName" />
</el-form-item>
- <el-form-item label="保险类型" prop="insuranceType">
- <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择保险类型">
+ <el-form-item label="社保档位" prop="insuranceType">
+ <el-select v-model="empBaseInfoForm.insuranceType" placeholder="请选择社保档位">
<el-option
v-for="dict in insuranceTypeOptions"
:key="dict.dicItemCode"
@@ -772,10 +785,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="家庭成员及关系" prop="family">
+ <el-form-item label="家庭成员及关系1" prop="family">
<el-input v-model="empBaseInfoForm.family" />
</el-form-item>
- <el-form-item label="紧急联系电话" prop="urgencyPhone">
+ <el-form-item label="家庭成员及关系2" prop="urgencyPhone">
<el-input v-model="empBaseInfoForm.urgencyPhone" />
</el-form-item>
</el-col>
@@ -786,7 +799,7 @@
<el-form-item label="姓名" prop="empName">
<el-input v-model="empBaseInfoForm.empName" />
</el-form-item>
- <el-form-item label="部门(护卫点)" required message="请选择护卫点" prop="deptId">
+ <el-form-item label="部门(护卫点)" required message="请选择部门(护卫点)" prop="allDeptName">
<treeselect
v-model="empBaseInfoForm.deptId"
:multiple="false"
@@ -866,7 +879,7 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="银行账号" prop="bankNumb">
+ <el-form-item label="银行账号">
<el-input v-model="empBaseInfoForm.bankNumb" />
</el-form-item>
<el-form-item label="社保电脑号" prop="socialNumb">
@@ -893,9 +906,9 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="24">
+ <el-col>
<el-form-item label="相关证件" prop="certificateList">
- <el-select v-model="empBaseInfoForm.certificateList" placeholder="请选择相关证件">
+ <el-select v-model="empBaseInfoForm.certificateList" multiple placeholder="请选择相关证件">
<el-option
v-for="dict in certificateListOptions"
:key="dict.dicItemCode"
@@ -942,8 +955,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" />
@@ -951,7 +964,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="工作单位" prop="workUnit">
<el-input v-model="workExperienceForm.workUnit" />
</el-form-item>
@@ -980,7 +993,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="主要工作内容" prop="jobContent">
<el-input v-model="workExperienceForm.jobContent" type="textarea" />
</el-form-item>
@@ -1043,8 +1056,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" />
@@ -1073,7 +1086,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="体检结论" prop="conclusion">
<el-input v-model="physicalExamForm.conclusion" />
</el-form-item>
@@ -1088,7 +1101,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注" prop="remark">
<el-input v-model="physicalExamForm.remark" type="textarea" />
</el-form-item>
@@ -1125,7 +1138,15 @@
/>
</el-form-item>
<el-form-item label="性别" prop="sex">
- <el-input v-model="contractInfoForm.sex" />
+ <!-- <el-input v-model="contractInfoForm.sex" />-->
+ <el-select v-model="contractInfoForm.sex" placeholder="请选择性别">
+ <el-option
+ v-for="dict in sexOptions"
+ :key="dict.dicItemCode"
+ :label="dict.dicItemName"
+ :value="dict.dicItemCode"
+ />
+ </el-select>
</el-form-item>
<el-form-item label="合同签订日期" prop="signingDate">
<el-date-picker
@@ -1156,8 +1177,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" />
@@ -1176,7 +1197,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注" prop="remark">
<el-input v-model="contractInfoForm.remark" type="textarea" />
</el-form-item>
@@ -1237,8 +1258,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" />
@@ -1257,7 +1278,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注" prop="remark">
<el-input v-model="dimissionAttendForm.remark" type="textarea" />
</el-form-item>
@@ -1321,8 +1342,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" />
@@ -1353,7 +1374,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注">
<el-input v-model="leaveInfoForm.remark" type="textarea" />
</el-form-item>
@@ -1394,8 +1415,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" />
@@ -1406,14 +1427,14 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="辞职事由" prop="reason">
<el-input v-model="resignForm.reason" />
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注">
<el-input v-model="resignForm.remark" type="textarea" />
</el-form-item>
@@ -1463,8 +1484,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" />
@@ -1479,7 +1500,7 @@
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注">
<el-input v-model="unemploymentForm.remark" type="textarea" />
</el-form-item>
@@ -1546,8 +1567,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" />
@@ -1571,7 +1592,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注">
<el-input v-model="insuranceForm.remark" type="textarea" />
</el-form-item>
@@ -1621,8 +1642,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" />
@@ -1637,7 +1658,7 @@
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="受伤经过描述" prop="injuredDescribe">
<el-input v-model="accidentCasesForm.injuredDescribe" type="textarea" />
</el-form-item>
@@ -1721,6 +1742,9 @@
/>
</el-select>
</el-form-item>
+ <el-form-item label="备注" prop="remark">
+ <el-input v-model="accidentCasesForm.remark" />
+ </el-form-item>
</el-col>
</el-row>
</el-form>
@@ -1768,8 +1792,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" />
@@ -1784,7 +1808,7 @@
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="受伤经过描述" prop="injuredDescribe">
<el-input v-model="occupationalForm.injuredDescribe" type="textarea" />
</el-form-item>
@@ -1909,7 +1933,7 @@
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注">
<el-input v-model="occupationalForm.remark" type="textarea" />
</el-form-item>
@@ -1922,7 +1946,7 @@
<el-button @click="dialogIsShow()">取 消</el-button>
</div>
</el-dialog>
- <el-dialog title="劳资案件" :visible.sync="dialogshowArr[11].show" width="50%">
+ <el-dialog title="仲裁案件" :visible.sync="dialogshowArr[11].show" width="50%">
<el-form
ref="laborTroubleForm"
:model="laborTroubleForm"
@@ -1969,8 +1993,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" />
@@ -2003,14 +2027,14 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="仲裁事由" prop="arbitrationReason">
<el-input v-model="laborTroubleForm.arbitrationReason" />
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注" prop="remark">
<el-input v-model="laborTroubleForm.remark" type="textarea" />
</el-form-item>
@@ -2057,8 +2081,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" />
@@ -2069,14 +2093,14 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="不良记录描述" prop="badContent">
<el-input v-model="badRecordForm.badContent" />
</el-form-item>
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注">
<el-input v-model="badRecordForm.remark" type="textarea" />
</el-form-item>
@@ -2123,8 +2147,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" />
@@ -2132,7 +2156,7 @@
</el-col>
</el-row>
<el-row>
- <el-col :span="24">
+ <el-col>
<el-form-item label="备注" prop="remarkContent">
<el-input v-model="remarkInfoForm.remarkContent" type="textarea" />
</el-form-item>
@@ -2200,7 +2224,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' }],
@@ -2278,10 +2302,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: {
@@ -2604,6 +2628,7 @@
JobId: '',
deptId: '',
deptName: '',
+ allDeptName: '',
jobName: '',
remarkContent: '',
remarkDate: '',
@@ -2625,6 +2650,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
arbitrationDate: '',
@@ -2653,6 +2679,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
injuredTime: '',
@@ -2701,6 +2728,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
injuredTime: '',
@@ -2740,6 +2768,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2767,6 +2796,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2792,6 +2822,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
applayDate: '',
@@ -2816,6 +2847,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
beginTime: '',
@@ -2843,6 +2875,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
beginDate: '',
@@ -2869,6 +2902,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
certificateNumb: '',
@@ -2898,6 +2932,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
hospital: '',
@@ -2927,6 +2962,7 @@
sexName: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
workUnit: '',
@@ -2946,8 +2982,9 @@
empId: '',
customerId: '',
archivesNumb: '',
- deptId: '1',
+ deptId: null,
deptName: '',
+ allDeptName: '',
empNumb: '',
empName: '',
sex: '1',
@@ -3003,6 +3040,7 @@
certificateNumb: '',
deptId: '',
deptName: '',
+ allDeptName: '',
JobId: '',
jobName: '',
badDate: '',
@@ -3040,10 +3078,12 @@
arbitrationTypeOptions: [],
changeTypeOptions: [],
dimissionTypeOptions: [],
- sexOptions: []
+ sexOptions: [],
+ permissions: {}
}
},
mounted() {
+ this.permissions = JSON.parse(localStorage.getItem('PERMISSIONS'))
this.getDicts('PLITICAL').then(response => {
this.statusOptions = response.data
})
@@ -3092,7 +3132,7 @@
this.getDicts('LEAVETYPE').then(response => {
this.leaveTypeOptions = response.data
})
- this.getDicts('insuranceGaers').then(response => {
+ this.getDicts('INSURANCETYPE').then(response => {
this.insuranceGaersOptions = response.data
})
this.getDicts('applayStatus').then(response => {
@@ -3122,6 +3162,14 @@
this.initJob()
},
methods: {
+ timelineShow(name) {
+ for (const v of this.permissions) {
+ if (v === name) {
+ return true
+ }
+ }
+ return false
+ },
importHandleAvatarError() {
this.$notify.error({
title: '错误',
@@ -3824,7 +3872,7 @@
// 起始日期有，进行判断
if (this.compareDate(this.contractInfoForm.signingDate, value)) {
// 如果起始在结束之前
- this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'y')
+ this.contractInfoForm.contractPeriod = dateDifference(this.contractInfoForm.signingDate, this.contractInfoForm.endDate, 'o')
callback()
} else {
callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
@@ -3839,7 +3887,7 @@
// 起始日期有，进行判断
if (this.compareDate(this.leaveInfoForm.beginTime, value)) {
// 如果起始在结束之前
- this.leaveInfoForm.leaveDay = dateDifference(this.leaveInfoForm.beginTime, this.leaveInfoForm.endTime, 'd')
+ // this.leaveInfoForm.leaveDay = dateDifference(this.leaveInfoForm.beginTime, this.leaveInfoForm.endTime, 'd')
callback()
} else {
callback(new Error('结束日期不能在开始始日期之前，请重新选择'))
@@ -4206,8 +4254,9 @@
this.empBaseInfoForm.empId = ''
this.empBaseInfoForm.customerId = ''
this.empBaseInfoForm.archivesNumb = ''
- this.empBaseInfoForm.deptId = ''
+ this.empBaseInfoForm.deptId = null
this.empBaseInfoForm.deptName = ''
+ this.empBaseInfoForm.allDeptName = ''
this.empBaseInfoForm.empNumb = ''
this.empBaseInfoForm.empName = ''
this.empBaseInfoForm.sex = ''
@@ -4255,11 +4304,17 @@
},
editEmpBase(row) {
this.isAdd = false
+ let certificateList = []
+ if (row.certificateList && typeof row.certificateList === 'string') {
+ certificateList = row.certificateList.split(',')
+ row.certificateList = certificateList
+ }
this.empBaseInfoForm.empId = row.empId
this.empBaseInfoForm.customerId = row.customerId
this.empBaseInfoForm.archivesNumb = row.archivesNumb
this.empBaseInfoForm.deptId = row.deptId
this.empBaseInfoForm.deptName = row.deptName
+ this.empBaseInfoForm.allDeptName = row.allDeptName
this.empBaseInfoForm.empNumb = row.empNumb
this.empBaseInfoForm.empName = row.empName
this.empBaseInfoForm.sex = row.sex
@@ -4304,6 +4359,7 @@
this.empBaseInfoForm.version = row.version
this.dialogshowArr[0].show = true
this.empBaseInfoImageUrl = pages.getEmpBaseInfoImage + row.empId
+ this.empBaseInfoForm.insuranceType = row.insuranceType
},
putEmpBase(formName) {
this.$refs[formName].validate((valid) => {
@@ -4349,6 +4405,9 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
selectWorkExperience() {
this.tableUrl = 'hr/empWorkExperience/list'
@@ -4402,12 +4461,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanWorkExperience() {
this.workExperienceForm.empId = ''
this.workExperienceForm.archivesNumb = ''
this.workExperienceForm.deptId = ''
this.workExperienceForm.deptName = ''
+ this.workExperienceForm.allDeptName = ''
this.workExperienceForm.empNumb = ''
this.workExperienceForm.empName = ''
this.workExperienceForm.sex = ''
@@ -4435,6 +4498,7 @@
this.workExperienceForm.sexName = row.sex
this.workExperienceForm.deptId = row.deptId
this.workExperienceForm.deptName = row.deptName
+ this.workExperienceForm.allDeptName = row.allDeptName
this.workExperienceForm.JobId = row.JobId
this.workExperienceForm.jobName = row.jobName
this.workExperienceForm.workUnit = row.workUnit
@@ -4499,12 +4563,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanPhysicalExam() {
this.physicalExamForm.empId = ''
this.physicalExamForm.archivesNumb = ''
this.physicalExamForm.deptId = ''
this.physicalExamForm.deptName = ''
+ this.physicalExamForm.allDeptName = ''
this.physicalExamForm.empNumb = ''
this.physicalExamForm.empName = ''
this.physicalExamForm.sex = ''
@@ -4531,6 +4599,7 @@
this.physicalExamForm.sex = row.sex
this.physicalExamForm.deptId = row.deptId
this.physicalExamForm.deptName = row.deptName
+ this.physicalExamForm.allDeptName = row.allDeptName
this.physicalExamForm.JobId = row.JobId
this.physicalExamForm.jobName = row.jobName
this.physicalExamForm.hospital = row.hospital
@@ -4601,12 +4670,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanContractInfo() {
this.contractInfoForm.empId = ''
this.contractInfoForm.archivesNumb = ''
this.contractInfoForm.deptId = ''
this.contractInfoForm.deptName = ''
+ this.contractInfoForm.allDeptName = ''
this.contractInfoForm.empNumb = ''
this.contractInfoForm.empName = ''
this.contractInfoForm.sex = ''
@@ -4639,6 +4712,7 @@
this.contractInfoForm.sex = row.sex
this.contractInfoForm.deptId = row.deptId
this.contractInfoForm.deptName = row.deptName
+ this.contractInfoForm.allDeptName = row.allDeptName
this.contractInfoForm.JobId = row.JobId
this.contractInfoForm.jobName = row.jobName
this.contractInfoForm.beginDate = row.beginDate
@@ -4707,12 +4781,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanDimissionAttend() {
this.dimissionAttendForm.empId = ''
this.dimissionAttendForm.archivesNumb = ''
this.dimissionAttendForm.deptId = ''
this.dimissionAttendForm.deptName = ''
+ this.dimissionAttendForm.allDeptName = ''
this.dimissionAttendForm.empNumb = ''
this.dimissionAttendForm.empName = ''
this.dimissionAttendForm.sex = ''
@@ -4744,6 +4822,7 @@
this.dimissionAttendForm.certificateNumb = row.certificateNumb
this.dimissionAttendForm.deptId = row.deptId
this.dimissionAttendForm.deptName = row.deptName
+ this.dimissionAttendForm.allDeptName = row.allDeptName
this.dimissionAttendForm.JobId = row.JobId
this.dimissionAttendForm.jobName = row.jobName
this.dimissionAttendForm.attendMonth = row.attendMonth
@@ -4811,12 +4890,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanLeaveInfo() {
this.leaveInfoForm.empId = ''
this.leaveInfoForm.archivesNumb = ''
this.leaveInfoForm.deptId = ''
this.leaveInfoForm.deptName = ''
+ this.leaveInfoForm.allDeptName = ''
this.leaveInfoForm.empNumb = ''
this.leaveInfoForm.empName = ''
this.leaveInfoForm.sex = ''
@@ -4849,6 +4932,7 @@
this.leaveInfoForm.certificateNumb = row.certificateNumb
this.leaveInfoForm.deptId = row.deptId
this.leaveInfoForm.deptName = row.deptName
+ this.leaveInfoForm.allDeptName = row.allDeptName
this.leaveInfoForm.JobId = row.JobId
this.leaveInfoForm.jobName = row.jobName
this.leaveInfoForm.beginTime = row.beginTime
@@ -4917,12 +5001,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanResign() {
this.resignForm.empId = ''
this.resignForm.archivesNumb = ''
this.resignForm.deptId = ''
this.resignForm.deptName = ''
+ this.resignForm.allDeptName = ''
this.resignForm.empNumb = ''
this.resignForm.empName = ''
this.resignForm.sex = ''
@@ -4952,6 +5040,7 @@
this.resignForm.certificateNumb = row.certificateNumb
this.resignForm.deptId = row.deptId
this.resignForm.deptName = row.deptName
+ this.resignForm.allDeptName = row.allDeptName
this.resignForm.JobId = row.JobId
this.resignForm.jobName = row.jobName
this.resignForm.applayDate = row.applayDate
@@ -5017,12 +5106,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanUnemployment() {
this.unemploymentForm.empId = ''
this.unemploymentForm.archivesNumb = ''
this.unemploymentForm.deptId = ''
this.unemploymentForm.deptName = ''
+ this.unemploymentForm.allDeptName = ''
this.unemploymentForm.empNumb = ''
this.unemploymentForm.empName = ''
this.unemploymentForm.sex = ''
@@ -5053,6 +5146,7 @@
this.unemploymentForm.certificateNumb = row.certificateNumb
this.unemploymentForm.deptId = row.deptId
this.unemploymentForm.deptName = row.deptName
+ this.unemploymentForm.allDeptName = row.allDeptName
this.unemploymentForm.JobId = row.JobId
this.unemploymentForm.jobName = row.jobName
this.unemploymentForm.applayDate = row.applayDate
@@ -5119,12 +5213,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanInsurance() {
this.insuranceForm.empId = ''
this.insuranceForm.archivesNumb = ''
this.insuranceForm.deptId = ''
this.insuranceForm.deptName = ''
+ this.insuranceForm.allDeptName = ''
this.insuranceForm.empNumb = ''
this.insuranceForm.empName = ''
this.insuranceForm.sex = ''
@@ -5157,6 +5255,7 @@
this.insuranceForm.certificateNumb = row.certificateNumb
this.insuranceForm.deptId = row.deptId
this.insuranceForm.deptName = row.deptName
+ this.insuranceForm.allDeptName = row.allDeptName
this.insuranceForm.JobId = row.JobId
this.insuranceForm.jobName = row.jobName
this.insuranceForm.applayDate = row.applayDate
@@ -5224,12 +5323,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanAccidentCases() {
this.accidentCasesForm.empId = ''
this.accidentCasesForm.archivesNumb = ''
this.accidentCasesForm.deptId = ''
this.accidentCasesForm.deptName = ''
+ this.accidentCasesForm.allDeptName = ''
this.accidentCasesForm.empNumb = ''
this.accidentCasesForm.empName = ''
this.accidentCasesForm.sex = ''
@@ -5260,7 +5363,7 @@
this.accidentCasesForm.creator = ''
this.accidentCasesForm.modifyTime = ''
this.accidentCasesForm.modifier = ''
- this.accidentCasesForm.delFlag = ''
+ this.accidentCasesForm.delFlag = '2'
this.accidentCasesForm.version = ''
},
editAccidentCases(row) {
@@ -5274,6 +5377,7 @@
this.accidentCasesForm.certificateNumb = row.certificateNumb
this.accidentCasesForm.deptId = row.deptId
this.accidentCasesForm.deptName = row.deptName
+ this.accidentCasesForm.allDeptName = row.allDeptName
this.accidentCasesForm.JobId = row.JobId
this.accidentCasesForm.jobName = row.jobName
this.accidentCasesForm.injuredTime = row.injuredTime
@@ -5354,12 +5458,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanOccupational() {
this.occupationalForm.empId = ''
this.occupationalForm.archivesNumb = ''
this.occupationalForm.deptId = ''
this.occupationalForm.deptName = ''
+ this.occupationalForm.allDeptName = ''
this.occupationalForm.empNumb = ''
this.occupationalForm.empName = ''
this.occupationalForm.sex = ''
@@ -5398,7 +5506,7 @@
this.occupationalForm.creator = ''
this.occupationalForm.modifyTime = ''
this.occupationalForm.modifier = ''
- this.occupationalForm.delFlag = ''
+ this.occupationalForm.delFlag = '2'
this.occupationalForm.version = ''
this.occupationalForm.remark = ''
},
@@ -5413,6 +5521,7 @@
this.occupationalForm.certificateNumb = row.certificateNumb
this.occupationalForm.deptId = row.deptId
this.occupationalForm.deptName = row.deptName
+ this.occupationalForm.allDeptName = row.allDeptName
this.occupationalForm.JobId = row.JobId
this.occupationalForm.jobName = row.jobName
this.occupationalForm.injuredTime = row.injuredTime
@@ -5504,12 +5613,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanLaborTrouble() {
this.laborTroubleForm.empId = ''
this.laborTroubleForm.archivesNumb = ''
this.laborTroubleForm.deptId = ''
this.laborTroubleForm.deptName = ''
+ this.laborTroubleForm.allDeptName = ''
this.laborTroubleForm.empNumb = ''
this.laborTroubleForm.empName = ''
this.laborTroubleForm.sex = ''
@@ -5528,7 +5641,7 @@
this.laborTroubleForm.creator = ''
this.laborTroubleForm.modifyTime = ''
this.laborTroubleForm.modifier = ''
- this.laborTroubleForm.delFlag = ''
+ this.laborTroubleForm.delFlag = '2'
this.laborTroubleForm.version = ''
this.laborTroubleForm.remark = ''
},
@@ -5542,6 +5655,7 @@
this.laborTroubleForm.certificateNumb = row.certificateNumb
this.laborTroubleForm.deptId = row.deptId
this.laborTroubleForm.deptName = row.deptName
+ this.laborTroubleForm.allDeptName = row.allDeptName
this.laborTroubleForm.JobId = row.JobId
this.laborTroubleForm.jobName = row.jobName
this.laborTroubleForm.arbitrationDate = row.arbitrationDate
@@ -5572,6 +5686,7 @@
this.badRecordForm.archivesNumb = ''
this.badRecordForm.deptId = ''
this.badRecordForm.deptName = ''
+ this.badRecordForm.allDeptName = ''
this.badRecordForm.empNumb = ''
this.badRecordForm.empName = ''
this.badRecordForm.sex = ''
@@ -5586,7 +5701,7 @@
this.badRecordForm.creator = ''
this.badRecordForm.modifyTime = ''
this.badRecordForm.modifier = ''
- this.badRecordForm.delFlag = ''
+ this.badRecordForm.delFlag = '2'
this.badRecordForm.version = ''
this.badRecordForm.remark = ''
},
@@ -5634,6 +5749,9 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
editBadRecord(row) {
this.isAdd = false
@@ -5645,6 +5763,7 @@
this.badRecordForm.certificateNumb = row.certificateNumb
this.badRecordForm.deptId = row.deptId
this.badRecordForm.deptName = row.deptName
+ this.badRecordForm.allDeptName = row.allDeptName
this.badRecordForm.JobId = row.JobId
this.badRecordForm.jobName = row.jobName
this.badRecordForm.badDate = row.badDate
@@ -5709,12 +5828,16 @@
}
}
})
+ setTimeout(() => {
+ this.$refs[formName].clearValidate()
+ }, 1500)
},
cleanRemarkInfo() {
this.remarkInfoForm.empId = ''
this.remarkInfoForm.archivesNumb = ''
this.remarkInfoForm.deptId = ''
this.remarkInfoForm.deptName = ''
+ this.remarkInfoForm.allDeptName = ''
this.remarkInfoForm.empNumb = ''
this.remarkInfoForm.empName = ''
this.remarkInfoForm.sex = ''
@@ -5728,7 +5851,7 @@
this.remarkInfoForm.creator = ''
this.remarkInfoForm.modifyTime = ''
this.remarkInfoForm.modifier = ''
- this.remarkInfoForm.delFlag = ''
+ this.remarkInfoForm.delFlag = '2'
this.remarkInfoForm.version = ''
},
editRemarkInfo(row) {
@@ -5742,6 +5865,7 @@
this.remarkInfoForm.JobId = row.JobId
this.remarkInfoForm.deptId = row.deptId
this.remarkInfoForm.deptName = row.deptName
+ this.remarkInfoForm.allDeptName = row.allDeptName
this.remarkInfoForm.jobName = row.jobName
this.remarkInfoForm.remarkContent = row.remarkContent
this.remarkInfoForm.remarkDate = row.remarkDate
@@ -5810,6 +5934,7 @@
this[this.inputForName].certificateNumb = data.certificateNumb
this[this.inputForName].deptId = data.deptId
this[this.inputForName].deptName = data.deptName
+ this[this.inputForName].allDeptName = data.allDeptName
this[this.inputForName].JobId = data.jobId
this[this.inputForName].jobName = data.jobName
this[this.inputForName].sex = data.sex === '1' ? '男' : '女'
@@ -5872,6 +5997,11 @@
case '5':
return '（非深户）四险一档'
}
+ },
+ changeSort(val) {
+ this.sort.field = val.prop
+ this.sort.order = val.order
+ this.search()
}
}
}
--
Gitblit v1.8.0