Skip to content

S
SuperMan
Commit 97d48595 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents 9173132a 5b83e85b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2766 additions and 476 deletions
src/components/myOrdersAllType/components/allList.vue
View file @ 97d48595
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
.groupTourOrder_count_item>p>span{ .groupTourOrder_count_item>p>span{
margin: 0; margin: 0;
} }
.color_red_order{
color: red;
}
.HT_total{ .HT_total{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -63,7 +66,7 @@ ...@@ -63,7 +66,7 @@
</style> </style>
<template> <template>
<div class="HotelWorkList" @click="showWarningSearch=false"> <div class="HotelWorkList">
<div class="query-box HotelWorkInput" style="border-bottom: none;"> <div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul> <ul>
<!-- <li> <!-- <li>
...@@ -168,29 +171,30 @@ ...@@ -168,29 +171,30 @@
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<li> <li style="line-height: 30px; padding-left: 30px;">
<span> <el-popover width="350" trigger="click">
<em @click.stop="showWarningSearch=true" <div class="groupSuperSearchLayer">
style="margin-top: 10px;cursor: pointer;"> 高级查询 <i class="el-icon-caret-bottom"></i></em> <p style="padding-bottom: 10px;">订单高级查询</p>
<el-popover width="300" v-model="showWarningSearch" trigger="click"> </div>
<div> <table class="groupSuperSearchLayerTable" border="0" cellspacing="0" cellpadding="0">
<div class="TC_queryTitle">订单高级查询</div> <tr>
<div class="clearfix"> <td style="padding: 5px 0">
<div class="TC_leftSearch"> <span style="width: 100px;display: inline-block;">线路</span>
<div> <el-select v-model='msg.LineId' style="width: 210px;">
<span>选择线路</span> <el-option :value="0" label="不限"></el-option>
<el-select v-model='msg.LineId' class="w150"> <el-option v-for='item in LineList'
<el-option :value="0" label="不限"></el-option> :label='item.LineName'
<el-option v-for='item in LineList' :value='item.LineID'
:label='item.LineName' :key='item.LineID'>
:value='item.LineID' </el-option>
:key='item.LineID'> </el-select>
</el-option> </td>
</el-select>
</div> </tr>
<div> <tr>
<span>出发时间</span> <td style="padding: 5px 0">
<el-date-picker <span style="width: 100px;display: inline-block;">出发日期</span>
<el-date-picker
style="height: 34px;width: 210px;" style="height: 34px;width: 210px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="DatelistUse" v-model="DatelistUse"
...@@ -199,10 +203,13 @@ ...@@ -199,10 +203,13 @@
:start-placeholder="$t('OrderList.star')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse"> :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker> </el-date-picker>
</div> </td>
<div>
<span>完结时间</span> </tr>
<el-date-picker <tr>
<td style="padding: 5px 0">
<span style="width: 100px;display: inline-block;">完结日期</span>
<el-date-picker
style="height: 34px;width: 210px;" style="height: 34px;width: 210px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="Datelist" v-model="Datelist"
...@@ -211,19 +218,18 @@ ...@@ -211,19 +218,18 @@
:start-placeholder="$t('OrderList.star')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDates"> :end-placeholder="$t('OrderList.end')" @change="getDates">
</el-date-picker> </el-date-picker>
</div> </td>
</div> </tr>
<div style="text-align: right;margin-top: 10px;"> <tr>
<button class="normalBtn TC_SearchBtn" <td colspan="4">
@click.stop="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}} <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
</button> @click="GetList();showWarningSearch=false" style="width: 310px!important;" />
</div> </td>
</div> </tr>
</table>
</div> <span slot="reference" style="cursor: pointer;">{{$t('visa.v_gjchaxun')}}<i
</el-popover> class="el-icon-caret-bottom"></i></span>
</span> </el-popover>
</li> </li>
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click.stop="msg.pageIndex=1,currentPage=1,GetList()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
...@@ -240,26 +246,27 @@ ...@@ -240,26 +246,27 @@
<span>{{item.CurrencyName}}</span> <span>{{item.CurrencyName}}</span>
</div> </div>
<p> <p>
<span class="color_red_order">应收： <!-- groupTourOrder_count_green -->
<span>应收：
{{item.Money.toFixed(2)}} {{item.Money.toFixed(2)}}
</span> </span>
<span class="groupTourOrder_count_green">实收： <span>实收：
{{item.Income.toFixed(2)}} {{item.Income.toFixed(2)}}
</span> </span>
<span class="color_red_order">退款： <span>退款：
{{item.Refund.toFixed(2)}} {{item.Refund.toFixed(2)}}
</span> </span>
<span class="color_red_order">手续费： <span>手续费：
{{item.PlatformTax.toFixed(2)}} {{item.PlatformTax.toFixed(2)}}
</span> </span>
<span class="color_red_order">成本： <span>成本：
{{item.CostMoney.toFixed(2)}} {{item.CostMoney.toFixed(2)}}
</span> </span>
<span class="color_red_order" <span
:style="{'color':item.DueInMoney>0?'red':''}">待收： :class="{'color_red_order':item.DueInMoney>0}">待收：
<span>{{item.DueInMoney.toFixed(2)}}</span> <span>{{item.DueInMoney.toFixed(2)}}</span>
</span> </span>
<span class="color_red_order">报名数： <span>报名数：
{{item.GuestNum}}人 {{item.GuestNum}}人
</span> </span>
</p> </p>
...@@ -576,11 +583,11 @@ ...@@ -576,11 +583,11 @@
if(this.Title!='销售'){ if(this.Title!='销售'){
this.getEmployee() this.getEmployee()
} }
this.msg.StartTime = this.getBeforeDate(31, new Date()) this.msg.StartTime = this.getBeforeDate(0, new Date())
this.msg.EndTime = this.getBeforeDate(0, new Date()) this.msg.EndTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
// this.GetOrderStatusEnumList() // this.GetOrderStatusEnumList()//订单状态
this.GetTicketStatusEnumList() // this.GetTicketStatusEnumList()//出票状态
this.GetOrderTypeEnumList() this.GetOrderTypeEnumList()
this.getLineList() this.getLineList()
this.Datelist = this.getyMDOne() this.Datelist = this.getyMDOne()
...@@ -596,8 +603,4 @@ ...@@ -596,8 +603,4 @@
}; };
</script> </script>
<style>
</style>
\ No newline at end of file
src/components/myOrdersAllType/erpCustomerOrderDayOP.vue 0 → 100644
View file @ 97d48595
<style>
</style>
<template>
<div>
<allList :pagesTitle="pagesTitle" :dataObj="dataObj"></allList>
</div>
</template>
<script>
import allList from './components/allList.vue';
export default {
components: { allList },
data() {
return {
pagesTitle: 'OP',
dataObj:{
OrderId: '',
}
};
},
watch: {
pagesTitle(val,oldval){
},
},
methods: {
},
created() {
},
mounted() {
if(this.$route.query.OrderId){
this.dataObj.OrderId = this.$route.query.OrderId
}
},
};
</script>
<style>
</style>
src/components/orderCommon/orderlist.vue 0 → 100644
View file @ 97d48595
This diff is collapsed.
src/router/config.js
View file @ 97d48595
...@@ -3314,6 +3314,14 @@ export default { ...@@ -3314,6 +3314,14 @@ export default {
title: '今日订单' title: '今日订单'
}, },
}, },
{ //OP 今日订单
path: '/erpCustomerOrderDayOP',
name: 'erpCustomerOrderDayOP',
component: resolve => require(['@/components/myOrdersAllType/erpCustomerOrderDayOP'], resolve),
meta: {
title: '今日订单'
},
},
{ // 销售 散卖机票订单 { // 销售 散卖机票订单
path: '/BulkAirTicketOrders', path: '/BulkAirTicketOrders',
name: 'BulkAirTicketOrders', name: 'BulkAirTicketOrders',
......
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