Skip to content

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

解决冲突

parents 81216205 82659754
Show 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,'酒店管理')"
<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='x.HotelOrderState==0' class="colorE95252">（待定）</span>{{x.NewHotelName}}
<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 x.OrderDetailsList">{{q.HouseTypeCount}}</span>
<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 {
......@@ -317,26 +322,22 @@
"-" +
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
{
} else {
this.msg.StartDate = nowDate;
}
this.getList()
this.getLineTeamList()
},
}
</script>
<style>
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 154aea2b
......@@ -11,13 +11,12 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
<tr>
<th class="fz14" colspan="10">团队信息</th>
<th class="fz14" colspan="13">地接操作信息</th>
<th class="fz14" colspan="8">团队信息</th>
<th class="fz14" colspan="15">地接操作信息</th>
</tr>
<tr>
<th width="120">公司团号</th>
<th width="100">入住时间</th>
<th width="200">酒店名称</th>
<th width="80">入住时间</th>
<th width="120">机位总数/(Y/E/F)</th>
<th width="120">占床/不占床</th>
<th width="80">实际用房数</th>
......@@ -26,6 +25,7 @@
<th width="80">房间人数</th>
<th width="200">修改酒店</th>
<th width="150">房间预定数</th>
<th width="150">预定人数</th>
<th width="120">尚差房间数</th>
<th width="80">单价/每人</th>
<th width="80">免减人数</th>
......@@ -39,104 +39,94 @@
<th width="80">备注</th>
<th width="80">操作</th>
</tr>
<tr v-for="(item,index) in list">
<td :rowspan="list.length" v-if="index==0">
<div class="w120">
<p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
<el-button @click='openChart()' v-if="CreateByAccount!=''" type="primary"
style="background:#6DD875; border-color:#6DD875;padding:4px;margin-top:10px;">联系OP</el-button>
</div>
<template v-for="(item,index) in list">
<tr v-for="(subItem,subIndex) in item.HotelOrderList">
<td :rowspan="item.HotelOrderList.length" v-if="subIndex==0">
<div class="w100">{{item.UseTimeStr}}</div>
</td>
<td>
<div class="w200 padding10">
<p class="link" style="word-break: normal;" :class="{'Hotel_red':item.HotelChangeState==3}"
@click="goUrlR('HotelManagement',item.HotelId,'酒店管理')">{{item.HotelName}}</p>
<p class="link" style="word-break: normal;" :class="{'Hotel_red':subItem.HotelChangeState==3}"
@click="goUrlR('HotelManagement',subItem.HotelId,'酒店管理')">{{subItem.HotelName}}</p>
</div>
</td>
<td>
<div class="w80">{{item.CheckInDateStr}}</div>
</td>
<td>
<div class="w120">
<p class="link" @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
{{flightTotal}}/{{item.HouseStatistics.RealityYSeatNum}}/{{item.HouseStatistics.RealityESeatNum}}/{{item.HouseStatistics.RealityFSeatNum}}
{{flightTotal}}/{{subItem.HouseStatistics.RealityYSeatNum}}/{{subItem.HouseStatistics.RealityESeatNum}}/{{subItem.HouseStatistics.RealityFSeatNum}}
</p>
</div>
</td>
<td>
<div class="w120">
<p class="link" @click="goUrlT('passengerHouse',item.TCIDS,'房间分配')">
{{item.HouseStatistics.NeedBed}}/{{item.HouseStatistics.NoNeedBed}}</p>
{{subItem.HouseStatistics.NeedBed}}/{{subItem.HouseStatistics.NoNeedBed}}</p>
</div>
</td>
<td>
<div class="w80">{{item.HouseStatistics.RealityRoomNum}}</div>
<div class="w80">{{subItem.HouseStatistics.RealityRoomNum}}</div>
</td>
<td>
<div class="w150">
<p class="pHouseStyle" v-for="o in item.HouseStatistics.HouseTypeList">
<p class="pHouseStyle" v-for="o in subItem.HouseStatistics.HouseTypeList">
{{o.HouseTypeName}}
</p>
</div>
</td>
<td>
<div class="w80">
<p class="pHouseStyle" v-for="o in item.HouseStatistics.HouseTypeList">
<p class="pHouseStyle" v-for="o in subItem.HouseStatistics.HouseTypeList">
{{o.HouseTypeCount}}
</p>
</div>
</td>
<td>
<div class="w80">
<p class="pHouseStyle" v-for="o in item.HouseStatistics.HouseTypeList">
<p class="pHouseStyle" v-for="o in subItem.HouseStatistics.HouseTypeList">
{{o.HouseGuestNum}}
</p>
</div>
</td>
<td>
<div class="w150">
<el-select class='w120 sel' v-model='item.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getHotelList(item)' @change='sendValue(item)'>
<el-option v-for='itemHotel in item.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
<el-select class='w120 sel' v-model='subItem.NewHotelId' filterable :placeholder="$t('pub.pleaseSel')"
@visible-change='getHotelList(subItem)' @change='sendValue(subItem)'>
<el-option v-for='itemHotel in subItem.hotelList' :label='itemHotel.Name' :value='itemHotel.ID'
:key='itemHotel.ID'>
<span style="float: left">{{itemHotel.Name}}</span>
<span style="float: right; color:red; font-size: 13px">{{itemHotel.Inventory }}</span>
</el-option>
</el-select>
</div>
<el-upload :http-request="uploadFileBtn" :multiple="true" :show-file-list="false" action="">
<el-button size="small" type="danger" icon="el-icon-upload2">
<!-- <i class="el-icon-plus avatar-uploader-icon" @click="ClickItem=item"></i> -->
<div class="el-upload__text" @click="ClickItem=item">点击上传</div>
</el-button>
</el-upload>
<div class="RoomfileList" v-for="(subItem,subIndex) in item.ContractUrlArray" v-if="item.ContractUrlArray!=null && item.ContractUrlArray.length>0">
<p title="点击下载" @click="downLoadPZ(subItem)" style="cursor: pointer;">{{ '附件' + (index + 1)}}</p>
<span>
<i class="iconfont icon-close" @click="deleteFile(item,subIndex)"></i>
</span>
</div>
</td>
<td>
<div class="w80">
<p class="pHouseStyle" v-for="o in item.OrderDetailsList">
<p class="pHouseStyle" v-for="o in subItem.OrderDetailsList">
<el-input class='w50 tcenter' @keyup.native="checkInteger(o,'HouseTypeCount')"
v-model='o.HouseTypeCount'></el-input>
</p>
</div>
</td>
<td>
<div class="w80">
<p class="pHouseStyle" v-for="o in subItem.OrderDetailsList">
<el-input class='w50 tcenter' @keyup.native="checkInteger(o,'BookNum')"
@input="calculationPrice(subItem)" v-model='o.BookNum'></el-input>
</p>
</div>
</td>
<td>
<div class="w80">
<p class="pHouseStyle"
:class="{colorRed:o.HouseTypeCount-item.HouseStatistics.HouseTypeList[index].HouseTypeCount<0}"
v-for="(o,index) in item.OrderDetailsList">
{{o.HouseTypeCount-item.HouseStatistics.HouseTypeList[index].HouseTypeCount}}
:class="{colorRed:o.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[index].HouseTypeCount<0}"
v-for="(o,index) in subItem.OrderDetailsList">
{{o.HouseTypeCount-subItem.HouseStatistics.HouseTypeList[index].HouseTypeCount}}
</p>
</div>
</td>
<td>
<div class="w120">
<p class="pHouseStyle" v-for="(o,index) in item.OrderDetailsList" @input="calculationPrice(item)">
<p class="pHouseStyle" v-for="(o,index) in subItem.OrderDetailsList" @input="calculationPrice(subItem)">
<el-input @keyup.native="checkInteger(o,'UnitPrice')" class='w80 tcenter' v-model='o.UnitPrice'>
</el-input>
</p>
......@@ -144,7 +134,7 @@
</td>
<td>
<div class="w80">
<p class="pHouseStyle" v-for="(o,index) in item.OrderDetailsList" @input="calculationPrice(item)">
<p class="pHouseStyle" v-for="(o,index) in subItem.OrderDetailsList" @input="calculationPrice(subItem)">
<el-input class='w50' @keyup.native="checkInteger(o,'HotelDiscount')" v-model='o.HotelDiscount'>
</el-input>
</p>
......@@ -152,8 +142,8 @@
</td>
<td>
<div class="w80">
<p class="pHouseStyle" v-for="(o,index) in item.OrderDetailsList">
{{o.UnitPrice*(o.HouseGuestNum-o.HotelDiscount)}}
<p class="pHouseStyle" v-for="(o,index) in subItem.OrderDetailsList">
{{o.UnitPrice*(o.BookNum-o.HotelDiscount)}}
</p>
</div>
......@@ -161,7 +151,8 @@
<td>
<!--返佣-->
<div class="w80">
<p class="pHouseStyle link" v-for="(o,index) in item.OrderDetailsList" @input="calculationPrice(item)">
<p class="pHouseStyle link" v-for="(o,index) in subItem.OrderDetailsList"
@input="calculationPrice(subItem)">
<span class="spanlink" v-if='o.IsRebateRatio==0' @click="goUrl('HotelInfo',o,'酒店管理')">设置</span>
<span v-if='o.IsRebateRatio!=0'>{{o.RebateRatio}}</span>
</p>
......@@ -169,45 +160,58 @@
</td>
<td>
<div class="w120">
{{item.TotalPrice}}
{{subItem.TotalPrice}}
</div>
</td>
<td>
<div class="w120">
<el-select class='w100 sel' v-model='item.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' value='0'></el-option>
<el-option label='现付' value='1'></el-option>
<el-option label='签单' value='2'></el-option>
<el-option label='实物抵扣' value='5'></el-option>
<el-option label='预付' value='4'></el-option>
<el-select class='w100 sel' v-model='subItem.PayStyle' :placeholder="$t('pub.pleaseSel')">
<el-option label='请选择' :value='0'></el-option>
<el-option label='现付' :value='1'></el-option>
<el-option label='签单' :value='2'></el-option>
<el-option label='实物抵扣' :value='5'></el-option>
<el-option label='预付' :value='4'></el-option>
</el-select>
</div>
</td>
<td>
<div class="w120">{{item.Tel}}</div>
<div class="w120">{{subItem.Tel}}</div>
</td>
<td>
<div class="w200 padding10">{{item.Address}}</div>
<div class="w200 padding10">{{subItem.Address}}</div>
</td>
<td>
<div class="w150">
<el-input class='w120' v-model='item.ReserveNo'></el-input>
<el-input class='w120' v-model='subItem.ReserveNo'></el-input>
</div>
</td>
<td>
<div class="w150">
<el-input type='textarea' class='w120' v-model='item.Remarks'></el-input>
<el-input type='textarea' class='w120' v-model='subItem.Remarks'></el-input>
</div>
</td>
<td>
<input type="button" class="roomBtn" value="保存" @click="SaveSingle(item)" />
<div class="w200">
<el-button-group>
<el-tooltip class="item" effect="dark" content="保存" placement="top-start">
<el-button icon="iconfont icon-shoufukuan" @click="SaveSingle(subItem)" type="primary"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="添加" placement="top-start">
<el-button @click='AddHotel(item,subIndex)' icon="iconfont icon-tianjia" type="primary"></el-button>
</el-tooltip>
<el-tooltip v-if="subIndex>0" class="item" effect="dark" content="删除" placement="top-start">
<el-button type="primary" icon="iconfont icon-shanchu" @click='DeleteHotel(item,subIndex)'>
</el-button>
</el-tooltip>
</el-button-group>
</div>
</td>
</tr>
</template>
</table>
</div>
</div>
</template>
<script>
export default {
data() {
......@@ -230,15 +234,46 @@
}
},
methods: {
//添加酒店
AddHotel(item, subIndex) {
var subItem = JSON.parse(JSON.stringify(item.HotelOrderList[subIndex]));
subItem.HotelId=0;
subItem.HotelName="";
subItem.OrderID=0;
item.HotelOrderList.push(subItem);
},
//删除酒店
DeleteHotel(item, subIndex) {
var that = this;
this.Confirm("是否删除?删除后将不能恢复", function () {
var subItem = item.HotelOrderList[subIndex];
if (subItem.OrderID > 0) {
that.apipost('dmcstatistics_post_DeleteHotelOrder', {
ID: subItem.OrderID
}, res => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
item.HotelOrderList.splice(subIndex, 1);
} else {
that.Error(res.data.message);
}
}, err => {})
} else {
item.HotelOrderList.splice(subIndex, 1);
}
});
},
//联系op
downLoadPZ: function (src) {
let dom = document.querySelector("#blankLink")
dom.href=src
dom.href = src
dom.click()
},
//删除
deleteFile(item,index){
item.ContractUrlArray.splice(index,1);
deleteFile(item, index) {
item.ContractUrlArray.splice(index, 1);
var str = "";
item.ContractUrlArray.forEach(subItem => {
str += subItem + ",";
......@@ -288,24 +323,22 @@
NewCombinationNum: this.$route.query.NewCombinationNum
}, res => {
if (res.data.resultCode == 1) {
this.list = res.data.data.HotelList;
this.list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy;
this.CreateByPhoto = res.data.data.CreateByPhoto;
this.CreateByAccount = res.data.data.CreateByAccount;
if (this.list != null && this.list.length > 0) {
this.list.forEach(item => {
this.calculationPrice(item);
item.hotelList.push({
Name: item.NewHotelName,
ID: item.NewHotelId
})
item.ContractUrlArray = [];
if (item.ContractUrl && item.ContractUrl != '') {
item.ContractUrlArray = item.ContractUrl.split(',');
}
item.PayStyle = item.PayStyle.toString()
item.OrderDetailsList.forEach((x, index1) => {
item.HotelOrderList.forEach(subItem => {
subItem.hotelList.push({
Name: subItem.NewHotelName,
ID: subItem.NewHotelId
});
this.calculationPrice(subItem);
subItem.OrderDetailsList.forEach((x, index1) => {
if (x.HouseTypeCount <= 0) {
x.HouseTypeCount = item.HouseStatistics.HouseTypeList[index1].HouseTypeCount.toString();
x.HouseTypeCount = subItem.HouseStatistics.HouseTypeList[index1].HouseTypeCount
.toString();
} else {
x.HouseTypeCount = x.HouseTypeCount.toString();
}
......@@ -313,10 +346,12 @@
x.UnitPrice = x.UnitPrice.toString();
x.HotelDiscount = x.HotelDiscount.toString();
})
if (item.ReserveNo == '' || item.ReserveNo == null) {
item.ReserveNo = this.$route.query.NewCombinationNum;
if (subItem.ReserveNo == '' || subItem.ReserveNo == null) {
subItem.ReserveNo = this.$route.query.NewCombinationNum;
}
})
});
}
} else {
this.$message.error(res.data.message);
}
......@@ -325,16 +360,17 @@
calculationPrice(obj) {
let totalPrice = 0;
obj.OrderDetailsList.forEach(item => {
totalPrice += item.UnitPrice * (item.HouseGuestNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
totalPrice += item.UnitPrice * (item.BookNum - item.HotelDiscount) * (1 - item.RebateRatio / 100);
})
obj.TotalPrice = totalPrice.toFixed(2);
this.$forceUpdate();
},
getHotelList(obj) {
this.apipost('hotel_post_GetLineHotelList', {
IsGetPic: 0,
IsGetRemark: 0,
QCity: obj.QCity
this.apipost('hotel_post_GetHasStockHotelList', {
//1-只查询有库存的酒店
IsMoreThanZero:0,
Country: "651",
sDate:obj.CheckInDateStr
}, res => {
if (res.data.resultCode == 1) {
obj.hotelList = res.data.data;
......@@ -357,20 +393,29 @@
saveList(type) {
if (type == 0) {
this.list.forEach(item => {
item.HotelOrderState = 0;
item.HotelOrderList.forEach(subItem => {
subItem.HotelOrderState = 0;
});
})
}
if (type == 1) {
this.list.forEach(item => {
item.HotelOrderState = 1;
item.HotelOrderList.forEach(subItem => {
subItem.HotelOrderState = 1;
});
})
}
this.list.forEach(x => {
x.OrderDetailsList.forEach(y => {
this.list.forEach(item => {
item.HotelOrderList.forEach(subItem => {
subItem.OrderDetailsList.forEach(y => {
y.HouseTypeCount = parseInt(y.HouseTypeCount);
y.UnitPrice = parseInt(y.UnitPrice);
y.HotelDiscount = parseInt(y.HotelDiscount);
if (y.BookNum == "") {
y.BookNum = 0;
}
})
});
})
this.apipost('dmcstatistics_get_SetHotelOrder', this.list, res => {
if (res.data.resultCode == 1) {
......@@ -387,6 +432,7 @@
this.apipost('dmcstatistics_post_SetNewHotelOrder', item, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
} else {
this.Error(res.data.message);
}
......@@ -424,29 +470,34 @@
</script>
<style>
.RoomfileList{
width:100%;
height:20px;
.RoomfileList {
width: 100%;
height: 20px;
text-align: center;
position: relative;
cursor: pointer;
}
.RoomfileList p{
.RoomfileList p {
display: inline-block;
}
.RoomfileList i:hover{
color:#E95252;
.RoomfileList i:hover {
color: #E95252;
}
.roomReservationsDetailsTalbe .el-button--small {
padding: 0 20px 0 10px;
margin-top: 10px;
height:28px;
height: 28px;
line-height: 10px;
}
.roomReservationsDetailsTalbe .el-button--small i{
.roomReservationsDetailsTalbe .el-button--small i {
float: left;
margin-top:9px;
margin-top: 9px;
}
.roomReservationsDetailsTalbe .roomBtn {
color: #fff;
padding: 0 10px !important;
......
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 = []
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 154aea2b
......@@ -391,58 +391,6 @@
</div>
</div>
</div>
<div class="el-col" style="width:200px;">
<div class="d2">
<p class="TCLflight_GO">
<i class="iconfont icon-hangban1"></i>{{$t('visa.v_hangban')}}
</p>
<el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">{{$t('system.query_arrivalTime')}}</th>
<th width="100">{{$t('system.query_stopCity')}}</th>
</tr>
<tr v-for="(fItem,fIndex) in item.flightList" :key="fIndex" style="text-align:center;">
<td class="_d_name _color_666">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span
v-else-if="fIndex>0 && fIndex!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td>
<td>
<div>{{fItem.Flight_number}}</div>
<div style="margin-top:5px;">{{fItem.AlName}}</div>
</td>
<td>
<div>{{fItem.FlightDate}} {{fItem.Departure_time}}</div>
<div style="margin-top:5px;">({{fItem.DIATA}}){{fItem.dName}}</div>
</td>
<td>
<div>{{fItem.FlightArrivalTime}} {{fItem.Arrival_time}}</div>
<div style="margin-top:5px;">({{fItem.AIATA}}){{fItem.aName}}</div>
</td>
<td>({{fItem.StopoverIATA}}){{fItem.StopoverName}}</td>
</tr>
</table>
<div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
({{subItem.DIATA}}){{subItem.DepartureName}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
{{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【暂定】</span>
</span>
</div>
</div>
</el-popover>
</div>
</div>
<div class="el-col" style="width:220px;">
<div class="d3">
<p>
......@@ -475,64 +423,6 @@
</p>
<p class="travelprice">同业价：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p>
<p class="travelprice">直客价：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
<p>
<el-popover width="700" trigger="click" popper-class="TC_customerInfo">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td rowspan="2" style="text-align:center" width="60">
<i>标准</i>
</td>
<td class="TC_cusTitle">同行会员</td>
<td><b>{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</b></td>
<td class="TC_cusTitle">同行</td>
<td><b>{{item.B2BPrice|priceFormat(item.B2BPrice)}}</b></td>
<td class="TC_cusTitle">直客会员</td>
<td><b>{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</b></td>
<td class="TC_cusTitle">直客</td>
<td><b>{{item.B2CPrice|priceFormat(item.B2CPrice)}}</b></td>
</tr>
<tr>
<td class="TC_cusTitle">婴儿</td>
<td><b>{{item.BabyPrice|priceFormat(item.BabyPrice)}}</b></td>
<td class="TC_cusTitle">单地接价格</td>
<td colspan="5">
<b>{{item.SingleDMCPrice|priceFormat(item.SingleDMCPrice)}}</b>
</td>
</tr>
<tr>
<td rowspan="2" style="text-align:center">
<i>增收</i>
</td>
<td class="TC_cusTitle">儿童占床</td>
<td><b>{{(item.ChildNeedPrice)|priceFormat(item.ChildNeedPrice)}}</b></td>
<td class="TC_cusTitle">儿童附加费</td>
<td><b>{{item.BabyChargePrice|priceFormat(item.BabyChargePrice)}}</b></td>
<td class="TC_cusTitle">老人附加费</td>
<td><b>{{item.OldManChargePrice|priceFormat(item.OldManChargePrice)}}</b></td>
<td class="TC_cusTitle">签证费</td>
<td><b>{{item.VisaPrice|priceFormat(item.VisaPrice)}}</b></td>
</tr>
<tr>
<td class="TC_cusTitle">单房差</td>
<td><b>{{item.SingleRoomPrice|priceFormat(item.SingleRoomPrice)}}</b></td>
<td class="TC_cusTitle">保险</td>
<td><b>{{item.SafeMoney|priceFormat(item.SafeMoney)}}</b></td>
<td class="TC_cusTitle">杂费</td>
<td colspan="3"><b>{{item.OtherPrice|priceFormat(item.OtherPrice)}}</b></td>
</tr>
<tr>
<td style="text-align:center">
<i>减免</i>
</td>
<td class="TC_cusTitle">儿童不占床</td>
<td><b>{{item.ChildNoNeedPrice|priceFormat(item.ChildNoNeedPrice)}}</b></td>
<td class="TC_cusTitle">退签证费</td>
<td colspan="6"><b>{{item.BackVisaPrice|priceFormat(item.BackVisaPrice)}}</b></td>
</tr>
</table>
<span slot="reference" class="price">查看价格明细</span>
</el-popover>
</p>
</div>
</div>
<div class="el-col" style="width:150px;">
......@@ -579,9 +469,7 @@
</div>
<div class="TC-OPName">{{item.OPName}}</div>
</div>
<div class="TC_SeatList">头等舱：{{item.FSeat}}</div>
<div class="TC_SeatList">商务舱：{{item.CSeat}}</div>
<div class="TC_SeatList">经济舱：{{item.YSeat}}</div>
<div class="TC_SeatList">座位数：{{item.YSeat}}</div>
</div>
</div>
<div class="el-col" style="width:200px;">
......@@ -589,48 +477,9 @@
<p>
<i class="iconfont icon-wenxintishi"></i>温馨提示
</p>
<p v-if="item.VisaType">
<span>签证类型</span>
<span v-if="item.VisaType==1">个签</span>
<span v-else-if="item.VisaType==2">团签</span>
</p>
<p>
<span>送签日期</span>
<span class="TCL-redType"> {{item.SendVisaTime}}</span>
</p>
<p>
<span>出签日期</span>
{{item.OutVisaTime}}
</p>
<p>
<span>开票日期</span>
{{item.TicketDeadline}}
</p>
<p v-if="item.LineID==2&&item.EuropeVisaType>0">
<span>
<span v-if="item.EuropeVisaType">欧洲签证类型</span>
<span v-if="item.EuropeVisaType==1">英国签证</span>
<span v-else-if="item.EuropeVisaType==2">申根签证</span>
</span>
</p>
<p v-if="item.LineID==2&&item.EuropeVisaType>0&&item.EuropeVisaType==2">
<span>
<span v-if="item.EuropeVisaName">欧洲签证名称</span>
<span>{{item.EuropeVisaName}}</span>
</span>
</p>
<p v-if="item.VisaFileList.length!==0">
<span>签证资料</span>
</p>
<p v-if="item.VisaFileList.length!==0" v-for="(item2, index2) in item.VisaFileList" :key="index2">
<span style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)">{{item2.Name}}</span>
</p>
<p>
<span>个签</span>
{{item.SignVisaNum}}
<span style="margin-left:10px;">团签</span>
{{item.GroupVisaNum}}
<span>结束日期</span>
<!-- {{item.TicketDeadline}} -->
</p>
</div>
</div>
......@@ -961,7 +810,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
this.queryCommonData.PlaceList = []
......@@ -1074,6 +923,7 @@
})
}
})
console.log(this.queryCommonData.dataList,'datalist');
}
},
err => {
......
src/components/TravelManager/TravelList/oneDayTripList.vue
View file @ 154aea2b
......@@ -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,12 +57,198 @@
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;">
<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>
......@@ -108,43 +294,45 @@
</span>
</td>
</tr>
</table>
</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
......@@ -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