Skip to content

S
SuperMan
Commit 0b81f6c9 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents acfd6ed8 513ff905
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3200 additions and 127 deletions
src/components/Hotel/roomQuery.vue
View file @ 0b81f6c9
......@@ -74,16 +74,6 @@
<el-input v-model='msg.CombinationNum'></el-input>
</span>
</li>
<li>
<span>
<em>出团公司</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>酒店</em>
......@@ -93,14 +83,14 @@
</el-select>
</span>
</li>
<li style="display:none;">
<li>
<span>
<em>酒店状态</em>
<el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="全部OK" :value='100'></el-option>
<el-option label="暂定一晚" :value='1'></el-option>
<el-option label="暂定二晚" :value='2'></el-option>
<el-option label="暂定两晚" :value='2'></el-option>
<el-option label="暂定三晚" :value='3'></el-option>
<el-option label="暂定四晚" :value='4'></el-option>
<el-option label="暂定五晚" :value='5'></el-option>
......@@ -109,6 +99,16 @@
</el-select>
</span>
</li>
<li>
<span>
<em>出团公司</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input"
:placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
<input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
......@@ -212,7 +212,7 @@
TCNUM: '',
PriceStatus: 0,
CombinationNum: '',
HotelStatus:-1,
HotelStatus: 0
},
//分公司类表
companyList: [],
......@@ -339,7 +339,7 @@
})
}
y.colNum = 9 + y.CommonReport.newHotel.length;
})
});
})
} else {
this.$message.error(res.data.message)
......
src/components/Hotel/roomReservations.vue
View file @ 0b81f6c9
......@@ -80,7 +80,22 @@
</el-select>
</span>
</li>
<li>
<span>
<em>酒店状态</em>
<el-select v-model="msg.HotelStatus" :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
<el-option label="全部OK" :value='100'></el-option>
<el-option label="暂定一晚" :value='1'></el-option>
<el-option label="暂定两晚" :value='2'></el-option>
<el-option label="暂定三晚" :value='3'></el-option>
<el-option label="暂定四晚" :value='4'></el-option>
<el-option label="暂定五晚" :value='5'></el-option>
<el-option label="暂定六晚" :value='6'></el-option>
<el-option label="暂定七晚以上" :value='7'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
......@@ -271,7 +286,8 @@
CreateBy:0,
TCNUM: '',
PriceStatus: 0,
CombinationNum:''
CombinationNum:'',
HotelStatus:0
},
thLengthTitle: [],
list: [],
......
src/components/Supplier/HotelManagement.vue 0 → 100644
View file @ 0b81f6c9
This diff is collapsed.
src/components/Supplier/HotelQueryList.vue 0 → 100644
View file @ 0b81f6c9
This diff is collapsed.
src/components/Supplier/HotelSalesBoard.vue 0 → 100644
View file @ 0b81f6c9
This diff is collapsed.
src/components/Supplier/HotelTotalStock.vue 0 → 100644
View file @ 0b81f6c9
This diff is collapsed.
src/components/Supplier/roomQuery.vue 0 → 100644
View file @ 0b81f6c9
This diff is collapsed.
src/components/Ticketing/TicketManager.vue
View file @ 0b81f6c9
......@@ -1256,8 +1256,8 @@
<li>
<span>
<em>航班日期</em>
<el-date-picker class="w135" v-model="msg.QFlightDateStart" type="date"
:picker-options="beforeCheck" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
<el-date-picker class="w135" v-model="msg.QFlightDateStart" type="date" :picker-options="beforeCheck"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
</el-date-picker>
<span class="_ln">-</span>
<el-date-picker class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck"
......@@ -1290,6 +1290,16 @@
</el-select>
</span>
</li>
<li>
<span>
<em>出发地</em>
<el-select v-model="msg.Departure_city" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="defaultSelectValue"></el-option>
<el-option v-for="item in ChinaCityList" :label="item.Name" :value="item.ID" :key="item.ID">
</el-option>
</el-select>
</span>
</li>
<li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="addShow=true,command=false,sanmai=false,initAddMsg()">
......@@ -1340,15 +1350,15 @@
{{$t('Airticket.Air_EconomyClass')}}
</li>
<li> <span style="color:#4BCA81 ;">√：</span>
<span >全部出票</span>
<span>全部出票</span>
</li>
<li>
<span style="color: #E95252;">O：</span>
<span > 已出中段/部分出票</span>
<span> 已出中段/部分出票</span>
</li>
<li>
<span style="color:#E95252 ;">X：</span>
<span >未处理</span>
<span>未处理</span>
</li>
</ul>
<div class="_ol_info" :class="addShow==true||command==true?'_edHeight':''">
......@@ -1468,13 +1478,15 @@
</div>
</el-col>
<el-col :span="1">
<div><ul>
<div>
<ul>
<!--出票状态-->
<li style="font-size:18px;">
<span style="color: #4BCA81;" v-if="item.TicketState==1">√</span>
<span class="colorE95252" v-else>{{item.TicketState=='0'?"x":"O"}}</span>
</li>
</ul></div>
</ul>
</div>
</el-col>
<el-col :span="4" class="vmiddle">
<div class="TK_raduis">
......@@ -1551,7 +1563,8 @@
</div>
</li> -->
<li v-else-if="item.FinalPayment!=''">
<div @click="goCustomList('PassengerList',item, 5,'旅客名单')" :class="getClass(item.FinalPaymentStatus)">
<div @click="goCustomList('PassengerList',item, 5,'旅客名单')"
:class="getClass(item.FinalPaymentStatus)">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250">
<span>尾</span>
</el-tooltip>
......@@ -1636,18 +1649,22 @@
</el-tooltip>
</el-button-group>
</div>
<div style="margin-top:5px;" >
<div style="margin-top:5px;">
<el-button-group size="mini">
<el-tooltip class="item" effect="dark" content="部分出票" placement="top-start" v-show="item.TicketState==0">
<el-tooltip class="item" effect="dark" content="部分出票" placement="top-start"
v-show="item.TicketState==0">
<el-button type="primary" class="iconfont icon-icon_status-half-dot"
@click="UpdateTicketState(item.ID,3)" ></el-button>
@click="UpdateTicketState(item.ID,3)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="已出中段" placement="top-start" v-show="item.TicketState==0">
<el-tooltip class="item" effect="dark" content="已出中段" placement="top-start"
v-show="item.TicketState==0">
<el-button type="primary" class="iconfont icon-zhongzhuan" @click="UpdateTicketState(item.ID,2)">
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="出票完成" placement="top-start" v-show="item.TicketState!=1">
<el-button type="primary" class="iconfont icon-duigou" @click="UpdateTicketState(item.ID,1)"></el-button>
<el-tooltip class="item" effect="dark" content="出票完成" placement="top-start"
v-show="item.TicketState!=1">
<el-button type="primary" class="iconfont icon-duigou" @click="UpdateTicketState(item.ID,1)">
</el-button>
</el-tooltip>
</el-button-group>
</div>
......@@ -2210,7 +2227,8 @@
LineId: 0, //线路编号
ID: 0,
TicketType: 0, //定金类型(1定，2定等)
IsLimit:1
IsLimit: 1,
Departure_city:0//出发地
},
addMsg: {
ID: "0",
......@@ -2288,6 +2306,8 @@
AirportNameList: [],
//回程航班列表
BackAirportNameList: [],
//国内城市列表
ChinaCityList:[],
//线路列表
LineList: [],
returnTrip: [],
......@@ -2324,9 +2344,8 @@
disabledDate: time => {
if (this.msg.QFlightDateEnd) {
let endTime = new Date(this.msg.QFlightDateEnd);
return time&&endTime.getTime() < time.getTime();
}else
{
return time && endTime.getTime() < time.getTime();
} else {
return false;
}
}
......@@ -2337,9 +2356,7 @@
let startTime = new Date(this.msg.QFlightDateStart);
//可以选择当天
return time && time.getTime() < startTime.getTime() - 1 * 24 * 60 * 60 * 1000;
}
else
{
} else {
return false;
}
}
......@@ -2555,12 +2572,12 @@
});
},
//跳转至旅客名单
goCustomList(path, obj, type, title){
goCustomList(path, obj, type, title) {
this.$router.push({
name: path,
query: {
blank: 'y',
isFromTk:true,
isFromTk: true,
id: obj.ID,
Obj: JSON.stringify({
Type: type
......@@ -2828,11 +2845,11 @@
err => {}
);
}, // 修改 根据ID获取信息
UpdateTicketState(ID,TicketState) {
UpdateTicketState(ID, TicketState) {
this.apipost(
"AirTicket_get_UpdateTicketState", {
ID: ID,
TicketState:TicketState
TicketState: TicketState
},
res => {
if (res.data.resultCode == 1) {
......@@ -3226,7 +3243,22 @@
},
err => {}
);
},
//获取中国下面的所有城市
GetChinaCityList() {
this.apipost(
"Destination_get_GetCityListByCountryId", {
Id: 2
},
res => {
if (res.data.resultCode == 1) {
this.ChinaCityList = res.data.data;
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
mounted() {
......@@ -3234,6 +3266,7 @@
if (id) {
this.msg.ID = id;
}
this.GetChinaCityList();
this.GetLineList();
this.getList();
this.initAirlines();
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ 0b81f6c9
......@@ -211,10 +211,9 @@
<tr>
<td rowspan="2">
<p v-if="item.isChargeLossOrders==1" style="color:red">{{$t('fnc.sun')}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId"
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;"
:title="item.alName" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;text-decoration:underline;" :title="item.orderId"
@click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)" title="点击跳转到报名清单">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" title="点击跳转到团控列表" @click="goUrlX('团控列表', 'TravelControlList',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''"
style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">
......@@ -224,10 +223,10 @@
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
</td>
<td class="fz12">
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.lineName">
<p style="max-width: 160px;display: block;text-decoration:underline;cursor:pointer;" title="点击跳转到报名清单" class="over_ellipsis" :title="item.lineName" @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">
<span>{{item.lineName}}</span>
</p>
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
<p style="max-width: 160px;display: block;text-decoration:underline;cursor:pointer;" title="点击跳转到报名清单" class="over_ellipsis" :title="item.ltName" @click="goUrlX('团报名清单', 'RegistrationList',item.tcid,item.tcnum)">{{item.ltName}}</p>
</td>
<td>{{item.guestNum}}</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
......@@ -320,7 +319,7 @@
</div>
</div>
</td>
<td colspan="8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
<td :colspan="userId==1?9:8" class="groupTourOrder_tickets" style="height: 20px;cursor: pointer;"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<div>
<div style="white-space: nowrap">{{$t('fnc.skdanju')}}：<span v-if="item.financeList.length===0"
......
src/components/temp/Supplier.vue 0 → 100644
View file @ 0b81f6c9
<style lang="less" scoped>
@import "../../assets/css/main.less";
@import "../../assets/css/cssReset.css";
</style>
<template>
<div>
<leftNav></leftNav>
</div>
</template>
<script>
import leftNav from '../public/leftNav.vue'
export default {
data (){
return{
}
},
components:{
leftNav
},
mounted(){
},
methods:{
}
}
</script>
\ No newline at end of file
src/router/config.js
View file @ 0b81f6c9
......@@ -696,6 +696,46 @@ export default {
title: '酒店查询统计'
},
},
{
path: '/HotelManagement2', //供应商->酒店管理
name: 'HotelManagement2',
component: resolve => require(['@/components/Supplier/HotelManagement'], resolve),
meta: {
title: '酒店管理'
},
},
{
path: '/HotelSalesBoard2', //供应商->酒店统计
name: 'HotelSalesBoard2',
component: resolve => require(['@/components/Supplier/HotelSalesBoard'], resolve),
meta: {
title: '酒店统计'
},
},
{
path: '/HotelTotalStock2', //供应商->总库存看板
name: 'HotelTotalStock2',
component: resolve => require(['@/components/Supplier/HotelTotalStock'], resolve),
meta: {
title: '总库存看板'
},
},
{
path: '/roomQuery2', //供应商->定房查询
name: 'roomQuery2',
component: resolve => require(['@/components/Supplier/roomQuery'], resolve),
meta: {
title: '定房查询'
},
},
{
path: '/HotelQueryList2', //供应商->酒店查询
name: 'HotelQueryList2',
component: resolve => require(['@/components/Supplier/HotelQueryList'], resolve),
meta: {
title: '酒店查询'
},
},
{
path: '/RestauranOrder', //餐厅订单信息
name: 'RestauranOrder',
......@@ -3318,7 +3358,14 @@ export default {
name: 'PermissionManage',
component: resolve => require(['@/components/PermissionManage'], resolve),
},
{
path: '/Supplier', //供应商一级页面
name: 'Supplier',
component: resolve => require(['@/components/temp/Supplier'], resolve),
meta: {
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