Skip to content

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

解决提交冲突

parents 9f5c021b b1e81391
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1018 additions and 332 deletions
src/assets/common/lang/zh.js
View file @ 81734d95
...@@ -614,6 +614,7 @@ export const visa = { ...@@ -614,6 +614,7 @@ export const visa = {
v_weiwanshan:'未完善', v_weiwanshan:'未完善',
v_weibangding:'未绑定', v_weibangding:'未绑定',
v_chulizhong:'处理中', v_chulizhong:'处理中',
v_lvkebianma:'旅客编码',
} }
export const advmanager = { export const advmanager = {
v_all:'全部', v_all:'全部',
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 81734d95
...@@ -161,6 +161,7 @@ ...@@ -161,6 +161,7 @@
<el-option key="0" value="0" label="不限"></el-option> <el-option key="0" value="0" label="不限"></el-option>
<el-option key="1" value="1" label="收入"></el-option> <el-option key="1" value="1" label="收入"></el-option>
<el-option key="2" value="2" label="支出"></el-option> <el-option key="2" value="2" label="支出"></el-option>
<el-option key="2" value="4" label="资金调拨"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
......
src/components/FinancialModule/FinancialSubmodule/FlowChartModule.vue
View file @ 81734d95
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
deep: true deep: true
} }
},created(){ },created(){
this.dataList = this.data this.dataList = this.data;
} }
} }
</script> </script>
src/components/FinancialModule/RecPayQueryTeam.vue
View file @ 81734d95
...@@ -245,32 +245,49 @@ ...@@ -245,32 +245,49 @@
<th>团队编号</th> <th>团队编号</th>
<th>发团日期</th> <th>发团日期</th>
<th>订单号</th> <th>订单号</th>
<th>客户信息</th>
<th>业务员</th> <th>业务员</th>
<th>应收金额</th> <th>应收金额</th>
<th>实收金额</th> <th>实收金额</th>
<th>待收金额</th> <th>待收金额</th>
<th>已退款</th> <th>已退款</th>
<th>平台税金</th> <th>平台税金</th>
<th>在途金额</th>
</tr> </tr>
<tr v-for=" ( item , index ) in DataList "> <tr v-for=" ( item , index ) in DataList ">
<td> <span class="_link_hover" @click="jumpPage('RegistrationList', item.TCID, 1, 0)"> {{ item.TCNUM }} （{{ item.TCID }}） </span> </td> <td> <span class="_link_hover" @click="jumpPage('RegistrationList', item.TCID, 1, 0)"> {{ item.TCNUM }} （{{ item.TCID }}） </span> </td>
<td> {{ item.StartDate }} </td> <td> {{ item.StartDate }} </td>
<td colspan="7"> <td colspan="9">
<table class="_singeRowTable_two" style="width: 100%;table-layout: fixed;border-collapse: collapse;" cellspacing="0" cellpadding="0" border="0"> <table class="_singeRowTable_two" style="width: 100%;table-layout: fixed;border-collapse: collapse;" cellspacing="0" cellpadding="0" border="0">
<tbody> <tbody>
<tr v-for=" ( son , sIndex ) in item.OrderList "> <tr v-for=" ( son , sIndex ) in item.OrderList ">
<td> <span class="_link_hover" @click="jumpPage('RegistrationList', son.OrderId, 2, item.TCID)"> {{ son.OrderId }} </span> </td> <td> <span class="_link_hover" @click="jumpPage('RegistrationList', son.OrderId, 2, item.TCID)"> {{ son.OrderId }} </span> </td>
<td> {{ son.ContactName }} </td>
<td> {{ son.EmName }} </td> <td> {{ son.EmName }} </td>
<td> {{ son.PreferPrice }} </td> <td> {{ son.PreferPrice }} </td>
<td> <span :class="son.DaiShou > 0 ? '':'_color_red'"> {{ son.Income }} </span> </td> <td> <span :class="son.DaiShou > 0 ? '_color_red':''"> {{ son.Income }} </span> </td>
<td>{{ son.DaiShou}} </td> <td>{{ son.DaiShou}} </td>
<td> {{ son.Refund }} </td> <td> {{ son.Refund }} </td>
<td> {{ son.PlatformTax }} </td> <td> {{ son.PlatformTax }} </td>
<td> {{ son.ZaiTuMoney }} </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
</td> </td>
</tr> </tr>
<tr>
<td>合计</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td>{{Statistics.PreferPrice}}</td>
<td>{{Statistics.Income}}</td>
<td>{{Statistics.DueinMoney}}</td>
<td>{{Statistics.Refund}}</td>
<td>{{Statistics.PlatformTax}}</td>
<td>{{Statistics.ZaiTuMoney}}</td>
</tr>
</table> </table>
<div class="noDataNotice" v-if="noData"> <div class="noDataNotice" v-if="noData">
<i class="iconfont icon-kong"></i> <i class="iconfont icon-kong"></i>
...@@ -332,6 +349,7 @@ export default { ...@@ -332,6 +349,7 @@ export default {
IsLeave:0, IsLeave:0,
}, },
DataList:[], DataList:[],
Statistics:{},
DepartmentList:[], DepartmentList:[],
EmployeeList:[], EmployeeList:[],
CompanyList:[], CompanyList:[],
...@@ -485,7 +503,8 @@ export default { ...@@ -485,7 +503,8 @@ export default {
this.apipost('Financial_post_GetInComePayInfoList',this.msg,res=>{ this.apipost('Financial_post_GetInComePayInfoList',this.msg,res=>{
if(res.data.resultCode == 1) { if(res.data.resultCode == 1) {
this.total = res.data.data.count; this.total = res.data.data.count;
this.DataList = res.data.data.pageData; this.DataList = res.data.data.pageData.List;
this.Statistics=res.data.data.pageData.Statistics;
if(this.DataList.length==0){ if(this.DataList.length==0){
this.noData = true; this.noData = true;
}else{ }else{
......
src/components/FinancialModule/addCapitalAllocation.vue
View file @ 81734d95
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
<div class="page_addCapitalAllocation" v-loading="loading"> <div class="page_addCapitalAllocation" v-loading="loading">
<div class="_top"> <div class="_top">
<p>四川和平国际旅行社有限公司</p> <p>四川和平国际旅行社有限公司</p>
<p><span>资金调拨单</span></p> <p><span>{{msg.TemplateId==34?'总部':'分公司'}}资金调拨单</span></p>
</div> </div>
<div class="_conten"> <div class="_conten">
<ul v-if="inList.length"> <ul v-if="inList.length">
...@@ -404,10 +404,10 @@ export default { ...@@ -404,10 +404,10 @@ export default {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.msg.RB_Depart_Id = userInfo.RB_Department_Id; this.msg.RB_Depart_Id = userInfo.RB_Department_Id;
this.msg.RB_Branch_Id = userInfo.RB_Branch_id; this.msg.RB_Branch_Id = userInfo.RB_Branch_id;
if(this.msg.RB_Branch_id===0 || this.msg.RB_Branch_id===45 || this.msg.RB_Branch_id===49){ if(this.msg.RB_Branch_Id===0 || this.msg.RB_Branch_Id===45 || this.msg.RB_Branch_Id===49){
this.msg.TemplateId=35; this.msg.TemplateId=34;
}else{ }else{
this.msg.TemplateId=36; this.msg.TemplateId=35;
} }
} }
}, },
......
src/components/Hotel/roomReservationsDetails.vue
View file @ 81734d95
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle"> <div style="width: 100%; overflow-x: auto;padding-bottom: 10px; " class="ownScrollbarStyle">
<table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe"> <table border="0" cellspacing="1" cellpadding="0" class="roomReservationsDetailsTalbe">
<tr> <tr>
<th class="fz14" colspan="10">团队信息</th> <th class="fz14" colspan="10">团队信息(定团号：{{NewCombinationNum}})</th>
<th class="fz14" colspan="12">地接操作信息</th> <th class="fz14" colspan="12">地接操作信息</th>
</tr> </tr>
<tr> <tr>
...@@ -306,9 +306,10 @@ export default { ...@@ -306,9 +306,10 @@ export default {
}, },
mounted() { mounted() {
this.TCNUM=this.$route.query.TCNUM this.TCNUM=this.$route.query.TCNUM;
this.flightTotal=this.$route.query.flightTotal this.flightTotal=this.$route.query.flightTotal;
this.GuestNum=this.$route.query.GuestNum this.GuestNum=this.$route.query.GuestNum;
this.NewCombinationNum=this.$route.query.NewCombinationNum;
this.getList() this.getList()
// this.getHotelList() // this.getHotelList()
}, },
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 81734d95
...@@ -4,8 +4,9 @@ ...@@ -4,8 +4,9 @@
<tr> <tr>
<th width="8%">出发地</th> <th width="8%">出发地</th>
<th width="30%">行程名称</th> <th width="30%">行程名称</th>
<th width="15%">团号</th> <th width="10%">团号</th>
<th width="15%">出发时间</th> <th width="10%">定团号</th>
<th width="10%">出发时间</th>
<th width="8%">天数</th> <th width="8%">天数</th>
<th width="8%">出团人数</th> <th width="8%">出团人数</th>
<th width="8%">领队</th> <th width="8%">领队</th>
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
<div class="padding10">{{item.Titles}}</div> <div class="padding10">{{item.Titles}}</div>
</td> </td>
<td>{{item.TCNUMS}}</td> <td>{{item.TCNUMS}}</td>
<td>{{NewCombinationNum}}</td>
<td>{{item.FlightDate}}</td> <td>{{item.FlightDate}}</td>
<td>{{item.DayNum}}天</td> <td>{{item.DayNum}}天</td>
<td>{{item.TotalSeat}}人</td> <td>{{item.TotalSeat}}人</td>
...@@ -566,6 +568,8 @@ ...@@ -566,6 +568,8 @@
TravelDayNum:0, TravelDayNum:0,
RealityNum:0, RealityNum:0,
UseCount:'', UseCount:'',
//定团号
NewCombinationNum:'',
} }
}, },
methods: { methods: {
...@@ -736,8 +740,9 @@ ...@@ -736,8 +740,9 @@
}, },
}, },
mounted() { mounted() {
this.isUpdate=this.$route.query.isUpdate this.isUpdate=this.$route.query.isUpdate;
this.msg.TCIDs=this.$route.query.id this.msg.TCIDs=this.$route.query.id;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getNav() this.getNav()
this.getList() this.getList()
} }
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 81734d95
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe"> <table border="0" cellspacing="1" cellpadding="0" class="bookDinnerStatisticsTalbe">
<tr> <tr>
<th width="120">公司团号</th> <th width="120">公司团号</th>
<th width="130">定团号</th>
<th width="150">用餐时间</th> <th width="150">用餐时间</th>
<th width="200">餐厅名称</th> <th width="200">餐厅名称</th>
<th width="200">修改餐厅</th> <th width="200">修改餐厅</th>
...@@ -34,11 +35,14 @@ ...@@ -34,11 +35,14 @@
</tr> </tr>
<tr v-for="(item,index) in list"> <tr v-for="(item,index) in list">
<td :rowspan="list.length" v-if="index==0"> <td :rowspan="list.length" v-if="index==0">
<div class="w120"> <div class="w120">
<p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p> <p class="link" @click="goUrlT('productQuery',TCNUM,'产品查询')">{{TCNUM}}</p>
</div> </div>
</td> </td>
<td> <td :rowspan="list.length" v-if="index==0">
<div class="w120" style="margin:0 5px;">{{NewCombinationNum}}</div>
</td>
<td>
<div class="w120">{{item.UseTimeStr}}</div> <div class="w120">{{item.UseTimeStr}}</div>
</td> </td>
<td> <td>
...@@ -214,6 +218,7 @@ export default { ...@@ -214,6 +218,7 @@ export default {
TCNUM: "", TCNUM: "",
flightTotal: 0, flightTotal: 0,
GuestNum: 0, GuestNum: 0,
NewCombinationNum:'',
}; };
}, },
methods: { methods: {
...@@ -326,6 +331,7 @@ export default { ...@@ -326,6 +331,7 @@ export default {
mounted() { mounted() {
this.TCNUM = this.$route.query.TCNUM; this.TCNUM = this.$route.query.TCNUM;
this.GuestNum= this.$route.query.GuestNum; this.GuestNum= this.$route.query.GuestNum;
this.NewCombinationNum = this.$route.query.NewCombinationNum;
this.getList(); this.getList();
} }
}; };
......
src/components/SalesVisa/OrderSplitting.vue 0 → 100644
View file @ 81734d95
<style scoped>
._vad_top{padding: 20px 0}
._vad_top>span._num{height:30px;background:#E3E3E3;border-radius:4px;display: inline-block;padding: 5px 10px;font-size: 14px;font-weight: bold}
.wrapper .singeRowTable tr{border-bottom: 1px solid #E3E3E3;margin-bottom: 10px;box-shadow: 0px 1px 0px rgba(227,227,227,1);margin-bottom: 20px;}
.wrapper .singeRowTable tr th:hover,.wrapper .singeRowTable tr td:hover{background-color: #FFFFFF}
.wrapper .singeRowTable tr th,.wrapper .singeRowTable tr td{background-color: #FFFFFF;text-align: center}
.wrapper .singeRowTable .text_left{text-align: left;padding-left: 25px}
.wrapper ._head_img{width: 24px;height: 24px;border-radius: 50%;}
.wrapper .singeRowTable td img{vertical-align:middle;}
.wrapper .singeRowTable .iconfont,.iconfont.icon-iconfontremind{color: #E95252}
.iconfont.icon-iconfontremind{font-size: 24px;cursor: pointer;}
.wrapper ._radius {display: inline-block;width: 24px;height: 24px;background-color: #FF793E;color: #fff;border-radius: 50%;text-align: center;line-height: 22px;font-size: 12px;margin-right: 10px;}
.wrapper ._radius._tuan{background-color: #3EABFF}
.wrapper .icon-img_delete_small{cursor: pointer;}
</style>
<template>
<div class="wrapper">
<div class="_vad_top clearfix">
<!-- <el-button @click="OrderSplit" style="float:right;background:#E95252;color:#fff" size="mini">拆分</el-button> -->
<!-- <span class="_num PingFangSC">{{$t('visa.v_tuan')}}：{{num}}</span>
<div class="fr">
<el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
{{$t('visa.v_tvisa')}}
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(item,index) in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-dropdown split-button type="primary" trigger="click" @command="bindVisa">
{{$t('visa.v_gvisa')}}
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="(item,index) in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>-->
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" style=" border-spacing:0 10px;" v-loading="loading">
<tr>
<th width=150 class="text_left"> <input type="checkbox" @change="checkAll" v-model="checkd" > {{$t('visa.v_lvkebianma')}}</th>
<th>{{$t('visa.v_youkeName')}}</th>
<th>{{$t('visa.v_guanlianyewu')}}</th>
<th>{{$t('visa.v_ziliaowanshan')}}</th>
<th>{{$t('visa.v_visaType')}}</th>
<th>{{$t('visa.v_qianzhengst')}}</th>
<th>{{$t('admin.admin_czPerson')}}</th>
<!-- <th>{{$t('hotel.table_operat')}}</th> -->
</tr>
<tr v-for="(item,index) in dataList">
<td width=150 class="text_left"> <input type="checkbox" :disabled="item.IsSplit!=1" v-model="checkList" :value="item.Id" @change="checkThis"> {{item.Id}}</td>
<td>{{item.GuestName}}</td>
<td><img class="_head_img" :src="item.SalesManPhoto" alt=""> {{item.SalesMan}}</td>
<td>
<span v-if="item.IsDataFull==2">{{$t('visa.v_yiwanshan')}}</span>
<span v-if="item.IsDataFull==1">{{$t('visa.v_weiwanshan')}}</span>
<span v-if="item.IsDataFull==0">{{$t('visa.v_weibangding')}}</span>
<!-- <i v-if="item.IsDataFull==1||item.IsDataFull==0" class="iconfont icon-iconfontremind" @click="UrgeGuestInfo(item.Id,item.EmployeeId)" style="vertical-align:middle;"></i> -->
</td>
<td>
{{item.VisaName}}
<span v-if="item.SignStatus==1" class="_radius" >{{$t('visa.v_dan')}}</span>
<span v-if="item.SignStatus==2" class="_radius _tuan">{{$t('visa.v_tuan')}}</span>
</td>
<td>
<span v-if="item.ApplyStatus==0">{{$t('visa.v_chulizhong')}}</span>
<img v-if="item.ApplyStatus==1" src="../../assets/img/pass@2x.png" alt="">
<img v-if="item.ApplyStatus==2" src="../../assets/img/fail@2x.png" alt="">
</td>
<td>{{item.UpdateName}} <img class="_head_img" :src="item.UpdatePhoto" alt=""></td>
<!-- <td> <i @click="deletelist(item.Id)" class="iconfont icon-img_delete_small"></i></td> -->
</tr>
</table>
</div>
</template>
<script>
export default {
components:{},
props:{},
data(){
return {
id:0,
num:0,
VisaManagementList:[],
dataList:[],
checkList:[],
checkListAll:[],
loading:false,
checkd:false,
StatusList:[
{
Id:'-1',
Name:'不限'
},{
Id:'0',
Name:'待处理'
},
{
Id:'1',
Name:'通过'
},{
Id:'2',
Name:'拒签'
},
],
}
},
watch:{},
computed:{},
methods:{
// 订单拆分
OrderSplit(){
},
checkThis(){ // 单选
if(this.checkList.length==this.checkListAll.length){
this.checkd = true
return
}
this.checkd = false
},
checkAll(){ //全选
if(this.checkList.length==this.checkListAll.length){
this.checkList=[]
return
}
this.checkList = this.checkListAll
},
getVisaManagementList(){ // 获取签证管理
this.apipost('dmc_get_visa_GetVisaManagementList',{Status:0,BranchId:-1,SignStatus:0},res=>{
if(res.data.resultCode==1){
this.VisaManagementList = res.data.data
}else{
this.$message.error(res.data.message)
}
},err=>{})
},
getData(){ //获取数据
this.loading = true
this.checkListAll=[]
this.apipost('dmc_get_GetTCGuestSplitList',{OrderId:this.id},res=>{
console.log("res",res);
if(res.data.resultCode==1){
this.dataList = res.data.data
this.dataList.forEach(x=>{
if(x.IsSplit==
1){
this.checkListAll.push(x.Id)
}
})
}else{
this.$message.error(res.data.message)
}
this.loading = false
},err=>{})
}
},
created(){},
mounted(){
this.id = this.$route.query.id
this.num = this.$route.query.num
this.getVisaManagementList()
this.getData()
}
}
</script>
src/components/SalesVisa/VisaProductOrder.vue
View file @ 81734d95
...@@ -177,8 +177,14 @@ ...@@ -177,8 +177,14 @@
<el-tooltip v-if="item.Income<=0&&item.VisaOrderStatus==1&&item.UpdateStatus==1" class="item" effect="dark" content="取消" placement="top-start"> <el-tooltip v-if="item.Income<=0&&item.VisaOrderStatus==1&&item.UpdateStatus==1" class="item" effect="dark" content="取消" placement="top-start">
<el-button type="primary" style='background:#E95252; border-color:#E95252;' icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button> <el-button type="primary" style='background:#E95252; border-color:#E95252;' icon="iconfont icon-xingzhuangkaobei" @click='cancelOrder(item)'></el-button>
</el-tooltip> </el-tooltip>
<!-- 订单拆分 -->
<el-tooltip v-if="item.PeopleNum==item.GuestList.length" class="item" effect="dark" content="订单拆分" placement="top-start">
<el-button type="primary" style='background:#47BF8C; border-color:#47BF8C;' icon="el-icon-edit" @click="goUrl2('OrderSplitting',item.Id,'订单拆分')"></el-button>
</el-tooltip>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="12" class="RL_Order" style="height:40px;"> <td colspan="12" class="RL_Order" style="height:40px;">
<span class="VO-remarkTitle">名单:</span> <span class="VO-remarkTitle">名单:</span>
...@@ -298,7 +304,7 @@ export default { ...@@ -298,7 +304,7 @@ export default {
this.loading = false; this.loading = false;
this.dataList.forEach(x=>{ this.dataList.forEach(x=>{
this.PreferPrice+=x.TotalPrice; this.PreferPrice+=x.TotalPrice;
this.IncomePrice+=x.Income; this.IncomePrice+=(x.Income+x.PlatformTax-x.RefundMoney);
}) })
} }
},err=>{}) },err=>{})
......
src/components/Ticketing/PassengerList.vue
View file @ 81734d95
<style> <style>
.PT_teamTable { .PT_teamTable {
width: 754px; width: 800px;
background-color: #fff;
border-collapse: collapse; border-collapse: collapse;
} }
.PT_teamTable td, .PT_teamTable td,
.PT_teamTable th { .PT_teamTable th {
border: 1px solid #dcdcdc; border: 1px solid #dcdcdc;
padding: 5px; padding: 6px;
height: 30px; height: 30px;
} }
.PT_teamTable tr th { .PT_teamTable tr th {
...@@ -27,6 +28,48 @@ ...@@ -27,6 +28,48 @@
.Tp_table .el-table .cell { .Tp_table .el-table .cell {
line-height: 3 !important; line-height: 3 !important;
} }
.passgenrDialog{
width:900px;
}
.PgflightDiv{
font-size: 12px;
color: #666666;
background-color: #e0f4ff;
width: 230px;
height: 175px;
border-radius: 4px;
float:left;
margin-right:10px;
}
.PgflightDiv p:first-child{
padding-left:8px;
color: #387ea5;
background-color: #cbe9fa;
height: 34px;
line-height: 34px;
}
.PgflightDiv ._add_info{
margin-top: 12px;
padding: 0 12px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.pg_table{
width:100%;
}
.pg_table tr{
display: block;
margin:10px 0;
}
.pg_table tr:last-child{
border-top:1px dashed #d1d1d1;
padding-top:10px;
}
.PassengerList .el-input,.el-input__inner{
height:23px!important;
padding:0 5px;
}
</style> </style>
<template> <template>
...@@ -50,7 +93,7 @@ ...@@ -50,7 +93,7 @@
</table> </table>
</li> </li>
<li> <li>
<input type="button" class="normalBtn" value="导出报表" @click="exportExcel()" /> <input type="button" class="normalBtn" value="导出报表" @click="getFlightInfo()" />
</li> </li>
</ul> </ul>
</div> </div>
...@@ -86,6 +129,85 @@ ...@@ -86,6 +129,85 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="msg.currentPage" layout="total,prev, pager, next, jumper"
:page-size='msg.PageSize' :total='msg.total'> :page-size='msg.PageSize' :total='msg.total'>
</el-pagination> </el-pagination>
<el-dialog custom-class='passgenrDialog' title="航班列表" :visible.sync="outerVisible" center>
<div>
<table border=0 class="pg_table">
<tr>
<td width="50" style="vertical-align:top;">去程</td>
<td>
<div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==1">
<p>
<span class="iconfont icon-hangban"></span>
<span>{{item.Flight_number}}</span>
<span>
<el-input class="w69" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>-
<el-input class="w69" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
</span>
</p>
<el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('Airticket.Air_StartTime')}}：{{item.FlightDate}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_flightAir')}}：{{item.dName}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
</p>
</el-tooltip>
</div>
</td>
</tr>
<tr>
<td width="50" style="vertical-align:top;">回程</td>
<td>
<div class="PgflightDiv" v-for="item in flightList" v-if="item.FlightSubType==3">
<p>
<span class="iconfont icon-hangban"></span>
<span>{{item.Flight_number}}</span>
<span>
<el-input class="w69" v-model="item.TicketDepartureTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>-
<el-input class="w69" v-model="item.TicketArrivalTime" onkeyup="value=value.replace(/[^\d^\:]/g,'')"></el-input>
</span>
</p>
<el-tooltip class="item" effect="dark" :content="item.FlightDate" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('Airticket.Air_StartTime')}}：{{item.FlightDate}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.dName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_flightAir')}}：{{item.dName}}</span>
</p>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="item.aName" placement="top-start"
popper-class="max-w250">
<p class="_add_info">
<span>{{$t('system.query_arrivalAir')}}：{{item.aName }}</span>
</p>
</el-tooltip>
</div>
</td>
</tr>
</table>
</div>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="getCheckInfo()">{{$t('pub.saveBtn')}}</button> &nbsp;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div> </div>
</template> </template>
...@@ -112,7 +234,9 @@ ...@@ -112,7 +234,9 @@
nowDate: "", nowDate: "",
//模板代码 //模板代码
TempCode: "" TempCode: ""
} },
outerVisible:false,
flightList:[],
}; };
}, },
methods: { methods: {
...@@ -140,8 +264,48 @@ ...@@ -140,8 +264,48 @@
err => {} err => {}
); );
}, },
exportExcel() { getFlightInfo() {
//导出报表 //导出报表
let msg = {
ID:this.$route.query.id
}
this.apipost("ticket_get_GetEntityExtend", msg,res => {
if (res.data.resultCode == 1) {
this.flightList = res.data.data.flightList;
} else {
this.Error(res.data.message);
}
},err => {}
);
this.outerVisible = true;
},
//确定
getCheckInfo(){
let FlightList = []
this.flightList.forEach(x=>{
var obj = {
ID:x.ID,
TicketDepartureTime:x.TicketDepartureTime,
TicketArrivalTime:x.TicketArrivalTime
}
FlightList.push(obj);
})
let msg = {
AirTicketId:this.$route.query.id,
FlightList:FlightList
}
this.apipost("ticket_post_SetFlightChildConfirm", msg ,res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.exportExcel();
this.outerVisible = false;
} else {
this.Error(res.data.message);
}
},err => {}
);
},
exportExcel(){
let msg = { let msg = {
AirTicketId: this.msg.AirTicketId AirTicketId: this.msg.AirTicketId
}; };
...@@ -164,6 +328,8 @@ ...@@ -164,6 +328,8 @@
} }
this.GetLocalFile("travel_get_GetAirTicketGuestExport", msg, fileName); this.GetLocalFile("travel_get_GetAirTicketGuestExport", msg, fileName);
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); this.getList();
......
src/components/Ticketing/flightManagement.vue
View file @ 81734d95
...@@ -229,6 +229,10 @@ ...@@ -229,6 +229,10 @@
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-else> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-else>
<el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button> <el-button type="danger" icon="el-icon-delete" circle @click="deletelist(index,1)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="效期维护" placement="top-start" style="display:none;">
<el-button type="danger" icon="el-icon-delete" circle @click="gotoChild(item)"></el-button>
</el-tooltip>
</el-row> </el-row>
</td> </td>
</tr> </tr>
...@@ -814,6 +818,18 @@ ...@@ -814,6 +818,18 @@
}, },
err => {} err => {}
); );
},
//跳转到子项
gotoChild(item)
{
this.$router.push({
name: "flightChild",
query: {
id: item.ID,
blank: 'y',
tab: "航班有效期维护"
}
})
} }
}, },
mounted() { mounted() {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 81734d95
...@@ -4115,7 +4115,7 @@ submitYSZEForm(){ ...@@ -4115,7 +4115,7 @@ submitYSZEForm(){
if (res.data.resultCode === 1) { if (res.data.resultCode === 1) {
this.getList(); this.getList();
this.getConfig(); this.getConfig();
this.Info(res.data.message); this.Success(res.data.message);
} else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 81734d95
...@@ -396,8 +396,8 @@ ...@@ -396,8 +396,8 @@
({{subItem.DIATA}}){{subItem.DepartureName}} ({{subItem.DIATA}}){{subItem.DepartureName}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}} {{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
{{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}} {{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span> <span v-if="item.OutNotice==1" class="TCL-greenType">【确定】</span>
<span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span> <span v-else class="TCL-redType">【暂定】</span>
</span> </span>
</div> </div>
</div> </div>
......
src/components/TravelManager/TravelList/TravelControlListSale.vue
View file @ 81734d95
...@@ -324,8 +324,8 @@ ...@@ -324,8 +324,8 @@
{{subItem.DepartureName}} {{subItem.DepartureName}}
{{subItem.StopoverName==""?"":"-"+subItem.StopoverName}} {{subItem.StopoverName==""?"":"-"+subItem.StopoverName}}
{{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}} {{subItem.ArrivalCityName==""?"":"-"+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span> <span v-if="subItem.OutNotice==1" class="TCL-greenType">【确定】</span>
<span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span> <span v-else class="TCL-redType">【暂定】</span>
</span> </span>
</div> </div>
</div> </div>
......
src/components/dmc/manager/LeaderHander.vue
View file @ 81734d95
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
.LH_contentDiv { .LH_contentDiv {
width: 1000px; width: 1000px;
height: 1500px; height: 1500px;
position: relative; position: absolute;
background-color: #fff; background-color: #fff;
padding: 20px 10px; padding: 20px 10px;
} }
...@@ -100,26 +100,34 @@ ...@@ -100,26 +100,34 @@
top: 20px; top: 20px;
right: 20px; right: 20px;
} }
@media print {
.LH_btnList,.nav{display:none;}
}
</style> </style>
<template> <template>
<div class="LH_contentDiv" v-if="isShow" id="print"> <div class="LH_contentDiv" v-if="isShow" id="print">
<div class="LH_btnList"> <div class="LH_btnList">
<input type="button" v-if="ishowBtn" @click="saveDelivery()" value="保存" class="normalBtn"/> <input type="button" @click="saveDelivery()" value="保存" class="normalBtn"/>
<input type="button" v-if="ishowBtn" value="打印" @click.prevent="doPrint" class="normalBtn"/> <input type="button" value="打印" @click.prevent="doPrint" class="normalBtn"/>
</div> </div>
<table class="Lh_Toptable"> <table class="Lh_Toptable">
<tr> <tr>
<th class="Lh_title" colspan="9">印象之旅 领队/导游/送机交接单（日本线）</th> <th class="Lh_title" colspan="9">印象之旅 领队/导游/送机交接单（日本线）</th>
</tr> </tr>
<tr>
<td colspan="9">
<div style="float:left;">团名：</div>
<div style="float:left;width:95%;">{{sendReceiptData.Title}}</div>
</td>
</tr>
<tr> <tr>
<td width="300"> <td width="300">
团号： 团号：
<el-input type="text" class="w160" v-model="sendReceiptData.TCNUM"/> <el-input type="text" class="w160" v-model="sendReceiptData.TCNUM"/>
</td> </td>
<td colspan="8"> <td colspan="8">
团名： 定团号：{{NewCombinationNum}}
<el-input type="text" class="w160" v-model="sendReceiptData.Title"/>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -185,14 +193,14 @@ ...@@ -185,14 +193,14 @@
</tr> </tr>
<tr> <tr>
<th width="180">项目</th> <th width="180">项目</th>
<th width="50">操作</th> <th width="60">操作</th>
<th width="50">领队</th> <th width="60">领队</th>
<th with="260">项目</th> <th with="260">项目</th>
<th width="50">操作</th> <th width="60">操作</th>
<th width="50">领队</th> <th width="60">领队</th>
<th width="160">项目</th> <th width="160">项目</th>
<th width="50">操作</th> <th width="60">操作</th>
<th width="50">领队</th> <th width="60">领队</th>
</tr> </tr>
<tr> <tr>
<td> <td>
...@@ -387,7 +395,8 @@ ...@@ -387,7 +395,8 @@
return { return {
isShow:false, isShow:false,
sendReceiptData: "", sendReceiptData: "",
ishowBtn:true, //定团号
NewCombinationNum:'',
}; };
}, },
methods: { methods: {
...@@ -402,6 +411,7 @@ ...@@ -402,6 +411,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.sendReceiptData = res.data.data; this.sendReceiptData = res.data.data;
console.log(this.sendReceiptData,'sssssssssssss');
this.isShow=true; this.isShow=true;
} }
}, },
...@@ -424,24 +434,13 @@ ...@@ -424,24 +434,13 @@
} }
); );
}, },
//打印 doPrint(){
doPrint() {
this.ishowBtn=false;
setTimeout(this.getPrint,500);
},
getPrint(){
let subOutputRankPrint = document.getElementById("print");
let newContent = subOutputRankPrint.innerHTML;
let oldContent = document.body.innerHTML;
document.body.innerHTML = newContent;
window.print(); window.print();
window.location.reload();
document.body.innerHTML = oldContent;
return false;
}, },
}, },
mounted() { mounted() {
this.getLeaderGuideSendReceipt(); this.getLeaderGuideSendReceipt();
this.NewCombinationNum = this.$route.query.NewCombinationNum;
} }
} }
</script> </script>
src/components/dmc/manager/dmcTotalTable.vue
View file @ 81734d95
...@@ -185,31 +185,31 @@ ...@@ -185,31 +185,31 @@
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,'领队交接表')"> <div class="fz16 fbold linkspan" @click="goUrlT('LeaderHander',item.TCID,outItem,'领队交接表')">
<span style="color: #4BCA81;" v-if="item.ResultReport.Associate==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.Associate==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.Associate=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.Associate=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,'用款计划')"> <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderReimbursement',item,outItem,'用款计划')">
<span style="color: #4BCA81;" v-if="item.ResultReport.UseMoney==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.UseMoney==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.UseMoney=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.UseMoney=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,'订房详情')"> <div class="fz16 fbold linkspan" @click="goUrl('roomReservationsDetails',item,outItem,'订房详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.HotelResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.HotelResult=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,'门票详情')"> <div class="fz16 fbold linkspan" @click="goUrl('admissionStatisticsDetails',item,outItem,'门票详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.TicketsResult==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.TicketsResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.TicketsResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.TicketsResult=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,'餐厅详情')"> <div class="fz16 fbold linkspan" @click="goUrl('bookDinnerStatisticsDetails',item,outItem,'餐厅详情')">
<span style="color: #4BCA81;" v-if="item.ResultReport.FoodsResult==1">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.FoodsResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.FoodsResult=='-1'?"x":"O"}}</span>
</div> </div>
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</div> </div>
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,'领队报账')"> <div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('leaderPay',item,outItem,'领队报账')">
<span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span> <span style="color: #4BCA81;" v-if="item.ResultReport.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.ResultReport.LeaderIsApply=='0'?"x":"O"}}</span>
</div> </div>
...@@ -389,17 +389,18 @@ ...@@ -389,17 +389,18 @@
} }
}) })
}, },
goUrlT(path, obj, title) { goUrlT(path, obj,outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
"id": obj, "id": obj,
NewCombinationNum:outItem.NewCombinationNum,
blank: 'y', blank: 'y',
tab: title tab: title
} }
}) })
}, },
goUrl(path, obj, title) { goUrl(path, obj,outItem, title) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -407,7 +408,7 @@ ...@@ -407,7 +408,7 @@
'TCNUM': obj.TCNUMS, 'TCNUM': obj.TCNUMS,
'flightTotal': obj.TotalSeat, 'flightTotal': obj.TotalSeat,
'GuestNum': obj.CommonReport.HouseStatistics.RealityNum, 'GuestNum': obj.CommonReport.HouseStatistics.RealityNum,
'NewCombinationNum': obj.NewCombinationNum, 'NewCombinationNum': outItem.NewCombinationNum,
blank: 'y', blank: 'y',
tab: title tab: title
} }
...@@ -426,11 +427,13 @@ ...@@ -426,11 +427,13 @@
} }
}) })
}, },
goUrlLeaderIsApply(path, obj, title) { goUrlLeaderIsApply(path, obj,outItem, title) {
console.log(outItem,'outItem');
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
"id": obj.TCIDS, "id": obj.TCIDS,
NewCombinationNum:outItem.NewCombinationNum,
isUpdate: false, isUpdate: false,
blank: 'y', blank: 'y',
tab: title tab: title
...@@ -560,7 +563,6 @@ ...@@ -560,7 +563,6 @@
} }
.dmcTotalTable tr td .pMsgStyle { .dmcTotalTable tr td .pMsgStyle {
;
padding: 0 10px; padding: 0 10px;
line-height: 20px; line-height: 20px;
} }
......
src/components/dmc/manager/teamReimbursement.vue
View file @ 81734d95
...@@ -384,7 +384,7 @@ ...@@ -384,7 +384,7 @@
<el-button-group> <el-button-group>
<el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button> <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
<!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 --> <!-- <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 -->
<el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 <el-button v-show="outItem.TravelPriceList.LeaderApplyStatus==1" @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
</el-button> </el-button>
</el-button-group> </el-button-group>
......
src/components/leaderPay2.vue
View file @ 81734d95
...@@ -223,10 +223,10 @@ ...@@ -223,10 +223,10 @@
<td>{{totalHotelPrice}}</td> <td>{{totalHotelPrice}}</td>
</tr> </tr>
</table> </table>
<el-input type="textarea" v-if="isShowRemark" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/> <el-input type="textarea" v-show="dataList.LeaderApply.Status==1" placeholder="请输入备注信息" v-model="dataList.LeaderApply.AccountForReason" class="wLeader2"/>
<div class="btnListDiv"> <div class="btnListDiv" >
<input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过"/> <input type="button" class="leader2Btn" @click="AuditOrder(2)" value="审核通过" v-show="dataList.LeaderApply.Status==1"/>
<input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过"/> <input type="button" class="leader2Btn" @click="AuditOrder(1)" value="审核不通过" v-show="dataList.LeaderApply.Status==1"/>
<input type="button" class="leader2Btn" value="打印" @click="printTable()"> <input type="button" class="leader2Btn" value="打印" @click="printTable()">
</div> </div>
</div> </div>
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 81734d95
...@@ -209,9 +209,9 @@ ...@@ -209,9 +209,9 @@
this.FeatureData.FeatureHtmlJson.d && this.FeatureData.FeatureHtmlJson.d &&
this.FeatureData.FeatureHtmlJson.d.length > 0 this.FeatureData.FeatureHtmlJson.d.length > 0
) { ) {
// console.log("to do something"); //to do something
} else { } else {
// this.$set(this.FeatureData, "DayList", data); //this.$set(this.FeatureData, "DayList", data);
this.$refs.TravelFeature.setNewDate(data); this.$refs.TravelFeature.setNewDate(data);
} }
}, },
...@@ -589,7 +589,6 @@ ...@@ -589,7 +589,6 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
console.log("tempData",tempData);
if (tempData.Feature != null) { if (tempData.Feature != null) {
this.FeatureData.ID = tempData.Feature.ID; this.FeatureData.ID = tempData.Feature.ID;
this.FeatureData.ConfigId = tempData.Feature.ConfigId; this.FeatureData.ConfigId = tempData.Feature.ConfigId;
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature2.vue
View file @ 81734d95
...@@ -1666,11 +1666,6 @@ ...@@ -1666,11 +1666,6 @@
watch:{ watch:{
data:{ data:{
handler: function (val, oldVal) { handler: function (val, oldVal) {
// console.log(val.DayList.length);
// console.log(oldVal.DayList.length);
// if (val && (val.DayList.length !== oldVal.DayList.length)) {
// console.log('ssss')
// }
}, },
deep: true deep: true
} }
......
src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue
View file @ 81734d95
...@@ -1170,7 +1170,6 @@ ...@@ -1170,7 +1170,6 @@
}, },
methods: { methods: {
DataComparison: function () { // 数据对比 DataComparison: function () { // 数据对比
console.log("DataComparison")
let newVal = this.newVal; let newVal = this.newVal;
let newRestaurantObj = { let newRestaurantObj = {
title:{ title:{
...@@ -1201,14 +1200,9 @@ ...@@ -1201,14 +1200,9 @@
deleteRestaurantHistory = []; deleteRestaurantHistory = [];
//json 历史数据 jsonDelete 历史删除数据 //json 历史数据 jsonDelete 历史删除数据
let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : ''; let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
console.log(json)
let jsonDelete = this.FeatureData.FeatureHtmlJsonDelete ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)) : ''; let jsonDelete = this.FeatureData.FeatureHtmlJsonDelete ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)) : '';
// console.log("json",json)
// console.log("jsonDelete",jsonDelete)
// 历史数据组装 // 历史数据组装
// console.log("json",json)
if (JSON.stringify(json) !== '{}' && json && json.hotelObj.list && json.hotelObj.list.length>0 && this.theFirstTime) { if (JSON.stringify(json) !== '{}' && json && json.hotelObj.list && json.hotelObj.list.length>0 && this.theFirstTime) {
// console.log("json.travelFeature2",json)
this.jsonTravelFeature2 = json; this.jsonTravelFeature2 = json;
newHtelObj = json.hotelObj; newHtelObj = json.hotelObj;
newViewSpotObj = json.viewSpotObj; newViewSpotObj = json.viewSpotObj;
...@@ -1238,9 +1232,6 @@ ...@@ -1238,9 +1232,6 @@
}) })
newRestaurantObj = restaurantObj; newRestaurantObj = restaurantObj;
} }
// console.log('1newViewSpotObj',newViewSpotObj)
// console.log('1restaurantObj',newRestaurantObj)
// console.log('1newHtelObj',newHtelObj)
// 获取并组装历史删除数据 // 获取并组装历史删除数据
if (jsonDelete && jsonDelete.length>0) { if (jsonDelete && jsonDelete.length>0) {
jsonDelete.forEach(x=>{ jsonDelete.forEach(x=>{
...@@ -1264,23 +1255,18 @@ ...@@ -1264,23 +1255,18 @@
newViewSpotObj.list.push(...viewSpotObj); newViewSpotObj.list.push(...viewSpotObj);
} }
// 对比景点 newViewSpotObj this.viewSpotObj.list // 对比景点 newViewSpotObj this.viewSpotObj.list
let DalateView = travelFeatureTwo.getArrDifference(newViewSpotObj.list, this.viewSpotObj.list); let DalateView = travelFeatureTwo.getArrDifference(newViewSpotObj.list, this.viewSpotObj.list);
if (deleteViewSpotHistory.length>0) { if (deleteViewSpotHistory.length>0) {
DalateView.push(...deleteViewSpotHistory) DalateView.push(...deleteViewSpotHistory)
} }
// console.log("newViewSpotObj.list",newViewSpotObj.list)
let VSobj = {}; let VSobj = {};
console.log(this.viewSpotObj.list)
let ov = JSON.parse(JSON.stringify(this.viewSpotObj)) let ov = JSON.parse(JSON.stringify(this.viewSpotObj))
ov.list.push(...newViewSpotObj.list) ov.list.push(...newViewSpotObj.list)
// newViewSpotObj.list.push(...this.viewSpotObj.list) //1-24 因为保存后特色已更改的刷新后变为上一次保存结果,所以调换顺序进行测试
ov.list = ov.list.reduce(function(item, next) { //根据MD5Sign数组对象去重 ov.list = ov.list.reduce(function(item, next) { //根据MD5Sign数组对象去重
VSobj[next.MD5Sign] ? '' : VSobj[next.MD5Sign] = true && item.push(next); VSobj[next.MD5Sign] ? '' : VSobj[next.MD5Sign] = true && item.push(next);
return item; return item;
}, []); }, []);
// console.log("newViewSpotObj.list",newViewSpotObj.list)
DalateView.forEach((x, index)=>{ // 根据MD5Sign过滤删除数据 DalateView.forEach((x, index)=>{ // 根据MD5Sign过滤删除数据
ov.list.filter((val, vIndex)=>{ ov.list.filter((val, vIndex)=>{
if(x.MD5Sign === val.MD5Sign) if(x.MD5Sign === val.MD5Sign)
...@@ -1298,7 +1284,6 @@ ...@@ -1298,7 +1284,6 @@
let HTobj = {}; let HTobj = {};
let hv = JSON.parse(JSON.stringify(this.hotelObj)) let hv = JSON.parse(JSON.stringify(this.hotelObj))
hv.list.push(...newHtelObj.list) hv.list.push(...newHtelObj.list)
// newHtelObj.list.push(...this.hotelObj.list)
hv.list = hv.list.reduce(function(item, next) { //数组对象去重 hv.list = hv.list.reduce(function(item, next) { //数组对象去重
HTobj[next.MD5Sign] ? '' : HTobj[next.MD5Sign] = true && item.push(next); HTobj[next.MD5Sign] ? '' : HTobj[next.MD5Sign] = true && item.push(next);
return item; return item;
...@@ -1320,8 +1305,6 @@ ...@@ -1320,8 +1305,6 @@
let RTobj = {}; let RTobj = {};
let rv = JSON.parse(JSON.stringify(this.restaurantObj)) let rv = JSON.parse(JSON.stringify(this.restaurantObj))
rv.list.push(...newRestaurantObj.list) rv.list.push(...newRestaurantObj.list)
console.log("rvrvrvrvrv",rv.list)
// newRestaurantObj.list.push(...this.restaurantObj.list)
rv.list = rv.list.reduce(function(item, next) { //数组对象去重 rv.list = rv.list.reduce(function(item, next) { //数组对象去重
RTobj[next.MD5Sign] ? '' : RTobj[next.MD5Sign] = true && item.push(next); RTobj[next.MD5Sign] ? '' : RTobj[next.MD5Sign] = true && item.push(next);
return item; return item;
...@@ -1332,9 +1315,7 @@ ...@@ -1332,9 +1315,7 @@
rv.list.splice(vIndex,1) rv.list.splice(vIndex,1)
}) })
}) })
// console.log('2newViewSpotObj',newViewSpotObj)
// console.log('2restaurantObj',newRestaurantObj)
// console.log('2newHtelObj',newHtelObj)
// 餐饮对比结束 // 餐饮对比结束
this.hotelObj.list = hv.list; this.hotelObj.list = hv.list;
this.viewSpotObj.list = ov.list; this.viewSpotObj.list = ov.list;
...@@ -1344,7 +1325,6 @@ ...@@ -1344,7 +1325,6 @@
this.pageCount('restaurant'); this.pageCount('restaurant');
this.Refresh = false; this.Refresh = false;
this.RenderingOk = false; this.RenderingOk = false;
// console.log(this.viewSpotObj.list)
this.$forceUpdate() this.$forceUpdate()
}, },
UpDateInfo: function () { // 防止组件改动一直渲染数据造成卡顿 添加点击更新视图 UpDateInfo: function () { // 防止组件改动一直渲染数据造成卡顿 添加点击更新视图
...@@ -1363,9 +1343,6 @@ ...@@ -1363,9 +1343,6 @@
let dataList = JSON.parse(JSON.stringify(this.FeatureData)); let dataList = JSON.parse(JSON.stringify(this.FeatureData));
let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete)); let deleteDataList = JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJsonDelete));
this.deleteArray = !deleteDataList ? [] : deleteDataList; this.deleteArray = !deleteDataList ? [] : deleteDataList;
// console.log("this.deleteArray", this.deleteArray)
// console.log("dataList",dataList,!this.$route.query.configId,dataList.switch4or5)
// console.log("this.$route.query.configId && this.FeatureData.FeatureType<4",this.$route.query.configId && this.FeatureData.FeatureType<4) || (this.$route.query.configId && this.FeatureData.FeatureType<4)
if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType)){ if (!this.$route.query.configId || (this.$route.query.configId && dataList.switch4or5) || (this.$route.query.configId && this.FeatureData.lastFeatureType)){
for (let i = 0; i < dataList.DayList.length; i++) { //组装数据 for (let i = 0; i < dataList.DayList.length; i++) { //组装数据
let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮 let restaurantObj = travelFeatureTwo.DinnerInit(i, dataList.DayList) // 餐饮
...@@ -1421,7 +1398,6 @@ ...@@ -1421,7 +1398,6 @@
} }
} }
let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : ''; let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
// console.log("jsonjsonjson",json)
this.hotelObj.title = json.hotelObj ? json.hotelObj.title : this.hotelObj.title; this.hotelObj.title = json.hotelObj ? json.hotelObj.title : this.hotelObj.title;
this.restaurantObj.title = json.restaurantObj ? json.restaurantObj.title : this.restaurantObj.title; this.restaurantObj.title = json.restaurantObj ? json.restaurantObj.title : this.restaurantObj.title;
this.viewSpotObj.title = json.viewSpotObj ? json.viewSpotObj.title : this.viewSpotObj.title; this.viewSpotObj.title = json.viewSpotObj ? json.viewSpotObj.title : this.viewSpotObj.title;
...@@ -1868,7 +1844,6 @@ ...@@ -1868,7 +1844,6 @@
}, },
// 版块删除 // 版块删除
bolckToDelete: function (name, index1, index2) { bolckToDelete: function (name, index1, index2) {
console.log(name, index1)
let blockList = []; let blockList = [];
if (name === 'hotel') { if (name === 'hotel') {
blockList = this.hotelObj.list blockList = this.hotelObj.list
...@@ -1877,10 +1852,8 @@ ...@@ -1877,10 +1852,8 @@
} else if (name === 'restaurant') { } else if (name === 'restaurant') {
blockList = this.restaurantObj.list blockList = this.restaurantObj.list
} }
console.log(blockList)
this.imgTopReset(name, index1, index2); this.imgTopReset(name, index1, index2);
this.deleteArray.push(blockList[index1]); this.deleteArray.push(blockList[index1]);
console.log("删除",blockList[index1])
blockList.splice(index1,1); blockList.splice(index1,1);
this.pageCount(name) this.pageCount(name)
}, },
...@@ -1896,7 +1869,6 @@ ...@@ -1896,7 +1869,6 @@
basicData:travelFeature2, basicData:travelFeature2,
deleteArray:this.deleteArray deleteArray:this.deleteArray
} }
console.log(obj)
return obj; return obj;
}, },
// 设置编辑状态 // 设置编辑状态
...@@ -1924,17 +1896,13 @@ ...@@ -1924,17 +1896,13 @@
watch:{ watch:{
FeatureData:{ FeatureData:{
handler: function (val, oldVal) { handler: function (val, oldVal) {
console.log('2019年2月12日10:53:11',oldVal)
console.log('2019年2月12日10:53:22',val)
if (this.ReadOnly) return; if (this.ReadOnly) return;
if (val && this.oldVal != null) { if (val && this.oldVal != null) {
// console.log("watch_if_FeatureData",11111)
this.newVal = JSON.parse(JSON.stringify(val)); this.newVal = JSON.parse(JSON.stringify(val));
this.Refresh = true; this.Refresh = true;
this.theFirstTime = false this.theFirstTime = false
return return
} else { } else {
// console.log("watch_else_FeatureData",333)
this.oldVal = JSON.parse(JSON.stringify(this.FeatureData)); this.oldVal = JSON.parse(JSON.stringify(this.FeatureData));
this.init() this.init()
} }
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 81734d95
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe"> <table border="0" cellspacing="1" cellpadding="0" class="admissionStatisticsDetailsTalbe">
<tr> <tr>
<th width="120">公司团号</th> <th width="120">公司团号</th>
<th width="120">定团号</th>
<th width="120">游览时间</th> <th width="120">游览时间</th>
<th width="200">景点名称</th> <th width="200">景点名称</th>
<th width="100">总人数</th> <th width="100">总人数</th>
...@@ -30,6 +31,7 @@ ...@@ -30,6 +31,7 @@
</tr> </tr>
<tr v-for="(item,index) in list"> <tr v-for="(item,index) in list">
<td :rowspan="list.length" v-if="index==0"><div class="w120">{{TCNUM}}</div></td> <td :rowspan="list.length" v-if="index==0"><div class="w120">{{TCNUM}}</div></td>
<td :rowspan="list.length" v-if="index==0"><div class="w120">{{NewCombinationNum}}</div></td>
<td> <td>
<div class="w120"> <div class="w120">
{{item.UseTimeStr}} {{item.UseTimeStr}}
...@@ -146,7 +148,8 @@ export default { ...@@ -146,7 +148,8 @@ export default {
roomList:[], roomList:[],
TCNUM:'', TCNUM:'',
flightTotal:0, flightTotal:0,
GuestNum:0 GuestNum:0,
NewCombinationNum:''
} }
}, },
methods: { methods: {
...@@ -228,7 +231,8 @@ export default { ...@@ -228,7 +231,8 @@ export default {
mounted() { mounted() {
this.TCNUM=this.$route.query.TCNUM this.TCNUM=this.$route.query.TCNUM
this.flightTotal=this.$route.query.flightTotal this.flightTotal=this.$route.query.flightTotal
this.GuestNum=this.$route.query.GuestNum this.GuestNum=this.$route.query.GuestNum
this.NewCombinationNum = this.$route.query.NewCombinationNum
this.getList() this.getList()
}, },
} }
......
src/router/config.js
View file @ 81734d95
...@@ -715,6 +715,14 @@ export default { ...@@ -715,6 +715,14 @@ export default {
title: '航班管理' title: '航班管理'
}, },
}, },
{
path: '/flightChild', //航班子表管理
name: 'flightChild',
component: resolve => require(['@/components/Ticketing/flightChild'], resolve),
meta: {
title: '航班管理'
},
},
{ {
path: '/startCityManagement', //出发城市管理 path: '/startCityManagement', //出发城市管理
name: 'startCityManagement', name: 'startCityManagement',
...@@ -2509,6 +2517,14 @@ export default { ...@@ -2509,6 +2517,14 @@ export default {
title: '签证产品下单' title: '签证产品下单'
}, },
}, },
{ // 拆分订单
path: '/OrderSplitting',
name: 'OrderSplitting',
component: resolve => require(['@/components/SalesVisa/OrderSplitting'], resolve),
meta: {
title: '拆分订单'
},
},
{ // 销售 签证订单旅客 { // 销售 签证订单旅客
path: '/VisapassengerList', path: '/VisapassengerList',
name: 'VisapassengerList', name: 'VisapassengerList',
......
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