Skip to content

S
SuperMan
Commit 67623ff2 authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

解决冲突

parent 88d0e50b
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 67 deletions
src/components/SalesModule/groupInquiry.vue
View file @ 67623ff2
...@@ -130,6 +130,47 @@ ...@@ -130,6 +130,47 @@
border: 1px solid #d95454 !important; border: 1px solid #d95454 !important;
box-sizing: border-box; box-sizing: border-box;
} }
/* 名单 */
.RL-remarkTitle {
display: inline-block;
width: 36px;
white-space: nowrap;
font-size: 14px;
}
.RL-remarkCon span {
margin-right: 5px;
}
.person_fan{
width: 100%;
border-top: 1px solid #e5e5e5;
padding: 0 10px;
font-size: 12px;
padding: 15px 6px;
box-sizing: border-box;
}
/* 财务单据的颜色 */
.groupTourOrder_tickets_red {
color: #FF0000;
text-decoration: underline;
cursor: pointer;
}
.groupTourOrder_tickets_blue {
color: #0000FF;
text-decoration: underline;
cursor: pointer;
}
.groupTourOrder_tickets_green {
color: #008000;
cursor: pointer;
text-decoration: underline;
}
.groupTourOrder_tickets_black {
color: #000000;
text-decoration: underline;
}
</style> </style>
<template> <template>
<div> <div>
...@@ -141,7 +182,7 @@ ...@@ -141,7 +182,7 @@
</el-tabs> </el-tabs>
</ul> --> </ul> -->
<div class="GQ_companyList" v-if="queryCommonData.IsParentCompany==1"> <div class="GQ_companyList" v-if="queryCommonData.IsParentCompany==1">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">全部</span> <span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span> <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)">{{item.BName}}</span>
</div> </div>
<div class="TC_Content TC-MyList"> <div class="TC_Content TC-MyList">
...@@ -149,7 +190,7 @@ ...@@ -149,7 +190,7 @@
<ul> <ul>
<li> <li>
<span> <span>
<em>所属线路</em> <em>{{$t('system.table_ssLine')}}</em>
<el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()"> <el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="(item,index) in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='index+10000'> <el-option v-for="(item,index) in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='index+10000'>
...@@ -159,7 +200,7 @@ ...@@ -159,7 +200,7 @@
</li> </li>
<li> <li>
<span> <span>
<em>系列名称</em> <em>{{$t('active.ad_xlmc')}}</em>
<el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
...@@ -169,14 +210,14 @@ ...@@ -169,14 +210,14 @@
</li> </li>
<li> <li>
<span> <span>
<em>团号</em> <em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList" <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" @keyup.native.enter="getControlList"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>发团日期</em> <em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="w150" type="date" v-model='queryMsg.StartGroupDate' :picker-options="pickerBeginDateBefore" <el-date-picker class="w150" type="date" v-model='queryMsg.StartGroupDate' :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" placeholder=""> value-format="yyyy-MM-dd" placeholder="">
</el-date-picker> </el-date-picker>
...@@ -189,21 +230,21 @@ ...@@ -189,21 +230,21 @@
<span> <span>
<em>{{$t('visa.v_qianzhengst')}}</em> <em>{{$t('visa.v_qianzhengst')}}</em>
<el-select v-model="queryMsg.TCVisaStatus" clearable class="w150" filterable :placeholder="$t('pub.pleaseSel')"> <el-select v-model="queryMsg.TCVisaStatus" clearable class="w150" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value="-1"></el-option> <el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option label="未办理" value="1"></el-option> <el-option :label="$t('visa.v_weibanli')" value="1"></el-option>
<el-option label="办理中" value="2"></el-option> <el-option :label="$t('visa.v_banlizhong')" value="2"></el-option>
<el-option label="已办理" value="3"></el-option> <el-option :label="$t('visa.v_yibanli')" value="3"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li class="advancedLi"> <li class="advancedLi">
<el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click"> <el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click">
<div> <div>
<div class="TC_queryTitle">团控高级查询</div> <div class="TC_queryTitle">{{$t('visa.v_tkgjcx')}}</div>
<div class="clearfix"> <div class="clearfix">
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div> <div>
<span>航空公司</span> <span>{{$t('system.query_airCompanyName')}}</span>
<el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150"> <el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150">
<el-option :label='$t("system.ph_buxian")' :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label='$t("system.ph_buxian")' :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName" :value="item.AirLineId"> <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName" :value="item.AirLineId">
...@@ -211,7 +252,7 @@ ...@@ -211,7 +252,7 @@
</el-select> </el-select>
</div> </div>
<div> <div>
<span>操作人员</span> <span>{{$t('visa.v_czuser')}}</span>
<el-select class='w150' v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'> <el-option v-for="item in queryCommonData.EmployeeList" :label='item.EmName' :value='item.EmployeeId' :key='item.EmployeeId'>
...@@ -219,13 +260,13 @@ ...@@ -219,13 +260,13 @@
</el-select> </el-select>
</div> </div>
<div> <div>
<span>行程天数</span> <span>{{$t('visa.v_xcdays')}}</span>
<el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')" <el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')"
class="w150" :placeholder="$t('pub.pleaseImport')"></el-input> class="w150" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>联运城市</span> <span>{{$t('visa.v_lycity')}}</span>
<el-select class='w150' filterable v-model="queryMsg.UnionCityId" :placeholder="$t('pub.pleaseSel')"> <el-select class='w150' filterable v-model="queryMsg.UnionCityId" :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
<el-option v-for="item in queryCommonData.CityList" :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for="item in queryCommonData.CityList" :label='item.Name' :value='item.ID' :key='item.ID'>
...@@ -236,7 +277,7 @@ ...@@ -236,7 +277,7 @@
</div> </div>
<div class="TC_rightSearch"> <div class="TC_rightSearch">
<div> <div>
<span>团队人数</span> <span>{{$t('visa.v_teamnum')}}</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" @keyup.native="checkInteger(queryMsg,'TeamMinNum')" <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" @keyup.native="checkInteger(queryMsg,'TeamMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
- -
...@@ -244,7 +285,7 @@ ...@@ -244,7 +285,7 @@
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input> @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>报名人数</span> <span>{{$t('leader.leader_registraNum')}}</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" @keyup.native="checkInteger(queryMsg,'ApplyMinNum')" <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" @keyup.native="checkInteger(queryMsg,'ApplyMinNum')"
:placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
- -
...@@ -252,11 +293,11 @@ ...@@ -252,11 +293,11 @@
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input> @blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div class="OnlyShowOverTeam"> <div class="OnlyShowOverTeam">
<span>只看报超团</span> <span>{{$t('visa.v_zkbaochaotuan')}}</span>
<el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false"></el-switch> <el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false"></el-switch>
</div> </div>
<div> <div>
<span>销售公司</span> <span>{{$t('visa.v_salecompany')}}</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}" v-model="queryMsg.SaleBranchId" multiple> <el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}" v-model="queryMsg.SaleBranchId" multiple>
<el-option v-for='item in queryCommonData.companyList' :key="item.id" :label="item.bName" :value="item.id"> <el-option v-for='item in queryCommonData.companyList' :key="item.id" :label="item.bName" :value="item.id">
</el-option> </el-option>
...@@ -265,9 +306,9 @@ ...@@ -265,9 +306,9 @@
</div> </div>
</div> </div>
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>团队状态</span> <span>{{$t('scen.sc_temStatu')}}</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">全选</el-checkbox> <el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList"> <el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList">
<el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" :key="team.Name">{{team.Name}}</el-checkbox> <el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" :key="team.Name">{{team.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
...@@ -275,36 +316,35 @@ ...@@ -275,36 +316,35 @@
</div> </div>
<!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> --> <!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> -->
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>销售平台</span> <span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span> <span>
<!-- 全选 --> <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">全选</el-checkbox>
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales"> <el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>团期状态</span> <span>{{$t('visa.v_tqstatus')}}</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">{{$t('system.table_chekAll')}}</el-checkbox> <el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">全选</el-checkbox>
<el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup"> <el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
<el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id" :key="state.Name">{{state.Name}}</el-checkbox> <el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id" :key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>航班状态</span> <span>{{$t('visa.v_hbstatus')}}</span>
<span> <span>
<el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;"> <el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
<el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" @change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox> <el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" @change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
<!-- 查询 -->
<button class="normalBtn TC_SearchBtn" @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}</button> <button class="normalBtn TC_SearchBtn" @click="getControlList(),resetPageIndex(),queryCommonData.showHigradeSearch=false">查询</button>
</div> </div>
<span class="advancedQuery" slot="reference">高级查询<i class="iconfont icon-xiaotuziCduan_1"></i></span> <span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}}<i class="iconfont icon-xiaotuziCduan_1"></i></span>
</el-popover> </el-popover>
</li> </li>
<li> <li>
...@@ -332,23 +372,23 @@ ...@@ -332,23 +372,23 @@
v-for="plat in item.SalePlatList" :key="plat.subCode"> v-for="plat in item.SalePlatList" :key="plat.subCode">
{{$tripUtils.getPlatName(plat)}} {{$tripUtils.getPlatName(plat)}}
</span> </span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">待完善</span> <span class="TC_xiajia daiwanshan" v-if="item.TCState==1">{{$t('visa.v_dwanshan')}}</span>
<span class="TC_xiajia" v-if="item.TCState==2">已下架</span> <span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">已取消</span> <span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
</div> </div>
</div> </div>
</div> </div>
<div class="el-col" style="width:200px;"> <div class="el-col" style="width:200px;">
<div class="d2"> <div class="d2">
<p class="TCLflight_GO"><i class="iconfont icon-hangban1"></i>航班</p> <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"> <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;"> <tr class="_color_666" style="text-align:center;">
<th width="60">{{$t('Airticket.Air_segment')}}</th> <th width="60">{{$t('Airticket.Air_segment')}}</th>
<th width="80">{{$t('system.query_flightNum')}}</th> <th width="80">{{$t('system.query_flightNum')}}</th>
<th width="150">起飞时间</th> <th width="150">{{$t('system.ph_flightTime')}}</th>
<th width="80">到达时间</th> <th width="80">{{$t('system.query_arrivalTime')}}</th>
<th width="100">经停城市</th> <th width="100">{{$t('system.query_stopCity')}}</th>
</tr> </tr>
<tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;"> <tr v-for="(ds,din) in item.flightList" :key="din" style="text-align:center;">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
...@@ -379,8 +419,8 @@ ...@@ -379,8 +419,8 @@
<span>{{subItem.StopoverName}}</span> <span>{{subItem.StopoverName}}</span>
<span v-if="subItem.ArrivalCityName">-</span> <span v-if="subItem.ArrivalCityName">-</span>
<span>{{subItem.ArrivalCityName}}</span> <span>{{subItem.ArrivalCityName}}</span>
<span v-if="subItem.FlightState==1" class="TCL-greenType">【确定】</span> <span v-if="subItem.FlightState==1" class="TCL-greenType">【{{$t('pub.sureBtn')}}】</span>
<span v-if="subItem.FlightState==2" class="TCL-redType">【暂定】</span> <span v-if="subItem.FlightState==2" class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</div> </div>
</div> </div>
</el-popover> </el-popover>
...@@ -388,19 +428,18 @@ ...@@ -388,19 +428,18 @@
</div > </div >
<div class="el-col" style="width:190px;"> <div class="el-col" style="width:190px;">
<div class="d3"> <div class="d3">
<p><i class="iconfont icon-tuandui"></i>{{$t('visa.v_teaminfo')}}<em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}晚</em></p> <p><i class="iconfont icon-tuandui"></i>团队信息<em>{{item.DayNum}}{{$t('hotel.hotel_day')}}{{item.NightNum}}晚</em></p>
<p><span>{{$t('Airticket.Air_StartTime')}}</span>{{item.StartDate}}</p> <p><span>出发时间</span>{{item.StartDate}}</p>
<p><span>>{{$t('scen.sc_cp')}}</span>{{item.OutBranchName}}</p> <p><span>出团公司</span>{{item.OutBranchName}}</p>
</div> </div>
</div> </div>
<div class="el-col" style="width:200px;"> <div class="el-col" style="width:200px;">
<div class="d5"> <div class="d5">
<p><i class="iconfont icon-tuanwei"></i>{{$t('visa.v_tuanweiinfo')}}</p> <p><i class="iconfont icon-tuanwei"></i>团位信息</p>
<!-- 当前余位 --> <p><span>当前余位</span><i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></p>
<p><span>{{$t('visa.v_currentseat')}}</span><i>{{item.SurplusSeat=item.SurplusSeat < 0 ? 0:item.SurplusSeat}}</i></p> <p><span>已报入</span><i @click='goUrlX("RegistrationList", item.TCID)' style="cursor:pointer;">{{item.OrderGuestNum}}<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人</i>(占位：{{item.Occupied}}人)</p>
<p><span>{{$t('visa.v_yibaoru')}}</span><i @click='goUrlX("RegistrationList", item.TCID)' style="cursor:pointer;">{{item.OrderGuestNum}}<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>人</i>(占位：{{item.Occupied}}人)</p> <p><span>候补</span>
<p><span>{{$t('visa.v_houbu')}}</span> <span v-if='item.IsSubstitution==1' class="TCL-greenType">允许候补</span>
<span v-if='item.IsSubstitution==1' class="TCL-greenType">{{$t('visa.v_yxhoubu')}}</span>
<span v-else class="TCL-redType">不允许候补</span> <span v-else class="TCL-redType">不允许候补</span>
</p> </p>
<p><span @click="goUrlY('TravelPassengerList',item.TCID)" style="cursor:pointer;text-decoration:underline;">旅客名单</span></p> <p><span @click="goUrlY('TravelPassengerList',item.TCID)" style="cursor:pointer;text-decoration:underline;">旅客名单</span></p>
...@@ -417,20 +456,20 @@ ...@@ -417,20 +456,20 @@
<div class="TC-OPName">{{item.OPName}}</div> <div class="TC-OPName">{{item.OPName}}</div>
</div> </div>
<div class="TC_SeatList"> <div class="TC_SeatList">
{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}} 头等舱：{{item.FSeat}}
</div> </div>
<div class="TC_SeatList"> <div class="TC_SeatList">
{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}} 商务舱：{{item.CSeat}}
</div> </div>
<div class="TC_SeatList"> <div class="TC_SeatList">
{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}} 经济舱：{{item.YSeat}}
</div> </div>
</div> </div>
</div> </div>
<div class="el-col" style="width:190px;"> <div class="el-col" style="width:190px;">
<div class="d3"> <div class="d3">
<p><i class="iconfont icon-qianzheng"></i>{{$t('active.cl_qianzheng')}}</p> <p><i class="iconfont icon-qianzheng"></i>签证</p>
<p><span>{{$t('visa.v_qianzhengst')}}:</span><i @click="goUrlP('visaWorksheet',item.TCID)" style="cursor:pointer;">{{item.VisaStatusName}}</i></p> <p><span>签证状态:</span><i @click="goUrlP('visaWorksheet',item.TCID)" style="cursor:pointer;">{{item.VisaStatusName}}</i></p>
<p><span>送签日期:</span>{{item.SendVisaTime}}</p> <p><span>送签日期:</span>{{item.SendVisaTime}}</p>
<p><span>出签日期:</span>{{item.OutVisaTime}}</p> <p><span>出签日期:</span>{{item.OutVisaTime}}</p>
<p><span>进馆日期:</span>{{item.EnterVisaTime}}</p> <p><span>进馆日期:</span>{{item.EnterVisaTime}}</p>
...@@ -451,8 +490,9 @@ ...@@ -451,8 +490,9 @@
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button> <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button> <el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button>
</div> </div>
<el-button @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button> <el-button v-if="item.LineID!=14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button>
<el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> <!-- <el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> -->
<el-button @click="goUrl('VisaFinancialDocuments',item.TCID,item.OutBranchId,item.TCNUM,'签证财务单据')" type="primary" style='background:#F16C3C; border-color:#F16C3C'>费用明细</el-button>
<el-button @click='openEdit(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>送签日期</el-button> <el-button @click='openEdit(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>送签日期</el-button>
<el-button @click="openAdmission(item)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>进馆日期</el-button> <el-button @click="openAdmission(item)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>进馆日期</el-button>
<el-button @click='openEdit2(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>出签日期</el-button> <el-button @click='openEdit2(item)' type="primary" style='background:#F16C3C; border-color:#F16C3C'>出签日期</el-button>
...@@ -477,7 +517,7 @@ ...@@ -477,7 +517,7 @@
<span v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red" >{{item2.FrID}}</span> <span v-else-if="item2.ColorState===3" class="groupTourOrder_tickets_red" >{{item2.FrID}}</span>
<span v-else-if="item2.ColorState===4" class="groupTourOrder_tickets_black" >{{item2.FrID}}</span> <span v-else-if="item2.ColorState===4" class="groupTourOrder_tickets_black" >{{item2.FrID}}</span>
</span> </span>
<span v-if="item.VisaFinanceList.length===0">{{$t('system.content_noData')}}</span> <span v-if="item.VisaFinanceList.length===0">暂无数据</span>
</div> </div>
</div> </div>
<!-- <div class="TC_remarkContent"> <!-- <div class="TC_remarkContent">
...@@ -493,7 +533,7 @@ ...@@ -493,7 +533,7 @@
<div class="TCL_remarkTitle">地接备注：</div> <div class="TCL_remarkTitle">地接备注：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div> <div class="TCL_Content">{{item.DmcRemarkLast!=null?item.DmcRemarkLast.DMCRemark:""}}</div>
</div> </div>
</div> </div> -->
</li> </li>
</ul> </ul>
<div class="noData" v-show="queryMsg.noData"> <div class="noData" v-show="queryMsg.noData">
...@@ -509,14 +549,14 @@ ...@@ -509,14 +549,14 @@
<div class="combottomTitle">请选择上架平台</div> <div class="combottomTitle">请选择上架平台</div>
<span class="setPlatLeft">销售平台</span> <span class="setPlatLeft">销售平台</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">{{$t('system.table_chekAll')}}</el-checkbox> <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">全选</el-checkbox>
<el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog"> <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
<span> <span>
<button class="normalBtn" style="margin-left:50px;" @click="SetshelvesUp">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" style="margin-left:50px;" @click="SetshelvesUp">确定</button>
<button class="hollowFixedBtn" @click="queryCommonData.setPlatDialog=false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="queryCommonData.setPlatDialog=false">取消</button>
</span> </span>
</div> </div>
...@@ -540,7 +580,7 @@ ...@@ -540,7 +580,7 @@
<button class="normalBtn" type="primary" @click="setOPremark">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="setOPremark">{{$t('pub.sureBtn')}}</button>
</div> </div>
</div> </div>
<! 送签日期窗口 --> <!-- 送签日期窗口 -->
<div class="groupInquiry_edit" v-show="editShow"> <div class="groupInquiry_edit" v-show="editShow">
<div class="groupInquiry_edit_tit"> <div class="groupInquiry_edit_tit">
<span>修改送签日期</span> <span>修改送签日期</span>
...@@ -585,10 +625,10 @@ ...@@ -585,10 +625,10 @@
<el-form-item label="进馆日期" prop="EnterVisaTime" class="groupInquiry_admission_formItem"> <el-form-item label="进馆日期" prop="EnterVisaTime" class="groupInquiry_admission_formItem">
<el-date-picker class="groupInquiry_admission_input2" v-model='msg_admission.EnterVisaTime' @change="admissionInput" type="date" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')" clearable></el-date-picker> <el-date-picker class="groupInquiry_admission_input2" v-model='msg_admission.EnterVisaTime' @change="admissionInput" type="date" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')" clearable></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('visa.v_visaType')" prop="VisaType" class="groupInquiry_admission_formItem"> <el-form-item label="签证类型" prop="VisaType" class="groupInquiry_admission_formItem">
<el-select class="groupInquiry_admission_input2" v-model="msg_admission.VisaType" placeholder="选择签证类型"> <el-select class="groupInquiry_admission_input2" v-model="msg_admission.VisaType" placeholder="选择签证类型">
<el-option :label="$t('visa.v_gvisa')" value='1'></el-option> <el-option label='个签' value='1'></el-option>
<el-option :label="$t('visa.v_tvisa')" value='2'></el-option> <el-option label='团签' value='2'></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="欧洲签证" prop="EuropeVisaType" class="groupInquiry_admission_formItem" v-if="msg_admission.LineID===2"> <el-form-item label="欧洲签证" prop="EuropeVisaType" class="groupInquiry_admission_formItem" v-if="msg_admission.LineID===2">
...@@ -597,9 +637,9 @@ ...@@ -597,9 +637,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<div style="display: inline-block;vertical-align: top;white-space: nowrap;"> <div style="display: inline-block;vertical-align: top;white-space: nowrap;">
<el-form-item :label="$t('advmanager.v_country')" prop="EuropeSchengen" class="groupInquiry_admission_formItem" v-show="msg_admission.LineID===2&&msg_admission.EuropeVisaType==='2'"> <el-form-item label="国家" prop="EuropeSchengen" class="groupInquiry_admission_formItem" v-show="msg_admission.LineID===2&&msg_admission.EuropeVisaType==='2'">
<el-select class="groupInquiry_admission_input2" v-model="msg_admission.EuropeSchengen" @change="SchengenChange" placeholder="选择国家"> <el-select class="groupInquiry_admission_input2" v-model="msg_admission.EuropeSchengen" @change="SchengenChange" placeholder="选择国家">
<el-option v-for="(item, index) in EuropeSchengenList" :key="index" :label='item.Name' :value='item.Id'></el-option> <el-option v-for="(item, index) in EuropeSchengenList" :key="index+2000" :label='item.Name' :value='item.Id'></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="EuropeVisaName" class="groupInquiry_admission_formItem" v-show="msg_admission.EuropeVisaType==='2'&&msg_admission.EuropeSchengen==='5'"> <el-form-item prop="EuropeVisaName" class="groupInquiry_admission_formItem" v-show="msg_admission.EuropeVisaType==='2'&&msg_admission.EuropeSchengen==='5'">
...@@ -770,7 +810,7 @@ export default { ...@@ -770,7 +810,7 @@ export default {
//航班配置 //航班配置
FlightState:0, FlightState:0,
TCVisaStatus: '-1', TCVisaStatus: '-1',
IsShowUnion:0, IsShowUnion:1,
QueryType:1,//查询类型 1:签证 QueryType:1,//查询类型 1:签证
}, },
remarkMsg: { remarkMsg: {
...@@ -780,7 +820,7 @@ export default { ...@@ -780,7 +820,7 @@ export default {
}, },
flightStatus: [{ flightStatus: [{
Id: 0, Id: 0,
Name: '不限', Name: this.$t('pub.unlimitedSel'),
Checked:true Checked:true
}, { }, {
Id: 1, Id: 1,
...@@ -806,6 +846,18 @@ export default { ...@@ -806,6 +846,18 @@ export default {
}; };
}, },
methods: { methods: {
goUrl(path, TCID,OutBranchId,TCNUM, name) {
this.$router.push({
name: path,
query: {
TCID:TCID,
OutBranchId:OutBranchId,
TCNUM:TCNUM,
blank: 'y',
tab: name
}
});
},
saveitem(tcid) { saveitem(tcid) {
this.uploadTCID = tcid this.uploadTCID = tcid
}, },
......
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