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

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -234,7 +234,8 @@
                   <div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
                   <div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
                   <div>
-                    注：实收-(应付/实付)+佣金收入+自费收入+其他收入(此处为收入模块下其他收入)-联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
+                    注：实收-(应付/实付)+佣金收入+自费收入+其他收入(此处为收入模块下其他收入)
+                    -联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
                   </div>
                 </div>
               </div>
@@ -255,6 +256,8 @@
                   </div>
                   <div>联运成本：<span>￥{{DataList.LYCB}}</span></div>
                   <div>额外返佣：<span>￥{{DataList.EWFY}}</span></div>
+                  <div>OP提成：<span>￥{{DataList.OpCommMoney}}</span></div>
+                  <div>票务提成：<span>￥{{DataList.AirCommMoney}}</span></div>
               </div>
             </el-col>
             <el-col :span="4">

src/components/administrative/AirticketCommission.vue

@@ -96,9 +96,11 @@
       },
       //生成票务提成报表
       CreateAirticketCommission() {
+        this.loading=true;
         this.apipost(
           "AirTicketRules_post_CreateAirticketCommissionService", {},
           res => {
+            this.loading=false;
             if (res.data.resultCode == 1) {
               this.getList();
               this.Success('报表生成成功')