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

src/components/FinancialModule/DataAnalysis/components/corporation.vue

@@ -12,7 +12,7 @@
         label="机构名称"
         width="150">
       </el-table-column>
-      <el-table-column align="center" :label="title" v-for="(title,i) in MonthList" :key="i" :prop="i">
+      <el-table-column align="center" :label="title" v-for="(title,i) in MonthList" :key="i" :prop="`${i}`">
         <el-table-column
           prop=""
           label="收入"
@@ -61,6 +61,22 @@
             {{scope.row.DetailList[i].ProfitRate.toFixed(2)}}%
           </template>
         </el-table-column>
+        <el-table-column
+          prop=""
+          label="联运收入"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].TransportIncome.toFixed(2)}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop=""
+          label="最终利润"
+          min-width="120" align="center">
+          <template slot-scope="scope">
+            {{scope.row.DetailList[i].FinalProfit.toFixed(2)}}
+          </template>
+        </el-table-column>
       </el-table-column>
     </el-table>
   </div>

src/components/FinancialModule/DataAnalysis/components/line.vue

@@ -4,8 +4,7 @@
     <el-table
     :data="LineAnalysisData"
     style="width: 100%"
-    class="LineAnalysisDataBJ"
-    :row-key="index">
+    class="LineAnalysisDataBJ">
       <el-table-column
       fixed
       align="center"
@@ -13,7 +12,7 @@
         label="线路"
         width="150">
       </el-table-column>
-      <el-table-column align="center" :label="title" v-for="(title,i) in MonthList" :key="i" :prop="i">
+      <el-table-column align="center" :label="title" v-for="(title,i) in MonthList" :key="i" :prop="`${i}`">
         <el-table-column
           prop=""
           label="收入"

src/components/FinancialModule/DataAnalysis/components/packet.vue

@@ -14,7 +14,7 @@
       </el-table-column>
       <el-table-column
         prop=""
-        :label="title" v-for="(title,i) in MonthList" :key="i" :prop="i"
+        :label="title" v-for="(title,i) in MonthList" :key="i" :prop="`${i}`"
         min-width="120" align="center">
         <template slot-scope="scope">
             <span v-if="scope.row.Name.indexOf('率')==-1">{{scope.row.MonthData[i].toFixed(2)}}</span>
@@ -36,7 +36,7 @@
       </el-table-column>
       <el-table-column
         prop=""
-        :label="title" v-for="(title,i) in MonthList" :key="i" :prop="i"
+        :label="title" v-for="(title,i) in MonthList" :key="i" :prop="`${i}`"
         min-width="120" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.Name.indexOf('率')==-1">{{scope.row.MonthData[i].toFixed(2)}}</span>
@@ -44,7 +44,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <h3 class="text-center" style="margin-top: 15px;margin-bottom: 5px;">日本散拼团（已出团）</h3>
+    <h3 class="text-center" style="margin-top: 15px;margin-bottom: 5px;">日本常规团（已出团）</h3>
     <el-table
     :data="JapanSPData"
     style="width: 100%"
@@ -58,7 +58,7 @@
       </el-table-column>
       <el-table-column
         prop=""
-        :label="title" v-for="(title,i) in MonthList" :key="i" :prop="i"
+        :label="title" v-for="(title,i) in MonthList" :key="i" :prop="`${i}`"
         min-width="120" align="center">
         <template slot-scope="scope">
           <span v-if="scope.row.Name.indexOf('率')==-1&&scope.row.Name.indexOf('/收入')==-1">{{scope.row.MonthData[i].toFixed(2)}}</span>
@@ -66,7 +66,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <h3 class="text-center" style="margin-top: 15px;margin-bottom: 5px;">毛利率分析（已出团）</h3>
+    <h3 class="text-center" style="margin-top: 15px;margin-bottom: 5px;">常规团毛利率分析（已出团）</h3>
     <el-table
     :data="MaoLiAnalysisData"
     style="width: 100%"
@@ -78,7 +78,7 @@
         label="名称"
         width="150">
       </el-table-column>
