Commit fe62f4cc authored by youjie's avatar youjie

no message

parent 1760d1db
...@@ -196,7 +196,9 @@ ...@@ -196,7 +196,9 @@
<th>{{$t('fnc.yueacc')}}</th> <th>{{$t('fnc.yueacc')}}</th>
</tr> </tr>
<tr> <tr>
<td :colspan="10">{{$t('fnc.a_qcyue')}}</td> <td :colspan="8">{{$t('fnc.a_qcyue')}}</td>
<td></td>
<td></td>
<td></td> <td></td>
<td></td> <td></td>
<td>{{moneyFormat(StartMoney)}}</td> <td>{{moneyFormat(StartMoney)}}</td>
...@@ -233,7 +235,9 @@ ...@@ -233,7 +235,9 @@
<td>{{ moneyFormat(item.EndMoney) }}</td> <td>{{ moneyFormat(item.EndMoney) }}</td>
</tr> </tr>
<tr> <tr>
<td :colspan="10">{{$t('fnc.a_heji')}}{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}</td> <td :colspan="8">{{$t('fnc.a_heji')}}{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}</td>
<td>{{ InMoneyB == 0 ? '-' : moneyFormat(InMoneyB) }}</td>
<td>{{ OutMoneyB == 0 ? '-' : moneyFormat(OutMoneyB) }}</td>
<td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td> <td>{{ InMoney == 0 ? '-' : moneyFormat(InMoney) }}</td>
<td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td> <td>{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}</td>
<td>{{ moneyFormat(allMoney) }}</td> <td>{{ moneyFormat(allMoney) }}</td>
...@@ -482,6 +486,8 @@ export default { ...@@ -482,6 +486,8 @@ export default {
allMoney:0, allMoney:0,
OutMoney:0, OutMoney:0,
InMoney:0, InMoney:0,
InMoneyB: 0,
OutMoneyB: 0,
BillType:1, //1 收 2 支 , BillType:1, //1 收 2 支 ,
addChuNa:false, addChuNa:false,
allLoading: false, allLoading: false,
...@@ -696,21 +702,27 @@ export default { ...@@ -696,21 +702,27 @@ export default {
this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; this.StartMoney = data[0].StartMoney?data[0].StartMoney:0;
let Money = data[0].StartMoney?data[0].StartMoney:0, let Money = data[0].StartMoney?data[0].StartMoney:0,
InMoney = 0, InMoney = 0,
OutMoney = 0; OutMoney = 0,
InMoneyB = 0,
OutMoneyB = 0;
data.forEach( ( x , i ) => { data.forEach( ( x , i ) => {
if(x.Type==1){ if(x.Type==1){
x.EndMoney = Money + x.Money; x.EndMoney = Money + x.Money;
Money = x.EndMoney; Money = x.EndMoney;
InMoney = InMoney + x.Money; InMoney = InMoney + x.Money;
InMoneyB = InMoney + x.OriginalMoney;
}else if(x.Type==2){ }else if(x.Type==2){
x.EndMoney = Money - x.Money; x.EndMoney = Money - x.Money;
Money = x.EndMoney; Money = x.EndMoney;
OutMoney = OutMoney + x.Money; OutMoney = OutMoney + x.Money;
OutMoneyB = OutMoneyB + x.OriginalMoney;
} }
}); });
this.allMoney = Money; this.allMoney = Money;
this.InMoney = InMoney; this.InMoney = InMoney;
this.OutMoney = OutMoney; this.OutMoney = OutMoney;
this.InMoneyB = InMoneyB;
this.OutMoneyB = OutMoneyB;
} }
this.DataList = data; this.DataList = data;
this.DataList.forEach(x=>{ this.DataList.forEach(x=>{
......
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