Skip to content

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

页面修改

parent d3c5235f
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 102 deletions
src/components/Hotel/singleProduct/HotelQueryList.vue
View file @ 2fac6c80
...@@ -46,10 +46,7 @@ ...@@ -46,10 +46,7 @@
<span> <span>
<em>酒店</em> <em>酒店</em>
<el-input type="" v-model="msg.HotelName" placeholder="酒店名称"></el-input> <el-input type="" v-model="msg.HotelName" placeholder="酒店名称"></el-input>
<!-- <el-select v-model="msg.HotelChooseArray" :placeholder="$t('pub.pleaseSel')" class="multiple_input w300"
filterable multiple collapse-tags :multiple-limit="3">
<el-option v-for="item in HotelList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select> -->
</span> </span>
</li> </li>
...@@ -220,7 +217,7 @@ ...@@ -220,7 +217,7 @@
OpType: 0, OpType: 0,
}, },
//默认显示弹窗信息 //默认显示弹窗信息
showHQinfo: true, showHQinfo: false,
//酒店温馨提示列表 //酒店温馨提示列表
HotelTipList: [], HotelTipList: [],
//供应商列表 //供应商列表
...@@ -414,7 +411,6 @@ ...@@ -414,7 +411,6 @@
this.HOTEL_memorandum = true; this.HOTEL_memorandum = true;
} }
this.getProvinceList("651", 1); this.getProvinceList("651", 1);
// this.GetHotelList();//酒店名称下拉
this.getList(); this.getList();
this.com_onresize(); this.com_onresize();
window.onresize = () => { window.onresize = () => {
......
src/components/index.vue
View file @ 2fac6c80
...@@ -179,19 +179,22 @@ ...@@ -179,19 +179,22 @@
<el-badge class="mark" :value="NotDealCount?NotDealCount:'0'" /> <el-badge class="mark" :value="NotDealCount?NotDealCount:'0'" />
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("考勤")!==-1' <template v-if="userInfo&&userInfo.RB_Group_id==2">
@click.native="goUrlT('myApproval',-1,'考勤')">
<i class="iconfont icon-menu-kaoqin" style="color:#27ae60"></i> <el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("考勤")!==-1'
考勤 @click.native="goUrlT('myApproval',-1,'考勤')">
<el-badge class="mark" :value="MyAuditCount?MyAuditCount:'0'" /> <i class="iconfont icon-menu-kaoqin" style="color:#27ae60"></i>
<i class="iconfont icon-right1"></i> 考勤
</el-dropdown-item> <el-badge class="mark" :value="MyAuditCount?MyAuditCount:'0'" />
<el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("企业云盘")!==-1' <i class="iconfont icon-right1"></i>
@click.native="goUrlT('myDocuments',-1,'企业云盘')"> </el-dropdown-item>
<i class="iconfont icon-menu-yunpan" style="color:#2980b9"></i> <el-dropdown-item class="clearfix _dropdown_other" v-if='firstMenuList.indexOf("企业云盘")!==-1'
企业云盘 @click.native="goUrlT('myDocuments',-1,'企业云盘')">
<i class="iconfont icon-right1"></i> <i class="iconfont icon-menu-yunpan" style="color:#2980b9"></i>
</el-dropdown-item> 企业云盘
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
</template>
<el-dropdown-item class="clearfix _dropdown_other" <el-dropdown-item class="clearfix _dropdown_other"
v-if='firstMenuList.indexOf("常用付款对象") && (qjGroupId==userInfo.RB_Group_id || F_Finance_Create)' v-if='firstMenuList.indexOf("常用付款对象") && (qjGroupId==userInfo.RB_Group_id || F_Finance_Create)'
@click.native="goUrlPayment()"> @click.native="goUrlPayment()">
...@@ -224,19 +227,19 @@ ...@@ -224,19 +227,19 @@
机票未绑团查看 机票未绑团查看
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" <el-dropdown-item v-if="userInfo.RB_Group_id==2 && ChangeThePriceList.length>0" class="clearfix _dropdown_other"
@click.native="GetChangeThePrice(1),GetExaminePriceOrderPageList(1)"> @click.native="GetChangeThePrice(1),GetExaminePriceOrderPageList(1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i> <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
订单改价查看 订单改价查看
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="userInfo.IsEditTripTemplate==1" class="clearfix _dropdown_other" <el-dropdown-item v-if="userInfo.RB_Group_id==2 && userInfo.IsEditTripTemplate==1" class="clearfix _dropdown_other"
@click.native="journeyTemplate()"> @click.native="journeyTemplate()">
<i class="iconfont icon-pdf" style="color:#f39c12"></i> <i class="iconfont icon-pdf" style="color:#f39c12"></i>
添加/编辑模版 添加/编辑模版
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="journeyTemplate(1)"> <el-dropdown-item v-if="userInfo.RB_Group_id==2" class="clearfix _dropdown_other" @click.native="journeyTemplate(1)">
<i class="iconfont icon-pdf" style="color:#f39c12"></i> <i class="iconfont icon-pdf" style="color:#f39c12"></i>
在线行程 在线行程
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
...@@ -254,6 +257,7 @@ ...@@ -254,6 +257,7 @@
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</li> </li>
<template v-if="userInfo.RB_Group_id==2">
<li style="position: relative;"> <li style="position: relative;">
<i class="iconfont icon-imessage_top" <i class="iconfont icon-imessage_top"
:class="[hasNewMsg>0&&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']" :class="[hasNewMsg>0&&!IM_bodyIsShow?'animation red':'',IM_bodyIsShow?'red':'']"
...@@ -263,6 +267,7 @@ ...@@ -263,6 +267,7 @@
<li v-if="!useRed"><i class="iconfont icon-gonggao" <li v-if="!useRed"><i class="iconfont icon-gonggao"
@click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i> @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i>
</li> </li>
</template>
<li> <li>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
<span class="el-dropdown-link"> <span class="el-dropdown-link">
...@@ -279,15 +284,15 @@ ...@@ -279,15 +284,15 @@
<el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'" <el-dropdown-item @click.native="ChangeLan('zh-TW')">繁体中文 <i v-if="language=='zh-TW'"
class="iconfont icon-duigou"></i></el-dropdown-item> class="iconfont icon-duigou"></i></el-dropdown-item>
<el-dropdown-item @click.native="ChangeLan('en-US')">English <i v-if="language=='en-US'" <el-dropdown-item @click.native="ChangeLan('en-US')">English <i v-if="language=='en-US'"
class="iconfont icon-duigou"></i></el-dropdown-item> class="iconfont icon-duigou"></i></el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</li> </li>
<li v-if="!useRed"> <li v-if="!useRed && userInfo.RB_Group_id==2">
<i @click="downmz=!downmz" class="el-icon-download"></i> <i @click="downmz=!downmz" class="el-icon-download"></i>
</li> </li>
</template> </template>
<li> <li v-if="userInfo.RB_Group_id==2">
<a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''" <a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''"
style="color:#FFF">前往前台</a> style="color:#FFF">前往前台</a>
<a href="javascript:alert('未開通B2B前端系統，請您聯繫業務員')" v-else style="color:#FFF">前往前台</a> <a href="javascript:alert('未開通B2B前端系統，請您聯繫業務員')" v-else style="color:#FFF">前往前台</a>
...@@ -1533,7 +1538,8 @@ ...@@ -1533,7 +1538,8 @@
qjGroupId: -1, qjGroupId: -1,
F_ContractManagement: false, //合同权限 F_ContractManagement: false, //合同权限
F_Finance_Create: false, F_Finance_Create: false,
HOTEL_memorandum: false HOTEL_memorandum: false,
}; };
}, },
filters: { filters: {
...@@ -1839,12 +1845,12 @@ ...@@ -1839,12 +1845,12 @@
this.userInfo.UserPhoto = ""; this.userInfo.UserPhoto = "";
} }
let UserInfo = this.getLocalStorage();
this.userId = UserInfo.EmployeeId; this.userId = this.userInfo.EmployeeId;
this.allPartMsg.RB_Group_Id = this.deleteMsg.groupId = this.likeMsg.groupId = this.addDynamicMsg.rB_GroupId = this this.allPartMsg.RB_Group_Id = this.deleteMsg.groupId = this.likeMsg.groupId = this.addDynamicMsg.rB_GroupId = this
.dynamicMsg.groupId = .dynamicMsg.groupId =
UserInfo.RB_Group_id; this.userInfo.RB_Group_id;
this.addDynamicMsg.rB_BranchId = UserInfo.RB_Branch_id; this.addDynamicMsg.rB_BranchId = this.userInfo.RB_Branch_id;
//获取版本 //获取版本
this.getVersion(); this.getVersion();
this.getMenu(); this.getMenu();
......
src/components/personalCenter.vue
View file @ 2fac6c80
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<span class="v">{{CurrentUserInfo.DepartName}}</span> <span class="v">{{CurrentUserInfo.DepartName}}</span>
</div> </div>
</div> </div>
<div class="n-info" > <div class="n-info">
<div class="item" @click="changeBoard(0)"> <div class="item" @click="changeBoard(0)">
<i class="iconfont icon-yichuheimingdan"></i> <i class="iconfont icon-yichuheimingdan"></i>
<span class="n-name">个人首页</span> <span class="n-name">个人首页</span>
...@@ -32,64 +32,66 @@ ...@@ -32,64 +32,66 @@
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</span> </span>
</div> </div>
<div class="item" @click="changeBoard(1)"> <template v-if="CurrentUserInfo&&CurrentUserInfo.RB_Group_id==2">
<i class="iconfont icon-pingjiabaogao"></i> <div class="item" @click="changeBoard(1)">
<span class="n-name">我的业绩</span> <i class="iconfont icon-pingjiabaogao"></i>
<span class="fang"> <span class="n-name">我的业绩</span>
<i class="iconfont icon-right1"></i> <span class="fang">
</span> <i class="iconfont icon-right1"></i>
</div> </span>
<div class="item" @click="changeBoard(2)"> </div>
<i class="iconfont icon-guanjun"></i> <div class="item" @click="changeBoard(2)">
<span class="n-name">冠军之路</span> <i class="iconfont icon-guanjun"></i>
<span class="fang"> <span class="n-name">冠军之路</span>
<i class="iconfont icon-right1"></i> <span class="fang">
</span> <i class="iconfont icon-right1"></i>
</div> </span>
<div class="item"> </div>
<i class="iconfont icon-dingdanguanli-"></i> <div class="item">
<span class="n-name" @click="goUrlNav('groupTourOrder',0,'跟团游订单')">我的订单</span> <i class="iconfont icon-dingdanguanli-"></i>
<span class="fang"> <span class="n-name" @click="goUrlNav('groupTourOrder',0,'跟团游订单')">我的订单</span>
<i class="iconfont icon-right1"></i> <span class="fang">
</span> <i class="iconfont icon-right1"></i>
</div> </span>
<div class="item"> </div>
<i class="iconfont icon-kaohedefen"></i> <div class="item">
<span class="n-name" @click="goUrlNav('ExaminationStatistics',0,'行政考核')">行政考核</span> <i class="iconfont icon-kaohedefen"></i>
<span class="fang"> <span class="n-name" @click="goUrlNav('ExaminationStatistics',0,'行政考核')">行政考核</span>
<i class="iconfont icon-right1"></i> <span class="fang">
</span> <i class="iconfont icon-right1"></i>
</div> </span>
<div class="item" @click="goUrlNav('FinancialDocuments',3,'财务单据')"> </div>
<i class="iconfont icon-danju1"></i> <div class="item" @click="goUrlNav('FinancialDocuments',3,'财务单据')">
<span class="n-name">财务审批</span> <i class="iconfont icon-danju1"></i>
<span class="fang"> <span class="n-name">财务审批</span>
<span class="tips" v-if="NotDealCount>0">{{NotDealCount}}</span> <span class="fang">
<i class="iconfont icon-right1"></i> <span class="tips" v-if="NotDealCount>0">{{NotDealCount}}</span>
</span> <i class="iconfont icon-right1"></i>
</div> </span>
<div class="item" @click="goUrlNav('myApproval',-1,'考勤')"> </div>
<i class="iconfont icon-kaoqinshenpi"></i> <div class="item" @click="goUrlNav('myApproval',-1,'考勤')">
<span class="n-name">考勤审批</span> <i class="iconfont icon-kaoqinshenpi"></i>
<span class="fang"> <span class="n-name">考勤审批</span>
<span class="tips" v-if="MyAuditCount>0">{{MyAuditCount}}</span> <span class="fang">
<i class="iconfont icon-right1"></i> <span class="tips" v-if="MyAuditCount>0">{{MyAuditCount}}</span>
</span> <i class="iconfont icon-right1"></i>
</div> </span>
<div class="item" @click="goUrlNav('myDocuments',-1,'企业云盘')"> </div>
<i class="iconfont icon-cloud-disk-services"></i> <div class="item" @click="goUrlNav('myDocuments',-1,'企业云盘')">
<span class="n-name">我的云盘</span> <i class="iconfont icon-cloud-disk-services"></i>
<span class="fang"> <span class="n-name">我的云盘</span>
<i class="iconfont icon-right1"></i> <span class="fang">
</span> <i class="iconfont icon-right1"></i>
</div> </span>
<div class="item"> </div>
<i class="iconfont icon-fukuan2"></i> <div class="item">
<span class="n-name">常用付款对象</span> <i class="iconfont icon-fukuan2"></i>
<span class="fang"> <span class="n-name">常用付款对象</span>
<i class="iconfont icon-right1"></i> <span class="fang">
</span> <i class="iconfont icon-right1"></i>
</div> </span>
</div>
</template>
</div> </div>
</div> </div>
<personalIndex v-if="boardIndex==0"></personalIndex> <personalIndex v-if="boardIndex==0"></personalIndex>
...@@ -173,7 +175,7 @@ ...@@ -173,7 +175,7 @@
// path: "/"+url, // path: "/"+url,
// query // query
// }); // });
window.location.href=`http://${window.location.host}/#/${url}?tab=${name}&Conditon=${index}` window.location.href = `http://${window.location.host}/#/${url}?tab=${name}&Conditon=${index}`
} }
} }
}; };
...@@ -199,7 +201,7 @@ ...@@ -199,7 +201,7 @@
border: 1px solid #2c2739; border: 1px solid #2c2739;
} }
.red-theme .personal .u-box{ .red-theme .personal .u-box {
background: #FBFBFB; background: #FBFBFB;
border: none; border: none;
} }
...@@ -224,18 +226,22 @@ ...@@ -224,18 +226,22 @@
margin: 15px; margin: 15px;
display: flex; display: flex;
} }
.red-theme .personal .u-box .h-info-box{
.red-theme .personal .u-box .h-info-box {
background: #F4F4F4; background: #F4F4F4;
margin: 0; margin: 0;
padding: 20px 15px; padding: 20px 15px;
} }
.red-theme .personal .u-box .u-info{
.red-theme .personal .u-box .u-info {
background: none; background: none;
} }
.red-theme .personal .u-box .u-info .item .k{
.red-theme .personal .u-box .u-info .item .k {
color: #787A7D; color: #787A7D;
font-family: unset; font-family: unset;
} }
.personal .u-box .h-info-box .h-info { .personal .u-box .h-info-box .h-info {
flex: 1; flex: 1;
} }
...@@ -250,15 +256,19 @@ ...@@ -250,15 +256,19 @@
display: block; display: block;
margin-top: 10px; margin-top: 10px;
} }
.red-theme .personal .u-box .h-info-box .h-img{
border:1px dotted #EB3349; .red-theme .personal .u-box .h-info-box .h-img {
border: 1px dotted #EB3349;
} }
.red-theme .personal .u-box .h-info-box .h-info .k { .red-theme .personal .u-box .h-info-box .h-info .k {
font-family: unset; font-family: unset;
} }
.red-theme .personal .u-box .h-info-box .h-info .v { .red-theme .personal .u-box .h-info-box .h-info .v {
color: #121315; color: #121315;
} }
.personal .u-box .h-info-box .h-info .v { .personal .u-box .h-info-box .h-info .v {
color: #ddd; color: #ddd;
height: 20; height: 20;
...@@ -327,20 +337,25 @@ ...@@ -327,20 +337,25 @@
margin: 20px 0; margin: 20px 0;
background: rgba(25, 19, 62, 0.56); background: rgba(25, 19, 62, 0.56);
} }
.red-theme .personal .u-box .n-info{
.red-theme .personal .u-box .n-info {
background: #F4F4F4; background: #F4F4F4;
} }
.red-theme .personal .u-box .n-info .item:hover{
.red-theme .personal .u-box .n-info .item:hover {
background: #eaeaea; background: #eaeaea;
} }
.red-theme .personal .u-box .n-info .item:hover *:not(.tips){
.red-theme .personal .u-box .n-info .item:hover *:not(.tips) {
color: #33B3FF; color: #33B3FF;
} }
.red-theme .personal .u-box .n-info .item .n-name{
.red-theme .personal .u-box .n-info .item .n-name {
color: #333; color: #333;
font-family: unset; font-family: unset;
} }
.personal .u-box .n-info .item { .personal .u-box .n-info .item {
align-items: center; align-items: center;
display: flex; display: flex;
...@@ -422,12 +437,14 @@ ...@@ -422,12 +437,14 @@
border-left: 3px solid #8a8894; border-left: 3px solid #8a8894;
border-bottom: 3px solid #8a8894; border-bottom: 3px solid #8a8894;
} }
.red-theme .personal .left-point-samll::before, .red-theme .personal .left-point-samll::before,
.red-theme .personal .left-point-samll::after, .red-theme .personal .left-point-samll::after,
.red-theme .personal .right-point-samll::before, .red-theme .personal .right-point-samll::before,
.red-theme .personal .right-point-samll::after{ .red-theme .personal .right-point-samll::after {
border-color: #EB3349; border-color: #EB3349;
} }
.personal .right-point::after { .personal .right-point::after {
position: absolute; position: absolute;
width: 9px; width: 9px;
......
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