Skip to content

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

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

parents eebb075a 566558d8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1603 additions and 23 deletions
src/components/LeaderManagement/leaderPerformance.vue
View file @ f3e6491d
......@@ -87,7 +87,7 @@
height: 230px;
border: 1px solid #E6E6E6;
border-radius: 4px;
margin-right: 10px;
margin:0 10px 10px 0;
background-color: #fff;
padding: 0 20px;
}
......@@ -282,7 +282,20 @@
.guidPerformance ._btTitle:last-child {
border-bottom: 0;
}
.leaderTousuTable{
border:1px solid #E6E6E6;
float:left;
width:226px;
margin-top:20px;
border-collapse:collapse;
color:#666666;
}
.leaderTousuTable tr{background: #fff;text-align: center; height: 40px;}
.leaderTousuTable tr:nth-child(2n+1){background:#fafafa; }
.leaderTousuTable tr td{font-size: 14px;border: 1px solid #E5E5E5;}
.leaderHeadTd td{
background-color: #f1f1f1;
}
</style>
<template>
<div class='flexOne guidPerformance'>
......@@ -508,23 +521,45 @@
</div>
</div>
</div>
</template>
</div>
<template v-if="msg.Type<7">
<div class="rightDiv">
<div class="_btTitle" v-for="(item,index) in twelveToTwenty" :key="item.subCode">
<div class="tweleindex">{{12+index}}</div>
<div class="peopleInfo clearfix">
<div class="HeadPortrait TW">
<img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
<img v-else :src="item.EmPhoto" :onerror='defaultImg' />
</div>
<span class="peopleName">{{item.Name}}</span>
<div class="TweleEx">￥{{item.LeaderExtract}}</div>
<div class="leftBottom clearfix">
<div class="bottomList">
<div class="btLittle" v-for="(item,index) in twelveToFifteen" :key="item.subCode">
<div class="_index">{{12+index}}</div>
<div class="peopleInfo clearfix">
<div class="HeadPortrait">
<img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
<img v-else :src="item.EmPhoto" :onerror='defaultImg' />
</div>
<span class="peopleName">{{item.Name}}</span>
<div class="peopleMoney">￥{{item.LeaderExtract}}</div>
</div>
</div>
</div>
<div class="bottomList">
<div class="btLittle" v-for="(item,index) in fifteenTonitten" :key="item.subCode">
<div class="_index">{{16+index}}</div>
<div class="peopleInfo clearfix">
<div class="HeadPortrait">
<img v-if="!item.EmPhoto" src="../../assets/img/default_head_img.jpg">
<img v-else :src="item.EmPhoto" :onerror='defaultImg' />
</div>
<span class="peopleName">{{item.Name}}</span>
<div class="peopleMoney">￥{{item.LeaderExtract}}</div>
</div>
</div>
</div>
</div>
</div>
</template>
</template>
</div>
<table class="leaderTousuTable" style="display:none;">
<tr class="leaderHeadTd">
<td>投诉次数</td>
<td>意见调查表缺少张数</td>
</tr>
<tr>
<td colspan="2">功能正在开发中</td>
</tr>
</table>
</div>
</div>
</template>
......@@ -559,6 +594,10 @@
eightToeleven: '',
//12-20名
twelveToTwenty: '',
//12-15
twelveToFifteen: '',
//15-19
fifteenTonitten: '',
//购物店名称
ShopList: [],
monthList: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
......@@ -589,6 +628,8 @@
this.fourToSeven = [];
this.eightToeleven = [];
this.twelveToTwenty = [];
this.twelveToFifteen = [];
this.fifteenTonitten= [];
this.DataList = [];
this.apipost("LeaderSchedule_get_GetLeaderList", msg, res => {
this.loading = false;
......@@ -601,7 +642,9 @@
this.jijun = nArray.splice(0, 1);
this.fourToSeven = nArray.splice(0, 4);
this.eightToeleven = nArray.splice(0, 4);
this.twelveToTwenty = nArray.splice(0, 9);
//this.twelveToTwenty = nArray.splice(0, 9);
this.twelveToFifteen = nArray.splice(0, 4);
this.fifteenTonitten = nArray.splice(0, 4);
}
}
},
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ f3e6491d
......@@ -35,6 +35,15 @@
display: inline-block;
margin-right:10px;
}
.AuditRedType{
color:red;
}
.AuditBlueType{
color:blue;
}
.AuditGreenType{
color:green;
}
</style>
<template>
<div>
......@@ -482,6 +491,40 @@
<div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
<template v-if="item.AuditStatus==1">
<span class="AuditRedType">审核中</span>
</template>
<template v-else>
<el-popover width="500" trigger="click">
<table class="singeRowTable" style="margin-top:20px;">
<tr>
<th width="70">审核人</th>
<th width="80">审核状态</th>
<th width="140">审核时间</th>
<th>备注</th>
</tr>
<tr>
<td>
<template v-if="item.AuditStatus!=1">{{item.AuditManName}}</template>
</td>
<td>
<span v-if="item.AuditStatus==1" class="AuditBlueType">{{item.AuditStatusStr}}</span>
<span v-if="item.AuditStatus==2" class="AuditGreenType">{{item.AuditStatusStr}}</span>
<span v-if="item.AuditStatus==3" class="AuditRedType">{{item.AuditStatusStr}}</span>
</td>
<td>
<template v-if="item.AuditStatus!=1">{{item.AuditTimeStr}}</template>
</td>
<td>
<template v-if="item.AuditStatus!=1">{{item.AuditRemark}}</template>
</td>
</tr>
</table>
<div slot="reference" title="审核信息"
style="cursor:pointer;color:rgb(71,191,140);text-decoration:underline;width:50px;">审核信息</div>
</el-popover>
</template>
</div>
</div>
<div class="el-col" style="width:200px;">
......@@ -528,7 +571,7 @@
<p>
<span>{{$t('visa.v_gvisa')}}</span>
{{item.SignVisaNum}}
<span style="margin-left:10px;">{{$t('visa.t_gvisa')}}</span>
<span style="margin-left:10px;">团签</span>
{{item.GroupVisaNum}}
</p>
</div>
......@@ -555,7 +598,8 @@
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">{{$t('Operation.Op_shouzhiDetail')}}</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('SalesconfirmationOrder',item.TCID,item.ID,item.StartCityID)">{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item>
<!--2020-02-04HK注释掉审核按钮-->
<el-dropdown-item style="display:none;" v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">{{$t('Operation.Op_xiajia')}}</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
......@@ -563,6 +607,7 @@
<el-dropdown-item @click.native="goB2B(item.ConfigId)">{{$t('Operation.Op_b2bView')}}</el-dropdown-item>
<el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>{{$t('Operation.Op_salelianyun')}}</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}</el-dropdown-item>
<el-dropdown-item @click.native='reSubmit(item)' v-if="item.AuditStatus==3">重新提交审核</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -900,6 +945,8 @@
});
}
});
console.log(res,'resssss');
}
},
err => {}
......@@ -1317,6 +1364,25 @@
}
})
},
//重新提交审核
reSubmit(item){
let msg = {
TCID:item.TCID,
AuditStatus:1
}
this.apipost(
"travel_post_UpdatePriceAuditStatusService",msg,
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getControlList();
} else {
this.Error(res.data.message);
}
},
err => {}
);
}
},
filters: {
formatStartDate(value) {
......
src/components/scenicSpot/scenicRecommentList.vue
View file @ f3e6491d
......@@ -468,7 +468,7 @@
methods: {
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.selectResource();
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
......
src/router/config.js
View file @ f3e6491d
......@@ -2067,14 +2067,24 @@ export default {
},
},
{
//团控列表 自主开团
//团控列表 自主开团【小包团】
path: '/TravelControlListSale',
name: 'TravelControlListSale',
component: resolve => require(['@/components/TravelManager/TravelList/TravelControlListSale'], resolve),
meta: {
titleempBankAccount: '团控列表'
},
}, { //行程列表
},
{
//团控列表 自主开团【小包团】审核列表
path: '/TravelControlListSaleAduit',
name: 'TravelControlListSaleAduit',
component: resolve => require(['@/components/TravelManager/TravelList/TravelControlListSaleAduit'], resolve),
meta: {
titleempBankAccount: '团控列表'
},
},
{ //行程列表
path: '/OpTripList',
name: 'OpTripList',
component: resolve => require(['@/components/TravelManager/TravelList/OpTripList'], resolve),
......
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