Merge branch 'redUrgent' into allTestUrgent

src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-tabs v-if="rebHeadData.length > 0" v-model="activeName" type="border-card" @tab-click="handleClick">
-      <el-tab-pane v-for="item in rebHeadData" :key="item.index" :label="item.billno_contract + '_' + item.title" :name="item.title">
+      <el-tab-pane v-for="item in rebHeadData" :key="item.index" :label="item.billno_contract + '_' + item.title" :name="item.billno_contract + '_' + item.title">
         <el-button size="small" style="margin-bottom: 10px" @click="detailGO(item)">查看合同</el-button>
         <div>
           <el-descriptions class="margin-top mt-10" title="居间明细" :column="2" size="small" border>
@@ -84,7 +84,7 @@ export default {
         },
       })
       this.rebHeadData = res.data
-      this.activeName = res.data.length > 0? res.data[0].title:''
+      this.activeName = res.data.length > 0? res.data[0].billno_contract + '_' + res.data[0].title:''
       this.sa_rebatesettlementid = res.data.length > 0?res.data[0].sa_rebatesettlementid:''
       this.sa_rebatesettlementid?this.listData():''
     },