Skip to content

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

11

parent ffa51734
Hide whitespace changes
Inline Side-by-side
Showing with 102 additions and 45 deletions
src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue
View file @ 409922de
...@@ -92,23 +92,23 @@ ...@@ -92,23 +92,23 @@
<!--常规团--> <!--常规团-->
<TravelPrice v-show="PostConfig.TeamType==0||PostConfig.TeamType==5" @saveMsg="SaveData(1)" ref="TravelPrice1" <TravelPrice v-show="PostConfig.TeamType==0||PostConfig.TeamType==5" @saveMsg="SaveData(1)" ref="TravelPrice1"
@headCallBack="getPrice" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" @headCallBack="getPrice" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
:CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect"></TravelPrice> :CurrentUserInfo="CurrentUserInfo" :IsDirect="PostConfig.IsDirect" :dayObj="journeyList"></TravelPrice>
<!--小包团--> <!--小包团-->
<TravelPrice2 v-show="PostConfig.TeamType==1" @saveMsg="SaveData(1)" ref="TravelPrice2" @headCallBack="getPrice" <TravelPrice2 v-show="PostConfig.TeamType==1" @saveMsg="SaveData(1)" ref="TravelPrice2" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:IsDirect="PostConfig.IsDirect"> :IsDirect="PostConfig.IsDirect" :dayObj="journeyList">
</TravelPrice2> </TravelPrice2>
<!--当地游--> <!--当地游-->
<TravelPrice3 v-show="PostConfig.TeamType==2" @saveMsg="SaveData(1)" ref="TravelPrice3" @headCallBack="getPrice" <TravelPrice3 v-show="PostConfig.TeamType==2" @saveMsg="SaveData(1)" ref="TravelPrice3" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:IsDirect="PostConfig.IsDirect"></TravelPrice3> :IsDirect="PostConfig.IsDirect" :dayObj="journeyList"></TravelPrice3>
<!--地接团--> <!--地接团-->
<TravelPrice4 v-show="PostConfig.TeamType==3" @saveMsg="SaveData(1)" ref="TravelPrice4" @headCallBack="getPrice" <TravelPrice4 v-show="PostConfig.TeamType==3" @saveMsg="SaveData(1)" ref="TravelPrice4" @headCallBack="getPrice"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :CurrentUserInfo="CurrentUserInfo"
:TeamType="PostConfig.TeamType"></TravelPrice4> :TeamType="PostConfig.TeamType" :dayObj="journeyList"></TravelPrice4>
</div> </div>
<div class="btnFixedDiv" v-if="IsShowBtn"> <div class="btnFixedDiv" v-if="IsShowBtn">
...@@ -232,6 +232,7 @@ ...@@ -232,6 +232,7 @@
FeaturePageType: 0, //1横版 2竖版 FeaturePageType: 0, //1横版 2竖版
TeamType: 0, TeamType: 0,
IsSplitTeam:0,//当团修改是否拆分团队(1-拆分) IsSplitTeam:0,//当团修改是否拆分团队(1-拆分)
BackScenicList:[],//可退景点
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -434,14 +435,6 @@ ...@@ -434,14 +435,6 @@
this.Error(this.$t('objFill.v101.dmc.qingxuanzxl')); this.Error(this.$t('objFill.v101.dmc.qingxuanzxl'));
return return
} }
// if (this.PostPrice && this.PostPrice.length > 0) {
// for (let i = 0; i < this.PostPrice.length; i++) {
// if (this.PostPrice[i].PriceTeamType == 3 && this.PostPrice[i].PriceOfferUrl == '') {
// this.Error(this.$t('fnc.tuanqi') + this.PostPrice[i].StartDate +this.$t('objFill.v101.myOrdersAllType.deriwdant'));
// return
// }
// }
// }
if (this.FeatureData.FeatureType == 9 && !this.isPptJourney) { if (this.FeatureData.FeatureType == 9 && !this.isPptJourney) {
var that = this var that = this
that.Confirm(that.$t('objFill.v101.myOrdersAllType.dangqxcwbjxcsfbc'), function () { that.Confirm(that.$t('objFill.v101.myOrdersAllType.dangqxcwbjxcsfbc'), function () {
...@@ -692,7 +685,6 @@ ...@@ -692,7 +685,6 @@
if (uploadConfig != undefined) { if (uploadConfig != undefined) {
var configData = JSON.parse(uploadConfig); var configData = JSON.parse(uploadConfig);
//基础数据组装 //基础数据组装
//this.PostConfig.Title = "";
this.PostConfig.IsDirect = 0; this.PostConfig.IsDirect = 0;
//线路行程组装 //线路行程组装
let dayList = []; let dayList = [];
...@@ -980,6 +972,7 @@ ...@@ -980,6 +972,7 @@
this.PostConfig.TripMapList = tempData.TripMapList; this.PostConfig.TripMapList = tempData.TripMapList;
this.PostConfig.NotQueryCityList = tempData.NotQueryCityList; this.PostConfig.NotQueryCityList = tempData.NotQueryCityList;
this.PostConfig.MapUrl = tempData.MapUrl; this.PostConfig.MapUrl = tempData.MapUrl;
this.PostConfig.BackScenicList=tempData.BackScenicList;
let arrList = function (list) { let arrList = function (list) {
list.forEach(x => { list.forEach(x => {
x.CountrySelectList = []; //国家下拉列表 x.CountrySelectList = []; //国家下拉列表
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 409922de
...@@ -873,7 +873,8 @@ ...@@ -873,7 +873,8 @@
</tr> </tr>
<tr v-for="item in priceData.ScenicBackList"> <tr v-for="item in priceData.ScenicBackList">
<td> <td>
<el-checkbox :checked="item.IsChecked" @change="getScenic(item)"></el-checkbox> <!--<el-checkbox :checked="item.IsChecked" @change="getScenic(item)"></el-checkbox>-->
<el-checkbox v-model="item.IsChecked"></el-checkbox>
</td> </td>
<td> <td>
{{item.Name}} {{item.Name}}
...@@ -887,7 +888,8 @@ ...@@ -887,7 +888,8 @@
</div> </div>
</div> </div>
<div slot="reference" class="SimulateDrop-box"> <div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in ScenicList">{{subItem.Name}}</span> <span class="SD_flight" v-for="subItem in priceData.ScenicBackList"
v-if="subItem.IsChecked">{{subItem.Name}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i> <i class="iconfont icon-arrow-down SimulaDrop"></i>
</div> </div>
</el-popover> </el-popover>
...@@ -1224,11 +1226,11 @@ ...@@ -1224,11 +1226,11 @@
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue"; import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue"; import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue";
export default { export default {
props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect"], props: ["priceList", "PostConfig", "modifyTcid", "CurrentUserInfo", "IsDirect", "dayObj"],
data() { data() {
return { return {
changePlat: "",//选择的平台 changePlat: "", //选择的平台
platformList: [],//平台列表 platformList: [], //平台列表
outerVisible: false, outerVisible: false,
currentDay: 1, currentDay: 1,
currentMonth: 1, currentMonth: 1,
...@@ -1272,8 +1274,6 @@ ...@@ -1272,8 +1274,6 @@
offerList: [], offerList: [],
selectFilghtList: [], selectFilghtList: [],
FinfoList: [], FinfoList: [],
//选中景点
ScenicList: [],
//下拉框默认值 //下拉框默认值
SelectDefaultValue: 0, SelectDefaultValue: 0,
SelectOtherDefault: -1, SelectOtherDefault: -1,
...@@ -1963,19 +1963,44 @@ ...@@ -1963,19 +1963,44 @@
} }
}); });
}, },
//选中景点选择框
getScenic(item) {
item.IsChecked = !item.IsChecked;
this.initScenic();
},
//初始化景点 //初始化景点
initScenic() { initScenic() {
this.ScenicList = []; var that = this;
this.priceData.ScenicBackList.forEach(x => { var tempBackCouponList = [];
if (x.IsChecked) { if (this.dayObj && this.dayObj.DayList && this.dayObj.DayList.length > 0 && this.PostConfig && this.PostConfig
this.ScenicList.push(x); .BackScenicList && this.PostConfig.BackScenicList.length > 0) {
this.dayObj.DayList.forEach(dItem => {
if (dItem.ScenicArray && dItem.ScenicArray.length > 0) {
dItem.ScenicArray.forEach(sItem => {
if (that.PostConfig.BackScenicList.indexOf(sItem.CouponsId) !== -1) {
var tempObj = {
ID: sItem.CouponsId,
IsChecked: false,
Name: sItem.CouponsName,
RefundMoney: 0
}
tempBackCouponList.push(tempObj);
}
})
}
})
}
if (tempBackCouponList && tempBackCouponList.length > 0) {
if (this.priceData.ScenicBackList && this.priceData.ScenicBackList.length == 0) {
this.priceData.ScenicBackList = JSON.parse(JSON.stringify(tempBackCouponList));
} else {
var scenicBackList = JSON.parse(JSON.stringify(this.priceData.ScenicBackList));
this.priceData.ScenicBackList = [];
scenicBackList.forEach(x => {
var tempObj = tempBackCouponList.find(sItem => sItem.ID == x.ID);
if (tempObj) {
that.priceData.ScenicBackList.push(x);
}
})
} }
}) } else {
this.priceData.ScenicBackList = [];
}
}, },
goUrl(path, id) { goUrl(path, id) {
this.$router.push({ this.$router.push({
...@@ -2250,6 +2275,13 @@ ...@@ -2250,6 +2275,13 @@
}, },
deep: true deep: true
}, },
dayObj: {
//监听行程景点是否编号
handler: function (val, oldVal) {
this.initScenic();
},
deep: true
},
}, },
components: { components: {
TravelPriceFlightList: TravelPriceFlightList, TravelPriceFlightList: TravelPriceFlightList,
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ 409922de
...@@ -857,7 +857,7 @@ ...@@ -857,7 +857,7 @@
</tr> </tr>
<tr v-for="item in priceData.ScenicBackList"> <tr v-for="item in priceData.ScenicBackList">
<td> <td>
<el-checkbox :checked="item.IsChecked" @change="getScenic(item)"></el-checkbox> <el-checkbox v-model="item.IsChecked"></el-checkbox>
</td> </td>
<td> <td>
{{item.Name}} {{item.Name}}
...@@ -871,7 +871,8 @@ ...@@ -871,7 +871,8 @@
</div> </div>
</div> </div>
<div slot="reference" class="SimulateDrop-box"> <div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in ScenicList">{{subItem.Name}}</span> <span class="SD_flight" v-for="subItem in priceData.ScenicBackList"
v-if="subItem.IsChecked">{{subItem.Name}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i> <i class="iconfont icon-arrow-down SimulaDrop"></i>
</div> </div>
</el-popover> </el-popover>
...@@ -1200,7 +1201,6 @@ ...@@ -1200,7 +1201,6 @@
<button class="hollowFixedBtn" @click="lessPriceVisible=false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="lessPriceVisible=false">{{$t('pub.cancelBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
<script> <script>
...@@ -1209,7 +1209,7 @@ ...@@ -1209,7 +1209,7 @@
import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue"; import TravelPriceFlightList_Self from "../TravelGroupControl/TravelPriceFlightList_Self.vue";
export default { export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType", "CurrentUserInfo", props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType", "CurrentUserInfo",
"IsDirect" "IsDirect", "dayObj"
], ],
data() { data() {
return { return {
...@@ -1955,19 +1955,44 @@ ...@@ -1955,19 +1955,44 @@
} }
}); });
}, },
//选中景点选择框
getScenic(item) {
item.IsChecked = !item.IsChecked;
this.initScenic();
},
//初始化景点 //初始化景点
initScenic() { initScenic() {
this.ScenicList = []; var that = this;
this.priceData.ScenicBackList.forEach(x => { var tempBackCouponList = [];
if (x.IsChecked) { if (this.dayObj && this.dayObj.DayList && this.dayObj.DayList.length > 0 && this.PostConfig && this.PostConfig
this.ScenicList.push(x); .BackScenicList && this.PostConfig.BackScenicList.length > 0) {
this.dayObj.DayList.forEach(dItem => {
if (dItem.ScenicArray && dItem.ScenicArray.length > 0) {
dItem.ScenicArray.forEach(sItem => {
if (that.PostConfig.BackScenicList.indexOf(sItem.CouponsId) !== -1) {
var tempObj = {
ID: sItem.CouponsId,
IsChecked: false,
Name: sItem.CouponsName,
RefundMoney: 0
}
tempBackCouponList.push(tempObj);
}
})
}
})
}
if (tempBackCouponList && tempBackCouponList.length > 0) {
if (this.priceData.ScenicBackList && this.priceData.ScenicBackList.length == 0) {
this.priceData.ScenicBackList = JSON.parse(JSON.stringify(tempBackCouponList));
} else {
var scenicBackList = JSON.parse(JSON.stringify(this.priceData.ScenicBackList));
this.priceData.ScenicBackList = [];
scenicBackList.forEach(x => {
var tempObj = tempBackCouponList.find(sItem => sItem.ID == x.ID);
if (tempObj) {
that.priceData.ScenicBackList.push(x);
}
})
} }
}) } else {
this.priceData.ScenicBackList = [];
}
}, },
goUrl(path, id) { goUrl(path, id) {
this.$router.push({ this.$router.push({
...@@ -2260,7 +2285,14 @@ ...@@ -2260,7 +2285,14 @@
this.initCalendar(); this.initCalendar();
}, },
deep: true deep: true
} },
dayObj: {
//监听行程景点是否编号
handler: function (val, oldVal) {
this.initScenic();
},
deep: true
},
}, },
components: { components: {
TravelPriceFlightList: TravelPriceFlightList, TravelPriceFlightList: TravelPriceFlightList,
......
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