Skip to content

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

团控列表新增车推送

parent cdbd7b9e
Hide whitespace changes
Inline Side-by-side
Showing with 279 additions and 46 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a0d66b83
......@@ -667,6 +667,17 @@
</div>
</el-popover>
</p>
<p
v-if="(item.LineID==14 ||item.LineID==118) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
:TCNUM="item.TCNUM">
</commonBusInfo>
<div slot="reference">
<span class="price" style="cursor:pointer;text-decoration:underline;">订车情况</span>
</div>
</el-popover>
</p>
<p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168 ||item.LineID==118) && item.IsOpenHotel==1">
<span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
......@@ -1047,14 +1058,17 @@
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
</el-button>
<template v-if="item.LineID==14||item.LineID==118">
<el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订房推送
</el-button>
<el-tooltip v-if="item.IsPush==0" class="item" effect="dark" placement="top" content="订房推送">
<el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订房推送
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" placement="top">
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送订房
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">
已推送订房
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate"
......@@ -1067,11 +1081,12 @@
</el-button>
</el-tooltip>
</template>
<template v-if="item.LineID==14||item.LineID==118">
<el-button v-if="item.CarIsPush==0" @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
<el-tooltip v-if="item.CarIsPush==0" class="item" effect="dark" placement="top" content="订车推送">
<el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
</el-tooltip>
<!-- content="点击取消推送" -->
<el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate"
placement="top">
......@@ -1340,10 +1355,12 @@
</template>
<script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import commonBusInfo from "../../commonPage/commonBusInfo.vue";
import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default {
components: {
commonBusInfo,
commonHotelInfo,
priceDialog,
EditLeaveGroup
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ a0d66b83
......@@ -504,6 +504,16 @@
</div>
</el-popover>
</p>
<p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
:TCNUM="item.TCNUM">
</commonBusInfo>
<div slot="reference">
<span class="price" style="cursor:pointer;text-decoration:underline;">订车情况</span>
</div>
</el-popover>
</p>
<p class="travelnowrap"
v-if="(item.LineID==14 || item.LineID==90|| item.LineID==168||item.LineID==118) && item.IsOpenHotel==1">
<span style="color:red;font-weight:bold;">※ {{$t('op.DJyiguanbi')}}.</span>
......@@ -802,16 +812,53 @@
style="background:#67c23a; border-color:#67c23a">广告&nbsp;{{item.AdvertCount}}</el-button>
<template v-if="item.LineID==14||item.LineID==118">
<el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送消息
</el-button>
<el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" content="点击取消推送" placement="top">
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送
<el-tooltip v-if="item.IsPush==0" class="item" effect="dark" placement="top" content="订房推送">
<el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订房推送
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" placement="top">
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">
已推送订房
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate"
placement="top">
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送订房
</el-button>
</el-tooltip>
</template>
<template v-if="item.LineID==14||item.LineID==118">
<el-tooltip v-if="item.CarIsPush==0" class="item" effect="dark" placement="top" content="订车推送">
<el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
</el-tooltip>
<!-- content="点击取消推送" -->
<el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate"
placement="top">
<div slot="content">
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary" style="background:red !important;">
已推送订车
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.CarIsPush==2" class="item" effect="dark" placement="top">
<div slot="content">
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
</el-tooltip>
<el-button v-if="item.IsPush==2" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">重新推送
</el-button>
</template>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
{{$t('Operation.Op_remark')}}</el-button>
......@@ -837,7 +884,8 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.IsEditOutBranch==1" @click.native="GroupTypeObj=item,GroupTypeVisible=true">
<el-dropdown-item v-if="item.IsEditOutBranch==1"
@click.native="GroupTypeObj=item,GroupTypeVisible=true">
<div>修改出团公司 </div>
</el-dropdown-item>
<el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 1)">
......@@ -978,10 +1026,12 @@
</template>
<script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import commonBusInfo from "../../commonPage/commonBusInfo.vue";
import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default {
components: {
commonBusInfo,
priceDialog,
commonHotelInfo,
EditLeaveGroup
......@@ -1265,9 +1315,29 @@
}
});
},
//消息推送
//提示信息(type=1酒店推送,type=2订车推送)
TipsContent(item, type) {
let resultStr = '';
//订车推送
if (type == 2) {
if (item.CarIsPush == 1) {
resultStr += '已推送订车，推送时间:' + item.CarPushDate + '<br/>点击可取消用车';
} else if (item.CarIsPush == 2) {
resultStr += '已取消订车，取消时间:' + item.CarPushDate + '<br/>点击可重新推送用车';
}
}
//订房推送
else if (type == 1) {
if (item.IsPush == 1) {
resultStr = '已推送订房，推送时间：' + item.HotelPushDate + '<br/> 点击可取消订房';
} else if (item.IsPush == 2) {
resultStr = '已取消订房推送，取消时间：' + item.HotelPushDate + '<br/>点击可重新推送订房';
}
}
return resultStr;
},
//推送消息
PushMessage(item) {
this.queryCommonData.loading = true;
var pMsg = {
TCID: item.TCID
};
......@@ -1277,15 +1347,53 @@
cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
tipMessage = "【取消】推送";
}
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
let that = this;
that.$confirm('是否确认操作酒店推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {
});
},
//订车推送
PushBusMessage(item) {
var pMsg = {
TCID: item.TCID
};
var tipMessage = "订车推送消息";
var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息
if (item.CarIsPush == 1) {
cmdStr = "travel_post_CancelPushTravelBusToQYWork"; //取消推送
tipMessage = "订车【取消】推送";
}
let that = this;
that.$confirm('是否确认操作订车推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {});
},
showDialog(ConfigId, OfferId) {
this.dialog = {
show: true,
......@@ -1960,7 +2068,7 @@
}
if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224 &&
userInfo.RB_Branch_id != 1249&& this.CurrentUserInfo.RB_Branch_id != 1252) {
userInfo.RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1252) {
this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
}
//默认查询全部团队状态
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ a0d66b83
......@@ -473,6 +473,16 @@
</div>
</el-popover>
</p>
<p v-if="(item.LineID==14 || item.LineID==118 ) && item.BusOrderList && item.BusOrderList.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonBusInfo :busData="item.BusOrderList" :TCID="item.TCID" :DMCNum="item.DMCNum"
:TCNUM="item.TCNUM">
</commonBusInfo>
<div slot="reference">
<span class="price" style="cursor:pointer;text-decoration:underline;">订车情况</span>
</div>
</el-popover>
</p>
</div>
</div>
<div class="el-col" style="width:190px;">
......@@ -681,16 +691,53 @@
style="background:#67c23a; border-color:#67c23a;">广告&nbsp;{{item.AdvertCount}}
</el-button>
<template v-if="item.LineID==14||item.LineID==118">
<el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送消息
</el-button>
<el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" content="点击取消推送" placement="top">
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">已推送
<el-tooltip v-if="item.IsPush==0" class="item" effect="dark" placement="top" content="订房推送">
<el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订房推送
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.IsPush==1" class="item" effect="dark" placement="top">
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary" style="background:red !important;">
已推送订房
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.IsPush==2" class="item" effect="dark" :content="item.HotelPushDate"
placement="top">
<div slot="content">
<div v-html="TipsContent(item,1)"></div>
</div>
<el-button @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">推送订房
</el-button>
</el-tooltip>
</template>
<template v-if="item.LineID==14||item.LineID==118">
<el-tooltip v-if="item.CarIsPush==0" class="item" effect="dark" placement="top" content="订车推送">
<el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
</el-tooltip>
<!-- content="点击取消推送" -->
<el-tooltip v-else-if="item.CarIsPush==1" class="item" effect="dark" :content="item.CarPushDate"
placement="top">
<div slot="content">
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary" style="background:red !important;">
已推送订车
</el-button>
</el-tooltip>
<el-tooltip v-else-if="item.CarIsPush==2" class="item" effect="dark" placement="top">
<div slot="content">
<div v-html="TipsContent(item,2)"></div>
</div>
<el-button @click.native='PushBusMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">订车推送
</el-button>
</el-tooltip>
<el-button v-if="item.IsPush==2" @click.native='PushMessage(item)' type="primary"
style="background:#00C6FF; border-color:#00C6FF;">重新推送
</el-button>
</template>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
{{$t('Operation.Op_remark')}}
......@@ -719,7 +766,8 @@
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.IsEditOutBranch==1" @click.native="GroupTypeObj=item,GroupTypeVisible=true">
<el-dropdown-item v-if="item.IsEditOutBranch==1"
@click.native="GroupTypeObj=item,GroupTypeVisible=true">
<div>修改出团公司 </div>
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">{{$t('visaT.sale')}}
......@@ -878,9 +926,11 @@
<script>
import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
import commonBusInfo from "../../commonPage/commonBusInfo.vue";
import EditLeaveGroup from './components/EditLeaveGroup.vue';
export default {
components: {
commonBusInfo,
priceDialog,
commonHotelInfo,
EditLeaveGroup
......@@ -1156,9 +1206,29 @@
}
});
},
//消息推送
//提示信息(type=1酒店推送,type=2订车推送)
TipsContent(item, type) {
let resultStr = '';
//订车推送
if (type == 2) {
if (item.CarIsPush == 1) {
resultStr += '已推送订车，推送时间:' + item.CarPushDate + '<br/>点击可取消用车';
} else if (item.CarIsPush == 2) {
resultStr += '已取消订车，取消时间:' + item.CarPushDate + '<br/>点击可重新推送用车';
}
}
//订房推送
else if (type == 1) {
if (item.IsPush == 1) {
resultStr = '已推送订房，推送时间：' + item.HotelPushDate + '<br/> 点击可取消订房';
} else if (item.IsPush == 2) {
resultStr = '已取消订房推送，取消时间：' + item.HotelPushDate + '<br/>点击可重新推送订房';
}
}
return resultStr;
},
//推送消息
PushMessage(item) {
this.queryCommonData.loading = true;
var pMsg = {
TCID: item.TCID
};
......@@ -1168,15 +1238,53 @@
cmdStr = "travel_post_CancelPushTravelPriceToQYWork"; //取消推送
tipMessage = "【取消】推送";
}
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
let that = this;
that.$confirm('是否确认操作酒店推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {
});
},
//订车推送
PushBusMessage(item) {
var pMsg = {
TCID: item.TCID
};
var tipMessage = "订车推送消息";
var cmdStr = "travel_post_PushTravelBusToQYWork"; //推送消息
if (item.CarIsPush == 1) {
cmdStr = "travel_post_CancelPushTravelBusToQYWork"; //取消推送
tipMessage = "订车【取消】推送";
}
let that = this;
that.$confirm('是否确认操作订车推送', this.$t('tips.tips'), {
confirmButtonText: this.$t('pub.sureBtn'),
cancelButtonText: this.$t('pub.cancelBtn'),
type: 'warning'
}).then(() => {
this.queryCommonData.loading = true;
this.apipost(cmdStr, pMsg, res => {
if (res.data.resultCode == 1) {
this.Success(tipMessage + '成功!');
this.getControlList();
} else {
this.Error(tipMessage + '失败!');
}
});
}).catch(() => {});
},
//显示报价单弹窗
showDialog(ConfigId, OfferId) {
this.dialog = {
......@@ -1980,7 +2088,7 @@
}
if (this.queryCommonData.IsParentCompany != 1) {
if (this.CurrentUserInfo.RB_Branch_id != 49 && this.CurrentUserInfo.RB_Branch_id != 1245 && this.CurrentUserInfo
.RB_Branch_id != 1249&& this.CurrentUserInfo.RB_Branch_id != 1252) {
.RB_Branch_id != 1249 && this.CurrentUserInfo.RB_Branch_id != 1252) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
}
......
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