Skip to content

S
SuperMan
Commit 914f55e2 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents fd35b22a 47b922d5
Hide whitespace changes
Inline Side-by-side
Showing with 183 additions and 37 deletions
src/components/dmc/manager/dmcTotalTable.vue
View file @ 914f55e2
<template> <template>
<div> <div>
<div class="query-box" style="border-bottom: none;"> <div class="query-box dmcMain" style="border-bottom: none;">
<ul> <ul>
<li> <li>
<span> <span>
<em>线路</em> <em>线路</em>
<el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" class="w150" @change="getLineTeamList()"> <el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()">
<el-option label="不限" :value='0'></el-option> <el-option label="不限" :value='0'></el-option>
<el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'> <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li>
<span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select v-model="msg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option>
</el-select>
</span>
</li>
<li> <li>
<span> <span>
<em>系列</em> <em>系列</em>
<el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')" class="w150"> <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option label="不限" value='-1'></el-option> <el-option label="不限" :value='0'></el-option>
<el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'> <el-option v-for="item in queryCommonData.LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -25,20 +36,44 @@ ...@@ -25,20 +36,44 @@
<li> <li>
<span> <span>
<em>团号</em> <em>团号</em>
<el-input v-model='msg.TCNUM' class="w150"></el-input> <el-input v-model='msg.TCNUM'></el-input>
</span> </span>
</li> </li>
<li><span><em>日期</em> <li><span><em>日期</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateBefore"></el-date-picker>
- -
<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" :picker-options="pickerBeginDateAfter"></el-date-picker>
</span>
</li>
<li><span>
<em>状态</em>
<el-select v-model='msg.PriceStatus'>
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Name" :key="team.Id" :value="team.Id"></el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>航空公司</em>
<el-select v-model="msg.AirLineId" filterable :placeholder="$t('system.ph_buxian')">
<el-option :label="$t('system.ph_buxian')" :value="0">
</el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
:label="item.AlName" :value="item.AirLineId"></el-option>
</el-select>
</span> </span>
</li> </li>
<li><span><em>状态</em></span> <li>
<el-select v-model='msg.PriceStatus' class="w150"> <span>
<el-option label='正常' value='0' key='0'></el-option> <em>OP</em>
<el-option label='取消' value='1' key='1'></el-option> <el-select v-model="msg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="0">
</el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="item.EmployeeId"></el-option>
</el-select> </el-select>
</span>
</li> </li>
<li> <li>
<span> <span>
...@@ -46,6 +81,16 @@ ...@@ -46,6 +81,16 @@
<el-input v-model='msg.CombinationNum'></el-input> <el-input v-model='msg.CombinationNum'></el-input>
</span> </span>
</li> </li>
<li>
<span>
<em>出团公司</em>
<el-select v-model="msg.OutBranchIds" filterable multiple class="multiple_input" :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in queryCommonData.BranchList" :label='item.BName' :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>
...@@ -302,14 +347,18 @@ ...@@ -302,14 +347,18 @@
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
SelectType: 6, SelectType: 6,
LineId: 0, PriceStatus: 0,
LineteamId: "-1",
PriceStatus: "0",
//地接团号 //地接团号
CombinationNum: "" CombinationNum: "",
//出团公司
OutBranchIds: [],
LineId: 0,
PlaceID: 0,
LineteamId: 0,
//航空公司
AirLineId:0,
CreateBy:0,
}, },
LineList: [],
LineTeamList: [],
thLengthTitle: [], thLengthTitle: [],
list: [], list: [],
colspanTotal: 0, colspanTotal: 0,
...@@ -317,6 +366,32 @@ ...@@ -317,6 +366,32 @@
NumObj: { NumObj: {
DMCNum: "", DMCNum: "",
TCIDs: "" TCIDs: ""
},
queryCommonData:{
//公司数据
BranchList: [],
//国家
PlaceList: [],
LineList: [],
LineTeamList: [],
AirlineList:[],
EmployeeList:[],
},
pickerBeginDateBefore: {
disabledDate: time => {
if (this.msg.EndDate == null) {
return false;
} else {
let endTime = new Date(this.msg.EndDate)
return endTime.getTime() < time.getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartDate)
return startTime.getTime() >= time.getTime()
}
} }
} }
}, },
...@@ -348,27 +423,42 @@ ...@@ -348,27 +423,42 @@
getLineList() { getLineList() {
this.apipost("line_post_GetAllList", {}, res => { this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.LineList = res.data.data; this.queryCommonData.LineList = res.data.data;
this.queryCommonData.PlaceList = []
this.queryCommonData.LineTeamList = []
} else { } else {
this.$message.error(res.data.message); this.Error(res.data.message);
} }
}); });
}, },
//获取目的地列表
getLinePlaceList() {
this.msg.PlaceID = 0;
this.msg.LineteamId = 0;
let msg = {
lineID: this.msg.LineId,
}
this.apipost('team_post_GetLinePlace', msg, res => {
if (res.data.resultCode == 1) {
this.queryCommonData.PlaceList = res.data.data
this.queryCommonData.LineTeamList = []
}
})
},
//获取系列列表 //获取系列列表
getLineTeamList(lineId) { getLineTeamList() {
this.LineTeamList = []; this.msg.LineteamId = 0
this.apipost( let msg = {
"team_post_GetList", { lineID: this.msg.LineId,
lineID: this.msg.LineId, placeID: this.msg.PlaceID,
isTOOP: 1 isTOOP: 1
}, }
res => { this.apipost('team_post_GetList', msg, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.msg.LineteamId = "-1"; this.queryCommonData.LineTeamList = res.data.data
this.LineTeamList = res.data.data;
}
} }
); })
}, },
goUrlRR(path, obj) { goUrlRR(path, obj) {
let routeData = this.$router.resolve({ let routeData = this.$router.resolve({
...@@ -513,6 +603,58 @@ ...@@ -513,6 +603,58 @@
} }
}, err => {}) }, err => {})
}, },
//初始化公司
getCompanyList() {
let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id
}
this.apipost(
'admin_get_BranchGetList',
msg,
res => {
if (res.data.resultCode == 1) {
this.queryCommonData.BranchList = res.data.data;
}
},
err => {}
)
},
//获取航空公司
getAirlineList() {
this.apipost(
'airline_post_GetList', {},
res => {
if (res.data.resultCode == 1) {
this.queryCommonData.AirlineList = res.data.data
}
},
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.queryCommonData.EmployeeList = res.data.data
}
},
err => {}
)
},
}, },
mounted() { mounted() {
let myDate = new Date(); let myDate = new Date();
...@@ -524,8 +666,10 @@ ...@@ -524,8 +666,10 @@
myDate.getDate(); myDate.getDate();
this.msg.StartDate = nowDate; this.msg.StartDate = nowDate;
this.getLineList(); this.getLineList();
this.getList() this.getList();
//this.getLineTeamList(); this.getCompanyList();
this.getAirlineList();
this.getEmployeeList();
}, },
} }
...@@ -653,5 +797,7 @@ ...@@ -653,5 +797,7 @@
.dmcTotalTable_tripDetails table tr._color_666 th { .dmcTotalTable_tripDetails table tr._color_666 th {
padding: 9px 15px; padding: 9px 15px;
} }
.dmcMain .el-checkbox+.el-checkbox{
margin-left:5px;
}
</style> </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