Skip to content

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

新增登陆跳转

parent 95bd2ce5
Hide whitespace changes
Inline Side-by-side
Showing with 230 additions and 173 deletions
src/App.vue
View file @ c0f04e05
......@@ -168,7 +168,8 @@
document.URL.indexOf("clientProtocol") == -1 &&
document.URL.indexOf("clientDisclaimerProtocol") == -1 &&
document.URL.indexOf("TravelContractConfirm") == -1 &&
document.URL.indexOf("ViittoContractConfirm") == -1
document.URL.indexOf("ViittoContractConfirm") == -1&&
document.URL.indexOf("ticketSpider") == -1
) {
this.$router.push({
path: "/login"
......@@ -179,7 +180,8 @@
document.URL.indexOf("clientProtocol") != -1 ||
document.URL.indexOf("clientDisclaimerProtocol") != -1 ||
document.URL.indexOf("TravelContractConfirm") != -1 ||
document.URL.indexOf("ViittoContractConfirm") != -1
document.URL.indexOf("ViittoContractConfirm") != -1||
document.URL.indexOf("ticketSpider") != -1
) {
// 车系统改变 单页面方式
if(this.typeSystem==1) {
......
src/components/Details.vue
View file @ c0f04e05
......@@ -31,7 +31,8 @@
</div>
</div>
<div class="flexParent" v-if="openMode==1">
<div v-if="typeSystem==0" class="nav-tabs-box" @contextmenu.prevent="showRightMenu" :style="{width:`${navWidth}px`}">
<div v-if="typeSystem==0" class="nav-tabs-box" @contextmenu.prevent="showRightMenu"
:style="{width:`${navWidth}px`}">
<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">
......@@ -39,8 +40,8 @@
</el-tabs>
<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':currentTag && currentTag.hisIndex>0}" :title="$t('objFill.v101.houtui')"></i>
<i class="iconfont icon-houtui" @click="goback(0)" :class="{'active':currentTag && currentTag.hisIndex>0}"
:title="$t('objFill.v101.houtui')"></i>
<i class="iconfont icon-qianjin" @click="goback(1)"
:class="{'active':currentTag && currentTag.hisIndex<currentTag.history.length-1}"
:title="$t('objFill.v101.qianjin')"></i>
......@@ -67,7 +68,8 @@
<li class="split"></li>
<li @click="closeCurrent" :class="{'disable':tabs.length==1}">{{$t('objFill.v101.guanbibqian')}}</li>
<li @click="closeOther" :class="{'disable':tabs.length<2}">{{$t('objFill.v101.guanbiqitbq')}}</li>
<li @click="closeRight" :class="{'disable':currentRightIndex==tabs.length-1}">{{$t('objFill.v101.guanbiycbq')}}</li>
<li @click="closeRight" :class="{'disable':currentRightIndex==tabs.length-1}">{{$t('objFill.v101.guanbiycbq')}}
</li>
</ul>
</div>
</template>
......@@ -184,17 +186,18 @@
} else {
this.goUrl('/' + hrefs[hrefs.length - 1])
}
this.isRed = (this.getLocalStorage().ThemeType ? this.getLocalStorage().ThemeType : 0) == 1
this.isRed = (this.getLocalStorage()&&this.getLocalStorage().ThemeType ? this.getLocalStorage().ThemeType : 0) == 1
},
methods: {
nullMethod() {
},
changeMenuShowType() {
if(this.$route.path=='/TravelManager'){
if (this.$route.path == '/TravelManager') {
this.isCollapse = true;
localStorage.navsot = 'a'
}else{
} else {
this.isCollapse = !this.isCollapse;
localStorage.navsot = this.isCollapse ? 'a' : 'b'
}
......@@ -406,9 +409,12 @@
}
},
getMenu() {
this.menuList = this.getLocalStorage().UserMenu;
this.menuList = [];
var tempStorage = this.getLocalStorage();
if (tempStorage && tempStorage.UserMenu) {
this.menuList = tempStorage.UserMenu;
}
let path = this.$route.path.split("?")[0];
let root = 0;
let temprootName = ""; //根节点名称
let tempparentName = ""; //二级节点名称
......@@ -642,8 +648,11 @@
}
},
getMenuV2(path) {
this.menuList = this.getLocalStorage().UserMenu;
this.menuList = [];
var tempStorage = this.getLocalStorage();
if (tempStorage && tempStorage.UserMenu) {
this.menuList = tempStorage.UserMenu;
}
let root = 0;
let temprootName = ""; //根节点名称
let tempparentName = ""; //二级节点名称
......@@ -878,8 +887,11 @@
return tempcurrentName
},
getTitleByRouter(name) {
let obj = {title:""};
if (routerConfig.routes[12] && routerConfig.routes[12].children && routerConfig.routes[12].children.length>0) {
let obj = {
title: ""
};
if (routerConfig.routes[12] && routerConfig.routes[12].children && routerConfig.routes[12].children.length >
0) {
routerConfig.routes[12].children[0].children.forEach(x => {
if (x.name == name) {
obj.comp = x.component
......@@ -993,7 +1005,7 @@
window.localStorage.navTabs = JSON.stringify(this.tabs)
},
created() {
if(localStorage.typeSystem&&localStorage.typeSystem==1) this.typeSystem = localStorage.typeSystem
if (localStorage.typeSystem && localStorage.typeSystem == 1) this.typeSystem = localStorage.typeSystem
}
};
......
src/components/Login2019.vue
View file @ c0f04e05
......@@ -341,6 +341,13 @@
this.$cookie.set("RB_Group_id", userData.RB_Group_id);
localStorage.menu = JSON.stringify(firstTire)
this.loginState = 0;
if (this.$route.query && this.$route.query.path) {
var goPath = this.$route.query.path;
this.$router.push({
path: goPath
});
return;
}
if(!jsonData.data.IsExactness) {
this.$router.push({
path: "/resetPassword"
......
src/components/index.vue
View file @ c0f04e05
......@@ -72,7 +72,7 @@
<div class="nav-middle">
<ul class="clearfix comIndexUl" :style="{width:`${allWindowWidth}px`}">
<li v-for="(item,index) in menuList" v-if="item.MenuUrl!='' && index<=maxLength"
:class="{active:item.MenuId==chosenIndex}" @click="goUrl(item.MenuUrl,item.MenuId,index)" :key="`r_`+index">
:class="{active:item.MenuId==chosenIndex}" @click="goUrl(item.MenuUrl,item.MenuId,index)" :key="`r_`+index">
<span class="big_tittle"><i :class="[fontPub,item.icon]"></i>
{{item.MenuName}}
<span class="MenuConfirm" v-if="item.fatherCount>0">{{item.fatherCount}}</span>
......@@ -89,12 +89,14 @@
{{son.MenuName}}
<span class="MenuConfirm" v-if="son.childCount>0">{{son.childCount}}</span>
</p>
<div v-for="(grand, gIndex) in son.NewChildMenu" class="menuList_tittle_box" :key="`r_`+index+`_s_`+sIndex+`_g_`+gIndex">
<div v-for="(grand, gIndex) in son.NewChildMenu" class="menuList_tittle_box"
:key="`r_`+index+`_s_`+sIndex+`_g_`+gIndex">
<p v-if="grand.GCode !== '默认'" class="menuList_son_two_tittle">{{grand.GCode}}</p>
<template v-for="(grandSon, gsIndex) in grand.list">
<template v-if="(HOTEL_memorandum&&son.MenuId==647)||son.MenuId!=647">
<p @click.stop="goUrl(grandSon.MenuUrl,grandSon.MenuId,gsIndex)"
class="menuList_son_three_tittle" :key="`r_`+index+`_s_`+sIndex+`_g_`+gIndex+`_gs_`+gsIndex"><i
class="menuList_son_three_tittle" :key="`r_`+index+`_s_`+sIndex+`_g_`+gIndex+`_gs_`+gsIndex">
<i
:class="[fontPub,JSON.parse(grandSon.MenuStyle).icon ? JSON.parse(grandSon.MenuStyle).icon : 'icon-guanli2']"></i>
{{grandSon.MenuName}}
<span class="MenuConfirm" v-if="grandSon.Count>0">{{grandSon.Count}}</span>
......@@ -191,7 +193,7 @@
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("企业云盘")!==-1'
@click.native="goUrlT('myDocuments',-1,'企业云盘')">
<i class="iconfont icon-menu-yunpan" style="color:#2980b9"></i>
{{$t('objFill.v101.header.qiyeyunpan')}}
{{$t('objFill.v101.header.qiyeyunpan')}}
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
</template>
......@@ -199,19 +201,19 @@
v-if='firstMenuList.indexOf("常用付款对象") && (qjGroupId==userInfo.RB_Group_id || F_Finance_Create)'
@click.native="goUrlPayment()">
<i class="iconfont icon-menu-zhishiquan" style="color:#f39c12"></i>
{{$t('objFill.changyongfkdx')}}
{{$t('objFill.changyongfkdx')}}
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlContract()"
v-if="qjGroupId==userInfo.RB_Group_id||F_ContractManagement">
<i class="iconfont icon-hetong" style="color:#f39c12"></i>
{{$t('objFill.hetongguanli')}}
{{$t('objFill.hetongguanli')}}
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlZC()"
v-if="qjGroupId==userInfo.RB_Group_id">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
{{$t('objFill.zhicangl')}}
{{$t('objFill.zhicangl')}}
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlCRM()"
......@@ -258,8 +260,7 @@
{{$t('objFill.v101.header.zaixianxc')}}
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other"
@click.native="SalesBoard(1)">
<el-dropdown-item class="clearfix _dropdown_other" @click.native="SalesBoard(1)">
<i class="iconfont icon-chakan" style="color:#f39c12"></i>
{{$t('objFill.v102.xiaosousjkb')}}
<i class="iconfont icon-right1"></i>
......@@ -279,7 +280,7 @@
</li>
<template v-if="userInfo.RB_Group_id==2">
<li style="position: relative;">
<!--||MsgCount>0-->
<!--||MsgCount>0-->
<i class="iconfont icon-imessage_top"
:class="[(hasNewMsg>0) &&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']"
@click="IM_bodyIsShow=!IM_bodyIsShow,IM_navType=1"></i>
......@@ -298,14 +299,14 @@
<i v-if="language=='en-US'" class="iconfont icon-yingyu"></i>
</span>
<el-dropdown-menu class="changelanguage" slot="dropdown">
<el-dropdown-item @click.native="ChangeLan('Japanese')">{{$t('objFill.v101.header.lang.t1')}} <i v-if="language=='Japanese'"
class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-CN')">{{$t('objFill.v101.header.lang.t2')}} <i v-if="language=='zh-CN'"
class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-TW')">{{$t('objFill.v101.header.lang.t3')}} <i v-if="language=='zh-TW'"
class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('en-US')">{{$t('objFill.v101.header.lang.t4')}} <i v-if="language=='en-US'"
class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('Japanese')">{{$t('objFill.v101.header.lang.t1')}} <i
v-if="language=='Japanese'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-CN')">{{$t('objFill.v101.header.lang.t2')}} <i
v-if="language=='zh-CN'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('zh-TW')">{{$t('objFill.v101.header.lang.t3')}} <i
v-if="language=='zh-TW'" class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('en-US')">{{$t('objFill.v101.header.lang.t4')}} <i
v-if="language=='en-US'" class="iconfont icon-duigou"></i></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</li>
......@@ -316,7 +317,8 @@
<li v-if="userInfo.RB_Group_id==2">
<a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''"
style="color:#FFF">{{$t('objFill.v101.header.qianwangqt')}}</a>
<a href="javascript:alert($t('objFill.v101.header.weiktb2bxt'))" v-else style="color:#FFF">{{$t('objFill.v101.header.qianwangqt')}}</a>
<a href="javascript:alert($t('objFill.v101.header.weiktb2bxt'))" v-else
style="color:#FFF">{{$t('objFill.v101.header.qianwangqt')}}</a>
</li>
</ul>
</div>
......@@ -350,7 +352,8 @@
<div class="IM_tool" style='top: 41px;z-index: 1;' v-if="IM_navType!==3 && IM_navType!==52">
<div class="search">
<i class='iconfont icon-search search'></i>
<input type="text" class='s-box' :placeholder="$t('objFill.v101.header.sousuo')" v-model="newSearchContent" @keyup.enter="searchNameV2" />
<input type="text" class='s-box' :placeholder="$t('objFill.v101.header.sousuo')" v-model="newSearchContent"
@keyup.enter="searchNameV2" />
<i class="close iconfont icon-close" v-if='newSearchContent.length>0' @click="changeTools(0)"></i>
</div>
</div>
......@@ -430,7 +433,8 @@
<ul class="_SysNoteDate_ul" v-loading="SystemLog">
<li @click="redNotice(item.noticeId, item.title)" v-for="item in NoticeList" class="u-list-item">
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">{{$t('objFill.tongzi')}}</div>
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">
{{$t('objFill.tongzi')}}</div>
<div class="cont sys_cont">
<p class="name">{{item.groupName}}</p>
<p class="msg sys_msg">{{item.title}}</p>
......@@ -444,7 +448,8 @@
</div>
<div class='IM_contacts contact-box' v-show="IM_navType==2 && searchList.length===0">
<div class="contacts-type-box">
<div class="contacts-type-item" :class="{active:contactsType==0}" @click="changeContactGroup(0)">{{$t('objFill.v101.header.tongshi')}}</div>
<div class="contacts-type-item" :class="{active:contactsType==0}" @click="changeContactGroup(0)">
{{$t('objFill.v101.header.tongshi')}}</div>
<div class="contacts-type-item" :class="{active:contactsType==1}" @click="changeContactGroup(1)"
v-if="!useRed">{{$t('objFill.v101.header.qunliao')}}</div>
<el-tooltip effect="dark" :content="$t('objFill.v101.header.xinjianqunl')" placement="top-start">
......@@ -487,8 +492,8 @@
<div class='IM_contacts' v-show="IM_navType==4">
<div style="padding: 10px; border-bottom: 1px dashed rgba(134,142,148,.4); overflow: hidden;">
<div class="fl" style="width: 300px; margin-right: 10px;">
<el-input prefix-icon="el-icon-search" :placeholder="$t('objFill.v101.header.yuanghcqss')" v-model='searchKey' @input='isSearchType'
@keyup.enter.native="searchName"></el-input>
<el-input prefix-icon="el-icon-search" :placeholder="$t('objFill.v101.header.yuanghcqss')"
v-model='searchKey' @input='isSearchType' @keyup.enter.native="searchName"></el-input>
</div>
<div class="fl" style="font-size: 12px; color: #1BC594; margin-top: 2px; text-align: center;">
<i class="iconfont icon-ico_commodity_defaul" @click="saveGroup" style="cursor: pointer;"></i>
......@@ -528,7 +533,8 @@
</div>
</div>
<div v-show="IM_navType==5" class="IM_messageList">
<div class="sysMsgDiv">{{$t('objFill.v101.header.xitongxiaox')}}<span v-show="msglist">({{$t('hotel.hotel_totalRoom')}}{{this.msgList.length}}{{$t('hotel.hotel_item')}})</span>
<div class="sysMsgDiv">{{$t('objFill.v101.header.xitongxiaox')}}<span
v-show="msglist">({{$t('hotel.hotel_totalRoom')}}{{this.msgList.length}}{{$t('hotel.hotel_item')}})</span>
<span class="fr">
<i @click="deletMsg(0)" class="iconfont icon-xingzhuang"></i>
&nbsp;
......@@ -538,7 +544,8 @@
<ul class="_SysNoteDate_ul" v-loading="SystemLog">
<li @click="LogSetReadStatus(session)" v-for="(session, index) in msgList" class="u-list-item">
<div style="float: left; width: 38px; height: 38px; border-radius: 19px;background: #6694DC;
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">{{$t('restaurant.res_system')}}</div>
margin: 0px 10px; font-size: 14px; text-align: center; line-height: 38px; color: #fff;">
{{$t('restaurant.res_system')}}</div>
<div class="cont sys_cont">
<p class="name">{{session.Title}}</p>
<p class="msg sys_msg">{{session.Content}}</p>
......@@ -572,8 +579,7 @@
<img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg">
&nbsp;
{{item.createEmName}}
<span class="fr"
style="font-size: 12px; color: #999;">{{diaplayTime(item.createTime)}}</span>
<span class="fr" style="font-size: 12px; color: #999;">{{diaplayTime(item.createTime)}}</span>
</p>
<p class="artcleCont" style="font-weight:bold;letter-spacing:2px;">
{{getResetTime(item.createTime)}}
......@@ -658,8 +664,7 @@
<img v-else :src="item.crearteEmPhoto" alt="" :onerror="defaultImg">
&nbsp;
{{item.createEmName}}
<span class="fr"
style="font-size: 12px; color: #999;">{{diaplayTime(item.createTime)}}</span>
<span class="fr" style="font-size: 12px; color: #999;">{{diaplayTime(item.createTime)}}</span>
</p>
<p class="artcleCont">{{item.content|decodeURIComponent(item.content)}}</p>
<p class="artclePic" v-if='item.fileType==1'>
......@@ -930,7 +935,8 @@
<p
style="line-height: 14px; height: 14px; border-left:3px solid #E95252; margin-bottom: 10px; font-size: 14px; text-indent: 10px;">
{{$t('objFill.v101.header.fabudongt')}}</p>
<el-input type="textarea" :rows="4" maxlength='50' :placeholder="$t('objFill.v101.header.zheyikxf')+'...'" v-model='dynamicCont'> </el-input>
<el-input type="textarea" :rows="4" maxlength='50' :placeholder="$t('objFill.v101.header.zheyikxf')+'...'"
v-model='dynamicCont'> </el-input>
<p style="margin: 10px 0;">
<el-upload action="" :file-list="imgList" :http-request="UploadAttachment" :multiple="false" :limit="9"
accept="image/jpeg,image/gif,image/png,image/bmp" list-type="picture-card" :on-remove="handleRemoveImg">
......@@ -953,7 +959,8 @@
</div>
<div class="inlogs_Content" v-html="versionList[0].UpdateContent">
</div>
<input type="button" :value="$t('objFill.v101.header.wozhidl')" class="normalBtn" style="margin:10px 0 15px 155px;" @click="logsShow=false" />
<input type="button" :value="$t('objFill.v101.header.wozhidl')" class="normalBtn"
style="margin:10px 0 15px 155px;" @click="logsShow=false" />
</div>
</div>
<div class="downmz" v-show="downmz">
......@@ -1078,12 +1085,13 @@
{{addOrUpdate==0?$t('objFill.v101.header.yaoqingxcy'):$t('objFill.v101.header.xinjianqunl')}}
</div>
<div class="new-group-name" v-if="addOrUpdate==1">
<input type="text" :placeholder="$t('objFill.v101.header.qingsrqmc')" v-model="groupName" class="search-input" />
<input type="text" :placeholder="$t('objFill.v101.header.qingsrqmc')" v-model="groupName"
class="search-input" />
</div>
<div class="group-body">
<div class="group-body-item">
<input type="text" :placeholder="$t('objFill.v101.header.sosuots')" v-model="newSearchContent" class="search-input"
@keyup.enter="searchNameV3" @keyup="emptyChangeBox" />
<input type="text" :placeholder="$t('objFill.v101.header.sosuots')" v-model="newSearchContent"
class="search-input" @keyup.enter="searchNameV3" @keyup="emptyChangeBox" />
<div class="search-result-box">
<el-tree :data='webAllpartList' v-show="groupboxSearch==0" :props="defaultProps1">
<span class="custom-tree-node" slot-scope="{ node, data }" :style="{'padding':data.Type==2?'5px 0':''}">
......@@ -1152,7 +1160,8 @@
</div>
<div class="cl-name">{{$t('objFill.v101.header.qunzhumc')}}</div>
<div class="new-group-name">
<input type="text" :placeholder="$t('objFill.v101.header.qingsrqmc')" v-model="currentSession.name" class="search-input" />
<input type="text" :placeholder="$t('objFill.v101.header.qingsrqmc')" v-model="currentSession.name"
class="search-input" />
</div>
<div class="cl-name">{{$t('objFill.v101.header.qunzhucy')}}</div>
<div class="group-body" style="height:200px;position: relative;margin-bottom:15px;border-bottom: 1px solid #eee">
......@@ -1190,15 +1199,15 @@
</div>
</el-dialog>
<a class="weOytour" ref="weOytour" href="http://we.oytour.com:8110/" target="view_window">Preface</a>
<el-dialog v-if="typeSystem==0" custom-class='w800 PingFangSC _saleRnk' :title="$t('sm.saleRank')" :visible.sync="saleRnkShow"
center :before-close="closeChangeMachie">
<el-dialog v-if="typeSystem==0" custom-class='w800 PingFangSC _saleRnk' :title="$t('sm.saleRank')"
:visible.sync="saleRnkShow" center :before-close="closeChangeMachie">
<saleRnk :detail='NewSaleRnkInfo' @closeChangeMachie="closeChangeMachie" />
</el-dialog>
<!-- 提成账单 -->
<el-dialog custom-class='w700 addTichengDialog' :title="$t('objFill.v101.header.tichengzhangdan')" :visible.sync="commissionDialog" center
:before-close="resetClose">
<el-dialog custom-class='w700 addTichengDialog' :title="$t('objFill.v101.header.tichengzhangdan')"
:visible.sync="commissionDialog" center :before-close="resetClose">
<commissonBill v-if="isShowBill" @Close="changeComponent" :articleId='articleId' :userId='createEmpId'
ref="myBill"></commissonBill>
<commissionDetail v-else @changeDiv="changeDis" :userId='createEmpId' ref="myBillDetail"></commissionDetail>
......@@ -1228,7 +1237,8 @@
<img class="tsbg" style="width:100%;height:100%" src="../assets/img/ts.png" alt="">
</div>
<div style="text-align:center">
<p style="font-size:26px;color:#111111;margin:40px 0">{{$t('tips.di')}}{{tsNumber}}{{$t('objFill.v101.header.qitoushualfxyfb')}}</p>
<p style="font-size:26px;color:#111111;margin:40px 0">
{{$t('tips.di')}}{{tsNumber}}{{$t('objFill.v101.header.qitoushualfxyfb')}}</p>
<a @click="CloseTs" target="_blank" href="http://we.oytour.com:8110/?/question/42"
style="font-size:18px;color:#E95252;cursor:pointer;text-decoration:underline">{{$t('pub.clickToView')}}</a>
</div>
......@@ -1256,8 +1266,9 @@
<ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible" :type="1" :msg="ExamineThePriceMsg"
:ChangeThePriceObj="ChangeThePriceObj"
@ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
<!-- 机票未维护人数提示 -->
<AirTicketMessage v-if="AirTicketVisible" :AirTicketListObj="AirTicketList" @AirTicketVisible="AirTicketVisible=false">
<!-- 机票未维护人数提示 -->
<AirTicketMessage v-if="AirTicketVisible" :AirTicketListObj="AirTicketList"
@AirTicketVisible="AirTicketVisible=false">
</AirTicketMessage>
<!-- ppt 模版新增编辑窗口 -->
<!-- <pptIframe v-show="dialogPptistVisible" :Url="TemplateUrl" @close="closeIframe()"></pptIframe> -->
......@@ -1334,11 +1345,11 @@
ExamineThePriceData: [],
ChangeThePriceData: [],
},
AirTicketList:{
count:0,
Data:[],
},//票务管理未维护开票信息 2024-10-28 add by:W
AirTicketVisible:false,//弹窗 2024-10-28 add by:W
AirTicketList: {
count: 0,
Data: [],
}, //票务管理未维护开票信息 2024-10-28 add by:W
AirTicketVisible: false, //弹窗 2024-10-28 add by:W
UnboundDate: {},
UnTravelDate: null,
......@@ -1839,7 +1850,7 @@
this.isShowMore = false
}
this.b2bDomain = this.userInfo.B2BDomain
this.useRed = (this.userInfo.ThemeType ? this.userInfo.ThemeType : 0) == 1
this.useRed = (this.userInfo && this.userInfo.ThemeType ? this.userInfo.ThemeType : 0) == 1
this.MsgBus.$emit("changeTheme", this.useRed)
document.title = this.userInfo.GroupName
if (this.userInfo.Icon != null) {
......@@ -1938,10 +1949,10 @@
//获取票务管理未维护开票信息提醒的数据
if ((!localStorage.getItem("AirTicketDataTime") ||
(localStorage.getItem("AirTicketDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
)) {
this.GetAirTicketList()
}
(localStorage.getItem("AirTicketDataTime") != this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))
)) {
this.GetAirTicketList()
}
// 获取改价及审核提醒 每月1到10号提示
......@@ -2020,15 +2031,16 @@
//this.testApi();
//this.testEmp();
let userinfo = this.getLocalStorage();
let ActionMenuCode = userinfo.ActionMenuCode;
if (ActionMenuCode.indexOf("HOTEL_memorandum") != -1) {
this.HOTEL_memorandum = true;
if (userinfo && userinfo.ActionMenuCode) {
let ActionMenuCode = userinfo.ActionMenuCode;
if (ActionMenuCode.indexOf("HOTEL_memorandum") != -1) {
this.HOTEL_memorandum = true;
}
}
this.RankingTime = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
if(!localStorage.getItem("RankingTime")||this.RankingTime!=localStorage.getItem("RankingTime")){
if (!localStorage.getItem("RankingTime") || this.RankingTime != localStorage.getItem("RankingTime")) {
this.SalesBoard()
}
},
watch: {
filterText(val) {
......@@ -2045,7 +2057,7 @@
let href = this.domainManager().SalesBoardUrl
this.TemplateUrl = `${href}/autoLogin?uid=${res.data.data}`
this.dialogRankingVisible = true
if(!localStorage.getItem("RankingTime")||this.RankingTime!=localStorage.getItem("RankingTime")){
if (!localStorage.getItem("RankingTime") || this.RankingTime != localStorage.getItem("RankingTime")) {
localStorage.setItem("RankingTime", this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")));
}
// window.open(this.TemplateUrl)
......@@ -2195,64 +2207,64 @@
// 获取票务管理未维护开票信息提醒的数据
GetAirTicketList(type) {
this.userId = this.userInfo.EmployeeId;
if(this.userInfo.RB_Department_Id==359||this.userInfo.RB_Department_Id==361){
if (this.userInfo.RB_Department_Id == 359 || this.userInfo.RB_Department_Id == 361) {
let today = new Date();
// 获取上个月的第一天
let firstDayOfLastMonth = new Date(today.getFullYear(), today.getMonth(), 1);
let Year = firstDayOfLastMonth.getFullYear()
let Month = firstDayOfLastMonth.getMonth()
let Months = Month > 9 ? Month : '0' + Month
let day = firstDayOfLastMonth.getDate()
let days = day > 9 ? day : '0' + day
let DepartSTime = Year + '-' + Months + '-' + days
// 获取上个月的最后一天
let lastDayOfLastMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0);
let eYear = lastDayOfLastMonth.getFullYear()
let eMonth = lastDayOfLastMonth.getMonth()
let eMonths = eMonth > 9 ? eMonth : '0' + eMonth
let eday = lastDayOfLastMonth.getDate()
let edays = eday > 9 ? eday : '0' + eday
let DepartETime = eYear + '-' + eMonths + '-' + edays
let msg = {
pageIndex: 1,
pagesize: 6,
AirLineID: 0,
DepositType: 0,
OpenPlatform: 0,
QFlightDateStart:DepartSTime,
QFlightDateEnd: DepartETime,
CreateBy: this.userId,
FlyState: 1,
LineId: 0,
ID: 0,
TicketType: 0,
IsLimit: 1,
Departure_city: 0,
SellType: -1,
IsSelectInvoicing: 1,
IsNoTCID: 0,
TravelTicketType: 0,
BId: -1,
}
this.AirTicketList.count = 0;
this.AirTicketList.Data = [];
this.apipost(
"AirTicket_get_GetNewPageList", msg,
res => {
if (res.data.resultCode == 1) {
if (res.data.data && res.data.data.count > 0 && res.data.data.pageData.length > 0) {
if (!this.AirTicketList.count) this.AirTicketList.count = res.data.data.count
localStorage.setItem("AirTicketDataTime", this.getBeforeDate(0, new Date().Format(
"yyyy-MM-dd")));
this.AirTicketList.Data = res.data.data.pageData
this.AirTicketVisible = true
} else {
this.AirTicketVisible = false
localStorage.removeItem("AirTicketDataTime");
// 获取上个月的第一天
let firstDayOfLastMonth = new Date(today.getFullYear(), today.getMonth(), 1);
let Year = firstDayOfLastMonth.getFullYear()
let Month = firstDayOfLastMonth.getMonth()
let Months = Month > 9 ? Month : '0' + Month
let day = firstDayOfLastMonth.getDate()
let days = day > 9 ? day : '0' + day
let DepartSTime = Year + '-' + Months + '-' + days
// 获取上个月的最后一天
let lastDayOfLastMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0);
let eYear = lastDayOfLastMonth.getFullYear()
let eMonth = lastDayOfLastMonth.getMonth()
let eMonths = eMonth > 9 ? eMonth : '0' + eMonth
let eday = lastDayOfLastMonth.getDate()
let edays = eday > 9 ? eday : '0' + eday
let DepartETime = eYear + '-' + eMonths + '-' + edays
let msg = {
pageIndex: 1,
pagesize: 6,
AirLineID: 0,
DepositType: 0,
OpenPlatform: 0,
QFlightDateStart: DepartSTime,
QFlightDateEnd: DepartETime,
CreateBy: this.userId,
FlyState: 1,
LineId: 0,
ID: 0,
TicketType: 0,
IsLimit: 1,
Departure_city: 0,
SellType: -1,
IsSelectInvoicing: 1,
IsNoTCID: 0,
TravelTicketType: 0,
BId: -1,
}
this.AirTicketList.count = 0;
this.AirTicketList.Data = [];
this.apipost(
"AirTicket_get_GetNewPageList", msg,
res => {
if (res.data.resultCode == 1) {
if (res.data.data && res.data.data.count > 0 && res.data.data.pageData.length > 0) {
if (!this.AirTicketList.count) this.AirTicketList.count = res.data.data.count
localStorage.setItem("AirTicketDataTime", this.getBeforeDate(0, new Date().Format(
"yyyy-MM-dd")));
this.AirTicketList.Data = res.data.data.pageData
this.AirTicketVisible = true
} else {
this.AirTicketVisible = false
localStorage.removeItem("AirTicketDataTime");
}
}
}
}
);
);
}
},
......@@ -2301,7 +2313,7 @@
var cmd = "";
cmd = "";
postMsg = {
hotelId:""
hotelId: ""
}
if (cmd != '') {
this.apipost(
......@@ -2326,7 +2338,7 @@
);
},
testDownLoad() {
var fileName = this.$t('objFill.v101.header.querenshuxz')+".doc";
var fileName = this.$t('objFill.v101.header.querenshuxz') + ".doc";
var msg = {
FinanceId: "81461"
};
......@@ -2867,7 +2879,7 @@
done: (error, team) => {
this.isUpdateGroup = false;
if (error) {
this.$message.error(this.$t('objFill.v101.header.shibai')+'!');
this.$message.error(this.$t('objFill.v101.header.shibai') + '!');
} else {
this.$store.state.teamlist.forEach(x => {
if (x.teamId == this.currentSession.teamInfo.teamId) {
......@@ -2942,7 +2954,7 @@
leaveTeam() {
let that = this;
this.editorTeam = false;
this.$confirm(this.$t('objFill.v101.header.shifoutuiq')+'?', this.$t('tips.tips'), {
this.$confirm(this.$t('objFill.v101.header.shifoutuiq') + '?', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: "warning"
......@@ -2957,7 +2969,7 @@
),
done: (error, obj) => {
if (!error) {
this.$message.success(this.$t('objFill.v101.header.niyicgtuiq')+'!');
this.$message.success(this.$t('objFill.v101.header.niyicgtuiq') + '!');
this.IM_Chatlayer = false;
this.IM_navType = 1;
this.$store.dispatch(
......@@ -2965,14 +2977,14 @@
window.localStorage.sessionId
);
} else {
this.$message.error(this.$t('objFill.v101.header.tuiquanshib')+'!');
this.$message.error(this.$t('objFill.v101.header.tuiquanshib') + '!');
}
}
}
});
})
.catch(() => {
this.$message.info(this.$t('hotel.hotel_HasBeenCancelled')+'!');
this.$message.info(this.$t('hotel.hotel_HasBeenCancelled') + '!');
});
},
deleteFriend(account) {
......@@ -2994,7 +3006,7 @@
accounts: [account],
done: (error, obj) => {
if (error) {
this.$message.error(this.$t('objFill.v101.header.nimeiygczqx')+'!');
this.$message.error(this.$t('objFill.v101.header.nimeiygczqx') + '!');
} else {
this.oldGroupMemberList.forEach((item, index) => {
if (item.account == account) {
......@@ -3077,7 +3089,7 @@
}
}
} else {
this.$message.warning(this.$t('objFill.v101.header.gaiyuangzbkjq')+'!');
this.$message.warning(this.$t('objFill.v101.header.gaiyuangzbkjq') + '!');
if (this.IMList.findIndex(item => item === null) != -1) {
this.IMList.splice(this.IMList.findIndex(item => item === null), 1);
}
......@@ -3102,7 +3114,7 @@
this.GroupMemberList.splice(_index, 1);
}
} else {
this.$message.warning(this.$t('objFill.v101.header.gaiyuangzbkjq')+'!');
this.$message.warning(this.$t('objFill.v101.header.gaiyuangzbkjq') + '!');
if (this.IMList.findIndex(item => item === null) != -1) {
this.IMList.splice(this.IMList.findIndex(item => item === null), 1);
}
......@@ -3151,7 +3163,7 @@
saveGroup() {
if (this.newGroup) {
if (this.IMList.length < 1) {
this.$message.warning(this.$t('objFill.v101.header.jianqunzsyygcy')+'!');
this.$message.warning(this.$t('objFill.v101.header.jianqunzsyygcy') + '!');
return;
}
let textName = this.$t('objFill.taolunzhu')
......@@ -3167,7 +3179,7 @@
this.$message.error(this.$t('objFill.v101.header.chuanjqzsb'));
}
if (!error) {
this.$message.success(this.$t('objFill.chenggong')+'!');
this.$message.success(this.$t('objFill.chenggong') + '!');
this.$store.state.teamlist.push(obj.team);
this.searchUsers(obj.accounts);
this.clearBuildGroup();
......@@ -3188,7 +3200,7 @@
accounts: this.IMList,
done: (error, obj) => {
if (error) {
this.$message.error(this.$t('objFill.v101.header.xiugaicysb')+'!');
this.$message.error(this.$t('objFill.v101.header.xiugaicysb') + '!');
return;
}
if (!error) {
......@@ -3200,7 +3212,7 @@
),
this.IMList
);
this.$message.success(this.$t('objFill.chenggong')+'!');
this.$message.success(this.$t('objFill.chenggong') + '!');
this.clearBuildGroup();
this.IM_navType = 1;
}
......@@ -3435,7 +3447,8 @@
this.searchList = [];
}
this.searchList = res.data.data;
let arrText = [this.$t('objFill.v101.header.meiythndltxx'),this.$t('objFill.v101.header.gaiygwktltgn')]
let arrText = [this.$t('objFill.v101.header.meiythndltxx'), this.$t(
'objFill.v101.header.gaiygwktltgn')]
this.searchList.forEach(x => {
x.lastMsg = arrText[0];
if (!x.imAccount || x.imAccount == "")
......@@ -3595,7 +3608,7 @@
);
})
.catch(() => {
this.$message.info(this.$t('objFill.yiquxsq')+'!');
this.$message.info(this.$t('objFill.yiquxsq') + '!');
});
},
likeArticle(id, index) {
......@@ -3916,7 +3929,7 @@
});
},
handleExceed(files, fileList) {
this.$message.warning(this.$t('objFill.v101.header.zuiduoscjzt')+'!');
this.$message.warning(this.$t('objFill.v101.header.zuiduoscjzt') + '!');
},
clearDialogMsg(done) {
done();
......@@ -4068,7 +4081,7 @@
this.transferMsg.WorkFlowId = this.workFlowId;
this.transferMsg.TemplateType = this.templateType;
if (this.transferMsg.CareOfEmId == "-1") {
this.$message.warning(this.$t('objFill.qxzzjiaoren')+'!');
this.$message.warning(this.$t('objFill.qxzzjiaoren') + '!');
return;
}
this.apipost(
......@@ -4236,7 +4249,11 @@
});
},
getMenu() {
var tempList = this.getLocalStorage().UserMenu;
var tempList = [];
var tempStoreage = this.getLocalStorage();
if (tempStoreage && tempStoreage.UserMenu) {
tempList = tempStoreage.UserMenu;
}
tempList.forEach(x => {
if (x.ParentId == 0) {
let menuStyle = JSON.parse(x.MenuStyle);
......@@ -4286,7 +4303,11 @@
},
//设置菜单选中
setCheckMenu() {
var tempMenuList = this.getLocalStorage().UserMenu;
var tempMenuList = [];
var tempStoreage = this.getLocalStorage();
if (tempStoreage && tempStoreage.UserMenu) {
tempMenuList = tempStoreage.UserMenu;
}
let path = this.$route.path.split("?")[0];
let root = 0;
//三级下面的子页面
......@@ -4525,7 +4546,7 @@
if (Time != '' && Time != null) {
let newTime = Time.split(' ')[0];
let endDate = newTime.split('-');
return endDate[0] + this.$t('pub.year') +endDate[1] + this.$t('pub.month') +endDate[2] + this.$t('fnc.day')
return endDate[0] + this.$t('pub.year') + endDate[1] + this.$t('pub.month') + endDate[2] + this.$t('fnc.day')
}
},
//打开详情
......
src/plug/index.js
View file @ c0f04e05
......@@ -122,7 +122,7 @@ export default {
let locationName = window.location.hostname;
let isOnline = 0; //0-本地测试，1-线上
let ocrUrl = "http://192.168.5.46:8888";
domainUrl = "http://192.168.5.214";
domainUrl = "http://192.168.5.46";
let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
let javaUrldo = "";
......@@ -248,7 +248,6 @@ export default {
//警告提示
Vue.prototype.Warning = function (msg) {
this.$message({
message: msg,
duration: 2000,
type: "warning"
......@@ -383,7 +382,7 @@ export default {
}
})
} else {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login") {
if (!localStorage.userInfo && localStorage.userInfo != "" && this.$route.path.toLowerCase() != "/login" && this.$route.path.toLowerCase() != "/ticketspider") {
this.goToLogin(1);
}
}
......@@ -973,8 +972,21 @@ export default {
},
//跳转到登录页面
Vue.prototype.goToLogin = function (type) {
var newpath = "";
var query = {};
if (this.$route.path) {
newpath = this.$route.path;
//ticketSpider?AirticketId=6995
if (this.$route.query.AirticketId) {
newpath = newpath + "?AirticketId=" + this.$route.query.AirticketId;
query = {
path: newpath
};
}
}
this.$router.push({
path: '/login'
path: '/login',
query
})
},
//ERP本地缓存
......@@ -1314,7 +1326,7 @@ export default {
poise = 'm_h'
}
var newpath = path.replace('http://192.168.5.214:8130', '').replace('https://imgfile.oytour.com', '').replace('https://imgfile.oytour.com', '').split('?')[0];
console.log(url + '/image/index?filePath=' + newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h,'------------------')
console.log(url + '/image/index?filePath=' + newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h, '------------------')
return url + '/image/index?filePath=' + newpath + '&process=resize,' + poise + ',w_' + w + ',h_' + h;
}
......@@ -1973,4 +1985,4 @@ export default {
return language;
}
}
}
\ No newline at end of file
}
src/store/actions/index.js
View file @ c0f04e05
......@@ -20,22 +20,25 @@ import {createTeam} from './team'
function connectNim ({state, commit, dispatch}, obj) {
let _storage=JSON.parse(window.localStorage.userInfo);
let {force} = Object.assign({}, obj)
// 操作为内容页刷新页面，此时无nim实例
if (!state.nim || force) {
let loginInfo = {
// uid: '15281055345',
// uid: '18380464246',
uid: _storage.ImAccount,
sdktoken: _storage.ImToken
}
if (!loginInfo.uid) {
// 无cookie，直接跳转登录页
pageUtil.turnPage('无历史登录记录，请重新登录', 'login')
} else {
// 有cookie，重新登录
dispatch('initNimSDK', loginInfo)
if(window.localStorage&&window.localStorage.userInfo)
{
let _storage=JSON.parse(window.localStorage.userInfo);
let {force} = Object.assign({}, obj)
// 操作为内容页刷新页面，此时无nim实例
if (!state.nim || force) {
let loginInfo = {
// uid: '15281055345',
// uid: '18380464246',
uid: _storage.ImAccount,
sdktoken: _storage.ImToken
}
if (!loginInfo.uid) {
// 无cookie，直接跳转登录页
pageUtil.turnPage('无历史登录记录，请重新登录', 'login')
} else {
// 有cookie，重新登录
dispatch('initNimSDK', loginInfo)
}
}
}
}
......
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