Commit 232c64ec authored by 黄奎's avatar 黄奎

11

parent 1b70ca40
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
{{$t('ground.yiqueding')}}:<span style="color:#4BCA81 ;"></span>{{$t('ground.daiqueding')}}:<span {{$t('ground.yiqueding')}}:<span style="color:#4BCA81 ;"></span>{{$t('ground.daiqueding')}}:<span
style="color: #E95252;">O</span>{{$t('salesModule.NotDeal')}}:<span style="color:#E95252 ;">X</span> style="color: #E95252;">O</span>{{$t('salesModule.NotDeal')}}:<span style="color:#E95252 ;">X</span>
<span style="font-size: 12px; float: right;">*注意领队交接表一定要在出团日期前维护(需点击保存),否则此团所有操作无提成;</span> <span style="font-size: 12px; float: right;">*注意领队交接表一定要在出团日期前维护(需点击保存),否则此团所有操作无提成;</span>
</div> </div>
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
<th width="75">{{$t('Operation.Op_jinchudian')}}</th> <th width="75">{{$t('Operation.Op_jinchudian')}}</th>
<th width="50"> <th width="50">
<el-tooltip class="item" effect="dark" content="成人/小孩(财务佣金标记,未满15岁识别为小孩)" placement="top"> <el-tooltip class="item" effect="dark" content="成人/小孩(财务佣金标记,未满15岁识别为小孩)" placement="top">
<div> {{$t('ground.dingdan')}}<br />{{$t('admin.admin_personNumber')}}</div> <div> {{$t('ground.dingdan')}}<br />{{$t('admin.admin_personNumber')}}</div>
</el-tooltip> </el-tooltip>
</th> </th>
<th width="100">{{$t('ground.jiweishu')}}<br />(Y/E/F/单地接)</th> <th width="100">{{$t('ground.jiweishu')}}<br />(Y/E/F/单地接)</th>
...@@ -286,14 +286,16 @@ ...@@ -286,14 +286,16 @@
<p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')"> <p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
{{$t('ground.peizhilingdui')}}</p> {{$t('ground.peizhilingdui')}}</p>
<p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')"> <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
{{item.LeaderName}}{{item.IsLeaderDaiTuan==1?"(带团)":"(不带团)"}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p> {{item.LeaderName}}{{item.IsLeaderDaiTuan==1?"(带团)":"(不带团)"}}{{getLeaderTypeStr(item.LeaderGuidClass)}}
</p>
</div> </div>
</td> </td>
<td> <td>
<div class="link"> <div class="link">
<p v-if='!item.GuideName' @click="goUrlT('leaderArrangement',item.TCID,'带团安排')"> <p v-if='!item.GuideName' @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">
{{$t('ground.daituananpai')}}</p> {{$t('ground.daituananpai')}}</p>
<p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">{{item.GuideName}}{{item.IsGuideDaiTuan==1?"(带团)":"(不带团)"}}</p> <p v-else @click="goUrlT('leaderArrangement',item.TCID,'带团安排')">
{{item.GuideName}}{{item.IsGuideDaiTuan==1?"(带团)":"(不带团)"}}</p>
</div> </div>
</td> </td>
<td> <td>
...@@ -371,12 +373,11 @@ ...@@ -371,12 +373,11 @@
<span style="color: #4BCA81;" v-if="item.FoodsResult==1"></span> <span style="color: #4BCA81;" v-if="item.FoodsResult==1"></span>
<span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
</div> </div>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载餐配信息" <a style="text-decoration:underline;cursor:pointer;display:none;" title="点击下载餐配信息"
@click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a> @click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载新餐配信息" <a style="text-decoration:underline;cursor:pointer;" title="点击下载新餐配信息"
@click="DownLoadNewDinner(item)">{{$t('ground.peicanxiazai')}}</a> @click="DownLoadNewDinner(item)">{{$t('ground.peicanxiazai')}}</a>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan"> <div class="fz16 fbold linkspan">
<span style="color: #4BCA81;" @click="goUrlBus('BusInfo',item,outItem,'车配信息')" <span style="color: #4BCA81;" @click="goUrlBus('BusInfo',item,outItem,'车配信息')"
...@@ -389,18 +390,18 @@ ...@@ -389,18 +390,18 @@
<template v-if="(item.LineId==14||item.LineId==118) &&(item.CarIsPush==0||item.CarIsPush==2)"> <template v-if="(item.LineId==14||item.LineId==118) &&(item.CarIsPush==0||item.CarIsPush==2)">
<el-tooltip class="item" effect="dark" content="同步车信息到印象车行" placement="top-start"> <el-tooltip class="item" effect="dark" content="同步车信息到印象车行" placement="top-start">
<div slot="content"> <div slot="content">
<div v-html="TipsContent(item)"></div> <div v-html="TipsContent(item)"></div>
</div> </div>
<span <span
style="cursor:pointer;text-decoration:underline;display:block;color:blue;font-size:12px;padding-top:2px;" style="cursor:pointer;text-decoration:underline;display:block;color:blue;font-size:12px;padding-top:2px;"
@click="PushMessage(outItem,item)">同步</span> @click="PushMessage(outItem,item)">同步</span>
</el-tooltip> </el-tooltip>
</template> </template>
<template v-else-if="(item.LineId==14||item.LineId==118) &&item.CarIsPush==1"> <template v-else-if="(item.LineId==14||item.LineId==118) &&item.CarIsPush==1">
<el-tooltip class="item" effect="dark" placement="top-start"> <el-tooltip class="item" effect="dark" placement="top-start">
<div slot="content"> <div slot="content">
<div v-html="TipsContent(item)"></div> <div v-html="TipsContent(item)"></div>
</div> </div>
<span <span
style="cursor:pointer;text-decoration:underline;display:block;color:red;font-size:12px;padding-top:2px;" style="cursor:pointer;text-decoration:underline;display:block;color:red;font-size:12px;padding-top:2px;"
@click="PushMessage(outItem,item)">取消同步</span> @click="PushMessage(outItem,item)">取消同步</span>
...@@ -787,11 +788,11 @@ ...@@ -787,11 +788,11 @@
methods: { methods: {
//推送消息 //推送消息
PushMessage(obj,item) { PushMessage(obj, item) {
var pMsg = { var pMsg = {
TCID: item.TCID TCID: item.TCID
}; };
var tipMessage = "同步车信息到印象车行"; var tipMessage = "同步车信息到印象车行";
var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息 var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息
if (item.CarIsPush == 1) { if (item.CarIsPush == 1) {
...@@ -799,42 +800,41 @@ ...@@ -799,42 +800,41 @@
tipMessage = "取消印象车行订单"; tipMessage = "取消印象车行订单";
} }
let that = this; let that = this;
that.$confirm('是否确认'+tipMessage, this.$t('tips.tips'), { that.$confirm('是否确认' + tipMessage, this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'), confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'), cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
this.queryCommonData.loading = true; this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => { this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!'); this.Success(tipMessage + '成功!');
this.getControlList(); this.getControlList();
} else { } else {
this.Error(tipMessage + '失败!'); this.Error(tipMessage + '失败!');
} }
});
}).catch(() => {
}); });
}).catch(() => {
});
}, },
TipsContent(item){ TipsContent(item) {
let resultStr=''; let resultStr = '';
let dateStr=''; let dateStr = '';
if(item.CarIsPush==1){ if (item.CarIsPush == 1) {
resultStr+= '点击取消印象车行订单'+"<br/>"+'' resultStr += '点击取消印象车行订单' + "<br/>" + ''
dateStr ='推送时间:'; dateStr = '推送时间:';
} } else if (item.CarIsPush == 2 || item.CarIsPush == 0) {
else if(item.CarIsPush==2||item.CarIsPush==0){ resultStr += '同步车信息到印象车行' + "<br/>"
resultStr+= '同步车信息到印象车行'+"<br/>" if (item.CarIsPush == 2) {
if(item.CarIsPush==2){ dateStr = '取消时间:';
dateStr ='取消时间:';
}
}
if(item.CarPushDateStr){
resultStr+= dateStr+ item.CarPushDateStr+"<br/>"
} }
}
if (item.CarPushDateStr) {
resultStr += dateStr + item.CarPushDateStr + "<br/>"
}
return resultStr; return resultStr;
}, },
//同步用车到车行订单 //同步用车到车行订单
...@@ -1410,7 +1410,7 @@ ...@@ -1410,7 +1410,7 @@
this.loading = false; this.loading = false;
}); });
}, },
DownLoadNewDinner(item) { DownLoadNewDinner(item) {
this.loading = true; this.loading = true;
//导出报表 //导出报表
let msg = { let msg = {
...@@ -1461,9 +1461,9 @@ ...@@ -1461,9 +1461,9 @@
if (userInfo.RB_Group_id == this.QjGroupId()) { if (userInfo.RB_Group_id == this.QjGroupId()) {
// this.msg.LineId = 14; // this.msg.LineId = 14;
} }
if(this.$route.query.CombinationNum){ if (this.$route.query.CombinationNum) {
this.msg.CombinationNum = this.$route.query.CombinationNum; this.msg.CombinationNum = this.$route.query.CombinationNum;
this.msg.StartDate=''; this.msg.StartDate = '';
} }
this.getLineList(); this.getLineList();
......
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