Skip to content

S
SuperMan
Commit 01282b89 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents 1b0ef000 ea0bd2c9
Show whitespace changes
Inline Side-by-side
Showing with 204 additions and 189 deletions
config/index.js
View file @ 01282b89
...@@ -99,7 +99,7 @@ module.exports = { ...@@ -99,7 +99,7 @@ module.exports = {
// Various Dev Server settings // Various Dev Server settings
host: 'testerp.oytour.com', // can be overwritten by process.env.HOST host: 'www.test.com', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
errorOverlay: true, errorOverlay: true,
......
src/components/TravelManager/TravelList/oneDayTrip.vue
View file @ 01282b89
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
text-align: center; text-align: center;
} }
.TC_Content ._pic_upload > div { .TC_Content ._pic_upload>div {
float: left; float: left;
width: 138px; width: 138px;
height: 92px; height: 92px;
...@@ -81,13 +81,15 @@ ...@@ -81,13 +81,15 @@
.TC_Content .avatar-uploader-icon { .TC_Content .avatar-uploader-icon {
height: auto; height: auto;
} }
</style> </style>
<template> <template>
<div class="TC_Content"> <div class="TC_Content">
<div class=" TC-MyList"> <div class=" TC-MyList">
<div class="query-box"> <div class="query-box">
<div class="TC_companyList"> <div class="TC_companyList">
<span :class="{'TC_checked':queryCommonData.checkCompanyAll}" @click="getCompanyCheckAll()">{{$t('advmanager.v_all')}}</span> <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}" <span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}"
@click="getCompanyCheck(item)">{{item.BName}}</span> @click="getCompanyCheck(item)">{{item.BName}}</span>
</div> </div>
...@@ -128,26 +130,23 @@ ...@@ -128,26 +130,23 @@
<span> <span>
<em>{{$t('visa.v_tuanhao')}}</em> <em>{{$t('visa.v_tuanhao')}}</em>
<el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150" <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150"
@keyup.native.enter="getControlList" @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input>
:placeholder="$t('pub.pleaseImport')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('hotel.hotel_SerialNumber')}}</em> <em>{{$t('hotel.hotel_SerialNumber')}}</em>
<el-input v-model="queryMsg.TCID" class="permiss-input w150" <el-input v-model="queryMsg.TCID" class="permiss-input w150" :placeholder="$t('pub.pleaseImport')"
:placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')" maxlength="6"></el-input> @keyup.native="checkInteger(queryMsg,'TCID')" maxlength="6"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('scen.sc_ftTime')}}</em> <em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate" <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter" :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span> </span>
</li> </li>
<li class="advancedLi" style="height:34px;"> <li class="advancedLi" style="height:34px;">
...@@ -160,21 +159,19 @@ ...@@ -160,21 +159,19 @@
<span>{{$t('system.query_airCompanyName')}}</span> <span>{{$t('system.query_airCompanyName')}}</span>
<el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" <el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')"
class="w150"> class="w150">
<el-option :label="$t('system.ph_buxian')" <el-option :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue">
:value="queryCommonData.SelectDefaultValue"></el-option> </el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
:label="item.AlName" :label="item.AlName" :value="item.AirLineId"></el-option>
:value="item.AirLineId"></el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
<span>{{$t('visa.v_czuser')}}</span> <span>{{$t('visa.v_czuser')}}</span>
<el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.CreateBy" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
:value="queryCommonData.SelectDefaultValue"></el-option> </el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" <el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName"
:value="item.EmployeeId" :value="item.EmployeeId" :key="item.EmployeeId"></el-option>
:key="item.EmployeeId"></el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
...@@ -187,8 +184,8 @@ ...@@ -187,8 +184,8 @@
<span>{{$t('visa.v_lycity')}}</span> <span>{{$t('visa.v_lycity')}}</span>
<el-select class="w150" filterable v-model="queryMsg.UnionCityId" <el-select class="w150" filterable v-model="queryMsg.UnionCityId"
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
:value="queryCommonData.SelectDefaultValue"></el-option> </el-option>
<el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID" <el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID"
:key="item.ID"></el-option> :key="item.ID"></el-option>
</el-select> </el-select>
...@@ -198,27 +195,27 @@ ...@@ -198,27 +195,27 @@
<div> <div>
<span>{{$t('visa.v_teamnum')}}</span> <span>{{$t('visa.v_teamnum')}}</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum" <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMinNum"
@keyup.native="checkInteger(queryMsg,'TeamMinNum')" @keyup.native="checkInteger(queryMsg,'TeamMinNum')" :placeholder="$t('pub.pleaseImport')">
:placeholder="$t('pub.pleaseImport')"></el-input> </el-input>
- -
<el-input maxlength="50" class="w80" v-model="queryMsg.TeamMaxNum" <el-input maxlength="50" class="w80" v-model="queryMsg.TeamMaxNum"
@keyup.native="checkInteger(queryMsg,'TeamMaxNum')" @keyup.native="checkInteger(queryMsg,'TeamMaxNum')" @blur="checkTeamNum(queryMsg)"
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>{{$t('leader.leader_registraNum')}}</span> <span>{{$t('leader.leader_registraNum')}}</span>
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum" <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum"
@keyup.native="checkInteger(queryMsg,'ApplyMinNum')" @keyup.native="checkInteger(queryMsg,'ApplyMinNum')" :placeholder="$t('pub.pleaseImport')">
:placeholder="$t('pub.pleaseImport')"></el-input> </el-input>
- -
<el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMaxNum" <el-input maxlength="50" class="w80" v-model="queryMsg.ApplyMaxNum"
@keyup.native="checkInteger(queryMsg,'ApplyMaxNum')" @keyup.native="checkInteger(queryMsg,'ApplyMaxNum')" @blur="checkTeamNum(queryMsg)"
@blur="checkTeamNum(queryMsg)" :placeholder="$t('pub.pleaseImport')"></el-input> :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div class="OnlyShowOverTeam"> <div class="OnlyShowOverTeam">
<span>{{$t('visa.v_zkbaochaotuan')}}</span> <span>{{$t('visa.v_zkbaochaotuan')}}</span>
<el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" <el-switch v-model="queryMsg.OnlyShowOverTeam" active-value="true" inactive-value="false">
inactive-value="false"></el-switch> </el-switch>
</div> </div>
<div> <div>
<span>{{$t('visa.v_salecompany')}}</span> <span>{{$t('visa.v_salecompany')}}</span>
...@@ -233,7 +230,8 @@ ...@@ -233,7 +230,8 @@
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>{{$t('scen.sc_temStatu')}}</span> <span>{{$t('scen.sc_temStatu')}}</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">{{$t('system.table_chekAll')}}</el-checkbox> <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-group v-model="queryMsg.TCState" @change="checkedTeamList">
<el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id" <el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id"
:key="team.Name">{{team.Name}}</el-checkbox> :key="team.Name">{{team.Name}}</el-checkbox>
...@@ -243,7 +241,8 @@ ...@@ -243,7 +241,8 @@
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>{{$t('Airticket.Air_salesPlatform')}}</span> <span>{{$t('Airticket.Air_salesPlatform')}}</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">{{$t('system.table_chekAll')}}</el-checkbox> <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-group v-model="queryMsg.SalePlat" @change="checkSales">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id"
:key="sales.Name">{{sales.Name}}</el-checkbox> :key="sales.Name">{{sales.Name}}</el-checkbox>
...@@ -253,7 +252,8 @@ ...@@ -253,7 +252,8 @@
<div class="comSearchDiv"> <div class="comSearchDiv">
<span>{{$t('visa.v_tqstatus')}}</span> <span>{{$t('visa.v_tqstatus')}}</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">{{$t('system.table_chekAll')}}</el-checkbox> <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-group v-model="queryMsg.GroupState" @change="checkGroup">
<el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id" <el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id"
:key="state.Name">{{state.Name}}</el-checkbox> :key="state.Name">{{state.Name}}</el-checkbox>
...@@ -266,8 +266,7 @@ ...@@ -266,8 +266,7 @@
<span> <span>
<el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;"> <el-checkbox-group v-model="queryCommonData.flightCKed" style="margin-left:0;">
<el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked" <el-checkbox v-for="state in flightStatus" :label="state.Id" :checked="state.Checked"
@change="checkedFlight(state)" @change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox>
:key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -297,7 +296,8 @@ ...@@ -297,7 +296,8 @@
<div class="clearfix"> <div class="clearfix">
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('leader.leader_registraNum')}}</span> <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')" <el-select v-model="queryMsg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')"
class="w150"> class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
...@@ -309,7 +309,8 @@ ...@@ -309,7 +309,8 @@
</el-select> </el-select>
</div> </div>
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('Operation.Op_daysChoice')}}</span> <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')" <el-select v-model="queryMsg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')"
class="w150"> class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
...@@ -320,7 +321,8 @@ ...@@ -320,7 +321,8 @@
</el-select> </el-select>
</div> </div>
<div> <div>
<span style="display:inline-block;margin: 0 5px 0 0;width:50px;text-align:right;">{{$t('Operation.Op_Attendance')}}</span> <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')" <el-select v-model="queryMsg.RateOn" filterable :placeholder="$t('system.ph_buxian')"
class="w150"> class="w150">
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option> <el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
...@@ -351,8 +353,8 @@ ...@@ -351,8 +353,8 @@
<div class="TravelTclList" v-loading="queryCommonData.loading"> <div class="TravelTclList" v-loading="queryCommonData.loading">
<ul> <ul>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
:total="queryMsg.total"></el-pagination> </el-pagination>
<li v-for="(item,index) in queryCommonData.dataList" :key="index" <li v-for="(item,index) in queryCommonData.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}"> :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName"> <div class="TC_remarkContent TC_teamName">
...@@ -367,9 +369,12 @@ ...@@ -367,9 +369,12 @@
<div> <div>
<div class="TC_teamType"> <div class="TC_teamType">
<span v-if="item.IsB2B==0" :title="$t('sm.neiBuTuan')">{{$t('Operation.Op_nei')}}</span> <span v-if="item.IsB2B==0" :title="$t('sm.neiBuTuan')">{{$t('Operation.Op_nei')}}</span>
<span v-if="item.IsUnion==1&&item.UnionTypeStr==1" :title="$t('Operation.Op_zhu')" class="MainTeam">{{$t('Operation.Op_zhu')}}</span> <span v-if="item.IsUnion==1&&item.UnionTypeStr==1" :title="$t('Operation.Op_zhu')"
<span v-if="item.IsUnion==1&&item.UnionTypeStr==2" :title="$t('Operation.Op_lian')">{{$t('Operation.Op_lian')}}</span> class="MainTeam">{{$t('Operation.Op_zhu')}}</span>
<span v-if="item.Status==2" :title="$t('Operation.Op_jietuan')">{{$t('Operation.Op_jietuan')}}</span> <span v-if="item.IsUnion==1&&item.UnionTypeStr==2"
:title="$t('Operation.Op_lian')">{{$t('Operation.Op_lian')}}</span>
<span v-if="item.Status==2"
:title="$t('Operation.Op_jietuan')">{{$t('Operation.Op_jietuan')}}</span>
<span v-if="item.Status==1" :title="$t('visaT.sale')">{{$t('visaT.sale')}}</span> <span v-if="item.Status==1" :title="$t('visaT.sale')">{{$t('visaT.sale')}}</span>
</div> </div>
<div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.UnionBranchName}}</div> <div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.UnionBranchName}}</div>
...@@ -412,7 +417,8 @@ ...@@ -412,7 +417,8 @@
{{item.OutBranchName}} {{item.OutBranchName}}
</p> </p>
<p class="travelnowrap" v-if="item.WordPath!=''"> <p class="travelnowrap" v-if="item.WordPath!=''">
<a style="corsor:pointer;" :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('visa.v_salecompany')}}下载WORD行程</a> <a style="corsor:pointer;"
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('visa.v_salecompany')}}下载WORD行程</a>
</p> </p>
</div> </div>
</div> </div>
...@@ -421,8 +427,10 @@ ...@@ -421,8 +427,10 @@
<p> <p>
<i class="iconfont icon-jiage"></i>{{$t('Operation.Op_PriceInfo')}} <i class="iconfont icon-jiage"></i>{{$t('Operation.Op_PriceInfo')}}
</p> </p>
<p class="travelprice">{{$t('Operation.Op_tradePrice')}}：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p> <p class="travelprice">
<p class="travelprice">{{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p> {{$t('Operation.Op_tradePrice')}}：￥{{item.B2BMemberPrice|priceFormat(item.B2BMemberPrice)}}</p>
<p class="travelprice">
{{$t('Operation.Op_directPrice')}}：￥{{item.B2CMemberPrice|priceFormat(item.B2CMemberPrice)}}</p>
</div> </div>
</div> </div>
<div class="el-col" style="width:150px;"> <div class="el-col" style="width:150px;">
...@@ -447,7 +455,8 @@ ...@@ -447,7 +455,8 @@
</p> </p>
<p class="travelnowrap"> <p class="travelnowrap">
<span>{{$t('visa.v_houbu')}}</span> <span>{{$t('visa.v_houbu')}}</span>
<span v-if="item.IsSubstitution==1" class="TCL-greenType">{{$t('visa.v_yxhoubu')}}（{{$t('visa.v_houbu')}}{{item.HBNum}}{{$t('sm.person')}}）</span> <span v-if="item.IsSubstitution==1"
class="TCL-greenType">{{$t('visa.v_yxhoubu')}}（{{$t('visa.v_houbu')}}{{item.HBNum}}{{$t('sm.person')}}）</span>
<span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span> <span v-else class="TCL-redType">{{$t('visa.v_byxhoubu')}}</span>
</p> </p>
</div> </div>
...@@ -477,7 +486,8 @@ ...@@ -477,7 +486,8 @@
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goToOpenTravel('TravelManager5',item.ID,0)">{{$t('Operation.Op_xilieModyfi')}} <el-dropdown-item @click.native="goToOpenTravel('TravelManager5',item.ID,0)">
{{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goTonowTeam('TravelManager5',item.ID,item.TCID,item.TCNUM)"> <el-dropdown-item @click.native="goTonowTeam('TravelManager5',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}} {{$t('Operation.Op_dangtuanModify')}}
...@@ -495,16 +505,21 @@ ...@@ -495,16 +505,21 @@
<i class="el-icon-arrow-down el-icon--right"></i> <i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<el-dropdown-menu slot="dropdown" class="TC-dropdown"> <el-dropdown-menu slot="dropdown" class="TC-dropdown">
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">{{$t('Operation.Op_shouzhiDetail')}} <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
{{$t('Operation.Op_shouzhiDetail')}}
</el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('SalesconfirmationOrder',item)">
{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goUrlR('SalesconfirmationOrder',item)">{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}</el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1"
@click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}} @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">{{$t('Operation.Op_xiajia')}} <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$t('Operation.Op_xiajia')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">{{$t('Operation.Op_jietuan')}} <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2)">
{{$t('Operation.Op_jietuan')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">{{$t('visaT.sale')}} <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1)">{{$t('visaT.sale')}}
</el-dropdown-item> </el-dropdown-item>
...@@ -515,10 +530,13 @@ ...@@ -515,10 +530,13 @@
@click.native="goB2B(item.ConfigId, item.TCID)"> @click.native="goB2B(item.ConfigId, item.TCID)">
{{$t('Operation.Op_b2bView')}} {{$t('Operation.Op_b2bView')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>{{$t('Operation.Op_salelianyun')}} <el-dropdown-item @click.native='goUrl("DistributionTransport",item.ID,"分销联运")'>
{{$t('Operation.Op_salelianyun')}}
</el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}
</el-dropdown-item>
<el-dropdown-item @click.native='ShowUploadWord(item)'>{{$t('Operation.Op_wordTrip')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native='ckSellPoint(item)'>{{$t('Operation.Op_bentuanMaidian')}}</el-dropdown-item>
<el-dropdown-item @click.native='ShowUploadWord(item)'>{{$t('Operation.Op_wordTrip')}}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
...@@ -542,7 +560,8 @@ ...@@ -542,7 +560,8 @@
<a v-if="item.HotelDiningBus.DiningChangeState>0" <a v-if="item.HotelDiningBus.DiningChangeState>0"
@click="goHotelDiningBus(item,item.HotelDiningBus,2)" @click="goHotelDiningBus(item,item.HotelDiningBus,2)"
style="color:blue;cursor:pointer">{{$t('sm.cantingbiangeng')}}</a> style="color:blue;cursor:pointer">{{$t('sm.cantingbiangeng')}}</a>
<a v-if="item.HotelDiningBus.ResultBusTypeStr!=''">{{$t('Operation.Op_carType')}}:{{item.HotelDiningBus.ResultBusTypeStr}}</a> <a
v-if="item.HotelDiningBus.ResultBusTypeStr!=''">{{$t('Operation.Op_carType')}}:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
</div> </div>
</div> </div>
</div> </div>
...@@ -550,8 +569,8 @@ ...@@ -550,8 +569,8 @@
</ul> </ul>
<div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div> <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
:total="queryMsg.total"></el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -559,10 +578,11 @@ ...@@ -559,10 +578,11 @@
<div class="combottomTitle">{{$t('Operation.Op_choicePlat')}}</div> <div class="combottomTitle">{{$t('Operation.Op_choicePlat')}}</div>
<span class="setPlatLeft">{{$t('Operation.Op_salesPlat')}}</span> <span class="setPlatLeft">{{$t('Operation.Op_salesPlat')}}</span>
<span> <span>
<el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">
style="margin-right:20px;">{{$t('system.table_chekAll')}}</el-checkbox> {{$t('system.table_chekAll')}}</el-checkbox>
<el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog"> <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
<el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">{{sales.Name}}</el-checkbox> <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name">
{{sales.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
<span> <span>
...@@ -624,9 +644,9 @@ ...@@ -624,9 +644,9 @@
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {
LookAllTeam:false,//查看所有团控 LookAllTeam: false, //查看所有团控
//查询数据列表 //查询数据列表
queryCommonData: { queryCommonData: {
//线路列表 //线路列表
...@@ -719,7 +739,7 @@ ...@@ -719,7 +739,7 @@
OnlyShowOverTeam: false, OnlyShowOverTeam: false,
TCState: [3], //去掉默认显示 TCState: [3], //去掉默认显示
GroupState: [1], GroupState: [1],
SalePlat: [1,2,3,4,5], SalePlat: [1, 2, 3, 4, 5],
UnionCityId: 0, UnionCityId: 0,
SaleBranchId: [], SaleBranchId: [],
total: 0, total: 0,
...@@ -784,18 +804,20 @@ ...@@ -784,18 +804,20 @@
this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name) this.downloadFileRename(item.FullUrl.replace(reg, ''), item.Name)
}, },
//翻页 //翻页
handleCurrentChange (val) { handleCurrentChange(val) {
this.queryMsg.pageIndex = val this.queryMsg.pageIndex = val
this.getControlList() this.getControlList()
}, },
//重新查询 //重新查询
resetPageIndex () { resetPageIndex() {
this.queryMsg.pageIndex = 1 this.queryMsg.pageIndex = 1
this.queryMsg.currentPage = 1 this.queryMsg.currentPage = 1
}, },
//获取线路列表 //获取线路列表
getLineList () { getLineList() {
this.apipost('line_post_GetList', {"LineDirection":3}, res => { this.apipost('line_post_GetList', {
"LineDirection": 3
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data this.queryCommonData.LineList = res.data.data
this.queryCommonData.PlaceList = [] this.queryCommonData.PlaceList = []
...@@ -804,7 +826,7 @@ ...@@ -804,7 +826,7 @@
}) })
}, },
//获取目的地列表 //获取目的地列表
getLinePlaceList () { getLinePlaceList() {
this.queryMsg.PlaceID = 0 this.queryMsg.PlaceID = 0
let msg = { let msg = {
lineID: this.queryMsg.LineId, lineID: this.queryMsg.LineId,
...@@ -817,7 +839,7 @@ ...@@ -817,7 +839,7 @@
}) })
}, },
//获取系列列表 //获取系列列表
getLineTeamList () { getLineTeamList() {
this.queryMsg.LineteamId = 0 this.queryMsg.LineteamId = 0
let msg = { let msg = {
lineID: this.queryMsg.LineId, lineID: this.queryMsg.LineId,
...@@ -831,13 +853,13 @@ ...@@ -831,13 +853,13 @@
}) })
}, },
//切换公司 //切换公司
getCompanyTab (Id) { getCompanyTab(Id) {
this.queryMsg.OutBranchId = Id this.queryMsg.OutBranchId = Id
this.queryMsg.currentPage = 1 this.queryMsg.currentPage = 1
this.getControlList() this.getControlList()
}, },
//获取航空公司 //获取航空公司
getAirlineList () { getAirlineList() {
this.apipost( this.apipost(
'airline_post_GetList', {}, 'airline_post_GetList', {},
res => { res => {
...@@ -845,12 +867,11 @@ ...@@ -845,12 +867,11 @@
this.queryCommonData.AirlineList = res.data.data this.queryCommonData.AirlineList = res.data.data
} }
}, },
err => { err => {}
}
) )
}, },
//根据当前员工所在部门获取该部门及子部门员工信息 //根据当前员工所在部门获取该部门及子部门员工信息
getEmployeeList () { getEmployeeList() {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
let msg = { let msg = {
GroupId: userInfo.RB_Group_id, GroupId: userInfo.RB_Group_id,
...@@ -866,13 +887,12 @@ ...@@ -866,13 +887,12 @@
this.queryCommonData.EmployeeList = res.data.data this.queryCommonData.EmployeeList = res.data.data
} }
}, },
err => { err => {}
}
) )
}, },
//新获取列表数据 //新获取列表数据
getControlList () { getControlList() {
var msg = JSON.parse(JSON.stringify(this.queryMsg)) var msg = JSON.parse(JSON.stringify(this.queryMsg))
if (msg.TeamMinNum == '') { if (msg.TeamMinNum == '') {
msg.TeamMinNum = -1 msg.TeamMinNum = -1
...@@ -916,13 +936,12 @@ ...@@ -916,13 +936,12 @@
}) })
} }
}, },
err => { err => {}
}
) )
}, },
//验证大小 //验证大小
checkTeamNum (queryMsg) { checkTeamNum(queryMsg) {
var TeamMinNum = parseInt(queryMsg.TeamMinNum) var TeamMinNum = parseInt(queryMsg.TeamMinNum)
var TeamMaxNum = parseInt(queryMsg.TeamMaxNum) var TeamMaxNum = parseInt(queryMsg.TeamMaxNum)
var ApplyMinNum = parseInt(queryMsg.ApplyMinNum) var ApplyMinNum = parseInt(queryMsg.ApplyMinNum)
...@@ -935,7 +954,7 @@ ...@@ -935,7 +954,7 @@
} }
}, },
//初始化公司 //初始化公司
getCompanyList () { getCompanyList() {
let userInfo = this.getLocalStorage() let userInfo = this.getLocalStorage()
var RB_Group_id = userInfo.RB_Group_id var RB_Group_id = userInfo.RB_Group_id
let msg = { let msg = {
...@@ -954,12 +973,11 @@ ...@@ -954,12 +973,11 @@
}) })
} }
}, },
err => { err => {}
}
) )
}, },
//团期状态全选 //团期状态全选
checkGroupAll (val) { checkGroupAll(val) {
this.queryMsg.GroupState = [] this.queryMsg.GroupState = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.teamDateStates.forEach(x => { this.$tripUtils.TeamStatesList.teamDateStates.forEach(x => {
...@@ -967,13 +985,13 @@ ...@@ -967,13 +985,13 @@
}) })
} }
}, },
checkGroup (value) { checkGroup(value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkGroupALL = this.queryCommonData.checkGroupALL =
checkedCount === this.$tripUtils.TeamStatesList.teamDateStates.length checkedCount === this.$tripUtils.TeamStatesList.teamDateStates.length
}, },
//销售平台全选 //销售平台全选
checkAllSales (val) { checkAllSales(val) {
this.queryMsg.SalePlat = [] this.queryMsg.SalePlat = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach(x => { this.$tripUtils.TeamStatesList.salsPlat.forEach(x => {
...@@ -981,13 +999,13 @@ ...@@ -981,13 +999,13 @@
}) })
} }
}, },
checkSales (value) { checkSales(value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkPlatForm = this.queryCommonData.checkPlatForm =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length
}, },
//团队状态全选 //团队状态全选
checkAllTeam (val) { checkAllTeam(val) {
this.queryMsg.TCState = [] this.queryMsg.TCState = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.TeamStates.forEach(x => { this.$tripUtils.TeamStatesList.TeamStates.forEach(x => {
...@@ -1004,7 +1022,7 @@ ...@@ -1004,7 +1022,7 @@
this.queryCommonData.showPlatForm = false this.queryCommonData.showPlatForm = false
} }
}, },
checkedTeamList (value) { checkedTeamList(value) {
if (value.indexOf(this.$tripUtils.TeamStatesList.TeamStates[2].Id) > -1) { if (value.indexOf(this.$tripUtils.TeamStatesList.TeamStates[2].Id) > -1) {
this.queryCommonData.showPlatForm = true this.queryCommonData.showPlatForm = true
} else { } else {
...@@ -1015,7 +1033,7 @@ ...@@ -1015,7 +1033,7 @@
checkedCount === this.$tripUtils.TeamStatesList.TeamStates.length checkedCount === this.$tripUtils.TeamStatesList.TeamStates.length
}, },
//全选弹出框 //全选弹出框
checkAllDialog (val) { checkAllDialog(val) {
this.queryCommonData.ckedplat = [] this.queryCommonData.ckedplat = []
if (val) { if (val) {
this.$tripUtils.TeamStatesList.salsPlat.forEach(x => { this.$tripUtils.TeamStatesList.salsPlat.forEach(x => {
...@@ -1023,13 +1041,13 @@ ...@@ -1023,13 +1041,13 @@
}) })
} }
}, },
checkDialog (value) { checkDialog(value) {
let checkedCount = value.length let checkedCount = value.length
this.queryCommonData.checkDialogAll = this.queryCommonData.checkDialogAll =
checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length checkedCount === this.$tripUtils.TeamStatesList.salsPlat.length
}, },
//点击上架 //点击上架
setUpPlat (item) { setUpPlat(item) {
this.queryCommonData.outerVisible = false this.queryCommonData.outerVisible = false
this.queryCommonData.setPlatDialog = true this.queryCommonData.setPlatDialog = true
this.queryCommonData.singleTCID = item.TCID this.queryCommonData.singleTCID = item.TCID
...@@ -1049,7 +1067,7 @@ ...@@ -1049,7 +1067,7 @@
} }
}, },
//单团设置下架 //单团设置下架
Setshelves (TCID) { Setshelves(TCID) {
let msg = { let msg = {
TCID: TCID, TCID: TCID,
TCState: 2, TCState: 2,
...@@ -1067,7 +1085,7 @@ ...@@ -1067,7 +1085,7 @@
}) })
}, },
//单团设置上架 //单团设置上架
SetshelvesUp () { SetshelvesUp() {
let msg = { let msg = {
TCID: this.queryCommonData.singleTCID, TCID: this.queryCommonData.singleTCID,
TCState: 3, TCState: 3,
...@@ -1088,7 +1106,7 @@ ...@@ -1088,7 +1106,7 @@
}) })
}, },
goUrl (path, id, name) { goUrl(path, id, name) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
name: path, name: path,
...@@ -1099,7 +1117,7 @@ ...@@ -1099,7 +1117,7 @@
} }
}) })
}, },
goUrlR (path, item) { goUrlR(path, item) {
var cityId = item.StartCityID var cityId = item.StartCityID
if (item.IsUnion == 1 && item.UnionTypeStr == 2) { if (item.IsUnion == 1 && item.UnionTypeStr == 2) {
cityId = item.UnionCityId cityId = item.UnionCityId
...@@ -1114,21 +1132,21 @@ ...@@ -1114,21 +1132,21 @@
vshowL: false, vshowL: false,
vshowM: false, vshowM: false,
vshowTCNUM: true, vshowTCNUM: true,
isClick:1,//不计算点击 isClick: 1, //不计算点击
} }
}) })
window.open(routeData.href, '_blank') window.open(routeData.href, '_blank')
}, },
//控制是否显示确认单按钮 //控制是否显示确认单按钮
showSureOrder (code,createBy) { showSureOrder(code, createBy) {
let UserInfo = this.getLocalStorage(); let UserInfo = this.getLocalStorage();
if(createBy == UserInfo.EmployeeId||UserInfo.ActionMenuCode.indexOf(code)!=-1){ if (createBy == UserInfo.EmployeeId || UserInfo.ActionMenuCode.indexOf(code) != -1) {
return true; return true;
}else{ } else {
return false; return false;
} }
}, },
goSureOrder (path, TCID) { goSureOrder(path, TCID) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -1138,7 +1156,7 @@ ...@@ -1138,7 +1156,7 @@
} }
}) })
}, },
goUrlMake (path, LineID, TCID, name) { goUrlMake(path, LineID, TCID, name) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -1149,11 +1167,11 @@ ...@@ -1149,11 +1167,11 @@
} }
}) })
}, },
goB2B (ConfigId, tcid) { goB2B(ConfigId, tcid) {
var B2BDomain = this.CurrentUserInfo.B2BDomain; var B2BDomain = this.CurrentUserInfo.B2BDomain;
this.$tripUtils.GotoB2BOneDayPage(B2BDomain,ConfigId,tcid); this.$tripUtils.GotoB2BOneDayPage(B2BDomain, ConfigId, tcid);
}, },
goTeamBalance (id, OutBranchId) { goTeamBalance(id, OutBranchId) {
this.$router.push({ this.$router.push({
name: 'TeamBalancePayment', name: 'TeamBalancePayment',
query: { query: {
...@@ -1166,7 +1184,7 @@ ...@@ -1166,7 +1184,7 @@
}) })
}, },
//开团或修改 //开团或修改
goToOpenTravel (path,configId, tcid) { goToOpenTravel(path, configId, tcid) {
if (configId > 0) { if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
...@@ -1186,7 +1204,7 @@ ...@@ -1186,7 +1204,7 @@
} }
}, },
//当团修改 //当团修改
goTonowTeam (path, configId, tcid, TCNUM) { goTonowTeam(path, configId, tcid, TCNUM) {
if (configId > 0) { if (configId > 0) {
this.$store.commit('pageConditionUpdate', this.queryMsg) this.$store.commit('pageConditionUpdate', this.queryMsg)
this.$router.push({ this.$router.push({
...@@ -1210,7 +1228,7 @@ ...@@ -1210,7 +1228,7 @@
}, },
//删除团期 //删除团期
removeTeamInfo (TCID) { removeTeamInfo(TCID) {
var that = this var that = this
that.Confirm(this.$t('tips.shifoushanchu'), function () { that.Confirm(this.$t('tips.shifoushanchu'), function () {
var msg = { var msg = {
...@@ -1232,14 +1250,14 @@ ...@@ -1232,14 +1250,14 @@
}) })
}, },
//获取城市 //获取城市
getCountryCity () { getCountryCity() {
this.apipost('sellorder_get_GetAllStartCity', {}, res => { this.apipost('sellorder_get_GetAllStartCity', {}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.CityList = res.data.data this.queryCommonData.CityList = res.data.data
} }
}) })
}, },
getSellorCompany () { getSellorCompany() {
//出团公司 //出团公司
this.apipost( this.apipost(
'sellorder_post_GetBranchList', {}, 'sellorder_post_GetBranchList', {},
...@@ -1248,12 +1266,11 @@ ...@@ -1248,12 +1266,11 @@
this.queryCommonData.companyList = res.data.data this.queryCommonData.companyList = res.data.data
} }
}, },
err => { err => {}
}
) )
}, },
//点击op备注 //点击op备注
ckOPremark (item) { ckOPremark(item) {
this.remarkMsg.TCID = item.TCID this.remarkMsg.TCID = item.TCID
this.remarkMsg.OPRemark = item.OPRemark this.remarkMsg.OPRemark = item.OPRemark
this.remarkMsg.OPInnerRemark = item.OPInnerRemark this.remarkMsg.OPInnerRemark = item.OPInnerRemark
...@@ -1261,7 +1278,7 @@ ...@@ -1261,7 +1278,7 @@
this.queryCommonData.outerVisible = true this.queryCommonData.outerVisible = true
}, },
//设置OP备注 //设置OP备注
setOPremark () { setOPremark() {
this.apipost( this.apipost(
'travel_post_SetTravelPrcieOpRemark', 'travel_post_SetTravelPrcieOpRemark',
this.remarkMsg, this.remarkMsg,
...@@ -1274,19 +1291,18 @@ ...@@ -1274,19 +1291,18 @@
this.Error(res.data.message) this.Error(res.data.message)
} }
}, },
err => { err => {}
}
) )
}, },
//点击本团卖点 //点击本团卖点
ckSellPoint (item) { ckSellPoint(item) {
this.queryCommonData.SellingPoints = true this.queryCommonData.SellingPoints = true
this.remarkMsg.ConfigId = item.ID this.remarkMsg.ConfigId = item.ID
this.remarkMsg.ProductRecommend = item.ProductRecommend this.remarkMsg.ProductRecommend = item.ProductRecommend
this.remarkMsg.TCID = item.TCID this.remarkMsg.TCID = item.TCID
}, },
//本团卖点 //本团卖点
SetSellingPoints () { SetSellingPoints() {
this.apipost( this.apipost(
'travel_post_SetSellingPoints', 'travel_post_SetSellingPoints',
this.remarkMsg, this.remarkMsg,
...@@ -1299,17 +1315,16 @@ ...@@ -1299,17 +1315,16 @@
this.Error(res.data.message) this.Error(res.data.message)
} }
}, },
err => { err => {}
}
) )
}, },
checkedFlight (item) { checkedFlight(item) {
this.queryMsg.FlightState = item.Id this.queryMsg.FlightState = item.Id
this.queryCommonData.flightCKed = [] this.queryCommonData.flightCKed = []
this.queryCommonData.flightCKed.push(item.Id) this.queryCommonData.flightCKed.push(item.Id)
}, },
//点击选取出团公司 //点击选取出团公司
getCompanyCheck (item) { getCompanyCheck(item) {
item.isShow = !item.isShow item.isShow = !item.isShow
this.queryCommonData.checkCompanyAll = false this.queryCommonData.checkCompanyAll = false
this.$forceUpdate() this.$forceUpdate()
...@@ -1331,7 +1346,7 @@ ...@@ -1331,7 +1346,7 @@
this.getControlList() this.getControlList()
}, },
//查询全部 //查询全部
getCompanyCheckAll () { getCompanyCheckAll() {
this.queryCommonData.checkCompanyAll = true this.queryCommonData.checkCompanyAll = true
this.queryMsg.OutBranchIds = [] this.queryMsg.OutBranchIds = []
this.queryCommonData.BranchList.forEach(x => { this.queryCommonData.BranchList.forEach(x => {
...@@ -1340,7 +1355,7 @@ ...@@ -1340,7 +1355,7 @@
this.getControlList() this.getControlList()
}, },
SetPrice (value) { SetPrice(value) {
if (value == null) { if (value == null) {
return 0.0 return 0.0
} }
...@@ -1357,7 +1372,7 @@ ...@@ -1357,7 +1372,7 @@
}, },
//隐藏显示 //隐藏显示
ShowUnionList (item) { ShowUnionList(item) {
// this.queryCommonData.showUnion = !this.queryCommonData.showUnion; // this.queryCommonData.showUnion = !this.queryCommonData.showUnion;
item.isshowUnion = !item.isshowUnion item.isshowUnion = !item.isshowUnion
if (item.isshowUnion) { if (item.isshowUnion) {
...@@ -1368,7 +1383,7 @@ ...@@ -1368,7 +1383,7 @@
this.$forceUpdate() this.$forceUpdate()
}, },
//酒店餐厅处理跳转 //酒店餐厅处理跳转
goHotelDiningBus (item, HotelDiningBus, type) { goHotelDiningBus(item, HotelDiningBus, type) {
if (type == 1) { if (type == 1) {
this.$router.push({ this.$router.push({
name: 'ChangeHotel', name: 'ChangeHotel',
...@@ -1392,12 +1407,12 @@ ...@@ -1392,12 +1407,12 @@
} }
}, },
//显示弹窗层 //显示弹窗层
ShowUploadWord (item) { ShowUploadWord(item) {
this.queryCommonData.UploadWORDTip = true this.queryCommonData.UploadWORDTip = true
this.queryCommonData.UploadItem = item this.queryCommonData.UploadItem = item
}, },
//保存WORD路劲 //保存WORD路劲
uploadFileBtn (file) { uploadFileBtn(file) {
var that = this var that = this
let newArr = [] let newArr = []
newArr.push(file.file) newArr.push(file.file)
...@@ -1422,8 +1437,7 @@ ...@@ -1422,8 +1437,7 @@
that.Error(res.data.message) that.Error(res.data.message)
} }
}, },
err => { err => {}
}
) )
} else { } else {
that.Error('上传文件失败!') that.Error('上传文件失败!')
...@@ -1431,7 +1445,7 @@ ...@@ -1431,7 +1445,7 @@
}) })
}, },
//结团/正常 //结团/正常
OutGroup (TCID, Status) { OutGroup(TCID, Status) {
let msg = { let msg = {
TCID: TCID, TCID: TCID,
Status: Status, Status: Status,
...@@ -1453,16 +1467,17 @@ ...@@ -1453,16 +1467,17 @@
this.CheckUserAuth(actionCode, res => { this.CheckUserAuth(actionCode, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { if (res.data.resultCode == 1 && res.data.data == 1) {
this.LookAllTeam = true; this.LookAllTeam = true;
this.queryMsg.OutBranchIds = [];
} }
}); });
}, },
}, },
filters: { filters: {
formatStartDate (value) { formatStartDate(value) {
let dataArr = value.split('-') let dataArr = value.split('-')
return dataArr[1] + '-' + dataArr[2] return dataArr[1] + '-' + dataArr[2]
}, },
priceFormat (value) { priceFormat(value) {
if (value == null) { if (value == null) {
return 0.0 return 0.0
} }
...@@ -1478,7 +1493,7 @@ ...@@ -1478,7 +1493,7 @@
return x1 + x2 return x1 + x2
} }
}, },
mounted () { mounted() {
//销售公司 //销售公司
this.getSellorCompany() this.getSellorCompany()
this.getCompanyList() this.getCompanyList()
...@@ -1487,7 +1502,7 @@ ...@@ -1487,7 +1502,7 @@
this.getEmployeeList() this.getEmployeeList()
this.getCountryCity() this.getCountryCity()
}, },
created () { created() {
this.GetLookAllTeamAuth(); this.GetLookAllTeamAuth();
//默认显示联运 //默认显示联运
this.queryMsg.IsShowUnion = 0; this.queryMsg.IsShowUnion = 0;
...@@ -1519,9 +1534,11 @@ ...@@ -1519,9 +1534,11 @@
if (!this.$route.query.tcmun) { if (!this.$route.query.tcmun) {
this.queryMsg.StartGroupDate = nowDate this.queryMsg.StartGroupDate = nowDate
} }
if (this.queryCommonData.IsParentCompany != 1&& this.LookAllTeam) { if (this.queryCommonData.IsParentCompany != 1) {
if (this.CurrentUserInfo.RB_Branch_id != 49) {
this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id) this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
} }
}
this.getControlList() this.getControlList()
} }
} }
......
src/plug/index.js
View file @ 01282b89
...@@ -114,7 +114,7 @@ export default { ...@@ -114,7 +114,7 @@ export default {
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
domainUrl = "http://127.0.0.1:8082"; domainUrl = "http://192.168.2.214:8082";
let locationName = window.location.hostname; let locationName = window.location.hostname;
let javaUrldo = ""; let javaUrldo = "";
...@@ -122,8 +122,6 @@ export default { ...@@ -122,8 +122,6 @@ export default {
if (locationName.indexOf('testerp.oytour') !== -1) { if (locationName.indexOf('testerp.oytour') !== -1) {
domainUrl = "http://testapi.oytour.com"; domainUrl = "http://testapi.oytour.com";
//domainUrl = "http://reborn.oytour.com";
//domainUrl = "http://127.0.0.1"
} else if (locationName.indexOf('oytour') !== -1) { } else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "http://reborn.oytour.com"; domainUrl = "http://reborn.oytour.com";
} }
......
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