From ebddabdc5ac57945922032bbd76a498d44a36b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= Date: Thu, 12 Nov 2020 20:05:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../performance/components/UseButton/index.vue | 1 + src/views/kpi/assessment/performance/index.vue | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/kpi/assessment/performance/components/UseButton/index.vue b/src/views/kpi/assessment/performance/components/UseButton/index.vue index b7fb862..d305685 100644 --- a/src/views/kpi/assessment/performance/components/UseButton/index.vue +++ b/src/views/kpi/assessment/performance/components/UseButton/index.vue @@ -282,6 +282,7 @@ export default { async cb (info) { const obj = {status: 8, menuName: '转交了', transferStaffId: info.value} if (this.info) obj.flowRecordId = this.info.flowRecordId + if (this.$attrs.flowRecordId) obj.flowRecordId = this.$attrs.flowRecordId const params = Object.assign({}, this.form, {resultRecordId: this.$route.query.id || ''}, obj) let res = await apiSaveapproval(params) if (res.code !== 200) { diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue index 06f3ff5..2eded63 100644 --- a/src/views/kpi/assessment/performance/index.vue +++ b/src/views/kpi/assessment/performance/index.vue @@ -10,7 +10,7 @@ departmentName:obj.departmentName }" />
- +
@@ -129,7 +129,7 @@ 已确认
- +
@@ -148,6 +148,8 @@ import tables from './components/table' export default { data () { return { + isShow: false, + flowRecordId: '', right: { showRight: false }, @@ -198,6 +200,7 @@ export default { this.right.showRight = false }, async handleList () { + this.isShow = false let res = await apiResultRecordDetail({ resultRecordId: this.$route.query.id }) this.handleGetTbale() if (res.code !== 200) return this.$message.error(res.msg) @@ -205,9 +208,14 @@ export default { for (let i in res.data.flowRecordList) { arr.shift() res.data.flowRecordList[i][arr.some(j => j.status === 1) ? 'isGou' : 'isActive'] = true - if (!arr.some(j => j.status === 1)) break + + if (!arr.some(j => j.status === 1)) { + break + } } + this.flowRecordId = res.data.flowRecordList.filter(i => i.isActive).length > 0 ? res.data.flowRecordList.filter(i => i.isActive)[0].flowDetailRespList[0].flowRecordId : '' this.formList = res.data + this.isShow = true } }, watch: {}