From 7174c821ea6dbbfee55f446f772424cea56c7a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E6=88=90=E5=BC=BA?= <xiongchengqiang@linzikg.com>
Date: Fri, 13 Nov 2020 15:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kpi/assessment/performance/components/UseButton/index.vue | 2 +-
 .../kpi/assessment/performance/components/table copy 2.vue    | 2 +-
 src/views/kpi/assessment/performance/index.vue                | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/views/kpi/assessment/performance/components/UseButton/index.vue b/src/views/kpi/assessment/performance/components/UseButton/index.vue
index 3849b00..cbb236a 100644
--- a/src/views/kpi/assessment/performance/components/UseButton/index.vue
+++ b/src/views/kpi/assessment/performance/components/UseButton/index.vue
@@ -285,7 +285,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
+      if (this.formList.flowRecordId !== 0) obj.flowRecordId = this.formList.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/components/table copy 2.vue b/src/views/kpi/assessment/performance/components/table copy 2.vue
index 47eb59d..67be33a 100644
--- a/src/views/kpi/assessment/performance/components/table copy 2.vue	
+++ b/src/views/kpi/assessment/performance/components/table copy 2.vue	
@@ -305,7 +305,7 @@ width: 50px;
   border-bottom: 1px solid @borderColor;
 }
 .table-list{
-   margin: 0 0 10px 0;
+   padding: 0 0 10px 0;
   //  border: 1px solid @borderColor;
   //  border-bottom: none;
    overflow: auto;
diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue
index 4728814..7d52fcf 100644
--- a/src/views/kpi/assessment/performance/index.vue
+++ b/src/views/kpi/assessment/performance/index.vue
@@ -10,7 +10,7 @@
                 departmentName:obj.departmentName
                 }" />
         <div class="performance-content-title-right">
-          <UseButton v-if="isShow" :flowRecordId='flowRecordId' :formList='formList' :tableInfo.sync='tableInfo'/>
+          <UseButton v-if="isShow"  :formList='formList' :tableInfo.sync='tableInfo'/>
         </div>
       </div>
       <div class="performance-content-center">
@@ -149,7 +149,6 @@ export default {
   data () {
     return {
       isShow: false,
-      flowRecordId: '',
       right: {
         showRight: false
       },
@@ -213,7 +212,6 @@ export default {
           break
         }
       }
-      this.flowRecordId = res.data.flowRecordList.filter(i => i.isActive).length > 0 ? (res.data.flowRecordList.filter(i => i.isActive)[0].flowDetailRespList ? res.data.flowRecordList.filter(i => i.isActive)[0].flowDetailRespList[0].flowRecordId : '') : ''
       this.formList = res.data
       this.isShow = true
     }