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 Hide whitespace changes
Inline Side-by-side
Showing with 1631 additions and 627 deletions
src/App.vue
View file @ 9c1af0a3
......@@ -10,7 +10,9 @@
</viewer>
<chosen-open-mode v-if="haveOpenMode" :settingSys="settingSys"></chosen-open-mode>
<!-- -->
<!-- <div class="showMyCareer">
<mycareer></mycareer>
</div> -->
</div>
</template>
......@@ -27,10 +29,12 @@ var sUserAgent = navigator.userAgent;
// document.html.style.minWidth = '1366px'
}
import chosenOpenMode from './components/commonPage/chosenOpenMode'
import mycareer from './components/champion/mycareer'
export default {
name: 'App',
components: {
chosenOpenMode
chosenOpenMode,
mycareer
},
created() {
//注册禁止后退，并且不做卸载
......@@ -124,6 +128,16 @@ export default {
.BMap_cpyCtrl {display: none;}
.anchorBL {display: none;}
.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>
src/components/FinancialModule/RecPayQuery.vue
View file @ 9c1af0a3
......@@ -903,7 +903,7 @@ export default {
this.msg.AccountType=15;
this.msg.TradeWay=4;
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[1]=this.$route.query.StartDate;
}
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ 9c1af0a3
......@@ -522,8 +522,12 @@ tr._item_list td:last-child {
<el-option value="4" 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="12" 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="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-form-item>
</el-col>
......@@ -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===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===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===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>
`,
......@@ -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===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===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===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>`,
props: {
rowData: {
......@@ -712,6 +723,9 @@ Vue.component("TCNUMJump", {
if(rowData.DataType===7){
BankID=15;
}
if(rowData.DataType===12){
BankID=19;
}
if(rowData.TCNUM.indexOf('JAP')!=-1 || rowData.TCNUM.indexOf('LAO')!=-1){
StartDate=moment(rowData.StartDate).format("YYYY-MM-DD");
}
......
src/components/Hotel/roomQuery.vue
View file @ 9c1af0a3
......@@ -381,7 +381,6 @@
});
}
this.dataList = sourceData;
console.log("this.dataList",this.dataList)
} else {
this.$message.error(res.data.message)
}
......
src/components/Restaurant/bookDinnerStatistics.vue
View file @ 9c1af0a3
......@@ -22,6 +22,14 @@
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</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>
<input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
</li>
......@@ -175,7 +183,10 @@
EndDate: '',
currentPage: 1,
total: 0,
QDiningID: 0, //餐厅编号
},
//餐厅列表
DiningList: [],
LineList: [],
LineTeamList: [],
thLengthTitle: [],
......@@ -292,6 +303,20 @@
}
}, err => {})
},
//获取餐厅列表
GetDinnerList() {
this.DiningList = [];
this.apipost(
"dining_post_GetList", {
QCountry: 651,
},
res => {
if (res.data.resultCode == 1) {
this.DiningList = res.data.data;
}
}
);
}
},
mounted() {
let myDate = new Date();
......@@ -306,7 +331,8 @@
let height = window.innerHeight - 65 - 164;
this.boxHeight = height;
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 @@
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>已设定清位</span>
<span>同行清位时间</span>
<span class="TCL-greenType">{{item.ClearOrderHour}}小时</span>
</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 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop">
<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 @@
<table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
<tr>
<th colspan="11">公司通用信息</th>
<th colspan="5">团队需求表</th>
<th colspan="6">团队需求表</th>
<th colspan="10">地接op操作</th>
</tr>
<tr>
......@@ -168,6 +168,7 @@
<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>
......@@ -277,6 +278,9 @@
<span class="colorE95252" v-else>{{item.HouseResult=='-1'?"x":"O"}}</span>
</div>
</td>
<td>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadGuestList(item)">旅客名单</a>
</td>
<td>
<div class="fz16 fbold linkspan">
<span @click="toTrip(item)" style="color: #4BCA81;" v-if="item.OutNotice==1">√</span>
......@@ -329,9 +333,10 @@
</td>
<td>
<div class="fz16 fbold linkspan" @click="goUrlBus('BusInfo',item,outItem,'车配信息')">
<span style="color: #4BCA81;" v-if="item.BusResult==1">√</span>
<span class="colorE95252" v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
<div class="fz16 fbold linkspan">
<span style="color: #4BCA81;" @click="goUrlBus('BusInfo',item,outItem,'车配信息')" v-if="item.BusResult==1">√</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>
</td>
<td>
......@@ -340,8 +345,10 @@
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
</td>
<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">
<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">
<span style="color: #4BCA81;" v-if="item.LeaderIsApply==2">√</span>
<span class="colorE95252" v-else>{{item.LeaderIsApply=='0'?"x":"O"}}</span>
</div>
......@@ -476,23 +483,23 @@
<tr>
<th>团号/时间</th>
<template v-for="(hItem,hIndex) in TeamHotelList">
<th>
{{hItem.TCNUM}}<br/>({{hItem.TCID}})
</th>
<th>
{{hItem.TCNUM}}<br />({{hItem.TCID}})
</th>
</template>
</tr>
</template>
<template v-for="(hItem,hIndex) in TeamHotelList">
<template v-for="(hSubItem,hSubIndex) in hItem.dayList">
<tr>
<td>{{hSubItem.UseTime}}</td>
<template v-for="(hSubItem,hSubIndex) in hItem.dayList">
<tr>
<td>{{hSubItem.UseTime}}</td>
<td>
<template v-if="hSubItem.subList&&hSubItem.subList.length>0">
{{hSubItem.subList[0].NewHotelName}}
</template>
</td>
</tr>
</template>
</tr>
</template>
</template>
</table>
<el-button @click="GetTeamHotelList(outItem.TCIDS)" slot="reference"
......@@ -505,7 +512,7 @@
</td>
</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">
<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!=''"
......@@ -843,8 +850,8 @@
'NewCombinationNum': outItem.NewCombinationNum,
'LeaderName': obj.LeaderName,
'GuideName': obj.GuideName,
'IsCombine':outItem.PriceCommonList.length>1,
'NewTCIDs':outItem.TCIDS,
'IsCombine': outItem.PriceCommonList.length > 1,
'NewTCIDs': outItem.TCIDS,
blank: 'y',
tab: title
}
......@@ -1017,6 +1024,34 @@
}
}, 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() {
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