Skip to content

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

'修改销售@'

parent 08ce9b15
Expand all 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/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