Skip to content

S
SuperMan
Commit ddd31385 authored by 黄奎's avatar 黄奎
Browse files
Options

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

parents 0c92adde be670284
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 39 deletions
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ ddd31385
......@@ -26,6 +26,9 @@
.page_CompanyAccDetail .singeRowTable tr td{
font-size: 14px;
}
.PlatHebing td{
padding:5px;
}
</style>
<template>
<div class='flexOne page_CompanyAccDetail'>
......@@ -191,7 +194,7 @@
</div>
<el-dialog custom-class='w750' title="合并单据" :visible.sync="addChuNa" center :before-close="initAddChuNa" v-loading="allLoading">
<p class="_addChuNa_tit"><span>{{count}}</span>{{$t('fnc.a_hbtips')}} <span>{{ moneyFormat(allWPrice) }}</span> {{$t('fnc.a_hbtips2')}} <span>{{ moneyFormat(allBPrice) }}</span> </p>
<table border="1" bordercolor="#D2D2D2" style="border-collapse:collapse;text-align: center;">
<table border="1" bordercolor="#D2D2D2" class="PlatHebing" style="border-collapse:collapse;text-align: center;">
<template>
<tr >
<th height="34px">{{$t('fnc.zhfenlei')}}</th>
......@@ -325,6 +328,15 @@
</el-date-picker>
</td>
</tr>
<tr>
<td>交易流水号</td>
<td colspan="2">
<el-input v-model="addMsg.AccountNumber" type="text"></el-input>
</td>
<td colspan="4">
<span style="color:red;">外交平台需录入交易流水号</span>
</td>
</tr>
</table>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitAddChuNa">{{$t('pub.saveBtn')}}</button>
......@@ -399,6 +411,8 @@ export default {
RemitterName:'',
TradeDate:'',
BankList:[],
//交易流水号
AccountNumber:''
},
AccListT:[],
accountListT:[],
......
src/components/champion/mycareer.vue
View file @ ddd31385
......@@ -430,7 +430,7 @@ export default {
}
.mycareer .uer-box .my-score .item .v {
font-family: pingfangR;
font-size: 32px;
font-size: 31px;
color: rgba(255, 255, 255, 1);
background: linear-gradient(
0deg,
......
src/components/index.vue
View file @ ddd31385
......@@ -41,7 +41,10 @@
</span>
<el-dropdown-menu slot="dropdown" class="_dropdown _more_dropdown">
<el-dropdown-item class="clearfix _dropdown_other" v-for="(item,index) in menuList" :key="index" v-if="item.MenuUrl!='' && index>maxLength" @click.native="goUrl(item.MenuUrl,item.MenuId,index)">
<a target="_blank" style="color:#a6adb4;">
<a target="_blank" style="color:#a6adb4;" v-if="item.MenuUrl.indexOf('http://')==-1">
<i :class="[fontPub,item.icon]"></i>{{item.MenuName}}
</a>
<a target="_blank" style="color:#a6adb4;" v-else :href="item.MenuUrl">
<i :class="[fontPub,item.icon]"></i>{{item.MenuName}}
</a>
</el-dropdown-item>
......@@ -50,11 +53,11 @@
<i class="iconfont icon-menu-zhishiquan"></i>知识圈
</a>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("统计平台")!==-1'>
<!-- <el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("统计平台")!==-1'>
<a href="http://data.oytour.com" target="_blank" style="color:#a6adb4;">
<i class="iconfont icon-tongji2"></i>统计平台
</a>
</el-dropdown-item>
</el-dropdown-item> -->
</el-dropdown-menu>
</el-dropdown>
</li>
......@@ -3254,29 +3257,31 @@ export default {
this.displayNone = true;
},
goUrl(url, id, index) {
if(url=='/JapanHotel'){
let userInfo = this.getLocalStorage();
let msg = {
id:userInfo.EmployeeId
}
this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
if (res.data.resultCode == 1) {
this.EnCodeWord=res.data.data;
window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
} else {
this.Error(res.data.message);
if(url.indexOf("http://")==-1){
if(url=='/JapanHotel'){
let userInfo = this.getLocalStorage();
let msg = {
id:userInfo.EmployeeId
}
},
err => {}
);
}else{
this.chosenIndex = id;
if(localStorage.openMode && localStorage.openMode==1)
this.$router.push({ path: url ,query:{blank:'y'}});
else
this.$router.push({ path: url ,query:{}});
this.apipost("sellorder_post_GetDesEncrypt",msg,res => {
if (res.data.resultCode == 1) {
this.EnCodeWord=res.data.data;
window.open("http://www.oytour.com/#/hotelHome?uid="+encodeURIComponent(this.EnCodeWord), "_blank");
} else {
this.Error(res.data.message);
}
},
err => {}
);
} else{
this.chosenIndex = id;
if(localStorage.openMode && localStorage.openMode==1)
this.$router.push({ path: url ,query:{blank:'y'}});
else
this.$router.push({ path: url ,query:{}});
}
}
},
goUrlT(url, index, name) {
let query={
......
src/router/config.js
View file @ ddd31385
......@@ -1027,7 +1027,7 @@ export default {
title: '未认款信息'
},
},
{
path: '/transportCostsManagement', //联运成本管理
name: 'transportCostsManagement',
......@@ -1884,14 +1884,14 @@ export default {
meta: {
title: '散卖酒店订单'
},
},{
}, {
path: '/HotelOrderTotal', //操作 散卖酒店订单统计
name: 'HotelOrderTotal',
component: resolve => require(['@/components/TravelManager/TravelList/HotelOrderTotal'], resolve),
meta: {
title: '散卖酒店订单统计'
},
},{
}, {
path: '/AmoebaDetail', //阿米巴结算详情
name: 'AmoebaDetail',
component: resolve => require(['@/components/TravelManager/TravelList/AmoebaDetail'], resolve),
......@@ -2022,7 +2022,7 @@ export default {
title: '客户分析'
},
},
{ // 销售 客户转交
path: '/customerTransfer',
name: 'customerTransfer',
......@@ -2067,7 +2067,7 @@ export default {
meta: {
title: '返佣查询'
},
},
},
{ // 销售 返佣比例管理
path: '/Returnratio',
name: 'Returnratio',
......@@ -2075,7 +2075,7 @@ export default {
meta: {
title: '返佣比例管理'
},
},{ // 销售 统计
}, { // 销售 统计
path: '/demandStatistics',
name: 'demandStatistics',
component: resolve => require(['@/components/SalesModule/demandStatistics'], resolve),
......@@ -2424,7 +2424,7 @@ export default {
meta: {
title: '散卖酒店订单'
},
},
},
{ // 销售 报名统计
path: '/enrollTotal',
name: 'enrollTotal',
......@@ -2498,7 +2498,7 @@ export default {
}
},
{
path: '/ElectronicContract', //合同预览
path: '/ElectronicContract', //合同预览
name: 'ElectronicContract',
component: resolve => require(['@/components/Contract/ElectronicContract'], resolve),
meta: {
......@@ -2724,7 +2724,7 @@ export default {
meta: {
title: '线控配置'
},
},
},
{ //财务 机票分摊比例
path: '/AirTicketApp',
name: 'AirTicketApp',
......@@ -2732,7 +2732,7 @@ export default {
meta: {
title: '机票分摊比例'
},
},{ //财务 资金调拨 新增
}, { //财务 资金调拨 新增
path: '/addCapitalAllocation',
name: 'addCapitalAllocation',
component: resolve => require(['@/components/FinancialModule/addCapitalAllocation'], resolve),
......@@ -3215,7 +3215,7 @@ export default {
meta: {
title: '收损订单'
},
},{ // 签证 个签办理
}, { // 签证 个签办理
path: '/signatureHandle',
name: 'signatureHandle',
component: resolve => require(['@/components/SalesVisa/signatureHandle'], resolve),
......@@ -3782,7 +3782,7 @@ export default {
title: '票务规则配置'
}
},
]
},
{
......@@ -3810,6 +3810,14 @@ export default {
meta: {
title: '个人中心'
}
},
{
path: '/magic', //供应商一级页面
name: 'magic',
component: resolve => require(['@/components/magic'], resolve),
meta: {
title: '统计中心'
}
}
]
},
......@@ -3837,7 +3845,7 @@ export default {
}
},
{
path:'/TravelContractNew', //新电子合同
path: '/TravelContractNew', //新电子合同
name: 'TravelContractNew',
component: resolve => require(['@/components/TravelContractNew'], resolve),
meta: {
......@@ -3845,7 +3853,7 @@ export default {
}
},
{
path:'/TravelContractDetail', //新电子合同详情
path: '/TravelContractDetail', //新电子合同详情
name: 'TravelContractDetail',
component: resolve => require(['@/components/TravelContractDetail'], resolve),
meta: {
......
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