This commit is contained in:
sean yu 2020-10-29 17:12:24 +08:00
commit f10c6300ad
19 changed files with 408 additions and 117 deletions

View File

@ -53,3 +53,12 @@ export function apiResultGetDetail (query) {
params: query
})
}
// 保存绩效详情-
export function apiSaveDetail (query) {
return request({
url: '/lz_management/user/lzresultrecord/saveDetail',
method: 'post',
data: query
})
}

View File

@ -2,7 +2,7 @@
<div class="team-filter commonFont">
<el-dialog
title="考评组筛选"
:visible.sync="dialogVisible"
:visible="true"
:before-close="handleCancel"
width="920"
>
@ -15,6 +15,7 @@
prefix-icon="el-icon-search"
v-model="searchName"
@change="handleSearchChange"
clearable
placeholder="搜索考评组"
size="small"
></el-input>
@ -112,6 +113,10 @@ export default {
type: Boolean,
default: false
},
value: {
type: String,
deafult: () => ''
},
filtersDic: {
type: Object,
default: () => {
@ -123,24 +128,11 @@ export default {
data () {
return {
searchName: '',
tableList: [{
copyId: 0,
counts: 53,
depIds: '154322459',
gmtCreate: '2020-10-26 11:22:01',
gmtModified: '2020-10-27 14:30:47',
id: 57,
isDelete: 0,
managerIds: '380',
name: '1231',
outIds: '322,379,380,387,388,389,391,410,825',
score: 0,
staffIds: ''
}],
tableList: [],
seleactedList: [],
pageInfo: {
currPage: 1,
pageSize: 1,
pageSize: 500,
totalCount: 1,
totalPage: 1
}
@ -149,27 +141,41 @@ export default {
created () {
},
mounted () {
this.$nextTick(() => {
this.handleDataList()
})
},
watch: {
dialogVisible (newVal, oldVal) {
if (newVal !== oldVal && newVal) {
this.handleDataList()
}
}
// dialogVisible (newVal, oldVal) {
// if (newVal) {
// if (this.filtersDic.currPage === undefined || !this.filtersDic.currPage) {
// this.filtersDic['currPage'] = this.pageInfo.currPage
// }
// if (this.filtersDic.pageSize === undefined || !this.filtersDic.pageSize) {
// this.filtersDic['pageSize'] = this.pageInfo.pageSize
// }
// this.handleDataList()
// }
// }
},
methods: {
handleDataList () {
let paraDic = Object.assign(this.pageInfo, this.filtersDic)
apiGetEvaluationTeamList(paraDic).then(res => {
apiGetEvaluationTeamList(Object.assign({}, this.pageInfo, this.filtersDic)).then(res => {
this.pageInfo.currPage = res.data.currPage
this.pageInfo.totalCount = res.data.totalCount
this.pageInfo.totalPage = res.data.totalPage
this.tableList = res.data.list
this.$nextTick(() => {
this.tableList.map(i => {
if (this.value.includes(String(i.id))) {
this.$refs.refChooseTable.toggleRowSelection(i, true)
}
})
})
// this.$ref.refChooseTable.toggleRowSelection()
})
},
// handleGetRowStyle () {
// return { 'height': '44px' }
// },
handleSearchChange () {
//
this.filtersDic['name'] = this.searchName
@ -191,8 +197,16 @@ export default {
this.$emit('close')
},
handleSubmit () {
this.$emit('submitClick', this.seleactedList)
this.handleCancel()
const obj = {
value: '',
title: ''
}
this.seleactedList.sort((a, b) => a.id - b.id).map(i => {
obj.value += i.id + ','
})
obj.value = obj.value.substring(obj.value.length - 1, 0)
obj.title = this.seleactedList.length > 0 ? (this.seleactedList[0].name + '等' + this.seleactedList.length + '个考评组') : ''
this.$emit('submitClick', obj)
},
handleSelectionChange (val) {
this.seleactedList = val
@ -229,6 +243,7 @@ export default {
&-content {
width: 100%;
height: 425px;
padding: 20px 0;
border-bottom: 1 solid @borderColor;
&-left {
height: 100%;

View File

@ -68,6 +68,10 @@
import bbb from './a'
export default {
props: {
len: {
type: Number,
default: 99999
},
isShow: {
TYPE: Boolean,
default: () => false
@ -224,10 +228,19 @@ export default {
}
return item
}, [])
if (this.len < arr.length) {
this.$message.info('人数最多只能选择' + this.len + '人')
return
}
const params = this.$personlGetForm(arr)
this.$emit('update:value', params.value)
this.$emit('update:showDataList', params)
this.$emit('update:isShow', false)
console.log(this.$listeners)
if (this.$listeners.cb) {
this.$emit('cb', params)
} else {
this.$emit('update:value', params.value)
this.$emit('update:showDataList', params)
this.$emit('update:isShow', false)
}
},
handleGetPerson (list = this.tags, getList = []) {
list.map(i => {

View File

@ -53,6 +53,9 @@ export default {
color: #aaaaaa;
cursor: pointer;
}
&-back:hover{
color: @fontBlue;
}
&-title{
padding: 0 10px;
position: relative;

View File

@ -18,6 +18,16 @@
color: #b1b1b1;
}
.comonTitle {
font-size: 20px;
color: #52575b;
}
.comonPrompt {
font-size: 14px;
color: #9b9b9b;
}
.common-main {
background-color: white;
padding: 40px 20px;

View File

@ -32,7 +32,8 @@ import {
TabPane,
Menu,
MenuItem,
Loading
Loading,
Image
} from 'element-ui'
Vue.prototype.$loading = Loading
@ -71,3 +72,4 @@ Vue.use(DropdownItem)
Vue.use(Cascader)
Vue.use(Menu)
Vue.use(MenuItem)
Vue.use(Image)

View File

@ -9,8 +9,8 @@
departmentName:obj.departmentName
}"/>
<div>
<el-button size='small' plain>暂存</el-button>
<el-button size='small' type="primary">提交</el-button>
<el-button size='small' @click="handleSaveDetail()" plain>暂存</el-button>
<el-button size='small' type="primary" >提交</el-button>
</div>
</div>
<div class="goals-content-tabbar">
@ -107,7 +107,7 @@ import InfoHeader from '@/components/InfoHeader'
import PopupRight from '@/components/PopupRight'
import draggable from 'vuedraggable'
import {getDimensions} from '@/api/data'
import { apiResultGetDetail } from '@/api/assessment'
import { apiResultGetDetail, apiSaveDetail } from '@/api/assessment'
export default {
data () {
return {
@ -160,6 +160,15 @@ export default {
this.handleGetTbale()
},
methods: {
async handleSaveDetail (params = this.obj) {
let res = await apiSaveDetail(params)
if (res.code !== 200) {
this.$message.error = res.msg
return
}
this.handleGetTbale()
console.log('res: ', res)
},
//
async handleGetDimensions () {
try {
@ -220,7 +229,7 @@ export default {
handleFilter (item) {
return item ? item.filter(i => !i.isDelete) : []
},
async handleGetTbale (id = 226) {
async handleGetTbale (id = this.$route.query.id) {
let res = await apiResultGetDetail({id})
if (res.code !== 200) return
this.obj = res.data

View File

@ -56,7 +56,7 @@
@click="handlePush(scope.row.id)"
type="text"
size="small">
</el-button>
<el-button
@click="handleDelete(scope.row.id)"

View File

@ -0,0 +1,55 @@
<!-- -->
<template>
<div>
<el-button
size="mini"
@click="handleZhiding"
type="primary"
>制定目标</el-button>
<getPersonnel :len='1' @cb='cb' v-if="isShowPersonnel" :value.sync='staffIds' :isShow.sync='isShowPersonnel' :showDataList.sync='personnelList'/>
</div>
</template>
<script>
import getPersonnel from '@/components/getPersonnel'
export default {
data () {
return {
isShowPersonnel: false,
staffIds: '',
personnelList: {
list: []
}
}
},
components: {
getPersonnel
},
computed: {},
beforeMount () {},
mounted () {},
methods: {
cb (info) {
console.log(info)
},
//
handleZhiding () {
this.isShowPersonnel = true
return
this.$router.push({
name: 'assessment-goals',
query: {
id: 267 || this.$route.query.id
}
})
}
},
watch: {}
}
</script>
<style lang='' scoped>
</style>

View File

@ -25,11 +25,7 @@
departmentName:obj.departmentName
}" />
<div class="performance-content-title-right">
<el-button
size="mini"
@click="handleZhiding"
type="primary"
>制定目标</el-button>
<UseButton />
</div>
</div>
<div class="performance-content-center">
@ -92,7 +88,7 @@
:obj='obj'
/>
</div>
<div class="performance-content-jilu">
<div v-if="!formList.resultCommentList" class="performance-content-jilu">
<div class="performance-content-jilu-title commonFont">
记录
</div>
@ -134,11 +130,20 @@
:key="index"
v-for="(i,index) in form.item.flowDetailRespList"
>
{{i}}
<InfoHeader :obj="{
name:i.staffName,
departmentName:i.departName
}"/>
<div class="chooseManage-item-center">
<el-tag size="mini" type="warning">未确认</el-tag>
<!-- <el-tag>已跳过</el-tag>
<el-tag type="success">已确认</el-tag> -->
</div>
<div>
<el-button size="mini" @click="handleJump(i)" type="primary" plain>跳过</el-button>
<el-button size="mini" type="primary" plain>转交</el-button>
</div>
</div>
<!-- <div v-for="i in rightList" :key="i.id" class="chooseManage-item" >
<el-checkbox :true-label='1' :false-label='0' :disabled='i.isDisable===1' :checked='i.isDisable===1' v-model='i.isSelect'></el-checkbox><span class='commonFont' style="margin:0 0 0 10px;">{{i.staffName}} </span>
</div> -->
</div>
</popup-right>
</div>
@ -148,6 +153,8 @@
import SmallNav from '@/components/kpi-layout/SmallNav'
import InfoHeader from '@/components/InfoHeader'
import PopupRight from '@/components/PopupRight'
import UseButton from './components/UseButton'
import { apiResultRecordDetail, apiResultGetDetail } from '@/api/assessment'
import tables from './components/table'
@ -187,7 +194,8 @@ export default {
SmallNav,
InfoHeader,
PopupRight,
tables
tables,
UseButton
},
computed: {},
beforeMount () { },
@ -196,16 +204,26 @@ export default {
this.handleGetTbale()
},
methods: {
//
handleZhiding () {
this.$router.push({
name: 'assessment-goals',
query: {
id: this.$route.query.id
}
//
handleJump (item) {
console.log('item: ', item)
this.$confirm('确认跳过该人员?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.$message({
type: 'success',
message: '删除成功!'
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
})
})
},
async handleGetTbale (id = 226) {
async handleGetTbale (id = 267) {
let res = await apiResultGetDetail({ id })
this.obj = res.data
console.log('res: ', res)
@ -223,7 +241,7 @@ export default {
},
async handleList () {
// resultRecordId = == this.$route.query.id
let res = await apiResultRecordDetail({ resultRecordId: 215 })
let res = await apiResultRecordDetail({ resultRecordId: 267 })
if (res.code !== 200) return
for (let i in res.data.flowRecordList) {
if (res.data.flowRecordList[i].status !== 1) {
@ -249,8 +267,15 @@ export default {
.performance {
overflow: auto;
.chooseManage-item {
padding: 24px 0;
// padding: 24px 0;
border-bottom: 1px solid @borderColor;
display: flex;
align-items: center;
justify-content: space-between;
&-center{
min-width: 200px;
.center()
}
}
&-content {
padding: 28px;

View File

@ -16,7 +16,7 @@
<div class="step-content-top">
<div class="step-content-top-left">
<el-button size="small" @click="handleChoose" plain>{{formTitle}}<i style="margin-left:10px;" class="el-icon-arrow-down"></i></el-button>
<el-button size="small" @click="handleKaoping" plain>选择考评组<i style="margin-left:10px;" class="el-icon-arrow-down"></i></el-button>
<el-button size="small" @click="handleKaoping" plain>{{params.evaluationIds?params.title:'选择考评组'}}<i style="margin-left:10px;" class="el-icon-arrow-down"></i></el-button>
<el-input clearable @change="handleChangeInput" @keyup.enter="handleChangeInput" size="small" style="margin-left:10px;" v-model="params.name" prefix-icon="el-icon-search" placeholder="请输入姓名搜索"></el-input>
</div>
<div class="step-content-top-right">
@ -98,13 +98,7 @@
</div>
</div>
</div>
<popup-right v-if="kaopingFrom.showRight" @cancel='handleCancel' @submit="handleSubmit" title="考评组筛选">
<div slot="content" class="chooseManage">
<div v-for="i in rightList" :key="i.id" class="chooseManage-item" >
<el-checkbox :true-label='1' :false-label='0' :disabled='i.isDisable===1' :checked='i.isDisable===1' v-model='i.isSelect'></el-checkbox><span class='commonFont' style="margin:0 0 0 10px;">{{i.staffName}} </span>
</div>
</div>
</popup-right>
<EvaluationTeamFilter v-if="dialogVisible" :value='params.evaluationIds' :filtersDic="{startId: this.params.startId }" :dialogVisible.sync='dialogVisible' @submitClick='submitClick' @close='dialogVisible = false'/>
<getPersonnel v-if="form.isShowPersonnel" :value.sync='params.staffIds' :isShow.sync='form.isShowPersonnel' :showDataList.sync='form.personnelList'/>
</div>
</template>
@ -113,6 +107,8 @@
import SmallNav from '@/components/kpi-layout/SmallNav'
import getPersonnel from '@/components/getPersonnel'
import PopupRight from '@/components/PopupRight'
import EvaluationTeamFilter from '@/components/EvaluationTeamFilter'
import { apiManagerDetail, apiChartList } from '@/api/assessment'
import {getWorkList} from '@/api/workbench'
import { getStartsData } from '@/api/report'
@ -120,9 +116,7 @@ let id = 0
export default {
data () {
return {
kaopingFrom: {
showRight: false
},
dialogVisible: false,
form: {
isShowPersonnel: false,
personnelList: {
@ -135,8 +129,8 @@ export default {
'evaluationIds': '',
'flowProcess': null,
'pageSize': 5,
// 'staffIds': '',
// 'staffName': '',
'staffIds': '',
'staffName': '',
'startId': 10
},
key: 0,
@ -163,7 +157,8 @@ export default {
components: {
SmallNav,
getPersonnel,
PopupRight
PopupRight,
EvaluationTeamFilter
},
computed: {
formTitle () {
@ -176,18 +171,16 @@ export default {
await this.handleStartsReq()
},
methods: {
submitClick (item) {
this.params.evaluationIds = item.value
this.params.title = item.title
this.params.currPage = 1
this.handleGetListContent()
this.dialogVisible = false
},
//
async handleKaoping () {
let res = await getWorkList(Object.assign({}, {startId: this.params.startId}, {
'currPage': 1,
'pageSize': 999
}))
if (res.code !== 200) {
this.rightList = []
return
}
this.rightList = res.data.list
this.kaopingFrom.showRight = true
this.dialogVisible = true
},
handleLook (id) {
// this.handleKaoping()
@ -206,6 +199,7 @@ export default {
this.handleGetListContent()
},
async handleGetListContent (params = this.params) {
console.log('params: ', params)
let res = await apiManagerDetail(params)
if (res.code !== 200) return
this.tableData = res.data.list
@ -245,7 +239,12 @@ export default {
},
async handleChange (item) {
this.params.startId = item[1]
// await this.handleGetChartList(Object.assign({}, this.params, {startId: item[1]}))
this.$router.replace({
name: 'assessment-stepList',
query: {
id: item[1]
}
})
this.params.currPage = 1
this.params.startId = item[1]
await this.handleGetChartList()

View File

@ -0,0 +1,147 @@
<template>
<div class="authority commonFont">
<div>
<div class="authority-main line-space">
<div class="authority-main-header">
<div class="comonTitle">智能绩效主管理员</div>
<el-button
type="primary"
size="small"
@click="handleChangeDirector"
>更换智能绩效主管理员</el-button>
</div>
<div class="comonPrompt">绩效应用的主管理员可由钉钉主管理员设置绩效主管理员具有应用所有权限且可以设置智能绩效应用子管理员</div>
<div class="authority-main-info">
<el-image :src="url"></el-image>
<div class="authority-main-info-name">阿三来了</div>
</div>
</div>
<div class="authority-sub line-space">
<div class="authority-sub-header">
<div class="comonTitle">智能绩效子管理员</div>
<el-button
type="primary"
size="small"
@click="handleSubAdd"
icon="el-icon-plus"
plain
>添加</el-button>
</div>
<div class="comonPrompt line-space">可把绩效应用的日常管理工作交给绩效子管理员绩效子管理员可由绩效主管理员设置</div>
<el-table
:data="tableDataList"
:header-cell-style="handleSubGetTableStyle"
>
<el-table-column label="姓名"></el-table-column>
<el-table-column label="功能模块"></el-table-column>
<el-table-column label="管理范围"></el-table-column>
<el-table-column label="是否可见考核结果"></el-table-column>
<el-table-column label="菜单权限"></el-table-column>
<el-table-column label="管理考评组"></el-table-column>
<el-table-column label="操作"></el-table-column>
</el-table>
</div>
<div class="authority-ceo line-space">
<div class="comonTitle line-space">企业负责人</div>
<div class="comonPrompt">企业负责人可以看到全公司的绩效数据可由钉钉主管理员在通讯录设置</div>
</div>
<div class="authority-department line-space">
<div class="comonTitle line-space">部门主管</div>
<div class="comonPrompt">部门主管可看到管理部门的绩效数据可由钉钉管理员在钉钉通讯录设置</div>
</div>
<div class="authority-employee line-space">
<div class="comonTitle line-space">员工</div>
<div class="comonPrompt">员工仅可见自己的绩效数据</div>
</div>
</div>
<dialog-depart
v-if="showDialogDepart"
:value.sync='depIds'
:isShow.sync='showDialogDepart'
:showDataList.sync='showData'
/>
<popup-right
v-if="showPopupAddSub"
@cancel="hundlePopupAddSubHide"
@submit="handlePopupAddSubSubmit"
title="智能绩效子管理员设置"
class="popup"
></popup-right>
</div>
</template>
<script>
import dialogDepart from '@/components/getDepart'
import popupRight from '@/components/PopupRight'
export default {
components: {
dialogDepart,
popupRight
},
data () {
return {
url: '',
showDialogDepart: false,
tableDataList: [],
showData: {},
depIds: '22',
showPopupAddSub: false //
}
},
methods: {
handleSubGetTableStyle () {
return { 'background-color': '#f5f4f5', 'text-align': 'center' }
},
handleChangeDirector () {
//
this.showDialogDepart = true
},
handleSubAdd () {
}
}
}
</script>
<style lang="less" scoped>
.authority {
background-color: white;
padding-top: 40px;
.line-space {
margin-bottom: 18px;
}
.el-image {
width: 40px;
height: 40px;
border-radius: 20px;
overflow: hidden;
}
&-main {
&-header {
display: flex;
width: 100%;
justify-content: space-between;
}
&-info {
display: flex;
justify-content: flex-start;
align-items: center;
height: 72px;
width: 100%;
line-height: 72px;
&-name {
margin-left: 10px;
}
}
}
&-sub {
&-header {
display: flex;
width: 100%;
justify-content: space-between;
}
}
}
</style>

View File

@ -13,14 +13,14 @@
</el-menu>
<ground-table v-if="activeIndex==='0'"></ground-table>
<div v-else-if="activeIndex==='1'">
<span>默认值设置</span>
<try-authority></try-authority>
</div>
</div>
</template>
<script>
import groundTable from '../workbench/assessmentGroup/groundTable'
import tryAuthority from './authority'
export default {
data () {
return {
@ -28,7 +28,8 @@ export default {
}
},
components: {
groundTable
groundTable,
tryAuthority
},
beforeMount () { },
mounted () { },
@ -48,6 +49,6 @@ export default {
<style lang='less' scoped>
.set-mian {
padding-top: 0px;
min-height: 600px;
// min-height: 600px;
}
</style>

View File

@ -25,6 +25,7 @@
<el-radio-group v-model="itemInfo.isActive">
<el-radio :label="1">主管指定一级</el-radio>
<el-radio :label="0">指定成员</el-radio>
<el-radio :label="-1">被考核人自己</el-radio>
</el-radio-group>
<div v-if="itemInfo.isActive!==0 && itemInfo.isActive!==-1" style="padding:30px 0 0 20px;">
<span>被考评人的</span>
@ -42,7 +43,7 @@
<span style="font-size:14px;padding:0 0 0 10px;">{{itemInfo.name}}</span>
</div>
<getpersonl v-if="itemInfo.isShow" :value.sync='itemInfo.optIds' :isShow.sync='itemInfo.isShow' :showDataList.sync='itemInfo.list'/>
<div style="padding:20px 0 0 0 ">
<div v-if="itemInfo.isActive!==-1" style="padding:20px 0 0 0 ">
<span>当执行人为多人时的处理方式</span>
<div style="padding:10px 0 0 20px">
<el-radio-group v-model="itemInfo.stepType">
@ -132,7 +133,7 @@ export default {
list = list.map(i => {
i.isShow = false
i = Object.assign({}, this.handleOptType(i), i)
i.isActive = i.optType === 0 ? 0 : 1
i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
j.checked = i.roleIds ? i.roleIds.includes(String(j.id)) : false
return j
@ -157,6 +158,7 @@ export default {
return obj
}
if (i.optType === -1) {
obj.name = '被考核人'
return obj
} else {
obj.name = this.options.filter(j => j.id === i.optType)[0].name
@ -231,10 +233,10 @@ export default {
n.map(i => {
i.roleIds = ''
i.roleDtos.map(j => {
if (j.type !== 1 && j.checked) i.roleIds += j.id + ','
if (j.type !== 1 && j.checked) i.roleIds += j.roleId + ','
})
i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
i.optType = i.isActive === 0 ? 0 : i.optType
i.optType = (i.isActive === 0 || i.isActive === -1) ? i.isActive : i.optType
})
console.log('n: ', n)
this.$emit('update:info', this.list)
@ -248,27 +250,25 @@ export default {
list: {
deep: true,
handler (n, o) {
this.handleIsEmit(n)
this.handleIsEmit(JSON.parse(JSON.stringify(n)))
}
},
itemInfo: {
deep: true,
handler (n, o) {
console.log('nxcq: ', n)
if (n.isActive !== 0) {
if (n.optType === 0 && n.optType !== -1) {
n.name = this.options.filter(i => i.id === n.optType)[0].name
n.optType = 1
}
if (n.optType === -1) {
n.name = '考核人员自己'
const arr = n
console.log('arr: ', arr)
if (arr.isActive !== 0 && arr.isActive !== -1) {
if (arr.optType < 1) arr.optType = 1
arr.name = this.options.filter(i => i.id === arr.optType)[0].name
} else if (arr.isActive === 0) {
if (arr.list) {
arr.name = this.handleTitle(arr.list)
} else {
arr.name = '未指定成员'
}
} else {
if (n.list) {
n.name = this.handleTitle(n.list)
} else {
n.name = '未指定成员'
}
arr.name = '被考核人自己'
}
// n.roleIds = ''
// n.roleDtos.map(i => {

View File

@ -25,6 +25,7 @@
<el-radio-group v-model="itemInfo.isActive">
<el-radio :label="1">主管指定一级</el-radio>
<el-radio :label="0">指定成员</el-radio>
<el-radio :label="-1">被考核人自己</el-radio>
</el-radio-group>
<div v-if="itemInfo.isActive!==0 && itemInfo.isActive!==-1" style="padding:30px 0 0 20px;">
<span>被考评人的</span>
@ -42,7 +43,7 @@
<span style="font-size:14px;padding:0 0 0 10px;">{{itemInfo.name}}</span>
</div>
<getpersonl v-if="itemInfo.isShow" :value.sync='itemInfo.optIds' :isShow.sync='itemInfo.isShow' :showDataList.sync='itemInfo.list'/>
<div style="padding:20px 0 0 0 ">
<div v-if="itemInfo.isActive !== -1" style="padding:20px 0 0 0 ">
<span>当执行人为多人时的处理方式</span>
<div style="padding:10px 0 0 20px">
<el-radio-group v-model="itemInfo.stepType">
@ -137,7 +138,8 @@ export default {
list = list.map(i => {
i.isShow = false
i = Object.assign({}, this.handleOptType(i), i)
i.isActive = i.optType === 0 ? 0 : 1
console.log('i: ', i)
i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
j.checked = i.roleIds ? i.roleIds.includes(String(j.id)) : false
return j
@ -162,6 +164,7 @@ export default {
return obj
}
if (i.optType === -1) {
obj.name = '被考核人'
return obj
} else {
obj.name = this.options.filter(j => j.id === i.optType)[0].name
@ -239,10 +242,10 @@ export default {
arr = arr.map(i => {
i.roleIds = ''
i.roleDtos.map(j => {
if (j.type !== 1 && j.checked) i.roleIds += j.id + ','
if (j.type !== 1 && j.checked) i.roleIds += j.roleId + ','
})
i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
i.optType = i.isActive === 0 ? 0 : i.optType
i.optType = (i.isActive === 0 || i.isActive === -1) ? i.isActive : i.optType
return i
})
console.log('arr: ', arr)
@ -266,15 +269,17 @@ export default {
handler (n, o) {
const arr = n
console.log('arr: ', arr)
if (arr.isActive !== 0) {
if (arr.optType === 0) arr.optType = 1
if (arr.isActive !== 0 && arr.isActive !== -1) {
if (arr.optType < 1) arr.optType = 1
arr.name = this.options.filter(i => i.id === arr.optType)[0].name
} else {
} else if (arr.isActive === 0) {
if (arr.list) {
arr.name = this.handleTitle(arr.list)
} else {
arr.name = '未指定成员'
}
} else {
arr.name = '被考核人自己'
}
// this.$emit('update:info', this.list)
// n.roleIds = ''

View File

@ -239,7 +239,7 @@ export default {
n.map(i => {
i.roleIds = ''
i.roleDtos.map(j => {
if (j.type !== 1 && j.checked) i.roleIds += j.id + ','
if (j.type !== 1 && j.checked) i.roleIds += j.roleId + ','
})
i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
})

View File

@ -36,8 +36,7 @@ import Perform from './Perform'
import Entry from './Entry'
import Score from './Score'
import Approval from './Approval'
import {getByFlowManagerId, saveDetailProcs} from '@/api/workbench'
console.log('saveDetailProcs: ', saveDetailProcs)
import {getByFlowManagerId} from '@/api/workbench'
export default {
props: ['processInfo'],
data () {

View File

@ -22,7 +22,6 @@ import basis from './components/basis'
import process from './components/process'
import templateSet from './components/templateSet'
import {saveBaseSet, saveTemSet, saveDetailProcs} from '@/api/workbench'
console.log('saveDetailProcs: ', saveDetailProcs)
export default {
data () {

View File

@ -149,7 +149,7 @@ export default {
this.handleGetList()
},
handleRowClick (row) {
this.$router.push({ name: 'assessment-stepList', query: { id: row.recordId } })
this.$router.push({ name: 'assessment-performance', query: { id: row.recordId } })
}
},
watch: {}