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

src/components/BusExport.vue

@@ -49,12 +49,23 @@
     .totalTabal td{
         height:33px;
     }
+    .excelBtn{
+        color: #fff;
+        padding: 0 15px;
+        height: 30px;
+        background: #E95252;
+        border: 1px solid #E95252;
+        cursor: pointer;
+        border-radius: 15px;
+        margin-left: 10px;
+    }
 </style>
 
 <template>
-    <div class="Bus_Content">
+    <div class="Bus_Content" v-loading="loading">
         <div class="BusExportTitle">
-              {{Year}}年{{Month}}月公社车账  
+            {{Year}}年{{Month}}月公社车账 
+            <input type="button" style="float:right;" @click="downLoadExcel" class="excelBtn" value="下载excel"/> 
         </div>
         <table class="Bus_detailTable">
             <thead>
@@ -154,6 +165,7 @@
           dataList:[],
           TotalJan:'',
           TotalCn:'',
+          loading:false,
       }
     },
     mounted() {
@@ -170,7 +182,9 @@
     },
     methods: {
         getList(){
+            this.loading=true;
             this.apipost('bus_get_CarfareApportionExport',this.msg, res => {
+                this.loading=false;
                 if(res.data.resultCode == 1) {
                     this.dataList = res.data.data.RObj;
                     this.msg.CurrName = res.data.data.CurrName;
@@ -180,6 +194,18 @@
                     this.Error(res.data.message);
                 }
             }, err => {})
+        },
+        //点击下载
+        downLoadExcel(){
+            this.loading=true;
+            this.apipost('bus_get_CarfareApportionExcelExport',this.msg, res => {
+                this.loading=false;
+                if(res.data.resultCode == 1) {
+                    this.Success(res.data.message);
+                }else{
+                    this.Error(res.data.message);
+                }
+            }, err => {})
         }
     },
   }

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -194,7 +194,7 @@
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_shou">
                     <i class="iconfont icon-qian"></i>
-                  </span>其他总收入
+                  </span>其他
                 </div>
                 <div class="Team_Incontent">
                   <div>应收：<span>￥{{moneyFormat(moneyAll.otheryTotalyf)}}</span></div>
@@ -228,13 +228,13 @@
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_lirun">
                     <i class="iconfont icon-qian"></i>
-                  </span>利润
+                  </span>利润（计算规则请看注解）
                 </div>
                 <div class="Team_Incontent">
                   <div>实际利润：<span>￥{{DataList.TeamBalance.ExpectedProfit}}</span></div>
                   <div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
                   <div>
-                    注：实收-(应付/实付)+佣金收入+自费收入+其他收入(此处为收入模块下其他收入)
+                    注：实收-(应付/实付)+佣金收入+自费收入+其他收入
                     -联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
                   </div>
                 </div>