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

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -679,8 +679,10 @@
                 </div>
               </td>
               <td style="font-size:14px;">
-                应付：{{item.Money}}<br />
-                实付：{{item.PayMoney}}
+                <span v-if="item.AirTotalMoney>0">应付：{{item.AirTotalMoney}}(分摊：{{item.Money}})</span>
+                <span v-else>应付：{{item.Money}}</span><br/>
+                <span v-if="item.AirTotalMoney>0">实付：{{item.AirTotalPayMoney}}(分摊：{{item.PayMoney}})</span>
+                <span v-else>实付：{{item.PayMoney}}</span>
               </td>
               <td>{{item.TradeDate}}</td>
               <td>