Skip to content

S
SuperMan
Commit 027b14b1 authored by liudong1993's avatar liudong1993
Browse files
Options

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

parents 03cbbebf a48eb773
Show whitespace changes
Inline Side-by-side
Showing with 1490 additions and 585 deletions
src/components/Hotel/roomReservationsDetails.vue
View file @ 027b14b1
......@@ -22,7 +22,7 @@
<ul>
<li>
<input v-if="IsOperation!=1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input v-if="IsOperation==1&&CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能再修改!</span>
</li>
</ul>
......@@ -694,7 +694,6 @@
if (this.CurrentUserInfo.EmployeeId == 615) {
this.IsEditHotel = 1;
this.IsEditHotelPeople = 1;
}
let list = res.data.data.HotelOrderListReport;
this.CreateBy = res.data.data.CreateBy;
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 027b14b1
......@@ -98,7 +98,7 @@
{{item.StopPrice >= 0 && item.StopPrice !== null ? moneyFormat(item.StopPrice) : ''}}
</td>
<td>
{{moneyFormat((item.PayType === 1 ? (item.HighSpeedPayType === 1 ? item.HighSpeedPrice + Number(item.CostPrice) : Number(item.CostPrice)) : 0) + Number(item.StopPrice))}}
{{moneyFormat( item.HighSpeedPrice + Number(item.CostPrice) + Number(item.StopPrice))}}
<!-- {{Number(moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))) <= 0 ? '' : moneyFormat((item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.PayType === 1 ? Number(item.StopPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(item.HighSpeedPrice) : 0))}} -->
</td>
<td v-if='index==0' :rowspan='list.BusList.length'>
......@@ -750,8 +750,7 @@
busTotalPrice(obj) {
let totalPrice = 0
obj.forEach(item => {
totalPrice += (item.PayType === 1 ? Number(item.CostPrice) : 0) + (item.HighSpeedPayType === 1 ? Number(
item.HighSpeedPrice) : 0) + Number(item.StopPrice)
totalPrice += Number(item.CostPrice) + Number(item.HighSpeedPrice) + Number(item.StopPrice)
})
return this.moneyFormat(totalPrice)
},
......
src/components/Restaurant/bookDinnerStatisticsDetails.vue
View file @ 027b14b1
......@@ -4,13 +4,13 @@
<ul>
<li>
<template v-if="IsOperation != 1">
<input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input v-if="IsOperation != 1" type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
<input type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
<input type="button" class="fr normalBtn mb30" value="保存草稿" @click="saveList(0)" />
</template>
<template v-else>
<span v-if="IsOperation==1" style="color:red;font-size:14px;">已制单，不能在修改!</span>
<span style="color:red;font-size:14px;">已制单，不能在修改!</span>
<input v-if="CurrentUserInfo.EmployeeId==615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</template>
<input type="button" class="fr normalBtn mb30" style="display:none;" value="保存" @click="saveList(1)" />
</li>
</ul>
</div>
......@@ -192,6 +192,8 @@
GuestNum: 0,
loading: false,
IsOperation: '',
//当前登录人信息
CurrentUserInfo:{},
};
},
methods: {
......@@ -343,6 +345,8 @@
},
},
mounted() {
let userInfo = this.getLocalStorage();
this.CurrentUserInfo = userInfo;
this.TCNUM = this.$route.query.TCNUM;
this.GuestNum = this.$route.query.GuestNum;
this.getList();
......
src/components/SalesModule/groupTourOrder.vue
View file @ 027b14b1
......@@ -932,8 +932,8 @@
</el-col>
<el-col :span="4">
<el-form-item label="单男单女">
<el-radio v-model="addMsg.OneSex" :label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" :label="2">女</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" :label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(2)" :label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
......@@ -2262,6 +2262,9 @@
}
},
methods: {
setDanren(e){
e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
},
gourlTip(path,id){
this.$router.push({
name: path,
......
src/components/SalesModule/investigationYouDetail.vue
View file @ 027b14b1
......@@ -33,13 +33,10 @@
</style>
<template>
<div class="investigationYouDetail">
<div v-if="details.GuestTravelLableList" v-for="(item, index) in details.GuestTravelLableList" :key="index" class="item">
<div v-for="(item, index) in details.GuestTravelLableList" :key="index" class="item">
<div class="_lable" v-if="item.Name">{{item.Name}}：</div>
<div :class="{_content: item.Name}">{{item.Content}}</div>
</div>
<div v-else>
<p>未填写</p>
</div>
<el-row class="img-box" :gutter="15">
<el-col :span="8" v-for="(item, index) in details.NotesPics" :key="index">
<img :src="item" @click="showImg(item)" alt>
......
src/components/SalesModule/productQuery.vue
View file @ 027b14b1
......@@ -340,8 +340,8 @@
</el-col>
<el-col :span="4">
<el-form-item label="单男单女">
<el-radio v-model="addMsg.OneSex" label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" label="2">女</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
......@@ -1174,6 +1174,9 @@
}
},
methods: {
setDanren(e){
e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
},
groupTypeChange: function (val) {
if (val === '4') {
this.addMsg.ManNum = 0
......
src/components/TravelManager/TravelLeader/Leader.vue
View file @ 027b14b1
......@@ -195,7 +195,7 @@
z-index: 20;
}
.Leader ._sanjiao_:after {
content: '外';
content: '同';
position: absolute;
top: -15px;
left: -14px;
......@@ -289,7 +289,7 @@
</el-pagination>
<el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
<el-form-item :label="$t('system.query_workType')" prop="Type">
<el-form-item :label="$t('system.query_workType')" prop="LeaderGuidClass">
<el-select v-model="addMsg.LeaderGuidClass" :placeholder="$t('admin.admin_workType')" class="w210">
<el-option key="0" label="公司领队" :value="0"></el-option>
<el-option key="1" label="同行领队" :value="1"></el-option>
......@@ -506,7 +506,7 @@ export default {
trigger: "change"
}
],
Type: [
LeaderGuidClass: [
{
required: true,
message: "请选择工作类型",
......
src/components/TravelManager/TravelList/HotelOrderTotal.vue
View file @ 027b14b1
......@@ -294,8 +294,8 @@
<th>订单号</th>
<th>第三方订单号</th>
<th>房间数</th>
<th>总价</th>
<th>已收</th>
<th>总额</th>
<th>实收</th>
<th>大红包</th>
<th>优惠金额</th>
<th>待收金额</th>
......
src/components/TravelManager/TravelList/OpHotelOrder.vue
View file @ 027b14b1
......@@ -73,8 +73,8 @@
<th>订单号</th>
<th>客户信息</th>
<th>房间数</th>
<th>总价格</th>
<th>总收入</th>
<th>总额</th>
<th>实收</th>
<th>抵扣金额</th>
<th>优惠金额</th>
<th>待收金额</th>
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 027b14b1
......@@ -1397,7 +1397,10 @@
</el-form-item>
</el-col>
<el-col :span="4">
&nbsp;
<el-form-item label="单男单女">
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(1)" :label="1">男</el-radio>
<el-radio v-model="addMsg.OneSex" @click.native.prevent="setDanren(2)" :label="2">女</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-row :gutter="20">
......@@ -2482,7 +2485,7 @@
<div class="RL_ListDiv">
<div class="LeaderSpan" :class="{'ckedClass':ckedIndex==index}" v-for="(item,index) in leaderListArr"
@click="getLeaderInfo(index,item.LeaderId)" :key="item.subCode">
<span class="RL_LeaderName">{{item.LeaderName}}【{{item.Type==2?"领兼导":"领队"}}】</span>
<span class="RL_LeaderName">{{item.LeaderName}}【{{getLeaderTypeStr(item.Type, item.LeaderGuidClass)}}】</span>
</div>
</div>
</div>
......@@ -2945,6 +2948,7 @@
//订单归属【HK新加，报名清单页面修改使用】
CreateBy: 0,
RefuseVisaNum: 0, //拒签人数
OneSex: ""
},
//行程下载使用
travelControlTripLayerShow: false,
......@@ -3217,6 +3221,20 @@
commonShouSun: commonShouSun
},
methods: {
setDanren(e){
e === this.addMsg.OneSex ? this.addMsg.OneSex = 0 : this.addMsg.OneSex = e
},
getLeaderTypeStr: function (type, clas){
if (type == 2) {
return "领兼地"
} else if (type == 1 && clas == 0) {
return "领队"
} else if (type == 1 && clas == 1) {
return "同行领队"
} else if (type == 1 && clas == 2) {
return "临时领队"
}
},
gourlTip(path,id){
this.$router.push({
name: path,
......
src/components/TravelManager/TravelList/TravelpassengerList.vue
View file @ 027b14b1
<style>
.PT_teamTable {
.PT_teamTable {
width: 800px;
border-collapse: collapse;
}
.PT_teamTable td,
.PT_teamTable th {
}
.PT_teamTable td,
.PT_teamTable th {
border: 1px solid #dcdcdc;
padding: 5px;
height: 30px;
}
.PT_teamTable tr th {
}
.PT_teamTable tr th {
background: #eee;
height: 30px;
border: 1px solid #dcdcdc;
}
.PT_teamTable tr td{background: #fff;}
.travelpassengerlist{font-size: 12px; background: #dcdcdc;}
.travelpassengerlist tr th {
}
.PT_teamTable tr td {
background: #fff;
}
.travelpassengerlist {
font-size: 12px;
background: #dcdcdc;
}
.travelpassengerlist tr th {
height: 30px;
}
.travelpassengerlist tr td{background: #fff; text-align: center;}
/*拒签人员*/
.travelpassengerlist .redTr td{
}
.travelpassengerlist tr td {
background: #fff;
text-align: center;
}
/*拒签人员*/
.travelpassengerlist .redTr td {
color: #E95252;
}
</style>
<template>
......@@ -39,7 +55,8 @@
<th width="120">出发日期</th>
</tr>
<tr v-for="item in QueryMsg.TeamInfoData">
<td><a @click="goUrlTravelControl('团控列表','TravelControlList',item.TCID,item.TCNUM)" style="cursor:pointer;color:blue;">{{item.TCNUM}}</a></td>
<td><a @click="goUrlTravelControl('团控列表','TravelControlList',item.TCID,item.TCNUM)"
style="cursor:pointer;color:blue;">{{item.TCNUM}}</a></td>
<td>{{item.Title}}</td>
<td>{{item.Inventory}}人</td>
<td>{{item.StartDate}} {{item.WeekStr}}</td>
......@@ -51,13 +68,7 @@
</li>
</ul>
</div>
<table
class="travelpassengerlist"
border="0"
cellspacing="1"
cellpadding="0"
v-loading="QueryMsg.loading"
>
<table class="travelpassengerlist" border="0" cellspacing="1" cellpadding="0" v-loading="QueryMsg.loading">
<tr>
<th width="50">房间数</th>
<th width="50">房号</th>
......@@ -94,9 +105,9 @@
{{getHouseTypeStr(subItem.HouseType)}}
</template>
<template v-else>
{{getHouseTypeStr(subItem.SingleRoomType)}} <br/><span style="color:red;">(指定)</span>
{{getHouseTypeStr(subItem.SingleRoomType)}} <br /><span style="color:red;">(指定)</span>
</template>
<template v-if="subItem.IsBed==0"><br/><span style="color:red;">(不占床)</span></template>
<template v-if="subItem.IsBed==0"><br /><span style="color:red;">(不占床)</span></template>
</td>
<td>{{subItem.GuestName}}</td>
<td>{{subItem.ESurName}}</td>
......@@ -124,7 +135,7 @@
</div>
</template>
<script>
export default {
export default {
data() {
return {
//请求数据
......@@ -135,8 +146,8 @@ export default {
OrderId: 0,
currentPage: 1
},
IsHaveLeader:1,//1-有领队,0-无领队
IsLeaderGuide:0,//1-领兼导,0-领队
IsHaveLeader: 1, //1-有领队,0-无领队
IsLeaderGuide: 0, //1-领兼导,0-领队
TCID: 0,
QueryMsg: {
loading: true,
......@@ -150,7 +161,6 @@ export default {
};
},
methods: {
goUrlTravelControl(name, path, id, tcmun) {
this.$router.push({
name: path,
......@@ -181,14 +191,11 @@ export default {
str = "标准双人间";
} else if (HouseType == 3) {
str = "大床房";
}
else if (HouseType == 4) {
} else if (HouseType == 4) {
str = "三人间";
}
else if (HouseType== 5) {
} else if (HouseType == 5) {
str = "拼凑双人间";
}
else {
} else {
str = "未分配";
}
return str;
......@@ -203,14 +210,15 @@ export default {
this.QueryMsg.loading = false;
if (res.data.resultCode == 1) {
this.QueryMsg.dataList = res.data.data.pageData.result;
this.IsHaveLeader=res.data.data.pageData.IsHaveLeader;
this.IsLeaderGuide=res.data.data.pageData.IsLeaderGuide;
this.IsHaveLeader = res.data.data.pageData.IsHaveLeader;
this.IsLeaderGuide = res.data.data.pageData.IsLeaderGuide;
}
},
err => {}
);
},
exportExcel() {
this.QueryMsg.loading = true;
//导出报表
let msg = {
TCID: this.msg.TCID
......@@ -220,7 +228,9 @@ export default {
fileName =
"【" + this.QueryMsg.TeamInfoData[0].TCNUM + "】旅客名单.xls";
}
this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName);
this.GetLocalFile("travel_get_GetTravelGuestExport", msg, fileName, res => {
this.QueryMsg.loading = false;
});
},
//获取团期信息
......@@ -247,5 +257,6 @@ export default {
this.getTeamInfo();
this.getList();
}
};
};
</script>
src/components/activity/PersonnelManagement.vue 0 → 100644
View file @ 027b14b1
<template>
<div class="mycareer personTable" style="padding-top:25px;">
<div style="width:1532px;margin:0 auto;">
<div class="uer-box">
<el-row style="width:100%">
<el-col :span="5">
<div class="photo">
<img src="http://imgfile.oytour.com/Upload/User/tangping.png" />
<div class="zezhao"></div>
<div class="bottom">周晓小</div>
</div>
</el-col>
<el-col :span="6" class="second">
<div class="zhouguan">周冠</div>
<div class="total">
<p style="padding-top:23px">总计</p>
<p style="color:#1B1B1B;font-size:62px;font-family: 'pingfangR';position:relative;top:-5px">15</p>
</div>
</el-col>
<el-col :span="7">
<div class="commonbg baseinfo">基本信息</div>
<el-row style="margin-top:30px">
<el-col class="triggerDiv" :span="8">
<span class="titlebg">年龄</span>
<p class="info">24</p>
</el-col>
<el-col class="triggerDiv" :span="8">
<span class="titlebg">入职时间</span>
<p class="info">2019-02-20</p>
</el-col>
<el-col class="triggerDiv" :span="8">
<span class="titlebg">部门</span>
<p class="info">销售部门</p>
</el-col>
<el-col class="triggerDiv" :span="8">
<span class="titlebg">总收客数</span>
<p class="info">256</p>
</el-col>
<el-col class="triggerDiv" :span="8">
<span class="titlebg">总订单数</span>
<p class="info">256</p>
</el-col>
<el-col class="triggerDiv" :span="8">
<span class="titlebg">累计销售</span>
<p class="info">￥1256154</p>
</el-col>
</el-row>
</el-col>
<el-col class="second" :span="6">
<div class="commonbg baseinfo">综合得分</div>
<div class='score'>86</div>
</el-col>
</el-row>
</div>
<div class="split"></div>
<div class="listDiv">
<div style="padding-bottom:20px" class="change-box">
<div class="choose">
<span @click="ClickChoose1(-1)" class="clickbtn" style="border-right:1px solid #494949">
<img v-if="index1==0" src="../../assets/img/champion/left.png" alt="">
<img v-else src="../../assets/img/champion/left1.png" alt="">
</span>
<span class="text">{{choose1[index1]}}</span>
<span @click="ClickChoose1(1)" class="clickbtn" style="border-left:1px solid #494949">
<img v-if="index1==choose1.length-1" src="../../assets/img/champion/right.png" alt="">
<img v-else src="../../assets/img/champion/right1.png" alt="">
</span>
</div>
<div class="choose" style="float:right">
<span @click="ClickChoose2(-1)" class="clickbtn" style="border-right:1px solid #494949">
<img v-if="index2==0" src="../../assets/img/champion/left.png" alt="">
<img v-else src="../../assets/img/champion/left1.png" alt="">
</span>
<span class="text">{{choose2[index2]}}</span>
<span @click="ClickChoose2(1)" class="clickbtn" style="border-left:1px solid #494949">
<img v-if="index2==choose2.length-1" src="../../assets/img/champion/right.png" alt="">
<img v-else src="../../assets/img/champion/right1.png" alt="">
</span>
</div>
</div>
<div class="data-box-before"></div>
<div class="data-box">
<div class="tab-head" ref="mycareerHead">
<table>
<thead>
<tr>
<th style="min-width:100px;max-width:100px;background:#fff">&nbsp;</th>
<th>新同行增加数份1</th>
<th>Im系统同行互动2</th>
<th>广告系统发送数3</th>
<th>IM系统同行互动4</th>
<th>同行浏览数5</th>
<th>今日外出时间6</th>
<th>完成计划7</th>
<th>拜访计划8</th>
<th>拜访同行9</th>
<th>拜访同行10</th>
<th>拜访同行11</th>
<th>拜访同行12</th>
<th>拜访同行13</th>
<th>拜访同行14</th>
<th>拜访同行15</th>
<th>拜访同行16</th>
</tr>
</thead>
</table>
</div>
<div class="lft-head">
<table>
<thead>
<tr>
<th style="background: #fff;color:#333333">时间</th>
</tr>
</thead>
</table>
</div>
<div class="lft-body" ref="mycareerLeft">
<table>
<tbody>
<tr @mouseover="LeftmouseOver(index)" @mouseleave="LeftmouseLeave(index)" :class="leftActiveIndex==index?'leftActive':''" v-for="(item,index) in dateList" :key="index">
<td class="odd">{{item}}</td>
</tr>
</tbody>
</table>
</div>
<div class="content-body" ref="mycareerContent">
<table>
<tbody>
<tr :class="dataActiveIndex==index?'dataActive':''" @mouseover="DatamouseOver(index)" @mouseleave="DatamouseLeave(index)" v-for="(item,index) in data" :key="index+5000">
<td>1</td>
<td>2</td>
<td>3</td>
<td>4</td>
<td>5</td>
<td>6</td>
<td>7</td>
<td>8</td>
<td>9</td>
<td>10</td>
<td>11</td>
<td>12</td>
<td>13</td>
<td>14</td>
<td>15</td>
<td>16</td>
</tr>
</tbody>
</table>
</div>
</div>
<!-- <el-table
:data="tableData"
style="width: 100%;"
height="200">
<el-table-column
fixed
prop="date"
label="月份"
width="150">
</el-table-column>
<el-table-column
prop="name"
label="新同行增加数份"
width="150">
</el-table-column>
<el-table-column
prop="province"
label="系统同行互动次数"
width="150">
</el-table-column>
<el-table-column
prop="city"
label="广告系统发送数"
width="150">
</el-table-column>
<el-table-column
prop="address"
label="系统同行互动时数"
width="150">
</el-table-column>
<el-table-column
prop="zip"
label="老同行的网站浏览数"
width="150">
</el-table-column>
<el-table-column
prop="zip"
label="今日外出时间"
width="150">
</el-table-column>
<el-table-column
prop="address"
label="系统同行互动时数"
width="150">
</el-table-column>
<el-table-column
prop="zip"
label="老同行的网站浏览数"
width="150">
</el-table-column>
<el-table-column
prop="address"
label="系统同行互动时数"
width="150">
</el-table-column>
<el-table-column
prop="zip"
label="老同行的网站浏览数"
width="150">
</el-table-column>
</el-table> -->
</div>
</div>
</div>
</template>
<script>
export default {
data(){
return{
choose1:["本周","本月","当年"],
choose2:["小组","团队","公司"],
index1:0,
index2:0,
leftActiveIndex:-1,
dataActiveIndex:-1,
listHeight:0,
dateList:["7月1日","7月2日","7月3日","7月4日","7月5日","7月6日","7月7日","7月8日"],
data:[1,1,1,1,1,1,1,1],
tableData: [{
date: '2016-05-03',
name: '王小虎1',
province: '上海1',
city: '普陀区1',
address: '上海市普1',
zip: 2003331
}, {
date: '2016-05-02',
name: '王小虎2',
province: '上海2',
city: '普陀区2',
address: '上海2',
zip: 200333
}, {
date: '2016-05-04',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普',
zip: 200333
}, {
date: '2016-05-01',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海',
zip: 200333
}, {
date: '2016-05-08',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市普',
zip: 200333
}, {
date: '2016-05-06',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市',
zip: 200333
}, {
date: '2016-05-07',
name: '王小虎',
province: '上海',
city: '普陀区',
address: '上海市',
zip: 200333
}]
}
},
created(){
let Height = document.body.clientHeight;
this.listHeight=Height-470;
// console.log("listHeight",this.listHeight)
},
mounted() {
this.$refs.mycareerContent.addEventListener(
"scroll",
this.handleScroll,
true
);
},
methods: {
ClickChoose1(num){
if(this.index1==0){
if(num>0){
this.index1=this.index1+num;
}
}
else if(this.index1==this.choose1.length-1){
if(num<0){
this.index1=this.index1+num;
}
}
else{
this.index1=this.index1+num;
}
},
ClickChoose2(num){
if(this.index2==0){
if(num>0){
this.index2=this.index2+num;
}
}
else if(this.index2==this.choose2.length-1){
if(num<0){
this.index2=this.index2+num;
}
}
else{
this.index2=this.index2+num;
}
},
LeftmouseOver(index){
this.dataActiveIndex=index;
this.leftActiveIndex=index;
},
LeftmouseLeave(index){
this.dataActiveIndex=-1;
this.leftActiveIndex=-1;
},
DatamouseOver(index){
this.leftActiveIndex=index;
},
DatamouseLeave(index){
this.leftActiveIndex=-1;
},
handleScroll() {
this.$refs.mycareerLeft.scrollTop = this.$refs.mycareerContent.scrollTop;
this.$refs.mycareerHead.scrollLeft = this.$refs.mycareerContent.scrollLeft;
}
}
};
</script>
<style>
.personTable .el-table--border::after, .personTable .el-table--group::after, .personTable .el-table::before{
background-color: transparent;
}
.personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar {
/*滚动条整体样式*/
width: 5px;
/*高宽分别对应横竖滚动条的尺寸*/
height: 5px;
border:1px solid #fff;
border-radius:5px;
background: #fff;
padding: 2px
}
.personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
height:4px;
width: 4px;
background:#6A0404;
border-radius:5px;
}
.personTable .el-table--scrollable-y .el-table__body-wrapper::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 2px #6A0404;
border-radius:5px;
background: transparent;
}
.personTable .el-table--striped .el-table__body tr.el-table__row--striped.current-row td,
.personTable .el-table__body tr.current-row>td,
.personTable .el-table__body tr.hover-row.current-row>td,
.personTable .el-table__body tr.hover-row.el-table__row--striped.current-row>td,
.personTable .el-table__body tr.hover-row.el-table__row--striped>td, .el-table__body tr.hover-row>td{
background:rgba(193,39,45,1)!important;
color:#fff!important;
}
.personTable .el-table .el-table__fixed .el-table__body .hover-row{
background:rgba(193,39,45,1)!important;
}
.personTable .el-table tbody tr:hover td{
background:rgba(193,39,45,1)!important;
color:#fff!important;
}
.personTable .el-table tbody tr:hover td:first-child{
color:#fff!important;
background:rgba(193,39,45,0.5)
}
.personTable .el-table tbody td:first-child{
background:rgba(255,255,255,0.5);
}
.personTable .el-table thead th:first-child{
background: #fff;
color:#333333;
}
.personTable .el-table thead th{
background: #333333;
color:#B7B7B7;
padding:5px 0;
}
.personTable .el-table, .personTable .el-table__expanded-cell{
background: transparent;
}
.personTable .el-table th, .personTable .el-table tr{
background: transparent;
}
.personTable .el-table td, .personTable .el-table th{
background: transparent;
padding:6px 0;
}
.personTable .el-table td,.personTable .el-table th.is-leaf{
border: none;
}
.personTable .leftActive td{
background:#D78884!important;
color: #fff!important;
}
.personTable .dataActive td{
background:#C1272D!important;
color: #fff!important;
}
.personTable .text{
text-align: center;
width: 120px;
color:#fff;
height:33px;
display: inline-block;
position: relative;
top: -8px;
font-family: "PingFangSC-Fine";
}
.personTable .clickbtn{
display: inline-block;
width:50px;
height:33px;
text-align: center;
background: #333333;
}
.personTable .clickbtn img{
margin-top:4px;
}
.personTable .change-box .choose{
height: 31px;
background: #333333;
display: inline-block;
}
.personTable .content-body table tr:hover td{
background: #C1272D!important;
color:#fff!important;
}
.personTable .listDiv{
background: rgba(255,255,255,0.2);
width: 1532px;
/* position: relative; */
}
.personTable .score{
background: url("../../assets/img/champion/circle.png") no-repeat;
width: 150px;
height: 150px;
line-height: 150px;
color: #1B1B1B;
text-align: center;
font-size: 60px;
font-family: "pingfangR"
}
.personTable .triggerDiv{
position: relative;
margin-bottom: 30px;
}
.personTable .uer-box .info{
font-size:20px;
margin-top:10px;
font-family: "pingfangR"
}
.personTable .uer-box .titlebg{
background: url("../../assets/img/champion/titlebg.png") no-repeat;
height: 25px;
line-height: 25px;
background-size: 100% 100%;
padding:0 5px 4px 10px;
color:#656565;
font-family: "PingFangSC-Fine";
}
.personTable .commonbg{
width: 113px;
background: url("../../assets/img/champion/commonbg.png");
height: 42px;
line-height: 42px;
color:#fff;
text-align: center;
font-family: "PingFangSC-Fine";
}
.personTable .uer-box .second{
display: flex;
justify-content: center;
flex-direction: column;
align-items: center
}
.uer-box .second .total{
width: 136px;
background: url("../../assets/img/champion/total.png");
height: 149px;
color:#fff;
text-align: center;
margin-top:34px;
}
.personTable .uer-box .second .zhouguan{
width: 77px;
background: url("../../assets/img/champion/zg.png");
height: 42px;
line-height: 42px;
color:#fff;
font-size: 20px;
text-align: center;
font-family: "pingfangR"
}
.personTable {
min-height: 100%;
width:calc(100% + 40px);
background: url("../../assets/img/champion/listbg.png");
position: relative;
user-select: none;
cursor: default;
margin:0 -20px;
}
.personTable .title {
width: 554px;
height: 69px;
background: url("../../assets/img/champion/title.png");
position: relative;
z-index: 2;
margin: 0 auto;
display: flex;
}
.personTable .title .uerf .dept-name {
height: 12px;
font-size: 12px;
color: #ffffff;
text-align: center;
margin-bottom: 4px;
}
.personTable .title .uerf .uer-name {
background: linear-gradient(
0deg,
rgba(246, 134, 15, 1) 0%,
rgba(253, 207, 52, 1) 100%
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
font-size: 24px;
font-family: pingfangR;
color: rgba(255, 255, 255, 1);
text-align: center;
font-family: "pingfangR"
}
.personTable .title .post-name {
width: 156px;
text-align: center;
margin-top: 17px;
font-family: pingfangR;
font-size: 18px;
color: rgba(255, 255, 255, 1);
background: linear-gradient(
0deg,
rgba(163, 169, 164, 1) 0%,
rgba(255, 255, 255, 1) 100%
);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
}
.personTable .uer-box {
padding:17px 30px;
box-sizing: border-box;
display: flex;
width:1532px;
height:277px;
background:rgba(255,255,255,0.2);
margin: 0 auto;
}
.personTable .uer-box .photo {
margin-left: 50px;
width: 240px;
height: 240px;
border-radius: 50%;
position: relative;
}
.personTable .uer-box .photo img {
width: 230px;
height: 230px;
border-radius: 50%;
position: absolute;
/* top: 5px;
left: 5px; */
z-index: 2;
}
.personTable .uer-box .photo .zezhao {
background: url("../../assets/img/champion/userbg.png");
width: 230px;
height: 230px;
z-index: 1;
position: absolute;
top: 0;
left: 0;
border-radius: 50%;
z-index: 3;
background-size:100% 100%;
}
.personTable .uer-box .photo .bottom {
width: 195px;
height: 54px;
line-height: 54px;
left: 18px;
bottom: -2px;
position: absolute;
background: url("../../assets/img/champion/userbottom.png");
z-index: 4;
color:#000000;
font-size: 22px;
text-align: center;
font-family: "pingfangR"
}
.personTable .uer-box .dashboards {
margin-right: 50px;
flex: 1;
display: flex;
margin-left: 60px;
flex-wrap: wrap;
}
.personTable .uer-box .dashboards .item {
width: 120px;
height: 120px;
margin-right: 40px;
margin-top: 25px;
}
.personTable .split {
margin: 20px 0 0 0;
height: 3px;
background: url("../../assets/img/champion/fg.png");
}
.personTable .data-box {
overflow: hidden;
position: absolute;
bottom: 39px;
top: 377px;
left: 167px;
right: 165px;
z-index: 2;
background: rgba(255,255,255,0.2);
}
.personTable .data-box .tab-head {
height: 43px;
overflow: hidden;
background: #333;
}
.personTable .data-box .lft-head {
left: -1px;
top: 0;
width: 100px;
overflow: hidden;
right: unset;
height: 43px;
position: absolute;
/* background: url("../../assets/img/champion/head.png") no-repeat; */
background: #333333;
}
.personTable .data-box .lft-body {
left: -1px;
top: 43px;
width: 100px;
bottom: 6px;
right: unset;
position: absolute;
overflow: hidden;
z-index: 3;
background: rgba(255,255,255,0.2);
/* height:100%; */
}
.personTable .data-box .content-body {
left: 97px;
top: 43px;
right: 0;
bottom: 0px;
position: absolute;
overflow: auto;
z-index: 2;
margin: 0 2px;
}
.personTable .data-box-before {
display: block;
position: absolute;
z-index: 1;
/* background: url("../../assets/img/champion/head.png") no-repeat; */
background: #333;
height: 43px;
content: " ";
top: 377px;
left: 167px;
right: 165px;
}
.personTable .data-box table {
border-collapse: collapse;
border-spacing: 0;
table-layout: fixed;
}
.personTable .data-box table thead th {
height: 43px;
padding-top: 10px;
box-sizing: border-box;
text-align: left;
padding-left: 10px;
font-size: 14px;
font-family: pingfangR;
color: #B7B7B7;
min-width: 100px;
}
.personTable .data-box table thead th {
min-width: 120px;
max-width: 120px;
}
.personTable .data-box table tbody td {
height: 30px;
line-height: 30px;
font-size: 12px;
color: #333333;
text-align: left;
padding-left: 10px;
min-width: 120px;
max-width: 120px;
}
.personTable .data-box table tbody td.odd {
color: #333333;
-webkit-background-clip: unset;
-webkit-text-fill-color: unset;
font-family: "PingFangR"
}
.personTable .data-box .content-body::-webkit-scrollbar {
/*滚动条整体样式*/
width: 5px;
/*高宽分别对应横竖滚动条的尺寸*/
height: 5px;
border:1px solid rgba(161,154,147,1);
border-radius:5px;
background: transparent;
padding: 2px
}
.personTable .data-box .content-body::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
height:4px;
width: 4px;
background:#6A0404;
border-radius:5px;
}
.personTable .data-box .content-body::-webkit-scrollbar-track {
/*滚动条里面轨道*/
-webkit-box-shadow: inset 0 0 2px rgba(0, 0, 0, 0.2);
border-radius:5px;
background: transparent;
}
.personTable .data-box .content-body::-webkit-scrollbar-corner{
color: transparent;
}
</style>
src/components/commonPage/commonTeamInfo.vue
View file @ 027b14b1
<style>
@import "../../assets/css/trip/index.css";
@import "../../assets/css/trip/index.css";
</style>
<template>
......@@ -13,7 +14,12 @@
</div>
<div class="trip-block-commonTeam" v-for="(item,i) in tripList" :key="i">
<div class="trip-title">
<div class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</div>
<div>
<p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p>
<template v-if="startDate&&startDate!=''">
<p>{{GetDayStr(startDate,item.dayNum-1)}}</p>
</template>
</div>
<div class="desc" v-html="item.title"></div>
</div>
<oneday v-if="item.details && item.details.length==1" :day='item'></oneday>
......@@ -25,17 +31,18 @@
</div>
</template>
<script>
import oneday from "../commonPage/TravelTripPreview/oneday";
import twoday from "../commonPage/TravelTripPreview/twoday";
import threeday from "../commonPage/TravelTripPreview/threeday";
import fourday from "../commonPage/TravelTripPreview/fourday";
import fiveday from "../commonPage/TravelTripPreview/fiveday";
export default {
import oneday from "../commonPage/TravelTripPreview/oneday";
import twoday from "../commonPage/TravelTripPreview/twoday";
import threeday from "../commonPage/TravelTripPreview/threeday";
import fourday from "../commonPage/TravelTripPreview/fourday";
import fiveday from "../commonPage/TravelTripPreview/fiveday";
export default {
props: ["subConfig"],
data() {
return {
tripList: [],
loading:false
loading: false,
startDate: ""
};
},
components: {
......@@ -47,19 +54,31 @@ export default {
},
mounted() {},
methods: {
GetTrip(id) {
this.tripList=[];
GetDayStr(dateStr, dayNum) {
return this.$commonUtils.AddDay(dateStr, dayNum);
},
GetTrip(id, TCID) {
this.tripList = [];
this.startDate = '';
var nTCID = 0;
if (TCID) {
nTCID = TCID;
}
var msg = {
configId: id,
tcid: nTCID
};
if (id !== undefined) {
//根据ID 获取行程内容
this.loading=true;
this.loading = true;
this.apipost(
"b2b_get_GetB2BTravelInfoNoDes",
{
configId: id
},
"b2b_get_GetB2BTravelInfoNoDes", msg,
res => {
this.loading=false;
this.loading = false;
if (res.data.resultCode == 1) {
if (res.data.data.priceList && res.data.data.priceList.length > 0) {
this.startDate = res.data.data.priceList[0].startDate;
}
this.tripList = res.data.data.dayList;
this.init();
}
......@@ -224,10 +243,8 @@ export default {
let obj = {
title: y.childItem.title,
content: y.childItem.description,
img:
y.childItem.imaArray && y.childItem.imaArray.length > 0
? y.childItem.imaArray[0].url
: "",
img: y.childItem.imaArray && y.childItem.imaArray.length > 0 ?
y.childItem.imaArray[0].url : "",
ticketName: "",
playTimeHour: null,
playTimeMinutes: null
......@@ -358,11 +375,11 @@ export default {
details = activy;
}
x.title =
dadian.length > 0
? dadian[0].title
: jiao.length > 0
? jiao[0].title
: "集合出发";
dadian.length > 0 ?
dadian[0].title :
jiao.length > 0 ?
jiao[0].title :
"集合出发";
x.details = details;
if (x.details.length == 0) {
......@@ -415,5 +432,6 @@ export default {
}
}
}
};
};
</script>
src/components/dmc/manager/dmcTotalTable.vue
View file @ 027b14b1
......@@ -257,7 +257,7 @@
<td>
<div class="link">
<p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">配置领队</p>
<p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}</p>
<p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
</div>
</td>
<td>
......@@ -330,6 +330,7 @@
<span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
<span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
</div>
<a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadDinner(item)">餐配下载</a>
</td>
<td>
......@@ -514,7 +515,7 @@
<tr>
<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>
<p @click="getJourney(item)" style="padding-top:4px;">{{item.Title}}</p>
<div v-if="outItem.PriceCommonList[index].DMCNum && outItem.PriceCommonList[index].DMCNum!=''"
class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.PriceCommonList[index].DMCNum}}
</div>
......@@ -682,11 +683,18 @@
commonTeamInfo
},
methods: {
getJourney(id, title) {
getLeaderTypeStr: function (clas){
if (clas == 1) {
return "（同行领队）"
} else if (clas == 2) {
return "（临时领队）"
}
},
getJourney(item) {
var that = this;
this.tripTitle = title;
this.tripTitle = item.Title;
this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id);
that.$refs.comTeam.GetTrip(item.ConfigID,item.TCID);
});
that.teamVisible = true;
},
......@@ -1051,7 +1059,26 @@
tab: "手配依赖书"
}
})
},
DownLoadDinner(item)
{
this.loading = true;
//导出报表
let msg = {
TCID: item.TCID,
StartDate:item.StartDateStr,
DayNum:item.DayNum
};
var fileName = "餐配下载.xls";
if (item.TCNUMS != null) {
fileName =
"【" + item.TCNUMS + "】餐配下载.xls";
}
this.GetLocalFile("travel_get_GetTravelDinnerDownLoad", msg, fileName,
res => {
this.loading = false;
});
},
},
mounted() {
let myDate = new Date();
......@@ -1062,7 +1089,6 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
//this.msg.CombinationNum = 'JVS0727OTC-MUA';
this.getLineList();
this.getList();
this.getCompanyList();
......
src/components/scenicSpot/admissionStatistics.vue
View file @ 027b14b1
......@@ -105,7 +105,7 @@
{{thirdItem.UseTimeStr}}
</td>
<td style="text-align:left;padding-left:3px;">
{{thirdItem.ScenicName}}
{{thirdItem.ScenicName}} 【<span style="color:red">{{getUseTypeStr(thirdItem.TicketPriceList)}}</span>】
</td>
<td :rowspan="item.itemRowSpan" v-if='subIndex==0&&thirdIndex==0'>
<div class="link">
......@@ -143,6 +143,8 @@
loading: false,
currentPage: 1,
total: 0,
//当前登录用户
CurrentUserInfo: {},
msg: {
pageIndex: 1,
pageSize: 5,
......@@ -158,6 +160,25 @@
}
},
methods: {
getUseTypeStr(item) {
var str = '';
if (item) {
item.forEach(childItem => {
var useStr = "";
if (childItem.PeopleType == 1) {
useStr = "成人"
}
if (childItem.PeopleType == 2) {
useStr = "中人"
}
if (childItem.PeopleType == 3) {
useStr = "小人"
}
str+=useStr+":"+childItem.UsePeopleNum+"，";
});
}
return str.substring(0,str.lastIndexOf('，'));
},
getLineList() {
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
......@@ -245,6 +266,8 @@
},
},
mounted() {
let userInfo = this.getLocalStorage()
this.CurrentUserInfo = userInfo;
let myDate = new Date();
let nowDate =
myDate.getFullYear() +
......@@ -284,10 +307,12 @@
.admissionStatisticsTalbe tr td {
font-size: 12px;
}
.admissionStatisticsTalbe tr td .link p:hover {
text-decoration: underline;
cursor: pointer;
}
.admissionStatistics_tripDetails {
padding: 0;
box-shadow: 0px 1px 3px 0px #dedede;
......
src/components/scenicSpot/admissionStatisticsDetails.vue
View file @ 027b14b1
......@@ -9,8 +9,8 @@
</template>
<template v-else>
<span style="color:red;font-size:14px;">已制单，不能在修改!</span>
<input v-if="CurrentUserInfo.EmployeeId == 615" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</template>
<input style="display:none;" type="button" class="fr normalBtn mb30" value="保存" @click="saveList(1)" />
</li>
</ul>
</div>
......
src/components/systemManagement/destinationManagement.vue
View file @ 027b14b1
......@@ -212,7 +212,7 @@ export default {
let msg = {
IsShow: -1
};
this.apipost("line_post_GetAllList", msg, res => {
this.apipost("line_post_GetAllList_V3", msg, res => {
this.lineList = res.data.data;
});
},
......
src/components/systemManagement/seriesManagement.vue
View file @ 027b14b1
......@@ -301,7 +301,7 @@ export default {
let msg = {
IsShow: -1
};
this.apipost("line_post_GetAllList", msg, res => {
this.apipost("line_post_GetAllList_V3", msg, res => {
this.lineList = res.data.data;
});
},
......
src/router/config.js
View file @ 027b14b1
......@@ -3533,6 +3533,14 @@ export default {
title: '轮播图管理'
}
},
{
path: '/PersonnelManagement',
name: 'PersonnelManagement',
component: resolve => require(['@/components/activity/PersonnelManagement'], resolve),
meta: {
title: '人员管理'
}
},
{
path: '/BmenuManagement',
name: 'BmenuManagement',
......@@ -3661,7 +3669,8 @@ export default {
meta: {
title: '票务规则配置'
}
}
},
]
},
{
......@@ -3705,6 +3714,7 @@ export default {
title: '领队报账'
}
},
{
path: '/supplierLogin', //供应商登录
name: 'supplierLogin',
......
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