Skip to content

S
SuperMan
Commit 74cf6764 authored by youjie's avatar youjie
Browse files
Options

优化门票、包车

parent a3231216
Show whitespace changes
Inline Side-by-side
Showing with 207 additions and 64 deletions
src/components/Hotel/reservation/OrderList.vue
View file @ 74cf6764
...@@ -576,7 +576,7 @@ ...@@ -576,7 +576,7 @@
</template> </template>
</div> </div>
</div> </div>
<div class="column px15 bgf5 radius5 flex-g pa relative"> <div class="column px15 bgf5 radius5 flex-g pa relative" style="min-width: 300px;">
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
...@@ -604,7 +604,7 @@ ...@@ -604,7 +604,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
...@@ -632,7 +632,7 @@ ...@@ -632,7 +632,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
...@@ -660,7 +660,7 @@ ...@@ -660,7 +660,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">手配费单据</div> <div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span <span
......
src/components/Hotel/singleProduct/components/OrderList.vue
View file @ 74cf6764
...@@ -562,7 +562,7 @@ ...@@ -562,7 +562,7 @@
</template> --> </template> -->
</div> </div>
</div> </div>
<div class="column px15 bgf5 radius5 flex-g pa relative"> <div class="column px15 bgf5 radius5 flex-g pa relative" style="min-width: 300px;">
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span <span
...@@ -588,7 +588,7 @@ ...@@ -588,7 +588,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span <span
...@@ -614,7 +614,7 @@ ...@@ -614,7 +614,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span <span
...@@ -640,7 +640,7 @@ ...@@ -640,7 +640,7 @@
></i> ></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">手配费单据</div> <div class="fz12">手配费单据</div>
<div class="row wrap orderNo fz12 py c3FC4FF"> <div class="row wrap orderNo fz12 py c3FC4FF">
<span <span
......
src/components/busManagement/CharteringManagement/CharteringPackagePrice.vue
View file @ 74cf6764
...@@ -661,7 +661,8 @@ export default { ...@@ -661,7 +661,8 @@ export default {
}, },
addPickerBeginDateAfter: { addPickerBeginDateAfter: {
disabledDate: time => { disabledDate: time => {
let startTime = new Date(this.addMsg.StartDate); // let startTime = new Date(this.addMsg.StartDate);
let startTime = new Date(this.getBeforeDate(1,new Date(this.addMsg.StartDate).Format("yyyy-MM-dd")));
return startTime.getTime() >= time.getTime(); return startTime.getTime() >= time.getTime();
} }
}, },
......
src/components/scenicSpot/Singleticket/OrderPreview.vue
View file @ 74cf6764
...@@ -336,9 +336,9 @@ ...@@ -336,9 +336,9 @@
<!-- <p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p> --> <!-- <p>自行前往指定位置取票，當您完成付款後我們將通過郵件通知您取票的門票訊息</p> -->
<p>自取地址：{{SelffetchAddress}}</p> <p>自取地址：{{SelffetchAddress}}</p>
</div> </div>
<div class="flexOne-infor-box" v-if="msg.MailingState!=4"> <div class="flexOne-infor-box">
<b> {{msg.MailingState==1?'客人讯息':'邮寄讯息'}}</b> <b> {{msg.MailingState==1?'客人讯息':'邮寄讯息'}}</b>
<el-form label-width="80px" :model="msg" :rules="rules" ref="msg"> <el-form v-if="msg.MailingState!=4" label-width="80px" :model="msg" :rules="rules" ref="msg">
<div class="infor-list"> <div class="infor-list">
<!-- <div class="list-title"> <!-- <div class="list-title">
<li>中文姓名</li> <li>中文姓名</li>
......
src/components/scenicSpot/reservation/OrderList.vue
View file @ 74cf6764
...@@ -681,7 +681,7 @@ ...@@ -681,7 +681,7 @@
</template> </template>
</div> </div>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">收款单据</div> <div class="fz12">收款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" <span class="cursor-pointer radius5 mr px5"
...@@ -697,7 +697,7 @@ ...@@ -697,7 +697,7 @@
@click="makeAdocument(item, index, 1)"></i> @click="makeAdocument(item, index, 1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">退款单据</div> <div class="fz12">退款单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" <span class="cursor-pointer radius5 mr px5"
...@@ -713,7 +713,7 @@ ...@@ -713,7 +713,7 @@
@click="makeAdocument(item, index, 2)"></i> @click="makeAdocument(item, index, 2)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative"> <div class="column px15 bgf5 radius5 ml flex-g pa relative" style="min-width: 300px;">
<div class="fz12">成本单据</div> <div class="fz12">成本单据</div>
<div class="row wrap orderNo fz12 py"> <div class="row wrap orderNo fz12 py">
<span class="cursor-pointer radius5 mr px5" <span class="cursor-pointer radius5 mr px5"
......
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ 74cf6764
<style> <style scoped>
.groupTourOrderByTuan_ico{ .listone-box {
margin-left: 5px; display: flex;
flex-direction: column;
} }
.groupTourOrderByTuan_ico>i{
display: inline-block;
margin: 0 5px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
.HotelWorkList .has-gutter tr th,
.el-table th.is-leaf {
background-color: #EAEAEA !important;
}
.HotelWorkList .HW_hotelDialog { .listone-box,
width: 900px; .listtwo-card {
} margin-top: 15px;
}
.HotelWorkList .Hw_tableOne { .listone-form {
width: 100%; padding: 10px;
height: 40px; border-radius: 5px;
background-color: #EAEAEA; background: #ffffff;
} display: flex;
flex-direction: row;
justify-content: space-between;
margin-bottom: 10px;
overflow: hidden;
}
.HotelWorkList .Hw_tableOne th { .listone-img {
text-align: center; width: 130px;
} flex-shrink: 0;
margin-right: 15px;
border-radius: 5px;
display: block;
}
.HotelWorkList .HotelWorkInput .el-input { .listone-list {
width: 223px; flex-grow: 1;
} display: flex;
justify-content: space-between;
}
.card-centent h6 {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
.list-left h6,
.card-centent h6 {
font-size: 16px;
margin-bottom: 5px;
cursor: pointer;
}
.HotelWorkList .HworkInput .el-input { .list-left div {
width: 110px; color: #7E8299;
} font-size: 13px;
</style> margin-top: 7px;
}
.list-left div a {
color: #009EF7;
font-size: 12px;
margin-left: 15px;
cursor: pointer;
}
.list-right {
flex-shrink: 1;
margin-left: 15px;
}
.list-right p {
margin-bottom: 10px;
}
.list-right p b {
font-size: 18px;
color: #F1416C;
}
.list-right p span {
color: #8A8C9F;
font-size: 12px;
margin-left: 10px;
}
.listtwo-form {
height: 100%;
display: flex;
flex-direction: column;
padding: 10px;
background: #ffffff;
border-radius: 5px;
}
.card-centent {
padding: 10px;
}
.card-centent p {
color: #7E8299;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
font-size: 13px;
}
.card-text {
margin-top: 20px;
display: flex;
justify-content: space-between;
align-items: inherit;
}
.card-text b {
font-size: 14px;
}
.card-form {
display: flex;
align-items: inherit;
flex-wrap: wrap;
}
.listtwo-col {
margin-bottom: 15px;
}
.listtwo-img {
height: 200px;
border-radius: 5px;
display: block;
}
.iconfont {
cursor: pointer;
background-color: #E95252;
color: white;
width: 30px;
height: 30px;
display: inline-block;
text-align: center;
line-height: 30px;
border-radius: 50%;
margin-left: 10px;
}
.image-slot {
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}
</style>
<template> <template>
<div class="HotelWorkList"> <div class="flexOne domesticScenic">
<div class="query-box HotelWorkInput" style="border-bottom: none;"> <div class="query-box" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<span> <span>
<em>{{ $t('OrderList.search.status') }}</em> <em>{{ $t('OrderList.search.status') }}</em>
<el-select v-model="msg.OrderStatus" class="w110 HworkInput"> <el-select v-model="msg.OrderStatus">
<el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option> <el-option :key="0" :value="0" :label="$t('OrderList.orderStatus.normal')"></el-option>
<el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option> <el-option v-for="item in OrderStatusType" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> </el-select>
...@@ -53,34 +162,46 @@ ...@@ -53,34 +162,46 @@
</li> </li>
<li> <li>
<span><em>{{ $t('OrderList.search.orderNum') }}</em> <span><em>{{ $t('OrderList.search.orderNum') }}</em>
<el-input class="w110 HworkInput" clearable type="Number" v-model="msg.OrderNo" <el-input clearable type="Number" v-model="msg.OrderNo"
:placeholder="$t('OrderList.search.orderNum')" /> :placeholder="$t('OrderList.search.orderNum')" />
</span> </span>
</li> </li>
<li> <li>
<span><em>订单ID</em> <span><em>订单ID</em>
<el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" class="w110 HworkInput" /> <el-input clearable type="Number" v-model="msg.OrderId" placeholder="订单ID" />
</span> </span>
</li> </li>
<li> <li>
<span><em>客人名称</em> <span><em>客人名称</em>
<el-input clearable v-model="msg.Name" placeholder="客人名称" class="w110 HworkInput" /> <el-input clearable v-model="msg.Name" placeholder="客人名称" />
</span>
</li>
<li v-if="pagesTitle!='销售'">
<span><em>业务员</em>
<el-select filterable v-model='msg.EnterID'>
<el-option :value="0" label="不限"></el-option>
<el-option v-for='item in EmployeeList'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'>
</el-option>
</el-select>
</span> </span>
</li> </li>
<li> <li>
<span><em>景区名称</em> <span><em>景区名称</em>
<el-input clearable v-model="msg.CouponsName" placeholder="景区名称" class="w110 HworkInput" /> <el-input clearable v-model="msg.CouponsName" placeholder="景区名称"/>
</span> </span>
</li> </li>
<li> <li>
<span><em>电话</em> <span><em>电话</em>
<el-input clearable v-model="msg.ContactNumber" placeholder="电话" class="w110 HworkInput" /> <el-input clearable v-model="msg.ContactNumber" placeholder="电话"/>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>取券方式</em> <em>取券方式</em>
<el-select v-model="msg.MailingState" placeholder="取券方式" class="w110 HworkInput"> <el-select v-model="msg.MailingState" placeholder="取券方式">
<el-option :key="-1" :value="-1" label="所有类型"></el-option> <el-option :key="-1" :value="-1" label="所有类型"></el-option>
<el-option v-for="item in MailingStateType" :key="item.ID" :label="item.Name" <el-option v-for="item in MailingStateType" :key="item.ID" :label="item.Name"
:value="item.ID"></el-option> :value="item.ID"></el-option>
...@@ -100,7 +221,7 @@ ...@@ -100,7 +221,7 @@
<li> <li>
<span> <span>
<em>{{ $t('OrderList.search.daterange') }}</em> <em>{{ $t('OrderList.search.daterange') }}</em>
<el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="Datelist" type="daterange" <el-date-picker style="height: 34px;width: 212px;" value-format="yyyy-MM-dd" v-model="Datelist" type="daterange"
:range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')" :range-separator="$t('OrderList.zhi')" :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>
...@@ -109,7 +230,7 @@ ...@@ -109,7 +230,7 @@
<li> <li>
<span> <span>
<em>门票时间</em> <em>门票时间</em>
<el-date-picker style="height: 34px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange" <el-date-picker style="height: 34px;width: 212px;" value-format="yyyy-MM-dd" v-model="DatelistUse" type="daterange"
:range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')" :range-separator="$t('OrderList.zhi')" :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>
...@@ -166,6 +287,8 @@ export default { ...@@ -166,6 +287,8 @@ export default {
MailingState: -1, MailingState: -1,
CouponsName: '',//景区名称 CouponsName: '',//景区名称
ContactNumber: '',//电话 ContactNumber: '',//电话
IsSelectSale: 1,
EnterID: 0
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
...@@ -186,6 +309,14 @@ export default { ...@@ -186,6 +309,14 @@ export default {
], ],
Datelist: '', Datelist: '',
DatelistUse: '', DatelistUse: '',
EmployeeList:[],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
}; };
}, },
watch: { watch: {
...@@ -194,6 +325,15 @@ export default { ...@@ -194,6 +325,15 @@ export default {
} }
}, },
methods: { methods: {
getEmployee() { //员工
let userInfo=this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id;
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) {
this.EmployeeList = res.data.data;
}
}, err => {})
},
getDatesUse() { getDatesUse() {
if(this.DatelistUse){ if(this.DatelistUse){
if (this.DatelistUse[0]) { if (this.DatelistUse[0]) {
...@@ -333,6 +473,7 @@ export default { ...@@ -333,6 +473,7 @@ export default {
mounted() { mounted() {
this.Datelist = this.getyMDOne() this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.getEmployee()
this.GetList(); this.GetList();
this.initHotels();//酒店名称下拉 this.initHotels();//酒店名称下拉
......
src/components/scenicSpot/scenicSpotPackagePrice.vue
View file @ 74cf6764
...@@ -661,7 +661,8 @@ export default { ...@@ -661,7 +661,8 @@ export default {
}, },
addPickerBeginDateAfter: { addPickerBeginDateAfter: {
disabledDate: time => { disabledDate: time => {
let startTime = new Date(this.addMsg.StartDate); // let startTime = new Date(this.addMsg.StartDate);
let startTime = new Date(this.getBeforeDate(1,new Date(this.addMsg.StartDate).Format("yyyy-MM-dd")));
return startTime.getTime() >= time.getTime(); return startTime.getTime() >= time.getTime();
} }
} }
......
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