Skip to content

S
SuperMan
Commit 76e48ff2 authored by youjie's avatar youjie
Browse files
Options

no message

parents 17bf184b ab2ee579
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2382 additions and 1887 deletions
src/components/SupplierIndex.vue
View file @ 76e48ff2
...@@ -1552,8 +1552,113 @@ ...@@ -1552,8 +1552,113 @@
let msgs = this.$store.state.currSessionMsgs; let msgs = this.$store.state.currSessionMsgs;
return msgs; return msgs;
}, },
},
// mounted() {
// let that = this;
// this.MsgBus.$on('doudong', function () {
// that.dou()
// });
// this.MsgBus.$on('openChat', function (obj) {
// that.lt(obj)
// });
// const permissionNow = Notification.requestPermission();
// var hiddenProperty =
// "hidden" in document ?
// "hidden" :
// "webkitHidden" in document ?
// "webkitHidden" :
// "mozHidden" in document ?
// "mozHidden" :
// null;
// var visibilityChangeEvent = hiddenProperty.replace(
// /hidden/i,
// "visibilitychange"
// );
// var onVisibilityChange = function () {
// if (!document[hiddenProperty]) {
// that.isFocus = true;
// } else {
// that.isFocus = false;
// }
// };
// document.addEventListener(visibilityChangeEvent, onVisibilityChange);
// if (!localStorage.menu)
// this.$store.dispatch("connect");
// else {
// this.firstMenuList = JSON.parse(localStorage.menu)
// if (this.firstMenuList.indexOf('IM') != -1) {
// this.$store.dispatch("connect");
// }
// }
}, // this.getDynamic();
// this.getMyDynamic();
// this.getAboutMeDynamic();
// this.getWebAllPart();
// this.getNoticeList()
// document
// .getElementById("allDynamic")
// .addEventListener("scroll", function () {
// //全部动态
// if (this.scrollHeight - this.scrollTop === this.clientHeight) {
// that.isAppend = true;
// that.dynamicMsg.pageIndex =
// Math.ceil(that.dynamicList.length / 10) + 1;
// that.getDynamic();
// }
// });
// document.getElementById("myDynamic").addEventListener("scroll", function () {
// //我的动态
// if (this.scrollHeight - this.scrollTop === this.clientHeight) {
// that.isAppendOne = true;
// that.myDynamicMsg.pageIndex =
// Math.ceil(that.myDynamicList.length / 10) + 1;
// that.getMyDynamic();
// }
// });
// document
// .getElementById("aboutMeDynamic")
// .addEventListener("scroll", function () {
// //与我相关
// if (this.scrollHeight - this.scrollTop === this.clientHeight) {
// that.isAppendTwo = true;
// that.aboutMeDynamicMsg.pageIndex =
// Math.ceil(that.aboutMyDynamicList.length / 10) + 1;
// that.getAboutMeDynamic();
// }
// });
// if (
// window.localStorage.msgBoxInfo &&
// window.localStorage.msgBoxInfo != ""
// ) {
// this.boxInfo = JSON.parse(window.localStorage.msgBoxInfo);
// }
// if (this.boxInfo.x == 0) {
// this.boxInfo.x = 560;
// }
// if (this.boxInfo.y == 0) {
// this.boxInfo.y = 280;
// }
// document.title = this.userInfo.GroupName;
// this.getMenu();
// this.getBranchList();
// this.getProvinceList(651, 1);
// this.GetHotelList();
// this.getList2();
// this.GetHotelTipList();
// var url = window.location.href;
// if (String(url).indexOf('SupplierIndex') >= 0) {
// this.showPage = true;
// } else {
// this.showPage = false;
// };
// this.com_onresize();
// window.onresize = () => {
// this.com_onresize();
// }
// },
created() { created() {
//页面刚进入时开启长连接 //页面刚进入时开启长连接
// this.initWebSocket() // this.initWebSocket()
......
src/components/TravelManager/TravelTeam/addInfo.vue 0 → 100644
View file @ 76e48ff2
This diff is collapsed.
src/components/airplane/apply.vue → src/components/TravelManager/TravelTeam/apply.vue
View file @ 76e48ff2
<style scoped> <style scoped>
.wrapper { .wrapper {
width: 600px; width: 600px;
background: #fff; background: #fff;
......
src/components/TravelManager/TravelTeam/orderInfo.vue 0 → 100644
View file @ 76e48ff2
<style scoped>
.wrapper {
width: 600px;
background: #fff;
margin: 0 auto;
padding: 20px;
}
</style>
<template>
<div class="wrapper">
<el-table v-if="dataList.length>0" :data="dataList" style="width:100%" border v-loading='loading'
:height="tableHeight">
<el-table-column fixed label="ホテル名" min-width="180">
<template slot-scope="scope">
<div>
{{scope.row.HotelName}}</div>
<div>{{scope.row.TotalInventory}}</div>
</template>
</el-table-column>
</el-table>
</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/travelTeamList.vue
View file @ 76e48ff2
<style> <style scoped>
@import "../../../assets/css/newTravelManager.css"; @import "../../../assets/css/newTravelManager.css";
.flex {
display: flex;
}
.w_20 { .w_20 {
width: 20%; width: 20%;
} }
.mb {
.w-25 { margin-bottom: 10px;
width: 25%; }
} .title {
font-weight: 600;
.w-50 { }
width: 50%
}
.p20 { .p20 {
padding: 20px; padding: 20px;
} }
.TC_companyList span,
.TC_OtherCompany span {
display: inline-block;
font-size: 12px;
padding: 5px 10px;
border: 1px solid #d1d1d1;
margin: 5px 10px 0 0;
border-radius: 4px;
cursor: pointer;
}
.TC_companyList span:first-child {
margin-right: 20px;
}
.TC_companyList {
padding-top: 15px;
margin-left: 32px;
}
.TC_checked {
border: 1px solid #d95454 !important;
box-sizing: border-box;
}
.TC_OtherCompany {
margin: 0 0 20px 20px;
}
.TC_customerInfo tbody th {
height: 40px;
text-align: center;
}
.TC_firTable td {
height: 20px !important;
text-align: center !important;
}
.TC_midTable td {
text-align: center !important;
}
.TC_showUnion {
float: right;
color: #2aaef2;
cursor: pointer;
margin-bottom: 10px;
}
.go_date {
font-weight: 700;
font-size: 14px;
}
.TC_Content ._pic_upload .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.TC_Content ._pic_upload>div {
float: left;
width: 138px;
height: 92px;
border: 1px dashed rgba(210, 210, 210, 1);
border-radius: 2px;
cursor: pointer;
margin-bottom: 10px;
padding: 5px;
margin-right: 10px;
position: relative;
}
.TC_Content .avatar-uploader-icon {
height: auto;
}
.TC_HotelPop {
overflow: auto;
max-height: 350px;
}
.TC_HotelPop table td {
padding: 5px 0;
text-align: center;
}
.TC_HotelPop table th {
text-align: center;
}
.TC_CarNum {
padding: 5px 10px;
background: #5151f5;
color: #fff;
font-size: 12px;
display: inline-block;
border-radius: 5px;
}
.comSearchDiv .el-checkbox {
margin-right: 0;
}
</style> </style>
<template> <template>
<div class="TC_Content"> <div class="TC_Content">
<div class="TC-MyList"> <div class="TC-MyList">
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <!-- <li>
<span> <span>
<em>{{$t('system.table_ssLine')}}</em> <em>{{$t('system.table_ssLine')}}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
...@@ -145,7 +30,7 @@ ...@@ -145,7 +30,7 @@
:key="item.LineID"></el-option> :key="item.LineID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li> -->
<li> <li>
<span> <span>
<em>业务名称</em> <em>业务名称</em>
...@@ -163,6 +48,7 @@ ...@@ -163,6 +48,7 @@
</span> </span>
</li> </li>
<li> <li>
<button class="hollowFixedBtn" @click="addAirplane">新增</button>
<button class="hollowFixedBtn" @click="resetQuery">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetQuery">{{$t('pub.searchBtn')}}</button>
</li> </li>
</ul> </ul>
...@@ -175,66 +61,70 @@ ...@@ -175,66 +61,70 @@
<li v-for="(item,index) in queryDataObj.dataList" :key="index" <li v-for="(item,index) in queryDataObj.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}"> :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent"> <div class="TC_remarkContent">
<div class="el-col w-20"> <div class="el-col w_20">
<div class="p20"> <div class="p20">
<div><span>{{item.GTeamName}}</span></div> <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.StartDate}}</span></div>
</div> </div>
</div> </div>
<div class="el-col w-20"> <div class="el-col w_20">
<div class="p20" v-for="(subItem,subIndex) in item.TravelTeamFlightList"> <div class="p20">
<div :key="subIndex+1000"> {{subItem.Flight_number}} <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.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
{{subItem.Arrival_time}}</div> {{subItem.Arrival_time}}</div>
</div> </div></div>
</div> </div>
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20"> <div class="p20">
<div><span>经济舱 {{item.YSeat}}</span></div> <div class="mb title"><i class="iconfont icon-jiage"></i><span>航班价格</span></div>
<div><span>商务舱 {{item.CSeat}}</span></div> <div class="mb"><span>经济舱: {{item.YSeat}}</span></div>
<div><span>头等舱 {{item.FSeat}}</span></div> <div class="mb"><span>商务舱: {{item.CSeat}}</span></div>
<div><span>中心价 {{item.MiddlePrice}}</span></div> <div class="mb"><span>头等舱: {{item.FSeat}}</span></div>
<div><span>中心价: {{item.MiddlePrice}}</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><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-right:10px;">{{subItem.CustomerName}}</el-tag>
</template> </template>
</div> </div>
</div> </div>
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20">发起人：{{item.CreateByName}}</div> <div class="p20">
<div class="p20">发起时间：{{item.CreateTime}}</div> <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> </div>
<div class="el-col w_20"> <div class="el-col w_20">
<div class="p20"> <div class="p20">
<span>操作</span> <!-- <span>操作</span> -->
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名情况")' type="primary" size="mini" <el-button class="mb" @click.native='goUrl("airplaneInfo", item.GTeamId,"包机信息")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">报名情况
</el-button>
<!-- <el-button @click.native='goUrl("RegistrationList", item.TCID,"财务入账")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">财务入账
</el-button>
<el-button @click.native='goUrl("RegistrationList", item.TCID,"财务审核")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">财务审核
</el-button>
<el-button @click.native='goUrl("RegistrationList", item.TCID,"修改")' type="primary" size="mini"
style="background:#00C6FF; border-color:#00C6FF">修改 style="background:#00C6FF; border-color:#00C6FF">修改
</el-button> </el-button>
<el-button @click.native='goUrl("RegistrationList", item.TCID,"删除")' type="primary" size="mini" <el-dropdown trigger="click">
style="background:#00C6FF; border-color:#00C6FF">删除 <span class="el-dropdown-link">更多
</el-button> <i class="el-icon-arrow-down el-icon--right"></i>
<el-button @click.native='goUrl("RegistrationList", item.TCID,"包机结算")' type="primary" size="mini" </span>
style="background:#00C6FF; border-color:#00C6FF">包机结算 <el-dropdown-menu slot="dropdown" class="travelControlDropDown">
</el-button> <el-dropdown-item>
<el-button @click.native='goUrl("RegistrationList", item.TCID,"查看包机团")' type="primary" size="mini" 财务入账
style="background:#00C6FF; border-color:#00C6FF">查看包机团 </el-dropdown-item>
</el-button> <el-dropdown-item>
<el-button @click.native='goUrl("RegistrationList", item.TCID,"添加包机团")' type="primary" size="mini" 财务审核
style="background:#00C6FF; border-color:#00C6FF">添加包机团 </el-dropdown-item>
</el-button> --> <el-dropdown-item>
包机结算
</el-dropdown-item>
<el-dropdown-item>
删除
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div> </div>
</div> </div>
</div> </div>
...@@ -310,6 +200,21 @@ ...@@ -310,6 +200,21 @@
}, },
}, },
methods: { methods: {
goUrl(path,id, name) {
this.$router.push({
name: path,
query: {
id: id,
blank: "y",
tab: name
}
});
},
addAirplane() {
this.$router.push({
name: 'airplaneInfo',
});
},
//翻页 //翻页
handleCurrentChange(val) { handleCurrentChange(val) {
this.queryMsg.pageIndex = val; this.queryMsg.pageIndex = val;
......
src/components/airplane/addInfo.vue deleted 100644 → 0
View file @ 17bf184b
This diff is collapsed.
src/router/config.js
View file @ 76e48ff2
...@@ -2291,13 +2291,34 @@ export default { ...@@ -2291,13 +2291,34 @@ export default {
meta: { meta: {
title: '团控列表' title: '团控列表'
}, },
}, , { }, {
path: '/airplaneInfo', //包机信息
name: 'airplaneInfo',
component: resolve => require(['@/components/TravelManager/TravelTeam/addInfo'], resolve),
meta: {
title: '包机信息'
},
}, {
path: '/TravelTeam', //包机列表 path: '/TravelTeam', //包机列表
name: 'TravelTeam', name: 'TravelTeam',
component: resolve => require(['@/components/TravelManager/TravelTeam/travelTeamList'], resolve), component: resolve => require(['@/components/TravelManager/TravelTeam/travelTeamList'], resolve),
meta: { meta: {
title: '包机列表' 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: '/TravelSupplier', //供应商列表 path: '/TravelSupplier', //供应商列表
name: 'TravelSupplier', name: 'TravelSupplier',
...@@ -5815,34 +5836,6 @@ export default { ...@@ -5815,34 +5836,6 @@ export default {
meta: { meta: {
title: '供应商投诉' title: '供应商投诉'
}, },
}, {
path: '/airplaneInfo', //包机信息
name: 'airplaneInfo',
component: resolve => require(['@/components/airplane/addInfo'], resolve),
meta: {
title: '包机信息'
},
}, {
path: '/airplaneGroup', //团控信息
name: 'airplaneGroup',
component: resolve => require(['@/components/airplane/airplaneGroup'], resolve),
meta: {
title: '团控信息'
},
}, {
path: '/airplaneGroup', //团控信息
name: 'airplaneGroup',
component: resolve => require(['@/components/airplane/airplaneGroup'], resolve),
meta: {
title: '团控信息'
},
}, {
path: '/airplane/apply', //团控信息
name: 'airplane/apply',
component: resolve => require(['@/components/airplane/apply'], resolve),
meta: {
title: '在线申请'
},
} }
] ]
}, },
......
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