Skip to content

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

ppt 行程特色

parent cf29ad63
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 88 deletions
src/components/index.vue
View file @ 36635d7f
......@@ -229,6 +229,12 @@
订单改价查看
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item v-if="userInfo.IsEditTripTemplate" class="clearfix _dropdown_other"
@click.native="journeyTemplate(1)">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
添加/编辑模版
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()">
<i class="iconfont icon-menu-shezhi1" style="color:#2c3e50"></i>
设置
......@@ -1210,6 +1216,9 @@
<ChangeThePriceMessage v-if="ChangeThePriceVisible||ExamineThePriceVisible" :type="1" :msg="ExamineThePriceMsg"
:ChangeThePriceObj="ChangeThePriceObj"
@ChangeThePriceVisible="ChangeThePriceVisible=false,ExamineThePriceVisible=false"></ChangeThePriceMessage>
<!-- ppt 模版新增编辑窗口 -->
<pptIframe v-show="dialogPptistVisible" :TemplateUrl="TemplateUrl"
@close="closeIframe()"></pptIframe>
</div>
</template>
......@@ -1234,6 +1243,7 @@
import Voting from "../components/administrative/model/Voting";
import unbundlingMessage from "../components/administrative/model/unbundlingMessage";
import ChangeThePriceMessage from "../components/administrative/model/ChangeThePriceMessage";
import pptIframe from './commonPage/pptIframe/index';
export default {
components: {
......@@ -1247,9 +1257,12 @@
Voting,
unbundlingMessage,
ChangeThePriceMessage,
pptIframe,
},
data() {
return {
TemplateUrl: '',
dialogPptistVisible: false,
ExamineThePriceMsg: {
Q_IsCollect: '2', //收款状态
DepartSTime: '', //出发时间
......@@ -1972,6 +1985,15 @@
}
},
methods: {
closeIframe(){
this.dialogPptistVisible = false
},
// 添加编辑模版
journeyTemplate(type){
let href = this.domainManager().PptUrl
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1`
this.dialogPptistVisible = true
},
GetExaminePriceOrderPageList(type) {
this.apipost(
"CarSingle_post_GetExaminePriceOrderPageList", this.ExamineThePriceMsg,
......@@ -2074,7 +2096,7 @@
// var postMsg = {};
// var cmd = "";
// cmd = "triptemplate_GetTripTemplatePage";
// postMsg = {
// postMsg = {
// pageIndex:1,
// pageSize:10,
// TagJsonStr:"春"
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 36635d7f
......@@ -6,10 +6,10 @@
</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>
<template v-if="false">
<span class="foldList" style="margin-right: 5px;"
<template v-if="true">
<!-- <span class="foldList" style="margin-right: 5px;"
v-if="userInfo.IsEditTripTemplate"
@click="journeyTemplate(1)">添加/编辑模版</span>
@click="journeyTemplate(1)">添加/编辑模版</span> -->
<span v-if="FeatureData.FeatureType==9" class="foldList" style="margin-right: 5px;"
@click="journeyTemplate(0)">编辑行程</span>
</template>
......@@ -124,6 +124,8 @@
</div>
<!-- ppt 模版行程 -->
<div v-if="FeatureData.FeatureType==9&&FeatureDataFlag">
<!-- <iframe :src="TemplateUrlImg" style="width: 100%;height: 1000px;border: 0;">
</iframe> -->
<div v-if="FeatureData.TripImageListNew&&FeatureData.TripImageListNew.length>0">
<template v-for="url in FeatureData.TripImageListNew">
<el-image
......@@ -132,28 +134,15 @@
:preview-src-list="FeatureData.TripImageListNew"></el-image>
</template>
</div>
<div v-else style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
<div v-if="FeatureData.TripImageListNew.length==0" style="text-align: center;margin-bottom: 20px;font-size: 14px;color: #808080;">暂无数据，右上角编辑行程试试吧！</div>
</div>
</div>
</div>
</div>
<!-- ppt 模版新增编辑窗口 -->
<div class="dialogPptistVisible-box" v-show="dialogPptistVisible"
style="width: 100%;height: 100%;">
<div class="closePptist-box">
<div class="closePptist">
<el-tooltip class="item" effect="dark" content="关闭窗口" placement="bottom">
<i class="el-icon-close"
style="color: #E95252;"
@click="dialogPptistVisible=!dialogPptistVisible"></i>
</el-tooltip>
</div>
</div>
<iframe :src="TemplateUrl"
class="TemplateIframe">
</iframe>
</div>
<pptIframe v-show="dialogPptistVisible" :TemplateUrl="TemplateUrl"
@close="closeIframe()"></pptIframe>
</div>
</template>
<script>
......@@ -171,6 +160,7 @@
// import newFeature2 from './TravelTemp/travelFeature2';
import newFeature2 from './TravelTemp/travelFeature3';
import UpgradedVersion from './UpgradedVersion/index';
import pptIframe from '../../commonPage/pptIframe/index';
import {
setTimeout
} from 'timers';
......@@ -187,7 +177,8 @@
newFeature,
newFeature2,
// newFeature3,
UpgradedVersion
UpgradedVersion,
pptIframe
},
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"],
inject: ['loadConfigInfo'],
......@@ -260,12 +251,12 @@
imgUrl: Travelslider,
TypeState: 8
},
// {
// ckTitle: "行程特色-ppt",
// isShow: false,
// imgUrl: Travelslider,
// TypeState: 9
// },
{
ckTitle: "行程特色-ppt",
isShow: false,
imgUrl: Travelslider,
TypeState: 9
},
], //tab数组
templateColorArray: [{
id: 1,
......@@ -293,12 +284,16 @@
dialogPptistVisible: false,
userInfo: {},
TemplateUrl:'',
TemplateUrlImg:'',
isPostMessage: false
};
},
created: function () {},
methods: {
closeIframe(){
this.dialogPptistVisible = false
},
handleMessage(event,targetOrigin) {
if(this.isPostMessage) return
if(event.data=='行程数据保存成功'){
......@@ -627,6 +622,7 @@
this.MsgBus.$on('FeatureDataFlag', () => {
this.FeatureDataFlag = true
});
this.TemplateUrlImg = `${this.domainManager().PptUrl}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=3&TempId=${this.FeatureData.TemplateId}`
},
watch: {
FeatureData: {
......@@ -1728,49 +1724,5 @@
font-size: 16px;
color: #333333;
}
.dialogPptistVisible-box{
position: fixed;
z-index: 1000;
left: 0;
top: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.4);
}
.closePptist-box{
position: fixed;
z-index: 1001;
left: 0;
right: 0;
top: 0;
height: 30px;
background: #fff;
border-bottom: 1px solid #eee;
}
.closePptist {
padding: 0 30px;
text-align: right;
margin: auto;
position: relative;
}
.closePptist i{
display: inline-block;
padding: 5px 10px;
font-size: 20px;
position: absolute;
right: 20px;
cursor: pointer;
}
.TemplateIframe{
border: none;
width: 100%;
height: calc(100vh - 30px);
background: rgb(243, 246, 251);
position: fixed;
z-index: 1002;
top: 30px;
left: 0;
right: 0;
bottom: 0px;
}
</style>
src/plug/index.js
View file @ 36635d7f
......@@ -122,7 +122,7 @@ export default {
let isOnline = 0; //0-本地测试，1-线上
let ocrUrl = "http://192.168.10.214:8140";
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑
// domainUrl = "http://192.168.10.226"; //春姐
domainUrl = "http://192.168.10.226"; //春姐
domainUrl = "http://192.168.10.214"; //奎哥
let crmLocalFileStreamDownLoadUrl = "";
......@@ -172,9 +172,9 @@ export default {
//google地图图片地址
GoogleMapImageUrl: "http://imgfile.oytour.com",
//上传站点
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.10.68:8120",
UploadUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://upload.oytour.com" : "http://192.168.10.214:8120",
//文件站点
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.10.68:8130',
ViittoFileUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://imgfile.oytour.com" : 'http://192.168.10.214:8130',
javaUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://efficient.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.10.123:9000",
javaUrlNew: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? (locationName.indexOf('oytour') !== -1 ? "http://property.oytour.com" : "http://47.96.12.235:9001") : "http://192.168.10.123:9000",
//Java接口本站文件流下载地址
......@@ -183,7 +183,7 @@ export default {
lxymallUrl: lxymallUrl,
crmUrl: crmUrl,
crmRoutingUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8081/#/",
PptUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://fcrmyx.oytour.com/#/" : "http://localhost:8080",
PptUrl: locationName.indexOf('oytour') !== -1 || locationName.indexOf('viitto') !== -1 ? "http://ppt.oytour.com" : "http://localhost:8080",
};
return obj;
},
......@@ -262,8 +262,8 @@ export default {
if (this.$route.name.indexOf('login') === -1 && this.$route.name.indexOf('clientConfirm') === -1 &&
this.$route.name.indexOf('confirmationOrderDownLoadNew') === -1 && this.$route.name.indexOf('PrintPage') === -1 &&
this.$route.name.indexOf('TravelContractConfirm') === -1 && this.$route.name.indexOf('ViittoContractConfirm') === -1 &&
this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1 &&
this.$route.name.indexOf('clientDisclaimerProtocol') === -1
this.$route.name.indexOf('OrderProfitLossList') === -1 && this.$route.name.indexOf('clientProtocol') === -1
&& this.$route.name.indexOf('clientDisclaimerProtocol')===-1
) {
let previousPathInfo = {
path: this.$route.name,
......@@ -328,7 +328,9 @@ export default {
guestId: guestId,
}
})
} else if (this.$route.path == "/clientDisclaimerProtocol") {
}
else if(this.$route.path=="/clientDisclaimerProtocol")
{
let TCID = this.$route.query.TCID;
let OrderId = this.$route.query.OrderId;
let GuestId = this.$route.query.GuestId;
......@@ -340,7 +342,8 @@ export default {
GuestId: GuestId,
}
})
} else if (this.$route.path == "/TravelContractConfirm") {
}
else if (this.$route.path == "/TravelContractConfirm") {
let ContractId = this.$route.query.ContractId;
this.$router.push({
name: "TravelContractConfirm",
......@@ -1057,18 +1060,16 @@ export default {
},
//文件上传
Vue.prototype.uploadImg = function (path, base64Str, successCall, faildCall) {
var apiurl = this.domainManager().UploadUrl + '/Upload/UploadBase64?fileType=1&fileLimit=5&&filePath=' + path;
var formData = new FormData();
formData.append("myfile", base64Str);
this.$http.post(apiurl, formData, {
var apiurl = this.domainManager().UploadUrl + '/Upload/UploadBase64Two?fileType=1&fileLimit=5&&filePath=' + path;
this.$http.post(apiurl, {
MyFile: base64Str
}, {
headers: {
"Content-Type": "application/x-www-form-urlencoded;"
},
}).then(function (res) {
if (successCall) {
successCall(res)
}
}, faildCall);
})
},
//证件识别
Vue.prototype.UploadCard = function (type, base64Str, successCall, faildCall) {
......
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