1 OP提成调整

src/components/FinancialModule/OpCommission/OPCommissionDetail.vue

@@ -198,6 +198,7 @@
               <th>{{$t('objFill.v101.FinancialModule.yuangongxm')}}</th>
               <!-- <th>负责团数</th> -->
               <th>{{$t('objFill.v101.FinancialModule.tuanshujl')}}</th>
+              <th width="120">出团公司分摊奖励</th>
               <th>{{$t('objFill.zongticeng')}}</th>
               <th>{{$t('objFill.v101.FinancialModule.chutuangstc')}}</th>
               <th>{{$t('tips.qishu')}}</th>
@@ -216,6 +217,7 @@
                 </span>
                 <!-- <span v-else>-</span> -->
               </td>
+              <td>{{item.BranchBouns?item.BranchBouns:'-'}}</td>
               <td>{{item.TotalCMoney?item.TotalCMoney:'-'}}</td>
               <td>{{item.BranchCommission?item.BranchCommission:'-'}}</td>
               <td><span class="cursor-p" :style="{'color': '#409EFF'}" @click="openCommissionRate(item.EmployeeId,item.UserName)">{{item.Periods}}</span></td>

src/components/FinancialModule/OpCommission/RewardDetail.vue

@@ -16,6 +16,7 @@
           <div>{{$t('objFill.v101.FinancialModule.zongjlje')}}：<span>{{item.Money}}</span></div>
           <div>{{$t('objFill.v101.FinancialModule.fafangrq')}}：<span>{{item.Periods?item.Periods:'-'}}</span></div>
         </div>
+        <div class="dataList-heade"><div>分摊：<span v-for="(items,indexs) in item.BonusDetailsList">{{items.BranchName}}/{{items.Money}}&nbsp;&nbsp;&nbsp;</span></div></div>
         <el-table
         :data="item.DetailList"
         style="width: 100%">
@@ -28,25 +29,33 @@
           <el-table-column
           prop="TravelNum"
           :label="$t('objFill.v101.FinancialModule.dangyuets')" width="80"></el-table-column>
+
+          <!-- <el-table-column prop="TravelNum" label="分摊奖励" width="80">
+            <template slot-scope="scope">
+              <div v-for="(items,indexs) in scope.row.BonusDetailsList" :key="indexs"
+            class="DetailList-form"></div>
+            </template>
+          </el-table-column> -->
+
         <el-table-column :label="$t('objFill.v101.FinancialModule.tuanlieb')">
           <template slot-scope="scope">
             <div v-for="(items,indexs) in scope.row.newTravelList" :key="indexs"
             class="DetailList-form">
               <div class="DetailList-right">
                 <div v-if="indexs==0" class="right-title">
-                  <span>{{$t('visa.v_tuanhao')}}</span>
-                  <span>{{$t('scen.sc_temStatu')}}</span>
-                  <span>{{$t('advmanager.v_type')}}</span>
-                  <span>{{$t('objFill.jietuanriqi')}}</span>
+                  <span style="flex: 0 0 40%;">{{$t('visa.v_tuanhao')}}</span>
+                  <span style="flex: 0 0 20%;">{{$t('scen.sc_temStatu')}}</span>
+                  <span style="flex: 0 0 20%;">{{$t('advmanager.v_type')}}</span>
+                  <span style="flex: 0 0 20%;">{{$t('objFill.jietuanriqi')}}</span>
                 </div>
                 <div>
                   <span @click="goDetails(items)"
-                  style="color: #409EFF;cursor: pointer;">
-                  {{items.TCNUM}} ({{items.TCID}})
+                  style="color: #409EFF;cursor: pointer;flex: 0 0 40%;">
+                  {{items.TCNUM}} ({{items.TCID}}) {{items.OutBranchName}}
                   </span>
-                  <span>{{items.StatusName}}</span>
-                  <span>{{items.TeamTypeName}}</span>
-                  <span>{{items.OutGroupAuditDate}}</span>
+                  <span style="flex: 0 0 20%;">{{items.StatusName}}</span>
+                  <span style="flex: 0 0 20%;">{{items.TeamTypeName}}</span>
+                  <span style="flex: 0 0 20%;">{{items.OutGroupAuditDate}}</span>
                 </div>
               </div>
               <more @change="ViewMore(scope.row,indexs)" :upIcon="scope.row.upIcon"></more>