Skip to content

S
SuperMan
Commit 06fd36ca authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 9039337a 556ef1ae
Expand all Show whitespace changes
Inline Side-by-side
Showing with 7512 additions and 7242 deletions
src/assets/utils/AuthCode.js
View file @ 06fd36ca
...@@ -8,6 +8,7 @@ var AuthCode = { ...@@ -8,6 +8,7 @@ var AuthCode = {
EditOrderCreateBy:"EditOrderCreateBy",//修改业务员 EditOrderCreateBy:"EditOrderCreateBy",//修改业务员
EditRoomDinnerTIcket:"EditRoomDinnerTIcket",//房餐景点修改权限 EditRoomDinnerTIcket:"EditRoomDinnerTIcket",//房餐景点修改权限
EditQuotation:"EditQuotation",//报价单修改权限 EditQuotation:"EditQuotation",//报价单修改权限
SupperOrderEdit:"SupperOrderEdit",//获取总经理副总经理超级修改权限
LookOrder:"LookOrder",//出纳查看订单权限
}; };
export default AuthCode; export default AuthCode;
\ No newline at end of file
src/components/BusExport.vue
View file @ 06fd36ca
<style> <style>
.BusExportTitle{ .BusExportTitle {
width:1000px; width: 1000px;
margin:0 auto; margin: 0 auto;
text-align: center; text-align: center;
font-weight: bold; font-weight: bold;
margin-top:10px; margin-top: 10px;
font-size:16px; font-size: 16px;
} }
.Bus_Content{
width:100%; .Bus_Content {
height:auto; width: 100%;
margin:auto; height: auto;
margin: auto;
position: absolute; position: absolute;
} }
.Bus_detailTable { .Bus_detailTable {
width: 1000px; width: 1000px;
font-size: 12px; font-size: 12px;
...@@ -25,31 +27,36 @@ ...@@ -25,31 +27,36 @@
.Bus_detailTable td { .Bus_detailTable td {
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
padding:0 10px; padding: 0 10px;
height:32px; height: 32px;
font-size:16px; font-size: 16px;
} }
.Bus_detailTable th { .Bus_detailTable th {
background-color: #fff; background-color: #fff;
border: 1px solid #d1d1d1; border: 1px solid #d1d1d1;
font-size:16px; font-size: 16px;
font-weight:bold; font-weight: bold;
height:32px; height: 32px;
} }
.txLeft{
.txLeft {
text-align: left; text-align: left;
} }
.txRight{
.txRight {
text-align: right; text-align: right;
} }
.fontBold{
font-weight:bold; .fontBold {
font-weight: bold;
} }
.totalTabal td{
height:33px; .totalTabal td {
height: 33px;
} }
.excelBtn{
.excelBtn {
color: #fff; color: #fff;
padding: 0 15px; padding: 0 15px;
height: 30px; height: 30px;
...@@ -59,13 +66,14 @@ ...@@ -59,13 +66,14 @@
border-radius: 15px; border-radius: 15px;
margin-left: 10px; margin-left: 10px;
} }
</style> </style>
<template> <template>
<div class="Bus_Content"> <div class="Bus_Content">
<div class="BusExportTitle"> <div class="BusExportTitle">
{{Year}}年{{Month}}月公社车账 {{Year}}年{{Month}}月公社车账
<input type="button" style="float:right;" @click="downLoadExcel" class="excelBtn" value="下载excel"/> <input type="button" style="float:right;" @click="downLoadExcel" class="excelBtn" value="下载excel" />
</div> </div>
<table class="Bus_detailTable"> <table class="Bus_detailTable">
<thead> <thead>
...@@ -122,9 +130,9 @@ ...@@ -122,9 +130,9 @@
</td> </td>
</tr> </tr>
</table> </table>
<table class="Bus_detailTable" v-for="(item,index) in dataList"
<table class="Bus_detailTable" v-for="item in dataList" style="margin: 5px auto;border:0px;page-break-before:always;"> style="margin: 5px auto;border:0px;page-break-before:always;">
<tr> <tr >
<th>做账主体</th> <th>做账主体</th>
<th width="250">团号</th> <th width="250">团号</th>
<th>单号</th> <th>单号</th>
...@@ -152,19 +160,19 @@ ...@@ -152,19 +160,19 @@
export default { export default {
data() { data() {
return { return {
msg:{ msg: {
Month:'', Month: '',
MakeStartDate:'', MakeStartDate: '',
MakeEndDate:'', MakeEndDate: '',
CurrType:'', CurrType: '',
CurrName:'', CurrName: '',
ClientId:'' ClientId: ''
}, },
Year:'', Year: '',
Month:'', Month: '',
dataList:[], dataList: [],
TotalJan:'', TotalJan: '',
TotalCn:'', TotalCn: '',
downList: "", downList: "",
} }
}, },
...@@ -173,36 +181,33 @@ ...@@ -173,36 +181,33 @@
this.msg.MakeStartDate = this.$route.query.MakeStartDate; this.msg.MakeStartDate = this.$route.query.MakeStartDate;
this.msg.MakeEndDate = this.$route.query.MakeEndDate; this.msg.MakeEndDate = this.$route.query.MakeEndDate;
this.msg.CurrType = this.$route.query.CurrType; this.msg.CurrType = this.$route.query.CurrType;
this.msg.ClientId=this.$route.query.ClientId; this.msg.ClientId = this.$route.query.ClientId;
this.Year = this.msg.Month.split('-')[0]; this.Year = this.msg.Month.split('-')[0];
this.Month = this.msg.Month.split('-')[1]; this.Month = this.msg.Month.split('-')[1];
this.getList(); this.getList();
}, },
methods: { methods: {
getList(){ getList() {
this.apipost('bus_get_CarfareApportionExport',this.msg, res => { this.apipost('bus_get_CarfareApportionExport', this.msg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.dataList = res.data.data.RObj; this.dataList = res.data.data.RObj;
this.msg.CurrName = res.data.data.CurrName; this.msg.CurrName = res.data.data.CurrName;
this.TotalJan = res.data.data.TotalStatistics.TSumOMoney; this.TotalJan = res.data.data.TotalStatistics.TSumOMoney;
this.TotalCn = res.data.data.TotalStatistics.TSumMoney; this.TotalCn = res.data.data.TotalStatistics.TSumMoney;
}else{ } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
}, err => {}) }, err => {})
}, },
//点击下载 //点击下载
downLoadExcel(){ downLoadExcel() {
let msg = JSON.parse(JSON.stringify(this.msg)); let msg = JSON.parse(JSON.stringify(this.msg));
this.GetLocalFile( this.GetLocalFile(
"bus_get_CarfareApportionExcelExport", "bus_get_CarfareApportionExcelExport",
msg, msg,
this.Year+'年'+this.Month+'月'+'公社车账.xls' this.Year + '年' + this.Month + '月' + '公社车账.xls'
); );
} }
}, },
} }
</script> </script>
\ No newline at end of file
src/components/Details.vue
View file @ 06fd36ca
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
<el-submenu v-for="(item,index) in items" :index="String(index+1)" :key='index'> <el-submenu v-for="(item,index) in items" :index="String(index+1)" :key='index'>
<template slot="title" class="left-nav"> <template slot="title" class="left-nav">
<i :class="[fontPub,item.MenuStyleIcon]" class="big-icon"></i> <i :class="[fontPub,item.MenuStyleIcon]" class="big-icon"></i>
<!-- <span>{{item.MenuName}}</span> -->
</template> </template>
<el-menu-item-group class="my_maxheight"> <el-menu-item-group class="my_maxheight">
<span slot="title">{{item.MenuName}}</span> <span slot="title">{{item.MenuName}}</span>
...@@ -25,26 +24,10 @@ ...@@ -25,26 +24,10 @@
</el-menu-item-group> </el-menu-item-group>
</el-submenu> </el-submenu>
</el-menu> </el-menu>
<!-- <ul>
<li v-for="(item,index) in items" class="menuItem_level1">
<p @click="showToggle(item.MenuId)" class="parentBox">
<i :class="[fontPub,item.MenuStyleIcon]"></i>
{{item.MenuName}}
<i class="iconfont icon-arrow-right small"></i>
</p>
<ul class="liDiv" >
<li v-for="subItem in item.childerns" class="childBox" @click="goUrl(subItem.MenuUrl)"><i :class="[fontPub,subItem.MenuStyleIcon]" :style="{background:subItem.MenuStyleColor}"></i><br/>{{subItem.MenuName}}</li>
</ul>
</li>
</ul> -->
</div> </div>
</div> </div>
</div> </div>
<div class="flexParent" v-if="openMode==1"> <div class="flexParent" v-if="openMode==1">
<!-- <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> -->
<div class="nav-tabs-box" @contextmenu.prevent="showRightMenu" :style="{width:`${navWidth}px`}"> <div class="nav-tabs-box" @contextmenu.prevent="showRightMenu" :style="{width:`${navWidth}px`}">
<el-tabs v-if='tabs && tabs.length>0' v-model="currentTabName" style="margin-left: 120px;" :closable="tabs.length>1" type="card" @edit="handleTabsEdit"> <el-tabs v-if='tabs && tabs.length>0' v-model="currentTabName" style="margin-left: 120px;" :closable="tabs.length>1" type="card" @edit="handleTabsEdit">
<el-tab-pane :key="i" v-for="(item,i) in tabs" :label="item.title" :name="item.name+'_'+i"> <el-tab-pane :key="i" v-for="(item,i) in tabs" :label="item.title" :name="item.name+'_'+i">
...@@ -163,34 +146,10 @@ export default { ...@@ -163,34 +146,10 @@ export default {
this.reloadpage() this.reloadpage()
}); });
this.navWidth=document.querySelector(".flexParent").offsetWidth; this.navWidth=document.querySelector(".flexParent").offsetWidth;
// this.MsgBus.$on('forEachLoc', ()=> {
// let obj = {}
// let LocNavTab = JSON.parse(window.localStorage.navTabs);
// let navTab = JSON.parse(window.localStorage.navTabs);
// let navTabSortR = [];
// for (let i = navTab.length-1; i>=0; i--) {
// navTabSortR.push(navTab[i]);
// }
// navTabSortR = navTabSortR.reduce(function(item, next) { //根据MD5Sign数组对象去重
// obj[next.name] ? '' : obj[next.name] = true && item.push(next);
// return item;
// }, []);
// let navTabSortA = [];
// for (let i = navTabSortR.length-1; i>=0; i--) {
// navTabSortA.push(navTabSortR[i]);
// }
// if (LocNavTab.length !== navTabSortA.length) {
// this.tabs = navTabSortA;
// this.currentTabName = this.tabs[this.tabs.length-1].name + '_' + (this.tabs.length-1);
// this.currentTag = this.tabs[this.tabs.length-1];
// }
// });
if(this.openMode==1){ if(this.openMode==1){
if(localStorage['navTabs']){ if(localStorage['navTabs']){
this.tabs=JSON.parse(localStorage['navTabs']) this.tabs=JSON.parse(localStorage['navTabs'])
// this.tabs.forEach(x=>{
// x.comp=this.mapObj(x.path,x.name).comp
// })
} }
} }
this.getMenu() this.getMenu()
...@@ -962,7 +921,7 @@ export default { ...@@ -962,7 +921,7 @@ export default {
window.localStorage.navTabs=JSON.stringify(this.tabs) window.localStorage.navTabs=JSON.stringify(this.tabs)
}, },
created(){ created(){
// document.title = this.$route.meta.title ? this.$route.meta.title + '-四川和平国际旅行社' : '四川和平国际旅行社'
} }
}; };
</script> </script>
src/components/clientConfirm.vue
View file @ 06fd36ca
This diff is collapsed.
src/components/confirmationOrder.vue
View file @ 06fd36ca
This diff is collapsed.
src/components/confirmationOrderDownLoad - 副本.vue
View file @ 06fd36ca
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
<a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0]!=null && priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none; <a class="travelControlTripBtn" v-if="priceList!=null&& priceList[0]!=null && priceList[0].wordPath!=''" style="display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;" width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
:href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a> :href="domainManager().ViittoFileUrl+priceList[0].wordPath">下载WORD行程</a>
<!-- ToWord(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游') -->
<!--&&isopOperation HK 注释 可以让销售修改基本信息-->
<input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" /> <input type="button" v-if="orderId>0" class="travelControlTripBtn" value="修改信息" @click="editMsgShow=true" />
<div id="pdfNode"> <div id="pdfNode">
<div id='pdfDom' style="padding:0 20px;"> <div id='pdfDom' style="padding:0 20px;">
......
src/components/confirmationOrderDownLoad.vue
View file @ 06fd36ca
...@@ -642,8 +642,6 @@ ...@@ -642,8 +642,6 @@
import threeday from './commonPage/threeday' import threeday from './commonPage/threeday'
import fourday from './commonPage/fourday' import fourday from './commonPage/fourday'
import fiveday from './commonPage/fiveday' import fiveday from './commonPage/fiveday'
// import saveAs from 'file-saver'
// import '../utils/jqueryWordexport.js'
import { import {
setTimeout setTimeout
} from 'timers'; } from 'timers';
......
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