Commit 7d9f2867 authored by 黄媛媛's avatar 黄媛媛
parents 211877bc fc702b66
...@@ -118,10 +118,10 @@ ...@@ -118,10 +118,10 @@
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
font-size: 12px; font-size: 12px;
} }
._fujian_box{ .FinancialDocumentsDetail ._fujian_box{
position: fixed; position: absolute;
left: 961px; left: 895px;
top: 141px; top: -0;
width: 440px; width: 440px;
} }
._wenjian{ ._wenjian{
...@@ -262,8 +262,10 @@ ...@@ -262,8 +262,10 @@
text-decoration: underline; text-decoration: underline;
color: rgb(255, 0, 0); color: rgb(255, 0, 0);
} }
._addUpload_box_btm{ .FinancialDocumentsDetail ._addUpload_box_btm{
padding-top: 20px; padding-top: 20px;
max-height: 230px;
overflow: auto;
} }
._addUpload_box_btm img{ ._addUpload_box_btm img{
width: 100%; width: 100%;
...@@ -373,7 +375,7 @@ ...@@ -373,7 +375,7 @@
</style> </style>
<template> <template>
<div class="page_fdd" v-if="GetDetail"> <div class="page_fdd FinancialDocumentsDetail" v-if="GetDetail">
<div class="_none_print"> <div class="_none_print">
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span> <span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
<span v-if="GetDetail.TemplateId==48 || GetDetail.TemplateId==43" class="Note_span" @click="goUrl('DebitNote',GetDetail.FrID)">借支单下载</span> <span v-if="GetDetail.TemplateId==48 || GetDetail.TemplateId==43" class="Note_span" @click="goUrl('DebitNote',GetDetail.FrID)">借支单下载</span>
......
...@@ -1483,7 +1483,7 @@ export default { ...@@ -1483,7 +1483,7 @@ export default {
created(){ created(){
var that=this; var that=this;
this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null; this.orderObj = this.$route.query.orderObj?JSON.parse(this.$route.query.orderObj):null;
this.isFrompassenger = this.orderObj.isFromPassenger; this.isFrompassenger = this.orderObj ? this.orderObj.isFromPassenger : undefined;
if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){ if(this.orderObj!=null&&this.orderObj.OrderSource===10&&this.isFrompassenger==undefined){
that.Description="旅客名单:"; that.Description="旅客名单:";
......
This diff is collapsed.
...@@ -448,7 +448,6 @@ ...@@ -448,7 +448,6 @@
"-" + "-" +
myDate.getDate(); myDate.getDate();
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
//this.msg.StartDate = '2019-06-26'
this.getLineList(); this.getLineList();
this.getList(); this.getList();
}, },
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; "> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; ">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading="loading"> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading="loading">
<tr> <tr>
<th colspan="8">导游操作</th> <th colspan="6">导游操作</th>
<th colspan="8">地接OP</th> <th colspan="8">地接OP</th>
</tr> </tr>
<tr> <tr>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<th width="80">进店人数</th> <th width="80">进店人数</th>
<th width="100">总金额</th> <th width="100">总金额</th>
<th width="100">佣金领取状况</th> <th width="100">佣金领取状况</th>
<th width="120">凭证上传</th> <th width="120" style="display:none;">凭证上传</th>
<th width="100">领队佣金<br />应付</th> <th width="100">领队佣金<br />应付</th>
<th width="100">导游佣金<br />应付</th> <th width="100">导游佣金<br />应付</th>
<th width="100">公司佣金<br />应收</th> <th width="100">公司佣金<br />应收</th>
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<el-option label="公司领取" :value='2'></el-option> <el-option label="公司领取" :value='2'></el-option>
</el-select> </el-select>
</td> </td>
<td class="more_td" @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length"> <td class="more_td" @click="upIndex = outindex" v-if="subIndex==0" :rowspan="item.ShopDetailsList.length" style="display:none;">
<p v-for="(img, imgIndex) in item.ShopDetailsList[0].imgList" @click="downLoadPZ(img)" v-if="img !== ''" <p v-for="(img, imgIndex) in item.ShopDetailsList[0].imgList" @click="downLoadPZ(img)" v-if="img !== ''"
style="cursor: pointer;padding: 5px;" title="点击下载">{{ '凭证' + (imgIndex + 1)}} <span style="cursor: pointer;padding: 5px;" title="点击下载">{{ '凭证' + (imgIndex + 1)}} <span
style="text-align: right;color: red;" @click.stop="UploadType=1,deleteImg(outindex,imgIndex)">X</span> style="text-align: right;color: red;" @click.stop="UploadType=1,deleteImg(outindex,imgIndex)">X</span>
......
This diff is collapsed.
...@@ -3281,6 +3281,8 @@ export default { ...@@ -3281,6 +3281,8 @@ export default {
this.$router.push({ path: url ,query:{}}); this.$router.push({ path: url ,query:{}});
} }
}else{
window.open(url, "_blank");
} }
}, },
goUrlT(url, index, name) { goUrlT(url, index, name) {
......
...@@ -1694,6 +1694,7 @@ ...@@ -1694,6 +1694,7 @@
Diningdest.push({ Diningdest.push({
UseTimeStr: ai.UseTimeStr, UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID, DiningID: ai.DiningID,
id: ai.DiningID + ai.UseTimeStr,
data: [ai] data: [ai]
}); });
Diningmap[ai.UseTimeStr] = ai; Diningmap[ai.UseTimeStr] = ai;
...@@ -1712,6 +1713,7 @@ ...@@ -1712,6 +1713,7 @@
Diningdest.push({ Diningdest.push({
UseTimeStr: ai.UseTimeStr, UseTimeStr: ai.UseTimeStr,
DiningID: ai.DiningID, DiningID: ai.DiningID,
id: ai.DiningID + ai.UseTimeStr,
data: [ai] data: [ai]
}); });
} }
...@@ -1724,7 +1726,8 @@ ...@@ -1724,7 +1726,8 @@
} }
Diningdest[i].row = row Diningdest[i].row = row
} }
this.DiningDataList = this.unique(Diningdest, 'DiningID'); console.log(Diningdest)
this.DiningDataList = this.unique(Diningdest, 'id');
// this.DiningDataList = Diningdest // this.DiningDataList = Diningdest
//票 //票
let ScenicList = [] let ScenicList = []
......
...@@ -1891,6 +1891,20 @@ export default { ...@@ -1891,6 +1891,20 @@ export default {
meta: { meta: {
title: '散卖酒店订单统计' title: '散卖酒店订单统计'
}, },
}, {
path: '/freeTravelOrder', // 操作 自由行订单
name: 'freeTravelOrder',
component: resolve => require(['@/components/TravelManager/TravelList/freeTravelOrder'], resolve),
meta: {
title: '自由行订单统计'
},
}, {
path: '/freeTravelOrderDetails', // 操作 自由行订单 详情
name: 'freeTravelOrderDetails',
component: resolve => require(['@/components/TravelManager/TravelList/freeTravelOrderDetails'], resolve),
meta: {
title: '自由行订单详情'
},
}, { }, {
path: '/AmoebaDetail', //阿米巴结算详情 path: '/AmoebaDetail', //阿米巴结算详情
name: 'AmoebaDetail', name: 'AmoebaDetail',
......
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