Skip to content

S
SuperMan
Commit 4b7de2f4 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 55785334
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 257 deletions
src/components/Details.vue
View file @ 4b7de2f4
...@@ -762,6 +762,9 @@ ...@@ -762,6 +762,9 @@
case "/TeamBalancePayment": //团队收支明细 case "/TeamBalancePayment": //团队收支明细
path = "/TravelControlList"; path = "/TravelControlList";
break; break;
case "/airplaneList": //包机管理
path = "/TravelControlList";
break;
case "/saleReceivablesTotal": //工作汇总 询价 case "/saleReceivablesTotal": //工作汇总 询价
path = "/workTotal"; path = "/workTotal";
break; break;
......
src/components/airplane/list.vue → src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 4b7de2f4
<style> <style>
@import "../../assets/css/newTravelManager.css"; @import "../../../assets/css/newTravelManager.css";
.flex { .flex {
display: flex; display: flex;
} }
...@@ -124,13 +124,7 @@ ...@@ -124,13 +124,7 @@
<div class="TC_Content"> <div class="TC_Content">
<div class=" TC-MyList"> <div class=" TC-MyList">
<div class="query-box"> <div class="query-box">
<!--v-if="queryCommonData.IsParentCompany==1"-->
<div class="TC_companyList">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}"
@click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span>
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
@click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span>
</div>
<ul> <ul>
<li> <li>
<span> <span>
...@@ -187,228 +181,7 @@ ...@@ -187,228 +181,7 @@
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li class="advancedLi" style="height:34px;">
<el-popover popper-class="advanceQueryList" v-model="queryCommonData.showHigradeSearch" trigger="click">
<div>
<div class="TC_queryTitle">{{$t('visa.v_tkgjcx')}}</div>
<div class="clearfix">
<div class="TC_leftSearch">
<div>
<span>{{$t('system.query_airCompanyName')}}</span>
<el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')"
class="w150">
<el-option :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue">
</el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
:label="item.AlName" :value="item.AirLineId"></el-option>
</el-select>
</div>
<div>
<span>{{$t('visa.v_czuser')}}</span>
<el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
</el-option>
<el-option v-for="(item,index) in queryCommonData.EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :key="index"></el-option>
</el-select>
</div>
<div>
<span>{{$t('visa.v_xcdays')}}</span>
<el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')"
class="w150" :placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<div>
<span>{{$t('visa.v_lycity')}}</span>
<el-select class="w150" filterable v-model="queryMsg.UnionCityId"
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
</el-option>
<el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID"
:key="item.ID"></el-option>
</el-select>
</div>
<div>
<span>&nbsp;&nbsp;&nbsp;车牌号</span>
<el-input maxlength="50" class="w150" v-model="queryMsg.QBusNumber" placeholder="请输入车牌号">
</el-input>
</div>
</div>
<div class="TC_rightSearch">
<div>
<span>{{$t('visa.v_teamnum')}}</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum"
@keyup.native="checkInteger(queryMsg,'TeamMinNum')" :placeholder="$t('pub.pleaseImport')">
</el-input>
-
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMaxNum"
@keyup.native="checkInteger(queryMsg,'TeamMaxNum')" @blur="checkTeamNum(queryMsg)"
:placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<div>
<span>{{$t('leader.leader_registraNum')}}</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum"
@keyup.native="checkInteger(queryMsg,'ApplyMinNum')" :placeholder="$t('pub.pleaseImport')">
</el-input>
-
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMaxNum"
@keyup.native="checkInteger(queryMsg,'ApplyMaxNum')" @blur="checkTeamNum(queryMsg)"
:placeholder="$t('pub.pleaseImport')"></el-input>
</div>
<div class="OnlyShowOverTeam">
<span>{{$t('visa.v_zkbaochaotuan')}}</span>
<el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false">
</el-switch>
</div>
<div>
<span>{{$t('visa.v_salecompany')}}</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}"
v-model="queryMsg.SaleBranchId" multiple>
<el-option v-for="item in queryCommonData.companyList" :key="item.id" :label="item.bName"
:value="item.id"></el-option>
</el-select>
</div>
<div>
<span>团队类型</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.PriceTeamType==''}"
v-model="queryMsg.PriceTeamType" clearable>
<el-option v-for="item in TeamListArr" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</div>
</div>
</div>
<div class="comSearchDiv">
<span>{{$t('scen.sc_temStatu')}}</span>
<span>
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">
{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.TCState" @change="checkedTeamList">
<el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id"
:key="team.Name">{{team.Name}}</el-checkbox>
</el-checkbox-group>
</span>
</div>
<div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span>
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">
{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.SalePlat" @change="checkSales">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id"
:key="sales.Name">{{sales.Name}}</el-checkbox>
</el-checkbox-group>
</span>
</div>
<div class="comSearchDiv">
<span>{{$t('visa.v_tqstatus')}}</span>
<span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">
{{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryMsg.GroupState" @change="checkGroup">
<el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id"
:key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group>
<el-checkbox v-model="queryMsg.IsWarning">{{$t('Operation.Op_WarningTeam')}}</el-checkbox>
</span>
</div>
<div class="comSearchDiv">
<span>{{$t('visa.v_hbstatus')}}</span>
<span>
<el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
<el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked"
@change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group>
</span>
</div>
<div class="comSearchDiv">
<span>{{$t('Operation.Op_TransportState')}}</span>
<span>
<el-checkbox-group v-model="queryCommonData.IsUnionCked" style="margin-left:0;">
<el-checkbox v-for="state in unionStatus" :label="state.Id" :checked="state.Checked"
@change="checkedUnion(state)" :key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group>
</span>
</div>
<div class="comSearchDiv" style="display: flex;align-items: center;">
<span style="flex-shrink: 0;">提成状态</span>
<span style="display: flex;align-items: center;flex-wrap: wrap;">
<el-select class="w180 multiple_input" v-model="queryMsg.QSendCommissionState">
<el-option v-for="item in QSendCommissionStateList" :label="item.Name" :value="item.ID"
:key="item.LineID"></el-option>
</el-select>
<a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
<el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text=""
active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" />
<div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
<span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span>
<span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span>
<span style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">出境</span>
</div>
</span>
</div>
<button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}
</button>
</div>
<span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}}
<i class="iconfont icon-xiaotuziCduan_1"></i>
</span>
</el-popover>
</li>
<li class="advancedLi" style="height:34px;">
<el-popover width="260" v-model="queryCommonData.showWarningSearch" trigger="click">
<div>
<div class="TC_queryTitle">{{$t('Operation.Op_TeamWarningSearch')}}</div>
<div class="clearfix">
<div class="TC_leftSearch">
<div>
<span
style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('leader.leader_registraNum')}}</span>
<el-select v-model="queryMsg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')"
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option :label="$t('sm.nobodybaoming')" value="1"></el-option>
<el-option :label="$t('sm.tenpx')" value="2"></el-option>
<el-option :label="$t('sm.tenps')" value="3"></el-option>
<el-option :label="$t('sm.yuweiXiaoyu')" value="4"></el-option>
<el-option :label="$t('sm.youHouBu')" value="5"></el-option>
</el-select>
</div>
<div>
<span
style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('Operation.Op_daysChoice')}}</span>
<el-select v-model="queryMsg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')"
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option :label="$t('sm.tendayYiNei')" value="1"></el-option>
<el-option :label="$t('sm.FitydayYiNei')" value="2"></el-option>
<el-option :label="$t('sm.twendayYiNei')" value="3"></el-option>
<el-option :label="$t('sm.twendayYiWai')" value="4"></el-option>
</el-select>
</div>
<div>
<span
style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('Operation.Op_Attendance')}}</span>
<el-select v-model="queryMsg.RateOn" filterable :placeholder="$t('system.ph_buxian')"
class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option label="100%" value="1"></el-option>
<el-option :label="$t('sm.buzue')" value="2"></el-option>
<el-option :label="$t('sm.buzus')" value="3"></el-option>
<el-option :label="$t('sm.buzuf')" value="4"></el-option>
</el-select>
</div>
</div>
</div>
<button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showWarningSearch=false">{{$t('pub.searchBtn')}}
</button>
</div>
<span class="advancedQuery" slot="reference">{{$t('Operation.Op_warningSearch')}}
<i class="iconfont icon-xiaotuziCduan_1"></i>
</span>
</el-popover>
</li>
<li> <li>
<button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button> <button class="hollowFixedBtn" @click="resetPageIndex(),getControlList()">{{$t('pub.searchBtn')}}</button>
</li> </li>
......
src/router/config.js
View file @ 4b7de2f4
...@@ -2292,6 +2292,13 @@ export default { ...@@ -2292,6 +2292,13 @@ export default {
title: '团控列表' title: '团控列表'
}, },
}, , { }, , {
path: '/TravelTeam', //包机列表
name: 'TravelTeam',
component: resolve => require(['@/components/TravelManager/TravelTeam/travelTeamList'], resolve),
meta: {
title: '包机列表'
},
}, {
path: '/TravelSupplier', //供应商列表 path: '/TravelSupplier', //供应商列表
name: 'TravelSupplier', name: 'TravelSupplier',
component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelSupplier'], resolve), component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelSupplier'], resolve),
...@@ -5792,38 +5799,35 @@ export default { ...@@ -5792,38 +5799,35 @@ export default {
meta: { meta: {
title: '供应商投诉' title: '供应商投诉'
}, },
},{ }, {
path: '/airplaneList', //包机列表
name: 'airplaneList',
component: resolve => require(['@/components/airplane/list'], resolve),
meta: {
title: '包机列表'
},
},{
path: '/airplaneInfo', //包机信息 path: '/airplaneInfo', //包机信息
name: 'airplaneInfo', name: 'airplaneInfo',
component: resolve => require(['@/components/airplane/addInfo'], resolve), component: resolve => require(['@/components/airplane/addInfo'], resolve),
meta: { meta: {
title: '包机信息' title: '包机信息'
},},{ },
path: '/airplaneGroup', //团控信息 }, {
name: 'airplaneGroup', path: '/airplaneGroup', //团控信息
component: resolve => require(['@/components/airplane/airplaneGroup'], resolve), name: 'airplaneGroup',
meta: { component: resolve => require(['@/components/airplane/airplaneGroup'], resolve),
title: '团控信息' meta: {
},},{ title: '团控信息'
path: '/airplaneGroup', //团控信息 },
name: 'airplaneGroup', }, {
component: resolve => require(['@/components/airplane/airplaneGroup'], resolve), path: '/airplaneGroup', //团控信息
meta: { name: 'airplaneGroup',
title: '团控信息' component: resolve => require(['@/components/airplane/airplaneGroup'], resolve),
},},{ meta: {
path: '/airplane/apply', //团控信息 title: '团控信息'
name: 'airplane/apply', },
component: resolve => require(['@/components/airplane/apply'], resolve), }, {
meta: { path: '/airplane/apply', //团控信息
title: '在线申请' name: 'airplane/apply',
},} component: resolve => require(['@/components/airplane/apply'], resolve),
meta: {
title: '在线申请'
},
}
] ]
}, },
{ // crm财务单据自动登录 { // crm财务单据自动登录
......
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