-      <el-table-column align="center" :label="title" v-for="(title,i) in MonthList" :key="i" :prop="i">
+      <el-table-column align="center" :label="title" v-for="(title,i) in MonthList" :key="i" :prop="`${i}`">
         <el-table-column
           prop=""
           label="收入"
@@ -97,7 +97,7 @@
         </el-table-column>
       </el-table-column>
     </el-table>
-    <h3 class="text-center" style="margin-top: 15px;margin-bottom: 5px;">房费分析（散拼已出团）</h3>
+    <h3 class="text-center" style="margin-top: 15px;margin-bottom: 5px;">常规团房费分析（已出团）</h3>
     <el-table
     :data="RoomAnalysisData"
     style="width: 100%"
@@ -111,7 +111,7 @@
       </el-table-column>
       <el-table-column
         prop=""
-        :label="title" v-for="(title,i) in MonthList" :key="i" :prop="i"
+        :label="title" v-for="(title,i) in MonthList" :key="i" :prop="`${i}`"
         min-width="120" align="center">
         <template slot-scope="scope">
             {{scope.row.MonthData[i].toFixed(2)}}

src/components/FinancialModule/DataAnalysis/index.vue

@@ -78,8 +78,8 @@
     </div>
     <div v-loading="loading" style="height: 78%;overflow: auto;">
       <Lines v-if="activeName=='1'" :StatisticalData="StatisticalData"></Lines>
-      <!-- <Corporations v-if="activeName=='2'" :StatisticalData="StatisticalData"></Corporations>
-      <Packets v-if="activeName=='3'" :StatisticalData="StatisticalData"></Packets> -->
+      <Corporations v-if="activeName=='2'" :StatisticalData="StatisticalData"></Corporations>
+      <Packets v-if="activeName=='3'" :StatisticalData="StatisticalData"></Packets>
     </div>
   </div>
 </template>
@@ -127,7 +127,7 @@ export default {
           onClick(picker) {
             const end = new Date();
             const start = new Date();
-            start.setMonth(start.getMonth() - 5);
+            start.setMonth(start.getMonth() - 6);
             picker.$emit('pick', [start, end]);
           }
         }]
@@ -139,7 +139,7 @@ export default {
     this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id
     const end = new Date();
     const start = new Date();
-    start.setMonth(start.getMonth() - 5);
+    start.setMonth(start.getMonth() - 6);
     this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
     this.msg.startDate = this.dateTime[0]
     this.msg.endDate = this.dateTime[1]
@@ -177,7 +177,7 @@ export default {
       }else{
         const end = new Date();
         const start = new Date();
-        start.setMonth(start.getMonth() - 5);
+        start.setMonth(start.getMonth() - 6);
         this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
         this.msg.startDate = start
         this.msg.endDate = end

src/components/FinancialModule/ReportForm/AirTicketLoss.vue

@@ -31,7 +31,7 @@
       </div>
       <div v-if="LossIncomeList&&LossIncomeList.length>0" style="font-size: 14px;color: red;margin-bottom: 3px;text-align: right;">
         <!-- 注: 韩国线与日本自由行是统计团队亏损，其他线路为机票损失 -->
-        注: 以下为团队航班目的地统计
+        注: 以下为团队航空公司-线路-航班目的地统计
       </div>
        <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
            <tr>
@@ -121,7 +121,7 @@ export default {
         goToDetail(item){
             if(item.Value!='损失占比'){
                 if(item.IsTravel==1){
-                    if(item.LossType==-1){
+                    if(item.AirType && item.AirType==2){
                         this.$router.push({
                             name: 'TeamRevenueReport',
                             query: {
@@ -130,6 +130,7 @@ export default {
                                 LineId:item.LineId,
                                 IsSelectTravelLoss:2,
                                 AirLossId:item.AirLossId,
+                                AirLossType:item.LossType,
                                 blank: "y",
                             }
                         });

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2488,6 +2488,7 @@ export default {
     if(this.$route.query.IsSelectTravelLoss){
       this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss;
       this.msg.LossId = this.$route.query.AirLossId;
+      this.msg.LossType = this.$route.query.AirLossType;
       if(this.msg.IsSelectTravelLoss==2){
         this.msg.DataType="-1";
       }