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

src/components/FinancialModule/accDetail/PlatformAccDetail.vue

@@ -193,6 +193,7 @@
                 <tr>
                   <th></th>
                     <th>{{$t('system.query_company')}}</th>
+                    <th>团队订单</th>
                     <th>{{$t('fnc.danhao')}}</th>
                     <th>结转调拨单</th>
                     <th>{{$t('fnc.a_zhaiyao')}}</th>
@@ -211,7 +212,7 @@
                     <th>{{$t('fnc.yueacc')}}</th>
                 </tr>
                 <tr>
-                    <td :colspan="9">{{$t('fnc.a_qcyue')}}：</td>
+                    <td :colspan="10">{{$t('fnc.a_qcyue')}}：</td>
                     <td></td>
                     <td></td>
                     <td></td>
@@ -223,6 +224,7 @@
                     <input v-if="item.CallBackReFrId<=0" type="checkbox" :disabled="item.disabled" v-model="item.check" @change="addCheckbox(item,index)">
                   </td>
                     <td>{{ item.BName }}</td>
+                    <td>{{ item.OrderID }}</td>
                     <!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
 
                     <td>
@@ -259,7 +261,7 @@
                     <td>{{ moneyFormat(item.EndMoney) }}</td>
                 </tr>
                 <tr>
-                    <td :colspan="9">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}）</td>
+                    <td :colspan="10">{{$t('fnc.a_heji')}}（{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}）</td>
                     <td>
                       {{ InMoneyB == 0 ? '-' : moneyFormat(InMoneyB) }}
                     </td>