Skip to content

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

新增直客数据统计

parent 87e2c373
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 118 deletions
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 0f3f48cd
......@@ -36,7 +36,8 @@
</div>
<div class="TFContent">
<div class="TFconTitle">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.myOrdersAllType.dianjcxjzxcts')" placement="top-start">
<el-tooltip class="item" effect="dark" :content="$t('objFill.v101.myOrdersAllType.dianjcxjzxcts')"
placement="top-start">
<span style="cursor:pointer;" @click="ReLoadFeature()">{{ckTitle}}</span>
</el-tooltip>
<div class="TFBTline"></div>
......@@ -86,8 +87,10 @@
<div class="sliderContent clearfix" style="width:1000px;">
<el-upload class="upload-demo" :http-request="reUpload" :multiple="true"
accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false" action>
<el-button size="small" type="primary" @click="updateTFimg(1)">{{$t('objFill.v101.myOrdersAllType.shangcxcts')}}</el-button>
<div slot="tip" class="el-upload__tip" style="color:red;">{{$t('objFill.v101.myOrdersAllType.hengbsbcc')}}</div>
<el-button size="small" type="primary" @click="updateTFimg(1)">
{{$t('objFill.v101.myOrdersAllType.shangcxcts')}}</el-button>
<div slot="tip" class="el-upload__tip" style="color:red;">
{{$t('objFill.v101.myOrdersAllType.hengbsbcc')}}</div>
</el-upload>
<div class="TFSelfimgList" style="margin-top:5px;"
v-for="(item,index) in FeatureData.TripImageListNew" :key="item.subCode">
......@@ -117,14 +120,17 @@
<div class="sliderContent clearfix" style="width:1000px;">
<el-form label-width="80px">
<el-form-item :label="$t('sm.xingchengxq')">
<el-radio v-model="FeatureData.IsUploadDetails" :label="0">{{$t('objFill.v101.myOrdersAllType.xitongsc')}}</el-radio>
<el-radio v-model="FeatureData.IsUploadDetails" :label="1">{{$t('objFill.v101.myOrdersAllType.zidinysc')}}</el-radio>
<el-radio v-model="FeatureData.IsUploadDetails" :label="0">
{{$t('objFill.v101.myOrdersAllType.xitongsc')}}</el-radio>
<el-radio v-model="FeatureData.IsUploadDetails" :label="1">
{{$t('objFill.v101.myOrdersAllType.zidinysc')}}</el-radio>
</el-form-item>
</el-form>
<template v-if="FeatureData.IsUploadDetails==1">
<el-upload class="upload-demo" :http-request="reUpload" :multiple="true"
accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false" action>
<el-button size="small" type="primary" @click="updateTFimg(2)">{{$t('objFill.v101.myOrdersAllType.shangcxcxq')}}</el-button>
<el-button size="small" type="primary" @click="updateTFimg(2)">
{{$t('objFill.v101.myOrdersAllType.shangcxcxq')}}</el-button>
<div slot="tip" class="el-upload__tip" style="color:red;">
<font style="font-weight:bold;font-size:14px;">
{{$t('objFill.v101.myOrdersAllType.ruguosclzdyt')}}。</font>
......@@ -205,7 +211,8 @@
</template>
</div> -->
<div v-show="PostMessageText=='暂无行程数据'"
style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">{{$t('objFill.v101.myOrdersAllType.zanwusjysjbjssb')}}</div>
style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">
{{$t('objFill.v101.myOrdersAllType.zanwusjysjbjssb')}}</div>
</div>
</div>
</div>
......@@ -590,14 +597,14 @@
else if (SaveType == 2 || SaveType == 3) {
let path = "TravelControlList";
//OP开团和地接开团
if (TeamType == 0) {
path = "TravelControlList";
} else if (TeamType == 3) {
if (TeamType == 3) {
path = "TravelControlList2";
} else if (TeamType == 1) {
path = "TravelControlListSale";
} else if (TeamType == 2) {
path = "oneDayTrip";
} else {
path = "TravelControlList";
}
this.$router.push({
path: path,
......
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 0f3f48cd
......@@ -67,7 +67,8 @@
<span class="TMTitle"><i></i>{{$t('objFill.ditu')}}</span>
<div style="padding-bottom: 15px;">
<input type="file" style="display:none" id="uploadMap" @change="uploadpic">
<span class="foldList" style="margin-left: 10px;" @click="ShowMap=!ShowMap">{{$t('objFill.v101.myOrdersAllType.bianjiditu')}}</span>
<span class="foldList" style="margin-left: 10px;"
@click="ShowMap=!ShowMap">{{$t('objFill.v101.myOrdersAllType.bianjiditu')}}</span>
<span class="foldList" @click="UploadImg">{{$t('objFill.v101.myOrdersAllType.shangcdttp')}}</span>
</div>
</div>
......@@ -77,7 +78,8 @@
:preview-src-list="[PostConfig.MapUrl]">
</el-image>
</div>
<p v-else @click="ShowMap=!ShowMap" style="cursor: pointer;">{{$t('objFill.v101.myOrdersAllType.dituzwscsc')}}</p>
<p v-else @click="ShowMap=!ShowMap" style="cursor: pointer;">
{{$t('objFill.v101.myOrdersAllType.dituzwscsc')}}</p>
</div>
</div>
<Tripmap v-if="ShowMap" :PostConfig="PostConfig" :ConfigId="ConfigId" @Cancel="ShowMap=false"
......@@ -88,9 +90,9 @@
v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<div id="fiveAnchor">
<!--常规团-->
<TravelPrice v-show="PostConfig.TeamType==0||PostConfig.TeamType==5" @saveMsg="SaveData(1)" ref="TravelPrice1" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:IsDirect="PostConfig.IsDirect"></TravelPrice>
<TravelPrice v-show="PostConfig.TeamType==0||PostConfig.TeamType==5" @saveMsg="SaveData(1)" ref="TravelPrice1"
@headCallBack="getPrice" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice>
<!--小包团-->
<TravelPrice2 v-show="PostConfig.TeamType==1" @saveMsg="SaveData(1)" ref="TravelPrice2" @headCallBack="getPrice"
......@@ -122,7 +124,8 @@
<div v-if="modifyType==2" class="DTSaveBtn" :class="{'disClick':!isSubmit}" :loading="saveLoading"
@click="submitForm(3)" :title="$t('objFill.v101.myOrdersAllType.lingcwxmb')">{{$t('pub.saveBtn')}}
</div>
<div v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">{{$t('sm.yulan')}}
<div style="display:none;" v-if="ConfigId>0" class="DTSaveBtn" :class="{'disClick':!isSubmit}" @click="goB2B()">
{{$t('sm.yulan')}}
</div>
</div>
</div>
......@@ -368,7 +371,7 @@
getConfig(configObj) {
this.PostConfig = configObj;
this.PostConfig.TripColor = configObj.TripColor ? configObj.TripColor : '#CC6900' //#CC0066
this.FeatureData.TripColor=this.PostConfig.TripColor;
this.FeatureData.TripColor = this.PostConfig.TripColor;
//没有报价单根据线路设置直采和非直采方式生成线路行程
if (this.IsHaveOffer == 0) {
this.NoticeParameters.ConfigId = this.PostConfig.ConfigId;
......@@ -589,6 +592,9 @@
this.$refs.TravelPrice4.closeHotelDialog();
this.$refs.TravelPrice4.initStatus();
}
if (basicData.PriceList && basicData.PriceList.length > 0) {
this.TeamType = basicData.PriceList[0].TeamType;
}
this.$refs.TravelFeature.getHtml(TripFeature, SaveType, this.TeamType);
} else if (res.data.resultCode == 10009) {
this.FeatureData.IsSave = false;
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 0f3f48cd
......@@ -924,7 +924,6 @@
</el-option>
</template>
<template v-if="priceData.TeamType==1">
<el-option v-if="item.Id==2" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</template>
......@@ -1251,6 +1250,7 @@
currentPriceIndex: 0, //当前团期索引位置
showPriceList: [],
priceShowCount: 6, //团期展示条数
QAirTicketId:"",//机票Id
QFlightDateStart: '', //航班查询开始日期
QFlightDateEnd: '', //航班查询结束日期
pickerBeginDateBefore: {
......@@ -1440,6 +1440,7 @@
IsLeaderDaiTuan: 1, //领队带团/不带团
IsGuideDaiTuan: 1, //导游带团/不带团
IsNewArrival: 0, //是否新品
TeamId:0,//团队分组编号
};
}
this.returnPriceList.push(objItem);
......@@ -1545,7 +1546,8 @@
CreateBy: createBy,
AirTicketId: this.priceData.AirTicketId,
TCID: this.priceData.TCID,
LineId: this.PostConfig.LineId
LineId: this.PostConfig.LineId,
QAirTicketId:this.QAirTicketId,
};
let that = this;
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 0f3f48cd
......@@ -1430,6 +1430,7 @@
GuideNum: 0, //导游人数
IsLeaderDaiTuan: 1, //领队带团/不带团
IsNewArrival: 0, //是否新品
TeamId:0,//团队分组编号
};
}
this.returnPriceList.push(objItem);
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice3.vue
View file @ 0f3f48cd
......@@ -1187,6 +1187,7 @@
IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数
IsNewArrival: 0, //是否新品
TeamId:0,//团队分组编号
};
}
this.returnPriceList.push(objItem);
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice4.vue
View file @ 0f3f48cd
......@@ -1285,6 +1285,7 @@
IsNeedAirportShuttle: 0, //是否需要接送服务
GuideNum: 0, //导游人数
IsNewArrival: 0, //是否新品
TeamId:0,//团队分组编号
};
}
this.returnPriceList.push(objItem);
......
src/components/rank/components/customer.vue
View file @ 0f3f48cd
......@@ -26,23 +26,47 @@
chartData: {
type: Object,
default: null
},
//类型(0-同业[旅小友],1-直客[国旅优选])
cusType:{
type:Number,
default:0,
}
},
watch: {
chartData: function (old, val) {
if (this.chartData) {
var barName="新增同业数";
if(this.cusType==1) {
barName="新增直客数";
}
this.barData.data = this.chartData.customerYData;
this.barData.name=barName;
this.lineData.data = this.chartData.activationYData;
if(this.cusType==1)
{
this.lineData.data=[];
this.lineData.name="";
}
this.xAxisData = this.chartData.xData;
}
this.initChart();
}
},
mounted() {
// this.unit = this.chartData.unit;
if (this.chartData) {
var barName="新增同业数";
if(this.cusType==1) {
barName="新增直客数";
}
this.barData.data = this.chartData.customerYData;
this.barData.name=barName;
this.lineData.data = this.chartData.activationYData;
if(this.cusType==1){
this.lineData.data=[];
this.lineData.name="";
}
this.xAxisData = this.chartData.xData;
}
this.initChart();
......@@ -52,8 +76,7 @@
const chartDom = document.getElementById('chart');
this.chart = echarts.init(chartDom);
var intervalNum=0;
if(this.xAxisData&&this.xAxisData.length>0)
{
if(this.xAxisData&&this.xAxisData.length>0){
intervalNum=this.calculateInterval(this.xAxisData.length);
}
const option = {
......
src/components/rank/components/tradecount.vue
View file @ 0f3f48cd
......@@ -11,11 +11,11 @@ export default {
return {
chart: null,
barData: {
name: '新增同业数',
name: '旅小友订单',
data: [123, 211, 178, 289, 90, 156, 222, 101, 267, 199, 125, 291, 187, 92, 243, 148, 212, 117, 279, 103, 137, 256, 221, 193, 88, 283, 165, 111, 239, 107],
},
lineData: {
name: '新增激活数',
name: '其他订单',
data: [105, 219, 142, 297, 176, 84, 233, 120, 265, 199, 207, 91, 251, 153, 281, 113, 224, 168, 246, 131, 273, 185, 99, 237, 147, 292, 109, 214, 171, 260],
},
xAxisData: [
......@@ -33,14 +33,23 @@ export default {
chartData: {
type: Object,
default: null
},
//类型(0-同业[旅小友],1-直客[国旅优选])
cusType:{
type:Number,
default:0,
}
},
watch: {
chartData: function (old, val) {
if (this.chartData) {
const otherOrders = this.chartData.allOrderData.map((x,i)=>x-(this.chartData.appOrderData[i]))
var barName="旅小友订单";
if(this.cusType==1){
barName="国旅优选订单";
}
this.barData = {
name: '旅小友订单',
name: barName,
data: this.chartData.appOrderData
};
this.lineData = {
......@@ -55,9 +64,13 @@ export default {
},
mounted() {
if (this.chartData) {
var barName="旅小友订单";
if(this.cusType==1){
barName="国旅优选订单";
}
const otherOrders = this.chartData.allOrderData.map((x,i)=>x-(this.chartData.appOrderData[i]))
this.barData = {
name: '旅小友订单',
name: barName,
data: this.chartData.appOrderData
};
this.lineData = {
......
src/components/rank/dataCount.vue
View file @ 0f3f48cd
......@@ -4,6 +4,9 @@
<div class="row items-center" style="margin-bottom: 20px;">
<div class="page-title col">平台数据</div>
<div class="row items-center">
<el-select v-model="parameters.CusType" style="width:100px; margin-right: 20px;height:40px" @change="handleDateChange()">
<el-option v-for="(x,i) in platforms" :key="i" :label="x.Name" :value="x.Id" ></el-option>
</el-select>
<template v-if="userInfo.RB_Branch_id==0||userInfo.RB_Branch_id==49">
<el-select
v-model="parameters.branchId"
......@@ -167,10 +170,9 @@
</div>
</div>
<div style="height: 320px;">
<Customer :chartData="customerObj" v-if="customerObj"></Customer>
<Customer :chartData="customerObj" v-if="customerObj" :cusType="parameters.CusType"></Customer>
</div>
</div>
<div class="sub-title q-my-md green">交易核心数据</div>
<div class="card rounded big">
<div class="row items-center">
......@@ -183,9 +185,6 @@
}}</span>
</div>
</div>
<!-- <el-select v-model="platformId" style="width: 140px;">
<el-option v-for="(x,i) in platforms" :key="i" :label="x.Name" :value="x.Id"></el-option>
</el-select> -->
</div>
<div class="q-mt-md row items-center">
<div class="data-items col NumCursorP" @click="goUrl(5)">
......@@ -226,7 +225,6 @@
<span>个</span>
</div>
</div>
<el-divider direction="vertical" style="margin: 0 12px;"></el-divider>
<div class="data-items col NumCursorP" @click="goUrl(8)">
<div>用卷订单数</div>
......@@ -250,7 +248,7 @@
</div>
</div>
<div style="height: 320px;">
<Tradecount :chartData="customerObj" v-if="customerObj"></Tradecount>
<Tradecount :chartData="customerObj" v-if="customerObj" :cusType="parameters.CusType"></Tradecount>
</div>
</div>
......@@ -391,16 +389,13 @@
</div>
</div>
</div>
<div class="q-mt-md row items-center">
<div class="card rounded big col q-mr-md">
<div style="margin: 0 12px;">
<div class="sub-title">新增用户概况</div>
<div class="">
<span class="dot"></span>
<span class="text-info"
>数据更新：{{ parameters.dateRange[1] }}</span
>
<span class="text-info">数据更新：{{ parameters.dateRange[1] }}</span>
</div>
</div>
<div class="q-mt-md row items-center">
......@@ -706,6 +701,7 @@ export default {
RB_Department_Id:null,
empIdList:[],
empId:"",
CusType:0,//客户类型(0-同行(旅小友小程序)，1-直客(和平国旅小程序))
},
normalizer(node) {
var obj = {
......@@ -847,12 +843,12 @@ export default {
],
platforms: [
{
Id: 1,
Name: "全部"
Id: 0,
Name: "同业"
},
{
Id: 2,
Name: "旅小友"
Id: 1,
Name: "直客"
}
],
platformId: 1,
......@@ -893,75 +889,7 @@ export default {
mounted() {},
methods: {
goUrl(type) {
let Time = [this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")),this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))]
let query
// if(type<5){
// if(type==1){
// query = {
// blank: "y",
// }
// }else if(type==2){
// query = {
// EnterTime: Time,
// blank: "y",
// }
// }else if(type==3){
// query = {
// activation: 1,
// blank: "y",
// }
// }else if(type==4){
// query = {
// activationTime: Time,
// activation: 1,
// blank: "y",
// }
// }
// this.OpenNewPage('/customerTransfer',query)
// }
// if(type>4&&type<9){
// if(type==5){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// BranchId: this.parameters.branchId,
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==6){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==7){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// isNormal: 1,
// blank: "y",
// }
// }else if(type==8){
// query = {
// CStartDate: this.parameters.dateRange[0],
// CEndDate: this.parameters.dateRange[1],
// RB_Department_Id:this.parameters.RB_Department_Id,
// EmployeeId:this.parameters.empId,
// discount: 1,
// isNormal: 1,
// blank: "y",
// }
// }
// this.OpenNewPage('/salesVolumeRank',query)
// }
query = {
let query= {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
BranchId: this.parameters.branchId,
......@@ -969,7 +897,9 @@ export default {
EmployeeId:this.parameters.empId,
blank: "y",
}
this.OpenNewPage('/salesVolumeRank',query)
if(this.parameters.CusType==0){
this.OpenNewPage('/salesVolumeRank',query);
}
},
changeDepart(node, instanceId){
this.parameters.RB_Department_Id=node.DepartmentId;
......@@ -1073,7 +1003,8 @@ export default {
getHomeChat() {
const msg = {
StartDate: this.parameters.dateRange[0],
EndDate: this.parameters.dateRange[1]
EndDate: this.parameters.dateRange[1],
WechatType:this.parameters.CusType
};
this.apipost(
"wechatstatistics_post_HomeWechatStatisticsList",
......@@ -1090,7 +1021,8 @@ export default {
getTrendWechatData(){
const msg = {
StartDate: this.parameters.dateRange[0],
EndDate: this.parameters.dateRange[1]
EndDate: this.parameters.dateRange[1],
WechatType:this.parameters.CusType,
};
this.apipost(
"wechatstatistics_post_WechatStatisticsList",
......@@ -1107,7 +1039,8 @@ export default {
getPageData(){
const msg = {
StartDate: this.parameters.dateRange[0],
EndDate: this.parameters.dateRange[1]
EndDate: this.parameters.dateRange[1],
WechatType:this.parameters.CusType
};
this.apipost(
"wechatstatistics_post_PageVisitStatisticsList",
......@@ -1124,7 +1057,8 @@ export default {
getAreaData(){
const msg = {
StartDate: this.parameters.dateRange[0],
EndDate: this.parameters.dateRange[1]
EndDate: this.parameters.dateRange[1],
WechatType:this.parameters.CusType
};
this.apipost(
"wechatstatistics_post_UserPortraitStatisticsList",
......
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