Skip to content

S
SuperMan
Commit db4d35c1 authored by youjie's avatar youjie
Browse files
Options

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

parents 84fb744e e0e136e6
Hide whitespace changes
Inline Side-by-side
Showing with 147 additions and 67 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ db4d35c1
......@@ -1381,15 +1381,7 @@
{{ $t("objFill.xilietxbm") }}
</el-dropdown-item>
</template>
<el-dropdown-item @click.native="
goTonowTeam(
'TravelManager',
item.ID,
item.TCID,
item.TCNUM,
item
)
">
<el-dropdown-item @click.native="goTonowTeam(item) ">
{{ $t("objFill.dangtuanxbm") }}
</el-dropdown-item>
</el-dropdown-menu>
......@@ -1666,7 +1658,7 @@
<template v-for="(subItem,subIndex) in item.TicketList">
<font :key="`p_`+subIndex">
<template v-if="subItem.TravelTicketType==1">
<font style="color:#47BF8C;"> {{$t('objFill.v101.tuanpiao')}}</font>
<font style="color:#47BF8C;"> {{$t('objFill.v101.tuanpiao')}}</font>
</template>
<template v-else-if="subItem.TravelTicketType==2">
<font style="color:blue;"> {{$t('objFill.v101.shanpiao')}}</font>
......@@ -1674,7 +1666,7 @@
<template v-else-if="subItem.TravelTicketType==3">
<font style="color:red;"> {{$t('objFill.v101.lspiao')}}</font>
</template>
{{subItem.TicketOpRemark}}
{{subItem.TicketOpRemark}}
【{{subItem.TicketCreateByName}}】
</font>
</template>
......@@ -3293,28 +3285,53 @@
}
},
//当团修改
goTonowTeam(path, configId, tcid, TCNUM, item) {
if (configId > 0) {
this.$store.commit("pageConditionUpdate", this.queryMsg);
this.$router.push({
name: path,
query: {
configId: configId,
offerId: item.Config_OfferId,
openState: 1,
tcid: tcid,
TCNUM: TCNUM,
blank: "y",
tab: "团期配置",
},
goTonowTeam(item) {
var that = this;
var path = 'TravelManager';
var ttMsg = {
configId: item.ID,
offerId: item.Config_OfferId,
openState: 1,
tcid: item.TCID,
TCNUM: item.TCNUM,
blank: "y",
tab: "团期配置",
};
if (item.RelationPriceList && item.RelationPriceList.length > 0) {
var tipMsg = "当前行程为系列团，你是否确定需要将当前团期进行独立维护并且不再与系列团关联？"
that.Confirm(tipMsg, function () {
that.queryCommonData.loading = true;
var dMsg = {
ConfigId: item.ID,
TCID: item.TCID
};
that.apipost(
"travel_post_SetTravelConfigChangeDT",
dMsg,
(res) => {
that.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
ttMsg.configId = res.data.data;
that.getControlList();
that.gotoUrl(path,ttMsg);
} else {
that.Error(res.data.message);
}
},
null
);
});
} else {
this.$router.push({
name: path,
});
that.gotoUrl(path, ttMsg);
}
},
gotoUrl(path, query) {
this.$router.push({
name: path,
query: query
});
},
//删除团期
removeTeamInfo(TCID) {
var that = this;
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ db4d35c1
......@@ -975,7 +975,7 @@
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,0,item)">
{{$t('Operation.Op_xilieModyfi')}}</el-dropdown-item>
</template>
<el-dropdown-item @click.native="goToOpenTravel('TravelManager',item.ID,item.TCID,item)">
<el-dropdown-item @click.native="goTonowTeam(item)">
{{$t('Operation.Op_dangtuanModify')}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -2582,6 +2582,54 @@
});
}
},
//当团修改
goTonowTeam(item) {
var that = this;
var path = 'TravelManager';
var ttMsg = {
configId: item.ID,
offerId: item.Config_OfferId,
openState: 1,
tcid: item.TCID,
TCNUM: item.TCNUM,
blank: "y",
tab: "团期配置",
};
if (item.RelationPriceList && item.RelationPriceList.length > 0) {
var tipMsg = "当前行程为系列团，你是否确定需要将当前团期进行独立维护并且不再与系列团关联？"
that.Confirm(tipMsg, function () {
that.queryCommonData.loading = true;
var dMsg = {
ConfigId: item.ID,
TCID: item.TCID
};
that.apipost(
"travel_post_SetTravelConfigChangeDT",
dMsg,
(res) => {
that.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
ttMsg.configId = res.data.data;
that.getControlList();
that.gotoUrl(path, ttMsg);
} else {
that.Error(res.data.message);
}
},
null
);
});
} else {
that.gotoUrl(path, ttMsg);
}
},
gotoUrl(path, query) {
this.$router.push({
name: path,
query: query
});
},
//删除团期
removeTeamInfo(TCID) {
var that = this;
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ db4d35c1
......@@ -745,7 +745,7 @@
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item>
</template>
<el-dropdown-item @click.native="goTonowTeam('TravelManager',item.ID,item.TCID,item.TCNUM,item)">
<el-dropdown-item @click.native="goTonowTeam(item)">
{{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item>
</el-dropdown-menu>
......@@ -1834,7 +1834,6 @@
}
)
},
//验证大小
checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum)
......@@ -2000,7 +1999,6 @@
}
})
},
goUrl(path, id, name) {
this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({
......@@ -2101,30 +2099,53 @@
}
},
//当团修改
goTonowTeam(path, configId, tcid, TCNUM, item) {
if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({
name: path,
query: {
configId: configId,
offerId: item.Config_OfferId,
openState: 1,
tcid: tcid,
TCNUM: TCNUM,
blank: 'y',
tab: '团期配置',
flag: this.$route.query.flag ? this.$route.query.flag : false
}
})
goTonowTeam(item) {
var that = this;
var path = 'TravelManager';
var ttMsg = {
configId: item.ID,
offerId: item.Config_OfferId,
openState: 1,
tcid: item.TCID,
TCNUM: item.TCNUM,
blank: "y",
tab: "团期配置",
};
if (item.RelationPriceList && item.RelationPriceList.length > 0) {
var tipMsg = "当前行程为系列团，你是否确定需要将当前团期进行独立维护并且不再与系列团关联？"
that.Confirm(tipMsg, function () {
that.queryCommonData.loading = true;
var dMsg = {
ConfigId: item.ID,
TCID: item.TCID
};
that.apipost(
"travel_post_SetTravelConfigChangeDT",
dMsg,
(res) => {
that.queryCommonData.loading = false;
if (res.data.resultCode == 1) {
that.Success(res.data.message);
ttMsg.configId = res.data.data;
that.getControlList();
that.gotoUrl(path, ttMsg);
} else {
that.Error(res.data.message);
}
},
null
);
});
} else {
this.$router.push({
name: path
})
that.gotoUrl(path, ttMsg);
}
},
gotoUrl(path, query) {
this.$router.push({
name: path,
query: query
});
},
//删除团期
removeTeamInfo(TCID) {
var that = this
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ db4d35c1
......@@ -6,16 +6,18 @@
</span>
<span class="foldList" @click="fold" v-if="isFold==''">{{$t('sm.djzd')}}</span>
<span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
<span v-if="FeatureData.ConfigId&&dataAll.FeaturePageType&&FeatureData.FeatureType==9" class="foldList"
style="margin-right: 5px;" @click="journeyTemplate()">{{$t('objFill.v101.myOrdersAllType.bianjixc')}}</span>
<span style="color: red;float: right;margin-right: 5px;line-height: 28px;font-weight:bold;">
{{$t('objFill.v101.myOrdersAllType.xinfzdtqrx')}}</span>
<template v-if="FeatureData.ConfigId&&FeatureData.FeatureType==9">
<span v-if="dataAll.FeaturePageType" class="foldList" style="margin-right: 5px;"
@click="journeyTemplate()">{{$t('objFill.v101.myOrdersAllType.bianjixc')}}</span>
<font v-else style="margin-right:5px;color:red;float:right;padding-top:5px;font-weight:bold;">
请选择 线路行程=>版型
</font>
</template>
<div class="TrfList clearfix">
<template v-for="item in TypeArray">
<div class="TFslide"
:class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode">
<!--v-if="((item.TypeState>3 && CurrentUserInfo.RB_Group_id==QjGroupId())||item.TypeState<=3)"-->
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
</div>
......@@ -202,14 +204,6 @@
<iframe name="myIframe" :src="myIframeUrl" style="width: 100%;border: 0;"
:style="{'height':myIframeHeigth+'px'}">
</iframe>
<!-- <div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
<template v-for="url in FeatureData.TripImageListNew">
<el-image
style="width: 100%; height: auto"
:src="url"
:preview-src-list="FeatureData.TripImageListNew"></el-image>
</template>
</div> -->
<div v-show="PostMessageText=='暂无行程数据'"
style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">
{{$t('objFill.v101.myOrdersAllType.zanwusjysjbjssb')}}</div>
......
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