Commit 99855961 authored by huangyuanyuan's avatar huangyuanyuan

update

parent dbfe15fe
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<th width="">{{$t('fnc.yueacc')}}</th> <th width="">{{$t('fnc.yueacc')}}</th>
</tr> </tr>
<tr> <tr>
<td :colspan="7">{{$t('fnc.a_qcyue')}}</td> <td :colspan="7">{{$t('fnc.a_qcyue')}}期初余额</td>
<td></td> <td></td>
<td></td> <td></td>
<td> {{ moneyFormat(RStartMoney) }} </td> <td> {{ moneyFormat(RStartMoney) }} </td>
...@@ -196,13 +196,13 @@ ...@@ -196,13 +196,13 @@
{{ item.AccountNumber }} {{ item.AccountNumber }}
</td> </td>
<td> <td>
{{ item.Type === 1 ? moneyFormat(item.OriginalMoney) : '' }} 收入:{{ item.Type === 1 ? moneyFormat(item.OriginalMoney) : '' }}
</td> </td>
<td> <td>
{{ item.Type === 2 ? moneyFormat(item.OriginalMoney) : '' }} 支出: {{ item.Type === 2 ? moneyFormat(item.OriginalMoney) : '' }}
</td> </td>
<td> <td>
{{ moneyFormat(item.enRSMoney) }} 余额:{{ moneyFormat(item.enRSMoney) }}
</td> </td>
<td> <td>
{{item.Rate}} {{item.Rate}}
...@@ -916,26 +916,30 @@ export default { ...@@ -916,26 +916,30 @@ export default {
this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{ this.apipost('Financial_post_GetAccountDetailList',this.msg,res=>{
if(res.data.resultCode===1){ if(res.data.resultCode===1){
let data = res.data.data; let data = res.data.data;
console.log("data",data)
if(data.length){ if(data.length){
this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; // 外币 this.StartMoney = data[0].StartMoney?data[0].StartMoney:0; // 外币
this.RStartMoney = data[0].RStartMoney?data[0].RStartMoney:0; // 本位币 this.RStartMoney = data[0].RStartMoney?data[0].RStartMoney:0; // 本位币
let endStartMoney = 0, let endStartMoney = this.StartMoney;
endRStartMoney = 0; let endRStartMoney = this.RStartMoney;
data.forEach( ( x ) => { data.forEach( ( x ) => {
if(x.Type===1){ if(x.Type===1){//收入
this.bShou = this.bShou + x.Money; this.bShou = this.bShou + x.Money;
this.wShou = this.wShou + x.OriginalMoney; this.wShou = this.wShou + x.OriginalMoney;
endRStartMoney = endRStartMoney + x.OriginalMoney; endRStartMoney = endRStartMoney + x.OriginalMoney;
endStartMoney = endStartMoney + x.Money; endStartMoney = endStartMoney + x.Money;
x.enRSMoney = endRStartMoney; x.enRSMoney = endRStartMoney;//外币收入
x.enSMoney = endStartMoney; x.enSMoney = endStartMoney;
}else if(x.Type===2){
}else if(x.Type===2){//支出
this.bZhi = this.bZhi + x.Money; this.bZhi = this.bZhi + x.Money;
this.wZhi = this.bZhi + x.OriginalMoney; this.wZhi = this.bZhi + x.OriginalMoney;
endRStartMoney = endRStartMoney - x.OriginalMoney; endRStartMoney = endRStartMoney - x.OriginalMoney;
endStartMoney = endStartMoney - x.Money; endStartMoney = endStartMoney - x.Money;
x.enRSMoney = endRStartMoney; x.enRSMoney = endRStartMoney;
x.enSMoney = endStartMoney; x.enSMoney = endStartMoney;
console.log("this.wZhi",this.wZhi);
} }
x.check = false; x.check = false;
x.disabled = false; x.disabled = false;
......
This diff is collapsed.
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