Commit eed0dd2c authored by 黄奎's avatar 黄奎

页面修改

parent 250c269d
<style> <style>
@import url('../../assets/css/domestic/SettlementOrder.css'); @import url('../../assets/css/domestic/SettlementOrder.css');
.page_SettlementOrder td._hover span{
.page_SettlementOrder td._hover span {
border-bottom: 1px solid #333; border-bottom: 1px solid #333;
cursor: pointer; cursor: pointer;
} }
.page_SettlementOrder td._hover._color_red span{
.page_SettlementOrder td._hover._color_red span {
border-bottom: 1px solid #E95252; border-bottom: 1px solid #E95252;
cursor: pointer; cursor: pointer;
} }
.page_SettlementOrder td._hover:hover span{
.page_SettlementOrder td._hover:hover span {
border-bottom: 1px dotted #333; border-bottom: 1px dotted #333;
} }
.sett_popover{
.sett_popover {
max-height: 300px; max-height: 300px;
overflow: auto; overflow: auto;
} }
</style> </style>
<template> <template>
<div class="flexOne page_SettlementOrder"> <div class="flexOne page_SettlementOrder">
<div class='query-box'> <div class='query-box'>
<ul> <ul>
<!-- <li>
<span>
<em>期数</em>
<el-input v-model="msg.Term" class="w210"></el-input>
</span>
</li> -->
<li> <li>
<span> <span>
<em>期数日期</em> <em>期数日期</em>
<el-date-picker <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd()" type="daterange"
class="h34"
v-model="transactionDate"
@change="timeAdd()"
type="daterange"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
</span> </span>
...@@ -41,7 +36,7 @@ ...@@ -41,7 +36,7 @@
<li> <li>
<span> <span>
<em>机票类别</em> <em>机票类别</em>
<el-select filterable v-model='msg.IsInter' > <el-select filterable v-model='msg.IsInter'>
<el-option label='全部' value='-1'></el-option> <el-option label='全部' value='-1'></el-option>
<el-option label='国内机票' value='0'></el-option> <el-option label='国内机票' value='0'></el-option>
<el-option label='国际机票' value='1'></el-option> <el-option label='国际机票' value='1'></el-option>
...@@ -51,7 +46,7 @@ ...@@ -51,7 +46,7 @@
<li> <li>
<span> <span>
<em>状态</em> <em>状态</em>
<el-select filterable v-model='msg.status' > <el-select filterable v-model='msg.status'>
<el-option label='全部' value='-1'></el-option> <el-option label='全部' value='-1'></el-option>
<el-option label='已完成' value='1'></el-option> <el-option label='已完成' value='1'></el-option>
<el-option label='未完成' value='0'></el-option> <el-option label='未完成' value='0'></el-option>
...@@ -59,13 +54,14 @@ ...@@ -59,13 +54,14 @@
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/> <input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
<button class="normalBtn" @click="method5()">导出</button> <button class="normalBtn" @click="method5()">导出</button>
</li> </li>
</ul> </ul>
</div> </div>
<div class="_content"> <div class="_content">
<table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading = 'loading'> <table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
v-loading='loading'>
<tr> <tr>
<th>机票类别</th> <th>机票类别</th>
<th>期数</th> <th>期数</th>
...@@ -85,47 +81,26 @@ ...@@ -85,47 +81,26 @@
<td>¥{{item.Money}}</td> <td>¥{{item.Money}}</td>
<td>¥{{item.Cost}}</td> <td>¥{{item.Cost}}</td>
<td>¥{{item.Profit}}</td> <td>¥{{item.Profit}}</td>
<td :class="item.Money===item.InCome?'':'_color_red'" @click="jumpPage('FinancialOrderNew',item.ID,item.Term,1)" class="_hover">¥ <td :class="item.Money===item.InCome?'':'_color_red'"
@click="jumpPage('FinancialOrderNew',item.ID,item.Term,1)" class="_hover">¥
<span>{{item.InCome}}</span> <span>{{item.InCome}}</span>
</td> </td>
<td :class="item.Cost===item.PayMoney?'':'_color_red'" @click="jumpPage('FinancialOrderNew',item.ID,item.Term,2)" class="_hover"> <td :class="item.Cost===item.PayMoney?'':'_color_red'"
@click="jumpPage('FinancialOrderNew',item.ID,item.Term,2)" class="_hover">
¥ ¥
<!-- <el-popover
popper-class="sett_popover"
placement="bottom"
width="450"
trigger="click">
<table class="add_table singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0">
<tr>
<th>单据号</th>
<th>金额</th>
<th>类型</th>
<th>状态</th>
</tr>
<tr v-for="(i,d) in Details">
<td>{{i.FrID}}</td>
<td>{{i.PayMoney}}</td>
<td>{{i.TypeName}}</td>
<td>{{i.StatusName}}</td>
</tr>
<tr v-if="Details.length==0">
<td colspan="4">暂无数据</td>
</tr>
</table>
<span slot="reference" @click="getDetails(item.ID)">{{item.PayMoney}}</span>
</el-popover> -->
<span>{{item.PayMoney}}</span> <span>{{item.PayMoney}}</span>
</td> </td>
<td :class="Math.abs(item.Money-item.InCome)>0?'_color_red':''">¥{{Math.abs(item.Money-item.InCome)}}</td> <td :class="Math.abs(item.Money-item.InCome)>0?'_color_red':''">¥{{Math.abs(item.Money-item.InCome)}}</td>
<td> <td>
<span v-if="item.Status!=0" :class="Math.abs(item.RealProfit)>0?'_color_red':''">¥{{Math.abs(item.RealProfit)}}</span> <span v-if="item.Status!=0"
:class="Math.abs(item.RealProfit)>0?'_color_red':''">¥{{Math.abs(item.RealProfit)}}</span>
<span v-else>-</span> <span v-else>-</span>
</td> </td>
<td>{{item.EmName}}<br/>{{item.UpdateDate}}</td> <td>{{item.EmName}}<br />{{item.UpdateDate}}</td>
<td> <td>
<el-tooltip class="item" effect="dark" content="详情" placement="top"> <el-tooltip class="item" effect="dark" content="详情" placement="top">
<el-button type="danger" class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term,item.ID)" circle></el-button> <el-button type="danger" class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term,item.ID)" circle>
</el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="收款" placement="top"> <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="收款" placement="top">
<el-button type="primary" class="_bth_bg_bl" @click="goUrlT(item,1)" circle></el-button> <el-button type="primary" class="_bth_bg_bl" @click="goUrlT(item,1)" circle></el-button>
...@@ -134,7 +109,8 @@ ...@@ -134,7 +109,8 @@
<el-button type="danger" class="_bth_bg_bgr" @click="goUrlT(item,2)" circle></el-button> <el-button type="danger" class="_bth_bg_bgr" @click="goUrlT(item,2)" circle></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="确认" placement="top"> <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="确认" placement="top">
<el-button v-if="item.Status==0" type="danger" class="_bth_bg_bl" @click="queren(item)" circle></el-button> <el-button v-if="item.Status==0" type="danger" class="_bth_bg_bl" @click="queren(item)" circle>
</el-button>
</el-tooltip> </el-tooltip>
</td> </td>
</tr> </tr>
...@@ -144,81 +120,79 @@ ...@@ -144,81 +120,79 @@
{{$t('system.content_noData')}} {{$t('system.content_noData')}}
</div> </div>
<div> <div>
<el-pagination <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
background layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size='msg.pageSize'
:total='total'>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data(){ data() {
return{ return {
msg:{ msg: {
Term:'', Term: '',
status:'-1', status: '-1',
PageIndex:1, PageIndex: 1,
pageSize:15, pageSize: 15,
sDate:'', sDate: '',
eDate:'', eDate: '',
IsInter:'-1', IsInter: '-1',
ID:0, ID: 0,
}, },
dataList:[], dataList: [],
noData:false, noData: false,
total:0, total: 0,
emID:0, emID: 0,
currentPage:1, currentPage: 1,
loading:true, loading: true,
transactionDate:[], transactionDate: [],
RB_Branch_Id:'', RB_Branch_Id: '',
Details:[], Details: [],
} }
}, },
created(){ created() {
if(this.$route.query.Term){ if (this.$route.query.Term) {
this.transactionDate[0] = this.$route.query.Term; this.transactionDate[0] = this.$route.query.Term;
this.transactionDate[1] = this.$route.query.Term; this.transactionDate[1] = this.$route.query.Term;
} }
}, },
mounted(){ mounted() {
this.getList(); this.getList();
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.emID=userInfo.EmployeeId; this.emID = userInfo.EmployeeId;
this.RB_Branch_Id = userInfo.RB_Branch_id; this.RB_Branch_Id = userInfo.RB_Branch_id;
this.msg.ID=this.$route.query.id; this.msg.ID = this.$route.query.id;
}, },
methods:{ methods: {
jumpPage(path,id,term,type){ jumpPage(path, id, term, type) {
// let routeData = this.$router.resolve({
// name: path,
// query: { SourceID: id,OrderSource:9,type:type}
// });
// window.open(routeData.href, "_blank");
this.$router.push({ this.$router.push({
name: path, name: path,
query: {SourceID: id,OrderSource:9,type:type,blank:'y',term:term} query: {
SourceID: id,
OrderSource: 9,
type: type,
blank: 'y',
term: term
}
}) })
}, },
queren(obj){ queren(obj) {
this.$confirm('是否已完成'+'“'+obj.Term+'”'+'期?确认后不可撤回!', '提示', { this.$confirm('是否已完成' + '“' + obj.Term + '”' + '期?确认后不可撤回!', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.apipost('Domestic_Ticket_post_Confirm',{ID:obj.ID},r=>{ this.apipost('Domestic_Ticket_post_Confirm', {
if(r.data.resultCode==1){ ID: obj.ID
}, r => {
if (r.data.resultCode == 1) {
let data = r.data.data; let data = r.data.data;
this.$message.success(r.data.message); this.$message.success(r.data.message);
this.getList(); this.getList();
} }
},null); }, null);
}).catch(() => { }).catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
...@@ -226,18 +200,21 @@ export default { ...@@ -226,18 +200,21 @@ export default {
}); });
}); });
}, },
getDetails(id){ getDetails(id) {
this.Details = []; this.Details = [];
this.apipost('Financial_post_GetOrderFinanceList',{OrderId:0,OrderResource:9,SourceID:id},r=>{ this.apipost('Financial_post_GetOrderFinanceList', {
if(r.data.resultCode==1){ OrderId: 0,
OrderResource: 9,
SourceID: id
}, r => {
if (r.data.resultCode == 1) {
let data = r.data.data; let data = r.data.data;
this.Details = data; this.Details = data;
console.log(data);
} }
},null); }, null);
}, },
timeAdd(){ // 日期格式 timeAdd() { // 日期格式
if(!this.transactionDate){ if (!this.transactionDate) {
this.msg.sDate = ''; this.msg.sDate = '';
this.msg.eDate = ''; this.msg.eDate = '';
return return
...@@ -245,60 +222,71 @@ export default { ...@@ -245,60 +222,71 @@ export default {
this.msg.sDate = this.transactionDate[0]; this.msg.sDate = this.transactionDate[0];
this.msg.eDate = this.transactionDate[1]; this.msg.eDate = this.transactionDate[1];
}, },
goUrlT(obj,t){ goUrlT(obj, t) {
let orderObj = { let orderObj = {
OrderID:0, OrderID: 0,
OrderSource:9, OrderSource: 9,
Obj: {}, Obj: {},
SourceID:obj.ID, SourceID: obj.ID,
TCIDList: [] TCIDList: []
} }
this.$router.push( this.$router.push({
{
name: 'ChoiceAddFinancialDocuments', name: 'ChoiceAddFinancialDocuments',
query:{ query: {
'Type':t, 'Type': t,
'path':'TicketingModule', 'path': 'TicketingModule',
'Cmd':'Domestic_Ticket_post_UpdateFrID', 'Cmd': 'Domestic_Ticket_post_UpdateFrID',
'blank':'y', 'blank': 'y',
'orderObj':JSON.stringify(orderObj) 'orderObj': JSON.stringify(orderObj)
}
} }
); });
}, },
goUrl(path,Term,id){ goUrl(path, Term, id) {
this.$router.push({name:path,query:{'Term':Term,'ID':id,blank:'y'}}) this.$router.push({
name: path,
query: {
'Term': Term,
'ID': id,
blank: 'y'
}
})
}, },
getList(){ getList() {
console.log(this.msg);
this.loading = true; this.loading = true;
this.apipost('Domestic_Ticket_post_GetBillPageList',this.msg,r=>{ this.apipost('Domestic_Ticket_post_GetBillPageList', this.msg, r => {
if(r.data.resultCode==1){ if (r.data.resultCode == 1) {
this.total = r.data.data.count; this.total = r.data.data.count;
if(this.total>0){ if (this.total > 0) {
this.noData =false; this.noData = false;
}else{ } else {
this.noData =true; this.noData = true;
} }
this.dataList = r.data.data.pageData this.dataList = r.data.data.pageData
this.loading =false; this.loading = false;
}else{ } else {
this.$message.error(r.data.message); this.$message.error(r.data.message);
this.loading =false; this.loading = false;
} }
},null) }, null)
},
method5: function () {
this.GetLocalFile("DomesticTicket_post_DownBill", {
'Term': this.msg.Term,
'Status': this.msg.Status,
'sDate': this.msg.sDate,
'eDate': this.msg.eDate,
'emID': this.emID,
'IsInter': this.msg.IsInter
}, "历史账单.xls");
}, },
method5: function() { resetPageIndex() { //查询初始化页码
this.GetLocalFile("DomesticTicket_post_DownBill", {'Term':this.msg.Term,'Status':this.msg.Status,'sDate':this.msg.sDate,'eDate':this.msg.eDate,'emID':this.emID,'IsInter':this.msg.IsInter},"历史账单.xls");
} ,
resetPageIndex() {//查询初始化页码
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1 this.currentPage = 1
}, },
handleCurrentChange(val) {//翻页功能按钮 handleCurrentChange(val) { //翻页功能按钮
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
}, },
} }
} }
</script> </script>
\ No newline at end of file
...@@ -102,7 +102,8 @@ ...@@ -102,7 +102,8 @@
<span class="spanlink" v-if='childItem.PeoplePrice==0' <span class="spanlink" v-if='childItem.PeoplePrice==0'
@click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span> @click="goUrl('RestaurantPackage',subItem,'套餐查询')">设置</span>
<template v-else> <template v-else>
{{childItem.PeoplePrice}} <el-input class='w50 tcenter' @input='calculationPrice(subItem)'
v-model='childItem.PeoplePrice' @keyup.native="checkInteger(childItem,'PeoplePrice')"></el-input>
</template> </template>
</td> </td>
<td> <td>
...@@ -141,7 +142,6 @@ ...@@ -141,7 +142,6 @@
付款方式: 付款方式:
</td> </td>
<td style="text-align:left;"> <td style="text-align:left;">
<el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')"> <el-select class='w135 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option> <el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option> <el-option label='现付' :value='1' v-if="subItem.PayStyleExt==1"></el-option>
...@@ -150,7 +150,6 @@ ...@@ -150,7 +150,6 @@
<el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option> <el-option label='预付' :value='4' v-if="subItem.PayStyleExt==4"></el-option>
<el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option> <el-option label='预付款抵扣' :value='5' v-if="subItem.PayStyleExt==5"></el-option>
<el-option label='公司合团支付' :value='6'></el-option> <el-option label='公司合团支付' :value='6'></el-option>
</el-select> </el-select>
</td> </td>
</tr> </tr>
......
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