Skip to content

S
SuperMan
Commit 94ef7c5d authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

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

parents 00325267 ab1372de
Hide whitespace changes
Inline Side-by-side
Showing with 209 additions and 93 deletions
src/App.vue
View file @ 94ef7c5d
......@@ -113,7 +113,7 @@ export default {
}
</script>
<style>
@import "//at.alicdn.com/t/font_635492_7l7pdpshnqc.css";
@import "//at.alicdn.com/t/font_635492_hjv41l1i5.css";
@import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css";
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ 94ef7c5d
......@@ -81,9 +81,9 @@
._icon_btn i.icon-quxiao1{background-color: #E95252;}
._icon_btn i.icon-quxiao1:hover{background-color: #ea6d6d}
._icon_btn i.icon-quxiao1:active{background-color:#e42d2d}
._icon_btn i.icon-zhuanjiao1{background-color: #E6A014;font-size: 16px;}
._icon_btn i.icon-zhuanjiao1:hover{background-color: rgb(235, 184, 84)}
._icon_btn i.icon-zhuanjiao1:active{background-color: rgb(223, 150, 6)}
._icon_btn i.icon-zhuanjiao1,._icon_btn i.icon-cuishou{background-color: #E6A014;font-size: 16px;}
._icon_btn i.icon-zhuanjiao1:hover,._icon_btn i.icon-cuishou:hover{background-color: rgb(235, 184, 84)}
._icon_btn i.icon-zhuanjiao1:active,._icon_btn i.icon-cuishou:active{background-color: rgb(223, 150, 6)}
._tag_span{background-color: rgba(64,158,255,.1);display: inline-block;padding: 0 5px;height: 22px;line-height: 20px;font-size: 12px;color: #409eff;border-radius: 4px;box-sizing: border-box;border: 1px solid rgba(64,158,255,.2);white-space: nowrap;margin-bottom: 4px;}
._tag_span._tag_warr{background-color: rgba(103,194,58,.1);border-color: rgba(103,194,58,.2);color: #67c23a;}
._fex_cen{display: flex;align-items: center}
......@@ -548,6 +548,9 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.shenhe')" placement="top">
<i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-ico_commodity_defaul" @click="goUrl('BasicDocuments',item.FrID,active,msg.pageIndex)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="催审" placement="top">
<i v-if="msg.Conditon==3 && item.Is_Self!=1" class="iconfont icon-cuishou" @click="cuishen('Financial_post_SetFinancePushOn', item.FrID)"></i>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('fnc.zhuanjiao')" placement="top">
<i v-if="msg.Conditon==3 && !BOSSBtn2" class="iconfont icon-zhuanjiao1" @click="zhuanBox = true,zhuanMsg.WorkFlowId = item.FrID"></i>
</el-tooltip>
......@@ -889,6 +892,17 @@ export default {
this.AccountType_post_GetList();
},
methods:{
// 催审
cuishen: function (cmd, id) {
this.apipost(cmd,{FrId: id},res=>{
if(res.data.resultCode==1){
this.Success(res.data.message);
this.getPageList();
}else{
this.Error(res.data.message);
}
},err=>{})
},
//转交
getExchange(FrID){
this.zhuanjiaoMsg.CreateBy = '';
......
src/components/TravelManager/Ticket/TravelMyTicket.vue
View file @ 94ef7c5d
......@@ -656,6 +656,16 @@
<div class="flexOne TravelMyTicket">
<div class="query-box">
<ul>
<li>
<span class="hotel_name">
<em>航空公司</em>
<el-select v-model="Query.AirLineID" filterable :placeholder="$t('system.ph_in')" class="w150">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option v-for="item in AirLineList" :label='item.AlName' :value='item.AirLineId' :key='item.AirLineId'>
</el-option>
</el-select>
</span>
</li>
<li>
<span class="hotel_name">
<em>起飞时间</em>
......@@ -667,10 +677,38 @@
</el-date-picker>
</span>
</li>
<li>
<span class="hotel_name">
<em>航班号</em>
<el-input v-model="Query.Flight_number" type="text" @keyup.native.enter="getList" placeholder="请输入航班号">
</el-input>
</span>
</li>
<li>
<span>
<em>机票编号</em>
<el-input v-model="Query.AirticketId" placeholder="机票编号" @keyup.native="checkInteger(Query,'AirticketId')"></el-input>
<el-input v-model="Query.AirticketId" placeholder="机票编号" @keyup.native="checkInteger(Query,'AirticketId')">
</el-input>
</span>
</li>
<li>
<span>
<em>票务</em>
<el-select v-model="Query.TicketCreateBy" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>是否绑定</em>
<el-select v-model="Query.IsBind" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option label="已绑定" :value="1" :key="1"></el-option>
<el-option label="未绑定" :value="2" :key="2"></el-option>
</el-select>
</span>
</li>
<li>
......@@ -884,7 +922,15 @@
StartNum: "",
EndNum: "",
//机票编号
AirticketId: ""
AirticketId: "",
//票务
TicketCreateBy: 0,
//航空公司编号
AirLineID: 0,
//航班号
Flight_number: "",
//是否绑定团期
IsBind: 0,
},
pickerBeginDateBefore: {
disabledDate: time => {
......@@ -919,8 +965,8 @@
dataList: [],
//航班详情
tripDetails: [],
//城市列表
CityList: [],
//航空公司
AirLineList: [],
//隐藏显示转让机位数div
isShowSet: false,
//员工列表
......@@ -966,19 +1012,7 @@
this.Query.pageIndex = 1;
this.currentPage = 1;
},
//初始化城市
initCity() {
this.apipost(
"dict_post_Destination_GetCityList",
this.Query,
res => {
if (res.data.resultCode == 1) {
this.CityList = res.data.data;
}
},
err => {}
);
},
//转出按钮点击事件
outBtn(item) {
this.isShowSet = true;
......@@ -1048,7 +1082,19 @@
},
err => {}
);
}
},
//初始化航空公司下拉
initAirline() {
this.apipost(
"airline_post_GetList", {},
res => {
if (res.data.resultCode == 1) {
this.AirLineList = res.data.data;
}
},
err => {}
);
},
},
mounted() {
let myDate = new Date();
......@@ -1058,8 +1104,8 @@
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
this.Query.QFlightDateStart=nowDate;
this.initCity();
this.Query.QFlightDateStart = nowDate;
this.initAirline();
this.getList();
this.getEmployeeList();
}
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ 94ef7c5d
......@@ -673,6 +673,16 @@
<el-input v-model="Query.ID" placeholder="机票编号" @keyup.native="checkInteger(Query,'ID')"></el-input>
</span>
</li>
<li>
<span>
<em>操作人</em>
<el-select v-model="Query.CreateBy" filterable :placeholder="$t('system.ph_in')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="selectDefauleValue"></el-option>
<el-option v-for="item in EmployeeList" :label="item.EmName" :value="item.EmployeeId"
:key="item.EmployeeId"></el-option>
</el-select>
</span>
</li>
<li>
<button class="hollowFixedBtn" type="button"
@click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
......@@ -905,7 +915,9 @@
//机票编号
ID: "",
//PNR
PNR:""
PNR: "",
//票务人员
CreateBy: 0,
},
//线路列表
LineList: [],
......@@ -931,6 +943,8 @@
AirticketId: 0,
TotalNum: 0
},
//员工列表
EmployeeList: [],
//绑定框提示
UseNum_placeholder: "",
pickerBeginDateBefore: {
......@@ -1048,9 +1062,30 @@
err => {}
);
}
}
},
//根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList() {
let userInfo = this.getLocalStorage()
let msg = {
GroupId: userInfo.RB_Group_id,
BranchId: '-1',
DepartmentId: '-1',
PostId: '-1',
IsLeave: '0'
}
this.apipost(
'admin_get_EmployeeGetList', {},
res => {
if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data
}
},
err => {}
)
},
},
mounted() {
this.getEmployeeList();
this.GetLineList();
this.initAirline();
this.getList();
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 94ef7c5d
......@@ -373,7 +373,10 @@
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName">
<div class="clearfix">
<div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;cursor:pointer;" v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span> {{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_remarkTitle" style="width:105px;"><span style="font-weight: 100;cursor:pointer;"
v-if="item.ScoreNum >= 0"
@click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span>
{{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content" style="width:90%">{{item.Title}}</div>
</div>
</div>
......@@ -491,11 +494,9 @@
</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"
:TCID="item.TCID"
:DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<commonHotelInfo :HotelObj="item.HotelOrderListReports" :showHotelObj="showHotelObj"
:TCID="item.TCID" :DMCNum="item.DMCNum" :TCNUM="item.TCNUM"
@SetShouPeiShu="SetShouPeiShu(item.TCID,item.ShouPeiStatus)"></commonHotelInfo>
<span slot="reference" class="price"
style="cursor:pointer;text-decoration:underline;">酒店预订状况</span>
</el-popover>
......@@ -726,8 +727,7 @@
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}}
</el-button>
<!-- v-if="CurrentUserInfo.RB_Branch_id==0||CurrentUserInfo.RB_Branch_id==1216||CurrentUserInfo.RB_Branch_id==49"-->
<el-dropdown trigger="click" style="margin-bottom:5px;">
<el-dropdown trigger="click" style="margin-bottom:5px;" v-if="IsModifyTravelControl==1">
<span class="el-dropdown-link">{{$t('pub.updateMsg')}}
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
......@@ -792,10 +792,11 @@
</el-dropdown-item>
<el-dropdown-item @click.native='ShowUploadWord(item)'>{{$t('Operation.Op_wordTrip')}}
</el-dropdown-item>
<el-dropdown-item >
<div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>查看旅客调查</div>
<el-dropdown-item>
<div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>查看旅客调查
</div>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -1066,14 +1067,15 @@
],
//当前登录用户信息
CurrentUserInfo: {},
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true,
showHotelObj: {
showPrice: true,
showPay: true,
showZhan: true,
showBtnList: true,
showCaozuoTime: true,
isFromTCList:true
isFromTCList: true
},
IsModifyTravelControl: 0, //分公司是否有修改团控权限
pickerBeginDateBefore: {
disabledDate: time => {
if (this.queryMsg.EndGroupDate == null) {
......@@ -1108,14 +1110,12 @@
});
},
//更新手配书状态
SetShouPeiShu(TCID,ShouPeiStatus)
{
var msg=
{
TCID:TCID,
ShouPeiStatus:(ShouPeiStatus==0?1:0)
SetShouPeiShu(TCID, ShouPeiStatus) {
var msg = {
TCID: TCID,
ShouPeiStatus: (ShouPeiStatus == 0 ? 1 : 0)
};
this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => {
this.apipost('dmcstatistics_post_SetPriceShouPeiShuService', msg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.getList();
......@@ -1869,6 +1869,18 @@
if (this.$route.query.IsUnionCked) {
this.queryMsg.IsShowUnion = this.$route.query.IsUnionCked;
}
if (this.CurrentUserInfo.RB_Branch_id == 0 || this.CurrentUserInfo.RB_Branch_id == 1216 || this.CurrentUserInfo
.RB_Branch_id == 49) {
this.IsModifyTravelControl = 1;
} else {
//检查分公司是否有权限
if (("," + this.CurrentUserInfo.ActionMenuCode + ",").indexOf("T_EditTravelControl") > -1) {
this.IsModifyTravelControl = 1;
} else {
this.IsModifyTravelControl = 0;
}
}
if (this.CurrentUserInfo.IsParentCompany == undefined) {
this.queryCommonData.IsParentCompany = 2
......@@ -1890,7 +1902,7 @@
if (!this.$route.query.tcmun) {
this.queryMsg.StartGroupDate = nowDate
}
if (this.queryCommonData.IsParentCompany != 1 && this.CurrentUserInfo.RB_Branch_id!=49) {
if (this.queryCommonData.IsParentCompany != 1 && this.CurrentUserInfo.RB_Branch_id != 49) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
}
this.getControlList();
......
src/components/administrative/ExaminationStatistics.vue
View file @ 94ef7c5d
......@@ -382,8 +382,8 @@ export default {
return `<span>${rowData.xiaoShouKaiTuan <= 0 && !rowData.xiaoShouKaiTuan ? '' : rowData.xiaoShouKaiTuan}</span>`
}
};
let PlanDmcPriceCount = {
field: "PlanDmcPriceCount",
let planDmcPriceCount = {
field: "planDmcPriceCount",
title: "用款计划违规",
titleAlign: "left",
columnAlign: "left",
......@@ -391,7 +391,7 @@ export default {
width: 120,
orderBy: "",
formatter: function(rowData, rowIndex, pagingIndex, field) {
return `<span>${rowData.PlanDmcPriceCount <= 0 && !rowData.PlanDmcPriceCount ? '' : rowData.PlanDmcPriceCount}</span>`
return `<span>${rowData.planDmcPriceCount <= 0 && !rowData.planDmcPriceCount ? '' : rowData.planDmcPriceCount}</span>`
}
};
this.columns = [];
......@@ -412,7 +412,7 @@ export default {
this.columns.push(leaveEarlyCount);
this.columns.push(complainCount);
this.columns.push(discountPrice);
this.columns.push(PlanDmcPriceCount)
this.columns.push(planDmcPriceCount)
this.isReady = true;
},
sortChange(param) {
......@@ -455,9 +455,9 @@ export default {
this.msg.OrderBy='a.AppletOrderCount '+param.appletOrderCount
}
if(param.PlanDmcPriceCount!=''){
if(param.planDmcPriceCount!=''){
this.msg.OrderBy='a.PlanDmcPriceCount '+param.PlanDmcPriceCount
this.msg.OrderBy='a.PlanDmcPriceCount '+param.planDmcPriceCount
}
//this.tableData = this.orderBy(d, ["incomeVal"], param.income).results;
this.getList();
......
src/components/busManagement/busStatistics.vue
View file @ 94ef7c5d
......@@ -76,10 +76,11 @@
</div>
</td>
<td>
<el-popover width="750" trigger="click" popper-class="Bus_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj"></commonHotelInfo>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;">酒店信息</div>
</el-popover>
<el-popover width="750" trigger="click" popper-class="Bus_HotelPop">
<commonHotelInfo :HotelObj="item.CommonReport.PriceHotelResult" :showHotelObj="showHotelObj">
</commonHotelInfo>
<div slot="reference" class="w80" style="cursor:pointer;text-decoration:underline;">酒店信息</div>
</el-popover>
</td>
<td>
<div class="w120">
......@@ -145,19 +146,22 @@
<div class="w80">{{item.GuideName}}</div>
</td>
<td>
<div class="w80">{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}} </div>
<div class="w80">
<template v-if="item.CommonReport&&item.CommonReport.BusPlanListReport&&item.CommonReport.BusPlanListReport.length>0&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList&&item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0]">
{{item.CommonReport.BusPlanListReport[0].BusPlanOrderList[0].MainBusTypeStr}}
</template>
</div>
</td>
<td v-for="(x,ww) in item.CommonReport.BusPlanListReport" style="vertical-align: top;">
<div class="w100">
<template v-for="(childItem,childIndex) in x.BusPlanOrderList">
<template v-if="x.BusPlanOrderList" v-for="(childItem,childIndex) in x.BusPlanOrderList">
<p class="pDateStyle" v-if="childIndex==0"> {{childItem.PlanDateStr}}</p>
<p class="pDateStyle">
{{(childItem.AirportPickUpStr!=""?childItem.AirportPickUpStr:"") }}
<span style="color: #4BCA81;" v-if="(childItem.AirportPickUpStr!='')">√</span>
<span style="color: #E95252;" v-else>X</span>
<template v-if="x.BusPlanOrderList.length>1 && x.BusPlanOrderList.length-1!=childIndex">
<br />
<br />
</template>
</p>
</template>
......@@ -232,10 +236,10 @@
colspanTotal: 0,
isCha: 0,
boxHeight: 0,
showHotelObj:{
showPrice:true,
showPay:true,
showZhan:true
showHotelObj: {
showPrice: true,
showPay: true,
showZhan: true
}
}
},
......@@ -255,11 +259,13 @@
GetTotalPrice(obj) { //车费总价
let totalPrice = 0;
obj.forEach(busInfo => {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.CostPrice != undefined) {
totalPrice += subItem.CostPrice;
}
});
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.CostPrice != undefined) {
totalPrice += subItem.CostPrice;
}
});
}
});
return totalPrice;
},
......@@ -286,23 +292,27 @@
let DayNum = 0;
obj.forEach((busInfo, index) => {
if (index == 0) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
jieji += subItem.AirportPickUpStr + ",";
} else {
jieji += "接机,";
}
});
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
jieji += subItem.AirportPickUpStr + ",";
} else {
jieji += "接机,";
}
});
}
} else if (index == (obj.length - 1)) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
songji += subItem.AirportPickUpStr + ",";
} else {
songji += "送机,";
}
});
if (busInfo.BusPlanOrderList) {
busInfo.BusPlanOrderList.forEach(subItem => {
if (subItem.AirportPickUpStr != "") {
songji += subItem.AirportPickUpStr + ",";
} else {
songji += "送机,";
}
});
}
} else {
DayNum += 1;
}
......@@ -397,7 +407,6 @@
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.DataList = res.data.data.pageData.data;
console.log("this.datalist",this.DataList);
this.thLengthTitle = [];
this.colspanTotal = res.data.data.pageData.columnsCount + 13;
for (let i = 1; i <= res.data.data.pageData.columnsCount; i++) {
......@@ -429,13 +438,11 @@
"-" +
myDate.getDate();
this.msg.StartDate = nowDate;
//this.msg.StartDate = '2019-08-12';
let width = window.innerWidth - 50;
let height = window.innerHeight - 65 - 210;
this.boxHeight = height;
this.offsetwidth = width;
// this.msg.CombinationNum = 'JVS0422OTC-NHA';
// this.msg.StartDate = "2019-04-20";
this.getList();
this.getLineTeamList();
},
......@@ -538,8 +545,10 @@
.busStatistics_tripDetails table tr._color_666 th {
padding: 9px 15px;
}
.Bus_HotelPop{
.Bus_HotelPop {
overflow: auto;
max-height: 350px;
}
</style>
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