Skip to content

S
SuperMan
Commit e2d3dc4e authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents 86cddaf7 86b3c02a
Hide whitespace changes
Inline Side-by-side
Showing with 2071 additions and 1710 deletions
src/components/ScenicStrategyview.vue 0 → 100644
View file @ e2d3dc4e
<style>
.ScenicMainContant{
width:900px;
margin:auto;
height:auto;
color:#4F5A61;
}
.cardTitle{
width:900px;
margin:20px auto;
font-weight:500;
word-break: break-word;
font-size:44px;
}
.ScenicCoverImg{
margin-top:20px;
}
.ScenicCoverImg img{
width:100%;
}
.ScenicStrateg{
color:#4F5A61;
}
.ScenicStrateg img{
width:100%;
}
</style>
<template>
<div class="ScenicMainContant">
<div class="cardTitle">
{{dataList.Name}}
</div>
<div class="ScenicCoverImg" v-if="dataList.ImgCover">
<img :src="dataList.ImgCover" alt=""/>
</div>
<div class="ScenicStrateg" v-html="dataList.Content">
</div>
</div>
</template>
<script>
export default {
data() {
return {
msg:{
Id:0,
},
dataList:{}
};
},
mounted() {
this.msg.Id = this.$route.query.id;
this.getList();
},
filters: {
},
methods: {
getList(){
this.apipost(
"ScenicRecomment_Get_GetScenicRecommentService", this.msg,
res => {
if (res.data.resultCode == 1) {
console.log(res,'ressss')
this.dataList=res.data.data;
}
},
null
);
}
}
};
</script>
\ No newline at end of file
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ e2d3dc4e
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ e2d3dc4e
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
SingleRoomShareMoney: 0, //单房差分摊费用 SingleRoomShareMoney: 0, //单房差分摊费用
InlandTrafficShareMoney: 0, //内陆段交通分摊费用 InlandTrafficShareMoney: 0, //内陆段交通分摊费用
OtherShareMoney: 0, //杂费分摊费用 OtherShareMoney: 0, //杂费分摊费用
OtherRemark: "", //其他价格备注
}, },
CostCurrencyList: [], //选择的币种 CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数 CostNumberList: [], //人数
...@@ -112,6 +113,7 @@ ...@@ -112,6 +113,7 @@
BackVisaPrice: 0, //退签证费 BackVisaPrice: 0, //退签证费
BackSafeMoney: 0, //退保险费 BackSafeMoney: 0, //退保险费
ContractUrl: "", //合同地址 ContractUrl: "", //合同地址
PriceRemark: "", //定价备注
}, },
LineList: [], //线路列表 LineList: [], //线路列表
loading: false loading: false
...@@ -166,8 +168,13 @@ ...@@ -166,8 +168,13 @@
}, },
getPostData() { getPostData() {
let configId = this.$route.query.configId; let configId = this.$route.query.configId;
let offerId = 0;
if (this.$route.query.offerid) {
offerId = this.$route.query.offerid;
}
let msg = { let msg = {
ID: configId ID: configId,
offerId: offerId
}; };
this.apipost( this.apipost(
"travel_get_GetMyTravelInfo_V2", "travel_get_GetMyTravelInfo_V2",
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ e2d3dc4e
...@@ -246,7 +246,6 @@ ...@@ -246,7 +246,6 @@
) { ) {
//to do something //to do something
} else { } else {
//this.$set(this.FeatureData, "DayList", data);
this.$refs.TravelFeature.setNewDate(data); this.$refs.TravelFeature.setNewDate(data);
} }
}, },
......
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @ e2d3dc4e
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<span class="TDTextspan">{{$t('sm.jhcfchengshi')}}</span> <span class="TDTextspan">{{$t('sm.jhcfchengshi')}}</span>
<span> <span>
<el-form-item prop="StartCityId"> <el-form-item prop="StartCityId">
<el-select :disabled="isOpenGroup" class='w200' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId" <el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'> <el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'>
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</span> </span>
<span class="TDTextspan">{{$t('sm.jhcfchengshi')}}返回抵达城市</span> <span class="TDTextspan">返回抵达城市</span>
<span> <span>
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="ReturnArriveCityId">
<el-select :disabled="isOpenGroup" class='w200' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId" <el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'> <el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'>
......
src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue
View file @ e2d3dc4e
...@@ -9,10 +9,12 @@ ...@@ -9,10 +9,12 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0&&!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0&&!isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
...@@ -47,7 +49,8 @@ ...@@ -47,7 +49,8 @@
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;{{$t('sm.hour')}} @keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;{{$t('sm.hour')}}
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>&nbsp;&nbsp;{{$t('sm.Minute')}} @keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>
&nbsp;&nbsp;{{$t('sm.Minute')}}
</div> </div>
</div> </div>
</div> </div>
...@@ -92,10 +95,12 @@ ...@@ -92,10 +95,12 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0&&!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0&&!isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
...@@ -178,8 +183,7 @@ ...@@ -178,8 +183,7 @@
}; };
return { return {
//其他餐食 //其他餐食
otherDinner: [ otherDinner: [{
{
Id: 1, Id: 1,
Name: this.$t('sm.jiudiannxyzc'), Name: this.$t('sm.jiudiannxyzc'),
City: 0, City: 0,
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
}, },
{ {
ID: -2, ID: -2,
Name:this.$t('sm.jiudianxy'), Name: this.$t('sm.jiudianxy'),
City: 0, City: 0,
About: "", About: "",
PicPath: "" PicPath: ""
...@@ -335,10 +339,12 @@ ...@@ -335,10 +339,12 @@
this.subItemObj.childItem.ImaArray = []; this.subItemObj.childItem.ImaArray = [];
var dinnerImgList = obj.PicPath.split(","); var dinnerImgList = obj.PicPath.split(",");
for (var i = 0; i < dinnerImgList.length; i++) { for (var i = 0; i < dinnerImgList.length; i++) {
var fileObj = this.$commonUtils.FileObject(); if (i <= 3) {
fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i]; var fileObj = this.$commonUtils.FileObject();
fileObj.Name = ""; fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
this.subItemObj.childItem.ImaArray.push(fileObj); fileObj.Name = "";
this.subItemObj.childItem.ImaArray.push(fileObj);
}
} }
} }
} }
......
src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue
View file @ e2d3dc4e
...@@ -2,72 +2,81 @@ ...@@ -2,72 +2,81 @@
<div class="trip-item-box"> <div class="trip-item-box">
<div class="edit" v-if="isShowEdit"> <div class="edit" v-if="isShowEdit">
<div class="TCtraffic flex"> <div class="TCtraffic flex">
<div class="partName"> <div class="partName">
<span class="TDTripType">{{$t('hotel.hotel')}}</span> <span class="TDTripType">{{$t('hotel.hotel')}}</span>
</div> </div>
<span class="datePickContent" style="display:none"> <span class="datePickContent" style="display:none">
<el-form-item > <el-form-item>
<el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')" v-model="subItemObj.childItem.TimeType"> <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')"
<el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'> v-model="subItemObj.childItem.TimeType">
</el-option> <el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-select> </el-option>
</el-form-item> </el-select>
</span> </el-form-item>
<div class="delSpan"> </span>
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start" > <div class="delSpan">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
</el-tooltip> <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> </el-tooltip>
<i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
</el-tooltip> v-if="!isOpenGroup">
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i>
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> </el-tooltip>
</el-tooltip> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
</div> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
<div class="TDplanList clearfix"> v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<div class="TDLeftPlan"> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
<span>{{$t('sm.ruzhujiudian')}}</span> </el-tooltip>
<span> </div>
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'" :rules="hotelTripRules.HotelId"> <div class="TDplanList clearfix">
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelId" <div class="TDLeftPlan">
@visible-change="getHotelList($event)" @change="changeHotelList()"> <span>{{$t('sm.ruzhujiudian')}}</span>
<el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option> <span>
<el-option v-for="item in QHotelList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'> <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'"
</el-option> :rules="hotelTripRules.HotelId">
</el-select> <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
</el-form-item> v-model="subItemObj.childItem.HotelId" @visible-change="getHotelList($event)"
</span> @change="changeHotelList()">
<span class="HD_hotelru">
<el-checkbox :disabled="isOpenGroup" v-model="subItemObj.childItem.IsSameLevel" :checked="subItemObj.childItem.IsSameLevel===CheckedVaule"
:true-label="CheckedVaule" :false-label="UnCheckedVaule" border size="mini">{{$t('sm.tongjijiudian')}}</el-checkbox>
</span>
<span class="comTravelLeft">{{$t('sm.fangxingxz')}}</span>
<span>
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelProductId"
@visible-change="getHotelProductList($event)" @change="changeHotelProductList()">
<el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option>
<el-option v-for="item in QHotelProductList" :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for="item in QHotelList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item>
</span>
<span class="HD_hotelru">
<el-checkbox :disabled="isOpenGroup" v-model="subItemObj.childItem.IsSameLevel"
:checked="subItemObj.childItem.IsSameLevel===CheckedVaule" :true-label="CheckedVaule"
:false-label="UnCheckedVaule" border size="mini">{{$t('sm.tongjijiudian')}}</el-checkbox>
</span>
<span class="comTravelLeft">{{$t('sm.fangxingxz')}}</span>
<span>
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
v-model="subItemObj.childItem.HotelProductId" @visible-change="getHotelProductList($event)"
@change="changeHotelProductList()">
<el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option>
<el-option v-for="item in QHotelProductList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</span>
<span v-if="subItemObj.childItem.IsUseDinner==1">
<span class="TDhotelDiner">{{$t('sm.jiudianhancan')}}</span>
<span>
<el-checkbox-group v-model="Diner.UseDinerCked">
<el-checkbox v-for="item in Diner.UseDinnerArray" :disabled="isOpenGroup||!varCanChecked(item)"
:label="item.Id" :key='item.Id'>{{item.Name}}</el-checkbox>
</el-checkbox-group>
</span> </span>
<span v-if="subItemObj.childItem.IsUseDinner==1"> </span>
<span class="TDhotelDiner">{{$t('sm.jiudianhancan')}}</span>
<span>
<el-checkbox-group v-model="Diner.UseDinerCked">
<el-checkbox v-for="item in Diner.UseDinnerArray" :disabled="isOpenGroup||!varCanChecked(item)" :label="item.Id"
:key='item.Id'>{{item.Name}}</el-checkbox>
</el-checkbox-group>
</span>
</span>
</div>
</div> </div>
</div>
</div> </div>
<div class="TP_edit"> <div class="TP_edit">
<my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description" <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit> v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</div> </div>
<div class="SiencDiv clearfix"> <div class="SiencDiv clearfix">
<div class="ScLeftImg"> <div class="ScLeftImg">
...@@ -76,16 +85,20 @@ ...@@ -76,16 +85,20 @@
<img v-else :src="item.Url" /> <img v-else :src="item.Url" />
<div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)"> <div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)">
<div class="clearfix" style="text-align:center;"> <div class="clearfix" style="text-align:center;">
<div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i></div> <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)" v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div> </div>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)" v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div> <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)"
v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)"
v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="rightAddImg"> <div class="rightAddImg">
<el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg" :data="subItemObj.childItem" <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg"
:multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> :data="subItemObj.childItem" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<i class="iconfont icon-img_haha"></i> <i class="iconfont icon-img_haha"></i>
</el-upload> </el-upload>
</div> </div>
...@@ -94,395 +107,401 @@ ...@@ -94,395 +107,401 @@
<div class="read" v-if="!isShowEdit"> <div class="read" v-if="!isShowEdit">
<div class="TCtraffic flex"> <div class="TCtraffic flex">
<div class="partName"> <div class="partName">
<span class="TDTripType">{{$t('hotel.hotel')}}</span> <span class="TDTripType">{{$t('hotel.hotel')}}</span>
</div> </div>
<div class="delSpan"> <div class="delSpan">
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" > <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
<i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i> v-if="!isOpenGroup">
</el-tooltip> <i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> </el-tooltip>
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
</el-tooltip> v-if="subIndex!=0 && !isOpenGroup">
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> </el-tooltip>
</el-tooltip> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
</div> v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<div class="title-box"> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
<div class="TDLeftPlan"> </el-tooltip>
<span>{{$t('sm.ruzhujiudian')}}</span> </div>
<span> <div class="title-box">
{{subItemObj.childItem.HotelName}} <div class="TDLeftPlan">
</span> <span>{{$t('sm.ruzhujiudian')}}</span>
<span v-if="subItemObj.childItem.IsSameLevel==1">{{$t('sm.huotongjijiudian')}}</span> <span>
<span>{{$t('hotel.hotel_roomType')}}</span> {{subItemObj.childItem.HotelName}}
<span> </span>
{{subItemObj.childItem.HotelProductName}} <span v-if="subItemObj.childItem.IsSameLevel==1">{{$t('sm.huotongjijiudian')}}</span>
</span> <span>{{$t('hotel.hotel_roomType')}}</span>
<span v-if="subItemObj.childItem.IsUseDinner==1"> <span>
<span class="TDhotelDiner">{{$t('sm.jiudianhancan')}}</span> {{subItemObj.childItem.HotelProductName}}
<span v-if="Diner.UseDinerCked==1">{{$t('sm.breakfast')}}</span> </span>
<span v-if="Diner.UseDinerCked==2">{{$t('sm.lunch')}}</span> <span v-if="subItemObj.childItem.IsUseDinner==1">
<span v-if="Diner.UseDinerCked==3">{{$t('sm.dinner')}}</span> <span class="TDhotelDiner">{{$t('sm.jiudianhancan')}}</span>
</span> <span v-if="Diner.UseDinerCked==1">{{$t('sm.breakfast')}}</span>
</div> <span v-if="Diner.UseDinerCked==2">{{$t('sm.lunch')}}</span>
<span v-if="Diner.UseDinerCked==3">{{$t('sm.dinner')}}</span>
</span>
</div> </div>
</div>
</div> </div>
<div class="TP_editShow"> <div class="TP_editShow">
<pre v-html="subItemObj.childItem.Description"></pre> <pre v-html="subItemObj.childItem.Description"></pre>
</div> </div>
<div class="SiencDiv clearfix"> <div class="SiencDiv clearfix">
<div class="ScLeftImg"> <div class="ScLeftImg">
<div class="TFimgList" v-for="(item,index) in subItemObj.childItem.ImaArray" :key="item.subCode"> <div class="TFimgList" v-for="(item,index) in subItemObj.childItem.ImaArray" :key="item.subCode">
<img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png" /> <img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png" />
<img v-else :src="item.Url" @click="getPic(subItemObj.childItem.ImaArray,index)"/> <img v-else :src="item.Url" @click="getPic(subItemObj.childItem.ImaArray,index)" />
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="dspNone" class="viewBigPicLayer myPiclayer" @click="colseLayer"> <div v-if="dspNone" class="viewBigPicLayer myPiclayer" @click="colseLayer">
<i @click="colseLayer" class="el-icon-circle-close-outline clolseViewBigPicLayer" ></i> <i @click="colseLayer" class="el-icon-circle-close-outline clolseViewBigPicLayer"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click"> <el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index"> <el-carousel-item v-for="(item,index) in picObj" :key="index">
<img style="width:100%;" :src="item.Url" /> <img style="width:100%;" :src="item.Url" />
</el-carousel-item> </el-carousel-item>
</el-carousel> </el-carousel>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import MyEdit from "../../EditTemplate.vue"; import MyEdit from "../../EditTemplate.vue";
export default { export default {
props: [ props: [
"subItemObj", "subItemObj",
"DefaultList", "DefaultList",
"DinnerList", "DinnerList",
"index", "index",
"subIndex", "subIndex",
"isOpenGroup", "isOpenGroup",
"subTotalIndex", "subTotalIndex",
"TimeTypeList" "TimeTypeList"
], ],
data() { data() {
var TimeTypeValidate = (rule, value, callback) => { var TimeTypeValidate = (rule, value, callback) => {
if (value === 0) { if (value === 0) {
callback(new Error(this.$t('sm.qxzshijianType'))); callback(new Error(this.$t('sm.qxzshijianType')));
} else { } else {
callback(); callback();
} }
}; };
var HotelIdValidate = (rule, value, callback) => { var HotelIdValidate = (rule, value, callback) => {
if (value === 0) { if (value === 0) {
callback(new Error(this.$t('sm.qxzjiudian'))); callback(new Error(this.$t('sm.qxzjiudian')));
} else { } else {
callback(); callback();
} }
}; };
return { return {
//酒店列表 //酒店列表
QHotelList: [], QHotelList: [],
//酒店房型列表 //酒店房型列表
QHotelProductList: [], QHotelProductList: [],
toolbar: { toolbar: {
clean: false, //加粗 clean: false, //加粗
font: false, //字体 font: false, //字体
narrative: true //叙述, narrative: true //叙述,
}, },
dspNone:false, dspNone: false,
initialIndex:0, initialIndex: 0,
//选中同级酒店 //选中同级酒店
CheckedVaule: 1, CheckedVaule: 1,
//不选中 //不选中
UnCheckedVaule: 0, UnCheckedVaule: 0,
//是否显示编辑框 //是否显示编辑框
isShowEdit: true, isShowEdit: true,
//text框placeholder //text框placeholder
placeholder: "请输入酒店信息", placeholder: "请输入酒店信息",
//酒店含餐 //酒店含餐
Diner: { Diner: {
DefaultSelectValue: 0, DefaultSelectValue: 0,
UseDinerCked: [], UseDinerCked: [],
UseDinnerType: [ UseDinnerType: [{
{ Id: "1",
Id: "1", Name: this.$t('sm.zao')
Name: this.$t('sm.zao') },
}, {
{ Id: "2",
Id: "2", Name: this.$t('sm.zhong')
Name: this.$t('sm.zhong') },
}, {
{ Id: "3",
Id: "3", Name: this.$t('sm.wan')
Name: this.$t('sm.wan') }
} ],
], UseDinnerArray: []
UseDinnerArray: [] },
}, //酒店验证
//酒店验证 hotelTripRules: {
hotelTripRules: { //时间类型验证
//时间类型验证 TimeType: [{
TimeType: [
{
validator: TimeTypeValidate, validator: TimeTypeValidate,
trigger: "change" trigger: "change"
} }],
], HotelId: [{
HotelId: [
{
validator: HotelIdValidate, validator: HotelIdValidate,
trigger: "change" trigger: "change"
} }]
] },
}, TheDayUserDinner: [] //当天餐厅用餐情况
TheDayUserDinner: [] //当天餐厅用餐情况 };
};
},
components: {
"my-edit": MyEdit
},
methods: {
//获取酒店列表
getHotelList(event) {
if (event) {
var msg = {
IsGetPic: 1,
IsGetRemark: 1,
QCity: this.subItemObj.childItem.QCity
};
this.apipost(
"hotel_post_GetLineHotelList",
msg,
res => {
if (res.data.resultCode == 1) {
this.QHotelList = res.data.data;
}
},
err => {}
);
}
}, },
//酒店选择改变 components: {
changeHotelList() { "my-edit": MyEdit
var that = this; },
if (that.subItemObj.childItem.HotelId != 0) { methods: {
//获取当前选中的对象 //获取酒店列表
let obj = {}; getHotelList(event) {
obj = that.QHotelList.find(item => { if (event) {
return item.ID === that.subItemObj.childItem.HotelId; //筛选出匹配数据 var msg = {
}); IsGetPic: 1,
if (obj != undefined) { IsGetRemark: 1,
that.subItemObj.childItem.HotelProductId = 0; QCity: this.subItemObj.childItem.QCity
that.subItemObj.childItem.HotelProductName = ""; };
that.QHotelProductList = []; this.apipost(
that.Diner.UseDinnerArray = []; "hotel_post_GetLineHotelList",
that.subItemObj.childItem.ImaArray = []; msg,
that.subItemObj.childItem.Description = obj.Descriptions; res => {
that.subItemObj.childItem.ImaArray = obj.imgList; if (res.data.resultCode == 1) {
that.subItemObj.childItem.IsUseDinner = obj.IsUseDinner; this.QHotelList = res.data.data;
that.subItemObj.childItem.HotelName = obj.Name; }
let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType; },
if (that.subItemObj.childItem.ID > 0) { err => {}
if (obj.UseDinnerType == null || !(obj.UseDinnerType.length > 0)) { );
that.Diner.UseDinerCked = []; }
that.subItemObj.childItem.UseDinnerType = ""; },
//酒店选择改变
changeHotelList() {
var that = this;
if (that.subItemObj.childItem.HotelId != 0) {
//获取当前选中的对象
let obj = {};
obj = that.QHotelList.find(item => {
return item.ID === that.subItemObj.childItem.HotelId; //筛选出匹配数据
});
if (obj != undefined) {
that.subItemObj.childItem.HotelProductId = 0;
that.subItemObj.childItem.HotelProductName = "";
that.QHotelProductList = [];
that.Diner.UseDinnerArray = [];
that.subItemObj.childItem.ImaArray = [];
that.subItemObj.childItem.Description = obj.Descriptions;
if (obj.imgList && obj.imgList.length > 4) {
obj.imgList.forEach((sItem, sIndex) => {
if (sIndex <= 3) {
that.subItemObj.childItem.ImaArray.push(sItem);
}
})
} else { } else {
let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType; that.subItemObj.childItem.ImaArray = obj.imgList;
if (useDinnerTypeStr != null && useDinnerTypeStr.length > 0) { }
let objUseDinnerTypeArr = obj.UseDinnerType.split(","); that.subItemObj.childItem.IsUseDinner = obj.IsUseDinner;
let useDinnerTypeArr = useDinnerTypeStr.split(","); that.subItemObj.childItem.HotelName = obj.Name;
let tmpDinnerTypeArr = []; let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType;
useDinnerTypeArr.forEach(x => { if (that.subItemObj.childItem.ID > 0) {
let isRemove = true; if (obj.UseDinnerType == null || !(obj.UseDinnerType.length > 0)) {
objUseDinnerTypeArr.forEach(y => { that.Diner.UseDinerCked = [];
if (x == y) { that.subItemObj.childItem.UseDinnerType = "";
isRemove = false; } else {
let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType;
if (useDinnerTypeStr != null && useDinnerTypeStr.length > 0) {
let objUseDinnerTypeArr = obj.UseDinnerType.split(",");
let useDinnerTypeArr = useDinnerTypeStr.split(",");
let tmpDinnerTypeArr = [];
useDinnerTypeArr.forEach(x => {
let isRemove = true;
objUseDinnerTypeArr.forEach(y => {
if (x == y) {
isRemove = false;
}
});
if (!isRemove) {
tmpDinnerTypeArr.push(x);
} }
}); });
if (!isRemove) { that.subItemObj.childItem.UseDinnerType = tmpDinnerTypeArr.join(
tmpDinnerTypeArr.push(x); ","
} );
}); that.Diner.UseDinerCked = tmpDinnerTypeArr;
that.subItemObj.childItem.UseDinnerType = tmpDinnerTypeArr.join( }
"," }
); } else {
that.Diner.UseDinerCked = tmpDinnerTypeArr; if (obj.UseDinnerType != null && obj.UseDinnerType.length > 0) {
that.Diner.UseDinerCked = obj.UseDinnerType.split(",");
} }
} }
} else { let useDinnerTypeArry = [];
if (obj.UseDinnerType != null && obj.UseDinnerType.length > 0) { if (obj.UseDinnerType != null && obj.UseDinnerType.length > 0) {
that.Diner.UseDinerCked = obj.UseDinnerType.split(","); useDinnerTypeArry = obj.UseDinnerType.split(",");
} }
useDinnerTypeArry.forEach(y => {
that.Diner.UseDinnerType.forEach(DinerTypeItem => {
if (y == DinerTypeItem.Id) {
that.Diner.UseDinnerArray.push(DinerTypeItem);
}
});
});
that.Diner.UseDinnerArray.sort(
this.$commonUtils.createComprisonFunction("Id")
);
} }
let useDinnerTypeArry = []; }
if (obj.UseDinnerType != null && obj.UseDinnerType.length > 0) { },
useDinnerTypeArry = obj.UseDinnerType.split(","); //获取酒店房型列表
} getHotelProductList(event) {
useDinnerTypeArry.forEach(y => { if (event) {
that.Diner.UseDinnerType.forEach(DinerTypeItem => { this.apipost(
if (y == DinerTypeItem.Id) { "dict_post_HotelProduc_GetList", {
that.Diner.UseDinnerArray.push(DinerTypeItem); Hotel_ID: this.subItemObj.childItem.HotelId
},
res => {
if (res.data.resultCode == 1) {
this.QHotelProductList = res.data.data;
} }
}); },
}); err => {}
that.Diner.UseDinnerArray.sort(
this.$commonUtils.createComprisonFunction("Id")
); );
} }
} },
}, //产品选择改变
//获取酒店房型列表 changeHotelProductList() {
getHotelProductList(event) { var that = this;
if (event) { if (that.subItemObj.childItem.HotelProductId != 0) {
this.apipost( //获取当前选中的对象
"dict_post_HotelProduc_GetList", let obj = {};
{ obj = that.QHotelProductList.find(item => {
Hotel_ID: this.subItemObj.childItem.HotelId return item.ID === that.subItemObj.childItem.HotelProductId; //筛选出匹配数据
}, });
res => { if (obj != undefined) {
if (res.data.resultCode == 1) { this.subItemObj.childItem.HotelProductName = obj.Name;
this.QHotelProductList = res.data.data; }
}
},
//上传景点图片
uploadScenImg(item) {
let newArr = [];
newArr.push(item.file);
let path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
//删除酒店
removeHotelTrip(dayNum, subIndex) {
this.$parent.$parent.commonRemove(dayNum, subIndex);
},
//删除图片
delImg(index, subItemObj) {
this.$parent.$parent.commonRemoveImg(index, subItemObj);
},
initTheDayUserDinner() {
let dayNum = this.subItemObj.childItem.DayNum;
this.TheDayUserDinner = [];
this.DinnerList.forEach(x => {
if (x.DayNum == dayNum) {
if (x.UseDinnerType.length > 0) {
let tempDinnerArr = x.UseDinnerType.split(",");
let reg = /^[0-9]+.?[0-9]*/;
tempDinnerArr.forEach(y => {
if (reg.test(y)) {
this.TheDayUserDinner.push(y);
}
});
} }
}, }
err => {}
);
}
},
//产品选择改变
changeHotelProductList() {
var that = this;
if (that.subItemObj.childItem.HotelProductId != 0) {
//获取当前选中的对象
let obj = {};
obj = that.QHotelProductList.find(item => {
return item.ID === that.subItemObj.childItem.HotelProductId; //筛选出匹配数据
}); });
if (obj != undefined) { this.TheDayUserDinner = Array.from(new Set(this.TheDayUserDinner));
this.subItemObj.childItem.HotelProductName = obj.Name; },
} varCanChecked(dinnerType) {
} let canChecked = true;
}, this.TheDayUserDinner.forEach(x => {
//上传景点图片 if (x == dinnerType.Id) {
uploadScenImg(item) { canChecked = false;
let newArr = [];
newArr.push(item.file);
let path = "/Upload/DMC/";
this.UploadSelfFileT(path, newArr, x => {
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
//删除酒店
removeHotelTrip(dayNum, subIndex) {
this.$parent.$parent.commonRemove(dayNum, subIndex);
},
//删除图片
delImg(index, subItemObj) {
this.$parent.$parent.commonRemoveImg(index, subItemObj);
},
initTheDayUserDinner() {
let dayNum = this.subItemObj.childItem.DayNum;
this.TheDayUserDinner = [];
this.DinnerList.forEach(x => {
if (x.DayNum == dayNum) {
if (x.UseDinnerType.length > 0) {
let tempDinnerArr = x.UseDinnerType.split(",");
let reg = /^[0-9]+.?[0-9]*/;
tempDinnerArr.forEach(y => {
if (reg.test(y)) {
this.TheDayUserDinner.push(y);
}
});
} }
});
return canChecked;
},
//上移下移
MoveItem(dayNum, subIndex, IsUp) {
this.$parent.$parent.MoveItem(dayNum, subIndex, IsUp);
},
//左右移动
toExchangeImg(dayNum, subIndex, imgIndex, IsMove) {
this.$parent.$parent.ExchangeImg(dayNum, subIndex, imgIndex, IsMove);
},
colseLayer() {
this.dspNone = false;
},
getPic(obj, index) {
this.picObj = obj
this.dspNone = true;
this.initialIndex = index;
},
getItemLabel(item) {
let returnName = item.Name;
if (item.Inventory >= 0) {
returnName = returnName + " " + item.Inventory;
} }
}); return returnName;
this.TheDayUserDinner = Array.from(new Set(this.TheDayUserDinner));
},
varCanChecked(dinnerType) {
let canChecked = true;
this.TheDayUserDinner.forEach(x => {
if (x == dinnerType.Id) {
canChecked = false;
}
});
return canChecked;
},
//上移下移
MoveItem(dayNum, subIndex, IsUp) {
this.$parent.$parent.MoveItem(dayNum, subIndex, IsUp);
},
//左右移动
toExchangeImg(dayNum, subIndex, imgIndex, IsMove) {
this.$parent.$parent.ExchangeImg(dayNum, subIndex, imgIndex,IsMove);
},
colseLayer(){
this.dspNone=false;
},
getPic(obj,index){
this.picObj=obj
this.dspNone=true;
this.initialIndex = index;
},
getItemLabel(item){
let returnName = item.Name;
if(item.Inventory>=0){
returnName = returnName+ " " +item.Inventory;
} }
return returnName; },
}
},
mounted() { mounted() {
if (this.subItemObj.childItem.ID > 0) { if (this.subItemObj.childItem.ID > 0) {
if (this.subItemObj.childItem.HotelId > 0) { if (this.subItemObj.childItem.HotelId > 0) {
this.QHotelList.push({ this.QHotelList.push({
ID: parseInt(this.subItemObj.childItem.HotelId), ID: parseInt(this.subItemObj.childItem.HotelId),
Name: this.subItemObj.childItem.HotelName Name: this.subItemObj.childItem.HotelName
}); });
} }
if (this.subItemObj.childItem.HotelProductId > 0) { if (this.subItemObj.childItem.HotelProductId > 0) {
this.QHotelProductList.push({ this.QHotelProductList.push({
ID: parseInt(this.subItemObj.childItem.HotelProductId), ID: parseInt(this.subItemObj.childItem.HotelProductId),
Name: this.subItemObj.childItem.HotelProductName Name: this.subItemObj.childItem.HotelProductName
}); });
} }
}
},
watch: {
subItemObj: {
//深度监听，可监听到对象、数组的变化
handler: function(val, oldVal) {
this.subItemObj.childItem.HotelImg = JSON.stringify(
this.subItemObj.childItem.ImaArray
);
},
deep: true
},
"Diner.UseDinerCked": {
handler: function(val, oldVal) {
this.subItemObj.childItem.UseDinnerType = this.Diner.UseDinerCked.join(
","
);
} }
}, },
DinnerList: { watch: {
handler: function(val, oldVal) { subItemObj: {
this.initTheDayUserDinner(); //深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
this.subItemObj.childItem.HotelImg = JSON.stringify(
this.subItemObj.childItem.ImaArray
);
},
deep: true
}, },
deep: true "Diner.UseDinerCked": {
}, handler: function (val, oldVal) {
"subItemObj.childItem.QCity": { this.subItemObj.childItem.UseDinnerType = this.Diner.UseDinerCked.join(
handler: function(val, oldVal) { ","
this.getHotelList(); );
}
}, },
deep: true DinnerList: {
handler: function (val, oldVal) {
this.initTheDayUserDinner();
},
deep: true
},
"subItemObj.childItem.QCity": {
handler: function (val, oldVal) {
this.getHotelList();
},
deep: true
}
} }
} };
};
</script> </script>
src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue
View file @ e2d3dc4e
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
</div> </div>
<span class="datePickContent" style="display:none;"> <span class="datePickContent" style="display:none;">
<el-form-item> <el-form-item>
<el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')" v-model="subItemObj.childItem.TimeType"> <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')"
v-model="subItemObj.childItem.TimeType">
<el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'> <el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -17,13 +18,16 @@ ...@@ -17,13 +18,16 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="!isOpenGroup">
<i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -31,9 +35,11 @@ ...@@ -31,9 +35,11 @@
<div class="TDLeftPlan"> <div class="TDLeftPlan">
<span>{{$t('sm.scenChoosse')}}</span> <span>{{$t('sm.scenChoosse')}}</span>
<span> <span>
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'" :rules="scienTripRules.CouponsId"> <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'"
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.CouponsId" :rules="scienTripRules.CouponsId">
@visible-change="getQScenicList($event)" @change="changeQScenicList()"> <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
v-model="subItemObj.childItem.CouponsId" @visible-change="getQScenicList($event)"
@change="changeQScenicList()">
<el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option>
<el-option v-for="item in QScenicList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'> <el-option v-for="item in QScenicList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
...@@ -55,13 +61,15 @@ ...@@ -55,13 +61,15 @@
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时 @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>&nbsp;&nbsp;分钟 @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
&nbsp;&nbsp;分钟
</div> </div>
</div> </div>
</div> </div>
<div class="TP_edit"> <div class="TP_edit">
<my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description" <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit> v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</div> </div>
<div class="SiencDiv clearfix"> <div class="SiencDiv clearfix">
<div class="ScLeftImg"> <div class="ScLeftImg">
...@@ -70,18 +78,20 @@ ...@@ -70,18 +78,20 @@
<img v-else :src="item.Url" /> <img v-else :src="item.Url" />
<div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)"> <div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)">
<div class="clearfix" style="text-align:center;"> <div class="clearfix" style="text-align:center;">
<div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i></div> <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)" v-if="index!=0"><i </div>
class="iconfont icon-zuoyi"></i></div> <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)"
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)" v-if="index!=subItemObj.childItem.ImaArray.length-1"><i v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div>
class="iconfont icon-youyi"></i></div> <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)"
v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="rightAddImg"> <div class="rightAddImg">
<el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg" :data="subItemObj.childItem" <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg"
:multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> :data="subItemObj.childItem" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<i class="iconfont icon-img_haha"></i> <i class="iconfont icon-img_haha"></i>
</el-upload> </el-upload>
</div> </div>
...@@ -97,13 +107,16 @@ ...@@ -97,13 +107,16 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" v-if="!isShowEdit"> <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" v-if="!isShowEdit">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="!isOpenGroup">
<i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -248,12 +261,15 @@ ...@@ -248,12 +261,15 @@
if (obj.PicPath != undefined && obj.PicPath != "") { if (obj.PicPath != undefined && obj.PicPath != "") {
var scenImgList = obj.PicPath.split(","); var scenImgList = obj.PicPath.split(",");
for (var i = 0; i < scenImgList.length; i++) { for (var i = 0; i < scenImgList.length; i++) {
var fileObj = that.$commonUtils.FileObject(); if (i <= 3) {
if (scenImgList[i] != "") { var fileObj = that.$commonUtils.FileObject();
fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i]; if (scenImgList[i] != "") {
fileObj.Name = ""; fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i];
that.subItemObj.childItem.ImaArray.push(fileObj); fileObj.Name = "";
that.subItemObj.childItem.ImaArray.push(fileObj);
}
} }
} }
} }
} }
...@@ -306,7 +322,7 @@ ...@@ -306,7 +322,7 @@
this.UploadSelfFileT(path, newArr, x => { this.UploadSelfFileT(path, newArr, x => {
var fileObj = this.$commonUtils.FileObject(); var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath, fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName; fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj); item.data.ImaArray.push(fileObj);
}); });
}, },
...@@ -326,10 +342,10 @@ ...@@ -326,10 +342,10 @@
this.dspNone = true; this.dspNone = true;
this.initialIndex = index; this.initialIndex = index;
}, },
getItemLabel(item){ getItemLabel(item) {
let returnName = item.Name; let returnName = item.Name;
if(item.Inventory>=0){ if (item.Inventory >= 0) {
returnName = returnName+ " " +item.Inventory; returnName = returnName + " " + item.Inventory;
} }
return returnName; return returnName;
} }
......
src/components/scenicSpot/scenicRecommentList.vue
View file @ e2d3dc4e
...@@ -325,6 +325,9 @@ ...@@ -325,6 +325,9 @@
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button type="primary" icon="el-icon-edit" circle @click="GetScenic(item.Id)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="GetScenic(item.Id)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="预览" placement="top">
<el-button type="primary" icon="iconfont icon-view" circle @click="goView(item.Id)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" icon="iconfont icon-img_delete_small" circle <el-button type="danger" icon="iconfont icon-img_delete_small" circle
@click="removeScenicRecomment(item.Id)"></el-button> @click="removeScenicRecomment(item.Id)"></el-button>
...@@ -673,6 +676,18 @@ ...@@ -673,6 +676,18 @@
err => {} err => {}
); );
} }
},
//跳转至预览页面
goView(id){
this.$router.push({
name: 'ScenicStrategyview',
query: {
id: id,
blank: 'y',
tab: name
}
})
} }
}, },
mounted() { mounted() {
......
src/router/config.js
View file @ e2d3dc4e
...@@ -4430,7 +4430,14 @@ export default { ...@@ -4430,7 +4430,14 @@ export default {
title: '电子合同' title: '电子合同'
} }
}, },
{
path: '/ScenicStrategyview', //景点攻略预览
name: 'ScenicStrategyview',
component: resolve => require(['@/components/ScenicStrategyview'], resolve),
meta: {
title: '景点攻略预览'
}
},
{ {
path: '/supplierLogin', //供应商登录 path: '/supplierLogin', //供应商登录
name: 'supplierLogin', name: 'supplierLogin',
......
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