Skip to content

S
SuperMan
Commit 5454c59c authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 23518fe5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 62 additions and 2585 deletions
src/components/TravelManager/TravelTeam/addInfo.vue deleted 100644 → 0
View file @ 23518fe5
This diff is collapsed.
src/components/TravelManager/TravelTeam/airplaneGroup.vue deleted 100644 → 0
View file @ 23518fe5
<style scoped>
.wrapper {
width: 600px;
background: #fff;
margin: 0 auto;
padding: 20px;
}
</style>
<template>
<div class="wrapper">
<el-form :model="editForm" label-width="100px">
<div>基础信息</div>
<div class="edit_form_box">
<div>
<el-form-item label="所属线路">
<el-select
lass="wp40 accountList"
v-model="editForm.accountNum"
placeholder="请选择"
>
<el-option
v-for="(item, index) in 4"
:key="index"
:label="item"
:value="index"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="团名">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="出发城市">
<el-select
lass="wp40 accountList"
v-model="editForm.accountNum"
placeholder="请选择"
>
<el-option
v-for="(item, index) in 4"
:key="index"
:label="item"
:value="index"
>
</el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-form-item label="经济舱">
<el-input v-model="editForm.gatherIdent"></el-input>
</el-form-item>
<el-form-item label="商务舱">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="头等舱">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="出发时间">
<el-date-picker
v-model="editForm.gatheringTime"
type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
</div>
</div>
<div>报价信息</div>
<div class="edit_form_box">
<div>
<el-form-item label="同行价">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="直客价">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="小孩占床减免">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="小孩不占床减免">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="三人房减免">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="单人房加价">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
</div>
</div>
<div>控制信息</div>
<div class="edit_form_box">
<el-form-item label="同业网站销售">
<el-radio-group v-model="editForm.gatheringAddress">
<el-radio :label="3">备选项</el-radio>
<el-radio :label="6">备选项</el-radio>
<el-radio :label="9">备选项</el-radio>
</el-radio-group> </el-form-item
><el-form-item label="直客网站销售">
<el-radio-group v-model="editForm.gatheringAddress">
<el-radio :label="3">备选项</el-radio>
<el-radio :label="6">备选项</el-radio>
<el-radio :label="9">备选项</el-radio>
</el-radio-group> </el-form-item
><el-form-item label="开启在线预定">
<el-radio-group v-model="editForm.gatheringAddress">
<el-radio :label="3">备选项</el-radio>
<el-radio :label="6">备选项</el-radio>
<el-radio :label="9">备选项</el-radio>
</el-radio-group> </el-form-item
><el-form-item label="允许订单修改">
<el-radio-group v-model="editForm.gatheringAddress">
<el-radio :label="3">备选项</el-radio>
<el-radio :label="6">备选项</el-radio>
<el-radio :label="9">备选项</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="允许报名候补">
<el-radio-group v-model="editForm.gatheringAddress">
<el-radio :label="3">备选项</el-radio>
<el-radio :label="6">备选项</el-radio>
<el-radio :label="9">备选项</el-radio>
</el-radio-group>
</el-form-item>
</div>
<div class="TravelFlightList">
<div class="TFAddFlight" @click="addFlight()">
<i class="iconfont icon-img_haha"></i>添加
</div>
</div>
</el-form>
</div>
</template>
<script>
export default {
data() {
return {
editForm: {},
};
},
};
</script>
\ No newline at end of file
src/components/TravelManager/TravelTeam/apply.vue deleted 100644 → 0
View file @ 23518fe5
<style scoped>
.wrapper {
width: 600px;
background: #fff;
margin: 0 auto;
padding: 20px;
}
</style>
<template>
<div class="wrapper">
<el-form :model="editForm" label-width="100px">
<div class="edit_form_box">
<div>
<el-form-item label="业务名称">
<el-input v-model="editForm.leaderInfo"></el-input>
</el-form-item>
<el-form-item label="航空公司">
<el-select
lass="wp40 accountList"
v-model="editForm.accountNum"
placeholder="请选择"
>
<el-option
v-for="(item, index) in 4"
:key="index"
:label="item"
:value="index"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="航班号">
<el-select
lass="wp40 accountList"
v-model="editForm.accountNum"
placeholder="请选择"
>
<el-option
v-for="(item, index) in 4"
:key="index"
:label="item"
:value="index"
>
</el-option>
</el-select>
</el-form-item>
</div>
<div>
<el-form-item label="出发时间">
<el-date-picker
v-model="editForm.gatheringTime"
type="date"
placeholder="选择日期"
>
</el-date-picker>
</el-form-item>
<el-form-item label="经济舱">
<el-input v-model="editForm.gatherIdent"></el-input>
</el-form-item>
<el-form-item label="商务舱">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="头等舱">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="占位方式">
<el-radio-group v-model="editForm.gatheringAddress">
<el-radio :label="3">备选项</el-radio>
<el-radio :label="6">备选项</el-radio>
<el-radio :label="9">备选项</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="销售方式">
<el-radio-group v-model="editForm.gatheringAddress">
<el-radio :label="3">备选项</el-radio>
<el-radio :label="6">备选项</el-radio>
<el-radio :label="9">备选项</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="经济舱">
<div class="flex" v-for="(item, index) in baseList" :key="index">
<el-input style="width: 70px" v-model="item.start"></el-input>至
<el-input style="width: 70px" v-model="item.end"></el-input>:
<el-input style="width: 70px" v-model="item.max"></el-input>
<span @click="handleAddOrDelete(index)">{{index > 0 ? '删除' : '添加'}}</span>
</div>
</el-form-item>
<el-form-item label="商务舱">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="头等舱">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="合作伙伴">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="包机旅游集团">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
<el-form-item label="是否显示">
<el-radio-group v-model="editForm.gatheringAddress">
<el-radio :label="3">备选项</el-radio>
<el-radio :label="6">备选项</el-radio>
<el-radio :label="9">备选项</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="editForm.gatheringAddress"></el-input>
</el-form-item>
</div>
</div>
<div class="TravelFlightList">
<div class="TFAddFlight" @click="addFlight()">
<i class="iconfont icon-img_haha"></i>添加
</div>
</div>
</el-form>
</div>
</template>
<script>
const baseInfo = {
start: '',
end: '',
max: ''
}
export default {
data() {
return {
editForm: {},
baseList: [this.createBaseInfo()]
};
},
methods: {
handleAddOrDelete(index) {
if(index) {
this.baseList.splice(index, 1)
} else {
this.baseList.push(this.createBaseInfo())
}
},
createBaseInfo() {
return JSON.parse(JSON.stringify(baseInfo))
}
}
};
</script>
\ No newline at end of file
src/components/TravelManager/TravelTeam/test.vue deleted 100644 → 0
View file @ 23518fe5
<template></templat>
<style><style>
<script></script>
\ No newline at end of file
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 5454c59c
......@@ -4,12 +4,19 @@
.w_20 {
width: 20%;
}
.mb {
margin-bottom: 10px;
}
.title {
font-weight: 600;
}
.w_10 {
width: 10%;
}
.mb {
margin-bottom: 10px;
}
.title {
font-weight: 600;
}
.p20 {
padding: 20px;
}
......@@ -48,7 +55,7 @@
</span>
</li>
<li>
<button class="hollowFixedBtn" @click="addAirplane">新增</button>
<button class="hollowFixedBtn" @click="editTeam(null)">新增</button>
<button class="hollowFixedBtn" @click="resetQuery">{{$t('pub.searchBtn')}}</button>
</li>
</ul>
......@@ -66,24 +73,34 @@
<div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div>
<div class="mb"><span>{{item.GTeamName}}</span></div>
<div>出发日期：<span>{{item.StartDate}}</span></div>
<div>团队信息：<span>{{item.TCNUM}}({{item.TCID}})</span></div>
</div>
</div>
<div class="el-col w_20">
<div class="p20">
<div class="p20">
<div class="mb title"><i class="iconfont icon-hangban1"></i><span>航班信息</span></div>
<div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
<div> {{subItem.Flight_number}}
{{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
{{subItem.Arrival_time}}</div>
</div></div>
<div class="mb" v-for="(subItem,subIndex) in item.TravelTeamFlightList" :key="subIndex+1000">
<div> {{subItem.Flight_number}}
{{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
{{subItem.Arrival_time}}</div>
</div>
</div>
</div>
<div class="el-col w_20">
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>航班价格</span></div>
<div class="mb title"><i class="iconfont icon-jiage"></i><span>仓位信息</span></div>
<div class="mb"><span>经济舱: {{item.YSeat}}</span></div>
<div class="mb"><span>商务舱: {{item.CSeat}}</span></div>
<div class="mb"><span>头等舱: {{item.FSeat}}</span></div>
<div><span>中心价: {{item.MiddlePrice}}</span></div>
</div>
</div>
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-jiage"></i><span>价格信息</span></div>
<div class="mb"><span>中心价: {{item.MiddlePrice}}</span></div>
<div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
<div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
<div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div>
</div>
</div>
<div class="el-col w_20">
......@@ -94,16 +111,16 @@
</template>
</div>
</div>
<div class="el-col w_20">
<div class="p20">
<div class="el-col w_10">
<div class="p20">
<div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div>
<div class="mb">发起人：{{item.CreateByName}}</div>
<div>发起时间：{{item.CreateTime}}</div></div>
<div class="mb">发起人：{{item.CreateByName}}</div>
<div>{{item.CreateTime}}</div>
</div>
</div>
<div class="el-col w_20">
<div class="el-col w_10">
<div class="p20">
<!-- <span>操作</span> -->
<el-button class="mb" @click.native='goUrl("airplaneInfo", item.GTeamId,"包机信息")' type="primary" size="mini"
<el-button class="mb" @click.native='editTeam(item)' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">修改
</el-button>
<el-dropdown trigger="click">
......@@ -140,18 +157,17 @@
</div>
</div>
<el-dialog class="app-attachment-dialog" style="width:1000px;height:800px;margin:0 auto;z-index:99999"
:title="ID ? '修改包机' : '新增包机'" :visible.sync="dialogVisible"
:close-on-click-modal="false">
<addInfo :id="ID"></addInfo>
<apply-info></apply-info>
:title="dialogTitle" :visible.sync="isShowEditTeamDialog" :close-on-click-modal="false">
<editTeamInfo :id="ID"></editTeamInfo>
</el-dialog>
</div>
</template>
<script>
import addInfo from "./addInfo";
import applyInfo from "./apply";
import editTeamInfo from "./editTeamInfo"; //新增修改包机团
export default {
components: {addInfo, applyInfo},
components: {
editTeamInfo
},
provide() {
return {
reload: this.reload
......@@ -159,7 +175,8 @@
},
data() {
return {
dialogVisible: false,
isShowEditTeamDialog: false, //是否显示新增修改包机团弹窗
dialogTitle: "添加包机信息", //弹窗名称
ID: '',
//查询参数
queryMsg: {
......@@ -211,28 +228,16 @@
},
},
methods: {
goUrl(path,id, name) {
// if(path === 'airplaneInfo') {
// this.ID = id
// this.dialogVisible = true
// return
// }
this.$router.push({
name: path,
query: {
id: id,
blank: "y",
tab: name
}
});
//新增修改包机团
editTeam(item) {
if (item) {
this.dialogTitle = "修改包机信息";
} else {
this.dialogTitle = "添加包机信息";
}
this.isShowEditTeamDialog = true;
},
addAirplane() {
// this.ID = 0
// this.dialogVisible = true
this.$router.push({
name: 'airplaneInfo',
});
},
//翻页
handleCurrentChange(val) {
this.queryMsg.pageIndex = val;
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 5454c59c
......@@ -613,7 +613,7 @@
<template slot="prepend">{{$t('sm.tonghangfanyong')}}</template>
</el-input>
</el-form-item>
<el-form-item style="display:none;">
<el-form-item>
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.DiscountPrice" @keyup.native="checkPrice(priceData,'DiscountPrice')">
<template slot="prepend">{{$t('sm.zaoniaoyouhui')}}</template>
......
src/components/newTravelmanager/travelLineTrip/trifficTrip.vue
View file @ 5454c59c
......@@ -293,17 +293,7 @@
}
}
},
//根据ID获取城市名称
getCityNameById(id) {
let name = "";
this.AllCityList.forEach(x => {
if (x.ID == id) {
name = x.Name;
return false;
}
});
return name;
},
//接机送机点击切换
changeAirportType(t) {
if (t == this.trafficObj.AirportPickUp) {
......
src/router/config.js
View file @ 5454c59c
......@@ -2292,9 +2292,9 @@ export default {
title: '团控列表'
},
}, {
path: '/airplaneInfo', //包机信息
name: 'airplaneInfo',
component: resolve => require(['@/components/TravelManager/TravelTeam/addInfo'], resolve),
path: '/editTeamInfo', //新增修改包机信息
name: 'editTeamInfo',
component: resolve => require(['@/components/TravelManager/TravelTeam/editTeamInfo'], resolve),
meta: {
title: '包机信息'
},
......@@ -2305,20 +2305,6 @@ export default {
meta: {
title: '包机列表'
},
}, {
path: '/airplaneGroup', //团控信息
name: 'airplaneGroup',
component: resolve => require(['@/components/TravelManager/TravelTeam/airplaneGroup'], resolve),
meta: {
title: '团控信息'
},
}, {
path: '/airplaneApply', //在线申请
name: 'airplaneApply',
component: resolve => require(['@/components/TravelManager/TravelTeam/apply'], resolve),
meta: {
title: '在线申请'
},
}, {
path: '/airplaneOrder', //订单列表
name: 'airplaneOrder',
......
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