Skip to content

S
SuperMan
Commit 5b76737e authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent e5d0cf64
Expand all Show whitespace changes
Inline Side-by-side
Showing with 376 additions and 96 deletions
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 5b76737e
......@@ -253,7 +253,6 @@
</el-checkbox-group>
</span>
</div>
<!-- <div class="comSearchDiv" v-if="queryCommonData.showPlatForm"> -->
<div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span>
......@@ -457,6 +456,7 @@
</tr>
</table>
<div class="FlightDiv-TCL" slot="reference">
<template v-if="item.UseFlightType==0">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
......@@ -468,6 +468,20 @@
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span>
</div>
</template>
<template v-else>
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
{{subItem.aName}} {{subItem.Departure_time}}
-
{{subItem.dName}} {{subItem.Arrival_time}}
</span>
</div>
</template>
</div>
</el-popover>
</div>
......@@ -922,7 +936,8 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
<el-button v-if="CurrentUserInfo.RB_Group_id==2" @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
<el-button v-if="CurrentUserInfo.RB_Group_id==2"
@click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a">
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
</el-button>
......@@ -942,7 +957,8 @@
v-if="item.b2b&&item.GroupRecommendType==1&&CurrentUserInfo.RB_Group_id==2">
{{$t('op.CancelSetjp')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||TeamShouZhi" @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||TeamShouZhi"
@click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('confirmationOrderDownLoad',item)">
......@@ -956,7 +972,8 @@
{{$t('Operation.Op_xiajia')}}
</el-dropdown-item>
<!--酒店下架-->
<el-dropdown-item v-if="item.LineID==14&&(CurrentUserInfo.RB_Group_id==2||OutHotel)" @click.native="RemoveHotelJourneyOrder(item.TCID)">
<el-dropdown-item v-if="item.LineID==14&&(CurrentUserInfo.RB_Group_id==2||OutHotel)"
@click.native="RemoveHotelJourneyOrder(item.TCID)">
{{$t('op.HotelXJ')}}
</el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
......@@ -977,17 +994,20 @@
直客版预览
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||FenXiaoLianYun" @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||FenXiaoLianYun"
@click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
{{$t('Operation.Op_salelianyun')}}
</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao" @click.native='ShowUploadWord(item,1)'>{{$t('Operation.Op_wordTrip')}}
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao"
@click.native='ShowUploadWord(item,1)'>{{$t('Operation.Op_wordTrip')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao" @click.native='ShowUploadWord(item,2)'>{{$t('op.UploadFFB')}}
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ShangChuanFenFangbiao"
@click.native='ShowUploadWord(item,2)'>{{$t('op.UploadFFB')}}
</el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ChaKanGuest" >
<el-dropdown-item v-if="CurrentUserInfo.RB_Group_id==2||ChaKanGuest">
<div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>
{{$t('op.LookPassengerSurvey')}}
</div>
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ 5b76737e
......@@ -699,6 +699,7 @@
} else {
this.FeatureData.Title = tempData.Title;
}
console.log("price",JSON.parse(JSON.stringify(tempData.PriceList)))
if (tempData.PriceList != null) {
this.PriceList = tempData.PriceList;
}
......
src/components/newTravelmanager/TravelGroupControl/TravelPriceFlightList_Self.vue 0 → 100644
View file @ 5b76737e
<style>
.TravelFlightList {
width: 100%;
background-color: #fff;
}
.TFflightName {
padding: 3px 5px;
display: inline-block;
background-color: #ff9c00;
color: #fff;
border-radius: 4px;
margin-left: 10px;
}
.TFTable .el-form-item {
margin: 10px;
}
.TFTable i {
font-size: 14px;
}
.TFTable .el-input--prefix .el-input__inner {
padding-right: 0;
}
</style>
<template>
<div>
<div class="TravelFlightList">
<el-form label-width="0">
<table class="TFTable">
<tr>
<th>{{$t('sm.hangkonggs')}}</th>
<th>{{$t('visa.v_hangban')}}</th>
<th>{{$t('system.query_flightAir')}}</th>
<th>{{$t('system.ph_flightTime')}}</th>
<th>{{$t('system.query_arrivalAir')}}</th>
<th>{{$t('system.query_arrivalTime')}}</th>
<th>{{$t('Airticket.Air_StartTime')}}</th>
<th>{{$t('Airticket.Air_TicketType')}}</th>
<th>{{$t('system.table_operation')}}</th>
</tr>
<tr v-for="(priceFlight,index) in priceFlightList" :key="priceFlight.code">
<td>
<el-input v-model="priceFlight.AirLineName"> </el-input>
</td>
<td>
<el-input v-model="priceFlight.FlightNum"> </el-input>
</td>
<td>
<el-input v-model="priceFlight.StartAirport"></el-input>
</td>
<td>
<el-input v-model="priceFlight.StartTime"> </el-input>
</td>
<td>
<el-input v-model="priceFlight.ArrivalAirport"> </el-input>
</td>
<td>
<el-input v-model="priceFlight.ArrivalTime"> </el-input>
</td>
<td>
<el-date-picker class="w110" :clearable="false" v-model="priceFlight.FlightDate" type="date"
value-format="yyyy-MM-dd"></el-date-picker>
</td>
<td>
<el-select v class="w80" :placeholder="$t('pub.pleaseSel')" v-model="priceFlight.FlightType">
<el-option v-for="item in ticketTypeList" :label="item.Name" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('Operation.Op_hide')" placement="top-start">
<el-button type="danger" icon="el-icon-delete" @click="removePriceFlight(index,priceFlight)"
circle></el-button>
</el-tooltip>
</td>
</tr>
</table>
</el-form>
<div class="TFAddFlight" v-if="!IsBindFlight" @click="addFlight()">
<i class="iconfont icon-img_haha"></i>{{$t('fnc.tianjia')}}
</div>
</div>
</div>
</template>
<script>
export default {
props: ['priceData', 'AirTicketId', 'selectFilghtList', 'DeleteAirticketIds'],
data() {
var AirLineIdValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error(this.$t('system.ph_choiceAir')))
} else {
callback()
}
}
var FlightIdValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error(this.$t('sm.qxzhangban')))
} else {
callback()
}
}
var TicketTypeValidate = (rule, value, callback) => {
if (value === 0) {
callback(new Error(this.$t('sm.qxzjplx')))
} else {
callback()
}
}
return {
//航班列表
priceFlightList: [],
//是否绑定航班
IsBindFlight: false,
//类型
ticketTypeList: [{
Id: 1,
Name: this.$t('Airticket.Air_go')
},
{
Id: 2,
Name: this.$t('Airticket.Air_returnTrip')
}
],
defaultSelectValue: 0,
rules: {
AirLineId: [{
validator: AirLineIdValidate,
trigger: 'change'
}],
FlightId: [{
validator: FlightIdValidate,
trigger: 'change'
}],
StartDate: [{
required: true,
message: '请选择日期',
trigger: 'change'
}],
TicketType: [{
validator: TicketTypeValidate,
trigger: 'change'
}]
}
}
},
methods: {
//新增航班
addFlight() {
var obj = {
AirLineName: '',
FlightNum: '',
StartAirport: '',
StartTime: '',
ArrivalAirport: '',
ArrivalTime: '',
FlightDate: '',
FlightType: 1,
}
this.priceFlightList.push(obj)
},
//删除航班信息
removePriceFlight(index, item) {
var that = this
var msg = that.$t('sm.shanchuhangbbnhf')
that.Confirm(msg, function () {
if (index > -1) {
that.priceFlightList.splice(index, 1)
}
that.headCallBack()
})
},
headCallBack() {
var obj = {
pricesFlight: this.priceFlightList,
DeleteAirticketIdArray: []
}
this.$emit('headCallBack', obj)
},
},
mounted() {
},
watch: {
priceData: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
if (val != oldVal) {
if (this.priceData.SelfPriceFlight) {
this.priceFlightList = this.priceData.SelfPriceFlight;
this.headCallBack()
}
}
},
deep: true
},
priceFlightList: {
//深度监听，可监听到对象、数组的变化
handler: function (val, oldVal) {
if (val != oldVal) {
this.headCallBack()
}
},
deep: true
},
}
}
</script>
src/components/platformModule/groupManagement.vue
View file @ 5b76737e
......@@ -221,8 +221,7 @@
<el-input type="text" v-model="addMsg.MaxDepartmentTier" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item label='Logo'>
<el-upload class="avatar-uploader" :http-request="UploadImage" action="" :show-file-list="false"
>
<el-upload class="avatar-uploader" :http-request="UploadImage" action="" :show-file-list="false">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
<i class="el-icon-upload2 avatar-uploader-icon" @click="imgType=1"></i>
<span v-if="imageUrl" class="repUp" @click="imgType=1">{{$t('system.up_againUp')}}</span>
......@@ -230,8 +229,7 @@
</el-upload>
</el-form-item>
<el-form-item label='行程特色背景图片' v-if="addMsg.IsOpenTripFeature==1">
<el-upload class="avatar-uploader" :http-request="UploadImage" action="" :show-file-list="false"
>
<el-upload class="avatar-uploader" :http-request="UploadImage" action="" :show-file-list="false">
<img v-if="tripImageUrl" :src="tripImageUrl" class="avatar">
<i class="el-icon-upload2 avatar-uploader-icon" @click="imgType=2"></i>
<span v-if="tripImageUrl" class="repUp" @click="imgType=2">{{$t('system.up_againUp')}}</span>
......@@ -241,6 +239,10 @@
<el-form-item class='w400' label='状态' prop="Status">
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='航班' prop="Status">
<el-radio v-model="addMsg.UseFlightType" :label="0">系统</el-radio>
<el-radio v-model="addMsg.UseFlightType" :label="1">自定义</el-radio>
</el-form-item>
<el-form-item class='w400' label='备注' prop="Remarks">
<el-input type="textarea" v-model="addMsg.Remarks"></el-input>
</el-form-item>
......@@ -403,6 +405,7 @@
IsOpenB2C: 0, //是否有直客网站(0-没有，1-有)
IsOpenTripFeature: 0, //是否有行程特色(0-没有，1-有)
TripFeatureImg: "", //行程特色背景图片
UseFlightType: 0, //使用航班类型(0-系统默认航班,1-自定义航班信息)
},
verSionMsg: {
Status: 0
......@@ -484,8 +487,6 @@
}
}, err => {})
},
getList() { //获取数据
this.loading = true
this.apipost('admin_get_GroupGetPageList', this.msg, res => {
......
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