Skip to content

S
SuperMan
Commit fe5227b1 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 0d72017d 8ccfc49c
Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 90 deletions
src/components/FinancialModule/OPRules.vue
View file @ fe5227b1
......@@ -44,6 +44,7 @@
<th>线路名称</th>
<th>系列名称</th>
<th>参与人员</th>
<th>部门</th>
<th>负责人金额</th>
<th>助理金额</th>
<th>描述</th>
......@@ -57,6 +58,7 @@
<td>{{item.LineName}}</td>
<td>{{item.LtName}}</td>
<td>{{item.EmployeeName}}</td>
<td>{{item.DepartmentName}}</td>
<td>{{item.ManagerMoney}}</td>
<td>{{item.InternMoney}}</td>
<td>{{item.Description}}</td>
......@@ -78,18 +80,26 @@
width="400px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-form-item label="公司" prop="BranchId">
<el-select filterable v-model="form.BranchId" >
<el-select filterable v-model="form.BranchId" @change='linkageDepartment()'>
<el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="参与人员" prop="EmployeeIdList">
<el-form-item label="参与人员">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.EmployeeIdList" >
<el-option label='全部' :value='-1'></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select>
</el-form-item>
<el-form-item label="部门">
<el-select filterable v-model="form.DepartmentId" @change='getDepart(form.DepartmentId)'>
<el-option label='全部' :value='-1'></el-option>
<el-option v-for="item in departmentList" :label="item.DepartmentName"
:value="item.DepartmentID" :key="item.DepartmentID"></el-option>
</el-select>
</el-form-item>
<el-form-item label="线路" prop="LineIdList">
<el-select class="multiple_input" filterable multiple collapse-tags v-model="form.LineIdList" @change="getLineTeamList">
<el-option label='全线' :value='-1' :key='-1'></el-option>
......@@ -102,13 +112,13 @@
</el-select>
</el-form-item>
<el-form-item label="负责人金额" prop="ManagerMoney">
<el-input @keyup.native="checkInteger(form,'ManagerMoney')" v-model="form.ManagerMoney"></el-input>
<el-input class="w220" @keyup.native="checkInteger(form,'ManagerMoney')" v-model="form.ManagerMoney"></el-input>
</el-form-item>
<el-form-item label="助理金额" prop="InternMoney">
<el-input @keyup.native="checkInteger(form,'InternMoney')" v-model="form.InternMoney"></el-input>
<el-input class="w220" @keyup.native="checkInteger(form,'InternMoney')" v-model="form.InternMoney"></el-input>
</el-form-item>
<el-form-item label="描述">
<el-input v-model="form.Description"></el-input>
<el-input class="w220" v-model="form.Description"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
......@@ -138,6 +148,7 @@ export default {
ruleVisible:false,
form:{
BranchId:"",
DepartmentId:-1,
Description:"",
EmployeeIdList:[],
LineIdList:[],
......@@ -145,6 +156,13 @@ export default {
InternMoney:'',
ManagerMoney:'',
},
departmentMsg: {
RB_Group_Id: '0',
RB_Branch_Id:'-1',
Status:'0',
ParentId:'-1',
Tier:'0',
},
LineTeamList:[],
EmployeeList:[],
rules:{
......@@ -160,6 +178,7 @@ export default {
ManagerMoney: [{ required: true, message: this.$t('rule.qsrjxmingcheng'), trigger: "blur" }],
InternMoney: [{ required: true, message: this.$t('rule.qsrjxmingcheng'), trigger: "blur" }],
},
departmentList:[]
}
},
created(){
......@@ -214,13 +233,16 @@ export default {
LtIdList:item.LtIdList,
InternMoney:item.InternMoney,
ManagerMoney:item.ManagerMoney,
DepartmentId:item.DepartmentId
}
// console.log("item",item);
// console.log("form",this.form);
this.departmentMsg.RB_Branch_Id=item.BranchId;
this.getDepartment();
this.getLineTeamList();
},
RulesOk(formName){
if(this.form.EmployeeIdList.length==0){
this.form.EmployeeIdList.push(-1)
}
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost(
......@@ -279,11 +301,9 @@ export default {
let msg = {
lineID: this.form.LineIdList[0],
}
console.log(" this.form.LineIdList[0]", this.form.LineIdList[0])
this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) {
this.LineTeamList = res.data.data;
console.log("this.LineTeamList",this.LineTeamList)
}
})
},
......@@ -315,18 +335,33 @@ export default {
}
});
},
getList(){
this.loading=true;
this.apipost("sellcommission_GetOPCommissionRuleList", this.obj, res => {
// console.log("ressfaf",res);
this.loading=false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
}
});
},
linkageDepartment(){
this.departmentMsg.RB_Branch_Id=this.form.BranchId;
this.departmentList=[];
this.form.DepartmentId=-1;
this.getDepartment();
},
getDepart(id){
this.form.DepartmentId= id;
this.$forceUpdate();
},
getDepartment() {
this.apipost('admin_get_DepartmentGetList', this.departmentMsg, res => {
if(res.data.resultCode == 1) {
this.departmentList = res.data.data;
}
}, err => {})
},
getList(){
this.loading=true;
this.apipost("sellcommission_GetOPCommissionRuleList", this.obj, res => {
this.loading=false;
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
}
});
},
}
}
......
src/components/FinancialModule/accDetail/PlatformAccDetail.vue
View file @ fe5227b1
......@@ -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/SalesModule/enrollTotal.vue
View file @ fe5227b1
......@@ -185,7 +185,7 @@
<th width="80">平台在途</th>
<th width="80">待收金额</th>
<th width="60">状态</th>
<th v-if="userId==1" width="140">操作</th>
<th v-if="isEditOrderCreate==1" width="140">操作</th>
</tr>
<tr>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td>
......@@ -330,12 +330,12 @@
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td v-if="item.isChargeLossOrders==1" class="fz12" style="color: #e95252">收损</td>
<td v-else class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td v-if="userId==1">
<td v-if="isEditOrderCreate==1">
<button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">修改业务员</button>
</td>
</tr>
<tr style="height:20px">
<td colspan="16" class="RL_Order" style="height:20px">
<td :colspan="isEditOrderCreate==1?17:16" class="RL_Order" style="height:20px">
<span style="font-size: 14px;color: #333333">名单:</span>
<span v-for="(childItem) in item.guestList" style="font-size: 14px;color: blue">{{childItem.userName}}&nbsp;&nbsp;</span>
<p v-if="item.cancelGuestList && item.cancelGuestList.length>0">
......@@ -530,6 +530,8 @@
OrderId:0
},
userId:0,
//修改订单业务员1-有权限
isEditOrderCreate:0,
};
},
methods: {
......@@ -764,11 +766,19 @@
query: { id: id,noDetail: 1,blank: "y",}
});
},
// 获取修改业务员权限
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
}
}, err => {})
},
},
mounted() {
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
this.GetEditOrderCreateByAuth();
this.getCompanyMsg.RB_Group_Id = this.getDepartmentMsg.RB_Group_Id = userInfo.RB_Group_id; //集团
this.getCompany();
......
src/components/SalesModule/groupTourOrder.vue
View file @ fe5227b1
......@@ -1781,7 +1781,7 @@
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="goUrlT('confirmationOrder',item.orderId)">确认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="isEditOrderCreate==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span
v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
......@@ -2009,6 +2009,8 @@
export default {
data() {
return {
//是否有修改业务员权限，1-有
isEditOrderCreate:0,
happy:false,
redBagList:[],
// 修改应收总额
......@@ -4159,9 +4161,17 @@
this.addMsg.CustomerId = '0'
this.Unit_PriceList=[];
},
// 获取修改业务员权限
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
}
}, err => {})
},
},
mounted() {
this.GetEditOrderCreateByAuth();
let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.TransferMission = userMenuCode.indexOf(',Sale_TurnGroup,') != -1 ? true : false;
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ fe5227b1
......@@ -2068,7 +2068,7 @@
<div @click="goUrlT('confirmationOrder',item.orderId)">确认函
{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}
</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="isEditOrderCreate==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span
v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
......@@ -2730,6 +2730,8 @@
export default {
data() {
return {
//修改业务员权限，1-有
isEditOrderCreate:0,
redBagList:[],
// 修改应收总额
Ysze: false,
......@@ -5174,8 +5176,17 @@
}, err => {})
},
// 获取修改业务员权限
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
}
}, err => {})
},
},
mounted() {
this.GetEditOrderCreateByAuth();
let userInfo = this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.TransferMission = userMenuCode.indexOf(',Sale_TurnGroup,') != -1 ? true : false;
......
src/components/SalesModule/groupTourOrderByTuanOne.vue
View file @ fe5227b1
......@@ -1736,7 +1736,7 @@
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="goUrlT('confirmationOrder',item.orderId)">确认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="isEditOrderCreate==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
......@@ -2031,7 +2031,7 @@
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="goUrlT('confirmationOrder',item.orderId)">确认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="isEditOrderCreate==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
<div v-if="item.isOrder=='1'&&(item.isHaveFinance=='1'||item.orderState=='1')" @click='getHouse(item)'>修改房型</div>
......@@ -2238,6 +2238,8 @@
export default {
data() {
return {
//修改订单业务员权限
isEditOrderCreate:0,
addObj:{},
// 修改应收总额
Ysze:false,
......@@ -4406,8 +4408,17 @@
}, err => {})
},
//获取修改业务员权限
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
}
}, err => {})
},
},
mounted() {
this.GetEditOrderCreateByAuth();
this.getList();
let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ fe5227b1
......@@ -1698,7 +1698,7 @@
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="goUrlT('confirmationOrder',item.orderId)">确认函{{item.operationState === 2 ? '（拒绝）' : item.operationState === 1 ? '（通过）' : item.operationState === 0 ? '(待审核)' : ''}}</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="isEditOrderCreate==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span
v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
......@@ -1911,6 +1911,8 @@
cityId: 0,
orderId: 0
},
//修改业务员权限
isEditOrderCreate:0,
userId: '',
customerId: '',
createByInfo: '',
......@@ -3875,9 +3877,17 @@
}
this.Unit_PriceList=[];
},
// 获取修改业务员权限
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
}
}, err => {})
},
},
mounted() {
this.GetEditOrderCreateByAuth();
let userInfo=this.getLocalStorage();
let userMenuCode = ',' + userInfo.ActionMenuCode + ',';
this.TransferMission = userMenuCode.indexOf(',Sale_TurnGroup,') != -1 ? true : false;
......
src/components/Ticketing/flightPerformance.vue
View file @ fe5227b1
......@@ -78,12 +78,20 @@
}
},
mounted() {
let date = new Date(),
y = date.getFullYear(),
m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
this.msg.QMonth = y + '-' + m;
this.initAirlines();
this.getEmployeeList();
if (this.$route.query.UserId) {
this.msg.CreateBy = Number(this.$route.query.UserId);
}
if (this.$route.query.Periods) {
var str = this.$route.query.Periods;
this.msg.QMonth = str.substring(0, 4) + "-" + str.substring(4);
} else {
let date = new Date(),
y = date.getFullYear(),
m = date.getMonth() < 10 ? "0" + (date.getMonth() + 1) : date.getMonth() + 1;
this.msg.QMonth = y + '-' + m;
}
this.initAirlines();
this.getList()
},
methods: {
......
src/components/TravelContractDetail.vue
View file @ fe5227b1
......@@ -732,8 +732,12 @@
<td>
{{item.TrifficType}}
</td>
<td>旅游酒店</td>
<td>双人间</td>
<td>
<span v-if="index!=tripList.length-1">旅游酒店</span>
</td>
<td>
<span v-if="index!=tripList.length-1">双人间</span>
</td>
</tr>
</tbody>
</table>
......
src/components/TravelContractNew.vue
View file @ fe5227b1
......@@ -737,7 +737,6 @@
</tr> -->
</tbody>
</table>
<div class="createTableTitle">争议的解决方式</div>
<table class="createTable">
<tbody>
<tr>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ fe5227b1
......@@ -1862,7 +1862,7 @@
<div class="groupTourOrder_more">
<div @click="goToPassenger(item)">旅客名单</div>
<div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="isEditOrderCreate==1" @click="getSalerInfo(item)">修改业务员</div>
<div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
<div v-if="OrderDataList.IsUpdateOrderCommission"
@click='TCMsg.OrderId = item.OrderId, TCMsg.CommissionMinusRate = item.CommissionMinusRate,TCMsg.LatestCommissionMoney=item.LatestCommissionMoney, TiChengLoading = true'>
......@@ -2152,7 +2152,7 @@
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="toTrip(childItem)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(childItem)">修改业务员</div>
<div v-if="isEditOrderCreate==1" @click="getSalerInfo(childItem)">修改业务员</div>
<div @click="transfer(childItem)">订单转团</div>
<div @click="OrderLoading=true,OrderLossInfo(childItem)" style="display:none;">订单收损</div>
<div
......@@ -2534,7 +2534,7 @@
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="isEditOrderCreate==1" @click="getSalerInfo(item)">修改业务员</div>
<div
@click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId,OPRemarkMsg.OP_Remarks=item.OP_Remarks'>
OP备注</div>
......@@ -2996,6 +2996,8 @@
export default {
data() {
return {
//修改订单业务员応
isEditOrderCreate:0,
importFileUrl2: '',
importNameFile: false,
HightUnitPrice: "0",
......@@ -5487,9 +5489,17 @@
}, err => {})
},
// 获取修改业务员权限
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
}
}, err => {})
},
},
mounted() {
this.GetEditOrderCreateByAuth();
let userInfo = this.getLocalStorage();
this.RBBranchId = userInfo.RB_Branch_id
this.userId = userInfo.EmployeeId;
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ fe5227b1
......@@ -344,7 +344,7 @@
<p>{{item.contactMobile}}</p>
<p v-if="item.industryCategory!==''" style="color:green">行业类别：{{item.industryCategory}}</p>
</td>
<td v-if="userId==1">
<td v-if="isEditOrderCreate==1">
<button class="normalBtn" @click="getSalerInfo(item)">修改业务员</button>
</td>
</tr>
......@@ -432,6 +432,8 @@
},
data() {
return {
//修改订单业务员权限
isEditOrderCreate:0,
redBagList:[],
normalizer(node) {
return {
......@@ -702,9 +704,17 @@
}
}, err => {})
},
//获取修改业务员权限
GetEditOrderCreateByAuth() {
this.apipost('sellorder_get_GetEditOrderCreateByAuth', {}, res => {
if (res.data.resultCode == 1) {
this.isEditOrderCreate=res.data.data;
}
}, err => {})
},
},
mounted() {
this.GetEditOrderCreateByAuth();
let userInfo = this.getLocalStorage();
this.userId = userInfo.EmployeeId;
this.getCompanyList()
......
src/components/administrative/AirticketCommissionDetail.vue
View file @ fe5227b1
......@@ -16,6 +16,7 @@
<th>总人数</th>
<th>提成金额</th>
<th>期数</th>
<th>详情</th>
</tr>
<tr v-for="item in dataList">
<td>{{item.BName}}</td>
......@@ -24,6 +25,7 @@
<td>{{item.TotalPersion}}</td>
<td>{{item.CommissionMoney}}</td>
<td>{{item.Periods}}</td>
<td><a @click="goUrl(item)" style="color:blue;text-decoration:underline;cursor:pointer;">详情</a></td>
</tr>
</table>
</div>
......@@ -64,8 +66,17 @@
null
);
},
}
goUrl(item) {
this.$router.push({
path: "flightPerformance",
query: {
UserId:item.UserId,
Periods:item.Periods,
blank: 'y',
tab: '票务业绩详情'
}
});
}
},
}
</script>
</script>
\ No newline at end of file
src/components/champion/mycareer.vue
View file @ fe5227b1
......@@ -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 @ fe5227b1
......@@ -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 @ fe5227b1
......@@ -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