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

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -278,7 +278,7 @@
                   <div>实付：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualPay}}</span></div>
                   <div>待付：<span class="Team_Coins">￥{{DataList.TeamBalance.WaitPay}}</span></div>
                   <div>
-                    注：成本单据总额(包含退款)+提成-小费收入-地接收入
+                    注：成本单据总额+提成-小费收入-地接收入
                   </div>
                 </div>
               </div>
@@ -294,7 +294,7 @@
                   <div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
                   <div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
                   <div>
-                    注：实收-(应付/实付)+佣金收入+自费收入+其他收入
+                    注：实收-退款-(成本应付/实付)+佣金收入+自费收入+其他收入
                     -联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出-机损增收-开票费用
                   </div>
                 </div>

src/components/rank/salesVolumeRank.vue

@@ -123,8 +123,7 @@
     </el-table-column>
     <el-table-column
       property="name"
-      label="名称"
-      width="80">
+      label="名称">
     </el-table-column>
     <el-table-column
       property="SumPreferPrice"