diff --git a/src/components/kpi-layout/SmallNav.vue b/src/components/kpi-layout/SmallNav.vue index 03699fc..db6bbd0 100644 --- a/src/components/kpi-layout/SmallNav.vue +++ b/src/components/kpi-layout/SmallNav.vue @@ -31,7 +31,7 @@ export default { handleBack () { const name = this.$route.query.name if (name) { - return this.$router.replace({name}) + return this.$router.replace({name: 'assessment-homeList'}) } this.$router.go(-1) } diff --git a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue index 572b551..1e461a0 100644 --- a/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue +++ b/src/views/kpi/workbench/assessmentGroup/edit/components/basis.vue @@ -121,6 +121,7 @@ export default { return { counts: '', // 参与考核人数 depIds: '', // 参与部门id,逗号隔开 + managerIdList: [], managerIds: '', // 绩效管理员ID,system_user,id,逗号隔开 outIds: '', // 排除人员ids,逗号隔开 staffIds: '', // 参与考核员工staff_id,逗号隔开 @@ -184,7 +185,7 @@ export default { beforeMount () {}, async mounted () { this.$loadingStart() - this.handleGetGround() + await this.handleGetGround() const id = this.$route.query.id || '' this.id = id if (id) { @@ -250,14 +251,12 @@ export default { try { let res = await getByIdForBasis({id}) res = res.data - console.log('res: ', res) this.GroundList1 = res.managers.map(i => { i.staffId = i.id i.staffName = i.name i.isSelect = 1 return i }) - const a = this.$personlGetForm(res.staffs) const c = this.$departGetForm(res.deps) const obj = { @@ -266,7 +265,7 @@ export default { id: this.$route.query.copy ? '' : res.id, name: this.$route.query.copy ? '' : res.name } - if (res.deps.length !== 0) { + if (res.deps && res.deps.length !== 0) { const b = this.$personlGetForm(res.outs) this.outIdsLsit = b obj.outIds = b.value @@ -306,6 +305,7 @@ export default { this.showRight = false }, handleGetChoose (item) { + console.log('item: ', item) this[item] = true } }, diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue index 5a63935..59f7cbe 100644 --- a/src/views/kpi/workbench/initiateAssessment/index.vue +++ b/src/views/kpi/workbench/initiateAssessment/index.vue @@ -209,7 +209,7 @@ export default { this.$message.error(res.msg) return } - this.$router.push({ name: 'assessment-stepList', query: { id: res.data.id, name: 'assessment-homeList' } }) + this.$router.push({ name: 'assessment-stepList', query: { id: res.data.id, name: '1' } }) this.$message({ message: res.msg, type: 'success'