From 8d371ac53d00413779caa830291e749f01b19e5c Mon Sep 17 00:00:00 2001
From: yz <yz_0812@outlook.com>
Date: 星期日, 31 一月 2021 15:06:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/user/Informationinput.vue | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/src/views/user/Informationinput.vue b/src/views/user/Informationinput.vue
index 708277d..d2bbfc7 100644
--- a/src/views/user/Informationinput.vue
+++ b/src/views/user/Informationinput.vue
@@ -4,46 +4,46 @@
<el-aside width="200px">
<el-timeline>
<el-timeline-item @click.native="isShow(showArr[0].show,0)">
- 基本信息
+ <span :class="this.thisShowIndex==0?'selectedTimeline':''">基本信息</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[1].show,1)">
- 工作经历
+ <span :class="this.thisShowIndex==1?'selectedTimeline':''">工作经历</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[2].show,2)">
- 体检信息
+ <span :class="this.thisShowIndex==2?'selectedTimeline':''">体检信息</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[3].show,3)">
- 合同信息
+ <span :class="this.thisShowIndex==3?'selectedTimeline':''">合同信息</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[4].show,4)">
- 考勤情况
+ <span :class="this.thisShowIndex==4?'selectedTimeline':''">考勤情况</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[5].show,5)">
- 请假记录
+ <span :class="this.thisShowIndex==5?'selectedTimeline':''">请假记录</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[6].show,6)">
- 辞职申请
+ <span :class="this.thisShowIndex==6?'selectedTimeline':''">辞职申请</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[7].show,7)">
- 失业金领取
+ <span :class="this.thisShowIndex==7?'selectedTimeline':''">失业金领取</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[8].show,8)">
- 社保申请
+ <span :class="this.thisShowIndex==8?'selectedTimeline':''">社保申请</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[9].show,9)">
- 意外险案件
+ <span :class="this.thisShowIndex==9?'selectedTimeline':''">意外险案件</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[10].show,10)">
- 工伤案件
+ <span :class="this.thisShowIndex==10?'selectedTimeline':''">工伤案件</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[11].show,11)">
- 劳资案件
+ <span :class="this.thisShowIndex==11?'selectedTimeline':''">劳资案件</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[12].show,12)">
- 不良记录
+ <span :class="this.thisShowIndex==12?'selectedTimeline':''">不良记录</span>
</el-timeline-item>
<el-timeline-item @click.native="isShow(showArr[13].show,13)">
- 备注信息
+ <span :class="this.thisShowIndex==13?'selectedTimeline':''">备注信息</span>
</el-timeline-item>
</el-timeline>
</el-aside>
@@ -61,10 +61,9 @@
<el-button type="text" size="small" @click="empBaseInfoEdit(scope.row)">编辑</el-button>
</template>
</el-table-column>
- <el-table-column prop="" label="照片" width="180" />
<el-table-column prop="empNumb" label="员工编号" width="180" />
<el-table-column prop="empName" label="姓名" width="180" />
- <el-table-column prop="deptName" label="护卫点" />
+ <el-table-column prop="deptName" label="部门名称" />
<el-table-column prop="jobName" label="岗位" width="180" />
<el-table-column prop="empType" label="员工类别" width="180" />
<el-table-column prop="sex" label="性别" />
@@ -2616,6 +2615,10 @@
color: rgb(163, 44, 48);
}
+ .selectedTimeline{
+ color: rgb(163, 44, 48);
+ }
+
.el-date-editor.el-input,
.el-date-editor.el-input__inner {
width: 100%;
--
Gitblit v1.8.0