Commit 601e10e2 authored by 黄奎's avatar 黄奎

1111

parent bec3e41d
...@@ -220,12 +220,12 @@ ...@@ -220,12 +220,12 @@
CRM系统 CRM系统
<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="goUrlCAR()" <!-- <el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlCAR()"
v-if="2==userInfo.RB_Group_id"> v-if="2==userInfo.RB_Group_id">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i> <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
CAR系统 CAR系统
<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="unbundlingVisible=true" v-if="userInfo&&userInfo.DepartName&&(userInfo.DepartName.indexOf('操作部')!=-1 || userInfo.DepartName.indexOf('总部财务部')!=-1) ||(userInfo.RB_Branch_id == 1245 <el-dropdown-item class="clearfix _dropdown_other" @click.native="unbundlingVisible=true" v-if="userInfo&&userInfo.DepartName&&(userInfo.DepartName.indexOf('操作部')!=-1 || userInfo.DepartName.indexOf('总部财务部')!=-1) ||(userInfo.RB_Branch_id == 1245
&& userInfo.DepartName.indexOf('引流')==-1 && userInfo.DepartName.indexOf('引流')==-1
&& userInfo.DepartName.indexOf('市场')==-1)"> && userInfo.DepartName.indexOf('市场')==-1)">
...@@ -233,24 +233,27 @@ ...@@ -233,24 +233,27 @@
机票未绑团查看 机票未绑团查看
<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="unTravelVisible=true" v-if="UnTravelDate"> <el-dropdown-item class="clearfix _dropdown_other" @click.native="unTravelVisible=true"
v-if="UnTravelDate">
<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.RB_Group_id==2 && 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.RB_Group_id==2 && userInfo.IsEditTripTemplate==1" class="clearfix _dropdown_other" <el-dropdown-item v-if="userInfo.RB_Group_id==2 && userInfo.IsEditTripTemplate==1"
@click.native="journeyTemplate()"> class="clearfix _dropdown_other" @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 v-if="userInfo.RB_Group_id==2" 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>
...@@ -4127,7 +4130,9 @@ ...@@ -4127,7 +4130,9 @@
window.open(url) window.open(url)
}, },
goUrlCAR() { goUrlCAR() {
let url = 'http://bus.oytour.com/'; let userinfo = this.getLocalStorage();
let url = this.domainManager().CarUrl + "/auth/autologon?tk=" + userinfo.token;
console.log(url);
window.open(url) window.open(url)
}, },
//跳转至个人信息设置 //跳转至个人信息设置
......
...@@ -7,8 +7,6 @@ ...@@ -7,8 +7,6 @@
margin-top: 10px; margin-top: 10px;
background-color: #fff; background-color: #fff;
border-top: 1px solid #d1d1d1; border-top: 1px solid #d1d1d1;
/*border-left: 1px solid #d1d1d1;*/
/* border-right: 1px solid #d1d1d1; */
font-size: 14px; font-size: 14px;
width: 100%; width: 100%;
min-width: 1200px; min-width: 1200px;
...@@ -23,20 +21,17 @@ ...@@ -23,20 +21,17 @@
.LP_table tr th { .LP_table tr th {
border-left: 1px solid #d1d1d1; border-left: 1px solid #d1d1d1;
border-bottom: 1px solid #d1d1d1; border-bottom: 1px solid #d1d1d1;
/* border-right: 1px solid #d1d1d1; */
position: relative; position: relative;
background-color: #E6E6E6; background-color: #E6E6E6;
} }
.LP_table tr th:last-child { .LP_table tr th:last-child {
border-right: 1px solid #d1d1d1; border-right: 1px solid #d1d1d1;
} }
.LP_table td { .LP_table td {
border-left: 1px solid #d1d1d1; border-left: 1px solid #d1d1d1;
border-bottom: 1px solid #d1d1d1; border-bottom: 1px solid #d1d1d1;
/* border-right: 1px solid #d1d1d1; */
text-align: center; text-align: center;
padding: 5px 0; padding: 5px 0;
} }
...@@ -109,7 +104,7 @@ ...@@ -109,7 +104,7 @@
<tr> <tr>
<th width="40%">项目名称</th> <th width="40%">项目名称</th>
<th width="150">{{$t('hotel.table_operat')}}&nbsp;&nbsp; <i <th width="150">{{$t('hotel.table_operat')}}&nbsp;&nbsp; <i
class="iconfont icon-bumenguanli-tianjia addLessPrice" @click="addLessPrice(item)"></i></th> class="iconfont icon-bumenguanli-tianjia addLessPrice" @click="addLessPrice()"></i></th>
</tr> </tr>
<tr> <tr>
<td> <td>
......
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