Skip to content

S
SuperMan
Commit 2cf143bf authored by youjie's avatar youjie
Browse files
Options

no message

parent e7d3ca71
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2568 additions and 40 deletions
src/components/Hotel/reservation/HotelOrderList.vue
View file @ 2cf143bf
......@@ -106,7 +106,7 @@
</ul>
</div>
<template>
<OrderList :OrderList="OrderList" v-loading="loading" @success="GetList"> </OrderList>
<OrderList :pagesTitle="pagesTitle" :OrderList="OrderList" v-loading="loading" @success="GetList"> </OrderList>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
......@@ -116,6 +116,7 @@
<script>
import OrderList from './OrderList.vue';
export default {
props:['pagesTitle'],
components: { OrderList },
data() {
return {
......@@ -163,7 +164,11 @@
Datelist:''
};
},
watch: {
pagesTitle(val,oldval){
}
},
methods: {
getDates(){
console.log(this.Datelist)
......@@ -226,8 +231,14 @@
// this.msg.EndTime = this.getyMDTwo()
// }
this.loading = true
this.apipost(
"dict_post_GetAdminCustomerOrderPageList", this.msg,
let url
// 销售 OP
if(this.pagesTitle){
url = "dict_post_GetMySaleCustomerOrderPageList"
}else{
url = "dict_post_GetAdminCustomerOrderPageList"
}
this.apipost(url, this.msg,
res => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
......
src/components/Hotel/reservation/OrderList.vue
View file @ 2cf143bf
......@@ -349,8 +349,8 @@
<span class="mr">
{{ item.SaleName }}
</span>
<span class="mr">创建人：</span>
<span class="mr"
<span class="mr" v-if="!pagesTitle&&item.CustomerName">创建人：</span>
<span class="mr" v-if="!pagesTitle&&item.CustomerName"
>{{ item.CustomerName }} ({{ item.CustomerContact }}/{{
item.CustomerTel
}})</span
......@@ -523,16 +523,17 @@
</el-table-column>
</el-table>
<div class="row justify-sb mt mb20" v-if="item.OrderStatus!=3">
<div class="row pt20" v-if="item.GuestFileList.length > 0">
<div class="row pt20" style="margin-right: 10px;" v-if="item.GuestFileList.length > 0||((item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle)">
<!-- <i class="el-icon-warning cF57A98 fz15 mr"></i> -->
<div class="column">
<!-- <div class="wrap fz12 c9e">
<!-- <div class="wrap fz12 c9e" v-if="x.CustomerPayType == 2 || x.CustomerPayType == 3">
出发前收款酒店，请您于
<span class="cff9800">{{item.PaymentDate}}</span>
前支付定金，并且于
<span class="cF1416C">{{item.FinalPaymentDate}}</span>
日前支付尾款
</div> -->
<template v-if="item.GuestFileList.length > 0">
<div class="wrap fz12 c9e">
旅客名单
</div>
......@@ -551,15 +552,22 @@
<!-- <div class="cursor-pointer see c04C8C8">查看支付方式</div>
<div class="cursor-pointer ml rec cf">提交付费凭证</div> -->
</div>
<!-- <template v-if="item.CustomerPayType==1 || item.CustomerPayType==3">
</template>
<template v-if="(item.CustomerPayType==1 || item.CustomerPayType==3)&&pagesTitle">
<div class="fz12 mt c9e">
到店自付酒店，需要您于
<span class="cff9800">{{item.UploadGuestDate}}</span>
</div>
<div class="row fz12 see-rec mt">
<div class="cursor-pointer seeLK c059FF6">上车旅客名单</div>
<el-upload ref="my-upload" :http-request="uploadFileBtn" v-loading="loading"
:multiple="true"
:show-file-list="false" action="">
<div :class="{'cursor-pointer seeLK c059FF6':!loading,
'cursor-pointer see c04C8C8':loading}"
@click="uploadOrderId=item.OrderId">上车旅客名单</div>
</el-upload>
</div>
</template> -->
</template>
</div>
</div>
<div class="column px15 bgf5 radius5 flex-g pa relative">
......@@ -628,7 +636,7 @@
</span>
</div>
<el-tooltip
v-if="item.OrderStatus == 2"
v-if="item.OrderStatus == 2&&pagesTitle!='销售'"
class="item"
effect="dark"
content="制单"
......@@ -657,7 +665,7 @@
</span>
</div>
<el-tooltip
v-if="item.OrderStatus == 2"
v-if="item.OrderStatus == 2&&pagesTitle!='销售'"
class="item"
effect="dark"
content="制单"
......@@ -680,7 +688,7 @@
</div>
<div
class="row-c justify-sb borderD py5"
v-if="item.CustomerPayType == 1 || item.CustomerPayType == 3"
v-if="(item.CustomerPayType == 1 || item.CustomerPayType == 3)&&!pagesTitle"
>
<span class="fz12 c9e">到店自付</span>
<div class="ml">
......@@ -720,7 +728,7 @@
<span class="cF1416C">取消订单</span>
</div>
<div
v-if="item.OrderStatus == 1"
v-if="item.OrderStatus == 1&&pagesTitle!='销售'"
class="row-c cursor-pointer radius5 confirm py5"
@click="clickRightButtom(item, 1)"
>
......@@ -734,6 +742,13 @@
>
<span class="c059FF6">明细/编辑</span>
</div>
<div
v-if="item.OrderStatus == 1&&pagesTitle"
class="row-c cursor-pointer radius5 change py5"
@click="goRoomDetails(item, '酒店预定变更')"
>
<span class="c059FF6">订单变更</span>
</div>
<div
v-if="item.OrderStatus == 2"
class="row-c cursor-pointer radius5 change1 py5"
......@@ -848,7 +863,7 @@
</template>
<script>
export default {
props: ["OrderList"],
props: ["OrderList","pagesTitle"],
data() {
return {
copyId: 0,
......@@ -880,11 +895,57 @@ export default {
},
cancelOrderDialog: false,
cancelRemark: "",
cancelOrderId:0
cancelOrderId:0,
uploadOrderId: 0,
loading: false,
fileList:[],
GuestFile: ''
};
},
watch: {
pagesTitle(val,oldval){
},
},
methods: {
uploadFileBtn(file){
let ft = file.file.name.substring(file.file.name.lastIndexOf('.') + 1, file.file.name.length).toUpperCase();
let typeOk = false;
let FileName = file.file.name.substring(0,file.file.name.lastIndexOf("."))
let newArr = [];
newArr.push(file.file)
let path = "/Upload/Temporary/"
this.$message.info(this.$t('tips.shangchuanzhong'))
this.UploadSelfFileT(path, newArr, x => {
this.GuestFile = this.domainManager().ViittoFileUrl + x.data.FilePath
this.uploadHandleChange()
}, 1);
},
// 上传旅客名单
uploadHandleChange(){
let msg = {
OrderId: this.uploadOrderId,
GuestFileList: [this.GuestFile]
}
this.loading = true
this.apipost(
"dict_post_SetSaleOrderGuestFile",msg,
res => {
if (res.data.resultCode == 1) {
this.loading = false;
this.Success(res.data.message);
this.uploadOrderId=0
this.GuestFile=''
this.$emit("success");
} else {
this.Error(res.data.message);
}
},
err => {
this.loading = false;
}
);
},
// 单据详情
openDetails(item) {
let query = {
......@@ -925,19 +986,31 @@ export default {
},
// 订单明细
goRoomDetails(obj, title) {
var path = "roomReservationsDetails";
if (this.userInfo.RB_Group_id == 91) {
path = "roomReservationsDetails_swt";
}
this.$router.push({
name: path,
query: {
id: obj.OrderId,
OrderType: 1,
blank: "y",
tab: title
var path
if(title==='订房详情'){
path = "roomReservationsDetails";
if (this.userInfo.RB_Group_id == 91) {
path = "roomReservationsDetails_swt";
}
});
this.$router.push({
name: path,
query: {
id: obj.OrderId,
OrderType: 1,
blank: "y",
tab: title
}
});
}else{//变更酒店预定
path = "singleProductModifyHotelOrder";
this.$router.push({
name: path,
query: {
id: obj.OrderId,
tab: title
}
});
}
},
clickRightButtom(item, type) {
// 0取消订单 1确认订单
......
src/components/Hotel/singleProduct/HotelList.vue
View file @ 2cf143bf
......@@ -470,7 +470,7 @@
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 180 - 50;
var h = contentsHeight - 50 - 180 - 100;
if (h < 110) {
return;
}
......@@ -704,7 +704,6 @@
newCars.push(item)
}
})
if(!states){
this.HotelLength = newCars.length
localStorage.removeItem("cars")
......
src/components/Hotel/singleProduct/HotelOrder.vue 0 → 100644
View file @ 2cf143bf
<style>
</style>
<template>
<div>
<HotelOrderList :pagesTitle="pagesTitle"></HotelOrderList>
</div>
</template>
<script>
import HotelOrderList from '../reservation/HotelOrderList.vue';
export default {
components: { HotelOrderList },
data() {
return {
pagesTitle:'销售',
};
},
methods: {
},
mounted() {
},
};
</script>
<style>
</style>
src/components/Hotel/singleProduct/HotelOrderOP.vue 0 → 100644
View file @ 2cf143bf
<style>
.HotelWorkList .has-gutter tr th,
.el-table th.is-leaf {
background-color: #EAEAEA !important;
}
.HotelWorkList .HW_hotelDialog {
width: 900px;
}
.HotelWorkList .Hw_tableOne {
width: 100%;
height: 40px;
background-color: #EAEAEA;
}
.HotelWorkList .Hw_tableOne th {
text-align: center;
}
.HotelWorkList .HotelWorkInput .el-input {
width: 223px;
}
.HotelWorkList .HworkInput .el-input {
width: 110px;
}
</style>
<template>
<div>
<HotelOrderList :pagesTitle="pagesTitle"></HotelOrderList>
</div>
</template>
<script>
import HotelOrderList from '../reservation/HotelOrderList.vue';
export default {
components: { HotelOrderList },
data() {
return {
pagesTitle:'OP',
};
},
methods: {
//获取酒店订单列表
GetList() {
// if(this.msg.StartTime==''){
// this.msg.StartTime = this.getyMDOne()
// }
// if(this.msg.EndTime==''){
// this.msg.EndTime = this.getyMDTwo()
// }
this.loading = true
this.apipost(
"dict_post_GetMySaleCustomerOrderPageList", this.msg,
res => {
this.loading = false
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
let addList = function(arr){
arr.forEach(x=>{
x.list = []
// x.Tax = 0
// 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.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;
}else {
this.Error(res.data.message);
}
},
err => {this.loading = false}
);
},
},
mounted() {
},
};
</script>
<style>
</style>
src/components/Hotel/singleProduct/ModifyHotelOrder.vue 0 → 100644
View file @ 2cf143bf
This diff is collapsed.
src/components/Hotel/singleProduct/components/ChosenHotel.vue 0 → 100644
View file @ 2cf143bf
This diff is collapsed.
src/components/Hotel/singleProduct/components/OrderList.vue 0 → 100644
View file @ 2cf143bf
This diff is collapsed.
src/components/SalesModule/MyCustomer.vue
View file @ 2cf143bf
......@@ -1011,13 +1011,14 @@
// this.$message.error('请输入LINE ID')
// return
// }
if(this.updateMsg.email){
var reg=/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
if(!reg.test(this.updateMsg.email)){
this.$message.error('请输入有效的邮箱')
return
}
}
// if(this.updateMsg.email){
// var reg=/^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
// if(!reg.test(this.updateMsg.email)){
// this.$message.error('请输入有效的邮箱')
// return
// }
// }
if (this.updateMsg.District == '') {
this.updateMsg.District = 0
}
......
src/router/config.js
View file @ 2cf143bf
......@@ -963,7 +963,7 @@ export default {
name: 'HotelOrderList',
component: resolve => require(['@/components/Hotel/reservation/HotelOrderList'], resolve),
meta: {
title: '预定订单'
title: '酒店预定订单'
},
},
{
......@@ -974,6 +974,30 @@ export default {
title: '酒店检索'
},
},
{
path: '/singleProductHotelOrder', //销售酒店预定订单
name: 'singleProductHotelOrder',
component: resolve => require(['@/components/Hotel/singleProduct/HotelOrder'], resolve),
meta: {
title: '酒店预定订单'
},
},
{
path: '/singleProductHotelOrderOP', //操作酒店预定订单
name: 'singleProductHotelOrderOP',
component: resolve => require(['@/components/Hotel/singleProduct/HotelOrderOP'], resolve),
meta: {
title: '酒店预定订单'
},
},
{
path: '/singleProductModifyHotelOrder', //酒店预定订单变更
name: 'singleProductModifyHotelOrder',
component: resolve => require(['@/components/Hotel/singleProduct/ModifyHotelOrder'], resolve),
meta: {
title: '酒店预定变更'
},
},
{
path: '/RestauranOrder', //餐厅订单信息
name: 'RestauranOrder',
......
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