Skip to content

S
SuperMan
Commit 154aea2b authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

解决冲突

parents 81216205 82659754
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 778 additions and 515 deletions
src/assets/common/lang/zh.js
View file @ 154aea2b
......@@ -740,6 +740,9 @@ export const active = {
cl_dkjezk: '抵扣金额/折扣',
cl_mdskeyong: '满多少可用',
cl_yxjzhiri: '有效截止日',
cl_sytiaojian: '使用条件',
cl_huoqufangshi: '获取方式',
cl_hqriqi: '获取日期',
cl_zuofei: '作废',
cl_syfanwei: '适用范围',
cl_tongyong: '通用',
......@@ -760,6 +763,8 @@ export const active = {
cl_zanwu: '暂无',
cl_qita: '其他',
cjjiangxiang: '抽奖奖项',
cl_man: '满',
cl_keyong: '可用',
}
export const fnc = {
......@@ -1018,6 +1023,7 @@ export const fnc = {
day: '日',
fyshuoming: '费用说明',
danjia: '单价',
cjdanjia: '成交单价',
jine: '金额',
yuanbi: '原币',
sfjine: '实付金额',
......@@ -1069,6 +1075,9 @@ export const fnc = {
yingfu: '应付',
shishou: '实收',
shifu: '实付',
youhui: '优惠',
xiaofei: '小费',
tuikuan: '退款',
zjdiaobo: '资金调拨',
tuanqi: '团期',
hkriqi: '汇款日期',
......@@ -1088,6 +1097,7 @@ export const fnc = {
shoukuan: '收款',
fukuan: '付款',
duixiang: '对象',
zhikuan: '支款',
dqzhuangtai: '当前状态',
gnjpqishu: '国内票务期数',
qzbianhao: '签证编号',
......@@ -1132,6 +1142,93 @@ export const fnc = {
xsfujian: '显示附件',
ycfujian: '隐藏附件',
ysjine: '应收金额',
guazhang: '挂账',
bmxuanze: '部门选择',
ryxuanze: '人员选择',
ctleixing: '参团类型',
bmriqi: '报名日期',
bmzrenshu: '总报名人数',
zcbmrenshu: '正常报名人数',
qxrenshu: '取消人数',
qtxtongji: '其他统计项',
nbbaoming: '内部报名',
B2BWAP: 'B2B/WAP网络报名',
cwdjshuoming: '财务单据说明',
yidadan: '已打单',
ptcnyshenhe: '平台出纳已审核',
yhcnyshenhe: '银行出纳已审核',
ytongguo: '已通过',
ysjine: '应收金额',
yishoujine: '已收金额',
tkjine: '退款金额',
ptshuijin: '平台税金',
ztjine: '在途金额',
wsjine: '未收金额',
khxinxi: '客户信息',
yszonge: '应收总额',
zaitu: '在途',
weishou: '未收',
sun: '损',
shousun: '收损',
dingdan: '订单',
lsbeizhu: '历史备注',
skdanju: '收款单据',
fkdanju: '付款单据',
w_ckmingcheng: '窗口名称',
w_ywrenyuan: '业务人员',
w_fzfangxiang: '负责方向',
w_djxinxi: '单据信息',
w_gong: '共',
w_chuangkou: '窗口',
w_shou: '收',
w_zhi: '支',
w_sqzhanghu: '授权账户',
w_ycldanju: '已处理单据',
w_dcldanju: '待处理单据',
w_zhbieming: '账户别名',
w_gsdgong: '公',
w_gsdsi: '私',
w_kscaozuo: '快速操作',
w_sygongzhang: '所有公账',
w_sysizhang: '所有私账',
w_sypingtai: '所有平台',
w_syzjinchi: '所有资金池',
w_syyhzhu: '所有银行账户',
w_syxjzhanghu: '所有现金账户',
a_xjzhanghu: '现金账户',
a_cnyshenhe: '出纳审核',
a_yshenhe: '已审核',
a_wshenhe: '未审核',
a_hkfkriqi: '汇款/付款日期',
a_hbdanju: '合并单据',
a_zhaiyao: '摘要',
a_hkrfkduixiang: '汇款人/付款对象',
a_hkfkshijian: '汇款时间/付款时间',
a_dhuanlv: '兑换率',
a_rminbi: '人民币',
a_qcyue: '期初余额',
a_fkshijian: '付款时间',
a_heji: '合计',
a_hbtips: '条合并为1条，外币总金额',
a_hbtips2: '，本位币总金额',
a_zongjine: '总金额',
a_qxzdanju: '请选择单据',
a_qxzjyriqi: '请选择交易日期！',
a_qxzjyfangshi: '请选择交易方式！',
a_yhzhanghu: '银行账户',
a_djztai: '单据状态',
a_shezhong: '审核中',
a_cnzancun: '出纳暂存',
a_ptzhanghu: '平台账户',
a_qsrjylshuihao: '请输入交易流水号',
a_zjczhanghu: '资金池账户',
a_xjrbaobiao: '现金日报表',
a_sqyue: '上期余额',
a_bqjffshenge: '本期借方发生额',
a_bqdffshenge: '本期贷方发生额',
a_bqyue: '本期余额',
a_jfbishu: '借方笔数',
a_dfbishu: '贷方笔数',
}
export const tips = {
tips: '提示',
......@@ -1190,7 +1287,11 @@ export const tips = {
qishu: '期数',
jiaoyifangshi: '交易方式',
zwtqxinxi: '暂无团期信息',
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！'
zuofeicaiwudan: '是否对申请单进行作废操作？作废后不可恢复！',
jsrqbndyksriqi: '结束日期不能大于开始日期',
hqsjshibai: '数据获取失败！',
accWorkTips: '注：指定银行卡收支方向的单据会自动分发到各个窗口，管理员在设定时应注意以下窗口是否涵盖了所有的业务，如果没有请及时设定，以免造成单据混乱',
qrscchuangkou: '确定删除窗口？',
}
export const Operation = {
Op_ShortName:'线路简称',
......@@ -1386,6 +1487,11 @@ export const rule = {
qtxhkshijian: '请选择汇款时间！',
qxzjylshuihao: '请选择交易流水号！',
qxzskzhanghao: '请选择收款账号！',
qtxckmingcheng: '请填写窗口名称',
qxzywuyuan: '请选择业务员',
qxzsyfangxiang: '请选择使用方向',
qsrjine: '请输入金额',
qsrzjine: '请输入总金额',
qxzrzshijian: '请选择入职时间!',
qsrzqdqq: '请输入正确的qq!',
......
src/components/Hotel/HotelProductManage2.vue
View file @ 154aea2b
......@@ -31,6 +31,9 @@
<div class="hotelProductManage2_calendar">
<div class="hotelProductManage2_calendarItem" v-for="(item, index) in days" :key="index">
<div class="calendarItem_month" @click="calendarShow(item, index)">{{item.date}}</div>
<div class="hotelproductCkbox">
<el-checkbox v-model="item.isCked" @change="changeHotelStatus(item,index)">全选</el-checkbox>
</div>
<div class="calendarItem_week">
<div>周一</div>
<div>周二</div>
......@@ -747,6 +750,8 @@
}
},
calendarDayOn: function (item, item2) {
console.log(item,'item');
console.log(item2,'item2');
if (item.date === item2.month) {
let dayIndex = this.msg2.DateList.indexOf(item2.day)
if (dayIndex === -1) {
......@@ -756,6 +761,7 @@
this.msg2.DateList.splice(dayIndex, 1)
}
}
console.log(this.msg2.DateList);
},
calendarDayOff: function (item) {
let dayIndex = this.msg2.DateList.indexOf(item)
......@@ -803,7 +809,8 @@
}
this.days[key] = {
date: month,
days: days
days: days,
isCked:false
}
this.getData(date, key)
},
......@@ -1003,6 +1010,26 @@
}
});
},
//增加全选
changeHotelStatus(item,index){
if(item.isCked){
item.days.forEach(x=>{
if(x.month==item.date){
if(this.msg2.DateList.indexOf(x.day)==-1){
this.msg2.DateList.push(x.day);
}
}
})
}else{
item.days.forEach(x=>{
this.msg2.DateList.forEach((y,index)=>{
if(x.day==y){
this.msg2.DateList.splice(index, 1)
}
})
})
}
}
},
created: function () {
this.hotelId = this.$route.query.id === undefined ? '0' : this.$route.query.id
......@@ -1027,7 +1054,12 @@
.hotelProductManage2 {
padding: 20px 0;
}
.hotelproductCkbox{
width:10%;
height:30px;
float:right;
margin:5px 20px 0 0;
}
.hotelProductManage2>.hotelProductManage2_btnList {
position: fixed;
top: 36px;
......@@ -1130,8 +1162,10 @@
}
.hotelProductManage2_calendarItem>.calendarItem_month {
width: 100%;
width: 50%;
height: 30px;
float:left;
margin-left:110px;
line-height: 30px;
text-align: center;
font-size: 14px;
......
src/components/Hotel/roomReservations.vue
View file @ 154aea2b
......@@ -31,7 +31,7 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsTalbe" v-loading='loading'>
<tr>
<th width="w50">序号</th>
<th width="w100">序号</th>
<th width="120">出发地</th>
<th width="120">航班时间</th>
<th width="80">公司团号</th>
......@@ -40,6 +40,7 @@
<th width="80">实际用房数</th>
<th></th>
<th v-for='item in thLengthTitle'>{{item}}</th>
<th></th>
<th>备注</th>
<th>操作</th>
</tr>
......@@ -50,8 +51,8 @@
<template v-for="(item,index) in outItem.StaticsReportList">
<tr>
<td :rowspan="2*outItem.StaticsReportList.length" v-if='index==0'>
<div style="max-width: 100px; min-width: 50px; ">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w100">{{outItem.NewCombinationNum}}</div>
<div style="max-width: 100px; min-width: 50px;margin:auto;">{{outindex+1}}</div>
<div v-if='outItem.StaticsReportList.length>0' class="w150">{{outItem.NewCombinationNum}}</div>
</td>
<td>
<div class="w80">
......@@ -59,7 +60,7 @@
</div>
</td>
<td>
<div class="w80">
<div class="w150">
{{item.FlightDate}}
<el-popover popper-class="roomReservations_tripDetails" width="550" trigger="click">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
......@@ -132,37 +133,41 @@
</p>
</div>
</td>
<td v-for="(x,ii) in item.CommonReport.HotelList" style="vertical-align: top;">
<div class="w150" v-if='ii<item.CommonReport.valueLength'>
<p class="pDateStyle">{{x.CheckInDateStr}}</p>
<p @click="goUrlR('HotelManagement',x.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
<span v-if='x.HotelOrderState==0' class="colorE95252">（待定）</span>{{x.NewHotelName}}
</p>
<p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
<p class="pDateStyle">
<span v-for="q in x.OrderDetailsList">{{q.HouseTypeCount}}</span>
</p>
<p class="pDateStyle">
<span v-for="x in item.CommonReport.HouseStatistics.HouseTypeList">{{x.HouseTypeCount}}</span>
<span v-if="item.CommonReport.HouseStatistics.HouseTypeList.length==0">暂无订房</span>
</p>
<td style="vertical-align: top;">
<div :style="{width:150*item.CommonReport.newHotel.length+'px'}">
<div class="w150" v-for="childItem in item.CommonReport.newHotel"
style="float:left;border-right:1px solid #d1d1d1;">
<p class="pDateStyle">{{childItem.CheckInDateStr}}</p>
<p @click="goUrlR('HotelManagement',childItem.HotelId,'酒店管理')"
class="pDateStyle phoverStype ownScrollbarStyle" style="height: 50px!important; overflow:auto;">
<span v-if='childItem.HotelOrderState==0'
class="colorE95252">（待定）</span>{{childItem.NewHotelName}}
</p>
<p class="pDateStyle">{{item.CommonReport.HouseStatistics.RealityRoomNum}}</p>
<p class="pDateStyle">
<span v-for="q in childItem.OrderDetailsList">{{q.HouseTypeCount}}</span>
</p>
<p class="pDateStyle">
<span v-for="x in item.CommonReport.HouseStatistics.HouseTypeList">{{x.HouseTypeCount}}</span>
<span v-if="item.CommonReport.HouseStatistics.HouseTypeList.length==0">暂无订房</span>
</p>
</div>
</div>
</td>
<td>
<div class="w200">
{{item.Remarks}}
</div>
</td>
<td>
<div class="w80 link">
<div class="w80 link" style="margin:auto;">
<p @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">详情</p>
</div>
</td>
</tr>
<tr>
<td :colspan="colspanTotal" style="text-align: left!important;padding-left: 20px;">
<td :colspan="item.colNum" style="text-align: left!important;padding-left: 20px;">
<div class="link">
<p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')">{{item.Titles}}</p>
<div v-show="outItem.StaticsReportList[0].DMCRemark!=''" class="colorE95252">
......@@ -251,7 +256,7 @@
}
})
},
goUrl(path, obj,outItem, title) {
goUrl(path, obj, outItem, title) {
this.$router.push({
name: path,
query: {
......@@ -278,27 +283,27 @@
this.apipost('dmcstatistics_post_GetUniteCombinationNumService', this.msg, res => {
if (res.data.resultCode == 1) {
this.loading = false
this.total = res.data.data.count
this.list = res.data.data.pageData.data
this.total = res.data.data.count;
this.list = res.data.data.pageData.data;
this.thLengthArr = []
this.thLengthTitle = []
this.colspanTotal = res.data.data.pageData.columnsCount + 9
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
this.thLengthTitle.push('第' + i + '晚')
}
this.list.forEach(outItem => {
outItem.StaticsReportList.forEach(item => {
item.CommonReport['valueLength'] = item.CommonReport.HotelList.length
if (item.CommonReport.HotelList.length < res.data.data.pageData.columnsCount) {
let _cha = res.data.data.pageData.columnsCount - item.CommonReport.HotelList.length
let _chaArr = new Array()
for (let i = 0; i < _cha; i++) {
_chaArr.push({
'HotelName': ''
this.list.forEach(x => {
x.StaticsReportList.forEach(y => {
y.CommonReport.newHotel = [];
if (y.CommonReport.HotelOrderListReport != null && y.CommonReport.HotelOrderListReport
.length > 0) {
y.CommonReport.HotelOrderListReport.forEach(z => {
z.HotelOrderList.forEach(q => {
y.CommonReport.newHotel.push(q);
})
}
item.CommonReport.HotelList = item.CommonReport.HotelList.concat(_chaArr)
}
})
}
y.colNum = 9 + y.CommonReport.newHotel.length;
})
})
} else {
......@@ -316,27 +321,23 @@
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
if(this.$route.query.hotelId)
{
this.msg.HotelId=this.$route.query.hotelId;
if (this.$route.query.hotelId) {
this.msg.HotelId = this.$route.query.hotelId;
}
if(this.$route.query.dateStr)
{
this.msg.DateStr=this.$route.query.dateStr;
if (this.$route.query.dateStr) {
this.msg.DateStr = this.$route.query.dateStr;
}
if(this.$route.query.hotelId||this.$route.query.dateStr)
{
if (this.$route.query.hotelId || this.$route.query.dateStr) {
this.msg.StartDate = "";
}
else
{
this.msg.StartDate = nowDate;
} else {
this.msg.StartDate = nowDate;
}
this.getList()
this.getLineTeamList()
},
}
</script>
<style>
......
src/components/SalesModule/enrollTotalTwo.vue
View file @ 154aea2b
......@@ -448,7 +448,13 @@
DueinMoney: 0,
PreferPrice: 0,
InteriorNum: 0,
B2BNum: 0
B2BNum: 0,
SumPreferPrice: 0,
SumIncome: 0,
SumRefund: 0,
SumPlatformTax: 0,
ZaiTu: 0,
DaiShou: 0,
},
ctlxList: []
};
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 154aea2b
......@@ -1843,6 +1843,18 @@
<span>参团：</span>
<span>{{seat.joinGroupNum}}</span>
</div>
<div>
<span>自由行</span>
<span>{{seat.IndependentTravelCount}}</span>
</div>
<div>
<span>单地接</span>
<span>{{seat.NurseryGraftingCount}}</span>
</div>
<div>
<span>单机票</span>
<span>{{seat.SingleAirTicketCount}}</span>
</div>
<div>
<span>领队：</span>
<span>{{seat.leaderNum}}</span>
......@@ -3879,8 +3891,13 @@ submitYSZEForm(){
this.seat.FSeat = res.data.data.pageData.fSeatNum
this.seat.joinGroupNum = res.data.data.pageData.joinGroupNum
this.seat.leaderNum = res.data.data.pageData.leaderNum
this.seat.ownVisaNum = res.data.data.pageData.ownVisaNum
this.seat.ownVisaNum = res.data.data.pageData.ownVisaNum;
//自由行
this.seat.IndependentTravelCount=res.data.data.pageData.independentTravelCount;
//单地接
this.seat.NurseryGraftingCount=res.data.data.pageData.nurseryGraftingCount;
//单机票
this.seat.SingleAirTicketCount=res.data.data.pageData.singleAirTicketCount;
} else {
this.$message.error(res.data.message);
}
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 154aea2b
......@@ -1902,7 +1902,7 @@
<tbody>
<tr>
<td></td>
<td colspan="13"> 本团机位: <span class="RL-redType">{{ConfigData.Config.YSeat}}Y +
<td colspan="14"> 本团机位: <span class="RL-redType">{{ConfigData.Config.YSeat}}Y +
{{ConfigData.Config.CSeat}}E + {{ConfigData.Config.FSeat}}F
</span>&nbsp;
剩余机位: <span class="RL-redType">
......@@ -1921,6 +1921,9 @@
{{OrderDataList.FSeatNum-ConfigData.Config.FSeat>0?OrderDataList.FSeatNum-ConfigData.Config.FSeat:0}}F
</span> &nbsp;
参团：<span class="RL-redType">{{OrderDataList.JoinCount}}</span>
自由行：<span class="RL-redType">{{OrderDataList.IndependentTravelCount}}</span>
单地接：<span class="RL-redType">{{OrderDataList.NurseryGraftingCount}}</span>
单机票：<span class="RL-redType">{{OrderDataList.SingleAirTicketCount}}</span>
领队：<span class="RL-redType">{{OrderDataList.LeaderCount}}</span>
</td>
</tr>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 154aea2b
......@@ -547,11 +547,14 @@
<p>
<span>{{$t('visa.v_yibaoru')}}</span>
<i>
{{item.OrderGuestNum}}
<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
</i>
</p>
<p v-if="item.SingleDMNum>0">
<span>单地接</span>
<i>{{item.SingleDMNum}}</i>
</p>
<p>
<span>{{$t('Operation.Op_takeSeat')}}</span>
<i>{{item.Occupied}}</i>{{$t('Operation.Op_people')}}
......@@ -963,7 +966,7 @@
},
//获取线路列表
getLineList () {
this.apipost('line_post_GetList', {}, res => {
this.apipost('line_post_GetList', {"LineDirection":2}, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data
this.queryCommonData.PlaceList = []
......@@ -1041,7 +1044,7 @@
//新获取列表数据
getControlList () {
var msg = JSON.parse(JSON.stringify(this.queryMsg))
if (msg.TeamMinNum == '') {
msg.TeamMinNum = -1
......@@ -1649,12 +1652,12 @@
this.queryMsg.IsShowUnion = 1
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo
this.$route.query.tcmun = this.$route.query.tcmun
if (this.$route.query.tcmun) {
this.queryMsg.TCNUM = this.$route.query.tcmun
}
if (this.CurrentUserInfo.IsParentCompany == undefined) {
this.queryCommonData.IsParentCompany = 2
} else {
......
src/components/TravelManager/TravelList/oneDayTripList.vue
View file @ 154aea2b
......@@ -29,7 +29,7 @@
<li>
<span>
<em>团号</em>
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
<el-input maxlength="50" v-model="queryMsg.TCNUMS" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')"></el-input>
</span>
</li>
......@@ -224,7 +224,7 @@
},
//获取线路列表
getLineList() {
this.apipost("line_post_GetList", {}, res => {
this.apipost("line_post_GetList", {"LineDirection":3}, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data;
}
......
src/components/TravelManager/TravelList/priceIncomeConfirmInfo.vue
View file @ 154aea2b
......@@ -57,94 +57,282 @@
float:right;
margin-right: 20px;
}
.priceIncomeTable {
width: 1200px;
border-collapse: collapse;
font-size: 14px;
}
.priceIncomeTable td {
border: 1px solid #dcdfe6;
height: 34px;
background-color: #fff;
text-align: center;
}
.priceComtd {
background: #e6e6e6 !important;
}
.princeOrderSpan {
margin-right: 10px;
display: inline-block;
}
.PriceRemark {
width: 100%;
min-height: 100px;
padding: 10px;
font-size: 14px;
background-color: #fff;
}
.leftRemarkTitle {
float: left;
width: 5%;
text-align: right;
}
.rightRemarkContent {
float: left;
width: 95%;
}
.priceContent {
width: 830px;
padding: 15px;
background-color: #fff;
min-height: 500px;
}
.pri_title {
font-size: 18px;
text-align: center;
margin-bottom: 20px;
}
.priceContent table td, .priceContent table th {
height: 34px;
padding: 10px;
}
.priceContent .pri_EmpName {
float: left;
margin-left: 20px;
}
.priceContent .pri_DateTime {
float: right;
margin-right: 20px;
}
.leftDepart {
display: inline-block;
width: 60%;
height: 35px;
}
.rightDepart {
width: 39%;
height: 35px;
display: inline-block;
}
.comTextAlign {
text-align: left;
padding: 10px 30px !important;
}
</style>
<template>
<div class="priceContent">
<p class="pri_title">团队收入确认单</p>
<table border="1" bordercolor="#c94052" style="border-collapse: collapse;width:100%;font-size:14px;text-align:center;">
<tr>
<th>部门</th>
<th>{{dataList.DepartmentName}}</th>
<th>单号</th>
<th width="200">{{dataList.Id}}</th>
</tr>
<tr>
<th>团号</th>
<th>团队编号</th>
<th>人数</th>
<th>领队</th>
</tr>
<tr>
<td>{{dataList.TCNUM}}</td>
<td>{{dataList.TCID}}</td>
<td>{{dataList.PeopleNum}}</td>
<td>{{dataList.LeaderName}}</td>
</tr>
<tr>
<td>团费收入合计</td>
<td colspan="3">{{dataList.TotalIncome}}</td>
</tr>
<tr>
<td rowspan="3">其中</td>
<td>直客收入</td>
<td colspan="2">{{dataList.DirectGuestIncome}}</td>
</tr>
<tr>
<td>同行交客收入</td>
<td colspan="2">{{dataList.PlatformGuestIncome}}</td>
</tr>
<tr>
<td>平台收入</td>
<td colspan="2">{{dataList.PlatformIncome}}</td>
</tr>
<tr>
<td colspan="4">
<span class="pri_EmpName">
操作人：{{dataList.EmpName}}
</span>
<span class="pri_DateTime">
操作时间：{{dataList.DateTimeStr}}
</span>
</td>
</tr>
</table>
<div class="priceContent">
<p class="pri_title">团队收入确认单</p>
<div class="clearfix">
<div class="leftDepart">
<span>部门：</span>
<span>{{confirmInfo.DepartmentName}}</span>
</div>
<!--<div class="rightDepart">-->
<!--<span>单号：</span>-->
<!--<span>123456</span>-->
<!--</div>-->
</div>
<table border="1" style="border-collapse: collapse;width:100%;font-size:14px;text-align:center;">
<tr>
<td>团号</td>
<td>团队编号</td>
<td>人数</td>
<td colspan="5">{{confirmInfo.PeopleNum}}</td>
</tr>
<tr>
<td>{{confirmInfo.TCID}}</td>
<td>{{confirmInfo.TCNUM}}</td>
<td>领队</td>
<td colspan="5">{{confirmInfo.LeaderName}}</td>
</tr>
<tr>
<td>团队收入合计</td>
<td colspan="7">{{confirmInfo.TotalIncome}}</td>
</tr>
<tr>
<td colspan="8" class="comTextAlign">交易明细</td>
</tr>
<tr>
<td>同行名称</td>
<td>应收金额</td>
<td>实收金额</td>
<td>优惠金额</td>
<td>手续费</td>
<td>退款</td>
<td>在途</td>
<td>未收</td>
</tr>
<tr v-for="item in confirmInfo.TradeTravelOrderList">
<td>
<div>{{item.ContactName}}</div>
<div>{{item.ContactMobile}}</div>
</td>
<td>{{item.PreferPrice}}</td>
<td>{{item.Income}}</td>
<td>{{item.DiscountMoney}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.Refund}}</td>
<td>{{item.ZaiTuMoney}}</td>
<td>{{item.OutstandingAmount}}</td>
<tr>
<td colspan="8" class="comTextAlign">平台款项</td>
</tr>
<tr>
<td>平台名称</td>
<td>应收金额</td>
<td>实收金额</td>
<td>优惠金额</td>
<td>手续费</td>
<td>退款</td>
<td>在途</td>
<td>未收</td>
</tr>
<tr v-for="item in confirmInfo.PlatformTravelOrderList">
<td>{{item.BrandName}}</td>
<td>{{item.PreferPrice}}</td>
<td>{{item.Income}}</td>
<td>{{item.DiscountMoney}}</td>
<td>{{item.PlatformTax}}</td>
<td>{{item.Refund}}</td>
<td>{{item.ZaiTuMoney}}</td>
<td>{{item.OutstandingAmount}}</td>
</tr>
<tr>
<td>其中</td>
<td>直客收入</td>
<td colspan="6">{{confirmInfo.DirectGuestIncome}}</td>
</tr>
<tr>
<td></td>
<td>同行交客收入</td>
<td colspan="6">{{confirmInfo.PlatformGuestIncome}}</td>
</tr>
<tr>
<td></td>
<td>平台收入</td>
<td colspan="6">{{confirmInfo.PlatformIncome}}</td>
</tr>
<tr>
<td colspan="8">
<span class="pri_EmpName">
操作人：{{confirmInfo.EmpName}}
</span>
<span class="pri_DateTime">
操作时间：{{confirmInfo.DateTimeStr}}
</span>
</td>
</tr>
</table>
<!-- <table border="1" bordercolor="#c94052" style="border-collapse: collapse;width:100%;font-size:14px;text-align:center;">
<tr>
<th>部门</th>
<th>{{dataList.DepartmentName}}</th>
<th>单号</th>
<th width="200">{{dataList.Id}}</th>
</tr>
<tr>
<th>团号</th>
<th>团队编号</th>
<th>人数</th>
<th>领队</th>
</tr>
<tr>
<td>{{dataList.TCNUM}}</td>
<td>{{dataList.TCID}}</td>
<td>{{dataList.PeopleNum}}</td>
<td>{{dataList.LeaderName}}</td>
</tr>
<tr>
<td>团费收入合计</td>
<td colspan="3">{{dataList.TotalIncome}}</td>
</tr>
<tr>
<td rowspan="3">其中</td>
<td>直客收入</td>
<td colspan="2">{{dataList.DirectGuestIncome}}</td>
</tr>
<tr>
<td>同行交客收入</td>
<td colspan="2">{{dataList.PlatformGuestIncome}}</td>
</tr>
<tr>
<td>平台收入</td>
<td colspan="2">{{dataList.PlatformIncome}}</td>
</tr>
<tr>
<td colspan="4">
<span class="pri_EmpName">
操作人：{{dataList.EmpName}}
</span>
<span class="pri_DateTime">
操作时间：{{dataList.DateTimeStr}}
</span>
</td>
</tr>
</table> -->
</div>
</template>
<script>
export default {
data() {
data () {
return {
loading:false,
loading: false,
msg: {
tcid:''
tcid: ''
},
dataList:[],
};
confirmInfo: {},
}
},
methods: {
getList() {
getList () {
//获取数据
this.loading=true;
this.loading = true
this.apipost(
"travel_post_GetPriceIncomeConfirmInfo",
'travel_post_GetPriceIncomeConfirmInfo',
this.msg,
res => {
this.loading=false;
this.loading = false
if (res.data.resultCode == 1) {
this.dataList = res.data.data;
this.confirmInfo = res.data.data
console.log(this.confirmInfo)
} else {
this.Error(res.data.message);
this.Error(res.data.message)
}
},
err => {}
);
err => {
}
)
},
},
mounted() {
this.msg.tcid = this.$route.query.TCID;
this.getList();
mounted () {
this.msg.tcid = this.$route.query.TCID
this.getList()
}
};
}
</script>
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 154aea2b
......@@ -398,7 +398,7 @@
err => {}
);
},
//初始化团的幻灯片
initFileList() {
for (var i = 0; i < 5; i++) {
......@@ -720,7 +720,8 @@
this.loading = true;
this.apipost(
"travel_get_GetCommonTravelInfo", {
isSale: this.TeamType==1?true:false
isSale: this.TeamType==1?true:false,
lineDirection:this.TeamType==2?3:2
},
res => {
if (res.data.resultCode == 1) {
......
src/components/systemManagement/lineManagement.vue
View file @ 154aea2b
......@@ -337,7 +337,9 @@ input[type="number"] {
</el-col>
<el-col :span="2">
<div class="_LowDisMoney">
<div>{{item.lineDirection==1?'入境':'出境'}}</div>
<div v-if="item.lineDirection==1">入境</div>
<div v-else-if="item.lineDirection==2">出境</div>
<div v-else-if="item.lineDirection==3">一日游</div>
<div>线路方向</div>
</div>
</el-col>
......@@ -495,6 +497,7 @@ input[type="number"] {
<el-select v-model="addMsg.LineDirection" :placeholder="$t('pub.pleaseSel')" class="w290">
<el-option label='入境' :value='1'></el-option>
<el-option label='出境' :value='2'></el-option>
<el-option label='一日游' :value='3'></el-option>
</el-select>
</el-form-item>
</el-col>
......
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