Skip to content

S
SuperMan
Commit f8835603 authored by youjie's avatar youjie
Browse files
Options

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

parents 6ab99bf6 fc3590ef
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 83 deletions
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ f8835603
......@@ -65,7 +65,6 @@
}
.TravelMyTicket ._ol_list>li {
/* display: flex; */
align-items: center;
overflow: hidden;
height: auto;
......@@ -268,7 +267,6 @@
text-decoration: underline;
}
/* .TMT_raduis{margin-left:50px;} */
.TMT_raduis>ul {
display: -webkit-box;
align-items: center;
......@@ -603,7 +601,6 @@
.TravelMyTicket .vmiddle {
display: flex;
align-items: Center;
/* height: 78px; */
}
.TM_AirUrl {
......@@ -635,8 +632,6 @@
/*航班详情*/
.TravelMyTicket .FlightDivDetails {
width: 100%;
/* height: 65px; */
/* overflow: auto; */
}
.TravelMyTicket ._flightList {
......@@ -731,7 +726,7 @@
</ul>
<div class="_ol_info">
<ul class="_ol_list" v-loading="loading">
<li v-for="(item,index) in dataList" :data-id="item.Id">
<li v-for="(item,index) in dataList" :data-id="item.Id" :key="index+10000">
<span class="_oll_line" v-if="item.FreightSpace==1"></span>
<span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
<span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
......@@ -747,7 +742,7 @@
</el-col>
<el-col :span="4" class="vmiddle">
<div class="FlightDivDetails">
<div class="_flightList" v-for="subItem in item.flightList">
<div class="_flightList" v-for="(subItem,subIndex) in item.flightList" :key="subIndex+20000">
<span class="FlightNumber">{{subItem.Flight_number}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
<span>({{subItem.DIATA}}){{subItem.DepartureName}}</span>
......@@ -765,7 +760,7 @@
<tr class="_color_666">
<th>{{$t('visa.v_lycity')}}</th>
</tr>
<tr v-for="(unionItem,x) in item.UnionList">
<tr v-for="(unionItem,uIndex) in item.UnionList" :key="uIndex+30000">
<td> {{unionItem.CityName}} </td>
</tr>
</table>
......@@ -801,33 +796,36 @@
<table>
<tr>
<td v-if="item.FirstDeposit&&item.FirstDeposit!=''" style="text-align:center;">
<el-button v-if="item.FirstDepositStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
<el-button v-if="item.FirstDepositStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
1
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>1</el-button>
</td>
<td v-if="item.SecondDeposit&&item.SecondDeposit!=''" style="text-align:center;">
<el-button v-if="item.SecondDepositStatus==1" style="background-color:#909090;color:white;width:26px;"
circle>
<el-button v-if="item.SecondDepositStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
2
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;" circle>2</el-button>
</td>
<td v-if="item.ThirdDeposit&&item.ThirdDeposit!=''" style="text-align:center;">
<el-button v-if="item.ThirdDepositStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
<el-button v-if="item.ThirdDepositStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
3
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;" circle>3</el-button>
</td>
<td v-if="item.FourthDeposit&&item.FourthDeposit!=''" style="text-align:center;">
<el-button v-if="item.FourthDepositStatus==1" style="background-color:#909090;color:white;width:26px;"
circle>
<el-button v-if="item.FourthDepositStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
4
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>4</el-button>
</td>
<td v-if="item.FinalPayment&&item.FinalPayment!=''" style="text-align:center;">
<el-button v-if="item.FinalPaymentStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
<el-button v-if="item.FinalPaymentStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
尾
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>尾</el-button>
......@@ -852,7 +850,7 @@
</tr>
</table>
</el-col>
<el-col :span="2" class="vmiddle">
<el-col :span="3" class="vmiddle">
<div class="TMT_raduis">
<ul>
<li class="_head" style="margin-left:20px;">
......@@ -879,7 +877,7 @@
<div class="InfoChangeLog">
<div class="changLog">
<ul class="changLogList">
<li class="changLogList_l" v-for="subItem in LogList">
<li class="changLogList_l" v-for="(subItem,subIndex) in LogList" :key="subIndex+40000">
<div class="logDate">
<div class="logCircle"></div>
{{subItem.LogTimeStr}}
......@@ -901,7 +899,7 @@
<el-row :gutter="0">
<el-col :span="8">
<div class="TCID_cont PingFangSC">
{{$t('visa.v_tuanhao')}}：<span v-if="item.TCNUM!=''">（{{item.TCID}}）{{item.TCNUM}}</span>
{{$t('visa.v_tuanhao')}}：<span v-if="item.TCNUM!=''">({{item.TCID}}){{item.TCNUM}}</span>
</div>
</el-col>
<el-col :span="4">
......@@ -1070,7 +1068,6 @@
this.Query.pageIndex = 1;
this.currentPage = 1;
},
//转出按钮点击事件
outBtn(item) {
this.isShowSet = true;
......@@ -1106,7 +1103,6 @@
err => {}
);
});
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ f8835603
......@@ -170,7 +170,6 @@
align-items: center;
color: #333333;
font-size: 14px;
/* padding-left: 40px; */
min-width: 100px;
}
......@@ -570,7 +569,6 @@
.TravelticketManager .vmiddle {
display: flex;
align-items: Center;
/* height: 78px; */
}
.TM_btm {
......@@ -580,7 +578,6 @@
.TravelticketManager .TICK_Code {
position: absolute;
left: 25px;
/* top: 5px; */
}
.TravelticketManager .TCID_cont {
......@@ -603,8 +600,6 @@
/*航班详情*/
.TravelticketManager .FlightDivDetails {
width: 100%;
/* height: 65px; */
/* overflow: auto; */
}
.TravelticketManager ._flightList {
......@@ -706,7 +701,7 @@
</ul>
<div class="_ol_info">
<ul class="_ol_list" v-loading="loading">
<li v-for="(item,index) in dataList" :data-id="item.ID">
<li v-for="(item,index) in dataList" :data-id="item.ID" :key="index+10000">
<span class="_oll_line" v-if="item.FreightSpace==1"></span>
<span class="_oll_line _o_green" v-if="item.FreightSpace==2"></span>
<span class="_oll_line _o_blu" v-if="item.FreightSpace==3"></span>
......@@ -727,7 +722,7 @@
</el-col>
<el-col :span="4" class="vmiddle">
<div class="FlightDivDetails">
<div class="_flightList" v-for="subItem in item.flightList">
<div class="_flightList" v-for="(subItem,subIndex) in item.flightList" :key="subIndex+20000">
<span class="FlightNumber">{{subItem.Flight_number}}</span>
<span>{{subItem.FlightDate}} {{subItem.Departure_time}}</span>
<span>({{subItem.DIATA}}){{subItem.DepartureName}}</span>
......@@ -745,7 +740,7 @@
<tr class="_color_666">
<th>{{$t('visa.v_lycity')}}</th>
</tr>
<tr v-for="(unionItem,x) in item.UnionList">
<tr v-for="(unionItem,uIndex) in item.UnionList" :key="uIndex+30000">
<td> {{unionItem.CityName}} </td>
</tr>
</table>
......@@ -781,7 +776,8 @@
<table>
<tr>
<td v-if="item.FirstDeposit&&item.FirstDeposit!=''" style="text-align:center;">
<el-button v-if="item.FirstDepositStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
<el-button v-if="item.FirstDepositStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
1
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>
......@@ -789,27 +785,29 @@
</el-button>
</td>
<td v-if="item.SecondDeposit&&item.SecondDeposit!=''" style="text-align:center;">
<el-button v-if="item.SecondDepositStatus==1" style="background-color:#909090;color:white;width:26px;"
circle>
<el-button v-if="item.SecondDepositStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
2
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>2</el-button>
</td>
<td v-if="item.ThirdDeposit&&item.ThirdDeposit!=''" style="text-align:center;">
<el-button v-if="item.ThirdDepositStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
<el-button v-if="item.ThirdDepositStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
3
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>3</el-button>
</td>
<td v-if="item.FourthDeposit&&item.FourthDeposit!=''" style="text-align:center;">
<el-button v-if="item.FourthDepositStatus==1" style="background-color:#909090;color:white;width:26px;"
circle>
<el-button v-if="item.FourthDepositStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
4
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>4</el-button>
</td>
<td v-if="item.FinalPayment&&item.FinalPayment!=''" style="text-align:center;">
<el-button v-if="item.FinalPaymentStatus==1" style="background-color:#909090;color:white;width:26px;" circle>
<el-button v-if="item.FinalPaymentStatus==1"
style="background-color:#909090;color:white;width:26px;" circle>
尾
</el-button>
<el-button v-else style="background-color:#47bf8c;color:white;width:26px;" circle>尾</el-button>
......@@ -833,45 +831,6 @@
</td>
</tr>
</table>
<!-- <div class="TKM_raduis">
<ul>
<li :class="item.FirstDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FirstDeposit" placement="top" popper-class="max-w250"
v-if="item.FirstDeposit">
<span>1</span>
</el-tooltip>
<span v-else>1</span>
</li>
<li :class="item.SecondDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.SecondDeposit" placement="top" popper-class="max-w250"
v-if="item.SecondDeposit">
<span>2</span>
</el-tooltip>
<span v-else>2</span>
</li>
<li :class="item.ThirdDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.ThirdDeposit" placement="top" popper-class="max-w250"
v-if="item.ThirdDeposit">
<span>3</span>
</el-tooltip>
<span v-else>3</span>
</li>
<li :class="item.FourthDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FourthDeposit" placement="top" popper-class="max-w250"
v-if="item.FourthDeposit">
<span>4</span>
</el-tooltip>
<span v-else>4</span>
</li>
<li :class="item.FourthDeposit?'_bg_gre':''">
<el-tooltip effect="dark" :content="item.FinalPayment" placement="top" popper-class="max-w250"
v-if="item.FinalPayment">
<span>{{$t('op.WEI')}}</span>
</el-tooltip>
<span v-else>{{$t('op.WEI')}}</span>
</li>
</ul>
</div> -->
</el-col>
<el-col :span="2" class="vmiddle">
<div class="_head">
......@@ -892,21 +851,13 @@
</span>
</div>
</el-col>
<!-- <el-col :span="2" class="vmiddle">
<div class="_btn _ttm_page">
<span v-if="item.SurplusNum>0">
<button class="normalBtn TM_btm" type="button"
@click="isShowOrder=true,isShowNeed=false,bindAirticket.AirticketId=item.ID,bindAirticket.TotalNum=item.SurplusNum,GetPlaceHolder()">立即采购222</button>
</span>
</div>
</el-col> -->
</el-row>
<el-row :gutter="0">
<el-col :span="8">
<div class="TCID_cont PingFangSC">
{{$t('fnc.tuanqi')}}：
<span v-show="item.PriceList.length==0">{{$t('pub.noMsg')}}</span>
<span class="Ticket_TCIDTMA" v-for="subItem in item.PriceList">
<span class="Ticket_TCIDTMA" v-for="(subItem,subIndex) in item.PriceList" :key="subIndex+40000">
<a style="color:blue;cursor:pointer" @click='goUrlT("TravelControlList",subItem.TCNUM,"团控列表")'>
({{subItem.TCID}}){{subItem.TCNUM}} </a>
&nbsp;</span>
......
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