1 收支合并结算

src/components/FinancialModule/FinancialSubmodule/MergeBillModule.vue

@@ -90,53 +90,12 @@
   <div class="Receipt_box" :class="[GetDetail.Type==1?'':'color_blur',isPrintPage?'_PrintPageStyle':'']" :style="{width:width,backgroundColor:color}" @click.stop v-loading='loading'>
     <div class="_sanjiao_"></div>
     <p class="rb_tit">{{GetDetail.CompanyName}}</p>
-    <!--<p class="rb_stit">-->
-      <!--<span :class="isPrintPage?'_rb_stit_print':''">{{GetDetail.FinanceName}}</span>-->
-      <!--<i v-if="name===1">（会计联）</i>-->
-      <!--<i v-if="name===2">（业务联）</i>-->
-    <!--</p>-->
-    <!--<p class="_yewudanju" v-if="GetDetail.OrderSource==8&&!isPrintPage">订单号：<span class="_jump_page" @click="GetDetail.OrderID>0?jumpPage('RegistrationList',GetDetail.TCID,1):''">{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></p>-->
-    <!--<p class="_yewudanju" v-if="GetDetail.OrderSource==9&&!isPrintPage">期数：<span class="" @click="">{{GetDetail.Term}}</span></p>-->
-    <!--<div class="rb_top_row _r_mb5"  v-if="GetDetail.Type==2">-->
-      <!--<p>付款对象：<span class="_r_name">{{GetDetail.AccountHolder}}</span>-->
-        <!--<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==0">{{'私账'}}</span>-->
-        <!--<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==1">{{'公账'}}</span>-->
-        <!--<span class="_r_name _r_IsPublic" v-if="GetDetail.IsPublic==2">{{'现金'}}</span>-->
-      <!--</p>-->
-      <!--&lt;!&ndash; <p><span class="">编号：</span>{{GetDetail.FrID}}</p> &ndash;&gt;-->
-    <!--</div>-->
-    <!--<template v-else>-->
-      <!--<div class="rb_top_row _r_mb5" >-->
-        <!--<p v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail[0]">收款账户：<span class="_r_name _no_border">{{GetDetail.CashierDetail[0].Alias}}</span></p>-->
-        <!--&lt;!&ndash; <p><span class="">编号：</span>{{GetDetail.FrID}}</p> &ndash;&gt;-->
-      <!--</div>-->
-      <!--<div class="rb_top_row _r_mb5">-->
-        <!--<p v-if="GetDetail.CashierDetail&&GetDetail.CashierDetail[0]">收款账号：<span class="_r_name _no_border">{{(GetDetail.CashierDetail[0].BankNo==''||GetDetail.CashierDetail[0].BankNo==null)?GetDetail.CashierDetail[0].Alias:GetDetail.CashierDetail[0].BankNo}}</span></p>-->
-        <!--&lt;!&ndash; <p class="_r_time">{{GetDetail.CreateDate}}</p> &ndash;&gt;-->
-      <!--</div>-->
-    <!--</template>-->
-    <!--<div class="rb_top_row _r_mb5" v-if="GetDetail.Type===2">-->
-      <!--<p>付款账户：-->
-        <!--<span class="_r_name" v-if="GetDetail.TradeDate!=''">{{GetDetail.AccountNumber}}（{{GetDetail.TradeDate}}）</span>-->
-        <!--<span class="_r_name" v-else>{{GetDetail.AccountNumber?GetDetail.AccountNumber:'无'}}</span>-->
-      <!--</p>-->
-      <!--&lt;!&ndash; <p class="_r_time">{{GetDetail.CreateDate}}</p> &ndash;&gt;-->
-
-    <!--</div>-->
-    <!--<div class="rb_top_row _r_mb5" v-if="GetDetail.TCIDAndTCNUMList&&GetDetail.TCIDAndTCNUMList.length>0&&isPrintPage">-->
-      <!--<p>-->
-        <!--<span class="">团号：<span v-for="(o,ox) in GetDetail.TCIDAndTCNUMList">{{o.TCNUM}}（{{o.TCID}}）</span></span>-->
-      <!--</p>-->
-      <!--<span class="">订单号：<span>{{GetDetail.OrderID?GetDetail.OrderID:'无'}}</span></span>-->
-    <!--</div>-->
     <table class="Receipt_table" border="1" :class="[GetDetail.Type==1?'_border_color_r':'_border_color_b',isPrintPage?'_border_color_p':'']" :bordercolor="GetDetail.Type==1?'#c94052':'#106BAF'" style="border-collapse:collapse;">
       <tr>
         <th rowspan="2">{{$t('system.query_company')}}</th>
         <th rowspan="2">{{$t('visa.v_tuanhao')}}</th>
         <th rowspan="2">{{$t('fnc.danhao')}}</th>
         <th rowspan="2">{{$t('fnc.fyshuoming')}}</th>
-        <!--<th rowspan="2">数量</th>-->
-        <!--<th rowspan="2">单 价</th>-->
         <th rowspan="2">{{$t('hotel.hotel_Currency')}}</th>
         <th colspan="5">{{$t('fnc.jine')}}</th>
         <th rowspan="2">{{$t('hotel.hotel_remark')}}</th>
@@ -159,8 +118,6 @@
           </td>
           <td height="34px"><span class="_jump_page" @click="openDetails(item.FinanceId)">{{item.FinanceId}}</span></td>
           <td height="34px">{{item.CostTypeName}}</td>
-          <!--<td height="34px">{{item.Number}}</td>-->
-          <!--<td height="34px">{{item.UnitPrice}}</td>-->
           <td height="34px">{{item.CurrencyName}}</td>
           <td height="34px">{{item.OriginalMoney}}</td>
           <td height="34px">{{item.Rate}}</td>
@@ -175,8 +132,8 @@
         <td height="34px"></td>
         <td height="34px"></td>
         <td height="34px"></td>
-        <!--<td height="34px"></td>-->
-        <!--<td height="34px"></td>-->
+        <td height="34px"></td>
+        <td height="34px"></td>
         <td height="34px"></td>
         <td height="34px"></td>
         <td height="34px"></td>
@@ -188,8 +145,8 @@
       <tr v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length<3">
         <td height="34px"></td>
         <td height="34px"></td>
-        <!--<td height="34px"></td>-->
-        <!--<td height="34px"></td>-->
+        <td height="34px"></td>
+        <td height="34px"></td>
         <td height="34px"></td>
         <td height="34px"></td>
         <td height="34px"></td>
@@ -202,8 +159,8 @@
       <tr v-if="GetDetail.MergeDetailList&&GetDetail.MergeDetailList.length<4">
         <td height="34px"></td>
         <td height="34px"></td>
-        <!--<td height="34px"></td>-->
-        <!--<td height="34px"></td>-->
+        <td height="34px"></td>
+        <td height="34px"></td>
         <td height="34px"></td>
         <td height="34px"></td>
         <td height="34px"></td>
@@ -213,7 +170,6 @@
         <td height="34px"></td>
         <td height="34px"></td>
       </tr>
-      <!--v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0"-->
       <tr v-if="GetDetail.MergeBankList&&GetDetail.MergeBankList.length>0">
         <td height="34px" class="">{{$t('tips.jiaoyifangshi')}}</td>
         <td height="34px" colspan="11" class="_color_b">