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 @@ ...@@ -14,7 +14,7 @@
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div> <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> <p>{{scope.row.CreateTimeStr}}</p>
</div> </div>
</template> </template>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div> <div>
<p class=" fz14" <p class=" fz14"
:class="{'cursor-pointer c059FF6':scope.row.OrderType==2}" :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> <p>出发日期：{{scope.row.StartDate}}</p>
</div> </div>
</template> </template>
...@@ -258,8 +258,14 @@ ...@@ -258,8 +258,14 @@
}, },
methods: { methods: {
goTuanDetails(row){ goTuanDetails(row){
let name = ''
if(row.IsOneDayOrder==1){
name = 'groupTourOrderByTuanOne'
}else{
name = 'groupTourOrderByTuan'
}
this.$router.push({ this.$router.push({
name: 'groupTourOrderByTuan', name: name,
query: { query: {
id: row.TCID, id: row.TCID,
tcmun: row.TCNUM, tcmun: row.TCNUM,
...@@ -268,6 +274,7 @@ ...@@ -268,6 +274,7 @@
}); });
}, },
goDetails(row){ goDetails(row){
console.log(this.pagesTitle,this.S_CheckBranchOrder,this.S_CheckAllOrder)
let data = [{ let data = [{
path: "", path: "",
OrderId: row.OrderId, OrderId: row.OrderId,
...@@ -278,7 +285,7 @@ ...@@ -278,7 +285,7 @@
if (row.OrderType == 1) { 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' data[0].path = 'myCustomerOrderAllType'
}else{ }else{
data[0].path = 'customerOrderAllType' data[0].path = 'customerOrderAllType'
...@@ -289,7 +296,7 @@ ...@@ -289,7 +296,7 @@
}else{ }else{
let name = '' let name = ''
if (row.OrderType == 6) { if (row.OrderType == 6) {
if(this.pagesTitle=='销售'||(this.S_CheckBranchOrder&&this.S_CheckAllOrder)){ if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
name = 'VisaProductEditOrder' name = 'VisaProductEditOrder'
}else{ }else{
name = 'VisaProductEditOrderOP' name = 'VisaProductEditOrderOP'
...@@ -298,7 +305,7 @@ ...@@ -298,7 +305,7 @@
name: name, name: name,
}); });
}else if (row.OrderType == 2) {//跟团 一日游 }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){ if(row.TravelType==1){
name = 'groupTourOrder' name = 'groupTourOrder'
}else{ }else{
...@@ -309,14 +316,14 @@ ...@@ -309,14 +316,14 @@
} }
} }
else if (row.OrderType == 3) {//酒店 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' name = 'singleProductHotelOrder'
}else{ }else{
name = 'singleProductHotelOrderOP' name = 'singleProductHotelOrderOP'
} }
} }
else if (row.OrderType == 4) {//门票 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' name = 'SingleticketOrderList'
}else{ }else{
name = 'SingleticketOrderListOP' name = 'SingleticketOrderListOP'
...@@ -372,7 +379,7 @@ ...@@ -372,7 +379,7 @@
if(pageData&&pageData.length>0){ if(pageData&&pageData.length>0){
OrderType = pageData[0].OrderType OrderType = pageData[0].OrderType
} }
if(this.pagesTitle=='销售'||(this.S_CheckBranchOrder&&this.S_CheckAllOrder)){ if(this.pagesTitle=='销售'||(!this.S_CheckBranchOrder&&!this.S_CheckAllOrder)){
name = 'CharterOrderList' name = 'CharterOrderList'
}else{ }else{
name = 'CharterOrderListOP' name = 'CharterOrderListOP'
......
src/components/myOrdersAllType/components/allList.vue
View file @ 83a84f6e
...@@ -66,7 +66,7 @@ ...@@ -66,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>
...@@ -171,29 +171,30 @@ ...@@ -171,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"
...@@ -202,10 +203,13 @@ ...@@ -202,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"
...@@ -214,19 +218,18 @@ ...@@ -214,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()" />
...@@ -580,7 +583,7 @@ ...@@ -580,7 +583,7 @@
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()//订单状态
......
src/router/config.js
View file @ 83a84f6e
...@@ -3319,7 +3319,7 @@ export default { ...@@ -3319,7 +3319,7 @@ export default {
name: 'erpCustomerOrderDayOP', name: 'erpCustomerOrderDayOP',
component: resolve => require(['@/components/myOrdersAllType/erpCustomerOrderDayOP'], resolve), component: resolve => require(['@/components/myOrdersAllType/erpCustomerOrderDayOP'], resolve),
meta: { 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