Skip to content

S
SuperMan
Commit 9c1af0a3 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents bfa857ff b8da3c32
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1631 additions and 627 deletions
src/App.vue
View file @ 9c1af0a3
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
</viewer> </viewer>
<chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode> <chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode>
<!-- --> <!-- -->
<!-- <div class="showMyCareer">
<mycareer></mycareer>
</div> -->
</div> </div>
</template> </template>
...@@ -27,10 +29,12 @@ var sUserAgent = navigator.userAgent; ...@@ -27,10 +29,12 @@ var sUserAgent = navigator.userAgent;
// document.html.style.minWidth = '1366px' // document.html.style.minWidth = '1366px'
} }
import chosenOpenMode from './components/commonPage/chosenOpenMode' import chosenOpenMode from './components/commonPage/chosenOpenMode'
import mycareer from './components/champion/mycareer'
export default { export default {
name: 'App', name: 'App',
components: { components: {
chosenOpenMode chosenOpenMode,
mycareer
}, },
created() { created() {
//注册禁止后退，并且不做卸载 //注册禁止后退，并且不做卸载
...@@ -124,6 +128,16 @@ export default { ...@@ -124,6 +128,16 @@ export default {
.BMap_cpyCtrl {display: none;} .BMap_cpyCtrl {display: none;}
.anchorBL {display: none;} .anchorBL {display: none;}
.viewer{display: none !important;} .viewer{display: none !important;}
.showMyCareer{
position: absolute;
top: 0;
bottom: 0;
right: 0;
left: 0;
background: rgba(0,0,0,.3);
align-items: center;
justify-content: center;
z-index: 999999999999999;
}
</style> </style>
src/components/FinancialModule/RecPayQuery.vue
View file @ 9c1af0a3
...@@ -903,7 +903,7 @@ export default { ...@@ -903,7 +903,7 @@ export default {
this.msg.AccountType=15; this.msg.AccountType=15;
this.msg.TradeWay=4; this.msg.TradeWay=4;
this.getAccountList(this.msg.AccountType,this.msg.TradeWay) this.getAccountList(this.msg.AccountType,this.msg.TradeWay)
this.msg.BankID=14; this.msg.BankID=this.$route.query.BankID;
this.transactionDate[0]=this.$route.query.StartDate; this.transactionDate[0]=this.$route.query.StartDate;
this.transactionDate[1]=this.$route.query.StartDate; this.transactionDate[1]=this.$route.query.StartDate;
} }
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 9c1af0a3
...@@ -522,8 +522,12 @@ tr._item_list td:last-child { ...@@ -522,8 +522,12 @@ tr._item_list td:last-child {
<el-option value="4" label="国内票务"></el-option> <el-option value="4" label="国内票务"></el-option>
<el-option value="5" v-if="isShowType" label="散卖机票"></el-option> <el-option value="5" v-if="isShowType" label="散卖机票"></el-option>
<el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option> <el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
<el-option value="12" v-if="isShowType" label="日本地接部专户(人民币)"></el-option>
<el-option value="7" v-if="isShowType" label="老挝地接部专户"></el-option> <el-option value="7" v-if="isShowType" label="老挝地接部专户"></el-option>
<el-option value="8" label="票务部专户"></el-option> <el-option value="8" label="票务部专户"></el-option>
<el-option value="9" v-if="isShowType" label="酒店住宿"></el-option>
<el-option value="10" v-if="isShowType" label="景点门票"></el-option>
<el-option value="11" v-if="isShowType" label="餐厅美食"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -649,8 +653,11 @@ Vue.component("TCIDJump", { ...@@ -649,8 +653,11 @@ Vue.component("TCIDJump", {
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===6||rowData.DataType===7||rowData.DataType===12">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===8">{{rowData.TCID}}</span> <span style="cursor: pointer" v-if="rowData.DataType===8">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===9">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===10">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===11">{{rowData.TCID}}</span>
</div> </div>
`, `,
...@@ -689,7 +696,11 @@ Vue.component("TCNUMJump", { ...@@ -689,7 +696,11 @@ Vue.component("TCNUMJump", {
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===6" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===7" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===12" @click="goRec('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span> <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===8" @click="goAIR('RecPayQuery',rowData)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===9">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===10">{{rowData.TCNUM}}</span>
<span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===11">{{rowData.TCNUM}}</span>
</div>`, </div>`,
props: { props: {
rowData: { rowData: {
...@@ -712,6 +723,9 @@ Vue.component("TCNUMJump", { ...@@ -712,6 +723,9 @@ Vue.component("TCNUMJump", {
if(rowData.DataType===7){ if(rowData.DataType===7){
BankID=15; BankID=15;
} }
if(rowData.DataType===12){
BankID=19;
}
if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){ if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD"); StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
} }
......
src/components/Hotel/roomQuery.vue
View file @ 9c1af0a3
...@@ -381,7 +381,6 @@ ...@@ -381,7 +381,6 @@
}); });
} }
this.dataList = sourceData; this.dataList = sourceData;
console.log("this.dataList",this.dataList)
} else { } else {
this.$message.error(res.data.message) this.$message.error(res.data.message)
} }
......
src/components/Restaurant/RestaurantSalesBoard.vue
View file @ 9c1af0a3
<style> <style>
/* 日期样式开始 */ /* 日期样式开始 */
.RestaurantSalesBoard .month ul { .RestaurantSalesBoard .month ul {
border-radius: 4px 4px 0 0; border-radius: 4px 4px 0 0;
width: 100%; width: 100%;
height: 50px; height: 50px;
...@@ -9,47 +9,56 @@ ...@@ -9,47 +9,56 @@
margin: 0; margin: 0;
padding: 0; padding: 0;
text-align: center; text-align: center;
} }
.RestaurantSalesBoard .year-month {
.RestaurantSalesBoard .year-month {
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: space-around; justify-content: space-around;
} }
.RestaurantSalesBoard .year-month > input {
.RestaurantSalesBoard .year-month>input {
width: 100px; width: 100px;
float: left; float: left;
} }
.RestaurantSalesBoard .arrow {
.RestaurantSalesBoard .arrow {
padding: 10px; padding: 10px;
font-style: normal; font-style: normal;
cursor: pointer; cursor: pointer;
} }
.RestaurantSalesBoard .monthminus {
.RestaurantSalesBoard .monthminus {
position: absolute; position: absolute;
left: 0px; left: 0px;
top: 15px; top: 15px;
} }
.RestaurantSalesBoard .monthadd {
.RestaurantSalesBoard .monthadd {
position: absolute; position: absolute;
right: 21px; right: 21px;
top: 15px; top: 15px;
} }
.RestaurantSalesBoard .month ul li {
.RestaurantSalesBoard .month ul li {
font-size: 18px; font-size: 18px;
color: #fff; color: #fff;
position: relative; position: relative;
display: inline-block; display: inline-block;
letter-spacing: 3px; letter-spacing: 3px;
} }
.RestaurantSalesBoard .month ul li i {
.RestaurantSalesBoard .month ul li i {
font-size: 22px; font-size: 22px;
color: #ff7e7e; color: #ff7e7e;
cursor: pointer; cursor: pointer;
} }
.RestaurantSalesBoard .month ul li > input {
.RestaurantSalesBoard .month ul li>input {
text-align: center; text-align: center;
} }
.RestaurantSalesBoard .weekdays {
.RestaurantSalesBoard .weekdays {
margin: 0; margin: 0;
padding: 3px 0; padding: 3px 0;
background-color: #3fa783; background-color: #3fa783;
...@@ -58,14 +67,15 @@ ...@@ -58,14 +67,15 @@
flex-wrap: wrap; flex-wrap: wrap;
color: #fff; color: #fff;
justify-content: space-around; justify-content: space-around;
} }
.RestaurantSalesBoard .weekdays li {
.RestaurantSalesBoard .weekdays li {
display: inline-block; display: inline-block;
width: 14.2857%; width: 14.2857%;
text-align: center; text-align: center;
} }
.RestaurantSalesBoard .days { .RestaurantSalesBoard .days {
width: 100%; width: 100%;
padding: 0; padding: 0;
margin: 0; margin: 0;
...@@ -73,8 +83,9 @@ ...@@ -73,8 +83,9 @@
flex-wrap: wrap; flex-wrap: wrap;
box-sizing: border-box; box-sizing: border-box;
justify-content: space-around; justify-content: space-around;
} }
.RestaurantSalesBoard .days > li {
.RestaurantSalesBoard .days>li {
list-style-type: none; list-style-type: none;
width: 14.2857%; width: 14.2857%;
height: 140px; height: 140px;
...@@ -86,22 +97,24 @@ ...@@ -86,22 +97,24 @@
box-sizing: border-box; box-sizing: border-box;
border-right: 1px solid #ddd; border-right: 1px solid #ddd;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
} }
.RestaurantSalesBoard .days li > div {
.RestaurantSalesBoard .days li>div {
height: 112px; height: 112px;
width: 100%; width: 100%;
overflow-y: auto; overflow-y: auto;
text-align: left; text-align: left;
} }
.RestaurantSalesBoard .days li > div > p {
.RestaurantSalesBoard .days li>div>p {
border-bottom: 1px dashed #ccc; border-bottom: 1px dashed #ccc;
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
width: 100%; width: 100%;
text-indent: 10px; text-indent: 10px;
} }
.RestaurantSalesBoard .currentInput { .RestaurantSalesBoard .currentInput {
width: 120px; width: 120px;
height: 30px; height: 30px;
border-radius: 17px; border-radius: 17px;
...@@ -110,8 +123,9 @@ ...@@ -110,8 +123,9 @@
color: #fff; color: #fff;
background: transparent; background: transparent;
font-size: 18px; font-size: 18px;
} }
.RestaurantSalesBoard .days li .other-month {
.RestaurantSalesBoard .days li .other-month {
display: inline-block; display: inline-block;
position: absolute; position: absolute;
right: 0; right: 0;
...@@ -122,9 +136,9 @@ ...@@ -122,9 +136,9 @@
line-height: 17px; line-height: 17px;
background-color: #cccccc; background-color: #cccccc;
color: #fff; color: #fff;
} }
.RestaurantSalesBoard .ckStyle { .RestaurantSalesBoard .ckStyle {
width: 100%; width: 100%;
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
...@@ -133,25 +147,27 @@ ...@@ -133,25 +147,27 @@
font-weight: bold; font-weight: bold;
background: #ccc; background: #ccc;
color: #000; color: #000;
} }
.RestaurantSalesBoard .ckStyleOther { .RestaurantSalesBoard .ckStyleOther {
background: #dddddd !important; background: #dddddd !important;
font-weight: normal !important; font-weight: normal !important;
color: #999; color: #999;
} }
.RestaurantSalesBoard .Owe_Room { .RestaurantSalesBoard .Owe_Room {
color: #e95252; color: #e95252;
} }
.RestaurantSalesBoard .Used_room {
.RestaurantSalesBoard .Used_room {
color: #13b0ae; color: #13b0ae;
} }
.RestaurantSalesBoard .otherMoth {
.RestaurantSalesBoard .otherMoth {
background: #f2f2f2; background: #f2f2f2;
} }
.RestaurantSalesBoard .title { .RestaurantSalesBoard .title {
height: 14px; height: 14px;
line-height: 14px; line-height: 14px;
border-left: 3px solid #e95252; border-left: 3px solid #e95252;
...@@ -159,21 +175,27 @@ ...@@ -159,21 +175,27 @@
color: #333; color: #333;
text-indent: 10px; text-indent: 10px;
margin: 20px 0; margin: 20px 0;
} }
.RestaurantSalesBoard .hasStock_1 { .RestaurantSalesBoard .hasStock_1 {
color: #FFFFFF; color: #FFFFFF;
background-color: #ff3737; background-color: #ff3737;
} }
.RestaurantSalesBoard .hasStock_2 { .RestaurantSalesBoard .hasStock_2 {
background-color: #ff99cc; background-color: #ff99cc;
} }
.RestaurantSalesBoard .hasStock_3 { .RestaurantSalesBoard .hasStock_3 {
background-color: #bcd6ee; background-color: #bcd6ee;
} }
.RestaurantSalesBoard .hasStock_4 { .RestaurantSalesBoard .hasStock_4 {
background-color: #ffffff; background-color: #ffffff;
} }
/* 日期样式结束*/
/* 日期样式结束*/
</style> </style>
<template> <template>
<div class="flexOne RestaurantSalesBoard"> <div class="flexOne RestaurantSalesBoard">
...@@ -190,6 +212,7 @@ ...@@ -190,6 +212,7 @@
</li> </li>
<li style="margin-right:50px;"> <li style="margin-right:50px;">
<button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button> <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
<button class="normalBtn" type="button" @click="DownLoadDinner()">下载</button>
</li> </li>
</ul> </ul>
</div> </div>
...@@ -201,12 +224,14 @@ ...@@ -201,12 +224,14 @@
<ul> <ul>
<li> <li>
<i class="el-icon-caret-left monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)"></i> <i class="el-icon-caret-left monthminus" @click="currentYear-=1,getDateString(),initCalendar(dateString)"></i>
<input type="text" disabled="disabled" v-model="currentYear" class="currentInput" @input="getDateString(),initCalendar(dateString)">年 <input type="text" disabled="disabled" v-model="currentYear" class="currentInput"
@input="getDateString(),initCalendar(dateString)">年
<i class="el-icon-caret-right monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)"></i> <i class="el-icon-caret-right monthadd" @click="currentYear+=1,getDateString(),initCalendar(dateString)"></i>
</li> </li>
<li> <li>
<i class="el-icon-caret-left monthminus" @click="pickPre(currentYear,currentMonth)"></i> <i class="el-icon-caret-left monthminus" @click="pickPre(currentYear,currentMonth)"></i>
<input type="text" disabled="disabled" v-model="currentMonth" class="currentInput" @input="getDateString(),initCalendar(dateString)">月 <input type="text" disabled="disabled" v-model="currentMonth" class="currentInput"
@input="getDateString(),initCalendar(dateString)">月
<i class="el-icon-caret-right monthadd" @click="pickNext(currentYear,currentMonth)"></i> <i class="el-icon-caret-right monthadd" @click="pickNext(currentYear,currentMonth)"></i>
</li> </li>
</ul> </ul>
...@@ -223,8 +248,9 @@ ...@@ -223,8 +248,9 @@
</ul> </ul>
<ul class="days clearfix" v-loading="msg.loading"> <ul class="days clearfix" v-loading="msg.loading">
<li v-for="(dayItem,index) in days" :key="dayItem.index"> <li v-for="(dayItem,index) in days" :key="dayItem.index">
<p class="ckStyle" :class="{ckStyleOther:dayItem.day.getMonth()+1 != currentMonth}">{{dayItem.day.getDate()}}</p> <p class="ckStyle" :class="{ckStyleOther:dayItem.day.getMonth()+1 != currentMonth}">{{dayItem.day.getDate()}}
<div @click="goUrl('TicketManager',dayItem,'票务管理')" > </p>
<div>
<p v-for="item in dayItem.dayValue"> <p v-for="item in dayItem.dayValue">
<span class="text_underLine">{{item.DinnerName}}（{{item.DiningNum}}）</span> <span class="text_underLine">{{item.DinnerName}}（{{item.DiningNum}}）</span>
</p> </p>
...@@ -270,17 +296,6 @@ ...@@ -270,17 +296,6 @@
} else if (type === 4) { } else if (type === 4) {
return 'hasStock_4' return 'hasStock_4'
} }
},
goUrl(path, obj, name) {
// this.$router.push({
// path: path,
// query: {
// id: obj.AirLineTicketId,
// blank: "y",
// tab: name
// }
// });
}, },
//格式化日期 //格式化日期
getDateString: function () { getDateString: function () {
...@@ -329,7 +344,7 @@ ...@@ -329,7 +344,7 @@
//点击获取酒店库存数据 //点击获取酒店库存数据
GetHoltelInventory() { GetHoltelInventory() {
this.msg.loading = true; this.msg.loading = true;
var that=this; var that = this;
this.apipost( this.apipost(
"order_post_GetDinnerMonthStatistics", "order_post_GetDinnerMonthStatistics",
this.msg, this.msg,
...@@ -348,8 +363,8 @@ ...@@ -348,8 +363,8 @@
for (var j = 0; j < this.DayData.length; j++) { for (var j = 0; j < this.DayData.length; j++) {
if (this.DayData[j].Day == myDate) { if (this.DayData[j].Day == myDate) {
dayItem.dayValue = this.DayData[j].SubList; dayItem.dayValue = this.DayData[j].SubList;
this.DayData[j].SubList.forEach(sunItem=>{ this.DayData[j].SubList.forEach(sunItem => {
that.TotalInventory=parseFloat(this.TotalInventory)+parseFloat(sunItem.DiningNum) that.TotalInventory = parseFloat(this.TotalInventory) + parseFloat(sunItem.DiningNum)
}); });
} }
} }
...@@ -370,6 +385,19 @@ ...@@ -370,6 +385,19 @@
}, },
err => {} err => {}
); );
},
//餐厅下载
DownLoadDinner() {
this.msg.loading = true;
let qMsg = {
queryMsg: this.msg,
uid: this.getLocalStorage().EmployeeId
};
let fileName = "餐厅下载" + this.$commonUtils.getCurrentDate() + ".xls";
this.GetLocalFile("dinner_get_downloadDinner", qMsg, fileName,
res => {
this.msg.loading = false;
});
} }
}, },
mounted() { mounted() {
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ 9c1af0a3
...@@ -22,6 +22,14 @@ ...@@ -22,6 +22,14 @@
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span> </span>
</li> </li>
<li><span><em>餐厅</em>
<el-select v-model="msg.QDiningID" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" :value='0'></el-option>
<el-option v-for="item in DiningList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option>
</el-select>
</span>
</li>
<li> <li>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" /> <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li> </li>
...@@ -175,7 +183,10 @@ ...@@ -175,7 +183,10 @@
EndDate: '', EndDate: '',
currentPage: 1, currentPage: 1,
total: 0, total: 0,
QDiningID: 0, //餐厅编号
}, },
//餐厅列表
DiningList: [],
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
thLengthTitle: [], thLengthTitle: [],
...@@ -292,6 +303,20 @@ ...@@ -292,6 +303,20 @@
} }
}, err => {}) }, err => {})
}, },
//获取餐厅列表
GetDinnerList() {
this.DiningList = [];
this.apipost(
"dining_post_GetList", {
QCountry: 651,
},
res => {
if (res.data.resultCode == 1) {
this.DiningList = res.data.data;
}
}
);
}
}, },
mounted() { mounted() {
let myDate = new Date(); let myDate = new Date();
...@@ -306,7 +331,8 @@ ...@@ -306,7 +331,8 @@
let height = window.innerHeight - 65 - 164; let height = window.innerHeight - 65 - 164;
this.boxHeight = height; this.boxHeight = height;
this.offsetwidth = width; this.offsetwidth = width;
this.getList() this.GetDinnerList();
this.getList();
}, },
} }
......
src/components/Ticketing/seatStatistics.vue
View file @ 9c1af0a3
This diff is collapsed.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 9c1af0a3
...@@ -489,9 +489,13 @@ ...@@ -489,9 +489,13 @@
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a> :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p> </p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0"> <p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span> <span>同行清位时间</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span> <span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</p> </p>
<p class="travelnowrap" v-if="item.SaleClearOrderHour>0">
<span>销售清位时间</span>
<span class="TCL-greenType">{{item.SaleClearOrderHour}}小时</span>
</p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj" <commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
......
src/components/champion/dashboard.vue 0 → 100644
View file @ 9c1af0a3
<template>
<div class="inerank-container">
<div :style="{height:'100%',width:'100%'}" ref="myLineRank"></div>
</div>
</template>
<script>
export default {
props:{
score:{
type:Number,
default:0
},
title:{
type:String,
default:''
}
},
data() {
return {};
},
mounted() {
this.init();
},
methods: {
init() {
let myChart = this.$echarts.init(this.$refs.myLineRank);
let option = {
series: [
{
name: "ze",
type: "gauge",
radius: "99%", //仪表大小
// startAngle: 200, //开始角度
// endAngle: -20, //结束角度
min: 0,
max: 100,
splitNumber: 5,
data: [{ value: this.score, name: "ze" }],
axisLine: {
show: false,
lineStyle: {
color: [
[
(this.score/100),
new this.$echarts.graphic.LinearGradient(1, 0, 0, 0, [
{ offset: 0, color: "#F7BF4Caa" },
{ offset: 1, color: "#F7BF4C00" }
])
],
[1, "#00000000"]
],
width: 25
}
},
splitLine: {
show: false
},
axisTick: {
show: false
},
axisLabel: {
show: false
},
pointer: {
//指针样式
length: "95%",
color: "#fff",
width: 0
},
title: {
show: false
},
detail: {
show: false
}
},
{
name: this.title,
type: "gauge",
radius: "100%", //仪表大小
// startAngle: 200, //开始角度
// endAngle: -20, //结束角度
min: 0,
max: 100,
splitNumber: 5,
data: [{ value: this.score, name: this.title}],
axisLine: {
show: false,
lineStyle: {
// 属性lineStyle控制线条样式
color: [[0.5, "#F7BF4C"], [0.8, "#F7BF4C"], [1, "#F7BF4C"]],
// shadowColor: "#F7BF4C",
// shadowBlur: 250,
width: 2
}
},
splitLine: {
show: false
},
axisTick: {
show: true,
lineStyle: {
// 属性lineStyle控制线条样式
color: "#F7BF4C66",
width: 1
}
},
axisLabel: {
show: false
},
pointer: {
//指针样式
length: "95%",
color: "#fff",
width: 3
},
title: {
show: true,
offsetCenter: [0, "80%"],
color: "#FFF",
fontSize: 14,
padding: 5,
fontFamily: "pingfangR"
},
detail: {
formatter: "{score|{value}}",
offsetCenter: [0, 0],
backgroundColor: "#000000",
shadowColor: "#F7BF4C88",
shadowBlur: 5,
borderRadius: 22,
width: 20,
rich: {
score: {
color: "#FFF",
fontSize: 22,
padding: 5,
fontFamily: "pingfangR"
}
}
}
}
]
};
myChart.setOption(option);
}
}
};
</script>
<style scoped>
.inerank-container {
height: 100%;
width: 100%;
}
</style>
src/components/champion/mycareer.vue 0 → 100644
View file @ 9c1af0a3
This diff is collapsed.
src/components/dmc/manager/dmcTotalTable.vue
View file @ 9c1af0a3
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
<table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading"> <table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
<tr> <tr>
<th colspan="11">公司通用信息</th> <th colspan="11">公司通用信息</th>
<th colspan="5">团队需求表</th> <th colspan="6">团队需求表</th>
<th colspan="10">地接op操作</th> <th colspan="10">地接op操作</th>
</tr> </tr>
<tr> <tr>
...@@ -168,6 +168,7 @@ ...@@ -168,6 +168,7 @@
<th width="60">导游</th> <th width="60">导游</th>
<th width="60">已开票</th> <th width="60">已开票</th>
<th width="60">分房表</th> <th width="60">分房表</th>
<th width="60">旅客名单</th>
<th width="60">出团<br />通知书</th> <th width="60">出团<br />通知书</th>
<th width="60">导游<br />计划表</th> <th width="60">导游<br />计划表</th>
<th width="60">领队<br />交接表</th> <th width="60">领队<br />交接表</th>
...@@ -277,6 +278,9 @@ ...@@ -277,6 +278,9 @@
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadGuestList(item)">旅客名单</a>
</td>
<td> <td>
<div class="fz16 fbold linkspan"> <div class="fz16 fbold linkspan">
<span @click="toTrip(item)" style="color: #4BCA81;" v-if="item.OutNotice==1">√</span> <span @click="toTrip(item)" style="color: #4BCA81;" v-if="item.OutNotice==1">√</span>
...@@ -329,9 +333,10 @@ ...@@ -329,9 +333,10 @@
</td> </td>
<td> <td>
<div class="fz16 fbold linkspan" @click="goUrlBus('BusInfo',item,outItem,'车配信息')"> <div class="fz16 fbold linkspan">
<span style="color: #4BCA81;" v-if="item.BusResult==1">√</span> <span style="color: #4BCA81;" @click="goUrlBus('BusInfo',item,outItem,'车配信息')" v-if="item.BusResult==1">√</span>
<span class="colorE95252" v-else>{{item.BusResult=='-1'?"x":"O"}}</span> <span class="colorE95252" @click="goUrlBus('BusInfo',item,outItem,'车配信息')" v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
<span @click="GoShoupei(item)" style="cursor:pointer;text-decoration:underline;display:block;color:#666;font-size:12px;">车辆信息</span>
</div> </div>
</td> </td>
<td> <td>
...@@ -340,8 +345,10 @@ ...@@ -340,8 +345,10 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div> </div>
</td> </td>
<td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0' > <td :rowspan="2*outItem.PriceCommonList.length" v-if='index==0'>
<div class="fz16 fbold linkspan" @click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')" v-if="outItem.PriceCommonList.length > 1"> <div class="fz16 fbold linkspan"
@click="goUrlLeaderIsApply('TravelPassengerList3',item,outItem,'合团分房表')"
v-if="outItem.PriceCommonList.length > 1">
<span style="color: #4BCA81;" v-if="item.LeaderIsApply==2">√</span> <span style="color: #4BCA81;" v-if="item.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span> <span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div> </div>
...@@ -477,7 +484,7 @@ ...@@ -477,7 +484,7 @@
<th>团号/时间</th> <th>团号/时间</th>
<template v-for="(hItem,hIndex) in TeamHotelList"> <template v-for="(hItem,hIndex) in TeamHotelList">
<th> <th>
{{hItem.TCNUM}}<br/>({{hItem.TCID}}) {{hItem.TCNUM}}<br />({{hItem.TCID}})
</th> </th>
</template> </template>
</tr> </tr>
...@@ -505,7 +512,7 @@ ...@@ -505,7 +512,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="21" style="text-align: left!important;padding:0 20px;"> <td colspan="22" style="text-align: left!important;padding:0 20px;">
<div class="link"> <div class="link">
<p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p> <p @click="getJourney(item.ConfigID,item.Title)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''" <div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
...@@ -843,8 +850,8 @@ ...@@ -843,8 +850,8 @@
'NewCombinationNum': outItem.NewCombinationNum, 'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName': obj.LeaderName, 'LeaderName': obj.LeaderName,
'GuideName': obj.GuideName, 'GuideName': obj.GuideName,
'IsCombine':outItem.PriceCommonList.length>1, 'IsCombine': outItem.PriceCommonList.length > 1,
'NewTCIDs':outItem.TCIDS, 'NewTCIDs': outItem.TCIDS,
blank: 'y', blank: 'y',
tab: title tab: title
} }
...@@ -1017,6 +1024,34 @@ ...@@ -1017,6 +1024,34 @@
} }
}, err => {}) }, err => {})
}, },
//下载旅客名单
DownLoadGuestList(item) {
this.loading = true;
//导出报表
let msg = {
TCID: item.TCID
};
var fileName = "旅客名单.xls";
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】旅客名单.xls";
}
this.GetLocalFile("travel_get_GetTravelGuestExport_V2", msg, fileName,
res => {
this.loading = false;
});
},
//跳转手配书
GoShoupei(item) {
this.$router.push({
name: "busHandBook",
query: {
"TCID": item.TCIDS,
blank: 'y',
tab: "手配依赖书"
}
})
}
}, },
mounted() { mounted() {
let myDate = new Date(); let myDate = new Date();
......
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