Commit 02eb75af authored by 吴春's avatar 吴春

修改平台账户明细显示

parent 9bd91a5c
...@@ -224,25 +224,12 @@ ...@@ -224,25 +224,12 @@
<th>{{$t('fnc.yueacc')}}</th> <th>{{$t('fnc.yueacc')}}</th>
</tr> </tr>
<tr> <tr>
<td :colspan="11">{{$t('fnc.a_heji')}}{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}</td> <td :colspan="11">{{$t('fnc.a_qcyue')}}</td>
<td> <td></td>
{{ InMoneyB == 0 ? '-' : moneyFormat(InMoneyB) }} <td></td>
</td> <td></td>
<td> <td></td>
{{ OutMoneyB == 0 ? '-' : moneyFormat(OutMoneyB) }} <td>{{moneyFormat(StartMoney)}}</td>
</td>
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>
<span>
<!-- {{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }} -->
{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}
</span>
</td>
<td>
<span v-if="OutMoney == 0">0</span>
<span v-else>{{ moneyFormat(allMoney) }}</span>
</td>
</tr> </tr>
<tr v-for=" ( item , index ) in DataList "> <tr v-for=" ( item , index ) in DataList ">
<td> <td>
...@@ -287,14 +274,28 @@ ...@@ -287,14 +274,28 @@
<td>{{ moneyFormat(item.EndMoney) }}</td> <td>{{ moneyFormat(item.EndMoney) }}</td>
</tr> </tr>
<tr> <tr>
<td :colspan="11">{{$t('fnc.a_qcyue')}}</td> <td :colspan="11">{{$t('fnc.a_heji')}}{{$t('hotel.hotel_totalRoom')}}{{DataList.length}}{{$t('hotel.hotel_item')}}</td>
<td></td> <td>
<td></td> {{ InMoneyB == 0 ? '-' : moneyFormat(InMoneyB) }}
<td></td> </td>
<td></td> <td>
<td>{{moneyFormat(StartMoney)}}</td> {{ OutMoneyB == 0 ? '-' : moneyFormat(OutMoneyB) }}
</td>
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>
<span>
<!-- {{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }} -->
{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}
</span>
</td>
<td>
<span v-if="OutMoney == 0">0</span>
<span v-else>{{ moneyFormat(allMoney) }}</span>
</td>
</tr> </tr>
</table> </table>
</div> </div>
<el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading"> <el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
...@@ -799,12 +800,12 @@ export default { ...@@ -799,12 +800,12 @@ export default {
this.InMoneyB = InMoneyB; this.InMoneyB = InMoneyB;
this.OutMoneyB = OutMoneyB; this.OutMoneyB = OutMoneyB;
} }
// this.DataList = data this.DataList = data
this.DataList =data.reduceRight(function(acc, cur) { // this.DataList =data.reduceRight(function(acc, cur) {
acc.push(cur); // acc.push(cur);
return acc; // return acc;
}, []); // }, []);
this.loading = false; this.loading = false;
if( this.msg.ClientID == 0 ){ if( this.msg.ClientID == 0 ){
this.msg.ClientID = ''; this.msg.ClientID = '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment