Skip to content

S
SuperMan
Commit a98cda86 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

'修改销售@'

parent 08ce9b15
Hide whitespace changes
Inline Side-by-side
Showing with 411 additions and 130 deletions
src/assets/css/cssReset.css
View file @ a98cda86
......@@ -14,7 +14,9 @@ time, mark, audio, video {
outline:0;
box-sizing: border-box;
}
.el-message{
z-index: 20200128 !important;
}
p,td,div{
word-break:break-all;
}
......
src/components/FinancialModule/BasicDocuments.vue
View file @ a98cda86
......@@ -459,7 +459,7 @@
<li v-for="(img,imgI) in son.Image">
<img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(img)">
<div class="_see_img" @click="showImg(img,2)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
......@@ -811,7 +811,7 @@
<li v-for="(img,imgI) in son.Image">
<img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(img)">
<div class="_see_img" @click="showImg(img,2)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
......@@ -841,7 +841,7 @@
<li v-for="(img,imgI) in son.Image">
<img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(img)">
<div class="_see_img" @click="showImg(img,2)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
......@@ -1443,8 +1443,21 @@ export default {
inited (viewer){
this.$viewer = viewer
},
showImg(obj){
this.$viewer.view(this.images.indexOf(obj))
showImg(obj, type){
if (type) {
let isExsit=false
this.images.forEach(x=>{
if(x==obj)
isExsit=true
})
if(!isExsit) {
this.images.push(obj)
} else {
this.$viewer.view(this.images.indexOf(obj))
}
} else {
this.$viewer.view(this.images.indexOf(obj))
}
this.$viewer.show()
},
Financial_post_GetDetail(id,t){ //获取单据详情
......
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ a98cda86
......@@ -324,13 +324,16 @@
.changLogList_l{border-left: 1px solid #E9E9E9;position: relative;padding-bottom: 10px;padding-left: 20px;padding-top: 10px;}
._radius_green{background-color: #47BF8C;width: 7px;height: 7px;border-radius: 50%;display: inline-block;position: absolute;left: -4px;top: 19px;}
.changLog_time{color: #666666;font-size: 12px;display: inline-block;padding-right: 10px}
.color_shz{color: #1273BC}
.color_tg{color: #4BCA81}
.color_bh{color: #c94052}
</style>
<template>
<div class="page_fdd" v-if="GetDetail">
<div class="_none_print">
<span class="_Printing" @click="goPrintPage(GetDetail.Type,GetDetail.FrID,GetDetail.Is_Merge,OrderSource)">打印单据</span>
<p class="_tit">{{GetDetail.FinanceName}}</p>
<p class="_tit">{{GetDetail.FinanceName}} <span :class="{color_shz:(GetDetail.StatusStr!=='通过' && GetDetail.StatusStr!=='驳回' && GetDetail.StatusStr!=='作废'),color_tg:GetDetail.StatusStr==='通过',color_bh:GetDetail.StatusStr==='驳回'}">{{GetDetail.StatusStr}}</span></p>
<div class="_conten">
<my-Bill v-if="GetDetail.Type!==1" :isPrintPage="false" :ID="GetDetail.FrID" :width="widthSon" :color="colorSon"></my-Bill>
<my-RVB-Bill v-else-if="GetDetail.Type===1" :ID="GetDetail.FrID" :isPrintPage="false" :width="widthSon" :color="colorSon"></my-RVB-Bill>
......@@ -589,7 +592,7 @@
<li v-for="(img,imgI) in son.Image">
<img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(img)">
<div class="_see_img" @click="showImg(img,2)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
......@@ -620,7 +623,7 @@
<li v-for="(img,imgI) in son.Image">
<img v-if="!img" src="../../assets/img/Travelslider.png" alt="">
<img v-else :src="img" alt="">
<div class="_see_img" @click="showImg(img)">
<div class="_see_img" @click="showImg(img,2)">
<i class="iconfont icon-sousuo"></i>
</div>
</li>
......@@ -1081,8 +1084,21 @@ export default {
this.uploadImgList.push(obj)
}
},
showImg(obj){
this.$viewer.view(this.images.indexOf(obj))
showImg(obj, type){
if (type) {
let isExsit=false
this.images.forEach(x=>{
if(x==obj)
isExsit=true
})
if(!isExsit) {
this.images.push(obj)
} else {
this.$viewer.view(this.images.indexOf(obj))
}
} else {
this.$viewer.view(this.images.indexOf(obj))
}
this.$viewer.show()
// this.picObj= obj;
// this.picIsShow= true;
......
src/components/SalesModule/enrollTotal.vue
View file @ a98cda86
......@@ -78,14 +78,13 @@
<el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-baomingrenshu groupTourOrder_count_green"></i>
<span>总报名人数</span>
<span>{{countData.TotalGuestNum}}</span>
<i class="iconfont icon-qian groupTourOrder_count_green"></i>
<span>销售额统计</span>
</div>
<p>
<span>经济舱：{{countData.TotalYSeatNum}};</span>
<span>商务舱：{{countData.TotalESeatNum}};</span>
<span>头等舱：{{countData.TotalFSeatNum}};</span>
<span>应收款：{{countData.PreferPrice}};</span>
<span>已收款：{{countData.Income}};</span>
<span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">未收款：{{countData.DueinMoney}};</span>
</p>
</div>
</el-col>
......@@ -149,19 +148,19 @@
<div style="clear: both; width: 100%;height: 20px;"></div>
<table class="enrollTotalSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="120">单号&团号</th>
<th width="130">单号&团号</th>
<th width="60">客户信息</th>
<th width="70">类型</th>
<th width="180">系列&线路</th>
<th width="190">日期</th>
<th width="50">人数</th>
<th width="180">系列&线路</th>
<th width="100">人数/机位数</th>
<th width="80">单价</th>
<th width="80">成交单价</th>
<th width="80">应收总额</th>
<th width="80">实收</th>
<th width="80">退款</th>
<th width="80">平台税金</th>
<th width="60">状态</th>
<th width="60">客户信息</th>
<th width="80">待收金额</th>
<th width="60">状态</th>
<th v-if="userId==1" width="140">操作</th>
</tr>
<tr>
......@@ -175,6 +174,11 @@
@click="goUrlX('产品查询', 'productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.createBy}}<span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span></p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
</td>
<td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
<p>{{item.contactMobile}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
......@@ -186,10 +190,7 @@
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
</td>
<td>
<p>下单：{{item.createDate}}</p>
</td>
<td>
{{item.guestNum}}
{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
<td style="color:#FF9C00">￥{{item.unit_Price}}</td>
......@@ -202,11 +203,8 @@
</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td>
<p class="over_ellipsis" style="width: 150px;" :title="item.contactName">{{item.contactName}}</p>
<p>{{item.contactMobile}}</p>
</td>
<td v-if="userId==1">
<button class="normalBtn" style="margin-left:0;width:95px;padding:0" @click="getSalerInfo(item)">修改业务员</button>
</td>
......@@ -563,6 +561,9 @@
</script>
<style>
.color_red_order{
color: #e95252 !important;
}
.enrollTotalSearch {
width: 100%;
min-height: auto;
......@@ -612,10 +613,11 @@
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
border-collapse: collapse;
}
.enrollTotalSearchTable tr {
border-bottom: 2px solid #333;
/* border-bottom: 2px solid #333; */
}
.enrollTotalSearchTable tr th {
......@@ -632,7 +634,12 @@
background: #fff;
text-align: left;
}
.enrollTotalSearchTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
.enrollTotalSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333;
}
.enrollTotalSearchTable tr td {
height: 80px;
padding: 10px;
......
src/components/SalesModule/groupTourOrder.vue
View file @ a98cda86
<style>
@import "../../assets/css/newTravelManager.css";
.color_red_order{
color: #e95252 !important;
}
.groupTourOrderSearch {
width: 100%;
min-height: auto;
......@@ -37,9 +40,16 @@
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
border-collapse: collapse;
}
.groupTourOrderSearchTable tr {
.groupTourOrderSearchTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
.groupTourOrderSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333;
}
.groupTourOrderSearchTable tbody{
}
.groupTourOrderSearchTable tr th {
background: #e6e6e6;
......@@ -1112,16 +1122,15 @@
<el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
<div>
<i class="iconfont icon-baomingrenshu groupTourOrder_count_green"></i>
<span>总报名人数</span>
<span>{{countData.TotalGuestNum}}</span>
</div>
<p>
<span>经济舱：{{countData.TotalYSeatNum}};</span>
<span>商务舱：{{countData.TotalESeatNum}};</span>
<span>头等舱：{{countData.TotalFSeatNum}};</span>
</p>
</div>
<i class="iconfont icon-qian groupTourOrder_count_green"></i>
<span>销售额统计</span>
</div>
<p>
<span>应收款：{{countData.PreferPrice}};</span>
<span>已收款：{{countData.Income}};</span>
<span :class="{color_red_order:countData.DueinMoney!==countData.PreferPrice}">未收款：{{countData.DueinMoney}};</span>
</p>
</div>
</el-col>
<el-col :span="5" class="groupTourOrder_count_col">
<div class="groupTourOrder_count_item">
......@@ -1184,9 +1193,9 @@
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="120">单号&团号</th>
<th width="120">客户信息</th>
<th width="70">类型</th>
<th width="150">系列&线路</th>
<th width="200">日期</th>
<th width="60">人数</th>
<th width="80">单价</th>
<th width="80">成交单价</th>
......@@ -1194,8 +1203,8 @@
<th width="80">实收</th>
<th width="80">退款</th>
<th width="80">平台税金</th>
<th width="80">待收金额</th>
<th width="80">状态</th>
<th width="120">客户信息</th>
<th width="120">确认函</th>
<th width="200">操作</th>
</tr>
......@@ -1208,7 +1217,12 @@
<p class="fbold over_ellipsis" style="width: 100%;cursor:pointer;" :title="item.orderId" @click="goUrlX('团报名清单','groupTourOrderByTuan',item.tcid,item.tcnum)">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;text-decoration:underline;cursor:pointer;" :title="item.alName" @click="goUrlX('产品查询','productQuery',item.tcid,item.tcnum)">{{item.tcnum}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName}}</p>
<p style="min-width: 180px;">发团：{{item.startDate}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p class="fz12">{{item.contactMobile}}</p>
</td>
<td>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.orderTypeName}}</p>
</td>
......@@ -1218,10 +1232,6 @@
</p>
<p style="max-width: 160px;display: block;" class="over_ellipsis" :title="item.ltName">{{item.ltName}}</p>
</td>
<td class="fz12">
<p style="min-width: 180px;">发团：{{item.startDate}}</p>
<p style="min-width: 180px;">下单：{{item.createDate}}</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click" >
<div class="personNolayer">
......@@ -1252,9 +1262,9 @@
</tr>
</table>
</div>
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}</span>
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td style="color:#FF9C00">{{item.tC_Price}}</td>
......@@ -1289,11 +1299,8 @@
</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td>
<p class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p class="fz12">{{item.contactMobile}}</p>
</td>
<td width="120">
<!--{{item.confirmFileList}}-->
<!--<span>确认函</span>-->
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ a98cda86
<style>
@import "../../assets/css/newTravelManager.css";
.color_red_order{
color: #e95252 !important;
}
.groupTourOrderSearch {
width: 100%;
min-height: auto;
......@@ -35,8 +38,15 @@
color: #333;
border-bottom: 1px solid #cccccc;
border-right: 1px solid #cccccc;
border-collapse: collapse;
}
.groupTourOrderSearchTable tr {
/* border-bottom: 2px solid #333; */
}
.groupTourOrderSearchTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
.groupTourOrderSearchTable tr:first-child td:first-child {
border-bottom: 2px solid #333;
}
.groupTourOrderSearchTable tr th {
......@@ -611,7 +621,7 @@
</style>
<template>
<div class="flexOne">
<div class="flexOne" v-loading='loading'>
<!-- 修改信息 -->
<div class="planeTicketEdit ownScrollbarStyle" v-show="isShowLayer2" >
<p>修改
......@@ -1320,10 +1330,10 @@
<span class="fr" v-if="remarksMsg.isOrder==1" style="margin-right:0px;">
<input type="button" class="hollowFixedBtn" value="取消" @click="cancelSubmitRemarks()"/>
<input type="button" class="normalBtn" value="保存" @click="submitFormRematks('remarksMsg')"/>
</span>
</span>
<span class="fr" v-else style="color:red;">
OP已禁止修改订单信息，请联系OP修改备注。
</span>
</span>
</p>
<el-form :model="remarksMsg" ref="remarksMsg" label-position="right" :rules="RemarksRules" label-width="80px">
<el-row :gutter="20">
......@@ -1363,26 +1373,26 @@
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle">
<!-- 表格 -->
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<table class="groupTourOrderSearchTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="120">单号</th>
<th width="160">日期</th>
<th width="60">人数</th>
<th width="150">单号</th>
<th width="100">业务员</th>
<th width="100">客户信息</th>
<th width="100">人数/机位数</th>
<th width="80">单价</th>
<th width="80">成交单价</th>
<th width="80">应收总额</th>
<th width="80">实收</th>
<th width="80">退款</th>
<th width="80">平台税金</th>
<th width="80">待收金额</th>
<th width="60">状态</th>
<th width="80">候补</th>
<th width="100">客户信息</th>
<th width="100">业务员</th>
<th width="100">确认函</th>
<th width="200">操作</th>
</tr>
</tr>
<tr>
<td v-show="list.length==0" colspan="13" align="center">暂无数据</td>
<td v-show="list.length==0" colspan="15" align="center">暂无数据</td>
</tr>
<template v-for="op in list">
<tbody>
......@@ -1396,9 +1406,17 @@
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
</td>
<td class="fz12">
<p>下单：{{item.createDate}}</p>
<td>
<img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/>
<img v-if='item.createPhoto' :onerror="defaultImg" :src='item.createPhoto'/>
{{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
</td>
<td>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12">{{item.contactMobile}}</p>
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click" >
......@@ -1430,9 +1448,9 @@
</tr>
</table>
</div>
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}</span>
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td style="color:#FF9C00">
......@@ -1476,6 +1494,7 @@
</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td><span :class="{color_red_order:item.dueInMoney!==item.preferPrice}">{{item.dueInMoney}}</span></td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td class="fz12">
<div v-if="item.orderState===3">
......@@ -1484,16 +1503,6 @@
<span v-if="item.waitFNum>0" style="margin: 0 5px 0 0;">{{item.waitFNum}}(F)</span>
</div>
</td>
<td>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12">{{item.contactMobile}}</p>
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
</td>
<td>
<img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/>
<img v-if='item.createPhoto' :onerror="defaultImg" :src='item.createPhoto'/>
{{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
</td>
<td>
<span v-if='item.confirmFileList.length>0' class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
确认函下载
......@@ -1553,7 +1562,7 @@
<div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div>
<span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>历史备注</div>
......@@ -1568,7 +1577,7 @@
</div>
</div>
</td>
<td colspan="6" class="groupTourOrder_tickets" style="height: 40px;">
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div>
<div>收款单据：</div>
<div>
......@@ -1624,6 +1633,217 @@
</td>
</tr>
</tbody>
<tr v-if="cancelRtData!=null && cancelRtData.length>0">
<td colspan="15">
<span class="RL-redType" @click="isShowCancelOrder=!isShowCancelOrder" style="cursor:pointer" title="点击查看">取消订单（<span
style="color:blue;">{{!isShowCancelOrder?"展开":"收起"}}</span>）</span>
</td>
</tr>
<tbody v-if="isShowCancelOrder" v-for="(item,index) in cancelRtData" :key="index+1000">
<tr>
<td rowspan="2" style="position:relative;">
<p v-if="item.isUnionOrder==1" class="GO_union">联</p>
<p class="fbold over_ellipsis" style="width: 100%;" :title="item.orderId">{{item.orderId}}</p>
<p class="fz12 over_ellipsis" style="width: 100%;">{{item.commissionSPeopleName=='无'?'':item.commissionSPeopleName}}</p>
<p>发团：{{item.startDate}}</p>
</td>
<td>
<img v-if='!item.createPhoto' src="../../assets/img/litheader.png"/>
<img v-if='item.createPhoto' :onerror="defaultImg" :src='item.createPhoto'/>
{{item.createBy}}<br/><span v-if="item.leaveStr!=''" style="color:red">({{item.leaveStr}})</span>
</td>
<td>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12 over_ellipsis" style="width: 120px;" :title="item.contactName">{{item.contactName}}</p>
<p v-if='item.isOwn==1||userId==1||userId==5||positionId==168' class="fz12">{{item.contactMobile}}</p>
<p v-if='item.isOwn==2&&userId!=1&&userId!=5&&positionId!=168'>*****</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click" >
<div class="personNolayer">
<p>
<span>成人：{{item.manNum}}人</span>
<span>儿童：{{item.chirdNum}}人</span>
<span>老人：{{item.oldPeopleNum}}人</span>
<span>婴儿：{{item.babyNum}}人</span>
<span>单地接：{{item.airticketNum}}人</span>
</p>
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>姓名</th>
<th>护照</th>
<th>性别</th>
<th>年龄</th>
<th width="110">联系电话</th>
</tr>
<tr v-if='memberList.length>0' v-for="(item2,index2) in memberList" :key="index2">
<td>{{item2.userName}}</td>
<td>{{item2.passportNo}}</td>
<td>{{item2.sexStr}}</td>
<td>{{item2.age}}</td>
<td>{{item2.mobilePhone}}</td>
</tr>
<tr v-if='memberList.length==0'>
<td colspan="5" align="center">暂无数据</td>
</tr>
</table>
</div>
<span v-if='item.guestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
<span v-if='item.guestNumStatus==3' style="color:#666;" class="personNo" slot="reference" @click="getMembersDetail(item)">{{item.guestNum}}/{{item.ySeatNum>0? item.ySeatNum+'Y ':''}}{{item.eSeatNum>0? item.eSeatNum+'E ':''}}{{item.fSeatNum>0? item.fSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.tC_Price}}</span>
<span v-else>*****</span>
</td>
<td style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.unit_Price}}</span>
<span v-else>*****</span>
</td>
<td>
<p style="color:#FF9C00">
<span v-if="item.isOwn==1||userId==1||userId==5||positionId==168">{{item.preferPrice}}</span>
<span v-else>*****</span>
</p>
</td>
<td>
<el-popover style='padding: 0;' width="370" trigger="click">
<div class="personNolayer">
<table border="0" cellspacing="1" cellpadding="1">
<tr>
<th>单据号</th>
<th>金额</th>
<th>类型</th>
<th>状态</th>
</tr>
<tr v-if='orderList.length>0' v-for="(item2,index2) in orderList" :key="index2">
<td>{{item2.FrID}}</td>
<td>{{item2.PayMoney}}</td>
<td>{{item2.TypeName}}</td>
<td>{{item2.StatusName}}</td>
</tr>
<tr v-if='orderList.length==0' >
<td colspan="4" align="center">暂无数据</td>
</tr>
</table>
</div>
<span v-if='item.isEnd==0' style="cursor: pointer;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
<span v-if='item.isEnd!=0' style="cursor: pointer;color: #e95252;" @click="getOrderDetail(item)" slot="reference">{{item.income}}</span>
</el-popover>
</td>
<td>{{item.refund}}</td>
<td>{{item.platformTax}}</td>
<td>{{item.DueInMoney}}</td>
<td class="fz12" :style="item.orderState===3?'color: #e95252;':''">{{item.statsstr}}</td>
<td class="fz12">
<div v-if="item.orderState===3">
<span v-if="item.waitYNum>0" style="margin: 0 5px 0 0;">{{item.waitYNum}}(Y)</span>
<span v-if="item.waitENum>0" style="margin: 0 5px 0 0;">{{item.waitENum}}(E)</span>
<span v-if="item.waitFNum>0" style="margin: 0 5px 0 0;">{{item.waitFNum}}(F)</span>
</div>
</td>
<td>
<span v-if='item.confirmFileList.length>0' class="fz12 dowloadSpan" @click="downLoadFile(item.confirmFileList)">
确认函下载
</span>
<i v-if='item.confirmFileList.length>0&&item.commissionSharePeople !== userId' @click="deleteFile(item)" style="margin-left: 5px;" class="el-icon-error color999"></i>
<el-upload v-if='(item.confirmFileList.length==0&&item.isOwn==1)||userId==1||userId==5' :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" aciton=''>
<el-button size="small" type="danger" @click='getItem(item)'>上传</el-button>
</el-upload>
</td>
<td class="groupTourOrderIcon">
<el-button-group v-if='item.isOwn==1 || userId==1||userId==5'>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button v-if="(userId==1||userId==5) || ( item.isOwn==1 &&item.isOrder=='1'&&item.isHaveFinance!='1'&&item.orderState!='1'&&item.orderState!='4')" type="primary" style='background:#00C6FF; border-color:#00C6FF' icon="iconfont icon-bianji-smal" @click='getDetail(item)'></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="修改备注" placement="top-start">
<el-button v-if="(userId==1||userId==5)|| ( item.isOwn==1 ||item.isHaveFinance=='1'||item.orderState=='1')" type="primary" style='background:#a55eea; border-color:#a55eea' icon="iconfont icon-beizhu" @click='getRemarks(item)'></el-button>
</el-tooltip>
<el-tooltip effect="dark" content="日志" placement="top-start" style="float:left">
<el-popover width='230' trigger="click">
<div class="priceContentDiv">
<div class="AuditLog">日志</div>
<div class="logContact" style="background:#f9f9f9; padding:20px 10px 0;">
<div v-if='logList.length>0' v-for="(item,index) in logList" :key="index">
<div class="clearfix" >
<div class="Auditcircle" style="left: 6px!important;"></div>
<div class="operateName" style="color:#005CAA;">{{item.emName}}</div>
<div class="operateDate fz12 color666">{{item.x}}</div>
</div>
<div class="fz12 color333">{{item.logInfo}}</div>
</div>
<div v-if='logList.length==0' >暂无数据</div>
</div>
</div>
<el-button slot="reference" @click='getLogDetail(item)' type="primary" style='background:#47BF8C; border-color:#47BF8C;border-top-right-radius: 0;border-bottom-right-radius: 0;' icon="iconfont icon-rizhi1"></el-button>
</el-popover>
</el-tooltip>
<el-tooltip effect="dark" content="更多" placement="top-start" style="float:left">
<el-popover width='100' trigger="hover">
<div class="groupTourOrder_more">
<div @click="goUrlT('confirmationOrder',item.orderId)">确认函</div>
<div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
<div v-if="item.isGuestOk=='1'&&item.outNotice==1" @click="toTrip(item)">出团通知书<span v-if="item.outNotice==1">(OK)</span><span v-else>(暂定)</span></div>
<div v-if="item.orderState!='4'" @click="goUrlP('旅客名单','passengerSaleList',item)">旅客名单</div>
<div v-if="item.isOrder=='1'&&item.isHaveFinance=='1'||item.orderState=='1'" @click='getHouse(item)'>修改房型</div>
<div v-if="item.isOrder=='1'&&item.orderState!='4'" @click="transfer(item)">订单转团</div>
<div v-if="item.isOrder=='1'&&(item.orderState=='1'||item.orderState=='2'||item.orderState=='3')" @click='deleteItem(item)'>取消</div>
</div>
<el-button slot="reference" type="primary" style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;' icon="iconfont icon-more"></el-button>
</el-popover>
</el-tooltip>
</el-button-group>
<payurlItem v-if='item.isOwn==1' :item="item" :showID="showID" v-show="item.orderState!='4'&&item.orderState!='3'" v-on:childByValue="childByValue"></payurlItem>
</td>
</tr>
<tr>
<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;">
<div>
<div><span>备注：</span><p><span v-if='item.clientSource==1&&item.brandName!=""'>{{item.brandName}}订单 {{item.platformOrder}};</span>{{item.remarks}}</p></div>
<div>
<!-- <span>{{item.remarksName}}&ensp;{{item.rematksTime}}</span> -->
<el-popover width="600" placement="bottom-end" trigger="click">
<div class="groupTourOrder_remarks_popover">
<div>历史备注</div>
<p v-if="item.remarksList.length !== 0" v-for="(item2, index2) in item.remarksList" :key="index2">
<span>{{item2.remarks}}</span>
<span>{{item2.createByName}} <span style="color: #666666;">{{item2.createDate}}</span></span>
</p>
<span v-if="item.remarksList.length === 0">暂无数据</span>
</div>
<el-button slot="reference" icon="iconfont icon-gengduo" style="padding:0px;border:none;background-color:transparent;" class="groupTourOrder_remarks_btn"></el-button>
</el-popover>
</div>
</div>
</td>
<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
<div>
<div>收款单据：</div>
<div>
<span v-for="(item2,index2) in item.financeList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
</span>
<span v-if="item.financeList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div>
<div>
<div>付款单据：</div>
<div>
<span v-for="(item2,index2) in item.refundFinanceList" :key="index2">
<span v-if="item2.colorState===1" class="groupTourOrder_tickets_blue" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===2" class="groupTourOrder_tickets_green" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===3" class="groupTourOrder_tickets_red" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
<span v-else-if="item2.colorState===4" class="groupTourOrder_tickets_black" @click="goUrl('财务单据','FinancialDocumentsDetail',item2.frID,'')">{{item2.frID}}</span>
</span>
<span v-if="item.refundFinanceList.length===0" style="cursor: default;">暂无数据</span>
</div>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<el-dialog custom-class='w450' title="行程下载" :visible.sync="travelControlTripLayerShow" center>
......@@ -1869,6 +2089,7 @@ export default {
pageSize: 1000,
TCID: this.$route.query.id
},
cancelRtData: [],
//返回数据
currentPage: 1,
total: 0,
......@@ -1889,6 +2110,7 @@ export default {
jyfsList: [],
ScenicRefundList: [],
ScenicRefundMoney: 0,
isShowCancelOrder: false,
tuanInfo: {},
seat: {
YSeat: 0,
......@@ -3156,6 +3378,7 @@ export default {
this.loading = false;
this.total = res.data.data.count;
this.list = res.data.data.pageData.rtData;
this.cancelRtData = res.data.data.pageData.cancelRtData[0].list;
this.seat.YSeat = res.data.data.pageData.ySeatNum
this.seat.CSeat = res.data.data.pageData.eSeatNum
this.seat.FSeat = res.data.data.pageData.fSeatNum
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ a98cda86
<style>
@import "../../../assets/css/newTravelManager.css";
.color_red_order{
color: #e95252 !important;
}
.groupTourOrderSearch {
width: 100%;
min-height: auto;
......@@ -52,7 +55,12 @@
text-indent: 15px;
border: 1px solid #cccccc;
}
.RegisTrationTable tbody tr:last-child {
border-bottom: 2px solid #333;
}
.RegisTrationTable tr:first-child td:first-child {
border-bottom: 2px solid #333;
}
.RegisTrationTable tr {
background: #fff;
text-align: left;
......@@ -1320,17 +1328,17 @@
<div style="width: 100%; height: auto; overflow-x: auto;" class="ownScrollbarStyle">
<table class="RegisTrationTable" border="0" cellspacing="0" cellpadding="0" v-loading='loading'>
<tr>
<th width="100">单号</th>
<th width="190">日期</th>
<th width="70">人数</th>
<th width="130">单号</th>
<th width="150">客户信息</th>
<th width="70">人数/机位数</th>
<th width="110">单价</th>
<th width="110">成交单价</th>
<th width="110">应收总额</th>
<th width="110">实收</th>
<th width="110">退款</th>
<th width="110">平台税金</th>
<th width="80">待收金额</th>
<th width="100">状态</th>
<th width="150">客户信息</th>
<th width="130">确认函</th>
<th width="150">操作</th>
</tr>
......@@ -1350,10 +1358,10 @@
</div>
<div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" style="color:red">({{item.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
<div> </div>
<p>发团：{{item.startDate}}</p>
</td>
<td class="fz12">
<p>下单：{{item.CreateDate}}</p>
<td>
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click">
......@@ -1384,9 +1392,9 @@
</tr>
</table>
</div>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}</span>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td>{{item.TC_Price}}</td>
......@@ -1423,10 +1431,8 @@
</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td><span :class="{color_red_order:item.DueInMoney!==item.PreferPrice}">{{item.DueInMoney}}</span></td>
<td class="fz12"><span :class="{'RL-redType':item.statsstr=='候补'}">{{item.statsstr}}</span></td>
<td>
<p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
</td>
<td>
</td>
<td class="RL-BTNlist" rowspan="2">
......@@ -1517,9 +1523,13 @@
</div>
<div class="RL_CreatInfo">{{childItem.CreateBy}}<span v-if="childItem.LeaveStr!=''" style="color:red">({{childItem.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{childItem.CommissionSPeopleName}}</div>
<p>发团：{{childItem.startDate}}</p>
</td>
<td class="fz12">
<p>下单：{{childItem.CreateDate}}</p>
<td>
<p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="childItem.ContactName">
{{childItem.ContactName}}</p>
<p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12">{{childItem.ContactMobile}}</p>
<p v-if="childItem.IsOwn==2&&userId!=1&&userId!=5">*****</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click">
......@@ -1550,9 +1560,9 @@
</tr>
</table>
</div>
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{childItem.GuestNum}}</span>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{childItem.GuestNum}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{childItem.GuestNum}}</span>
<span v-if='childItem.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
<span v-if='childItem.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{childItem.GuestNum}}/{{childItem.YSeatNum>0? childItem.YSeatNum+'Y ':''}}{{childItem.ESeatNum>0? childItem.ESeatNum+'E ':''}}{{childItem.FSeatNum>0? childItem.FSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td>{{childItem.TC_Price}}</td>
......@@ -1589,15 +1599,9 @@
</td>
<td>{{childItem.Refund}}</td>
<td>{{childItem.PlatformTax}}</td>
<td><span :class="{color_red_order:childItem.DueInMoney!==childItem.PreferPrice}">{{childItem.DueInMoney}}</span></td>
<td class="fz12"><span :class="{'RL-redType':childItem.statsstr=='候补'}">{{childItem.statsstr}}</span></td>
<td>
<p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="childItem.ContactName">
{{childItem.ContactName}}</p>
<p v-if="childItem.IsOwn==1||userId==1||userId==5" class="fz12">{{childItem.ContactMobile}}</p>
<p v-if="childItem.IsOwn==2&&userId!=1&&userId!=5">*****</p>
</td>
<td>
<div @click="goOpenUrl('confirmationOrder',childItem.OrderId)" style="cursor:pointer;">电子确认函</div>
<span v-if='childItem.ConfirmFileList.length>0' @click="downLoadFile(childItem.ConfirmFileList)">确认函下载</span>
</td>
......@@ -1727,9 +1731,12 @@
</div>
<div class="RL_CreatInfo">{{item.CreateBy}}<span v-if="item.LeaveStr!=''" style="color:red">({{item.LeaveStr}})</span></div>
<div class="RL_CreatInfo">关联销售：{{item.CommissionSPeopleName}}</div>
<p>发团：{{item.StartDate}}</p>
</td>
<td class="fz12">
<p>下单：{{item.CreateDate}}</p>
<td>
<p v-if="item.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="item.ContactName">{{item.ContactName}}</p>
<p v-if="item.IsOwn==1||userId==1||userId==5" class="fz12">{{item.ContactMobile}}</p>
<p v-if="item.IsOwn==2&&userId!=1&&userId!=5">*****</p>
</td>
<td>
<el-popover style='padding: 0;' width="470" trigger="click">
......@@ -1760,9 +1767,9 @@
</tr>
</table>
</div>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}</span>
<span v-if='item.GuestNumStatus==1' style="color:#1AA86B;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==2' style="color:#E95252;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
<span v-if='item.GuestNumStatus==3' style="color:#666;" class="personNo" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
</el-popover>
</td>
<td>{{item.TC_Price}}</td>
......@@ -1799,16 +1806,12 @@
</td>
<td>{{item.Refund}}</td>
<td>{{item.PlatformTax}}</td>
<td><span :class="{color_red_order:item.DueInMoney!==item.PreferPrice}">{{item.DueInMoney}}</span></td>
<td class="fz12">
<span class="RL-redType">{{item.statsstr}}</span>
<br />
<span class="RL-redType" v-if="item.OrderCancelDate!=''">{{item.OrderCancelDate}}</span>
</td>
<td>
<p v-if="item.IsOwn==1||userId==1||userId==5" class="fz12 over_ellipsis" style="width:90%;" :title="item.ContactName">{{item.ContactName}}</p>
<p v-if="item.IsOwn==1||userId==1||userId==5" class="fz12">{{item.ContactMobile}}</p>
<p v-if="item.IsOwn==2&&userId!=1&&userId!=5">*****</p>
</td>
<td>
<div @click="goOpenUrl('confirmationOrder',item.orderId)" style="cursor:pointer;">电子确认函</div>
<span v-if='item.ConfirmFileList.length>0' @click="downLoadFile(item.ConfirmFileList)">确认函下载</span>
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ a98cda86
......@@ -240,8 +240,8 @@
</tr>
<tr v-for="item in DataList.FinicePayList" :key="item.subCode">
<td>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
<el-checkbox v-model="item.checked"></el-checkbox>
<span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
</td>
<td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
<td>
......@@ -343,6 +343,7 @@ export default {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
this.zhuanLoading = false
} else {
this.$message.error(res.data.message);
}
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ a98cda86
......@@ -31,6 +31,10 @@
.TC_firTable td{height:20px!important;text-align: center!important;}
.TC_midTable td{text-align: center!important;}
.TC_showUnion{float:right;color:#2aaef2;cursor: pointer;margin-bottom:10px;}
.go_date{
font-weight: 700;
font-size: 14px;
}
</style>
<template>
<div>
......@@ -361,7 +365,7 @@
</p>
<p class="travelnowrap">
<span>出发时间</span>
{{item.StartDate}}
<span class="go_date">{{item.StartDate}}</span>
</p>
<p class="travelnowrap">
<span>出团通知书</span>
......
src/components/index.vue
View file @ a98cda86
......@@ -12,7 +12,7 @@
<div class="hoverNote"></div>
<!--<div :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? ((item.ChildMenu.length*160) + 'px') : '0',left: item.ChildMenu.length>1 ? '-50%' : '0'}" @click.stop>-->
<div :class="{menuList_son:item.ChildMenu.length>=1}" :style="{width:item.ChildMenu.length>=1 ? '1300px' : '0',left:'50px'}" @click.stop>
<div class="menuList_son_item">
<div class="menuList_son_item" @mousemove.stop @mouseout.stop>
<div v-for="(son, sIndex) in item.ChildMenu" style="width: 150px;margin-right: 20px">
<p class="menuList_son_one_tittle">{{son.MenuName}}</p>
<div v-for="(grand, gIndex) in son.NewChildMenu" class="menuList_tittle_box">
......@@ -3465,6 +3465,7 @@ export default {
width: 100%;
margin: 0 auto;
height: 100%;
z-index: 2019128;
}
.nav-middle ul li {
.size(100px, 100%);
......@@ -3475,7 +3476,7 @@ export default {
position: relative;
padding: 12px 0;
float: left;
z-index: 10;
z-index: 2019128;
}
.nav-middle ul li i {
font-size: 16px;
......@@ -3486,20 +3487,24 @@ export default {
margin: 32px 0 14px;
}
.nav-middle ul li:hover .menuList_son{
display: block;
// display: block;
width: 1000px;
z-index: 99999;
z-index: 999999;
opacity: 1;
padding: 20px 0 20px 20px;
height: auto;
// transition: all .5s linear .5s;
}
.nav-middle ul li .menuList_son{
position: fixed;
z-index: 9000;
background-color: #363c4a;
top: 50px;
display: none;
// display: none;
opacity: 0;
transition: all linear .3s;
padding: 20px 0 20px 20px;
padding: 0;
overflow: hidden;
height: 0;
}
.menuList_tittle_box{
line-height: 30px;
......
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