Skip to content

S
SuperMan
Commit 1c46bc24 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 743ec12a 3550912f
Hide whitespace changes
Inline Side-by-side
Showing with 106 additions and 38 deletions
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 1c46bc24
......@@ -393,7 +393,7 @@
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
{{subItem.Remarks}}
</td>
</tr>
</template>
......@@ -465,7 +465,7 @@
<span v-show="subItem.PayStyle==6">付款团号：{{subItem.PayTypeTCNUM}}</span>
</td>
<td v-if="childIndex==0" :rowspan="3">
{{item.Remarks}}
{{subItem.Remarks}}
</td>
</tr>
</template>
......
src/components/Ticketing/airTicketRules.vue
View file @ 1c46bc24
......@@ -443,22 +443,39 @@
<div class="combottomTitle">{{divTitle}}</div>
<div class="">
<el-form :model="addMsg" ref="addMsg" label-width="130px">
<el-col :span="5">
<el-form-item label="年">
<el-select v-model="addMsg.YearStr" size="mini" class="_month_input">
<el-option :key="DefaultValue" label="请选择" :value="DefaultValue"></el-option>
<el-option v-for="item in YearList" :key="item" :label="item" :value="item"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="月">
<el-select v-model="addMsg.MonthStr" size="mini" class="_month_input">
<el-option :key="DefaultValue" label="请选择" :value="DefaultValue"></el-option>
<el-option v-for="item in MonthList" :key="item" :label="item" :value="item"></el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="addMsg.ID==0">
<el-col :span="5">
<el-form-item label="开始月份">
<el-date-picker v-model="addMsg.MonthRangeStart" type="month" value-format="yyyy-MM">
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="结束月份">
<el-date-picker v-model="addMsg.MonthRangeEnd" type="month" value-format="yyyy-MM">
</el-date-picker>
</el-form-item>
</el-col>
</template>
<template v-else>
<el-col :span="5">
<el-form-item label="年">
<el-select v-model="addMsg.YearStr" size="mini" class="_month_input">
<el-option :key="DefaultValue" label="请选择" :value="DefaultValue"></el-option>
<el-option v-for="item in YearList" :key="item" :label="item" :value="item"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="月">
<el-select v-model="addMsg.MonthStr" size="mini" class="_month_input">
<el-option :key="DefaultValue" label="请选择" :value="DefaultValue"></el-option>
<el-option v-for="item in MonthList" :key="item" :label="item" :value="item"></el-option>
</el-select>
</el-form-item>
</el-col>
</template>
<el-col :span="5">
<el-form-item label="单价/人">
<el-input v-model="addMsg.UnitPrice" maxlength="5" @keyup.native="checkPrice(addMsg,'UnitPrice')">
......@@ -492,6 +509,8 @@
YearStr: 0, //年份
MonthStr: 0, //月份
UnitPrice: 0, //单价每人
MonthRangeStart: "", //开始月份【2019-01到2019-12】
MonthRangeEnd: "", //结束月份【2019-01到2019-12】
},
DefaultValue: 0, //默认值
YearList: [],
......@@ -535,16 +554,29 @@
this.addMsg.YearStr = 0;
this.addMsg.MonthStr = 0;
this.addMsg.UnitPrice = 0;
this.addMsg.MonthRangeEnd="";
this.addMsg.MonthRangeStart="";
},
//保存信息
SaveAirticketRules() {
if (this.addMsg.YearStr == 0) {
this.Info("请选择年份!");
return;
}
if (this.addMsg.MonthStr == 0) {
this.Info("请选择月份!");
return;
if (this.addMsg.ID > 0) {
if (this.addMsg.YearStr == 0) {
this.Info("请选择年份!");
return;
}
if (this.addMsg.MonthStr == 0) {
this.Info("请选择月份!");
return;
}
} else {
if (this.addMsg.MonthRangeStart == "") {
this.Info("请选择开始月份!");
return;
}
if (this.addMsg.MonthRangeEnd == "") {
this.Info("请选择结束月份!");
return;
}
}
if (this.addMsg.UnitPrice == 0) {
this.Info("请输入提成金额!");
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 1c46bc24
......@@ -347,7 +347,8 @@
<th>金额</th>
</tr>
<tr v-for="(fnc, findex) in outItem.FinanceIds">
<td class="cursorpointer text-decoration" @click="goFncUrl('FinancialDocumentsDetail', fnc.FinanceId)">{{fnc.FinanceId}}</td>
<td class="cursorpointer text-decoration"
@click="goFncUrl('FinancialDocumentsDetail', fnc.FinanceId)">{{fnc.FinanceId}}</td>
<td>{{moneyFormat(fnc.OriginalMoney)}}</td>
</tr>
</table>
......@@ -459,6 +460,25 @@
style="background:green; border-color:green"></el-button>
</el-popover>
</el-tooltip>
<el-tooltip class="item" effect="dark" content=" 领队/导游配置" placement="top-start"
v-if="item.LineId==14&&outItem.PriceCommonList.length>1" style="display:none;">
<el-popover placement="bottom" width="450" trigger="click">
<table class="dmcSetTable">
<tr>
<template v-for="(hItem,hIndex) in TeamHotelList">
<td>{{hItem.TCNUM}}({{hItem.TCID}})</td>
</template>
</tr>
<template v-if="TeamHotelList&&TeamHotelList.length>0">
<template v-for="(hItem,hIndex) in TeamHotelList">
</template>
</template>
</table>
<el-button @click="GetTeamHotelList(outItem.TCIDS)" slot="reference" icon="iconfont icon-suo1"
type="primary" style="background:green; border-color:green"></el-button>
</el-popover>
</el-tooltip>
</el-button-group>
</div>
</td>
......@@ -580,17 +600,19 @@
cityId: 0,
orderId: 0
},
//合团团酒店列表
TeamHotelList: [],
LeaderList: [],
showHotelObj: {
showPrice: true,//是否显示价格
showPay: true,//是否显示支付方式
showZhan: true,//占房时间
showBtnList: true,//是否下载、确认按钮
showPrice: true, //是否显示价格
showPay: true, //是否显示支付方式
showZhan: true, //占房时间
showBtnList: true, //是否下载、确认按钮
ShowTaxType: true, //显示税入税别
ShowRebateRatio: true, //显示返佣比列
ShowSupplier:true,//是否显示供应商
showCaozuoTime:true,//操作时间
colspanLength:6//跨行
ShowSupplier: true, //是否显示供应商
showCaozuoTime: true, //操作时间
colspanLength: 6 //跨行
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -759,12 +781,12 @@
})
window.open(routeData.href, '_blank');
},
goFncUrl: function(path, id) {
goFncUrl: function (path, id) {
this.$router.push({
name: path,
query: {
id: id,
blank: 'y',
blank: 'y',
}
})
},
......@@ -798,8 +820,8 @@
'flightTotal': obj.TotalSeat,
'GuestNum': obj.OrderGuestNum,
'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName':obj.LeaderName,
'GuideName':obj.GuideName,
'LeaderName': obj.LeaderName,
'GuideName': obj.GuideName,
blank: 'y',
tab: title
}
......@@ -960,7 +982,19 @@
this.$message.error(res.data.message);
}
}, err => {})
}
},
GetTeamHotelList(tcids) {
this.apipost('dmcstatistics_get_GetTeamHotelListService', {
TCIDs: tcids
}, res => {
if (res.data.resultCode == 1) {
this.TeamHotelList = res.data.data;
console.log("TeamHotelList", this.TeamHotelList);
} else {
this.$message.error(res.data.message);
}
}, err => {})
},
},
mounted() {
let myDate = new Date();
......@@ -971,6 +1005,8 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
//this.msg.CombinationNum='JVS0723OTC-MUC';
//this.msg.CombinationNum = 'JVS0617OTC-MUA';
this.getLineList();
this.getList();
this.getCompanyList();
......
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