Skip to content

S
SuperMan
Commit 2cbaf838 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 8ee9fbbd ed51c9d1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1146 additions and 1119 deletions
src/assets/css/Details.css
View file @ 2cbaf838
.secondMenu { .secondMenu {
width: 50px; width: 50px;
margin: 0px 30px 0 0; margin: 0px 30px 0 0;
background: #38425D; background: #282733;
/* box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.09); */ /* box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.09); */
height: 100%; height: 100%;
max-height: 100%; max-height: 100%;
...@@ -9,39 +9,72 @@ ...@@ -9,39 +9,72 @@
overflow-x: hidden; overflow-x: hidden;
position: relative; position: relative;
transition: all linear .3s; transition: all linear .3s;
} }
.menuItem .el-submenu__title{
.secondMenu .el-submenu__title i {
color: #a3ace0;
font-size: 18px;
}
.el-menu--vertical .thridMenu {
height: 44px;
line-height: 44px;
}
.el-menu--vertical .thridMenu i {
font-size: 15px;
color: #a3ace0;
margin-right: 10px;
}
.el-menu--vertical .thridMenu:hover,
.el-menu--vertical .thridMenu:hover i {
color: #f1f1f1 !important;
}
.secondMenu .el-submenu__title:hover i {
color: #f1f1f1;
}
.menuItem .el-submenu__title {
padding: 0px !important; padding: 0px !important;
text-align: center; text-align: center;
} }
.menuItem .el-menu--collapse{
.menuItem .el-menu--collapse {
width: 51px; width: 51px;
} }
/* .secondMenu:hover{
/* .secondMenu:hover{
width: 200px; width: 200px;
} */ } */
.secondMenu::-webkit-scrollbar {
.secondMenu::-webkit-scrollbar {
width: 4px; width: 4px;
height: 8px; height: 8px;
} }
.secondMenu::-webkit-scrollbar-track {
.secondMenu::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px; border-radius: 4px;
background: #ededed; background: #ededed;
} }
.secondMenu::-webkit-scrollbar-thumb {
.secondMenu::-webkit-scrollbar-thumb {
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #c9c9c9; background: #c9c9c9;
} }
.secondMenu .menuItem { .secondMenu .menuItem {
min-height: 40px; min-height: 40px;
font-size: 14px; font-size: 14px;
color: #333; color: #333;
overflow: hidden; overflow: hidden;
} }
.menuTop {
.menuTop {
padding-left: 20px; padding-left: 20px;
width: 200px; width: 200px;
height: 52px; height: 52px;
...@@ -50,8 +83,9 @@ ...@@ -50,8 +83,9 @@
text-align: left; text-align: left;
color: #fff; color: #fff;
margin-top: -2px; margin-top: -2px;
} }
.secondMenu .menuItem > p {
.secondMenu .menuItem>p {
font-size: 14px; font-size: 14px;
cursor: pointer; cursor: pointer;
height: 50px !important; height: 50px !important;
...@@ -60,12 +94,14 @@ ...@@ -60,12 +94,14 @@
background: #eaeaea; background: #eaeaea;
border-top: 1px solid #fafafa; border-top: 1px solid #fafafa;
position: relative; position: relative;
} }
.secondMenu .menuItem > p:hover {
.secondMenu .menuItem>p:hover {
background: #999; background: #999;
color: #fff; color: #fff;
} }
.secondMenu .menuItem .liDiv li {
.secondMenu .menuItem .liDiv li {
float: left; float: left;
padding: 10px 0 0 0; padding: 10px 0 0 0;
margin: 5px 0 5px 10px; margin: 5px 0 5px 10px;
...@@ -76,25 +112,29 @@ ...@@ -76,25 +112,29 @@
color: #333; color: #333;
height: 83px; height: 83px;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
} }
.secondMenu .menuItem li.menuItem_level1{
.secondMenu .menuItem li.menuItem_level1 {
position: relative; position: relative;
} }
.liDiv {
.liDiv {
padding: 5px 0 20px 0; padding: 5px 0 20px 0;
overflow: hidden; overflow: hidden;
} }
.secondMenu .menuItem li img { .secondMenu .menuItem li img {
margin: 0 auto; margin: 0 auto;
display: block; display: block;
width: 55px; width: 55px;
height: 55px; height: 55px;
} }
.flexDiv .childBox {
.flexDiv .childBox {
text-align: center; text-align: center;
} }
.flexDiv .childBox i {
.flexDiv .childBox i {
font-size: 26px; font-size: 26px;
width: 56px; width: 56px;
height: 56px; height: 56px;
...@@ -106,171 +146,205 @@ ...@@ -106,171 +146,205 @@
text-indent: 0px; text-indent: 0px;
color: #fafafa; color: #fafafa;
margin-bottom: 5px; margin-bottom: 5px;
} }
.flexDiv .parentBox{
cursor: pointer; .flexDiv .parentBox {
} cursor: pointer;
.flexDiv .parentBox i { }
.flexDiv .parentBox i {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
padding: 0 20px; padding: 0 20px;
} }
.flexDiv .parentBox i.small {
.flexDiv .parentBox i.small {
font-size: 12px; font-size: 12px;
font-weight: 300; font-weight: 300;
position: absolute; position: absolute;
top: 7px; top: 7px;
right: 0px; right: 0px;
} }
.resource-ttop {
.resource-ttop {
height: 40px; height: 40px;
border-bottom: 1px solid #ededed; border-bottom: 1px solid #ededed;
font-size: 14px; font-size: 14px;
line-height: 40px; line-height: 40px;
color: #333333; color: #333333;
} }
.resource-ttop i {
.resource-ttop i {
font-size: 12px; font-size: 12px;
color: #999; color: #999;
margin: 0 5px; margin: 0 5px;
} }
.secondMenu_l{
.secondMenu_l {
width: 200px; width: 200px;
} }
.menuItem .el-menu-item-group__title{
.menuItem .el-menu-item-group__title {
padding: 0; padding: 0;
} }
.flexParent{
.flexParent {
background: #f2f2f2; background: #f2f2f2;
}
.my_maxheight {
max-height: 600px;
overflow: auto;
} }
.my_maxheight {
max-height: 600px;
overflow: auto;
}
.my_maxheight .el-menu-item-group__title { .my_maxheight .el-menu-item-group__title {
border-bottom: 1px solid #0f1522; border-bottom: 1px solid #0f1522;
} }
.my_maxheight .el-menu-item-group__title span { .my_maxheight .el-menu-item-group__title span {
font-size: 14px; font-size: 14px;
color: #ffffff; color: #ffffff;
font-family: "PingFangSC-fine"; font-family: "PingFangSC-fine";
} }
.my_maxheight::-webkit-scrollbar { .my_maxheight::-webkit-scrollbar {
/*滚动条整体样式*/ /*滚动条整体样式*/
width: 4px; width: 4px;
/*高宽分别对应横竖滚动条的尺寸*/ /*高宽分别对应横竖滚动条的尺寸*/
height: 8px; height: 8px;
} }
.my_maxheight::-webkit-scrollbar-thumb { .my_maxheight::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/ /*滚动条里面小方块*/
border-radius: 4px; border-radius: 4px;
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
background: #1f2533; background: #1f2533;
} }
.my_maxheight::-webkit-scrollbar-track { .my_maxheight::-webkit-scrollbar-track {
/*滚动条里面轨道*/ /*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2); -webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius: 4px; border-radius: 4px;
background: #38425d; background: #38425d;
} }
.el-menu--vertical{
left: 46px !important; .el-menu--vertical {
left: 46px !important;
} }
.big-icon { .big-icon {
font-size: 20px; font-size: 20px;
} }
.nav-tabs-box .el-tabs__header{
margin: 0px; .nav-tabs-box .el-tabs__header {
} margin: 0px;
.nav-tabs-box .el-tabs__nav-wrap::after{ }
background-color: #38425d;
} .nav-tabs-box .el-tabs__nav-wrap::after {
.nav-tabs-box{ background-color: #38425d;
margin: 0 -20px; }
position: relative;
} .nav-tabs-box {
.nav-tabs-box .is-active{ margin: 0 -20px;
background: #f2f2f2; position: relative;
} }
.nav-tabs-box .el-tabs{
background: #f0f0f0; .nav-tabs-box .is-active {
} background: #f2f2f2;
.browner-opera-box{ }
position: absolute;
width: 100px; .nav-tabs-box .el-tabs {
height: 40px; background: #f0f0f0;
left: 0; }
top: 0;
display: flex; .browner-opera-box {
padding: 5px; position: absolute;
} width: 100px;
.browner-opera-box i{ height: 40px;
display: block; left: 0;
flex: 1; top: 0;
font-size: 16px; display: flex;
color: #CCC; padding: 5px;
text-align: center; }
cursor: default;
height: 30px; .browner-opera-box i {
line-height: 30px; display: block;
} flex: 1;
.browner-opera-box i.active{ font-size: 16px;
color:#666; color: #CCC;
} text-align: center;
.browner-opera-box i.active:hover{ cursor: default;
background:#ddd; height: 30px;
border-radius: 30px; line-height: 30px;
} }
.browner-opera-box i:last-child{
margin-top: 1px; .browner-opera-box i.active {
} color: #666;
.nav-tabs-box .el-tabs__nav-scroll{ }
padding-left:100px;
} .browner-opera-box i.active:hover {
.right-menu{ background: #ddd;
border:1px solid #BABABA; border-radius: 30px;
background: #ffffff; }
position: absolute;
width: 200px; .browner-opera-box i:last-child {
margin: 0; margin-top: 1px;
padding: 2px 0; }
z-index: 9999;
} .nav-tabs-box .el-tabs__nav-scroll {
.right-menu li{ /* padding-left:100px; */
margin: 0; }
padding:5px 10px;
list-style: none; .right-menu {
display: block; border: 1px solid #BABABA;
color:#000; background: #ffffff;
font-size: 12px; position: absolute;
cursor: pointer; width: 200px;
} margin: 0;
.right-menu li:hover{ padding: 2px 0;
background: #eee; z-index: 9999;
} }
.right-menu li.disable{
color: gray; .right-menu li {
cursor: default; margin: 0;
} padding: 5px 10px;
.right-menu li.disable:hover{ list-style: none;
background: none; display: block;
} color: #000;
.right-menu li.split{ font-size: 12px;
padding:0; cursor: pointer;
margin: 5px 10px; }
height: 1px;
background: #bababa; .right-menu li:hover {
cursor: default; background: #eee;
} }
.right-menu li.split:hover{
background: #bababa; .right-menu li.disable {
} color: gray;
.nav-tabs-box .is-focus{ cursor: default;
border: none; }
outline: none;
} .right-menu li.disable:hover {
.nav-tabs-box .el-tabs--card>.el-tabs__header .el-tabs__item.is-active{ background: none;
border-bottom-color: #f2f2f2; }
.right-menu li.split {
padding: 0;
margin: 5px 10px;
height: 1px;
background: #bababa;
cursor: default;
}
.right-menu li.split:hover {
background: #bababa;
}
.nav-tabs-box .is-focus {
border: none;
outline: none;
}
.nav-tabs-box .el-tabs--card>.el-tabs__header .el-tabs__item.is-active {
border-bottom-color: #f2f2f2;
} }
\ No newline at end of file
src/assets/utils/travelFeature2.js
View file @ 2cbaf838
...@@ -10,13 +10,16 @@ let travelFeatureTwo = { ...@@ -10,13 +10,16 @@ let travelFeatureTwo = {
images: [], images: [],
type:"Hotel" type:"Hotel"
}; };
for (let item2 of item.ImaArray) { if(item.ImaArray&& item.ImaArray.length>0)
let obj2 = { {
Url: item2.Url, for (let item2 of item.ImaArray) {
x: 0, let obj2 = {
y: 0 Url: item2.Url,
}; x: 0,
obj.images.push(obj2) y: 0
};
obj.images.push(obj2)
}
} }
obj.description = item.Description; obj.description = item.Description;
obj.name = item.HotelName ? item.HotelName : ''; obj.name = item.HotelName ? item.HotelName : '';
...@@ -29,57 +32,70 @@ let travelFeatureTwo = { ...@@ -29,57 +32,70 @@ let travelFeatureTwo = {
}, },
ScenicInit: function (index, data) { // 景点初始化 ScenicInit: function (index, data) { // 景点初始化
let list = []; let list = [];
for (let item of data[index].ScenicArray) { if(data[index]&&data[index].ScenicArray.length>0)
let obj = { {
MD5Sign: '', for (let item of data[index].ScenicArray) {
name: '',
description: '',
images: [],
type:"Scenic"
};
for (let item2 of item.NewImaArray) {
let obj2 = {
Url: item2.Url,
x: 0,
y: 0
};
obj.images.push(obj2)
}
obj.description = item.Description;
obj.name = item.CouponsName ? item.CouponsName : '';
obj.MD5Sign = item.MD5Sign ? item.MD5Sign : '';
obj.Ename = '';
list.push(obj)
}
return list;
},
DinnerInit: function (index, data) { // 餐初始化
let list = [];
for (let item of data[index].DinnerArray) {
if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName == "酒店内享用早餐" || item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
let obj = { let obj = {
name: '',
MD5Sign: '', MD5Sign: '',
name: '',
description: '', description: '',
images: [], images: [],
type:"Dinner" type:"Scenic"
}; };
if(item.NewImaArray.length>0)
for (let item2 of item.ImaArray) { {
let obj2 = { for (let item2 of item.NewImaArray) {
Url: item2.Url, let obj2 = {
x: 0, Url: item2.Url,
y: 0 x: 0,
}; y: 0
obj.images.push(obj2) };
obj.images.push(obj2)
}
} }
obj.description = item.Description; obj.description = item.Description;
obj.name = item.DinnerName ? item.DinnerName : ''; obj.name = item.CouponsName ? item.CouponsName : '';
obj.Ename = '';
obj.MD5Sign = item.MD5Sign ? item.MD5Sign : ''; obj.MD5Sign = item.MD5Sign ? item.MD5Sign : '';
obj.Ename = '';
list.push(obj) list.push(obj)
} }
return list;
} }
},
DinnerInit: function (index, data) { // 餐初始化
let list = [];
if(data[index]&&data[index].DinnerArray.length>0)
{
for (let item of data[index].DinnerArray) {
if (item.DinnerName && item.DinnerName !== '' && !(item.DinnerName == "酒店内享用早餐" || item.DinnerName == '酒店外享用早餐' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '方便游玩敬请自理' || item.DinnerName == '机上简餐或自理' || item.DinnerName == '酒店享用')) {
let obj = {
name: '',
MD5Sign: '',
description: '',
images: [],
type:"Dinner"
};
if(item.ImaArray.length>0)
{
for (let item2 of item.ImaArray) {
let obj2 = {
Url: item2.Url,
x: 0,
y: 0
};
obj.images.push(obj2)
}
}
obj.description = item.Description;
obj.name = item.DinnerName ? item.DinnerName : '';
obj.Ename = '';
obj.MD5Sign = item.MD5Sign ? item.MD5Sign : '';
list.push(obj)
}
}
}
return list; return list;
}, },
getArrDifference(array1, array2) { // 上一次数据与这一次对比 取出被删除的 getArrDifference(array1, array2) { // 上一次数据与这一次对比 取出被删除的
......
src/components/Details.vue
View file @ 2cbaf838
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
<div class="menuItem" > <div class="menuItem" >
<el-menu <el-menu
default-active="" default-active=""
background-color="#38425D" background-color="#282733"
text-color="#8899AA" text-color="#a3ace0"
active-text-color="#FFFFFF" active-text-color="#FFFFFF"
class="el-menu-vertical-demo" :collapse="isCollapse"> class="el-menu-vertical-demo" :collapse="isCollapse">
<el-submenu v-for="(item,index) in items" :index="String(index+1)" :key='index'> <el-submenu v-for="(item,index) in items" :index="String(index+1)" :key='index'>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</template> </template>
<el-menu-item-group class="my_maxheight"> <el-menu-item-group class="my_maxheight">
<span slot="title">{{item.MenuName}}</span> <span slot="title">{{item.MenuName}}</span>
<el-menu-item v-for="(subItem,sindex) in item.childerns" :index="String(index+1)+'-'+String(sindex+1)" @click="goUrl(subItem.MenuUrl)" :key='sindex'> <el-menu-item class="thridMenu" v-for="(subItem,sindex) in item.childerns" :index="String(index+1)+'-'+String(sindex+1)" @click="goUrl(subItem.MenuUrl)" :key='sindex'>
<i :class="[fontPub,subItem.MenuStyleIcon]" ></i> <i :class="[fontPub,subItem.MenuStyleIcon]" ></i>
{{subItem.MenuName}}</el-menu-item> {{subItem.MenuName}}</el-menu-item>
</el-menu-item-group> </el-menu-item-group>
...@@ -45,12 +45,12 @@ ...@@ -45,12 +45,12 @@
{{rootName}}<i class="iconfont icon-weibiaoti102"></i>{{parentName}}<i class="iconfont icon-weibiaoti102"></i><span class="active">{{currentName}}</span> {{rootName}}<i class="iconfont icon-weibiaoti102"></i>{{parentName}}<i class="iconfont icon-weibiaoti102"></i><span class="active">{{currentName}}</span>
</div> --> </div> -->
<div class="nav-tabs-box" @contextmenu.prevent="showRightMenu"> <div class="nav-tabs-box" @contextmenu.prevent="showRightMenu" :style="{width:`${navWidth}px`}">
<el-tabs v-if='tabs && tabs.length>0' v-model="currentTabName" :closable="tabs.length>1" type="card" @edit="handleTabsEdit"> <el-tabs v-if='tabs && tabs.length>0' v-model="currentTabName" style="margin-left: 120px;" :closable="tabs.length>1" type="card" @edit="handleTabsEdit">
<el-tab-pane :key="i" v-for="(item,i) in tabs" :label="item.title" :name="item.name+'_'+i"> <el-tab-pane :key="i" v-for="(item,i) in tabs" :label="item.title" :name="item.name+'_'+i">
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
<div class="browner-opera-box" v-if="currentTag.history&&currentTag.history.length>0"> <div class="browner-opera-box" v-if="currentTag.history&&currentTag.history.length>0" style="border-bottom: 1px solid #e4e7ed;">
<i class="iconfont icon-houtui" @click="goback(0)" :class="{'active':this.currentTag && this.currentTag.hisIndex>0}" title="后退"></i> <i class="iconfont icon-houtui" @click="goback(0)" :class="{'active':this.currentTag && this.currentTag.hisIndex>0}" title="后退"></i>
<i class="iconfont icon-qianjin" @click="goback(1)" :class="{'active':this.currentTag && this.currentTag.hisIndex<this.currentTag.history.length-1}" title="前进"></i> <i class="iconfont icon-qianjin" @click="goback(1)" :class="{'active':this.currentTag && this.currentTag.hisIndex<this.currentTag.history.length-1}" title="前进"></i>
<i class="iconfont icon-shuaxin1 active" @click="reloadpage" title="刷新"></i> <i class="iconfont icon-shuaxin1 active" @click="reloadpage" title="刷新"></i>
...@@ -106,7 +106,7 @@ export default { ...@@ -106,7 +106,7 @@ export default {
ctrlDown:false, ctrlDown:false,
openMode:0, openMode:0,
blankUrl:'', blankUrl:'',
navWidth:0,
}; };
}, },
components:{ components:{
...@@ -130,7 +130,25 @@ export default { ...@@ -130,7 +130,25 @@ export default {
window.localStorage.navTabs=JSON.stringify(newValue) window.localStorage.navTabs=JSON.stringify(newValue)
}, },
deep: true deep: true
　　} 　　},
currentTag:{
handler(newValue, oldValue) {
setTimeout(() => {
document.querySelectorAll('.frame-box').forEach(x=>{
if(x.style.display!='none'){
let opContents=x.querySelectorAll(".query-box ul li");
console.log(opContents)
if(opContents && opContents.length>0){
this.navWidth=document.querySelector(".flexParent").offsetWidth-opContents[opContents.length-1].offsetWidth-50
}else{
this.navWidth=document.querySelector(".flexParent").offsetWidth-20;
}
}
})
}, 300);
},
deep: true
}
}, },
mounted() { mounted() {
this.openMode=0 this.openMode=0
...@@ -142,6 +160,7 @@ export default { ...@@ -142,6 +160,7 @@ export default {
this.MsgBus.$on('refresh', ()=> { this.MsgBus.$on('refresh', ()=> {
this.reloadpage() this.reloadpage()
}); });
this.navWidth=document.querySelector(".flexParent").offsetWidth;
// this.MsgBus.$on('forEachLoc', ()=> { // this.MsgBus.$on('forEachLoc', ()=> {
// let obj = {} // let obj = {}
// let LocNavTab = JSON.parse(window.localStorage.navTabs); // let LocNavTab = JSON.parse(window.localStorage.navTabs);
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 2cbaf838
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
<th width="">出团人数</th> <th width="">出团人数</th>
<th width="">领队</th> <th width="">领队</th>
<th width="">导游</th> <th width="">导游</th>
<th>酒店</th>
</tr> </tr>
<tr v-for='item in nav'> <tr v-for='item in nav'>
<td>{{item.StartCityNames}}</td> <td>{{item.StartCityNames}}</td>
...@@ -24,6 +25,12 @@ ...@@ -24,6 +25,12 @@
<td>{{item.TotalSeat}}人</td> <td>{{item.TotalSeat}}人</td>
<td>{{item.LeaderName}}</td> <td>{{item.LeaderName}}</td>
<td>{{item.GuideName}}</td> <td>{{item.GuideName}}</td>
<td>
<el-popover width="900" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
</el-popover>
</td>
</tr> </tr>
</table> </table>
<table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0"> <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
...@@ -448,6 +455,7 @@ ...@@ -448,6 +455,7 @@
</template> </template>
<script> <script>
import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
export default { export default {
data() { data() {
return { return {
...@@ -471,9 +479,21 @@ ...@@ -471,9 +479,21 @@
NewCombinationNum: '', NewCombinationNum: '',
TotalNav: [], TotalNav: [],
LeaderGetPrice: 0, LeaderGetPrice: 0,
HangingList: [] HangingList: [],
showHotelObj: {
showPrice: true,
showPay: true,
showZhan: true,
showBtnList: false,
showCaozuoTime: true,
ShowTaxType:true, //显示税入税别
ShowRebateRatio:true, //显示返佣比列
},
} }
}, },
components: {
commonHotelInfo
},
methods: { methods: {
getHangingAccountByTCIDList: function () { getHangingAccountByTCIDList: function () {
this.apipost( this.apipost(
...@@ -733,9 +753,10 @@ ...@@ -733,9 +753,10 @@
x.LeaderGetPriceT = 0 x.LeaderGetPriceT = 0
} }
}) })
this.nav = nav this.nav = nav;
console.log(this.nav,'navvvvvvvv');
} else { } else {
this.$message.error(res.data.message) this.Error(res.data.message)
} }
}, err => {}) }, err => {})
}, },
...@@ -747,7 +768,7 @@ ...@@ -747,7 +768,7 @@
this.TotalNav = res.data.data; this.TotalNav = res.data.data;
this.getNav(); this.getNav();
} else { } else {
this.$message.error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) }, err => {})
}, },
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 2cbaf838
...@@ -722,7 +722,7 @@ ...@@ -722,7 +722,7 @@
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary" <el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}} style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}}
</el-button> </el-button>
<el-dropdown trigger="click" style="margin-bottom:5px;"> <el-dropdown trigger="click" style="margin-bottom:5px;" v-if="CurrentUserInfo.RB_Branch_id==0">
<span class="el-dropdown-link">{{$t('pub.updateMsg')}} <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
......
src/components/commonPage/commonHotelInfo.vue
View file @ 2cbaf838
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
<th style="width:100px;">状态</th> <th style="width:100px;">状态</th>
<th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</th> <th style="width:150px;" v-if="showHotelObj.showPrice">使用数量/价格</th>
<th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th> <th style="width:100px;" v-if="showHotelObj.showPay">付款方式</th>
<th style="width:100px;" v-if="showHotelObj.ShowTaxType">税入/税别</th>
<th style="width:120px;" v-if="showHotelObj.ShowRebateRatio">返佣比例</th>
<th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th> <th style="width:120px" v-if="showHotelObj.showZhan">占房时间</th>
<th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th> <th style="width:100px" v-if="showHotelObj.showZhan">确认时间</th>
</tr> </tr>
...@@ -59,6 +61,13 @@ ...@@ -59,6 +61,13 @@
<td v-if="showHotelObj.showPay"> <td v-if="showHotelObj.showPay">
{{hotelSubItem.PayTypeStr}} {{hotelSubItem.PayTypeStr}}
</td> </td>
<td v-if="showHotelObj.ShowTaxType">
<template v-if="hotelSubItem.TaxType==1">税入</template>
<template v-if="hotelSubItem.TaxType==2">税别</template>
</td>
<td v-if="showHotelObj.ShowRebateRatio">
{{hotelSubItem.RebateRatio}}
</td>
<td v-if="showHotelObj.showZhan"> <td v-if="showHotelObj.showZhan">
<template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)"> <template v-if="hotelSubItem.OPState==1||(hotelSubItem.OPState==2 && hotelSubItem.DMCState==0)">
{{hotelSubItem.CreateDateStr}} {{hotelSubItem.CreateDateStr}}
...@@ -145,6 +154,7 @@ ...@@ -145,6 +154,7 @@
} }
}, },
mounted() { mounted() {
} }
}; };
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 2cbaf838
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
</div> </div>
<p <p
v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0"> v-if="item.LineId==14 && item.CommonReport.PriceHotelResult && item.CommonReport.PriceHotelResult.length>0">
<el-popover width="750" trigger="click" popper-class="DMC_HotelPop"> <el-popover width="900" trigger="click" popper-class="DMC_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS" @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo> :TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUMS" @SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span> <span slot="reference" class="price" style="cursor:pointer;text-decoration:underline;">酒店信息</span>
...@@ -555,6 +555,8 @@ ...@@ -555,6 +555,8 @@
showBtnList: true, showBtnList: true,
showCaozuoTime: true, showCaozuoTime: true,
ShowShouPeiStatus:true,//显示手配置暂定确定按钮 ShowShouPeiStatus:true,//显示手配置暂定确定按钮
ShowTaxType:true, //显示税入税别
ShowRebateRatio:true, //显示返佣比列
}, },
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
......
src/components/index.vue
View file @ 2cbaf838
This diff is collapsed.
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ 2cbaf838
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/personalCenter.vue
View file @ 2cbaf838
<template> <template>
<div class="personal" :style="{zoom:zoom}"> <div class="personal" :style="{zoom:zoom}">
<div class="u-box"> <div class="u-box">
<div class="left-point"></div> <!-- <div class="left-point"></div>
<div class="right-point"></div> <div class="right-point"></div> -->
<div class="h-info-box"> <div class="h-info-box">
<div class="h-info"> <div class="h-info">
<div class="k">姓名</div> <div class="k">姓名</div>
...@@ -166,23 +166,26 @@ export default { ...@@ -166,23 +166,26 @@ export default {
/* background: #000; */ /* background: #000; */
background: #0a0919 url("../assets/img/persion/bg.png") 100% 100%; background: #0a0919 url("../assets/img/persion/bg.png") 100% 100%;
position: relative; position: relative;
background: #282733;
} }
.personal .u-box { .personal .u-box {
width: 300px; width: 300px;
position: absolute; position: absolute;
background: #19133e6e; background: #19133e6e;
left: 30px; left: 0px;
top: 30px; top: 0;
bottom: 30px; bottom: 0;
border: 1px solid #2c2739; border: 1px solid #2c2739;
} }
.personal .c-box { .personal .c-box {
position: absolute; position: absolute;
left: 360px; left: 300px;
top: 30px; top: 0;
bottom: 30px; bottom: 0;
right: 30px; right: 0;
display: flex; display: flex;
background:rgba(242,243,248,1);
padding: 20px;
} }
.personal .c-box .fince{ .personal .c-box .fince{
width: 400px; width: 400px;
......
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