Skip to content

S
SuperMan
Commit baa19b1a authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

散客订单

parent 74536407
Hide whitespace changes
Inline Side-by-side
Showing with 118 additions and 85 deletions
src/components/Ticketing/IndividualTicketOrder.vue
View file @ baa19b1a
...@@ -142,13 +142,24 @@ ...@@ -142,13 +142,24 @@
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span style="cursor: default;">暂无数据</span> <span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">{{fina.PayMoney}}</span>
<span v-if="item.FinanceList==0">
暂无数据
</span>
</span>
</div> </div>
</div> </div>
<div> <div>
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span style="cursor: default;">暂无数据</span> <span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">{{fina.PayMoney}}</span>
<span v-if="item.RefundFinanceList==0">
暂无数据
</span>
</span>
</div> </div>
</div> </div>
</td> </td>
...@@ -200,7 +211,7 @@ export default { ...@@ -200,7 +211,7 @@ export default {
res => { res => {
this.loading=false; this.loading=false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
// console.log(res); console.log(res);
this.total = res.data.data.count; this.total = res.data.data.count;
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
} else { } else {
...@@ -225,6 +236,11 @@ export default { ...@@ -225,6 +236,11 @@ export default {
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/newTravelManager.css"; @import "../../assets/css/newTravelManager.css";
.tickets_green {
color: #008000;
text-decoration: underline;
margin-right: 6px;
}
.title_tr th{ .title_tr th{
width:9%; width:9%;
} }
......
src/components/Ticketing/IndividualTicketOrderDetails.vue
View file @ baa19b1a
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<p><el-button type="primary" size="mini">{{AirModel.FreightSpaceStr}}</el-button></p> <p><el-button type="primary" size="mini">{{AirModel.FreightSpaceStr}}</el-button></p>
</el-col> </el-col>
<el-col :span="15"> <el-col :span="15">
<p v-for="(item,index) in AirModel.flightList" :key="index"> <p v-for="item in AirModel.flightList" :key="item">
<span class="air">{{item.Flight_number}} </span> <span class="air">{{item.Flight_number}} </span>
<span>{{item.FlightDate}} {{item.Departure_time}}{{item.DepartureName}} - {{item.AIATA}}{{item.ArrivalCityName}}</span> <span>{{item.FlightDate}} {{item.Departure_time}}{{item.DepartureName}} - {{item.AIATA}}{{item.ArrivalCityName}}</span>
</p> </p>
...@@ -18,8 +18,6 @@ ...@@ -18,8 +18,6 @@
</div> </div>
<!-- Tab选项 --> <!-- Tab选项 -->
<el-tabs v-model="activeName" >
<el-tab-pane label="正常" name="first">
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle"> <div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle">
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> <table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr class="title_tr"> <tr class="title_tr">
...@@ -39,7 +37,7 @@ ...@@ -39,7 +37,7 @@
<tr> <tr>
<td v-show="dataList.length==0" colspan="16" align="center">暂无数据</td> <td v-show="dataList.length==0" colspan="16" align="center">暂无数据</td>
</tr> </tr>
<tbody v-for="(item,index) in dataList" :key="index"> <tbody v-for="item in dataList" :key="item.ContactName">
<tr> <tr>
<td>{{item.AirProductId}} </td> <td>{{item.AirProductId}} </td>
<td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p> <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
...@@ -53,47 +51,44 @@ ...@@ -53,47 +51,44 @@
<td>{{item.Refund}}</td> <td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td> <td>{{item.PlatformTax}}</td>
<td> <td>
<el-tag v-if="item.Status==1" type="success">正常</el-tag> <span v-if="item.Status==1" type="success">正常</span>
<el-tag v-if="item.Status==2">取消</el-tag> <span v-if="item.Status==2">取消</span>
</td> </td>
</tr> </tr>
<tr style="height:20px"> <tr style="height:20px">
<td colspan="15" class="RL_Order" style="height:20px"> <td colspan="15" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">名单:</span> <span class="RL-remarkTitle">名单:</span>
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<span v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
<el-popover <el-popover
placement="right" placement="right"
width="1000" width="1000"
trigger="click"> trigger="click">
<el-table :data="item.GuestList"> <el-table :data="item.GuestList">
<el-table-column property="Id" label="订单ID"></el-table-column> <el-table-column property="Id" label="排号"></el-table-column>
<el-table-column property="Name" label="姓名"></el-table-column> <el-table-column property="Name" label="姓名"></el-table-column>
<el-table-column property="EName" label="英文姓名"></el-table-column> <el-table-column property="Sex" label="性别">
<el-table-column property="Sex" label="性别"> <template slot-scope="scope">
<template slot-scope="scope"> <span v-if="scope.row.Sex=='1'">男</span>
<span v-if="scope.row.Sex=='1'">男</span> <span v-if="scope.row.Sex=='2'">女</span>
<span v-if="scope.row.Sex=='2'">女</span> </template>
</template> </el-table-column>
</el-table-column> <el-table-column property="Birthday" label="生日"></el-table-column>
<el-table-column property="Birthday" label="生日"></el-table-column> <el-table-column property="PassportNo" label="护照号码"></el-table-column>
<el-table-column property="PassportNo" label="护照号码"></el-table-column> <el-table-column property="NationalityName" label="国籍"></el-table-column>
<el-table-column property="NationalityName" label="国籍"></el-table-column> <el-table-column width="120" property="MobilePhone" label="手机号码"></el-table-column>
<el-table-column width="120" property="MobilePhone" label="手机号码"></el-table-column>
<el-table-column property="AgeType" label="年龄类型">
<el-table-column property="AgeType" label="年龄类型"> <template slot-scope="scope">
<template slot-scope="scope"> <span v-if="scope.row.AgeType=='1'">成人</span>
<span v-if="scope.row.AgeType=='1'">成人</span> <span v-if="scope.row.AgeType=='2'">孩子</span>
<span v-if="scope.row.AgeType=='2'">孩子</span> <span v-if="scope.row.AgeType=='3'">婴儿</span>
<span v-if="scope.row.AgeType=='3'">婴儿</span> <span v-if="scope.row.AgeType=='4'">老人</span>
<span v-if="scope.row.AgeType=='4'">老人</span> </template>
</template> </el-table-column>
</el-table-column> </el-table>
</el-table> <span slot="reference">
<span style="float:right" class="RL-remarkTitle" slot="reference"> <span style="cursor:pointer" v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
<i style="font-size:12px;color:#e95252" class="iconfont icon-gengduo"></i> </span>
</span>
</el-popover> </el-popover>
</span> </span>
<span class="RL-redType RL-remarkCon" v-else> <span class="RL-redType RL-remarkCon" v-else>
...@@ -116,42 +111,39 @@ ...@@ -116,42 +111,39 @@
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span style="cursor: default;">暂无数据</span> <span style="cursor: default;">
</div> <span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">{{fina.PayMoney}}</span>
<span v-if="item.FinanceList==0">
暂无数据
</span>
</span>
</div>
</div> </div>
<div> <div>
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span style="cursor: default;">暂无数据</span> <span style="cursor: default;">
</div> <span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">{{fina.PayMoney}}</span>
<span v-if="item.RefundFinanceList==0">
暂无数据
</span>
</span>
</div>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table>
</div> <!-- 展开或关闭 -->
</el-tab-pane> <tr v-if="CancelList.length>0" style="height:60px;line-height:60px;width:100%">
<el-tab-pane label="取消" name="second"> <td colspan="15">
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle"> <p @click="Toggle" style="cursor:pointer;display:inline-block;width:100%;background:#fff;padding:0 6px;box-sizing:border-box">
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'> 取消订单<span style="color:blue">({{toggle_title}})</span>
<tr class="title_tr"> </p>
<th>单号</th> </td>
<th>客户信息</th> </tr>
<th>客人数量</th> <tbody v-show="toggle_status" v-for="item in CancelList" :key="item.ContactName">
<th>单价</th>
<th>成交单价</th>
<th>应收总额</th>
<th>实收</th>
<th>退款</th>
<th>平台税金</th>
<!-- <th width="80">平台在途</th> -->
<!-- <th width="80">待收金额</th> -->
<th>状态</th>
</tr>
<tr>
<td v-show="CancelList.length==0" colspan="16" align="center">暂无数据</td>
</tr>
<tbody v-for="(item,index) in CancelList" :key="index">
<tr> <tr>
<td>{{item.AirProductId}} </td> <td>{{item.AirProductId}} </td>
<td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p> <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.ContactName}}</p>
...@@ -165,8 +157,8 @@ ...@@ -165,8 +157,8 @@
<td>{{item.Refund}}</td> <td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td> <td>{{item.PlatformTax}}</td>
<td> <td>
<el-tag v-if="item.Status==1" type="success">正常</el-tag> <span v-if="item.Status==1">正常</span>
<el-tag v-if="item.Status==2">取消</el-tag> <span v-if="item.Status==2">取消</span>
</td> </td>
</tr> </tr>
<tr style="height:20px"> <tr style="height:20px">
...@@ -179,9 +171,8 @@ ...@@ -179,9 +171,8 @@
width="1000" width="1000"
trigger="click"> trigger="click">
<el-table :data="item.GuestList"> <el-table :data="item.GuestList">
<el-table-column property="Id" label="订单ID"></el-table-column> <el-table-column property="Id" label="排号"></el-table-column>
<el-table-column property="Name" label="姓名"></el-table-column> <el-table-column property="Name" label="姓名"></el-table-column>
<el-table-column property="EName" label="英文姓名"></el-table-column>
<el-table-column property="Sex" label="性别"> <el-table-column property="Sex" label="性别">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.Sex=='1'">男</span> <span v-if="scope.row.Sex=='1'">男</span>
...@@ -202,11 +193,10 @@ ...@@ -202,11 +193,10 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<span style="float:right" class="RL-remarkTitle" slot="reference"> <span slot="reference">
<i style="font-size:12px;color:#e95252" class="iconfont icon-gengduo"></i> <span style="cursor:pointer" v-for="(childItem) in item.GuestList" :key="childItem.Name">{{childItem.Name}}&nbsp;&nbsp;</span>
</span> </span>
</el-popover>
</el-popover>
</span> </span>
<span class="RL-redType RL-remarkCon" v-else> <span class="RL-redType RL-remarkCon" v-else>
<span>暂无名单</span> <span>暂无名单</span>
...@@ -228,23 +218,32 @@ ...@@ -228,23 +218,32 @@
<div> <div>
<div>收款单据：</div> <div>收款单据：</div>
<div> <div>
<span style="cursor: default;">暂无数据</span> <span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.FinanceList" :key="fin">{{fina.PayMoney}}</span>
<span v-if="item.FinanceList==0">
暂无数据
</span>
</span>
</div> </div>
</div> </div>
<div> <div>
<div>付款单据：</div> <div>付款单据：</div>
<div> <div>
<span style="cursor: default;">暂无数据</span> <span style="cursor: default;">
<span class="tickets_green" v-for="(fina,fin) in item.RefundFinanceList" :key="fin">{{fina.PayMoney}}</span>
<span v-if="item.RefundFinanceList==0">
暂无数据
</span>
</span>
</div> </div>
</div> </div>
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</div> </div>
</el-tab-pane>
</el-tabs>
</div> </div>
</template> </template>
...@@ -260,6 +259,8 @@ export default { ...@@ -260,6 +259,8 @@ export default {
loading:false, loading:false,
AirModel:{}, AirModel:{},
CancelList:[], CancelList:[],
toggle_status:false,
toggle_title:"展开",
}; };
}, },
components: {}, components: {},
...@@ -273,7 +274,15 @@ export default { ...@@ -273,7 +274,15 @@ export default {
}, },
methods: { methods: {
Toggle(){
this.toggle_status=!this.toggle_status;
if(this.toggle_status){
this.toggle_title="关闭"
}else{
this.toggle_title="展开"
}
},
getList() { getList() {
this.loading=true; this.loading=true;
this.apipost( this.apipost(
...@@ -301,6 +310,14 @@ export default { ...@@ -301,6 +310,14 @@ export default {
</script> </script>
<style scoped> <style scoped>
@import "../../assets/css/newTravelManager.css"; @import "../../assets/css/newTravelManager.css";
.tickets_green {
color: #008000;
text-decoration: underline;
margin-right: 6px;
}
.groupTourOrderSearchTable tr:first-child td:first-child{
border-bottom:none;
}
.AirModel{ .AirModel{
font-size: 14px; font-size: 14px;
width: 500px; width: 500px;
......
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