Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/FinancialSubmodule/czBillModule.vue

@@ -37,6 +37,7 @@
                     <tr>
                         <th>{{$t('fnc.danhao')}}</th>
                         <th>{{$t('sm.company')}}</th>
+                        <th style="width:180px">{{$t('objFill.fukuanzhanghao')}}</th>
                         <th>{{$t('fnc.feiyongleixing')}}</th>
                         <th>{{$t('hotel.hotel_Currency')}}</th>
                         <th>{{$t('hotel.hotel_CurrentRate')}}</th>
@@ -46,6 +47,11 @@
                     <tr class="_color_b" v-for="(item,index) in czList" :key="index">
                         <td class="hover_text" @click="goDetail(item.FrID)" ><span>{{item.FrID}}</span></td>
                         <td>{{item.BranchName}}</td>
+                        <td style="max-width: 100px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap; ">
+                            <el-tooltip class="item" effect="dark" :content="item.RemitterName+'/'+item.AccountNumber" placement="top-start">
+                                <div>{{item.RemitterName}}/{{item.AccountNumber}}</div>
+                            </el-tooltip>
+                        </td>
                         <td>{{item.CostTypeName}}</td>
                         <td>{{item.CurrencyName}}</td>
                         <td>{{item.Rate}}</td>

src/router/config.js

@@ -4929,6 +4929,14 @@ export default {
                 title: '赞羊返佣明细'
               },
             },
+            {
+              path: '/MemberSettlement',
+              name: 'MemberSettlement',
+              component: resolve => require(['@/components/FinancialModule/ReportForm/MemberSettlement'], resolve),
+              meta: {
+                title: '会员返利结算'
+              },
+            },
             {
               path: '/JumpReport',
               name: 'JumpReport',