Skip to content

S
SuperMan
Commit 2d16f97c authored by youjie's avatar youjie
Browse files
Options

no message

parent fe62f4cc
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 11 deletions
src/components/FinancialModule/accDetail/CompanyAccDetail.vue
View file @ 2d16f97c
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,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>原币种</th>
<th>原币收款</th> <th>原币收款</th>
<th>原币付款</th> <th>原币付款</th>
<th>本位币收款 <th>本位币收款
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ 2d16f97c
...@@ -144,12 +144,21 @@ ...@@ -144,12 +144,21 @@
<th>{{$t('fnc.zhidanren')}}</th> <th>{{$t('fnc.zhidanren')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th> <th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th> <th>{{$t('fnc.jylshuihao')}}</th>
<th>{{$t('fnc.skjine')}}</th> <th>原币种</th>
<th>{{$t('fnc.fkjine')}}</th> <th>原币收款</th>
<th>原币付款</th>
<th>本位币收款
<!-- {{$t('fnc.skjine')}} -->
</th>
<th>本位币付款
<!-- {{$t('fnc.fkjine')}} -->
</th>
<th>{{$t('fnc.yueacc')}}</th> <th>{{$t('fnc.yueacc')}}</th>
</tr> </tr>
<tr> <tr>
<td :colspan="7">{{$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>
...@@ -180,6 +189,9 @@ ...@@ -180,6 +189,9 @@
<td> <td>
{{ item.AccountNumber }} {{ item.AccountNumber }}
</td> </td>
<td> {{item.CurrencyName}} </td>
<td>{{ item.Type == 1 ? moneyFormat(item.OriginalMoney) : '' }}</td>
<td>{{ item.Type == 2 ? moneyFormat(item.OriginalMoney) : '' }}</td>
<td>{{ item.Type == 1 ? moneyFormat(item.Money) : '' }}</td> <td>{{ item.Type == 1 ? moneyFormat(item.Money) : '' }}</td>
<td> <td>
<span v-if="item.Type == 1 && item.IsPlatformMergeBank==1">{{moneyFormat(item.Money)}}</span> <span v-if="item.Type == 1 && item.IsPlatformMergeBank==1">{{moneyFormat(item.Money)}}</span>
...@@ -189,10 +201,19 @@ ...@@ -189,10 +201,19 @@
<td>{{ moneyFormat(item.EndMoney) }}</td> <td>{{ moneyFormat(item.EndMoney) }}</td>
</tr> </tr>
<tr> <tr>
<td :colspan="7">{{$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> <td>
<span>{{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }}</span> <span>
<!-- {{ OutMoney == 0 ? moneyFormat(InMoney) : moneyFormat(OutMoney) }} -->
{{ OutMoney == 0 ? '-' : moneyFormat(OutMoney) }}
</span>
</td> </td>
<td> <td>
<span v-if="OutMoney == 0">0</span> <span v-if="OutMoney == 0">0</span>
...@@ -397,6 +418,8 @@ export default { ...@@ -397,6 +418,8 @@ export default {
allMoney:0, allMoney:0,
OutMoney:0, OutMoney:0,
InMoney:0, InMoney:0,
OutMoneyB:0,
InMoneyB:0,
BillType:1, //1 收 2 支 , BillType:1, //1 收 2 支 ,
addChuNa:false, addChuNa:false,
allLoading:false, allLoading:false,
...@@ -588,32 +611,39 @@ export default { ...@@ -588,32 +611,39 @@ export default {
if(res.data.resultCode==1){ if(res.data.resultCode==1){
let data = res.data.data; let data = res.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;
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){
if(x. IsPlatformMergeBank==1){ if(x. IsPlatformMergeBank==1){
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;
} }
// else{ // else{
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 = InMoneyB + x.OriginalMoney;
// } // }
}else{ }else{
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;
} }
// if(x.Type==2) // if(x.Type==2)
}); });
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.loading = false; this.loading = false;
......
src/components/Hotel/singleProduct/components/hotelDetails.vue
View file @ 2d16f97c
...@@ -256,7 +256,7 @@ ...@@ -256,7 +256,7 @@
flex-grow: 1; flex-grow: 1;
} }
.hotelDetails-Img>div:nth-child(2){ .hotelDetails-Img>div:nth-child(2){
width: 50%; width: 100%;
margin-left: 10px; margin-left: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
src/components/busManagement/BookAcar/components/Details.vue
View file @ 2d16f97c
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
flex-grow: 1; flex-grow: 1;
} }
.hotelDetails-Img>div:nth-child(2){ .hotelDetails-Img>div:nth-child(2){
width: 50%; width: 100%;
margin-left: 10px; margin-left: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
src/components/scenicSpot/Singleticket/components/OrderDetails.vue
View file @ 2d16f97c
...@@ -271,7 +271,7 @@ ...@@ -271,7 +271,7 @@
flex-grow: 1; flex-grow: 1;
} }
.hotelDetails-Img>div:nth-child(2){ .hotelDetails-Img>div:nth-child(2){
width: 50%; width: 100%;
margin-left: 10px; margin-left: 10px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
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