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

src/components/FinancialModule/TradeCommission/TicketDetails.vue

@@ -149,14 +149,14 @@
           <th style="width: 100px;">部门</th>
           <th style="width: 100px;">姓名</th>
           <th style="width: 100px;">线路</th>
-          <th style="width: 100px;">是否欧洲订单</th>
+          <th style="width: 100px;">是否欧洲</th>
           
           <th style="width: 100px;">订单人数</th>
           <th style="width: 100px;">团队总人数</th>
+          <th style="width: 100px;">团队利润</th>
           <th style="width: 100px;">提成方式</th>
           <th style="width: 100px;">提成比例</th>
-          <th style="width: 100px;">当月利润</th>
-          <th style="width: 100px;">团队利润</th>
+          <th style="width: 100px;">当月利润/业绩</th>
           <th style="width: 100px;">提成金额</th>
           <th style="width: 100px;">期数</th>
           <th width='200'>备注</th>
@@ -171,13 +171,13 @@
           <td>{{item.DeptName?item.DeptName:'-'}}</td>
           <td>{{item.UserName}}</td>
           <td>{{item.LineName}}</td>
-          <td>{{item.IsEurope==1?'是':'否'}}</td>
-          <td>{{item.PeopleNum}}</td>
-          <td>{{item.TCGuestNum}}</td>
+          <td>{{item.IsEurope==1?'是':''}}</td>
+          <td>{{item.TCProfit?item.TCProfit:'-'}}</td>
+          <td>{{item.PeopleNum?item.PeopleNum:'-'}}</td>
+          <td>{{item.TCGuestNum?item.TCGuestNum:'-'}}</td>
           <td>{{item.Way==1?'销售额':'利润比'}}</td>
           <td>{{item.Rate?item.Rate+'%':'-'}}</td>
           <td>{{item.OrderProfit}}</td>
-          <td>{{item.TCProfit}}</td>
           <td>{{item.CommissionMoney?item.CommissionMoney:'-'}}</td>
           <td>{{item.Periods}}</td>
           <td>{{item.Description?item.Description:'-'}}</td>