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
Expand all 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 @@
SingleRoomShareMoney: 0, //单房差分摊费用
InlandTrafficShareMoney: 0, //内陆段交通分摊费用
OtherShareMoney: 0, //杂费分摊费用
OtherRemark: "", //其他价格备注
},
CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数
......@@ -112,6 +113,7 @@
BackVisaPrice: 0, //退签证费
BackSafeMoney: 0, //退保险费
ContractUrl: "", //合同地址
PriceRemark: "", //定价备注
},
LineList: [], //线路列表
loading: false
......@@ -166,8 +168,13 @@
},
getPostData() {
let configId = this.$route.query.configId;
let offerId = 0;
if (this.$route.query.offerid) {
offerId = this.$route.query.offerid;
}
let msg = {
ID: configId
ID: configId,
offerId: offerId
};
this.apipost(
"travel_get_GetMyTravelInfo_V2",
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ e2d3dc4e
......@@ -246,7 +246,6 @@
) {
//to do something
} else {
//this.$set(this.FeatureData, "DayList", data);
this.$refs.TravelFeature.setNewDate(data);
}
},
......
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @ e2d3dc4e
......@@ -29,7 +29,7 @@
<span class="TDTextspan">{{$t('sm.jhcfchengshi')}}</span>
<span>
<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>
<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'>
......@@ -37,10 +37,10 @@
</el-select>
</el-form-item>
</span>
<span class="TDTextspan">{{$t('sm.jhcfchengshi')}}返回抵达城市</span>
<span class="TDTextspan">返回抵达城市</span>
<span>
<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>
<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'>
......
src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue
View file @ e2d3dc4e
......@@ -9,10 +9,12 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</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>
</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>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
......@@ -47,7 +49,8 @@
<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')}}
<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>
......@@ -92,10 +95,12 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</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>
</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>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
......@@ -178,8 +183,7 @@
};
return {
//其他餐食
otherDinner: [
{
otherDinner: [{
Id: 1,
Name: this.$t('sm.jiudiannxyzc'),
City: 0,
......@@ -216,7 +220,7 @@
},
{
ID: -2,
Name:this.$t('sm.jiudianxy'),
Name: this.$t('sm.jiudianxy'),
City: 0,
About: "",
PicPath: ""
......@@ -335,10 +339,12 @@
this.subItemObj.childItem.ImaArray = [];
var dinnerImgList = obj.PicPath.split(",");
for (var i = 0; i < dinnerImgList.length; i++) {
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
fileObj.Name = "";
this.subItemObj.childItem.ImaArray.push(fileObj);
if (i <= 3) {
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
fileObj.Name = "";
this.subItemObj.childItem.ImaArray.push(fileObj);
}
}
}
}
......
src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue
View file @ e2d3dc4e
......@@ -7,7 +7,8 @@
</div>
<span class="datePickContent" style="display:none;">
<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>
</el-select>
......@@ -17,13 +18,16 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</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>
</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>
</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>
</el-tooltip>
</div>
......@@ -31,9 +35,11 @@
<div class="TDLeftPlan">
<span>{{$t('sm.scenChoosse')}}</span>
<span>
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'" :rules="scienTripRules.CouponsId">
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.CouponsId"
@visible-change="getQScenicList($event)" @change="changeQScenicList()">
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'"
:rules="scienTripRules.CouponsId">
<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 v-for="item in QScenicList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'>
</el-option>
......@@ -55,13 +61,15 @@
<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;小时
<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 class="TP_edit">
<my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
<my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</div>
<div class="SiencDiv clearfix">
<div class="ScLeftImg">
......@@ -70,18 +78,20 @@
<img v-else :src="item.Url" />
<div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)">
<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="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 class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></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 class="rightAddImg">
<el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg" :data="subItemObj.childItem"
:multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action="">
<el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg"
: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>
</el-upload>
</div>
......@@ -97,13 +107,16 @@
<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>
</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>
</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>
</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>
</el-tooltip>
</div>
......@@ -248,12 +261,15 @@
if (obj.PicPath != undefined && obj.PicPath != "") {
var scenImgList = obj.PicPath.split(",");
for (var i = 0; i < scenImgList.length; i++) {
var fileObj = that.$commonUtils.FileObject();
if (scenImgList[i] != "") {
fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i];
fileObj.Name = "";
that.subItemObj.childItem.ImaArray.push(fileObj);
if (i <= 3) {
var fileObj = that.$commonUtils.FileObject();
if (scenImgList[i] != "") {
fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i];
fileObj.Name = "";
that.subItemObj.childItem.ImaArray.push(fileObj);
}
}
}
}
}
......@@ -306,7 +322,7 @@
this.UploadSelfFileT(path, newArr, x => {
var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().ViittoFileUrl + x.data.FilePath,
fileObj.fileName = x.data.FileName;
fileObj.fileName = x.data.FileName;
item.data.ImaArray.push(fileObj);
});
},
......@@ -326,10 +342,10 @@
this.dspNone = true;
this.initialIndex = index;
},
getItemLabel(item){
getItemLabel(item) {
let returnName = item.Name;
if(item.Inventory>=0){
returnName = returnName+ " " +item.Inventory;
if (item.Inventory >= 0) {
returnName = returnName + " " + item.Inventory;
}
return returnName;
}
......
src/components/scenicSpot/scenicRecommentList.vue
View file @ e2d3dc4e
......@@ -325,6 +325,9 @@
<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-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-button type="danger" icon="iconfont icon-img_delete_small" circle
@click="removeScenicRecomment(item.Id)"></el-button>
......@@ -673,6 +676,18 @@
err => {}
);
}
},
//跳转至预览页面
goView(id){
this.$router.push({
name: 'ScenicStrategyview',
query: {
id: id,
blank: 'y',
tab: name
}
})
}
},
mounted() {
......
src/router/config.js
View file @ e2d3dc4e
......@@ -4430,7 +4430,14 @@ export default {
title: '电子合同'
}
},
{
path: '/ScenicStrategyview', //景点攻略预览
name: 'ScenicStrategyview',
component: resolve => require(['@/components/ScenicStrategyview'], resolve),
meta: {
title: '景点攻略预览'
}
},
{
path: '/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