Skip to content

S
SuperMan
Commit 212ee17b authored by youjie's avatar youjie
Browse files
Options

no message

parent 7192a954
Show whitespace changes
Inline Side-by-side
Showing with 160 additions and 39 deletions
src/components/Hotel/reservation/HotelOrderList.vue
View file @ 212ee17b
......@@ -101,7 +101,7 @@
</ul>
</div>
<template>
<OrderList :OrderList="OrderList" v-loading="loading"> </OrderList>
<OrderList :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>
......@@ -125,7 +125,7 @@
tableHeight: 0,
msg:{
pageIndex: 1,
pageSize: 10,
pageSize: 5,
HotelId: 0,
RoomType: 0,
StartTime: '',//new Date().Format("yyyy-MM-dd")
......
src/components/Hotel/reservation/OrderList.vue
View file @ 212ee17b
<style scoped>
.row{display: flex;}.row-c{ display: flex; align-items:center;}
.column{ display: flex; flex-direction: column;}.wrap{flex-wrap:wrap;}
.column{ display: flex; flex-direction: column;}.column-ac{display:flex;flex-direction:column;align-items:center;}.wrap{flex-wrap:wrap;}
.justify-sb{justify-content: space-between;}.justify-c{ justify-content:space-between;}.justify-e{justify-content: flex-end;align-items: flex-end;}
.flex-g{ flex-grow: 1;}.flex-s{ flex-shrink: 0;}.cblack{color: black;}
.cf{ color: #ffffff;}.c9e{ color: #9e9e9e;}.c20C997{color: #20C997;}.c02C854{color: #02C854;}
.cff9800{ color: #ff9800;}.cF1416C{ color: #F1416C;}.cF57A98{ color: #F57A98;}
.c04C8C8{color: #04C8C8;}.c059FF6{ color: #059FF6;}.c3FC4FF{ color: #3FC4FF;}
.fz10{ font-size: 10px;}.fz11{ font-size: 11px;}.fz12{font-size: 12px;}.fz13{ font-size: 13px;}.fz14{ font-size: 14px;}.fz15{ font-size: 15px;}.fz16{ font-size: 16px;}.fz17{ font-size: 17px;}.fz18{ font-size: 18px;}.fbold{ font-weight: bold;}
.ml{ margin-left: 10px;}.mr{ margin-right: 10px;}.mt{margin-top: 10px;}.mt20{margin-top: 20px;}.mb{margin-bottom: 10px;}.mb20{margin-bottom: 20px;}.mx{margin-left: 10px;margin-right: 10px;}.mx5{margin-left: 5px;margin-right: 5px;}
.py{ padding: 15px 0;}.px5{ padding: 0 5px;}.px15{padding: 0 15px;}.py20{padding: 20px 0;}
.pa{padding: 10px 20px;}.pa20{padding: 20px;}.pt20px{padding: 20px 0;}
.ml{ margin-left: 10px;}.mr{ margin-right: 10px;}.mt{margin-top: 10px;}.mt20{margin-top: 20px;}.mb{margin-bottom: 10px;}.mb20{margin-bottom: 20px;}.mx{margin-left: 10px;margin-right: 10px;}.mx5{margin-left: 5px;margin-right: 5px;}.mb5{margin-bottom: 5px;}
.py{ padding: 15px 0;}.py5{padding: 5px 0;}.px5{ padding: 0 5px;}.px15{padding: 0 15px;}.py20{padding: 20px 0;}.pb5{padding: 0 0 5px 0;}
.pa{padding: 10px 20px;}.pa20{padding: 20px;}.pt20{padding: 20px 0;}
.borderD{border-bottom: 1px dashed #DDDDDD}
.bgf{background:#ffffff;}.bgf5{background:#F5F5F5;}.bgE8F5E9{background:#E8F5E9;}.bgD9F3FF{background:#D9F3FF;}.bgFAEAED{background: #FAEAED;}
.bgf{background:#ffffff;}.bgf5{background:#F5F5F5;}.bgE8F5E9{background:#E8F5E9;}.bgD9F3FF{background:#D9F3FF;}.bgFAEAED{background: #FAEAED;}.bj{background: #ffffff;}
.radius5{border-radius: 5px;}.cursor-pointer{cursor: pointer;}
.relative{position: relative;}.absolute{position: absolute;}.left0{left: 0;}.right0{right: 0;}.top0{top: 0;}.bottom0{bottom: 0;}
.left20{left: 020px;}.right20{right: 20px;}.top20{top: 20px;}.bottom20{bottom: 20px;}
......@@ -40,6 +40,9 @@
.see{
border: 1px solid #04C8C8;
}
.seeLK{
border: 1px solid #059FF6;
}
.see:hover{
background-color: rgba(4,200,200,.1);
}
......@@ -54,6 +57,9 @@
.cancel:hover{
background-color: #F3DCE2;
}
.confirm:hover{
background-color: #E8F5E9;
}
.change:hover{
background-color: #D7E9F3;
}
......@@ -79,7 +85,7 @@
<div class="row-c justify-sb align-c py">
<div class="row-c">
<div>
<div class="orderType cf fz13"
<div class="orderType cf fz12"
:class="{'active':item.OrderType==1}">
{{item.OrderType==1?'散拼订房':'团队订房'}}
</div>
......@@ -87,7 +93,8 @@
<div class="c9e fz12">
<span>订单编号：</span>
<span>{{item.OrderNo}}</span>
<span class="copy fz13 cblack cursor-pointer">复制</span>
<span class="copy cblack cursor-pointer" v-if="copyId != item.OrderId" @click="CopyHandler(item)">复制</span>
<span class="copy c059FF6 bgD9F3FF cursor-pointer" v-else><i class="el-icon-check mr"></i>已复制</span>
</div>
</div>
<div class="c9e fz12">
......@@ -102,7 +109,6 @@
<i v-else class="el-icon-alarm-clock mx5 c20C997"></i>
<span class="fz12 cblack" :class="{'c20C997':item.OrderStatus!=2}">
{{item.OrderStatusName}}
<!-- 待确认 -->
</span>
</div>
</div>
......@@ -114,24 +120,24 @@
{{scope.row.Date}}
</template>
</el-table-column>
<el-table-column label="酒店名称" min-width="150" style="background:#EAEAEA">
<el-table-column label="酒店名称" style="background:#EAEAEA">
<template slot-scope="scope">
{{scope.row.HotelName}}
</template>
</el-table-column>
<el-table-column min-width="300">
<el-table-column min-width="240">
<template slot="header" slot-scope="scope">
<span>入驻信息</span>
<el-tooltip class="item" effect="dark" content="按照入住人数*房型单价=房型总价小计（不含稅" placement="bottom">
<el-tooltip class="item" effect="dark" content="按照入住人数*房型单价=房型总价小计（不含稅）" placement="bottom">
<i class="el-icon-question c059FF6 cursor-pointer"></i>
</el-tooltip>
</template>
<template slot-scope="scope">
<div class="RoomList">
<div class="fz12 c9e" v-for="(x,i) in scope.row.RoomList">
<span>{{x.RoomTypeName}}：{{x.Number}} 人间</span>
<span class="ml">人数：{{x.PeopleNumber}} 人</span>
<span class="ml">单价：{{x.Unit_Price}}</span>
<span class="mr">{{x.RoomTypeName}}：{{x.Number}} 人间</span>
<span class="ml mr">人数：{{x.PeopleNumber}} 人</span>
<span class="ml mr">单价：{{x.Unit_Price}}</span>
<span class="ml">小计：{{x.Money}}</span>
</div>
</div>
......@@ -146,22 +152,22 @@
</template>
</template>
</el-table-column>
<el-table-column label="城市税" min-width="100">
<el-table-column label="城市税" min-width="60">
<template slot-scope="scope">
{{scope.row.Tax>0?scope.row.Tax.toFixed(2):'-'}}
</template>
</el-table-column>
<el-table-column label="入汤税" min-width="100" style="background:#EAEAEA">
<el-table-column label="入汤税" min-width="60" style="background:#EAEAEA">
<template slot-scope="scope">
{{scope.row.Tax2>0?scope.row.Tax2.toFixed(2):'-'}}
</template>
</el-table-column>
<el-table-column label="小计" min-width="100" style="background:#EAEAEA">
<el-table-column label="小计" min-width="70" style="background:#EAEAEA">
<template slot-scope="scope">
{{scope.row.Money.toFixed(2)}}
</template>
</el-table-column>
<el-table-column label="付款方式" min-width="100" style="background:#EAEAEA">
<el-table-column label="付款方式" min-width="80" style="background:#EAEAEA">
<template slot-scope="scope">
{{scope.row.CustomerPayType==1?'到店自付':'出发前付款'}}
</template>
......@@ -172,17 +178,26 @@
<div class="row pt20">
<i class="el-icon-warning cF57A98 fz15 mr"></i>
<div class="column w220">
<div class="wrap fz12">
<div class="wrap fz12 c9e">
出发前收款酒店，请您于
<span class="cff9800">{{item.PaymentDate}}</span>
前支付定金，并且于
<span class="cF1416C">{{item.FinalPaymentDate}}</span>
日前支付尾款
</div>
<div class="row fz10 see-rec mt">
<div class="cursor-pointer fz10 see c04C8C8">查看支付方式</div>
<div class="cursor-pointer fz10 ml rec cf">提交付费凭证</div>
<div class="row fz12 see-rec mt">
<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">
<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>
</div>
</template>
</div>
</div>
<div class="column px15 bgf5 radius5 ml flex-g pa relative">
......@@ -209,8 +224,8 @@
</div>
<i class="absolute right20 bottom20 el-icon-edit cursor-pointer c059FF6"></i>
</div>
<div class="column px15 bgf5 radius5 ml flex-g">
<div class="row-c justify-sb borderD py20">
<div class="column px15 bgf5 radius5 ml pa20">
<div class="row-c justify-sb borderD pb5">
<span class="fz12 c9e">订单总金额</span>
<div class="ml">
<span class="fz12 ml">¥</span>
......@@ -218,15 +233,15 @@
<span class="fz15">元</span>
</div>
</div>
<div class="row-c justify-sb py20" v-if="item.CustomerPayType==1 ||item.CustomerPayType==3">
<span class="fz12 c9e">出发前付款</span>
<div class="row-c justify-sb borderD py5" v-if="item.CustomerPayType==1 ||item.CustomerPayType==3">
<span class="fz12 c9e">到店自付</span>
<div class="ml">
<span class="fz10 ml">¥</span>
<span class="fz14">{{item.SelfPayMoney.toFixed(2)}}</span>
<span class="fz14">元</span>
</div>
</div>
<div class="row-c justify-sb py20" v-if="item.CustomerPayType==2 ||item.CustomerPayType==3">
<div class="row-c justify-sb py5" v-if="item.CustomerPayType==2 ||item.CustomerPayType==3">
<span class="fz12 c9e">出发前付款</span>
<div class="ml">
<span class="fz10 ml">¥</span>
......@@ -235,14 +250,32 @@
</div>
</div>
</div>
<div class="column justify-c px15 bgf5 radius5 ml fz12 orderop pa20 flex-s">
<div class="row-c cursor-pointer radius5 cancel">
<div v-if="item.OrderStatus==1" class="column justify-c px15 bgf5 radius5 ml fz12 orderop pa20 flex-s">
<div class="row-c cursor-pointer radius5 cancel" @click="clickRightButtom(item,0)">
<i v-loading="loading0"></i>
<span class="cF1416C">取消订单</span>
</div>
<div class="row-c cursor-pointer radius5 change">
<div class="row-c cursor-pointer radius5 confirm" @click="clickRightButtom(item,1)">
<i v-loading="loading1"></i>
<span class="c20C997">确认订单</span>
</div>
<div class="row-c cursor-pointer radius5 change" @click="clickRightButtom(item,2)">
<i v-loading="loading2"></i>
<span class="c059FF6">订单变更</span>
</div>
</div>
<div v-else class="column-ac px15 bgE8F5E9 radius5 ml fz12 pa20 flex-s c20C997">
<div class="mb5">已支付</div>
<div>
<span class="fbold fz14">0.00</span>
<span>元</span>
</div>
<div class="orderop">
<div class="row-c cursor-pointer radius5 change mt mb" @click="goRoomDetails(item,'订房详情')">
<span class="c059FF6">明细</span>
</div>
</div>
</div>
......@@ -258,11 +291,84 @@
props:['OrderList'],
data() {
return {
copyId:0,
loading0:false,
loading1:false,
loading2:false,
userInfo:{}
};
},
methods: {
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,
// 'TCNUM': obj.TCNUMS,
// 'flightTotal': obj.TotalSeat,
// 'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
// 'NewCombinationNum': outItem.NewCombinationNum,
// 'LeaderName': obj.LeaderName,
// 'GuideName': obj.GuideName,
'OrderType': 1,
blank: 'y',
tab: title
}
})
},
clickRightButtom(item,type){
if(type==0){
}else if(type==1){
if(!this.loading1){
this.confirmFun(item)
}
}else if(type==2){
if(!this.loading2){
}
}
},
confirmFun(item){
this.$confirm("是否确认订单?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.loading1 = true
this.apipost(
"dict_post_ConfirmAdminCustomerOrder", {
OrderId: item.OrderId
},
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.$emit('success')
}else {
this.Error(res.data.message);
}
this.loading1 = false
},
err => {this.loading1 = false}
);
})
.catch(() => {
this.$message.info("已取消！");
});
},
//复制信息
CopyHandler(item) {
this.copyId = item.OrderId
setTimeout(() => {
this.copyId = 0
}, 2000)
},
setEdate() {
return this.addMoth(new Date().Format("yyyy-MM-dd"), 1)
},
......@@ -286,6 +392,7 @@
},
},
mounted() {
this.userInfo = this.getLocalStorage();
//自适应高度调节
this.com_onresize();
window.onresize = () => {
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 212ee17b
......@@ -927,12 +927,26 @@
},
getList() {
this.loading = true;
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', {
let msg = {
TCIDs: '',
NewCombinationNum: '',
IsCombine: '',
NewTCIDs: ''
}
if(this.$route.query.OrderType){
msg = {
TCIDs: this.$route.query.id,
OrderType: this.$route.query.OrderType
}
}else{
msg = {
TCIDs: this.$route.query.id,
NewCombinationNum: this.$route.query.NewCombinationNum,
IsCombine: this.IsCombine,
NewTCIDs: this.NewTCIDs
}, res => {
}
}
this.apipost('dmcstatistics_get_GetHotelStaticsDetail_V2', msg, res => {
if (res.data.resultCode == 1) {
this.IsOperation = res.data.data.IsOperation;
if (this.IsEditHotel == 0) {
......
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