Skip to content

S
SuperMan
Commit 2e6254a9 authored by 王悦's avatar 王悦
Browse files
Options

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

parents 1ce2244f 2070d6f3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 688 additions and 13 deletions
src/components/Details.vue
View file @ 2e6254a9
......@@ -59,7 +59,7 @@
<analogIFrame :key="i" :type='item.type' v-model="item.history" :curIndex='i' :refer='item.refer' v-show="tabs.indexOf(currentTag)==i" :componentTemp='item.comp' v-for="(item,i) in tabs" v-if='item.comp' :path='item.path' :name='item.name'></analogIFrame>
</div>
<div class="flexParent" v-if="openMode==0">
<a :href='blankUrl' ref='blankLink' target="_blank" style="display:none">1</a>
<a :href='blankUrl' id='blankLink' target="_blank" style="display:none">1</a>
<div class="resource-ttop" style="font-family:PingFangSC-Semibold" v-if="rootName!=''">
{{rootName}}<i class="iconfont icon-weibiaoti102"></i>{{parentName}}<i class="iconfont icon-weibiaoti102"></i><span class="active">{{currentName}}</span>
</div>
......@@ -882,10 +882,10 @@ export default {
next()
}else if(that.openMode==0 && to.query.blank && to.query.blank=='y'){
that.$refs.blankLink.href=`http://${window.location.host}/#${to.fullPath}`
let dom = document.querySelector("#blankLink")
dom.href=`http://${window.location.host}/#${to.fullPath}`
//console.log(that.$refs.blankLink.click())
that.$refs.blankLink.click()
dom.click()
}else{
next()
}
......
src/components/SalesModule/saleReceivablesTotal.vue
View file @ 2e6254a9
......@@ -142,9 +142,9 @@
</script>
<style>
._bank_type{background-color: #2AAEF2}
.workTotalSearch ._bank_type{background-color: #2AAEF2}
._bank_type2{background-color: #FF9C01}
._bank_name,._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
.workTotalSearch ._bank_name,.workTotalSearch ._bank_type{display: inline-block;background-color: #333333;color: white;padding: 2px 4px;border-radius: 4px;margin-left:10px;}
._fex_cen{display: flex;align-items: center}
.workTotalSearch{width: 100%; min-height: auto; padding:0 0 20px 0;}
.workTotalSearch li{float: left; font-size: 12px; color: #666; margin:20px 10px 0px 0;}
......
src/components/Ticketing/individualTicket.vue 0 → 100644
View file @ 2e6254a9
This diff is collapsed.
src/components/busManagement/busStatistics.vue
View file @ 2e6254a9
......@@ -162,7 +162,7 @@
<td :colspan="colspanTotal" style="text-align: left!important;padding-left: 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
<div v-show="item.DMCRemark!=''" class="colorE95252">地接备注:{{item.DMCRemark}}</div>
</div>
</td>
</tr>
......
src/components/confirmationOrderDownLoad.vue
View file @ 2e6254a9
......@@ -9,7 +9,7 @@
<div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版PDF" @click="toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载手机版WORD" @click="gernalFeature(0)" />
<input type="button" style="width: auto !important;display:none" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
<input type="button" style="width: auto !important;" class="travelControlTripBtn" value="下载电脑版WORD" @click="gernalFeature(1)" />
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 2e6254a9
......@@ -145,9 +145,6 @@
</td>
<td>
<div class="fz16 fbold">
<!--{{item.ResultReport.MakeInvoice=='0'?"x":"O"}}
<span style="color: #4BCA81;">√</span>-->
<!--√：X :o 含义定义-->
<span style="color: #4BCA81;" v-if="item.ResultReport.MakeInvoice==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.MakeInvoice=='-1'?"x":"O"}}</span>
</div>
......@@ -233,7 +230,7 @@
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p>
<div v-show="outItem.StaticsReportList[index].OPRemark!=''" class="colorE95252" style="padding-top:5px;">OP备注:{{outItem.StaticsReportList[index].OPRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[0].DMCRemark}}</div>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252" style="padding-top:5px;padding-bottom:4px;">地接备注:{{outItem.StaticsReportList[index].DMCRemark}}</div>
</div>
</td>
</tr>
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ 2e6254a9
......@@ -14,6 +14,13 @@
<div>{{item.ckTitle}}</div>
</div>
</div>
<div style="display:none">
<p style="padding:5px 0;">请选择下载word行程的主题颜色</p>
<el-radio-group v-model="FeatureData.TemplateId">
<el-radio-button v-for="item in templateColorArray" :class="`templateColorArray_${item.color}`" :label="item.id" :key="item.id" :value="item.id">{{item.text}}</el-radio-button>
</el-radio-group>
<p style="padding:5px 0 0 0;"> </p>
</div>
<div>注：幻灯片（图片至少为两张，图片尺寸应该控制在960*500，如果超出系统将自动裁剪显示）</div>
<div class="ScraList">九宫格（请尽量保持图片高清，系统将根据你的图片数量自动缩放图片大小，最多9张图片）</div>
<div class="TFContent">
......@@ -248,6 +255,23 @@
TypeState: 5
}
], //tab数组
templateColorArray:[
{
id: 1,
color: 'yellow',
text: '黄色'
},
{
id: 2,
color: 'pink',
text: '粉色'
},
{
id: 3,
color: 'blue',
text: '蓝色'
},
],
travelsList: [],
del_show: true,
//折叠展开
......@@ -329,6 +353,7 @@
ShopRemark:postData.ShopRemark,
VisaRemark:postData.VisaRemark,
WarmTip:postData.WarmTip,
TemplateId: postData.TemplateId
};
let flagWangYue = this.$route.query.flag;
......@@ -607,6 +632,24 @@
</script>
<style>
.templateColorArray_yellow.is-active span.el-radio-button__inner{
background-color: #f6dc61;
border-color: #f6dc61;
color: #d19913;
box-shadow: -1px 0 0 0 #f6dc61;
}
.templateColorArray_pink.is-active span.el-radio-button__inner{
background-color: pink;
border-color: pink;
color: #9c525f;
box-shadow: -1px 0 0 0 pink;
}
.templateColorArray_blue.is-active span.el-radio-button__inner{
background-color: skyblue;
border-color: skyblue;
color: #346f88;
box-shadow: -1px 0 0 0 skyblue;
}
@font-face {
font-family: "FZDBSJW";
src: url("../../../assets/webfont/FZDBSJW.woff") format("woff"),
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 2e6254a9
......@@ -139,6 +139,7 @@
Subtitle: "",
LineName: "",
DayList: [],
TemplateId: 1,
IsSave: false //是否保存
},
//线路行程
......@@ -584,6 +585,7 @@
this.FeatureData.ConfigId = tempData.Feature.ConfigId;
this.FeatureData.FeatureType = tempData.Feature.FeatureType;
this.FeatureData.FeatureImg = tempData.Feature.FeatureImg;
this.FeatureData.TemplateId = tempData.Feature.TemplateId;
this.FeatureData.FeatureContent = tempData.Feature.FeatureContent;
//图片列表
this.FeatureData.fileList = tempData.Feature.FeatureImgList;
......
src/plug/index.js
View file @ 2e6254a9
......@@ -150,7 +150,9 @@ export default {
//google地图图片地址
GoogleMapImageUrl: "http://super.oytour.com",
// "http://upload.oytour.com"
UploadUrl: locationName.indexOf('oytour')!==-1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120"
UploadUrl: locationName.indexOf('oytour') !== -1 ? "http://upload.oytour.com" : "http://127.0.0.1:8120",
// 读取文件
ViittoFileUrl:'http://imgfile.oytour.com'
// UploadUrl: "http://upload.oytour.com"
};
return obj;
......
src/router/config.js
View file @ 2e6254a9
......@@ -1011,6 +1011,13 @@ export default {
title: '机票列表'
},
}, {
path: '/individualTicket', //散客机票
name: 'individualTicket',
component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
meta: {
title: '散客机票'
},
},{
path: '/PassengerList', //旅客名单
name: 'PassengerList',
component: resolve => require(['@/components/Ticketing/PassengerList'], resolve),
......
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