diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue index 9ed955a..4467a8b 100644 --- a/src/views/kpi/assessment/performance/index.vue +++ b/src/views/kpi/assessment/performance/index.vue @@ -127,9 +127,9 @@ departmentName:i.departName }"/>
- 未确认 - + 未确认 + 已跳过 + 已确认
@@ -186,7 +186,7 @@ export default { this.$loadingStart() let res = await apiResultGetDetail({ id }) this.$loadingEnd() - if (res.code !== 200) return + if (res.code !== 200) return this.$message.error(res.msg) this.obj = res.data }, handleRight (item) { diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue index 070256a..0eef953 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue @@ -252,12 +252,20 @@ export default { } const a = this.$personlGetForm(res.staffs) const c = this.$departGetForm(res.deps) - this.form.staffIds = a.value - this.form.depIds = c.value + const obj = { + staffIds: a.value, + depIds: c.value, + id: this.$route.query.copy ? '' : res.id, + name: this.$route.query.copy ? '' : res.name + } + // this.form.staffIds = a.value + // this.form.depIds = c.value this.personnelList = a this.showData = c - this.form.id = this.$route.query.copy ? '' : res.id - this.form.name = this.$route.query.copy ? '' : res.name + this.form = obj + // this.form.id = this.$route.query.copy ? '' : res.id + // this.form.name = this.$route.query.copy ? '' : res.name + console.log('this.form: ', this.form) } catch (error) { this.$message.error(error.msg) } @@ -292,6 +300,7 @@ export default { form: { deep: true, handler (n, o) { + console.log('n: ', n) this.$emit('update:basisForm', n) } } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/index.vue b/src/views/kpi/workbench/assessmentGroup/edit/index.vue index b315691..97c3b9e 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/index.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/index.vue @@ -74,6 +74,7 @@ export default { if (!this.basisForm.name) { return this.$message.error('请输入考评组名称') } + console.log('!this.basisForm: ', this.basisForm) if (!this.basisForm.depIds && !this.basisForm.staffIds) { return this.$message.error('请选择被考核人员') }