Skip to content

S
SuperMan
Commit 48c0abf6 authored by youjie's avatar youjie
Browse files
Options

no message

parent 073611ae
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 534 additions and 763 deletions
src/components/scenicSpot/Singleticket/OrderPreview.vue
View file @ 48c0abf6
...@@ -428,6 +428,7 @@ ...@@ -428,6 +428,7 @@
<script> <script>
import TicketCard from './components/OrderDetails.vue' import TicketCard from './components/OrderDetails.vue'
export default { export default {
components: { TicketCard },
data() { data() {
return { return {
isCheck:true, isCheck:true,
...@@ -454,7 +455,7 @@ ...@@ -454,7 +455,7 @@
detailsObj: {}, detailsObj: {},
beforeCheck: { beforeCheck: {
disabledDate: time => { disabledDate: time => {
let endTime = new Date(this.getBeforeDate(-1,new Date().Format("yyyy-MM-dd"))); let endTime = new Date(this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")));
return time && endTime.getTime() >= time.getTime(); return time && endTime.getTime() >= time.getTime();
} }
}, },
...@@ -559,19 +560,17 @@ ...@@ -559,19 +560,17 @@
} }
}, },
getInfo(value){ getInfo(value){
console.log(value,'----')
let time let time
if(this.OpenTime!=this.msg.UseDate){ if(this.OpenTime!=this.msg.UseDate){
time = this.msg.UseDate time = this.msg.UseDate
}else{ }else{
time = this.OpenTime time = this.OpenTime
} }
console.log(time,'----222')
if(time){ if(time){
this.apipost( this.apipost(
"ticket_post_GetTicketCouponsInfo", "ticket_post_GetTicketCouponsInfo",
{ {
CouponsId: this.CouponsId, CouponsId: this.msg.CouponsId,
OpenTime: time, OpenTime: time,
}, },
res => { res => {
...@@ -631,12 +630,13 @@ ...@@ -631,12 +630,13 @@
}, },
mounted() { mounted() {
this.getInfo()
}, },
created() { created() {
this.msg.CouponsId = this.$route.query.id this.msg.CouponsId = this.$route.query.id
this.OpenTime = this.$route.query.OpenTime this.OpenTime = this.$route.query.OpenTime
this.msg.UseDate = this.$route.query.OpenTime this.msg.UseDate = this.$route.query.OpenTime
this.getInfo()
} }
}; };
......
src/components/scenicSpot/Singleticket/SingleticketList.vue
View file @ 48c0abf6
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
</el-image> </el-image>
</div> </div>
<div class="card-centent"> <div class="card-centent">
<h6 @click="showCardHandler(x)">{{x.Name}}}</h6> <h6 @click="showCardHandler(x)">{{x.Name}}</h6>
<p>地址: 日本 {{x.ProvinceName}} {{x.CityName}} {{x.Address}}</p> <p>地址: 日本 {{x.ProvinceName}} {{x.CityName}} {{x.Address}}</p>
<div class="card-text"> <div class="card-text">
<b>共{{x.TicketPriceList.length}}种票型</b> <b>共{{x.TicketPriceList.length}}种票型</b>
......
src/components/scenicSpot/Singleticket/components/OrderDetails.vue
View file @ 48c0abf6
...@@ -126,7 +126,9 @@ ...@@ -126,7 +126,9 @@
watch: { watch: {
ticket: { ticket: {
handler: function (val, oldVal) { handler: function (val, oldVal) {
this.t = JSON.parse(JSON.stringify(this.ticket))
this.images = this.t.PicPathList
this.initMap(this.t.Lng,this.t.Lat,this.t.Name)
}, },
deep: true deep: true
}, },
......
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ 48c0abf6
...@@ -43,25 +43,39 @@ ...@@ -43,25 +43,39 @@
</li> </li>
<li> <li>
<span><em>{{$t('OrderList.search.orderNum')}}</em> <span><em>{{$t('OrderList.search.orderNum')}}</em>
<el-input type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w200"/> <el-input clearable type="Number" v-model="msg.OrderNo" :placeholder="$t('OrderList.search.orderNum')" class="w200"/>
</span> </span>
</li> </li>
<li> <li>
<span><em>订单ID</em> <span><em>订单ID</em>
<el-input type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w200"/> <el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w200"/>
</span> </span>
</li> </li>
<li> <li>
<span><em>客人名称</em>
<el-input clearable v-model="msg.Name" placeholder="客人名称" class="w200"/>
</span>
</li>
<li>
<span><em>景区名称</em>
<el-input clearable v-model="msg.CouponsName" placeholder="景区名称" class="w200"/>
</span>
</li>
<li>
<span><em>电话</em>
<el-input clearable v-model="msg.ContactNumber" placeholder="电话" class="w200"/>
</span>
</li>
<!-- <li>
<span> <span>
<em>{{$t('hotel.hotel')}}</em> <em>{{$t('hotel.hotel')}}</em>
<!-- multiple_input w300 multiple collapse-tags-->
<el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" style="height: 34px;" <el-select v-model="msg.HotelId" :placeholder="$t('pub.pleaseSel')" style="height: 34px;"
filterable> filterable>
<el-option :key="0" :value="0" :label="$t('OrderList.search.allHotel')"></el-option> <el-option :key="0" :value="0" :label="$t('OrderList.search.allHotel')"></el-option>
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li> -->
<li> <li>
<span> <span>
<em>{{$t('OrderList.search.daterange')}}</em> <em>{{$t('OrderList.search.daterange')}}</em>
...@@ -76,32 +90,31 @@ ...@@ -76,32 +90,31 @@
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
<!-- <li>
<span><em>{{$t('OrderList.search.orderId')}}</em>
<el-input type="Number" v-model="msg.orderId" :placeholder="$t('OrderList.search.orderId')" class="w200"/>
</span>
</li> -->
<li> <li>
<span> <span>
<em>{{$t('OrderList.search.roomType')}}</em> <em>门票时间</em>
<el-select v-model="msg.RoomType" :placeholder="$t('OrderList.rooms.roomType')" class="w110 HworkInput"> <el-date-picker
<el-option :key="0" :value="0" :label="$t('OrderList.rooms.default')"></el-option> style="height: 34px;"
<el-option v-for="item in roomType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> value-format="yyyy-MM-dd"
</el-select> v-model="DatelistUse"
type="daterange"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDates">
</el-date-picker>
</span> </span>
</li> </li>
<!-- <li> <li>
<span> <span>
<em>{{$t('OrderList.search.orderType')}}</em> <em>取券方式</em>
<el-select v-model="msg.orderType" :placeholder="$t('OrderList.search.orderType')" class="w110 HworkInput"> <el-select v-model="msg.MailingState" placeholder="取券方式" class="w110 HworkInput">
<el-option :key="0" :value="0" :label="$t('OrderList.orderType.default')"></el-option> <el-option :key="-1" :value="-1" label="所有类型"></el-option>
<el-option v-for="item in orderType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in MailingStateType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
</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="msg.pageIndex=1,currentPage=1,GetList()" />
<!-- <input type="button" class="normalBtn" :value="$t('adm.adm_download')" @click="DownLoadHotelWork()" /> -->
</li> </li>
</ul> </ul>
</div> </div>
...@@ -132,15 +145,17 @@ ...@@ -132,15 +145,17 @@
msg:{ msg:{
pageIndex: 1, pageIndex: 1,
pageSize: 5, pageSize: 5,
HotelId: 0, Name: '',
RoomType: 0,
StartTime: '',//new Date().Format("yyyy-MM-dd") StartTime: '',//new Date().Format("yyyy-MM-dd")
EndTime: '',//this.setEdate() EndTime: '',//this.setEdate()
UseSTime: '',
UseETime: '',
OrderStatus: 0, OrderStatus: 0,
OrderNo: '', OrderNo: '',
OrderId: '' OrderId: '',
// RoomType: 0, MailingState: -1,
// orderType: 0 CouponsName: '',//景区名称
ContactNumber: '',//电话
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
...@@ -150,18 +165,16 @@ ...@@ -150,18 +165,16 @@
{Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'}, {Name: this.$t('OrderList.orderStatus.cancel'),ID:'3'},
{Name: this.$t('OrderList.orderStatus.sun'),ID:'4'}, {Name: this.$t('OrderList.orderStatus.sun'),ID:'4'},
], ],
roomType:[ MailingStateType:[
{Name: this.$t('OrderList.rooms.normal'),ID:'1'}, {Name: '自行取票',ID:'1'},
{Name: this.$t('OrderList.rooms.big'),ID:'2'}, {Name: '邮寄票券',ID:'2'},
{Name: this.$t('OrderList.rooms.sing'),ID:'3'},
{Name: this.$t('OrderList.rooms.three'),ID:'4'},
{Name: this.$t('OrderList.rooms.driver'),ID:'5'},
], ],
orderType:[ orderType:[
{Name: this.$t('OrderList.orderType.tour'),ID:'1'}, {Name: this.$t('OrderList.orderType.tour'),ID:'1'},
{Name: this.$t('OrderList.orderType.guest'),ID:'2'}, {Name: this.$t('OrderList.orderType.guest'),ID:'2'},
], ],
Datelist:'' Datelist:'',
DatelistUse:'',
}; };
}, },
watch: { watch: {
...@@ -170,6 +183,14 @@ ...@@ -170,6 +183,14 @@
} }
}, },
methods: { methods: {
getDatesUse(){
console.log(this.Datelist)
if(this.DatelistUse[0]){
this.msg.UseSTime = this.DatelistUse[0]
}if(this.DatelistUse[1]){
this.msg.UseETime = this.DatelistUse[1]
}
},
getDates(){ getDates(){
console.log(this.Datelist) console.log(this.Datelist)
if(this.Datelist[0]){ if(this.Datelist[0]){
...@@ -224,58 +245,26 @@ ...@@ -224,58 +245,26 @@
}, },
//获取酒店订单列表 //获取酒店订单列表
GetList() { GetList() {
// if(this.msg.StartTime==''){
// this.msg.StartTime = this.getyMDOne()
// }
// if(this.msg.EndTime==''){
// this.msg.EndTime = this.getyMDTwo()
// }
this.loading = true this.loading = true
let url let url
// 销售 OP // 销售 OP
if(this.pagesTitle=='销售'){ if(this.pagesTitle=='销售'){
url = "dict_post_GetMySaleCustomerOrderPageList" url = "ticket_post_GetMySaleTicketOrderPageList"
}else{ }else{
url = "dict_post_GetAdminCustomerOrderPageList" url = "ticket_post_GetAdminTicketOrderPageList"
} }
this.apipost(url, this.msg, this.apipost(url, this.msg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
let data = res.data.data.pageData let data = res.data.data.pageData
let addList = function(arr){ data.forEach((x) => {
arr.forEach(x=>{ x.Money = 0
x.list = [] x.DetailList.forEach((y)=>{
// x.Tax = 0 x.Money+=y.Money
// x.Tax2 = 0
})
}
addList(data)
data.forEach(item => {
item.DetailList.forEach(x=>{
x.Number = 0
x.PeopleNumber = 0
x.RoomList.forEach(r=>{
x.Number+=r.Number
x.PeopleNumber+=r.PeopleNumber
})
x.Tax = x.TaxesPrice*x.Number
x.Tax2 = x.PriceInTangTax*x.PeopleNumber
x.Money = x.HotelMoeny+x.TaxesPrice
}) })
}) })
this.OrderList = data; this.OrderList = data;
this.OrderList.forEach(item=>{
let datas = {
Income: item.Income,
CostMoney: item.CostMoney,
PlatformTax: item.PlatformTax,
Refund: item.Refund,
HandFittingIncome: item.HandFittingIncome,
HandFittingTax: item.HandFittingTax
}
item.list.push(datas)
})
this.total = res.data.data.count; this.total = res.data.data.count;
}else { }else {
this.Error(res.data.message); this.Error(res.data.message);
......
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