Skip to content

S
SuperMan
Commit 9cc1aa17 authored by youjie's avatar youjie
Browse files
Options

no message

parents 848ec65d d7ecfc2c
Expand all Show whitespace changes
Inline Side-by-side
Showing with 6090 additions and 2535 deletions
src/components/TravelManager/TravelTeam/addInfo.vue deleted 100644 → 0
View file @ 848ec65d
This diff is collapsed.
src/components/TravelManager/TravelTeam/airplaneGroup.vue deleted 100644 → 0
View file @ 848ec65d
<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 @ 848ec65d
<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/editTeamInfo.vue 0 → 100644
View file @ 9cc1aa17
This diff is collapsed.
src/components/TravelManager/TravelTeam/priceGroup.vue 0 → 100644
View file @ 9cc1aa17
This diff is collapsed.
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 9cc1aa17
...@@ -4,12 +4,19 @@ ...@@ -4,12 +4,19 @@
.w_20 { .w_20 {
width: 20%; width: 20%;
} }
.mb {
.w_10 {
width: 10%;
}
.mb {
margin-bottom: 10px; margin-bottom: 10px;
} }
.title {
.title {
font-weight: 600; font-weight: 600;
} }
.p20 { .p20 {
padding: 20px; padding: 20px;
} }
...@@ -48,7 +55,7 @@ ...@@ -48,7 +55,7 @@
</span> </span>
</li> </li>
<li> <li>
<button class="hollowFixedBtn" @click="addAirplane">新增</button> <button class="hollowFixedBtn" @click="editTeam(null)">新增</button>
<button class="hollowFixedBtn" @click="resetQuery">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetQuery">{{$t('pub.searchBtn')}}</button>
</li> </li>
</ul> </ul>
...@@ -66,6 +73,7 @@ ...@@ -66,6 +73,7 @@
<div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div> <div class="mb title"><i class="iconfont icon-biaoti1"></i><span>包机信息</span></div>
<div class="mb"><span>{{item.GTeamName}}</span></div> <div class="mb"><span>{{item.GTeamName}}</span></div>
<div>出发日期：<span>{{item.StartDate}}</span></div> <div>出发日期：<span>{{item.StartDate}}</span></div>
<div>团队信息：<span>{{item.TCNUM}}({{item.TCID}})</span></div>
</div> </div>
</div> </div>
<div class="el-col w_20"> <div class="el-col w_20">
...@@ -75,35 +83,44 @@ ...@@ -75,35 +83,44 @@
<div> {{subItem.Flight_number}} <div> {{subItem.Flight_number}}
{{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}} {{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
{{subItem.Arrival_time}}</div> {{subItem.Arrival_time}}</div>
</div></div>
</div> </div>
<div class="el-col w_20"> </div>
</div>
<div class="el-col w_10">
<div class="p20"> <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.YSeat}}</span></div>
<div class="mb"><span>商务舱: {{item.CSeat}}</span></div> <div class="mb"><span>商务舱: {{item.CSeat}}</span></div>
<div class="mb"><span>头等舱: {{item.FSeat}}</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> </div>
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20"> <div class="p20">
<div class="mb title"><i class="iconfont icon-tuandui"></i><span>合作伙伴</span></div> <div class="mb title"><i class="iconfont icon-tuandui"></i><span>合作伙伴</span></div>
<template v-for="(subItem,subIndex) in item.TravelTeamPartnerList"> <template v-for="(subItem,subIndex) in item.TravelTeamPartnerList">
<el-tag :key="subIndex+1000" style="margin-right:10px;">{{subItem.CustomerName}}</el-tag> <el-tag :key="subIndex+1000" style="margin: 0 10px 10px 0;">{{subItem.CustomerName}}</el-tag>
</template> </template>
</div> </div>
</div> </div>
<div class="el-col w_20"> <div class="el-col w_10">
<div class="p20"> <div class="p20">
<div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div> <div class="mb title"><i class="iconfont icon-yuangong"></i><span>发起信息</span></div>
<div class="mb">发起人：{{item.CreateByName}}</div> <div class="mb">发起人：{{item.CreateByName}}</div>
<div>发起时间：{{item.CreateTime}}</div></div> <div>{{item.CreateTime}}</div>
</div> </div>
<div class="el-col w_20"> </div>
<div class="el-col w_10">
<div class="p20"> <div class="p20">
<!-- <span>操作</span> --> <el-button class="mb" @click.native='editTeam(item)' type="primary" size="mini"
<el-button class="mb" @click.native='goUrl("airplaneInfo", item.GTeamId,"包机信息")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">修改 style="background:#00C6FF; border-color:#00C6FF">修改
</el-button> </el-button>
<el-dropdown trigger="click"> <el-dropdown trigger="click">
...@@ -139,10 +156,18 @@ ...@@ -139,10 +156,18 @@
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
<el-dialog class="app-attachment-dialog" style="width:1000px;height:800px;margin:0 auto;z-index:99999"
:title="dialogTitle" :visible.sync="isShowEditTeamDialog" :close-on-click-modal="false">
<editTeamInfo :id="ID"></editTeamInfo>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import editTeamInfo from "./editTeamInfo"; //新增修改包机团
export default { export default {
components: {
editTeamInfo
},
provide() { provide() {
return { return {
reload: this.reload reload: this.reload
...@@ -150,6 +175,9 @@ ...@@ -150,6 +175,9 @@
}, },
data() { data() {
return { return {
isShowEditTeamDialog: false, //是否显示新增修改包机团弹窗
dialogTitle: "添加包机信息", //弹窗名称
ID: '',
//查询参数 //查询参数
queryMsg: { queryMsg: {
pageIndex: 1, pageIndex: 1,
...@@ -200,21 +228,16 @@ ...@@ -200,21 +228,16 @@
}, },
}, },
methods: { methods: {
goUrl(path,id, name) { //新增修改包机团
this.$router.push({ editTeam(item) {
name: path, if (item) {
query: { this.dialogTitle = "修改包机信息";
id: id, } else {
blank: "y", this.dialogTitle = "添加包机信息";
tab: name
} }
}); this.isShowEditTeamDialog = true;
},
addAirplane() {
this.$router.push({
name: 'airplaneInfo',
});
}, },
//翻页 //翻页
handleCurrentChange(val) { handleCurrentChange(val) {
this.queryMsg.pageIndex = val; this.queryMsg.pageIndex = val;
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ 9cc1aa17
...@@ -613,7 +613,7 @@ ...@@ -613,7 +613,7 @@
<template slot="prepend">{{$t('sm.tonghangfanyong')}}</template> <template slot="prepend">{{$t('sm.tonghangfanyong')}}</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item style="display:none;"> <el-form-item>
<el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat" <el-input :placeholder="$t('pub.pleaseImport')" class="w190 ComSeat"
v-model="priceData.DiscountPrice" @keyup.native="checkPrice(priceData,'DiscountPrice')"> v-model="priceData.DiscountPrice" @keyup.native="checkPrice(priceData,'DiscountPrice')">
<template slot="prepend">{{$t('sm.zaoniaoyouhui')}}</template> <template slot="prepend">{{$t('sm.zaoniaoyouhui')}}</template>
......
src/components/newTravelmanager/travelLineTrip/trifficTrip.vue
View file @ 9cc1aa17
...@@ -293,17 +293,7 @@ ...@@ -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) { changeAirportType(t) {
if (t == this.trafficObj.AirportPickUp) { if (t == this.trafficObj.AirportPickUp) {
......
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