Merge branch 'master' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui
* 'master' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui: 优化
This commit is contained in:
zhujida
commit
6564d65255
@ -11,22 +11,26 @@
|
||||
<div class="line-space commonFont">
|
||||
<div class="line-space ">
|
||||
<el-input
|
||||
v-model="rqAssessmentParameter.searchName"
|
||||
v-model="rqAssessmentParameter.staffName"
|
||||
@change="handlePopupSearchChange"
|
||||
prefix-icon="el-icon-search"
|
||||
placeholder="按姓名搜索"
|
||||
size="small"
|
||||
></el-input>
|
||||
</div>
|
||||
<div >
|
||||
<div>
|
||||
<el-button
|
||||
@click="handleChooseDepartment"
|
||||
size="small"
|
||||
><div class="popup-btn"><span class="popup-btn-left-title">{{deptFilterData.deptNames}}</span><i class="el-icon-arrow-down"></i></div></el-button>
|
||||
>
|
||||
<div class="popup-btn"><span class="popup-btn-left-title">{{deptFilterData.deptNames}}</span><i class="el-icon-arrow-down"></i></div>
|
||||
</el-button>
|
||||
<el-button
|
||||
@click="handleChooseGroup"
|
||||
size="small"
|
||||
><div class="popup-btn"><span class="popup-btn-left-title">{{groupFilterData.groupNames}}</span><i class="el-icon-arrow-down"></i></div></el-button>
|
||||
>
|
||||
<div class="popup-btn"><span class="popup-btn-left-title">{{groupFilterData.groupNames}}</span><i class="el-icon-arrow-down"></i></div>
|
||||
</el-button>
|
||||
</div>
|
||||
<div
|
||||
v-if="groupFilterData.selectedList.length>0|| deptFilterData.showDataList.list.length>0"
|
||||
@ -70,11 +74,14 @@
|
||||
label="姓名"
|
||||
width="55px"
|
||||
><template slot-scope="scope">
|
||||
<div class="header">
|
||||
<InfoHeader :isShow='false' :obj="{
|
||||
<div class="header">
|
||||
<InfoHeader
|
||||
:isShow='false'
|
||||
:obj="{
|
||||
src:scope.row.avatar
|
||||
}"/>
|
||||
</div>
|
||||
}"
|
||||
/>
|
||||
</div>
|
||||
</template></el-table-column>
|
||||
<el-table-column>
|
||||
<template slot-scope="scope">
|
||||
@ -124,16 +131,37 @@
|
||||
:showDataList.sync='deptFilterData.showDataList'
|
||||
@cb="handleDeptSubmit"
|
||||
/>
|
||||
<el-dialog title="删除确认" :visible.sync="visibleRemovePerson" width="440px">
|
||||
<el-dialog
|
||||
title="删除确认"
|
||||
:visible.sync="visibleRemovePerson"
|
||||
width="440px"
|
||||
>
|
||||
<div v-if="popupData.selectedList.length>1">
|
||||
<div class="commonFont line-space">确认将选中的{{popupData.selectedList.length}}人，从考核中删除，删除后，绩效考核数据将被清空，数据无法恢复，请确认是否删除</div>
|
||||
<div class="commonFont line-space">请在下方输入框中输入<span style="color: red;">“删除”</span>二字，确认您已知晓删除将导致数据无法恢复</div>
|
||||
<div><el-input v-model="removeConfirmInput" placeholder="请输入“删除二字”" size="small"></el-input></div>
|
||||
<div>
|
||||
<el-input
|
||||
v-model="removeConfirmInput"
|
||||
placeholder="请输入“删除二字”"
|
||||
size="small"
|
||||
></el-input>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="commonFont">被考核人删除后，本次考核相关数据数据将被清空，数据无法恢复，请确认是否删除</div>
|
||||
<div
|
||||
v-else
|
||||
class="commonFont"
|
||||
>被考核人删除后，本次考核相关数据数据将被清空，数据无法恢复，请确认是否删除</div>
|
||||
<div slot="footer">
|
||||
<el-button @click="visibleRemovePerson = false" size="small">取 消</el-button>
|
||||
<el-button @click="handleConfirmRemovePerson" type="primary" size="small" :disabled="removeConfirmInput!=='删除'&&popupData.selectedList.length>1">确 定</el-button>
|
||||
<el-button
|
||||
@click="visibleRemovePerson = false"
|
||||
size="small"
|
||||
>取 消</el-button>
|
||||
<el-button
|
||||
@click="handleConfirmRemovePerson"
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled="removeConfirmInput!=='删除'&&popupData.selectedList.length>1"
|
||||
>确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
@ -188,7 +216,7 @@ export default {
|
||||
rqAssessmentParameter: {
|
||||
currPage: 1,
|
||||
pageSize: 100,
|
||||
searchName: '',
|
||||
staffName: '',
|
||||
totalCount: 1,
|
||||
totalPage: 1,
|
||||
evaluationIds: '', // 考勤组ids
|
||||
@ -296,9 +324,9 @@ export default {
|
||||
this.handleGainAssessmentGroupList()
|
||||
},
|
||||
handleGainDeptPerson (dicArr, list) {
|
||||
for (let index = 0; index < list.length; index++) {
|
||||
for (let index = 0;index < list.length;index++) {
|
||||
const dept = list[index]
|
||||
for (let index = 0; index < dept.staffDtos.length; index++) {
|
||||
for (let index = 0;index < dept.staffDtos.length;index++) {
|
||||
const person = dept.staffDtos[index]
|
||||
dicArr[person.staffId.toString()] = 1
|
||||
}
|
||||
@ -372,7 +400,7 @@ export default {
|
||||
this.rqAssessmentParameter.startId = null
|
||||
this.rqAssessmentParameter.staffIds = ''
|
||||
this.rqAssessmentParameter.evaluationIds = ''
|
||||
this.rqAssessmentParameter.searchName = ''
|
||||
this.rqAssessmentParameter.staffName = ''
|
||||
this.rqAssessmentParameter.currPage = 1
|
||||
this.rqAssessmentParameter.totalCount = 1
|
||||
this.rqAssessmentParameter.totalPage = 1
|
||||
@ -393,23 +421,23 @@ export default {
|
||||
</script>
|
||||
|
||||
<style lang='less' scoped>
|
||||
.line-space {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.line-space {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.popup {
|
||||
.header{
|
||||
.header {
|
||||
height: 50px;
|
||||
width: 50px;
|
||||
}
|
||||
max-width: 440px;
|
||||
max-width: 440px;
|
||||
.el-button {
|
||||
max-width: 104px;
|
||||
width: 104px;
|
||||
}
|
||||
&-btn{
|
||||
&-btn {
|
||||
display: flex;
|
||||
&-left-title {
|
||||
&-left-title {
|
||||
width: 74px;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
@ -417,7 +445,7 @@ export default {
|
||||
}
|
||||
}
|
||||
|
||||
.el-tag{
|
||||
.el-tag {
|
||||
margin-right: 10px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user