Skip to content

S
SuperMan
Commit 318f316f authored by zhengke's avatar zhengke
Browse files
Options

修改

parent 995ac0b3
Hide whitespace changes
Inline Side-by-side
Showing with 129 additions and 66 deletions
src/components/newTravelmanager/travelLineTrip/ScenicTraffic.vue
View file @ 318f316f
......@@ -3,74 +3,137 @@
height: 25px;
line-height: 25px;
}
;
.St_mainDiv{
width:100%;
height:100%;
margin:10px;
padding:0 20px;
border-left:2px solid #E4E7ED;
position: relative;
}
.St_radioDiv{
position: absolute;
width:12px;
height:12px;
background-color: rgb(11, 189, 135);
left:-27px;
top:3px;
border-radius: 50%;
}
.St_current{
position: relative;
}
.St_current:last-child{
margin-bottom:0!important;
}
.St_current:last-child .St_radioDiv{
top:7px;
}
.Str1{
top:0;
}
</style>
<template>
<div class="TC-ScenicTraffic">
<template v-if="!ishasScenic">
<table>
<thead v-if="CurrentDayNum!=1">
<tr>
<td>
酒店出发
</td>
</tr>
</thead>
<tbody>
<tr>
<td>
{{trafficObj.trafficIntroduce.IntroduceTitle}}
</td>
</tr>
<tr>
<td>
<el-select :placeholder="$t('pub.pleaseSel')" v-model="trafficObj.trafficIntroduce.TrafficType">
<el-option v-for="item in ArrivalTypeArray" :value="item.ID" :key="item.ID" :label="item.Name">
</el-option>
</el-select>
</td>
</tr>
</tbody>
<tfoot v-if="CurrentDayNum!=totalDayNum">
<tr>
<td>回酒店</td>
</tr>
</tfoot>
</table>
</template>
<template v-else>
<table>
<thead v-if="CurrentDayNum!=1">
<tr>
<td>
酒店出发
</td>
</tr>
</thead>
<tbody v-for="(item,index) in ScenicArray">
<tr :key="index">
<td>
{{item.CouponsName}}
</td>
</tr>
<tr>
<td>
<el-select :placeholder="$t('pub.pleaseSel')" v-model="item.TrafficType">
<el-option v-for="subItem in ArrivalTypeArray" :value="subItem.ID" :key="subItem.ID" :label="subItem.Name">
</el-option>
</el-select>
</td>
</tr>
</tbody>
<tfoot v-if="CurrentDayNum!=totalDayNum">
<tr>
<td>回酒店</td>
</tr>
</tfoot>
</table>
</template>
<div class="St_mainDiv">
<div v-if="!ishasScenic">
<div v-if="CurrentDayNum!=1">
<div class="St_radioDiv Str1"></div>
酒店出发
</div>
<div>{{trafficObj.trafficIntroduce.IntroduceTitle}}</div>
<div>
<el-select :placeholder="$t('pub.pleaseSel')" v-model="trafficObj.trafficIntroduce.TrafficType">
<el-option v-for="item in ArrivalTypeArray" :value="item.ID" :key="item.ID" :label="item.Name">
</el-option>
</el-select>
</div>
<div v-if="CurrentDayNum!=totalDayNum">
回酒店
</div>
</div>
<div v-else>
<div v-if="CurrentDayNum!=1" class="St_current">
<div class="St_radioDiv Str1"></div>
酒店出发
</div>
<div v-for="(item,index) in ScenicArray" :key="index">
<div style="margin:10px 0">{{item.CouponsName}}</div>
<div>
<el-select :placeholder="$t('pub.pleaseSel')" v-model="item.TrafficType">
<el-option v-for="subItem in ArrivalTypeArray" :value="subItem.ID" :key="subItem.ID" :label="subItem.Name">
</el-option>
</el-select>
</div>
<div v-if="CurrentDayNum!=totalDayNum" class="St_current" style="margin:10px 0">
<div class="St_radioDiv"></div>
回酒店
</div>
</div>
</div>
</div>
<!-- <template v-if="!ishasScenic">
<table>
<thead v-if="CurrentDayNum!=1">
<tr>
<td>
酒店出发
</td>
</tr>
</thead>
<tbody>
<tr>
<td>
{{trafficObj.trafficIntroduce.IntroduceTitle}}
</td>
</tr>
<tr>
<td>
<el-select :placeholder="$t('pub.pleaseSel')" v-model="trafficObj.trafficIntroduce.TrafficType">
<el-option v-for="item in ArrivalTypeArray" :value="item.ID" :key="item.ID" :label="item.Name">
</el-option>
</el-select>
</td>
</tr>
</tbody>
<tfoot v-if="CurrentDayNum!=totalDayNum">
<tr>
<td>回酒店</td>
</tr>
</tfoot>
</table>
</template>
<template v-else>
<table>
<thead v-if="CurrentDayNum!=1">
<tr>
<td>
酒店出发
</td>
</tr>
</thead>
<tbody v-for="(item,index) in ScenicArray">
<tr :key="index">
<td>
{{item.CouponsName}}
</td>
</tr>
<tr>
<td>
<el-select :placeholder="$t('pub.pleaseSel')" v-model="item.TrafficType">
<el-option v-for="subItem in ArrivalTypeArray" :value="subItem.ID" :key="subItem.ID" :label="subItem.Name">
</el-option>
</el-select>
</td>
</tr>
</tbody>
<tfoot v-if="CurrentDayNum!=totalDayNum">
<tr>
<td>回酒店</td>
</tr>
</tfoot>
</table>
</template> -->
</div>
</template>
<script>
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ 318f316f
......@@ -161,7 +161,7 @@
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.Inventory }}</span>
</el-option>
</el-select>
<el-popover placement="right" width="540" trigger="click" >
<el-popover placement="right" width="500" trigger="click" >
<scenicTraffic :ref="'scenicTraffic'+dayObj.DayNum+''" :ScenicArray="dayObj.ScenicArray"
:trafficObj="dayObj.TrafficObj" :ishasScenic="ishasScenic"
:CurrentDayNum="dayObj.DayNum" :totalDayNum="subConfig.DayNum"
......
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