Skip to content

S
SuperMan
Commit 0a34ae3f authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 0ca98590
Show whitespace changes
Inline Side-by-side
Showing with 307 additions and 290 deletions
src/assets/utils/tripUtils.js
View file @ 0a34ae3f
......@@ -355,6 +355,7 @@ var tripUtils = {
TrafficType:2,//交通类型,默认为专车
TrafficContent:"",//交通详情
TrafficImage:"",//交通图片
}
};
},
......@@ -369,7 +370,9 @@ var tripUtils = {
//出发城市名称
StartCityName: "",
//到达城市名称
ArrivalCityName: ""
ArrivalCityName: "",
StartTime:"",//出发时间
EndTime:"",//到达时间
};
},
//行程-景点对象
......@@ -405,6 +408,7 @@ var tripUtils = {
TrafficType:2,//交通类型(1-飞机,2-专车,3-地铁,4-步行)
TrafficContent:"",//交通内容
TrafficImage:"",//交通图片
TimeStr:"",//时间字符串备注
};
},
//行程-酒店对象
......@@ -435,6 +439,7 @@ var tripUtils = {
//酒店类型
HotelType:0,
MD5Sign:"",
TimeStr:"",//时间字符串备注
};
},
//行程-餐饮对象
......@@ -463,6 +468,7 @@ var tripUtils = {
QCity: '',
BreakfastUseType: 2,
MD5Sign:"",
TimeStr:"",//时间字符串备注
};
},
//行程-自由活动对象
......
src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue
View file @ 0a34ae3f
......@@ -37,6 +37,10 @@
</el-select>
</el-form-item>
</span>
<span class="comTravelLeft">时间</span>
<span>
<el-input v-model="subItemObj.childItem.TimeStr" placeholder="时间信息" style="width:80px"></el-input>
</span>
</div>
<div class="TDmealTime">
<label class="TDhotelDiner">{{$t('sm.yongcanshiduan')}}</label>
......
src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue
View file @ 0a34ae3f
......@@ -51,6 +51,7 @@
:checked="subItemObj.childItem.IsSameLevel===CheckedVaule" :true-label="CheckedVaule"
:false-label="UnCheckedVaule" border size="mini">{{$t('sm.tongjijiudian')}}</el-checkbox>
</span>
<span class="comTravelLeft">{{$t('sm.fangxingxz')}}</span>
<span>
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
......
src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue
View file @ 0a34ae3f
......@@ -46,15 +46,10 @@
</el-select>
</el-form-item>
</span>
<!-- <span class="comTravelLeft">门票</span>
<span class="comTravelLeft">时间</span>
<span>
<el-select :disabled="isOpenGroup" class='w160' filterable :placeholder="$t('pub.pleaseSel')" v-model="subItemObj.childItem.CouponsTicketId"
@visible-change="getTicketList($event)" @change="changeTicketList()">
<el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option>
<el-option v-for="item in QTicketList" :label='item.TicketName' :value='item.Id' :key='item.Id'>
</el-option>
</el-select>
</span> -->
<el-input v-model="subItemObj.childItem.TimeStr" placeholder="时间信息" style="width:80px"></el-input>
</span>
</div>
<div class="TDRightPlan">
<label class="comTravelLeft">{{$t('scen.sc_etTime')}}</label>
......
src/components/newTravelmanager/oldTravelGroupControl/trifficTrip.vue
View file @ 0a34ae3f
......@@ -15,7 +15,8 @@
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeTrifficTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1">
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip>
</div>
......@@ -23,21 +24,26 @@
<div class="TDLeftPlan">
<span v-for="(subTraffic,subTrafficIndex) in subItemObj.childItem.SubTraffic">
<span v-if="subTrafficIndex==0">
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.SubTraffic.'+subTrafficIndex+'.StartCityId'"
<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)" @change="changeGetDepartList(subTraffic.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-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"></el-input>
</span>
<!--显示交通类型-->
<span class="TDArrivalType">
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.SubTraffic.'+subTrafficIndex+'.ArrivalType'"
<el-form-item
:prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.SubTraffic.'+subTrafficIndex+'.ArrivalType'"
:rules="trifficTripRules.ArrivalType">
<el-select :disabled="isOpenGroup" :placeholder="$t('pub.pleaseSel')" v-model="subTraffic.ArrivalType">
<el-select :disabled="isOpenGroup" :placeholder="$t('pub.pleaseSel')"
v-model="subTraffic.ArrivalType">
<el-option v-for="item in ArrivalTypeArray" :value='item.ID' :key='item.ID'>
<i :class="item.ClassStr"></i>
</el-option>
......@@ -49,10 +55,13 @@
<i v-if="subTraffic.ArrivalType==4" class="iconfont icon-huoche huoche"></i>
</span>
<span>
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.SubTraffic.'+subTrafficIndex+'.ArrivalCityId'"
<el-input v-model="subTraffic.EndTime" placeholder="到达时间" style="width:80px"></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)" @change="changeArrivalCity(subTraffic.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-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'>
</el-option>
......@@ -63,35 +72,42 @@
<!--增加交通计划-->
<span v-if="!isOpenGroup" class="addTrafficPlan" @click="addTrafficPlan(subItemObj)">+</span>
<!--减少交通计划-->
<span v-if="subItemObj.childItem.SubTraffic.length>1&&!isOpenGroup" class="addTrafficPlan" @click="minusTrafficPlan(subItemObj)">-</span>
<span v-if="subItemObj.childItem.SubTraffic.length>1&&!isOpenGroup" class="addTrafficPlan"
@click="minusTrafficPlan(subItemObj)">-</span>
</div>
</div>
<div class="useCar">
<el-checkbox v-model="subItemObj.childItem.IsUseBus" :checked="subItemObj.childItem.IsUseBus===CheckedVaule"
:true-label="CheckedVaule" :false-label="UnCheckedVaule" border size="mini">{{$t('sm.yongche')}}</el-checkbox>
:true-label="CheckedVaule" :false-label="UnCheckedVaule" border size="mini">{{$t('sm.yongche')}}
</el-checkbox>
</div>
</div>
<div class="TDplanList TDRightPlan" v-if='subItemObj.childItem.IsUseBus===CheckedVaule'>
<div class="useCarPlan"><label>{{$t('sm.yongchejihua')}}</label>
<span v-if="index==0" :class="{'ListCked':subItemObj.childItem.AirportPickUp==1}" @click="changeAirportType(1)">{{AirPickUp}}</span>
<span v-if="index==DayList.length-1" :class="{'ListCked':subItemObj.childItem.AirportPickUp==2}" @click="changeAirportType(2)">{{AirSend}}</span>
<span v-if="index==0" :class="{'ListCked':subItemObj.childItem.AirportPickUp==1}"
@click="changeAirportType(1)">{{AirPickUp}}</span>
<span v-if="index==DayList.length-1" :class="{'ListCked':subItemObj.childItem.AirportPickUp==2}"
@click="changeAirportType(2)">{{AirSend}}</span>
</div>
<div class="clearfix">
<div v-if="!isOpenGroup" class="useTypeDiv" v-for="useTypeItem in UseTypeArray" :key="useTypeItem.subCode">
<span :class="{'ListCked':subItemObj.childItem.UseType==useTypeItem.Id}" @click="UseTypeClick( subItemObj.childItem,useTypeItem.Id)">{{useTypeItem.Name}}</span>
<span :class="{'ListCked':subItemObj.childItem.UseType==useTypeItem.Id}"
@click="UseTypeClick( subItemObj.childItem,useTypeItem.Id)">{{useTypeItem.Name}}</span>
</div>
<div v-if="isOpenGroup" class="useTypeDiv" v-for="useTypeItem in UseTypeArray" :key="useTypeItem.subCode">
<span :class="{'ListCked':subItemObj.childItem.UseType==useTypeItem.Id}">{{useTypeItem.Name}}</span>
</div>
<div>
<el-input :disabled="isOpenGroup" class="w135" v-model="subItemObj.childItem.UseTime" @keyup.native="checkInteger(subItemObj.childItem,'UseTime')"
:placeholder="$t('sm.shuruyongchexiaoshi')"></el-input>
<el-input :disabled="isOpenGroup" class="w135" v-model="subItemObj.childItem.UseTime"
@keyup.native="checkInteger(subItemObj.childItem,'UseTime')" :placeholder="$t('sm.shuruyongchexiaoshi')">
</el-input>
</div>
</div>
</div>
<div class="TP_edit">
<my-edit v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList"></my-edit>
<my-edit v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList"></my-edit>
</div>
</div>
<div class="read" v-if="!isShowEdit">
......@@ -108,7 +124,8 @@
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeTrifficTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1">
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip>
</div>
......@@ -158,8 +175,8 @@
</div>
</template>
<script>
import MyEdit from "../../EditTemplate.vue";
export default {
import MyEdit from "../../EditTemplate.vue";
export default {
props: [
"subItemObj",
"index",
......@@ -207,8 +224,7 @@ export default {
narrative: true //叙述,
},
//交通类型数组
ArrivalTypeArray: [
{
ArrivalTypeArray: [{
ID: 1,
ClassStr: "iconfont icon-feiji"
}, //飞机
......@@ -235,24 +251,18 @@ export default {
placeholder: this.$t('sm.qsrjiaotonginfo'),
//交通验证
trifficTripRules: {
StartCityId: [
{
StartCityId: [{
validator: StartCityIdValidate,
trigger: "change"
}
],
ArrivalType: [
{
}],
ArrivalType: [{
validator: ArrivalTypeValidate,
trigger: "change"
}
],
ArrivalCityId: [
{
}],
ArrivalCityId: [{
validator: ArrivalCityIdValidate,
trigger: "change"
}
]
}]
},
//出发城市列表1
DepartList1: [],
......@@ -412,7 +422,7 @@ export default {
watch: {
//监听参数
subItemObj: {
handler: function(val, oldVal) {
handler: function (val, oldVal) {
//获取当前到达城市
var subArray = this.subItemObj.childItem.SubTraffic;
if (subArray.length > 0) {
......@@ -437,5 +447,6 @@ export default {
deep: true
}
}
};
};
</script>
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