Skip to content

S
SuperMan
Commit 0176bdca authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 6c6d3d69 b9468df9
Show whitespace changes
Inline Side-by-side
Showing with 60 additions and 34 deletions
src/components/FinancialModule/accDetail/GuideAccount.vue
View file @ 0176bdca
......@@ -146,6 +146,7 @@
<th>{{$t('fnc.a_hkrfkduixiang')}}</th>
<th>{{$t('fnc.a_hkfkshijian')}}</th>
<th>{{$t('fnc.jylshuihao')}}</th>
<th>制单人</th>
<th>{{$t('fnc.skjine')}}</th>
<th>{{$t('fnc.fkjine')}}</th>
<th>总计</th>
......@@ -164,10 +165,11 @@
<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="goUrlNew(item)">{{ item.FinanceId }}</span>
<span class="cursorpointer" :class=" item.Type === 1 ? '_bg_green' : '_bg_red'" @click="goUrlNew(item)">
{{ item.FinanceId }}</span>
</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>
<p v-for="(cost,cindex) in item.CostTypeList" :key="cindex+200">{{cost}}</p>
......@@ -177,18 +179,19 @@
</td>
<td>
<span>{{$t('fnc.hkshijian')}}：{{ item.TradeDate }}</span>
<span>{{ item.TradeDate }}</span>
<span></span>
</td>
<td>
{{ item.AccountNumber }}
</td>
<td>{{item.EmName}}</td>
<td>{{item.Income}}</td>
<td>{{item.Refund}}</td>
<td>{{item.Balance }}</td>
</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.Refund }}</td>
<td>{{ dataJson.Balance}}</td>
......@@ -575,30 +578,10 @@ export default {
this.loading = false;
if(res.data.resultCode==1){
let data = res.data.data;
console.log("let data",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;
console.log("this.DataList",this.DataList)
// console.log("this.DataList",this.DataList)
if( this.msg.ClientID == 0 ){
......
src/components/Supplier/roomQuery2.vue
View file @ 0176bdca
<template>
<div class="roomQuery">
<div class="roomQuery" ref="wrap">
<div class="query-box" style="border-bottom: none;">
<ul style="position:relative;">
<li>
......@@ -20,6 +20,7 @@
<div style="display:inline-block;color:red;display:none">注意事项:每次导出数据最好不要超过一个月。</div>
<div class="rq_comSpan" style="display:inline-block;">颜色说明:
<span class="rq_span1">新增团体</span><span class="rq_span2">取消团体</span>
<span class="rq_span3">取消团体</span>
</div>
</div><br />
<table border="0" cellspacing="1" cellpadding="0" class="roomQuery_SupplierTable" v-loading='loading'>
......@@ -192,7 +193,7 @@
</div>
<div class="rq_remark" v-if="item.SupplierHotelStatus==1||item.SupplierHotelStatus==2&&item.Numbers>=0">
<span class="rq_reSpan">酒店提醒</span>
<span class="rQ_HtList">
<span class="rQ_HTremark">
<span v-for="subItem in item.Numbers"></span>
</span>
</div>
......@@ -207,7 +208,11 @@
</tbody>
</table>
</div>
<transition name="el-zoom-in-top">
<div class="page-component-up" v-show="top>100" @click="goTop">
<i class="el-icon-arrow-up"></i>
</div>
</transition>
</div>
</template>
<script>
......@@ -217,6 +222,7 @@
loading: false,
hotelLoading: false,
total: 0,
top:0,
msg: {
pageIndex: 1,
pageSize: 5,
......@@ -371,6 +377,13 @@
//提取年月日
getDateYear(date) {
return date.split(' ')[0];
},
goTop(){
document.documentElement.scrollTop = 0
this.top=0
},
handleScroll(){
this.top=document.documentElement.scrollTop
}
},
mounted() {
......@@ -379,7 +392,7 @@
var nowMonth = (new Date().getMonth() + 1).toString()
var nowDay = new Date().getDate().toString();
this.todayDate = new Date().getFullYear() + '-' + this.timeAdd0(nowMonth) + '-' + this.timeAdd0(nowDay);
document.addEventListener('scroll', this.handleScroll);
this.getList();
},
}
......@@ -453,7 +466,9 @@
.roomQuery .rq_span2 {
background-color: red;
}
.roomQuery .rq_span3 {
background-color: #fb5f7a;
}
.roomQuery .hotelLink {
color: blue;
text-decoration: underline;
......@@ -558,18 +573,23 @@
font-size: 12px;
}
.rQ_HtList {
.rQ_HtList,.rQ_HTremark {
position: relative;
top:3px;
}
.rQ_HTremark span{
display: inline-block;
width: 15px;
height: 15px;
margin-right: 5px;
background-color: #fb5f7a;
}
.rQ_HtList span {
display: inline-block;
width: 15px;
height: 15px;
margin-right: 5px;
background-color: red;
border: 1px solid #d1d1d1;
}
.rq_importNote {
......@@ -594,4 +614,27 @@
width:75px;
text-align: right;
}
.roomQuery .page-component-up {
background-color: #fff;
position: fixed;
right: calc(8.3% - 60px);
bottom: 150px;
width: 40px;
height: 40px;
cursor: pointer;
transition: .3s;
z-index: 5;
border:1px solid #ddd;
box-sizing: border-box;
line-height: 40px;
text-align: center;
}
.roomQuery .page-component-up i{font-size: 36px;color: #bbb;}
.roomQuery .page-component-up:hover{
background-color: #EF4455;
border:1px solid #ec3346;
}
.roomQuery .page-component-up:hover i{
color: #F1f1f1;
}
</style>
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