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 Hide 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()" />
......@@ -166,10 +166,10 @@
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
{{childItem.NewHotelName}}
<span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
<span class="colorE95252">
<template v-if="childItem.OPState==1">[OP选房-OK]</template>
<template v-else>{{childItem.DMCState==1?"[地接-OK]":(childItem.DMCState==0?"[未操作]":"[暂定]")}}
</template>
</span>
</p>
</div>
......@@ -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
This diff is collapsed.
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