1

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

@@ -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/packet.vue

@@ -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%"
@@ -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%"
@@ -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%"