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

src/components/FinancialModule/accDetail/CashAccDetail.vue

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