Skip to content

S
SuperMan
Commit 739fd675 authored by 吴春's avatar 吴春
Browse files
Options

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

parents 990f40ef ef22d16c
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 67 deletions
src/components/administrative/ContractManage.vue
View file @ 739fd675
...@@ -136,15 +136,7 @@ ...@@ -136,15 +136,7 @@
getList(); getList();
resetPageIndex(); resetPageIndex();
" /> " />
<!-- <el-dropdown @command="getImport">
<el-button type="primary" @click="goContract('onedayTripContract', 0, '一日游合同')"> 一日游合同
<i class="el-icon-arrow-down el-icon--right"></i>
</el-button>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="1">境内旅游合同</el-dropdown-item>
<el-dropdown-item command="2">单项委托合同</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown> -->
<el-dropdown size="medium" @command="getImport" split-button type="primary" @click="handleClick" <el-dropdown size="medium" @command="getImport" split-button type="primary" @click="handleClick"
style="padding-left:5px;"> style="padding-left:5px;">
一日游合同 一日游合同
......
src/components/commonPage/TripDownLoadCommon.vue
View file @ 739fd675
...@@ -145,11 +145,11 @@ ...@@ -145,11 +145,11 @@
<td><input id="vshowLLR" v-model="TripLayer.vshowLLR" type="checkbox" /><label <td><input id="vshowLLR" v-model="TripLayer.vshowLLR" type="checkbox" /><label
for="vshowLLR">{{$t('salesModule.EmergencyContact')}}</label></td> for="vshowLLR">{{$t('salesModule.EmergencyContact')}}</label></td>
</tr> </tr>
<tr height="36"> <!-- <tr height="36">
<td style="padding-left:28px;"><input id="vshowO" v-model="TripLayer.vshowO" type="checkbox" /><label <td style="padding-left:28px;"><input id="vshowO" v-model="TripLayer.vshowO" type="checkbox" /><label
for="vshowO">显示视频图片</label></td> for="vshowO">显示视频图片</label></td>
<td></td> <td></td>
</tr> </tr> -->
</tbody> </tbody>
<tr height="66"> <tr height="66">
<td colspan="2" align="center"> <td colspan="2" align="center">
......
src/components/confirmationOrderDownLoadNew.vue
View file @ 739fd675
...@@ -14,22 +14,7 @@ ...@@ -14,22 +14,7 @@
top: 55px; top: 55px;
} }
.travelControlTrip .el-dropdown {
height: 30px;
line-height: 30px;
background-color: #E95252;
color: #fff;
font-size: 12px;
width: 80px;
text-align: center;
border-radius: 4px;
cursor: pointer;
margin-left: 20px;
}
.travelControlDropDown .el-dropdown-menu__item {
width: 156px;
}
.guoneiLine tbody td { .guoneiLine tbody td {
font-size: 17px; font-size: 17px;
...@@ -43,32 +28,30 @@ ...@@ -43,32 +28,30 @@
<el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;"> <el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
<el-col :span="14" class="row-aic"> <el-col :span="14" class="row-aic">
<a id="pdfDownLoad" style="display:none;" target="_blank" href="http://www.baidu.com" download="xx.pdf">页面跳转</a> <a id="pdfDownLoad" style="display:none;" target="_blank" href="http://www.baidu.com" download="xx.pdf">页面跳转</a>
<div class="el-dropdown-link" style=" height: 30px; <template v-if="orderId>0">
line-height: 30px; <el-button type="primary" size="medium" @click="toPDF_2023()">
background-color: #E95252; 出团通知书下载</el-button>
color: #fff; <el-button type="primary" size="medium" @click="gernalFeature(1)">
font-size: 12px; 出团通知书下载WROD</el-button>
width: 90px; </template>
text-align: center; <template v-else>
border-radius: 4px; <el-button type="primary" size="medium" @click="toPDF_2023()" style="margin-left:20px;">
cursor: pointer; 行程下载</el-button>
margin-left: 20px;" @click="toPDF_2023()"> <!-- <el-dropdown size="medium" @command="tripDownLoadClick" split-button type="primary" @click="handleClick">
{{orderId>0?"出团通知书下载":"行程下载"}} 行程下载
</div> <el-dropdown-menu slot="dropdown">
<div class="el-dropdown-link" style="height: 30px; <el-dropdown-item command="1" style="display:none;">行程(同行备注)</el-dropdown-item>
line-height: 30px; <el-dropdown-item command="2" style="display:none;">行程(无同行备注)</el-dropdown-item>
background-color: #E95252; </el-dropdown-menu>
color: #fff; </el-dropdown> -->
font-size: 12px; <el-button type="primary" size="medium" @click="gernalFeature(1)" style="margin-left:20px;">
width: 90px; 行程下载WORD</el-button>
text-align: center; </template>
border-radius: 4px; <!-- 可以让销售修改基本信息-->
cursor: pointer; <el-button v-if="orderId>0" type="primary" size="medium" value="修改信息" @click="editMsgShow=true">
margin-left: 20px;" @click="gernalFeature(1)"> 修改信息</el-button>
{{orderId>0?"出团通知书下载WROD":"行程下载WORD"}}
</div>
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
<el-checkbox class="marginL11" style="display:none;" v-model="isShowTime">显示行程日期</el-checkbox> <el-checkbox class="marginL11" style="display:none;" v-model="isShowTime">显示行程日期</el-checkbox>
</el-col> </el-col>
</el-row> </el-row>
...@@ -311,6 +294,14 @@ ...@@ -311,6 +294,14 @@
}, 2000) }, 2000)
}, },
methods: { methods: {
//每次自动生成行程
handleClick() {
this.toPDF_2023();
},
//阿里云
tripDownLoadClick(command) {
this.toPDF_2023(command);
},
//获取微信二维码 //获取微信二维码
getWxCode: function () { getWxCode: function () {
this.apipost('survey_post_GetSurveyWeiXinShare', { this.apipost('survey_post_GetSurveyWeiXinShare', {
...@@ -536,7 +527,7 @@ ...@@ -536,7 +527,7 @@
}) })
}, },
// 生成pdf // 生成pdf
toPDF_2023: function () { toPDF_2023: function (command) {
this.pdfLoading = true; this.pdfLoading = true;
var that = this; var that = this;
let urlObj = this.domainManager(); let urlObj = this.domainManager();
...@@ -567,14 +558,28 @@ ...@@ -567,14 +558,28 @@
// } else if (urlObj.IsOnline == 0) { // } else if (urlObj.IsOnline == 0) {
// //本地行程下载 // //本地行程下载
// this.pdfDownLoad(fileName, msg); // this.pdfDownLoad(fileName, msg);
// } else { // } else if (command && command == "1") {
// //阿里云行程下载
// var objFileKey = "TripDownLoad"
// objFileKey += "/" + msg.configId + "_" + msg.tcid;
// objFileKey += "/" + msg.configId + "_" + msg.tcid + "_B2B.pdf";
// that.downloadChengDuFileRename(objFileKey, fileName, res => {
// if (res.resultCode == 0) {
// msg.isShowB2B = 1;
// that.pdfDownLoad(fileName, msg);
// } else {
// that.pdfLoading = false;
// }
// })
// } else if (command && command == 2) {
// //阿里云行程下载 // //阿里云行程下载
// var objFileKey = "TripDownLoad" // var objFileKey = "TripDownLoad"
// objFileKey += "/" + msg.configId + "_" + msg.tcid; // objFileKey += "/" + msg.configId + "_" + msg.tcid;
// objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf"; // objFileKey += "/" + msg.configId + "_" + msg.tcid + ".pdf";
// that.downloadChengDuFileRename(objFileKey, fileName, res => { // that.downloadChengDuFileRename(objFileKey, fileName, res => {
// if (res.resultCode == 0) { // if (res.resultCode == 0) {
// msg.isShowB2B = 0;
// that.pdfDownLoad(fileName, msg);
// } else { // } else {
// that.pdfLoading = false; // that.pdfLoading = false;
// } // }
......
src/components/index.vue
View file @ 739fd675
...@@ -231,10 +231,16 @@ ...@@ -231,10 +231,16 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="userInfo.IsEditTripTemplate==1" class="clearfix _dropdown_other" <el-dropdown-item v-if="userInfo.IsEditTripTemplate==1" class="clearfix _dropdown_other"
@click.native="journeyTemplate()"> @click.native="journeyTemplate()">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i> <i class="iconfont icon-pdf" style="color:#f39c12"></i>
添加/编辑模版 添加/编辑模版
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other"
@click.native="journeyTemplate(1)">
<i class="iconfont icon-pdf" style="color:#f39c12"></i>
在线行程
<i class="iconfont icon-right1"></i>
</el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()"> <el-dropdown-item class="clearfix _dropdown_other" @click.native="goUrlPersonal()">
<i class="iconfont icon-menu-shezhi1" style="color:#2c3e50"></i> <i class="iconfont icon-menu-shezhi1" style="color:#2c3e50"></i>
设置 设置
...@@ -1996,9 +2002,14 @@ ...@@ -1996,9 +2002,14 @@
this.dialogPptistVisible = false this.dialogPptistVisible = false
}, },
// 添加编辑模版 // 添加编辑模版
journeyTemplate(){ journeyTemplate(type){
let href = this.domainManager().PptUrl let href = this.domainManager().PptUrl
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&model=1&TempType=0` // type 1销售暂存模版
if(type==1){
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=2&TempType=0`
}else{
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1&TempType=0`
}
this.dialogPptistVisible = true this.dialogPptistVisible = true
}, },
GetExaminePriceOrderPageList(type) { GetExaminePriceOrderPageList(type) {
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 739fd675
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span> <span class="foldList" @click="fold" v-if="isFold==1">{{$t('sm.djzk')}}</span>
<template v-if="true"> <template v-if="true">
<span v-if="FeatureData.FeatureType==9" class="foldList" style="margin-right: 5px;" <span v-if="FeatureData.FeatureType==9" class="foldList" style="margin-right: 5px;"
@click="journeyTemplate(0)">编辑行程</span> @click="journeyTemplate()">编辑行程</span>
</template> </template>
<div class="TrfList clearfix"> <div class="TrfList clearfix">
<!--&&item.TypeState!=8--> <!--&&item.TypeState!=8-->
...@@ -325,14 +325,11 @@ ...@@ -325,14 +325,11 @@
this.iframeLoading = false this.iframeLoading = false
}, },
// 添加编辑模版 // 添加编辑模版
journeyTemplate(type){ journeyTemplate(){
this.isPostMessage = false this.isPostMessage = false
let href = this.domainManager().PptUrl let href = this.domainManager().PptUrl
if(type&&type==1){ this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}`
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=0&model=1&TempType=0` // this.TemplateUrl=`${href}/index/${this.userInfo.EmployeeId}/${this.FeatureData.ConfigId}/0/${this.dataAll.FeaturePageType}`
}else{
this.TemplateUrl=`${href}/?uid=${this.userInfo.EmployeeId}&ConfigId=${this.FeatureData.ConfigId}&model=0&TempType=${this.dataAll.FeaturePageType}`
}
this.dialogPptistVisible = true this.dialogPptistVisible = true
}, },
//重新加载行程特色 //重新加载行程特色
......
src/plug/index.js
View file @ 739fd675
...@@ -120,10 +120,10 @@ export default { ...@@ -120,10 +120,10 @@ export default {
let crmUrl = ""; //crm API let crmUrl = ""; //crm API
let locationName = window.location.hostname; let locationName = window.location.hostname;
let isOnline = 0; //0-本地测试，1-线上 let isOnline = 0; //0-本地测试，1-线上
let ocrUrl = "http://192.168.10.214:8140"; let ocrUrl = "http://192.168.10.68:8888";
// domainUrl = "http://192.168.10.238:8083"; // 刘东电脑 // 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"; //奎哥 domainUrl = "http://192.168.10.68"; //奎哥
let crmLocalFileStreamDownLoadUrl = ""; let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com"; crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
......
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