Skip to content

S
SuperMan
Commit 143635dd authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents d781848f abeac456
Expand all Show whitespace changes
Inline Side-by-side
Showing with 767 additions and 116 deletions
src/components/FinancialModule/addFinancialDocuments.vue
View file @ 143635dd
......@@ -1271,8 +1271,10 @@ export default {
this.detailList.CostTypeId = this.orderObj.CostType?this.orderObj.CostType: '';
this.detailList.UnitPrice = this.orderObj.Money?this.orderObj.Money:0;
this.detailList.Number = this.orderObj.CostType ? 1 : 0
if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
}
}
if(data.VorcherInos){
data.VorcherInos.forEach(x=>{
x.Url = x.Content;
......
src/components/FinancialModule/addReceivablesDocuments.vue
View file @ 143635dd
......@@ -1394,8 +1394,10 @@ export default {
this.msg.Obj = this.orderObj.Obj?this.orderObj.Obj:'';
this.msg.SourceID = this.orderObj.SourceID?this.orderObj.SourceID:0;
this.msg.CallType=this.orderObj.CallType?this.orderObj.CallType:0;
if (!JSON.parse(sessionStorage.getItem("saveGuestInfo"))){
this.Description = this.orderObj.laRemark?this.orderObj.laRemark:'';
}
}
if(data.VorcherInos){
data.VorcherInos.forEach(x=>{
x.Url = x.Content;
......
src/components/SalesModule/investigationDetail.vue
View file @ 143635dd
......@@ -16,10 +16,16 @@
show-text>
</el-rate>
<template v-else-if="item.SurveyType === 2">
<el-radio v-for="(r, i) in item.SurveyOptionsList" v-model="item.lable" :label="r.ID" disabled="disabled" :key="i">{{r.OptionsName}}</el-radio>
<template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'">
<span>{{r.OptionsName}}</span>
</template>
<!-- <el-radio v-for="(r, i) in item.SurveyOptionsList" v-model="item.lable" :label="r.ID" disabled="disabled" :key="i"></el-radio> -->
</template>
<template v-else-if="item.SurveyType === 3">
<el-checkbox v-for="(r, i) in item.SurveyOptionsList" v-model="item.ckeckList" :label="r.ID" disabled="disabled" :key="i">{{r.OptionsName}}</el-checkbox >
<template v-for="(r, i) in item.SurveyOptionsList" v-if="r.IsCheck!=='0'">
<span>{{r.OptionsName}}</span>
</template>
<!-- <el-checkbox v-for="(r, i) in item.SurveyOptionsList" v-model="item.ckeckList" :label="r.ID" disabled="disabled" :key="i">{{r.OptionsName}}</el-checkbox > -->
</template>
<template v-else-if="item.SurveyType === 4">
<span>{{item.TextContent}}</span>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 143635dd
......@@ -903,6 +903,32 @@
font-size: 12px;
margin-left: 10px;
}
.RL_Scenic{
width:400px;
max-height: 400px;
overflow: auto;
}
.RL_Scenic table th{
height:30px;
border: 1px solid #d2d2d2;
}
.RL_Scenic table td{
padding:9px 5px!important;
border: 1px solid #d2d2d2;
}
.RL_Scenic table ._color_666 {
background-color: #ededed;
color:#666666;
}
.RL_Scenic table{
padding: 10px 0 0 20px;
border-collapse: collapse;
border: 1px solid #d2d2d2;
font-size: 12px;
margin: 0 20px 5px 0;
width: 100%;
}
</style>
......@@ -1533,7 +1559,7 @@
<th width="150" class="nowrap">操作</th>
</tr>
<tr>
<td v-show="OrderDataList.length==0" colspan="14" align="center">暂无数据</td>
<td v-show="OrderDataList.length==0" colspan="16" align="center">暂无数据</td>
</tr>
<tr v-if="OrderDataList.leadetList!=null && OrderDataList.leadetList.length>0">
......@@ -2032,7 +2058,24 @@
<!-- <span class="RL-redType RL-remarkCon" v-else>-->
<!-- <span>暂无名单</span>-->
<!-- </span>-->
<span style="display: block">房间信息：{{childItem.OrderGuestHouseStr}}</span>
<span style="display: block">
房间信息：{{childItem.OrderGuestHouseStr}}
<el-popover trigger="click" popper-class="RL_Scenic">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;">
<th width="150">景点名称</th>
<th width="60">人数</th>
<th width="60">退款金额</th>
</tr>
<tr v-for="fItem in childItem.OrderBackScenicList" style="text-align:center;">
<td style="text-align:left;">{{fItem.CouponsName}}</td>
<td>{{fItem.Number}}</td>
<td>{{fItem.BackMoney}}</td>
</tr>
</table>
<span slot="reference" v-if="childItem.OrderBackScenicList&&childItem.OrderBackScenicList.length>0" style="color:#f56c6c;margin-left:20px;cursor:pointer;">退景点</span>
</el-popover>
</span>
<div>
<span v-if="childItem.OPTipMoney==''&&childItem.TipMoney!=''" style="color:red">（小费：{{childItem.TipMoney}}）</span>
<span v-if="childItem.OPTipMoney!=''" style="color:red">
......@@ -3325,6 +3368,7 @@
this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
this.addMsg.BabyNum = x.BabyNum.toString();
this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
this.addMsg.OrderBackScenicList=x.OrderBackScenicList;
this.IsChildrenTour = x.IsChildrenTour;
this.IsBirdDiscount = x.IsBirdDiscount;
......
src/components/dmc/manager/dmcTotalTable.vue
View file @ 143635dd
......@@ -271,7 +271,7 @@
</div>
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlT('TravelPassengerList',item.TCID,'旅客名单')">
<div class="fz16 fbold linkspan" @click="goUrlT('TravelPassengerList2',item.TCID,'旅客名单')">
<span style="color: #4BCA81;" v-if="item.HouseResult==1">√</span>
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
</div>
......
src/components/leaderPay2.vue
View file @ 143635dd
......@@ -980,42 +980,38 @@ export default {
return
}
// type 1 零件地 自动生成 2 领队人头费 跳转
let BType = 3,
AccountId = 1,
IsRelevanceTravel = 1,
TemplateId = 71,
RB_Branch_Id = userinfo.RB_Branch_id,
OrderSource = 6;
if (obj.Type == 2) {
let id = [72, 73];
let TCIDARR = [obj.TCIDs];
let orderObj = {
OrderID: 0,
OrderSource: 6,
Obj: {},
SourceID: 0,
CostType: 180,
TCIDList: TCIDARR,
Money: inputPrice,
TCNUMS: ''
};
let fullPath = `/ChoiceAddFinancialDocuments?Type=${1}&templateID=${JSON.stringify(id)}&companyID=${userinfo.RB_Branch_id}&orderObj=${JSON.stringify(orderObj)}&blank=y&tab=领队报账`;
let dom = document.querySelector("#blankLink");
dom.href = `http://${window.location.host}/#${fullPath}`;
dom.click();
} else {
BType = 1;
AccountId = 7;
IsRelevanceTravel = 0;
TemplateId = obj.OutBranchId === 0 ? 72 : 73;
RB_Branch_Id = obj.OutBranchId;
OrderSource = 8;
}
// 自动生成
let msg = {
TemplateId: 71,
RB_Branch_Id: userinfo.RB_Branch_id,
RB_Branch_Id: RB_Branch_Id,
IsPublic: 0,
BType: 4,
AccountId: 14,
BType: BType,
AccountId: AccountId,
CostTypeID: 180,
WBMoney: obj.price,
Remark: "",
TCID: obj.TCIDs,
IsRelevanceTravel: 1,
IsRelevanceTravel: IsRelevanceTravel,
OrderID: 0,
vorcherInos: [{FrIdStr:''}],
Description: "",
RemitterName: obj.LeaderOrGuidName,
TradeDate: new Date().Format("yyyy-MM-dd"),
OrderSource: 6,
OrderSource: OrderSource,
}
this.apipost('Financial_post_SetFinanceInfoCommonForIn', msg, res=>{
if (res.data.resultCode == 1) {
......@@ -1027,7 +1023,6 @@ export default {
this.$message.error(res.data.message)
}
}, null)
}
},
goZhiDan: function(obj) {
let id = [59];
......@@ -1277,7 +1272,7 @@ export default {
DiningID: ai.DiningID,
data: [ai]
});
Diningmap[ai.PlanDateStr] = ai;
Diningmap[ai.UseTimeStr] = ai;
}else{
for(var j = 0; j < Diningdest.length; j++){
var dj = Diningdest[j];
......@@ -1306,7 +1301,7 @@ export default {
TicketID: ai.TicketID,
data: [ai]
});
Scenicmap[ai.PlanDateStr] = ai;
Scenicmap[ai.UseTimeStr] = ai;
}else{
for(var j = 0; j < Scenicdest.length; j++){
var dj = Scenicdest[j];
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 143635dd
......@@ -185,7 +185,11 @@
max-height: 400px;
overflow: auto;
}
._TravelPricePopover .ScenicDiv{
width: 450px;
max-height: 400px;
overflow: auto;
}
._TravelPricePopover table {
padding: 10px 0 0 20px;
background-color: #ededed;
......@@ -664,19 +668,50 @@
<template slot="prepend">集合标识</template>
</el-input>
</el-form-item>
<el-form-item>
<span class="TP_Sendprepend" style="margin-left:0;width:120px;">可退景点</span>
<el-select class="w180" v-model="priceData.ChooseBackScenicArr" multiple >
<el-option v-for="item in priceData.scenicBackList" :key="item.ID" :label="item.Name" :value="item.ID">
</el-option>
</el-select>
</el-form-item>
<el-form-item>
</div>
<div class="clearfix">
<div class="leftSetInfo">
<span class="TPbaseSet"></span>
<span class="TPsecondTitle">可退景点</span>
</div>
<div class="TPright clearfix">
<el-popover popper-class="_TravelPricePopover" trigger="click">
<div>
<div class="ScenicDiv">
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="_color_666">选择</td>
<td class="_color_666">景点名称</td>
<td class="_color_666">退款金额</td>
</tr>
<tr v-for="item in priceData.ScenicBackList">
<td>
<el-checkbox :checked="item.IsChecked" @change="getScenic(item)"></el-checkbox>
</td>
<td>
{{item.Name}}
</td>
<td>
<el-input class="w80" @keyup.native="checkPrice(item,'RefundMoney')"
v-model="item.RefundMoney"></el-input>
</td>
</tr>
</table>
</div>
</div>
<div slot="reference" class="SimulateDrop-box">
<span class="SD_flight" v-for="subItem in ScenicList">{{subItem.Name}}</span>
<i class="iconfont icon-arrow-down SimulaDrop"></i>
</div>
</el-popover>
<el-form-item style="margin-top:1px;">
<el-input placeholder="请输入" class="w460 ComSeat" v-model="priceData.AirportService">
<template slot="prepend">机场服务</template>
</el-input>
</el-form-item>
</div>
</div>
<div class="clearfix">
<div class="leftSetInfo">
<span class="TPbaseSet"></span>
......@@ -973,6 +1008,8 @@
offerList: [],
selectFilghtList: [],
FinfoList: [],
//选中景点
ScenicList:[],
//下拉框默认值
SelectDefaultValue: 0,
SelectOtherDefault: -1,
......@@ -1142,10 +1179,8 @@
ChooseHotelArray: [],
//销售清位时间
SaleClearOrderHour: 0,
//可退景点选择列表
chooseBackScenicArr:[],
//可退景点下拉列表
scenicBackList:[],
ScenicBackList:[],
};
}
this.returnPriceList.push(objItem);
......@@ -1538,6 +1573,20 @@
}
});
},
//选中景点选择框
getScenic(item){
item.IsChecked=!item.IsChecked;
this.initScenic();
},
//初始化景点
initScenic(){
this.ScenicList=[];
this.priceData.ScenicBackList.forEach(x=>{
if(x.IsChecked){
this.ScenicList.push(x);
}
})
},
goUrl(path, id) {
this.$router.push({
name: path,
......@@ -1735,6 +1784,7 @@
x["Checked"] = true;
this.chooseDay = this.priceData.StartDate;
this.initFlightData();
this.initScenic();
} else {
x["Checked"] = false;
}
......
src/router/config.js
View file @ 143635dd
......@@ -1816,6 +1816,14 @@ export default {
title: '旅客名单'
},
},
{
path: '/TravelPassengerList2', //旅客名单
name: 'TravelPassengerList2',
component: resolve => require(['@/components/TravelManager/TravelList/TravelPassengerList2'], resolve),
meta: {
title: '旅客名单'
},
},
{
path: '/RegistrationList',
name: 'RegistrationList',
......
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