Skip to content

S
SuperMan
Commit 83a84f6e authored by youjie's avatar youjie
Browse files
Options

no message

parent ffb6465a
Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 52 deletions
src/components/myOrdersAllType/components/OrderList.vue
View file @ 83a84f6e
......@@ -14,7 +14,7 @@
show-overflow-tooltip>
<template slot-scope="scope">
<div>
<p class="cursor-pointer c059FF6 fz18 row-c" @click.stop="goDetails(scope.row)"><el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag><span>{{scope.row.OrderId}}</span> </p>
<p class="cursor-pointer c059FF6 fz18 row-c" @click="goDetails(scope.row)"><el-tag style="margin-right: 5px;" size="mini">{{scope.row.OrderTypeName}}</el-tag><span>{{scope.row.OrderId}}</span> </p>
<p>{{scope.row.CreateTimeStr}}</p>
</div>
</template>
......@@ -28,7 +28,7 @@
<div>
<p class=" fz14"
:class="{'cursor-pointer c059FF6':scope.row.OrderType==2}"
@click.stop="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
@click="scope.row.OrderType==2?goTuanDetails(scope.row):''">{{scope.row.TCNUM}}</p>
<p>出发日期：{{scope.row.StartDate}}</p>
</div>
</template>
......@@ -258,8 +258,14 @@
},
methods: {
goTuanDetails(row){
let name = ''
if(row.IsOneDayOrder==1){
name = 'groupTourOrderByTuanOne'
}else{
name = 'groupTourOrderByTuan'
}
this.$router.push({
name: 'groupTourOrderByTuan',
name: name,
query: {
id: row.TCID,
tcmun: row.TCNUM,
......@@ -268,6 +274,7 @@
});
},
goDetails(row){
console.log(this.pagesTitle,this.S_CheckBranchOrder,this.S_CheckAllOrder)
let data = [{
path: "",
OrderId: row.OrderId,
......@@ -278,7 +285,7 @@
if (row.OrderType == 1) {
if(this.pagesTitle=='销售'||(this.S_CheckBranchOrder&&this.S_CheckAllOrder)){
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
data[0].path = 'myCustomerOrderAllType'
}else{
data[0].path = 'customerOrderAllType'
......@@ -289,7 +296,7 @@
}else{
let name = ''
if (row.OrderType == 6) {
if(this.pagesTitle=='销售'||(this.S_CheckBranchOrder&&this.S_CheckAllOrder)){
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
name = 'VisaProductEditOrder'
}else{
name = 'VisaProductEditOrderOP'
......@@ -298,7 +305,7 @@
name: name,
});
}else if (row.OrderType == 2) {//跟团 一日游
if(this.pagesTitle=='销售'||(this.S_CheckBranchOrder&&this.S_CheckAllOrder)){
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
if(row.TravelType==1){
name = 'groupTourOrder'
}else{
......@@ -309,14 +316,14 @@
}
}
else if (row.OrderType == 3) {//酒店
if(this.pagesTitle=='销售'||(this.S_CheckBranchOrder&&this.S_CheckAllOrder)){
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
name = 'singleProductHotelOrder'
}else{
name = 'singleProductHotelOrderOP'
}
}
else if (row.OrderType == 4) {//门票
if(this.pagesTitle=='销售'||(this.S_CheckBranchOrder&&this.S_CheckAllOrder)){
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
name = 'SingleticketOrderList'
}else{
name = 'SingleticketOrderListOP'
......@@ -372,7 +379,7 @@
if(pageData&&pageData.length>0){
OrderType = pageData[0].OrderType
}
if(this.pagesTitle=='销售'||(this.S_CheckBranchOrder&&this.S_CheckAllOrder)){
if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
name = 'CharterOrderList'
}else{
name = 'CharterOrderListOP'
......
src/components/myOrdersAllType/components/allList.vue
View file @ 83a84f6e
......@@ -66,7 +66,7 @@
</style>
<template>
<div class="HotelWorkList" @click="showWarningSearch=false">
<div class="HotelWorkList">
<div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul>
<!-- <li>
......@@ -171,29 +171,30 @@
</el-date-picker>
</span>
</li>
<li>
<span>
<em @click.stop="showWarningSearch=true"
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 class="TC_queryTitle">订单高级查询</div>
<div class="clearfix">
<div class="TC_leftSearch">
<div>
<span>选择线路</span>
<el-select v-model='msg.LineId' class="w150">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in LineList'
:label='item.LineName'
:value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</div>
<div>
<span>出发时间</span>
<el-date-picker
<li style="line-height: 30px; padding-left: 30px;">
<el-popover width="350" trigger="click">
<div class="groupSuperSearchLayer">
<p style="padding-bottom: 10px;">订单高级查询</p>
</div>
<table class="groupSuperSearchLayerTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<td style="padding: 5px 0">
<span style="width: 100px;display: inline-block;">线路</span>
<el-select v-model='msg.LineId' style="width: 210px;">
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in LineList'
:label='item.LineName'
:value='item.LineID'
:key='item.LineID'>
</el-option>
</el-select>
</td>
</tr>
<tr>
<td style="padding: 5px 0">
<span style="width: 100px;display: inline-block;">出发日期</span>
<el-date-picker
style="height: 34px;width: 210px;"
value-format="yyyy-MM-dd"
v-model="DatelistUse"
......@@ -202,10 +203,13 @@
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker>
</div>
<div>
<span>完结时间</span>
<el-date-picker
</td>
</tr>
<tr>
<td style="padding: 5px 0">
<span style="width: 100px;display: inline-block;">完结日期</span>
<el-date-picker
style="height: 34px;width: 210px;"
value-format="yyyy-MM-dd"
v-model="Datelist"
......@@ -214,19 +218,18 @@
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDates">
</el-date-picker>
</div>
</div>
<div style="text-align: right;margin-top: 10px;">
<button class="normalBtn TC_SearchBtn"
@click.stop="GetList(),showWarningSearch=false">{{$t('pub.searchBtn')}}
</button>
</div>
</div>
</div>
</el-popover>
</span>
</td>
</tr>
<tr>
<td colspan="4">
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click="GetList();showWarningSearch=false" style="width: 310px!important;" />
</td>
</tr>
</table>
<span slot="reference" style="cursor: pointer;">{{$t('visa.v_gjchaxun')}}<i
class="el-icon-caret-bottom"></i></span>
</el-popover>
</li>
<li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click.stop="msg.pageIndex=1,currentPage=1,GetList()" />
......@@ -580,7 +583,7 @@
if(this.Title!='销售'){
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.DatelistBM = [new Date(this.msg.StartTime),new Date()]
// this.GetOrderStatusEnumList()//订单状态
......
src/router/config.js
View file @ 83a84f6e
......@@ -3319,7 +3319,7 @@ export default {
name: 'erpCustomerOrderDayOP',
component: resolve => require(['@/components/myOrdersAllType/erpCustomerOrderDayOP'], resolve),
meta: {
title: '我的订单'
title: '今日订单'
},
},
{ // 销售 散卖机票订单
......
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