Skip to content

S
SuperMan
Commit eed0dd2c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 250c269d
Hide whitespace changes
Inline Side-by-side
Showing with 277 additions and 290 deletions
src/components/DomesticModule/SettlementOrder.vue
View file @ eed0dd2c
<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{
border-bottom: 1px solid #E95252; .page_SettlementOrder td._hover._color_red span {
cursor: pointer; border-bottom: 1px solid #E95252;
} 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> <li>
<span> <span>
<em>期数</em> <em>期数日期</em>
<el-input v-model="msg.Term" class="w210"></el-input> <el-date-picker class="h34" v-model="transactionDate" @change="timeAdd()" type="daterange"
</span> value-format="yyyy-MM-dd">
</li> --> </el-date-picker>
<li> </span>
<span> </li>
<em>期数日期</em> <li>
<el-date-picker <span>
class="h34" <em>机票类别</em>
v-model="transactionDate" <el-select filterable v-model='msg.IsInter'>
@change="timeAdd()" <el-option label='全部' value='-1'></el-option>
type="daterange" <el-option label='国内机票' value='0'></el-option>
value-format="yyyy-MM-dd"> <el-option label='国际机票' value='1'></el-option>
</el-date-picker> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>机票类别</em> <em>状态</em>
<el-select filterable v-model='msg.IsInter' > <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='0'></el-option> <el-option label='已完成' value='1'></el-option>
<el-option label='国际机票' value='1'></el-option> <el-option label='未完成' value='0'></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <input type="button" class="hollowFixedBtn" value="查询" @click="getList()" />
<em>状态</em> <button class="normalBtn" @click="method5()">导出</button>
<el-select filterable v-model='msg.status' > </li>
<el-option label='全部' value='-1'></el-option> </ul>
<el-option label='已完成' value='1'></el-option> </div>
<el-option label='未完成' value='0'></el-option> <div class="_content">
</el-select> <table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"
</span> v-loading='loading'>
</li> <tr>
<li> <th>机票类别</th>
<input type="button" class="hollowFixedBtn" value="查询" @click="getList()"/> <th>期数</th>
<button class="normalBtn" @click="method5()">导出</button> <th>应收金额</th>
</li> <th>成本</th>
</ul> <th>预期利润</th>
</div> <th>实收</th>
<div class="_content"> <th>实付</th>
<table class="_content_tab singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading = 'loading'> <th>待收金额</th>
<tr> <th>实际利润</th>
<th>机票类别</th> <th>操作人</th>
<th>期数</th> <th>操作</th>
<th>应收金额</th> </tr>
<th>成本</th> <tr v-for="(item,index) in dataList">
<th>预期利润</th> <td>{{item.IsInter==0?"国内机票":"国际机票"}}</td>
<th>实收</th> <td>{{item.Term}}</td>
<th>实付</th> <td>¥{{item.Money}}</td>
<th>待收金额</th> <td>¥{{item.Cost}}</td>
<th>实际利润</th> <td>¥{{item.Profit}}</td>
<th>操作人</th> <td :class="item.Money===item.InCome?'':'_color_red'"
<th>操作</th> @click="jumpPage('FinancialOrderNew',item.ID,item.Term,1)" class="_hover">¥
</tr> <span>{{item.InCome}}</span>
<tr v-for="(item,index) in dataList"> </td>
<td>{{item.IsInter==0?"国内机票":"国际机票"}}</td> <td :class="item.Cost===item.PayMoney?'':'_color_red'"
<td>{{item.Term}}</td> @click="jumpPage('FinancialOrderNew',item.ID,item.Term,2)" class="_hover">
<td>¥{{item.Money}}</td> ¥
<td>¥{{item.Cost}}</td> <span>{{item.PayMoney}}</span>
<td>¥{{item.Profit}}</td> </td>
<td :class="item.Money===item.InCome?'':'_color_red'" @click="jumpPage('FinancialOrderNew',item.ID,item.Term,1)" class="_hover">¥ <td :class="Math.abs(item.Money-item.InCome)>0?'_color_red':''">¥{{Math.abs(item.Money-item.InCome)}}</td>
<span>{{item.InCome}}</span> <td>
</td> <span v-if="item.Status!=0"
<td :class="item.Cost===item.PayMoney?'':'_color_red'" @click="jumpPage('FinancialOrderNew',item.ID,item.Term,2)" class="_hover"> :class="Math.abs(item.RealProfit)>0?'_color_red':''">¥{{Math.abs(item.RealProfit)}}</span>
¥ <span v-else>-</span>
<!-- <el-popover </td>
popper-class="sett_popover" <td>{{item.EmName}}<br />{{item.UpdateDate}}</td>
placement="bottom" <td>
width="450" <el-tooltip class="item" effect="dark" content="详情" placement="top">
trigger="click"> <el-button type="danger" class="_bth_bg_gr" @click="goUrl('OrderDetails',item.Term,item.ID)" circle>详
<table class="add_table singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0"> </el-button>
<tr> </el-tooltip>
<th>单据号</th> <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="收款" placement="top">
<th>金额</th> <el-button type="primary" class="_bth_bg_bl" @click="goUrlT(item,1)" circle>收</el-button>
<th>类型</th> </el-tooltip>
<th>状态</th> <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="付款" placement="top">
</tr> <el-button type="danger" class="_bth_bg_bgr" @click="goUrlT(item,2)" circle>付</el-button>
<tr v-for="(i,d) in Details"> </el-tooltip>
<td>{{i.FrID}}</td> <el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="确认" placement="top">
<td>{{i.PayMoney}}</td> <el-button v-if="item.Status==0" type="danger" class="_bth_bg_bl" @click="queren(item)" circle>确
<td>{{i.TypeName}}</td> </el-button>
<td>{{i.StatusName}}</td> </el-tooltip>
</tr> </td>
<tr v-if="Details.length==0"> </tr>
<td colspan="4">暂无数据</td> </table>
</tr>
</table>
<span slot="reference" @click="getDetails(item.ID)">{{item.PayMoney}}</span>
</el-popover> -->
<span>{{item.PayMoney}}</span>
</td>
<td :class="Math.abs(item.Money-item.InCome)>0?'_color_red':''">¥{{Math.abs(item.Money-item.InCome)}}</td>
<td>
<span v-if="item.Status!=0" :class="Math.abs(item.RealProfit)>0?'_color_red':''">¥{{Math.abs(item.RealProfit)}}</span>
<span v-else>-</span>
</td>
<td>{{item.EmName}}<br/>{{item.UpdateDate}}</td>
<td>
<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-tooltip>
<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-tooltip>
<el-tooltip v-if="item.UpdateBy==emID" class="item" effect="dark" content="付款" placement="top">
<el-button type="danger" class="_bth_bg_bgr" @click="goUrlT(item,2)" circle>付</el-button>
</el-tooltip>
<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-tooltip>
</td>
</tr>
</table>
</div>
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination
background
@current-change="handleCurrentChange"
:current-page.sync="currentPage"
layout="total,prev, pager, next, jumper"
:page-size='msg.pageSize'
:total='total'>
</el-pagination>
</div>
</div> </div>
<div class="noData" v-show="noData">
{{$t('system.content_noData')}}
</div>
<div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size='msg.pageSize' :total='total'>
</el-pagination>
</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({ this.$router.push({
// name: path, name: path,
// query: { SourceID: id,OrderSource:9,type:type} query: {
// }); SourceID: id,
// window.open(routeData.href, "_blank"); OrderSource: 9,
this.$router.push({ type: type,
name: path, blank: 'y',
query: {SourceID: id,OrderSource:9,type:type,blank:'y',term:term} term: term
}) }
}, })
queren(obj){ },
this.$confirm('是否已完成'+'“'+obj.Term+'”'+'期？确认后不可撤回！', '提示', { queren(obj) {
confirmButtonText: '确定', this.$confirm('是否已完成' + '“' + obj.Term + '”' + '期？确认后不可撤回！', '提示', {
cancelButtonText: '取消', confirmButtonText: '确定',
type: 'warning' cancelButtonText: '取消',
}).then(() => { type: 'warning'
this.apipost('Domestic_Ticket_post_Confirm',{ID:obj.ID},r=>{ }).then(() => {
if(r.data.resultCode==1){ this.apipost('Domestic_Ticket_post_Confirm', {
let data = r.data.data; ID: obj.ID
this.$message.success(r.data.message); }, r => {
this.getList(); if (r.data.resultCode == 1) {
} let data = r.data.data;
},null); this.$message.success(r.data.message);
}).catch(() => { this.getList();
this.$message({
type: 'info',
message: '已取消'
});
});
},
getDetails(id){
this.Details = [];
this.apipost('Financial_post_GetOrderFinanceList',{OrderId:0,OrderResource:9,SourceID:id},r=>{
if(r.data.resultCode==1){
let data = r.data.data;
this.Details = data;
console.log(data);
}
},null);
},
timeAdd(){ // 日期格式
if(!this.transactionDate){
this.msg.sDate = '';
this.msg.eDate = '';
return
}
this.msg.sDate = this.transactionDate[0];
this.msg.eDate = this.transactionDate[1];
},
goUrlT(obj,t){
let orderObj = {
OrderID:0,
OrderSource:9,
Obj: {},
SourceID:obj.ID,
TCIDList: []
} }
this.$router.push( }, null);
{ }).catch(() => {
name: 'ChoiceAddFinancialDocuments', this.$message({
query:{ type: 'info',
'Type':t, message: '已取消'
'path':'TicketingModule', });
'Cmd':'Domestic_Ticket_post_UpdateFrID', });
'blank':'y', },
'orderObj':JSON.stringify(orderObj) getDetails(id) {
} this.Details = [];
} this.apipost('Financial_post_GetOrderFinanceList', {
); OrderId: 0,
}, OrderResource: 9,
goUrl(path,Term,id){ SourceID: id
this.$router.push({name:path,query:{'Term':Term,'ID':id,blank:'y'}}) }, r => {
}, if (r.data.resultCode == 1) {
getList(){ let data = r.data.data;
console.log(this.msg); this.Details = data;
this.loading = true; }
this.apipost('Domestic_Ticket_post_GetBillPageList',this.msg,r=>{ }, null);
if(r.data.resultCode==1){ },
this.total = r.data.data.count; timeAdd() { // 日期格式
if(this.total>0){ if (!this.transactionDate) {
this.noData =false; this.msg.sDate = '';
}else{ this.msg.eDate = '';
this.noData =true; return
} }
this.dataList = r.data.data.pageData this.msg.sDate = this.transactionDate[0];
this.loading =false; this.msg.eDate = this.transactionDate[1];
}else{ },
this.$message.error(r.data.message); goUrlT(obj, t) {
this.loading =false; let orderObj = {
} OrderID: 0,
},null) OrderSource: 9,
}, Obj: {},
method5: function() { SourceID: obj.ID,
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"); TCIDList: []
} , }
resetPageIndex() {//查询初始化页码 this.$router.push({
this.msg.pageIndex = 1; name: 'ChoiceAddFinancialDocuments',
this.currentPage = 1 query: {
}, 'Type': t,
handleCurrentChange(val) {//翻页功能按钮 'path': 'TicketingModule',
this.msg.pageIndex = val; 'Cmd': 'Domestic_Ticket_post_UpdateFrID',
this.getList(); 'blank': 'y',
}, 'orderObj': JSON.stringify(orderObj)
}
});
},
goUrl(path, Term, id) {
this.$router.push({
name: path,
query: {
'Term': Term,
'ID': id,
blank: 'y'
}
})
},
getList() {
this.loading = true;
this.apipost('Domestic_Ticket_post_GetBillPageList', this.msg, r => {
if (r.data.resultCode == 1) {
this.total = r.data.data.count;
if (this.total > 0) {
this.noData = false;
} else {
this.noData = true;
}
this.dataList = r.data.data.pageData
this.loading = false;
} else {
this.$message.error(r.data.message);
this.loading = false;
}
}, 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");
},
resetPageIndex() { //查询初始化页码
this.msg.pageIndex = 1;
this.currentPage = 1
},
handleCurrentChange(val) { //翻页功能按钮
this.msg.pageIndex = val;
this.getList();
},
} }
} }
</script> </script>
\ No newline at end of file
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ eed0dd2c
...@@ -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