diff --git a/src/views/achievements/components/addSelfEvaluationForm.vue b/src/views/achievements/components/addSelfEvaluationForm.vue index 6c76654..d2224eb 100644 --- a/src/views/achievements/components/addSelfEvaluationForm.vue +++ b/src/views/achievements/components/addSelfEvaluationForm.vue @@ -3,14 +3,14 @@ 审核驳回 - + - + - + - + - + - + {{ detail.year }} 年度 - {{ type === 1 ? '年中' : '年度' }}绩效目标 + {{ type === 1 ? '年度' : '年度' }}绩效目标 {{ type === 1 ? detail.year_midst : detail.year_end }} - {{ type === 1 ? '年中' : '年度' }}绩效目标完成情况 + {{ type === 1 ? '年度' : '年度' }}绩效目标完成情况 {{ type === 1 ? detail.middle_result : detail.end_result }} diff --git a/src/views/achievements/point.vue b/src/views/achievements/point.vue index 0224684..9d1017b 100644 --- a/src/views/achievements/point.vue +++ b/src/views/achievements/point.vue @@ -31,6 +31,7 @@ $refs['addPoint'].show(); }" @delete="destroy"> +
@@ -115,6 +116,36 @@ export default { label: "分值", prop: "score", width: 100 + }, + { + label: "操作", + align: "left", + width: 160, + customFn: row => { + return ( +
+ + +
+ ) + } } ], list: [], @@ -224,6 +255,10 @@ export default { // } // this.spanArr = arr // console.log(arr) + + this.$nextTick(() => { + setTimeout(() => this.$refs['table'].doLayout(),500) + }) }, spanMethod({ row, column, rowIndex, columnIndex }) {