Skip to content

S
SuperMan
Commit 56c7a5ee authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents adf72038 2e0c1219
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 38 deletions
src/assets/css/sale_pdf.css
View file @ 56c7a5ee
......@@ -505,9 +505,10 @@
/*font-family: 'pingfangR'*/
}
.detail-box .timeline .timeline-item .left{
width: 40px;
margin-right:20px;
/* width: 40px;
margin-right:20px; */
text-align: center;
position: absolute;
}
.detail-box .timeline .timeline-item .left i{
font-size: 20px;
......@@ -643,7 +644,7 @@
}
.detail-box .timeline .timeline-item .new_right{
width:89%;
margin-left:40px;
margin-left:65px;
}
.detail-box .timeline .timeline-item .new_right .Newimg-list .item img{
width:100%;
......
src/components/SalesconfirmationOrder.vue
View file @ 56c7a5ee
......@@ -17,17 +17,19 @@
font-size:12px;
}
.timeline-item .Arrayleft{
width: 51px;
width: 71px;
height: 25px;
background-color: #fff;
margin-right: 20px;
text-align: center;
font-size: 12px;
padding: 5px 0;
position: absolute;
left:-16px;
}
.timeline-item .Arrayleft i{
position: relative;
left:-4px;
left:1px;
top:-4px;
}
</style>
......@@ -293,12 +295,14 @@
<!-- <traffice :tripItem='son' v-if="son.type==1"></traffice> -->
<template v-if="son.type==1">
<div class="timeline-item">
<div class="Arrayleft">
<!-- <i class="iconfont icon-feiji"></i> -->
<span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
<span v-if="dns.startTime!=''" style="margin-right:20px;">{{dns.startTime}} </span><span v-if="dns.endTime!=''">-{{dns.endTime}}</span>
</span>
</div>
<template v-for="(dd,Subindex) in son.childItem.subTraffic">
<div class="Arrayleft" v-if="dd.startTime!=''||dd.endTime!=''">
<!-- <i class="iconfont icon-feiji"></i> -->
<span v-if="son.type==1" v-for="(dns,o) in son.childItem.subTraffic" :key="o">
<span v-if="dns.startTime!=''">{{getStartTime(dns.startTime)}}</span><span v-if="dns.endTime!=''">-{{getStartTime(dns.endTime)}}</span>
</span>
</div>
</template>
<div class="new_right">
<span class="time" v-if="dataList.trafficList[0].airportPickUp==1">接早</span>
<span class="time" v-if="dataList.trafficList[0].airportPickUp==2">送机</span>
......@@ -320,10 +324,10 @@
<template v-if="son.type==2">
<div class="timeline-item">
<div class="Arrayleft">
<div class="Arrayleft" v-if="son.childItem.timeStr!=''">
<!-- <i class="iconfont icon-zuji"></i> -->
<template v-if="son.childItem.timeStr!=''">
{{son.childItem.timeStr}}
{{getStartTime(son.childItem.timeStr)}}
</template>
</div>
<div class="new_right">
......@@ -366,10 +370,10 @@
</template>
<template v-if="son.type==4">
<div class="timeline-item">
<div class="Arrayleft">
<div class="Arrayleft" v-if="son.childItem.timeStr!=''">
<!-- <i class="iconfont icon-yongcan"></i> -->
<span v-if="son.childItem.timeStr!=''">
{{son.childItem.timeStr}}
{{getStartTime(son.childItem.timeStr)}}
</span>
</div>
<div class="new_right">
......@@ -1399,6 +1403,18 @@
}
}
},
getStartTime(startTime){
var n = Number(startTime);
if (!isNaN(n)&&startTime.indexOf(':')==-1) {
var strSep=":";
var str1=startTime.substring(0,2);
var str0=startTime.substring(2,startTime.length);
var strNew=str1+strSep+str0;
return strNew;
}else{
return startTime.replace('：',':')
}
}
},
components: {
oneday,
......
src/components/newTravelmanager/oldTravelGroupControl/trifficTrip.vue
View file @ 56c7a5ee
......@@ -27,15 +27,16 @@
<el-form-item
:prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.SubTraffic.'+subTrafficIndex+'.StartCityId'"
:rules="trifficTripRules.StartCityId">
<el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" filterable
v-model="subTraffic.StartCityId" @visible-change="GetDepartList1($event)"
<el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" filterable remote
v-model="subTraffic.StartCityId" reserve-keyword :remote-method="GetDepartList1"
@change="changeGetDepartList(subTraffic.StartCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option>
<el-option v-for="item in DepartList1" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</el-form-item>
<el-input v-model="subTraffic.StartTime" placeholder="出发时间" style="width:80px" @keyup.native="checkTime(subTraffic,'StartTime')"></el-input>
<el-input v-model="subTraffic.StartTime" placeholder="出发时间" style="width:80px"
@keyup.native="checkTime(subTraffic,'StartTime')"></el-input>
</span>
<!--显示交通类型-->
<span class="TDArrivalType">
......@@ -55,12 +56,13 @@
<i v-if="subTraffic.ArrivalType==4" class="iconfont icon-huoche huoche"></i>
</span>
<span>
<el-input v-model="subTraffic.EndTime" placeholder="到达时间" style="width:80px" @keyup.native="checkTime(subTraffic,'EndTime')"></el-input>
<el-input v-model="subTraffic.EndTime" placeholder="到达时间" style="width:80px"
@keyup.native="checkTime(subTraffic,'EndTime')"></el-input>
<el-form-item
:prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.SubTraffic.'+subTrafficIndex+'.ArrivalCityId'"
:rules="trifficTripRules.ArrivalCityId">
<el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" filterable
v-model="subTraffic.ArrivalCityId" @visible-change="GetArrivalList1($event)"
<el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" filterable remote
v-model="subTraffic.ArrivalCityId" reserve-keyword :remote-method="GetArrivalList1"
@change="changeArrivalCity(subTraffic.ArrivalCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option>
<el-option v-for="item in ArriveList1" :label='item.Name' :value='item.ID' :key='item.ID'>
......@@ -275,15 +277,39 @@
},
methods: {
//出发城市1
GetDepartList1(event) {
if (event) {
this.DepartList1 = this.AllCityList;
GetDepartList1(query) {
this.DepartList1 = [];
if (query != "") {
this.apipost(
"dict_get_Destination_GetListService", {
Name: query
},
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.DepartList1 = res.data.data;
}
},
err => {}
);
}
},
//到达城市
GetArrivalList1(event) {
if (event) {
this.ArriveList1 = this.AllCityList;
GetArrivalList1(query) {
this.ArriveList1 = [];
if (query != "") {
this.apipost(
"dict_get_Destination_GetListService", {
Name: query
},
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.ArriveList1 = res.data.data;
}
},
err => {}
);
}
},
//到达城市改变
......
src/components/newTravelmanager/travelLineTrip/trifficTrip.vue
View file @ 56c7a5ee
......@@ -10,8 +10,9 @@
<span v-for="(subTraffic,subTrafficIndex) in trafficObj.SubTraffic">
<span v-if="subTrafficIndex==0">
<el-form-item :rules="trifficTripRules.StartCityId">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="subTraffic.StartCityId"
@visible-change="GetDepartList1($event)" @change="changeGetDepartList(subTraffic.StartCityId)">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable remote v-model="subTraffic.StartCityId"
reserve-keyword :remote-method="GetDepartList1"
@change="changeGetDepartList(subTraffic.StartCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in DepartList1" :label="item.Name" :value="item.ID" :key="item.ID+10000"></el-option>
</el-select>
......@@ -33,8 +34,9 @@
</span>
<span>
<el-form-item :rules="trifficTripRules.ArrivalCityId">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable v-model="subTraffic.ArrivalCityId"
@visible-change="GetArrivalList1($event)" @change="changeArrivalCity(subTraffic.ArrivalCityId)">
<el-select :disabled="isOpenGroup" class="w120" :placeholder="$t('pub.pleaseSel')" filterable remote v-model="subTraffic.ArrivalCityId"
reserve-keyword :remote-method="GetArrivalList1"
@change="changeArrivalCity(subTraffic.ArrivalCityId)">
<el-option :label="$t('pub.unlimitedSel')" :value="DefaultSelectValue"></el-option>
<el-option v-for="item in ArriveList1" :label="item.Name" :value="item.ID" :key="item.ID+1000"></el-option>
</el-select>
......@@ -214,15 +216,39 @@
},
methods: {
//出发城市1
GetDepartList1(event) {
if (event) {
this.DepartList1 = this.AllCityList;
GetDepartList1(query) {
this.DepartList1 = [];
if (query != "") {
this.apipost(
"dict_get_Destination_GetListService", {
Name: query
},
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.DepartList1 = res.data.data;
}
},
err => {}
);
}
},
//到达城市
GetArrivalList1(event) {
if (event) {
this.ArriveList1 = this.AllCityList;
//到达城市
GetArrivalList1(query) {
this.ArriveList1 = [];
if (query != "") {
this.apipost(
"dict_get_Destination_GetListService", {
Name: query
},
res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.ArriveList1 = res.data.data;
}
},
err => {}
);
}
},
//到达城市改变
......
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