Skip to content

S
SuperMan
Commit 556ef1ae authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent a9463102
Show whitespace changes
Inline Side-by-side
Showing with 2590 additions and 2140 deletions
src/components/BusExport.vue
View file @ 556ef1ae
<style>
.BusExportTitle{
width:1000px;
margin:0 auto;
.BusExportTitle {
width: 1000px;
margin: 0 auto;
text-align: center;
font-weight: bold;
margin-top:10px;
font-size:16px;
margin-top: 10px;
font-size: 16px;
}
.Bus_Content{
width:100%;
height:auto;
margin:auto;
.Bus_Content {
width: 100%;
height: auto;
margin: auto;
position: absolute;
}
.Bus_detailTable {
width: 1000px;
font-size: 12px;
......@@ -25,31 +27,36 @@
.Bus_detailTable td {
border: 1px solid #d1d1d1;
padding:0 10px;
height:32px;
font-size:16px;
padding: 0 10px;
height: 32px;
font-size: 16px;
}
.Bus_detailTable th {
background-color: #fff;
border: 1px solid #d1d1d1;
font-size:16px;
font-weight:bold;
height:32px;
font-size: 16px;
font-weight: bold;
height: 32px;
}
.txLeft{
.txLeft {
text-align: left;
}
.txRight{
.txRight {
text-align: right;
}
.fontBold{
font-weight:bold;
.fontBold {
font-weight: bold;
}
.totalTabal td{
height:33px;
.totalTabal td {
height: 33px;
}
.excelBtn{
.excelBtn {
color: #fff;
padding: 0 15px;
height: 30px;
......@@ -59,13 +66,14 @@
border-radius: 15px;
margin-left: 10px;
}
</style>
<template>
<div class="Bus_Content">
<div class="BusExportTitle">
{{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>
<table class="Bus_detailTable">
<thead>
......@@ -122,9 +130,9 @@
</td>
</tr>
</table>
<table class="Bus_detailTable" v-for="item in dataList" style="margin: 5px auto;border:0px;page-break-before:always;">
<tr>
<table class="Bus_detailTable" v-for="(item,index) in dataList"
style="margin: 5px auto;border:0px;page-break-before:always;">
<tr >
<th>做账主体</th>
<th width="250">团号</th>
<th>单号</th>
......@@ -152,19 +160,19 @@
export default {
data() {
return {
msg:{
Month:'',
MakeStartDate:'',
MakeEndDate:'',
CurrType:'',
CurrName:'',
ClientId:''
msg: {
Month: '',
MakeStartDate: '',
MakeEndDate: '',
CurrType: '',
CurrName: '',
ClientId: ''
},
Year:'',
Month:'',
dataList:[],
TotalJan:'',
TotalCn:'',
Year: '',
Month: '',
dataList: [],
TotalJan: '',
TotalCn: '',
downList: "",
}
},
......@@ -173,36 +181,33 @@
this.msg.MakeStartDate = this.$route.query.MakeStartDate;
this.msg.MakeEndDate = this.$route.query.MakeEndDate;
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.Month = this.msg.Month.split('-')[1];
this.getList();
},
methods: {
getList(){
this.apipost('bus_get_CarfareApportionExport',this.msg, res => {
if(res.data.resultCode == 1) {
getList() {
this.apipost('bus_get_CarfareApportionExport', this.msg, res => {
if (res.data.resultCode == 1) {
this.dataList = res.data.data.RObj;
this.msg.CurrName = res.data.data.CurrName;
this.TotalJan = res.data.data.TotalStatistics.TSumOMoney;
this.TotalCn = res.data.data.TotalStatistics.TSumMoney;
}else{
} else {
this.Error(res.data.message);
}
}, err => {})
},
//点击下载
downLoadExcel(){
downLoadExcel() {
let msg = JSON.parse(JSON.stringify(this.msg));
this.GetLocalFile(
"bus_get_CarfareApportionExcelExport",
msg,
this.Year+'年'+this.Month+'月'+'公社车账.xls'
this.Year + '年' + this.Month + '月' + '公社车账.xls'
);
}
},
}
</script>
\ No newline at end of file
src/components/Details.vue
View file @ 556ef1ae
......@@ -15,7 +15,6 @@
<el-submenu v-for="(item,index) in items" :index="String(index+1)" :key='index'>
<template slot="title" class="left-nav">
<i :class="[fontPub,item.MenuStyleIcon]" class="big-icon"></i>
<!-- <span>{{item.MenuName}}</span> -->
</template>
<el-menu-item-group class="my_maxheight">
<span slot="title">{{item.MenuName}}</span>
......@@ -25,26 +24,10 @@
</el-menu-item-group>
</el-submenu>
</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 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`}">
<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">
......@@ -163,34 +146,10 @@ export default {
this.reloadpage()
});
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(localStorage['navTabs']){
this.tabs=JSON.parse(localStorage['navTabs'])
// this.tabs.forEach(x=>{
// x.comp=this.mapObj(x.path,x.name).comp
// })
}
}
this.getMenu()
......@@ -962,7 +921,7 @@ export default {
window.localStorage.navTabs=JSON.stringify(this.tabs)
},
created(){
// document.title = this.$route.meta.title ? this.$route.meta.title + '-四川和平国际旅行社' : '四川和平国际旅行社'
}
};
</script>
src/components/clientConfirm.vue
View file @ 556ef1ae
This source diff could not be displayed because it is too large. You can view the blob instead.
src/components/confirmationOrder.vue
View file @ 556ef1ae
<template>
<div>
<template>
<span
v-if="ConfirmationDetails.OperationState === -1 || ConfirmationDetails.OperationState === 2"
class="confirmationOrderNormalBtn"
@click="SetOrderConfirmation()"
>申请</span>
<!-- v-if="ConfirmationDetails.OperationState === 1" -->
<span
v-if="ConfirmationDetails.OperationState === 1"
class="confirmationOrderNormalBtn"
@click="toPDF('旅游行程确认件')"
>下载PDF</span>
<span class="confirmationOrderNormalBtn confirmationOrderNormalBtn2" v-if="ConfirmationDetails.OperationState === 2" @click="outerVisible = true">修改账户</span>
<span v-if="ConfirmationDetails.OperationState === -1 || ConfirmationDetails.OperationState === 2"
class="confirmationOrderNormalBtn" @click="SetOrderConfirmation()">申请</span>
<span v-if="ConfirmationDetails.OperationState === 1" class="confirmationOrderNormalBtn"
@click="toPDF('旅游行程确认件')">下载PDF</span>
<span class="confirmationOrderNormalBtn confirmationOrderNormalBtn2"
v-if="ConfirmationDetails.OperationState === 2" @click="outerVisible = true">修改账户</span>
</template>
<div style="width: 800px; margin: 10px auto 0;" id="pdfDom">
<div
v-if="ConfirmationDetails.ConfirmationContent"
v-html="ConfirmationDetails.ConfirmationContent"
></div>
<div v-if="ConfirmationDetails.ConfirmationContent" v-html="ConfirmationDetails.ConfirmationContent"></div>
<div class="confirmationOrder" v-else>
<p class="f22 center" style="margin: 20px 0 0 0;">{{list.CompanyTitle}}</p>
<p class="f22 center">旅游行程确认件</p>
<p
class="f14"
style="text-indent: 36px;"
>经甲乙双方友好协商，现甲方委托乙方承办甲方所组旅游团队/散客的游览事宜，达成如下协议，烦请仔细审核，核实无误后烦请签字盖章回传确认件（本确认件现为业务合同，传真件具有同等法律效力）。</p>
<p class="f14" style="text-indent: 36px;">
经甲乙双方友好协商，现甲方委托乙方承办甲方所组旅游团队/散客的游览事宜，达成如下协议，烦请仔细审核，核实无误后烦请签字盖章回传确认件（本确认件现为业务合同，传真件具有同等法律效力）。</p>
<table class="confirmationOrderTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="20" rowspan="3">甲方</td>
<td width="170" rowspan="3">委托社名称及许可证号</td>
<td width="160" rowspan="3">
<!-- <input v-if='!isPrint' class="wp100" v-model="list.CustomerName" type="text">
<span v-if='isPrint'>{{list.CustomerName}}</span>-->
<span class="__input" :contenteditable="true">{{list.CustomerName}}</span>
</td>
<td width="80" rowspan="3">经办人</td>
......@@ -86,9 +73,8 @@
<td colspan="4">团号：{{list.TCNUM}}</td>
</tr>
<tr>
<td
colspan="7"
>时间：{{list.StartDate}}-{{list.EndDate}}&nbsp;&nbsp;&nbsp;{{list.DayNum}}天{{list.NightNum}}晚</td>
<td colspan="7">时间：{{list.StartDate}}-{{list.EndDate}}&nbsp;&nbsp;&nbsp;{{list.DayNum}}天{{list.NightNum}}晚
</td>
</tr>
<tr>
<td colspan="3">出境地：{{list.StartCity}}</td>
......@@ -99,13 +85,13 @@
参团人数：
<span class="__input">{{list.GuestNum}}</span>
大：
<span class="__input" >{{list.ManNum}}</span>
<span class="__input">{{list.ManNum}}</span>
小:
<span class="__input" >{{list.ChildNum}}</span>
<span class="__input">{{list.ChildNum}}</span>
</td>
<td colspan="4">
客户姓名：
<span class="__input" >{{list.ClientName}}</span>
<span class="__input">{{list.ClientName}}</span>
</td>
</tr>
<tr>
......@@ -121,9 +107,9 @@
<tr>
<td colspan="3">
结算价格：
<span class="__input" >{{list.SettlePrice}}</span>
<span class="__input">{{list.SettlePrice}}</span>
<br>合计：
<span class="__input" >{{list.PreferPrice}}</span>
<span class="__input">{{list.PreferPrice}}</span>
</td>
<td colspan="4">
结算方式：
......@@ -154,20 +140,10 @@
<td colspan="7" :id="isSave ? 'selectBox' : ''">
<p>
<span>甲方同意本订单所有费用在出发前支付到乙方指定账户:</span>
<!-- && !isSave -->
<el-select
v-if="printShow===true"
class="wp40 accountList"
v-model="accountNum"
@change="accountChange"
placeholder="请选择"
>
<el-option
v-for="(item,index) in accountList"
:key="index"
:label="item.BankSubName"
:value="index"
></el-option>
<el-select v-if="printShow===true" class="wp40 accountList" v-model="accountNum" @change="accountChange"
placeholder="请选择">
<el-option v-for="(item,index) in accountList" :key="index" :label="item.BankSubName" :value="index">
</el-option>
</el-select>
</p>
<p class="fnormal">
......@@ -199,10 +175,6 @@
<br>确认章并签字：
</td>
<td valign="bottom" colspan="2" style="position: relative;">
<!-- <img
:src="'data:image/jpeg;base64,'+list.ImagePath"
style="position: absolute; left: 10px; top: 10px;"
> -->
时间：{{list.Date}}
</td>
</tr>
......@@ -211,32 +183,19 @@
<p>备注：以上确认件需完成双方确认章和签字视为生效！</p>
<p style="text-indent: 43px;">如因同行未按照约定时间结清费用导致的任何问题有由同行全权负责！</p>
<p style="text-indent: 43px;">如在此期间有任何纠纷，处理依据均参照《旅游合同》或《旅游法》相关规定执行！</p>
<p style="text-indent: 43px;">本公司行程中赠送一份意外险，我司默认为贵司征得旅客同意，且认可保险金额及范围，并授权乙方购买该保险，如旅客认为该赠送意外险，保险范围不够全面，可另自行购买其它险种的保险。</p>
<p style="text-indent: 43px;">
本公司行程中赠送一份意外险，我司默认为贵司征得旅客同意，且认可保险金额及范围，并授权乙方购买该保险，如旅客认为该赠送意外险，保险范围不够全面，可另自行购买其它险种的保险。</p>
</td>
</tr>
</table>
</div>
</div>
<el-dialog custom-class="w450"
title="修改账户"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie">
<el-dialog custom-class="w450" title="修改账户" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<p style="margin-bottom: 10px;">
<span>账户:</span>
<!-- && !isSave -->
<el-select
class="wp40 accountList"
v-model="accountNum"
@change="accountChange()"
placeholder="请选择"
>
<el-option
v-for="(item,index) in accountList"
:key="index"
:label="item.BankSubName"
:value="index"
></el-option>
<el-select class="wp40 accountList" v-model="accountNum" @change="accountChange()" placeholder="请选择">
<el-option v-for="(item,index) in accountList" :key="index" :label="item.BankSubName" :value="index">
</el-option>
</el-select>
</p>
<p class="fnormal" style="margin-bottom: 10px;">
......@@ -257,11 +216,10 @@
</div>
</el-dialog>
</div>
</div>
</template>
<script>
export default {
export default {
data() {
return {
cz: "",
......@@ -287,8 +245,9 @@ export default {
},
mounted() {
this.apipost(
"sellorder_get_GetConfirmationInfoForFinance",
{ OrderId: this.$route.query.id },
"sellorder_get_GetConfirmationInfoForFinance", {
OrderId: this.$route.query.id
},
res => {
if (res.data.resultCode === 1) {
this.accountList = res.data.data;
......@@ -302,8 +261,9 @@ export default {
err => {}
);
this.apipost(
"sellorder_get_GetOrderConfirmationInfo",
{ OrderId: this.$route.query.id },
"sellorder_get_GetOrderConfirmationInfo", {
OrderId: this.$route.query.id
},
res => {
if (res.data.resultCode == 1) {
this.list = res.data.data;
......@@ -314,8 +274,9 @@ export default {
err => {}
);
this.apipost(
"OnlinePay_post_GetPayConfigList",
{ OrderId: this.$route.query.id },
"OnlinePay_post_GetPayConfigList", {
OrderId: this.$route.query.id
},
res => {
this.bank = res.data.data;
},
......@@ -323,7 +284,7 @@ export default {
);
},
methods: {
setHtml: function() {
setHtml: function () {
let dom = document.getElementById("selectBox")
if (!dom) return
let str = `<p>
......@@ -348,16 +309,17 @@ export default {
</p>`;
document.getElementById("selectBox").innerHTML = str;
},
getConfifmationDetails: function() {
getConfifmationDetails: function () {
this.apipost(
"sellorder_post_GetOrderConfirmationDetails",
{ orderId: this.$route.query.id },
"sellorder_post_GetOrderConfirmationDetails", {
orderId: this.$route.query.id
},
res => {
if (res.data.resultCode === 1) {
let data = res.data.data;
data.ConfirmationContent = data.ConfirmationContent
? JSON.parse(data.ConfirmationContent)
: null;
data.ConfirmationContent = data.ConfirmationContent ?
JSON.parse(data.ConfirmationContent) :
null;
this.accountNum = data.BankIndexNum;
this.ConfirmationDetails = data;
this.accountChange();
......@@ -365,12 +327,14 @@ export default {
setTimeout(() => {
if (data.OperationState === 1 || data.OperationState === 0 || this.$route.query.isShen) {
let ele=document.getElementsByClassName('__input')
for(var i=0;i<ele.length;i++){
let ele = document.getElementsByClassName('__input')
for (var i = 0; i < ele.length; i++) {
ele[i].contentEditable = false
}
}
if (data.OperationState !== -1) { this.setHtml(); }
if (data.OperationState !== -1) {
this.setHtml();
}
}, 1000);
} else {
this.$message.error(res.data.message);
......@@ -380,7 +344,7 @@ export default {
);
},
// 保存确认函
SetOrderConfirmation: function() {
SetOrderConfirmation: function () {
this.isSave = true;
this.printShow = false
setTimeout(() => {
......@@ -407,30 +371,26 @@ export default {
);
}, 500);
},
// toPDF: function (title) {
// this.printShow = false
// setTimeout(() => {
// this.getPdf(title,() => {
// this.printShow = true
// })
// }, 0)
// },
toPDF: function(title) {
toPDF: function (title) {
this.isPrint = true;
this.$forceUpdate();
setTimeout(() => {
let pageData = document.getElementById("pdfDom").innerHTML;
let urlObj = this.domainManager();
this.$http({
headers: { "Content-Type": "application/json" },
headers: {
"Content-Type": "application/json"
},
method: "post",
url: urlObj.DomainUrl + "/api/file/GetWebHtmlTwo",
data: { msg: pageData, sign: "new_file" }
data: {
msg: pageData,
sign: "new_file"
}
})
.then(res => {
if (res.data.resultCode === 1) {
setTimeout(() => {
// let sign = title+parseInt(Math.random()*1000)
let sign = title;
const a = document.createElement("a");
a.setAttribute("download", "");
......@@ -455,7 +415,7 @@ export default {
});
}, 500);
},
accountChange: function() {
accountChange: function () {
this.accountInfo.BankName = this.accountList[this.accountNum].BankName;
this.accountInfo.BankSubName = this.BankSubName = this.accountList[
this.accountNum
......@@ -476,15 +436,18 @@ export default {
done();
},
}
};
};
</script>
<style>
@import "../assets/css/cssReset.css";
.confirmationOrder {
@import "../assets/css/cssReset.css";
.confirmationOrder {
line-height: 18px;
}
.confirmationOrderNormalBtn {
}
.confirmationOrderNormalBtn {
color: #fff;
float: right;
width: 60px;
......@@ -503,71 +466,90 @@ export default {
position: absolute;
left: 70%;
margin-left: -30px;
}
.confirmationOrderNormalBtn2{
}
.confirmationOrderNormalBtn2 {
left: 78%;
}
.confirmationOrder {
}
.confirmationOrder {
width: 800px;
font-weight: bold;
margin: auto;
font-family: "宋体";
letter-spacing: 1px;
}
.confirmationOrder > p {
}
.confirmationOrder>p {
line-height: 26px;
}
.confirmationOrder .center {
}
.confirmationOrder .center {
text-align: center;
}
.confirmationOrder .fnormal {
}
.confirmationOrder .fnormal {
font-weight: normal !important;
}
.confirmationOrder .f22 {
}
.confirmationOrder .f22 {
font-size: 22px;
}
.confirmationOrder .f20 {
}
.confirmationOrder .f20 {
font-size: 20px;
}
.confirmationOrder .f18 {
}
.confirmationOrder .f18 {
font-size: 18px;
}
.confirmationOrder .f16 {
}
.confirmationOrder .f16 {
font-size: 16px;
}
.confirmationOrder .f14 {
}
.confirmationOrder .f14 {
font-size: 14px;
}
.confirmationOrder .w40 {
}
.confirmationOrder .w40 {
width: 40px !important;
}
.confirmationOrder .wp40 {
}
.confirmationOrder .wp40 {
width: 40%;
}
.confirmationOrder .wp80 {
}
.confirmationOrder .wp80 {
width: 80%;
}
.confirmationOrder .wp100 {
}
.confirmationOrder .wp100 {
width: 100%;
}
.confirmationOrderTable {
}
.confirmationOrderTable {
width: 800px;
border: 1px solid #000;
}
.confirmationOrderTable tr td {
}
.confirmationOrderTable tr td {
background: #fff;
font-size: 14px;
padding: 3px 10px;
border-bottom: 1px solid #000;
border-right: 1px solid #000;
}
.confirmationOrderTable tr:last-child td {
}
.confirmationOrderTable tr:last-child td {
border-bottom: none;
}
.confirmationOrderTable tr td:last-child {
}
.confirmationOrderTable tr td:last-child {
border-right: none;
}
.confirmationOrder input {
}
.confirmationOrder input {
display: inline-block;
border: none;
outline: none;
......@@ -576,12 +558,15 @@ export default {
color: #333;
font-family: "宋体";
letter-spacing: 1px;
}
.accountList input {
}
.accountList input {
border-bottom: 1px solid #dcdfe6;
}
.__input {
}
.__input {
display: inline-block;
min-width: 60px;
}
}
</style>
src/components/confirmationOrderDownLoad - 副本.vue
View file @ 556ef1ae
......@@ -13,8 +13,6 @@
<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;"
: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" />
<div id="pdfNode">
<div id='pdfDom' style="padding:0 20px;">
......
src/components/confirmationOrderDownLoad.vue
View file @ 556ef1ae
......@@ -642,8 +642,6 @@
import threeday from './commonPage/threeday'
import fourday from './commonPage/fourday'
import fiveday from './commonPage/fiveday'
// import saveAs from 'file-saver'
// import '../utils/jqueryWordexport.js'
import {
setTimeout
} 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