This commit is contained in:
熊成强 2020-11-03 15:06:52 +08:00
parent ad893c38c1
commit 2e464f172e
6 changed files with 30 additions and 27 deletions

View File

@ -35,22 +35,30 @@ export function apiManagerDetail (query) {
data: query
})
}
const loginUserId = 825
// 获取考核详情
export function apiResultRecordDetail (query) {
return request({
url: '/lz_management/user/lzresultrecord/new/resultRecordDetail',
method: 'get',
params: query
params: Object.assign({}, query, {loginUserId})
})
}
// 获取考核详情表格数据
export function apiResultGetDetail (query) {
return request({
url: '/lz_management/user/lzresultrecord/getDetail',
method: 'get',
params: query
params: Object.assign({}, query, {loginUserId})
})
}
// 审批流程-
export function apiSaveapproval (query) {
return request({
url: '/lz_management/user/lzresultrecord/new/approval',
method: 'get',
params: Object.assign({}, query, {loginUserId})
})
}
@ -63,15 +71,6 @@ export function apiSaveDetail (query) {
})
}
// 审批流程-
export function apiSaveapproval (query) {
return request({
url: '/lz_management/user/lzresultrecord/new/approval',
method: 'get',
params: query
})
}
// 获取3.75分等级列表 -
export function apiGet375 (query) {
return request({

View File

@ -2,7 +2,7 @@
<template>
<div class="header-title">
<div class="header-title-img">
<img onerror="javascript:this.src='/static/default.jpg';" src='/static/default.jpg' alt="">
<img onerror="javascript:this.src='/static/default.jpg';" :src="obj.src|| ''" alt="">
</div>
<div class="header-title-right commonFont">
<span style="font-size:14px;">{{obj.name || "熊成强"}}</span>
@ -33,7 +33,7 @@ export default {
.header{
width: 100%;
&-title{
margin: 0 0 10PX 0;
// margin: 0 0 10PX 0;
display: flex;
align-items: center;
&-img{

View File

@ -5,7 +5,8 @@
<div class="goals-content boderAndRadius">
<div class="goals-content-name">
<InfoHeader :obj="{
name:obj.currentApprovalStaffName,
src:obj.avatar,
name:obj.staffName,
departmentName:obj.departmentName
}"/>
<div>
@ -185,7 +186,7 @@ export default {
this.$message.error(res1.msg)
return
}
const obj = {status: 1, menuName: this.tableInfo.result ? '提交了结果值' : '提交了评分'}
const obj = {status: 1, menuName: '制定了目标'}
const params = Object.assign({}, {resultRecordId: this.$route.query.id || ''}, obj)
let res = await apiSaveapproval(params)
if (res.code !== 200) {
@ -196,7 +197,7 @@ export default {
message: res.msg,
type: 'success'
})
history.go(0)
history.go(-1)
},
handleGetWeight (arr) {
const weight = arr.detailDtos.reduce((num, i) => {

View File

@ -35,7 +35,7 @@
<el-input
:rows="5"
type="textarea"
v-model="ruleForm.comment"
v-model="form.comment"
placeholder="请输入驳回理由"
maxlength="9999"
show-word-limit></el-input>
@ -280,6 +280,7 @@ export default {
let res = await apiSaveapproval(params)
if (res.code !== 200) {
this.$message.error(res.msg)
// history.go(0)
resolve(1)
}
this.form = {}
@ -287,6 +288,7 @@ export default {
message: res.msg,
type: 'success'
})
// history.go(0)
resolve(0)
}
})

View File

@ -5,10 +5,10 @@
<div class="table-left">维度</div>
<div class="table-header-flex name">名称</div>
<div class="table-header-flex">考核标准</div>
<div class="table-header-flex" v-if="tableInfo.result">结果值</div>
<div class="table-header-flex" v-if="tableInfo.result || auth.showResult">结果值</div>
<div class="table-header-flex quanzhomng">权重({{obj.weight*100}}%)</div>
<div class="table-header-flex" v-if="tableInfo.score">上级评分</div>
<div class="table-header-flex" v-if="tableInfo.score">评分说明</div>
<div class="table-header-flex" v-if="tableInfo.score || auth.showScore">上级评分</div>
<div class="table-header-flex" v-if="tableInfo.score || auth.showScore">评分说明</div>
</div>
<!-- <div v-if="obj.recortModelDtos.length === 0" class='listNone'>
<div>

View File

@ -5,7 +5,8 @@
<div class="performance-content boderAndRadius">
<div class="performance-content-title">
<InfoHeader :obj="{
name:obj.currentApprovalStaffName,
src:obj.avatar,
name:obj.staffName,
departmentName:obj.departmentName
}" />
<div class="performance-content-title-right">
@ -69,7 +70,7 @@
</div>
<div class="performance-content-bottom">
<tables
:formList='formList.auth'
:auth='formList.auth'
:tableInfo.sync='tableInfo'
v-if="obj.recortModelDtos.length !==0"
:obj='obj'
@ -118,6 +119,7 @@
v-for="(i,index) in form.item.flowDetailRespList"
>
<InfoHeader :obj="{
src:i.avatar,
name:i.staffName,
departmentName:i.departName
}"/>
@ -195,8 +197,7 @@ export default {
this.right.showRight = false
},
async handleList () {
// resultRecordId = == this.$route.query.id
let res = await apiResultRecordDetail({ resultRecordId: this.$route.query.id, loginUserId: 313 })
let res = await apiResultRecordDetail({ resultRecordId: this.$route.query.id })
if (res.code !== 200) return
for (let i in res.data.flowRecordList) {
res.data.flowRecordList[i === '0' ? i : (i - 1)].isGou = true
@ -218,7 +219,7 @@ export default {
.performance {
overflow: auto;
.chooseManage-item {
// padding: 24px 0;
padding: 10px 0;
border-bottom: 1px solid @borderColor;
display: flex;
align-items: center;