Commit afaddc00 authored by youjie's avatar youjie

no message

parent 030394df
<style scoped> <style scoped>
.TC_leftSearch>div{
padding: 5px 0;
}
.groupTourOrderByTuan_ico{ .groupTourOrderByTuan_ico{
margin-left: 5px; margin-left: 5px;
} }
...@@ -43,7 +46,7 @@ ...@@ -43,7 +46,7 @@
</style> </style>
<template> <template>
<div class="HotelWorkList"> <div class="HotelWorkList" @click="showWarningSearch=false">
<div class="query-box HotelWorkInput" style="border-bottom: none;"> <div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul> <ul>
<li> <li>
...@@ -68,31 +71,6 @@ ...@@ -68,31 +71,6 @@
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span>
<em>出票状态</em>
<el-select v-model='msg.TicketStatus' class="w200">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ticketingStatusList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>出签状态</em>
<el-select v-model='msg.VisaStatus' class="w200">
<el-option v-for='item in VisaList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li> <li>
<span> <span>
<em>订单状态</em> <em>订单状态</em>
...@@ -141,15 +119,15 @@ ...@@ -141,15 +119,15 @@
</li> </li>
<li> <li>
<span> <span>
<em>完结时间</em> <em>报名时间</em>
<el-date-picker <el-date-picker
style="height: 34px;" style="height: 34px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="Datelist" v-model="DatelistBM"
type="daterange" type="daterange"
:range-separator="$t('OrderList.zhi')" :range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDates"> :end-placeholder="$t('OrderList.end')" @change="getDatesBM">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
...@@ -169,44 +147,66 @@ ...@@ -169,44 +147,66 @@
</li> </li>
<li> <li>
<span> <span>
<em @click="showWarningSearch=true">高级查询</em> <em @click.stop="showWarningSearch=true"
<el-popover width="260" v-model="showWarningSearch" trigger="click"> style="margin-top: 10px;cursor: pointer;"> 高级查询 <i class="el-icon-caret-bottom"></i></em>
<el-popover width="300" v-model="showWarningSearch" trigger="click">
<div> <div>
<div class="TC_queryTitle">高级查询</div> <div class="TC_queryTitle">机票高级查询</div>
<div class="clearfix"> <div class="clearfix">
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div>
<span>出票状态</span>
<el-select v-model='msg.TicketStatus' class="w150">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in ticketingStatusList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</div>
<div> <div>
<span>{{$t('system.query_airCompanyName')}}</span> <span>出签状态</span>
<!-- <el-select v-model="msg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" <el-select v-model='msg.VisaStatus' class="w150">
class="w150"> <el-option v-for='item in VisaList'
<el-option :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue"> :label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option> </el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" </el-select>
:label="item.AlName" :value="item.AirLineId"></el-option> </div>
</el-select> --> <div>
<span>完结时间</span>
<el-date-picker <el-date-picker
class="w150" style="height: 34px;width: 210px;"
style="height: 34px;" value-format="yyyy-MM-dd"
value-format="yyyy-MM-dd" v-model="Datelist"
v-model="Datelist" type="daterange"
type="daterange" :range-separator="$t('OrderList.zhi')"
:range-separator="$t('OrderList.zhi')" :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> </div>
<div>
<span>出行概述</span>
<el-input v-model='msg.StartCityName' style="width: 210px;"></el-input>
</div> </div>
</div> </div>
<button class="normalBtn TC_SearchBtn" <div style="text-align: right;margin-top: 10px;">
@click="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}} <button class="normalBtn TC_SearchBtn"
@click.stop="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}}
</button> </button>
</div>
</div>
</div> </div>
</el-popover> </el-popover>
</span> </span>
</li> </li>
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click="msg.pageIndex=1,currentPage=1,GetList()" /> <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -221,13 +221,13 @@ ...@@ -221,13 +221,13 @@
</div> </div>
<p> <p>
<span class="groupTourOrder_count_green">{{$t('op.TotalMoney')}} <span class="groupTourOrder_count_green">{{$t('op.TotalMoney')}}
{{TotalMsg.Money}} {{TotalMsg.Money.toFixed(2)}}
</span> </span>
<span class="groupTourOrder_count_green">{{$t('salesModule.TotalIncome')}} <span class="groupTourOrder_count_green">{{$t('salesModule.TotalIncome')}}
{{TotalMsg.Money-TotalMsg.PayMoney}} {{(TotalMsg.Money-TotalMsg.PayMoney).toFixed(2)}}
</span> </span>
<span class="color_red_order">{{$t('op.Tocollected')}} <span class="color_red_order">{{$t('op.Tocollected')}}
{{TotalMsg.DueinMoney}} {{TotalMsg.DueinMoney.toFixed(2)}}
</span> </span>
</p> </p>
</div> </div>
...@@ -369,6 +369,7 @@ ...@@ -369,6 +369,7 @@
], ],
Datelist:'', Datelist:'',
DatelistUse:'', DatelistUse:'',
DatelistBM: [],
Title:'', Title:'',
EmployeeList:[], EmployeeList:[],
employeeMsg:{ // 员工 employeeMsg:{ // 员工
...@@ -433,20 +434,29 @@ ...@@ -433,20 +434,29 @@
} }
}, err => {}) }, err => {})
}, },
getDatesBM(){
if(this.DatelistBM){
this.msg.StartTime = this.DatelistBM[0]
this.msg.EndTime = this.DatelistBM[1]
}if(!this.DatelistBM){
this.msg.StartTime = ''
this.msg.EndTime = ''
}
},
getDatesUse(){ getDatesUse(){
if(this.Datelist){ if(this.DatelistUse){
this.msg.DepartSTime = this.Datelist[0] this.msg.DepartSTime = this.DatelistUse[0]
this.msg.DepartETime = this.Datelist[1] this.msg.DepartETime = this.DatelistUse[1]
}if(!this.Datelist){ }if(!this.DatelistUse){
this.msg.DepartSTime = '' this.msg.DepartSTime = ''
this.msg.DepartETime = '' this.msg.DepartETime = ''
} }
}, },
getDates(){ getDates(){
if(this.DatelistUse){ if(this.Datelist){
this.msg.FinishSTime = this.Datelist[0] this.msg.FinishSTime = this.Datelist[0]
this.msg.FinishETime = this.Datelist[1] this.msg.FinishETime = this.Datelist[1]
}if(!this.DatelistUse){ }if(!this.Datelist){
this.msg.FinishSTime = '' this.msg.FinishSTime = ''
this.msg.FinishETime = '' this.msg.FinishETime = ''
} }
...@@ -657,6 +667,9 @@ ...@@ -657,6 +667,9 @@
if(this.Title!='销售'){ if(this.Title!='销售'){
this.getEmployee() this.getEmployee()
} }
this.msg.StartTime = this.getBeforeDate(31, new Date())
this.msg.EndTime = this.$calendarUtils.formatDate(new Date(), "YYYY-MM-dd", 0)
this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
this.GetOrderStatusEnumList() this.GetOrderStatusEnumList()
this.GetTicketStatusEnumList() this.GetTicketStatusEnumList()
this.Datelist = this.getyMDOne() this.Datelist = this.getyMDOne()
......
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