Commit 24ecfc67 authored by huangyuanyuan's avatar huangyuanyuan

update

parent 6b27800e
...@@ -146,6 +146,7 @@ ...@@ -146,6 +146,7 @@
<th>{{$t('fnc.a_hkrfkduixiang')}}</th> <th>{{$t('fnc.a_hkrfkduixiang')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th> <th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th> <th>{{$t('fnc.jylshuihao')}}</th>
<th>制单人</th>
<th>{{$t('fnc.skjine')}}</th> <th>{{$t('fnc.skjine')}}</th>
<th>{{$t('fnc.fkjine')}}</th> <th>{{$t('fnc.fkjine')}}</th>
<th>总计</th> <th>总计</th>
...@@ -164,10 +165,11 @@ ...@@ -164,10 +165,11 @@
<td>{{item.BName}}</td> <td>{{item.BName}}</td>
<!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> --> <!-- <td><span class="cursorpointer" :class="item.Type==1?'_bg_green':'_bg_red'" @click="goUrl('FinancialDocumentsDetail',item.FinanceId)">{{ item.FinanceId }}</span> </td> -->
<td> <td>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">{{ item.FinanceId }}</span> <span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">
{{ item.FinanceId }}</span>
</td> </td>
<td> <td>
<p v-for="(tc,tindex) in item.TCList" :key="tindex+100">{{tc.TCID}} {{tc.TCNUM}}</p> <p v-for="(tc,tindex) in item.TCList" :key="tindex+100">{{tc.TCNUM}}({{tc.TCID}})</p>
</td> </td>
<td> <td>
<p v-for="(cost,cindex) in item.CostTypeList" :key="cindex+200">{{cost}}</p> <p v-for="(cost,cindex) in item.CostTypeList" :key="cindex+200">{{cost}}</p>
...@@ -177,18 +179,19 @@ ...@@ -177,18 +179,19 @@
</td> </td>
<td> <td>
<span>{{$t('fnc.hkshijian')}}{{ item.TradeDate }}</span> <span>{{ item.TradeDate }}</span>
<span></span> <span></span>
</td> </td>
<td> <td>
{{ item.AccountNumber }} {{ item.AccountNumber }}
</td> </td>
<td>{{item.EmName}}</td>
<td>{{item.Income}}</td> <td>{{item.Income}}</td>
<td>{{item.Refund}}</td> <td>{{item.Refund}}</td>
<td>{{item.Balance }}</td> <td>{{item.Balance }}</td>
</tr> </tr>
<tr> <tr>
<td :colspan="8">{{$t('fnc.a_heji')}}{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}</td> <td :colspan="9">{{$t('fnc.a_heji')}}{{$t('hotel.hotel_totalRoom')}}{{ DataList.length }} {{$t('hotel.hotel_item')}}</td>
<td>{{ dataJson.Income }}</td> <td>{{ dataJson.Income }}</td>
<td>{{ dataJson.Refund }}</td> <td>{{ dataJson.Refund }}</td>
<td>{{ dataJson.Balance}}</td> <td>{{ dataJson.Balance}}</td>
...@@ -575,30 +578,10 @@ export default { ...@@ -575,30 +578,10 @@ export default {
this.loading = false; this.loading = false;
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.data.data;
console.log("let data",data)
this.dataJson=data; this.dataJson=data;
// if(data.Rlist.length){
// this.StartMoney = data[0].StartMoney?data[0].StartMoney:0;
// let Money = data[0].StartMoney?data[0].StartMoney:0,
// InMoney = 0,
// OutMoney = 0;
// data.Rlist.forEach( ( x , i ) => {
// if(x.Type==1){
// x.EndMoney = Money + x.Money;
// Money = x.EndMoney;
// InMoney = InMoney + x.Money;
// }else if(x.Type==2){
// x.EndMoney = Money - x.Money;
// Money = x.EndMoney;
// OutMoney = OutMoney + x.Money;
// }
// });
// this.allMoney = Money;
// this.InMoney = InMoney;
// this.OutMoney = OutMoney;
// }
this.DataList = data.Rlist; this.DataList = data.Rlist;
console.log("this.DataList",this.DataList) // console.log("this.DataList",this.DataList)
if( this.msg.ClientID == 0 ){ if( this.msg.ClientID == 0 ){
......
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