Skip to content

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

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

parents 86cddaf7 86b3c02a
Show whitespace changes
Inline Side-by-side
Showing with 2071 additions and 1710 deletions
src/components/ScenicStrategyview.vue 0 → 100644
View file @ e2d3dc4e
<style>
.ScenicMainContant{
width:900px;
margin:auto;
height:auto;
color:#4F5A61;
}
.cardTitle{
width:900px;
margin:20px auto;
font-weight:500;
word-break: break-word;
font-size:44px;
}
.ScenicCoverImg{
margin-top:20px;
}
.ScenicCoverImg img{
width:100%;
}
.ScenicStrateg{
color:#4F5A61;
}
.ScenicStrateg img{
width:100%;
}
</style>
<template>
<div class="ScenicMainContant">
<div class="cardTitle">
{{dataList.Name}}
</div>
<div class="ScenicCoverImg" v-if="dataList.ImgCover">
<img :src="dataList.ImgCover" alt=""/>
</div>
<div class="ScenicStrateg" v-html="dataList.Content">
</div>
</div>
</template>
<script>
export default {
data() {
return {
msg:{
Id:0,
},
dataList:{}
};
},
mounted() {
this.msg.Id = this.$route.query.id;
this.getList();
},
filters: {
},
methods: {
getList(){
this.apipost(
"ScenicRecomment_Get_GetScenicRecommentService", this.msg,
res => {
if (res.data.resultCode == 1) {
console.log(res,'ressss')
this.dataList=res.data.data;
}
},
null
);
}
}
};
</script>
\ No newline at end of file
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ e2d3dc4e
<style> <style>
@import "../../../assets/css/newTravelManager.css"; @import "../../../assets/css/newTravelManager.css";
.TC_companyList span, .TC_companyList span,
.TC_OtherCompany span { .TC_OtherCompany span {
display: inline-block; display: inline-block;
font-size: 12px; font-size: 12px;
padding: 5px 10px; padding: 5px 10px;
...@@ -10,62 +10,62 @@ ...@@ -10,62 +10,62 @@
margin: 5px 10px 0 0; margin: 5px 10px 0 0;
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
} }
.TC_companyList span:first-child { .TC_companyList span:first-child {
margin-right: 20px; margin-right: 20px;
} }
.TC_companyList { .TC_companyList {
padding-top: 15px; padding-top: 15px;
margin-left: 32px; margin-left: 32px;
} }
.TC_checked { .TC_checked {
border: 1px solid #d95454 !important; border: 1px solid #d95454 !important;
box-sizing: border-box; box-sizing: border-box;
} }
.TC_OtherCompany { .TC_OtherCompany {
margin: 0 0 20px 20px; margin: 0 0 20px 20px;
} }
.TC_customerInfo tbody th { .TC_customerInfo tbody th {
height: 40px; height: 40px;
text-align: center; text-align: center;
} }
.TC_firTable td { .TC_firTable td {
height: 20px !important; height: 20px !important;
text-align: center !important; text-align: center !important;
} }
.TC_midTable td { .TC_midTable td {
text-align: center !important; text-align: center !important;
} }
.TC_showUnion { .TC_showUnion {
float: right; float: right;
color: #2aaef2; color: #2aaef2;
cursor: pointer; cursor: pointer;
margin-bottom: 10px; margin-bottom: 10px;
} }
.go_date { .go_date {
font-weight: 700; font-weight: 700;
font-size: 14px; font-size: 14px;
} }
.TC_Content ._pic_upload .el-upload-dragger { .TC_Content ._pic_upload .el-upload-dragger {
font-size: 28px; font-size: 28px;
color: #8c939d; color: #8c939d;
width: 126px; width: 126px;
height: 80px; height: 80px;
line-height: 41px; line-height: 41px;
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;
...@@ -76,25 +76,25 @@ ...@@ -76,25 +76,25 @@
padding: 5px; padding: 5px;
margin-right: 10px; margin-right: 10px;
position: relative; position: relative;
} }
.TC_Content .avatar-uploader-icon { .TC_Content .avatar-uploader-icon {
height: auto; height: auto;
} }
.TC_HotelPop { .TC_HotelPop {
overflow: auto; overflow: auto;
max-height: 350px; max-height: 350px;
} }
.TC_HotelPop table td { .TC_HotelPop table td {
padding: 5px 0; padding: 5px 0;
text-align: center; text-align: center;
} }
.TC_HotelPop table th { .TC_HotelPop table th {
text-align: center; text-align: center;
} }
</style> </style>
<template> <template>
<div class="TC_Content"> <div class="TC_Content">
...@@ -102,25 +102,31 @@ ...@@ -102,25 +102,31 @@
<div class="query-box"> <div class="query-box">
<!--v-if="queryCommonData.IsParentCompany==1"--> <!--v-if="queryCommonData.IsParentCompany==1"-->
<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}"
<span v-for="(item,bindex) in queryCommonData.BranchList" :class="{'TC_checked':item.isShow}" @click="getCompanyCheck(item)" :key="bindex">{{item.BName}}</span> @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> </div>
<ul> <ul>
<li> <li>
<span> <span>
<em>{{$t('system.table_ssLine')}}</em> <em>{{$t('system.table_ssLine')}}</em>
<el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="getLinePlaceList()"> <el-select class="w150" v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLinePlaceList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID"></el-option> <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
:key="item.LineID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span> <span>
<em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em> <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
<el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()"> <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')"
@change="getLineTeamList()">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID" :key="item.LtID"></el-option> <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID"
:key="item.LtID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -129,27 +135,32 @@ ...@@ -129,27 +135,32 @@
<em>{{$t('active.ad_xlmc')}}</em> <em>{{$t('active.ad_xlmc')}}</em>
<el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" v-model="queryMsg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID"></el-option> <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID"
:key="item.LtID"></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<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" @keyup.native.enter="getControlList" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input maxlength="50" v-model="queryMsg.TCNUM" class="permiss-input w150"
@keyup.native.enter="getControlList" :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 maxlength="6" v-model="queryMsg.TCID" class="permiss-input w150" :placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')"></el-input> <el-input maxlength="6" v-model="queryMsg.TCID" class="permiss-input w150"
:placeholder="$t('pub.pleaseImport')" @keyup.native="checkInteger(queryMsg,'TCID')"></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" :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate" :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker> :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter" 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,10 +171,12 @@ ...@@ -160,10 +171,12 @@
<div class="TC_leftSearch"> <div class="TC_leftSearch">
<div> <div>
<span>{{$t('system.query_airCompanyName')}}</span> <span>{{$t('system.query_airCompanyName')}}</span>
<el-select v-model="queryMsg.AirTicketId" filterable :placeholder="$t('system.ph_buxian')" class="w150"> <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 :label="$t('system.ph_buxian')" :value="queryCommonData.SelectDefaultValue">
</el-option> </el-option>
<el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId" :label="item.AlName" :value="item.AirLineId"></el-option> <el-option v-for="item in queryCommonData.AirlineList" :key="item.AirLineId"
:label="item.AlName" :value="item.AirLineId"></el-option>
</el-select> </el-select>
</div> </div>
<div> <div>
...@@ -171,37 +184,47 @@ ...@@ -171,37 +184,47 @@
<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')" :value="queryCommonData.SelectDefaultValue"> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
</el-option> </el-option>
<el-option v-for="item in queryCommonData.EmployeeList" :label="item.EmName" :value="item.EmployeeId" :key="item.EmployeeId"></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>
</div> </div>
<div> <div>
<span>{{$t('visa.v_xcdays')}}</span> <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> <el-input maxlength="50" v-model="queryMsg.DayNum" @keyup.native="checkInteger(queryMsg,'DayNum')"
class="w150" :placeholder="$t('pub.pleaseImport')"></el-input>
</div> </div>
<div> <div>
<span>{{$t('visa.v_lycity')}}</span> <span>{{$t('visa.v_lycity')}}</span>
<el-select class="w150" filterable v-model="queryMsg.UnionCityId" :placeholder="$t('pub.pleaseSel')"> <el-select class="w150" filterable v-model="queryMsg.UnionCityId"
:placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue">
</el-option> </el-option>
<el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID" :key="item.ID"></el-option> <el-option v-for="item in queryCommonData.CityList" :label="item.Name" :value="item.ID"
:key="item.ID"></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<div class="TC_rightSearch"> <div class="TC_rightSearch">
<div> <div>
<span>{{$t('visa.v_teamnum')}}</span> <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 maxlength="50" class="w80" v-model="queryMsg.TeamMinNum"
@keyup.native="checkInteger(queryMsg,'TeamMinNum')" :placeholder="$t('pub.pleaseImport')">
</el-input> </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> <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>
<div> <div>
<span>{{$t('leader.leader_registraNum')}}</span> <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 maxlength="50" class="w80" v-model="queryMsg.ApplyMinNum"
@keyup.native="checkInteger(queryMsg,'ApplyMinNum')" :placeholder="$t('pub.pleaseImport')">
</el-input> </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> <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>
<div class="OnlyShowOverTeam"> <div class="OnlyShowOverTeam">
<span>{{$t('visa.v_zkbaochaotuan')}}</span> <span>{{$t('visa.v_zkbaochaotuan')}}</span>
...@@ -210,8 +233,10 @@ ...@@ -210,8 +233,10 @@
</div> </div>
<div> <div>
<span>{{$t('visa.v_salecompany')}}</span> <span>{{$t('visa.v_salecompany')}}</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}" v-model="queryMsg.SaleBranchId" multiple> <el-select class="w180 multiple_input" :class="{'SaleBranchList':queryMsg.SaleBranchId==''}"
<el-option v-for="item in queryCommonData.companyList" :key="item.id" :label="item.bName" :value="item.id"></el-option> 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> </el-select>
</div> </div>
</div> </div>
...@@ -222,7 +247,8 @@ ...@@ -222,7 +247,8 @@
<el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam"> <el-checkbox v-model="queryCommonData.checkTCStateAll" @change="checkAllTeam">
{{$t('system.table_chekAll')}}</el-checkbox> {{$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" :key="team.Name">{{team.Name}}</el-checkbox> <el-checkbox v-for="team in $tripUtils.TeamStatesList.TeamStates" :label="team.Id"
:key="team.Name">{{team.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -233,7 +259,8 @@ ...@@ -233,7 +259,8 @@
<el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales"> <el-checkbox v-model="queryCommonData.checkPlatForm" @change="checkAllSales">
{{$t('system.table_chekAll')}}</el-checkbox> {{$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" :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>
</div> </div>
...@@ -243,7 +270,8 @@ ...@@ -243,7 +270,8 @@
<el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll"> <el-checkbox v-model="queryCommonData.checkGroupALL" @change="checkGroupAll">
{{$t('system.table_chekAll')}}</el-checkbox> {{$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" :key="state.Name">{{state.Name}}</el-checkbox> <el-checkbox v-for="state in $tripUtils.TeamStatesList.teamDateStates" :label="state.Id"
:key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<el-checkbox v-model="queryMsg.IsWarning">{{$t('Operation.Op_WarningTeam')}}</el-checkbox> <el-checkbox v-model="queryMsg.IsWarning">{{$t('Operation.Op_WarningTeam')}}</el-checkbox>
</span> </span>
...@@ -252,7 +280,8 @@ ...@@ -252,7 +280,8 @@
<span>{{$t('visa.v_hbstatus')}}</span> <span>{{$t('visa.v_hbstatus')}}</span>
<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" @change="checkedFlight(state)" :key="state.Name">{{state.Name}}</el-checkbox> <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> </el-checkbox-group>
</span> </span>
</div> </div>
...@@ -260,11 +289,13 @@ ...@@ -260,11 +289,13 @@
<span>{{$t('Operation.Op_TransportState')}}</span> <span>{{$t('Operation.Op_TransportState')}}</span>
<span> <span>
<el-checkbox-group v-model="queryCommonData.IsUnionCked" style="margin-left:0;"> <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 v-for="state in unionStatus" :label="state.Id" :checked="state.Checked"
@change="checkedUnion(state)" :key="state.Name">{{state.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</div> </div>
<button class="normalBtn TC_SearchBtn" @click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}} <button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showHigradeSearch=false">{{$t('pub.searchBtn')}}
</button> </button>
</div> </div>
<span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}} <span class="advancedQuery" slot="reference">{{$t('visa.v_gjchaxun')}}
...@@ -279,8 +310,10 @@ ...@@ -279,8 +310,10 @@
<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
<el-select v-model="queryMsg.WarningQuery" filterable :placeholder="$t('system.ph_buxian')" class="w150"> 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('system.ph_buxian')" value="-1"></el-option>
<el-option :label="$t('sm.nobodybaoming')" 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.tenpx')" value="2"></el-option>
...@@ -290,8 +323,10 @@ ...@@ -290,8 +323,10 @@
</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
<el-select v-model="queryMsg.RateOnDay" filterable :placeholder="$t('system.ph_buxian')" class="w150"> 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('system.ph_buxian')" value="-1"></el-option>
<el-option :label="$t('sm.tendayYiNei')" 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.FitydayYiNei')" value="2"></el-option>
...@@ -300,8 +335,10 @@ ...@@ -300,8 +335,10 @@
</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
<el-select v-model="queryMsg.RateOn" filterable :placeholder="$t('system.ph_buxian')" class="w150"> 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="$t('system.ph_buxian')" value="-1"></el-option>
<el-option label="100%" 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.buzue')" value="2"></el-option>
...@@ -311,7 +348,8 @@ ...@@ -311,7 +348,8 @@
</div> </div>
</div> </div>
</div> </div>
<button class="normalBtn TC_SearchBtn" @click="resetPageIndex(),getControlList(),queryCommonData.showWarningSearch=false">{{$t('pub.searchBtn')}} <button class="normalBtn TC_SearchBtn"
@click="resetPageIndex(),getControlList(),queryCommonData.showWarningSearch=false">{{$t('pub.searchBtn')}}
</button> </button>
</div> </div>
<span class="advancedQuery" slot="reference">{{$t('Operation.Op_warningSearch')}} <span class="advancedQuery" slot="reference">{{$t('Operation.Op_warningSearch')}}
...@@ -327,13 +365,17 @@ ...@@ -327,13 +365,17 @@
<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" layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"> <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
</el-pagination> </el-pagination>
<li v-for="(item,index) in queryCommonData.dataList" :key="index" :class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}"> <li v-for="(item,index) in queryCommonData.dataList" :key="index"
:class="{'TC_hasContent':item.OPInnerRemark==''&&item.OPRemark==''}">
<div class="TC_remarkContent TC_teamName"> <div class="TC_remarkContent TC_teamName">
<div class="clearfix"> <div class="clearfix">
<div class="TCL_remarkTitle" style="width:105px;"> <div class="TCL_remarkTitle" style="width:105px;">
<span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;" v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span> <span style="font-weight: 100;text-decoration:underline;cursor:pointer;color: #e95252;"
v-if="item.ScoreNum >= 0"
@click='goInvetig("investigationList", item.TCID, 0)'>(评分{{item.ScoreNum}})</span>
{{$t('Operation.Op_TeamName')}}：</div> {{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content" style="width:90%">{{item.Title}}</div> <div class="TCL_Content" style="width:90%">{{item.Title}}</div>
</div> </div>
...@@ -349,7 +391,8 @@ ...@@ -349,7 +391,8 @@
<div> <div>
<div class="TC_teamType"> <div class="TC_teamType">
<span v-if="item.IsB2B==0" title="内部团">{{$t('Operation.Op_nei')}}</span> <span v-if="item.IsB2B==0" title="内部团">{{$t('Operation.Op_nei')}}</span>
<span v-if="item.IsUnion==1&&item.UnionTypeStr==1" title="主" class="MainTeam">{{$t('Operation.Op_zhu')}}</span> <span v-if="item.IsUnion==1&&item.UnionTypeStr==1" title="主"
class="MainTeam">{{$t('Operation.Op_zhu')}}</span>
<span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">{{$t('Operation.Op_lian')}}</span> <span v-if="item.IsUnion==1&&item.UnionTypeStr==2" title="联">{{$t('Operation.Op_lian')}}</span>
<span v-if="item.Status==2" title="结团">{{$t('Operation.Op_jietuan')}}</span> <span v-if="item.Status==2" title="结团">{{$t('Operation.Op_jietuan')}}</span>
<span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span> <span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
...@@ -365,7 +408,9 @@ ...@@ -365,7 +408,9 @@
<p class="d12p">{{item.LtName}}</p> <p class="d12p">{{item.LtName}}</p>
</div> </div>
<div class="TC_TravelSalePlat clearfix"> <div class="TC_TravelSalePlat clearfix">
<span class="TC_neibu" v-if="item.TCState==3" :class="{'TCneibu':plat==3,'TCb2b':plat==1,'TCb2c':plat==2,'AppPlat':plat==4,'otherPlat':plat==5}" v-for="plat in item.SalePlatList" :key="plat.subCode">{{$tripUtils.getPlatName(plat)}}</span> <span class="TC_neibu" v-if="item.TCState==3"
:class="{'TCneibu':plat==3,'TCb2b':plat==1,'TCb2c':plat==2,'AppPlat':plat==4,'otherPlat':plat==5}"
v-for="plat in item.SalePlatList" :key="plat.subCode">{{$tripUtils.getPlatName(plat)}}</span>
<span class="TC_xiajia daiwanshan" v-if="item.TCState==1">{{$t('visa.v_dwanshan')}}</span> <span class="TC_xiajia daiwanshan" v-if="item.TCState==1">{{$t('visa.v_dwanshan')}}</span>
<span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span> <span class="TC_xiajia" v-if="item.TCState==2">{{$t('visa.v_yxiajia')}}</span>
<span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span> <span class="TC_xiajia quxiao" v-if="item.TCState==4">{{$t('hotel.hotel_HasBeenCancelled')}}</span>
...@@ -390,7 +435,8 @@ ...@@ -390,7 +435,8 @@
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span> <span v-if="fIndex==0">{{$t('Airticket.Air_go')}}</span>
<span v-else-if="fIndex==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span> <span v-else-if="fIndex==item.flightList.length-1">{{$t('Airticket.Air_returnTrip')}}</span>
<span v-else-if="fIndex>0 && fIndex!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span> <span
v-else-if="fIndex>0 && fIndex!=item.flightList.length-1">{{$t('Airticket.Air_transit')}}</span>
</td> </td>
<td> <td>
<div>{{fItem.Flight_number}}</div> <div>{{fItem.Flight_number}}</div>
...@@ -405,14 +451,18 @@ ...@@ -405,14 +451,18 @@
<div style="margin-top:5px;">({{fItem.AIATA}}){{fItem.aName}}</div> <div style="margin-top:5px;">({{fItem.AIATA}}){{fItem.aName}}</div>
</td> </td>
<td> <td>
<template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}</td> <template v-if="fItem.StopoverIATA">({{fItem.StopoverIATA}})</template>{{fItem.StopoverName}}
</td>
</tr> </tr>
</table> </table>
<div class="FlightDiv-TCL" slot="reference"> <div class="FlightDiv-TCL" slot="reference">
<div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode" class="TCL-flighInfoList"> <div v-for="subItem in item.flightList" slot="reference" :key="subItem.subCode"
class="TCL-flighInfoList">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{subItem.Flight_number}}</span> <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
({{subItem.DIATA}}){{subItem.DepartureName}} {{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}} {{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}} ({{subItem.DIATA}}){{subItem.DepartureName}}
{{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
{{subItem.ArrivalCityName==''?'':'-('+subItem.AIATA+')'+subItem.ArrivalCityName}}
<span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span> <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
<span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span> <span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
</span> </span>
...@@ -442,10 +492,12 @@ ...@@ -442,10 +492,12 @@
{{item.OutBranchName}} {{item.OutBranchName}}
</p> </p>
<p class="travelnowrap" v-if="item.WordPath!=''"> <p class="travelnowrap" v-if="item.WordPath!=''">
<a style="cursor:pointer;" :href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a> <a style="cursor:pointer;"
:href="domainManager().ViittoFileUrl+item.WordPath">{{$t('Operation.Op_downLoadword')}}</a>
</p> </p>
<p class="travelnowrap" v-if="item.FenFangUrl!=''"> <p class="travelnowrap" v-if="item.FenFangUrl!=''">
<a style="cursor:pointer;color:blue;" title="点击下载已上传的分房表文件" v-if="item.FenFangUrl && item.FenFangUrl!=''" :href="item.FenFangUrl">{{$t('op.FFBDowmLoad')}}</a> <a style="cursor:pointer;color:blue;" title="点击下载已上传的分房表文件"
v-if="item.FenFangUrl && item.FenFangUrl!=''" :href="item.FenFangUrl">{{$t('op.FFBDowmLoad')}}</a>
</p> </p>
<p class="travelnowrap" v-if="item.ClearOrderHour>0"> <p class="travelnowrap" v-if="item.ClearOrderHour>0">
<span>{{$t('salesModule.THQW')}}</span> <span>{{$t('salesModule.THQW')}}</span>
...@@ -457,10 +509,14 @@ ...@@ -457,10 +509,14 @@
</p> </p>
<p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 "> <p v-if="item.LineID==14 && item.HotelOrderListReports && item.HotelOrderListReports.length>0 ">
<el-popover width="980" trigger="click" popper-class="TC_HotelPop"> <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>
<div slot="reference"> <div slot="reference">
<span class="price" style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</span> <span class="price"
<span style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</span> style="cursor:pointer;text-decoration:underline;">{{$t('salesModule.HotelOrder')}}</span>
<span
style="color: #e95252">op{{item.OpSureHouse==2 ? '已确认' : '未确认'}}{{$t('op.Fenfang')}}</span>
</div> </div>
</el-popover> </el-popover>
</p> </p>
...@@ -593,7 +649,8 @@ ...@@ -593,7 +649,8 @@
<span>{{$t('visa.v_yibaoru')}}</span> <span>{{$t('visa.v_yibaoru')}}</span>
<i> <i>
{{item.OrderGuestNum}} {{item.OrderGuestNum}}
<span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}} <span class="TCL-redType"
v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
</i> </i>
</p> </p>
<p v-if="item.SingleDMNum>0"> <p v-if="item.SingleDMNum>0">
...@@ -606,7 +663,8 @@ ...@@ -606,7 +663,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('Operation.Op_people')}}）</span> <span v-if="item.IsSubstitution==1"
class="TCL-greenType">{{$t('visa.v_yxhoubu')}}（{{$t('visa.v_houbu')}}{{item.HBNum}}{{$t('Operation.Op_people')}}）</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>
<p> <p>
...@@ -636,13 +694,14 @@ ...@@ -636,13 +694,14 @@
<div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_firstClass')}}：{{item.FSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_businessClass')}}：{{item.CSeat}}</div>
<div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div> <div class="TC_SeatList">{{$t('Airticket.Air_EconomyClass')}}：{{item.YSeat}}</div>
<div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}: {{item.BindNum}}</div> <div class="TC_SeatList" v-if="item.BindNum>0" style="color:red;">{{$t('Operation.Op_bindNum')}}:
{{item.BindNum}}</div>
<div class="TC_SeatList" v-if="item.TicketNum>0 && item.TicketList"> <div class="TC_SeatList" v-if="item.TicketNum>0 && item.TicketList">
<el-popover width="440" trigger="click" popper-class="TC_customerInfo"> <el-popover width="550" trigger="click">
<table width="440" border="0" cellspacing="0" cellpadding="0"> <table width="100%" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th width="70" style="text-align:center;">{{$t('Operation.Op_bindNum')}}</th> <th width="90" style="text-align:center;">{{$t('Operation.Op_bindNum')}}</th>
<th width="70" style="text-align:center;">{{$t('op.TicketNum')}}</th> <th width="90" style="text-align:center;">{{$t('op.TicketNum')}}</th>
<th width="70" style="text-align:center;">{{$t('Operation.Op_price')}}</th> <th width="70" style="text-align:center;">{{$t('Operation.Op_price')}}</th>
<th width="70" style="text-align:center;">同业价</th> <th width="70" style="text-align:center;">同业价</th>
<th width="70" style="text-align:center;">直客价</th> <th width="70" style="text-align:center;">直客价</th>
...@@ -661,7 +720,9 @@ ...@@ -661,7 +720,9 @@
<td style="text-align:center;">{{subItem.TicketCreateByName}}</td> <td style="text-align:center;">{{subItem.TicketCreateByName}}</td>
</tr> </tr>
</table> </table>
<span slot="reference" title="点击查看详情" class="price" style="cursor:pointer;color:red;text-decoration: underline;">{{$t('op.FlightToNum')}}: {{item.TicketNum}}</span> <span slot="reference" title="点击查看详情" class="price"
style="cursor:pointer;color:red;text-decoration: underline;">{{$t('op.FlightToNum')}}:
{{item.TicketNum}}</span>
</el-popover> </el-popover>
</div> </div>
<div class="TC_SeatList"> <div class="TC_SeatList">
...@@ -669,7 +730,8 @@ ...@@ -669,7 +730,8 @@
<span style="color:rgb(71, 191, 140)">可售散客机票&nbsp; <span style="color:rgb(71, 191, 140)">可售散客机票&nbsp;
<span style="color:red;font-size:14px;font-weight:700;">{{item.CanSellTicketNum}}</span>&nbsp;张 <span style="color:red;font-size:14px;font-weight:700;">{{item.CanSellTicketNum}}</span>&nbsp;张
</span>&nbsp;&nbsp; </span>&nbsp;&nbsp;
<a @click="closeAirticket(item.TCID)" title="点击关闭可售机票" style="cursor:pointer;color:red;text-decoration: underline;">关闭</a> <a @click="closeAirticket(item.TCID)" title="点击关闭可售机票"
style="cursor:pointer;color:red;text-decoration: underline;">关闭</a>
</template> </template>
<template v-if="item.CanSellTicketNum==0"> <template v-if="item.CanSellTicketNum==0">
<span style="color:red;">已关闭散客机票</span>&nbsp;&nbsp; <span style="color:red;">已关闭散客机票</span>&nbsp;&nbsp;
...@@ -680,7 +742,9 @@ ...@@ -680,7 +742,9 @@
可售机票数量: 可售机票数量:
</td> </td>
<td style="text-align:left;height:30px;line-height:30px;"> <td style="text-align:left;height:30px;line-height:30px;">
<el-input type="text" style="width:100px;padding-left:5px;" v-model="updateAirticketObj.CanSellTicketNum" maxlength="1" @keyup.native="checkInteger(updateAirticketObj,'CanSellTicketNum')"></el-input> <el-input type="text" style="width:100px;padding-left:5px;"
v-model="updateAirticketObj.CanSellTicketNum" maxlength="1"
@keyup.native="checkInteger(updateAirticketObj,'CanSellTicketNum')"></el-input>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -693,10 +757,65 @@ ...@@ -693,10 +757,65 @@
</td> </td>
</tr> </tr>
</table> </table>
<a slot="reference" title="点击开启可售机票" @click="clickAirticket(item)" style="cursor:pointer;color:rgb(71, 191, 140);text-decoration: underline;">开启</a> <a slot="reference" title="点击开启可售机票" @click="clickAirticket(item)"
style="cursor:pointer;color:rgb(71, 191, 140);text-decoration: underline;">开启</a>
</el-popover> </el-popover>
</template> </template>
</div> </div>
<div class="TC_SeatList">
<el-popover width="500" trigger="click">
<table>
<tr>
<td colspan="4" style="text-align:center;height:40px;">
报价单 <template v-if="item.Config_OfferId>0">
<a style="cursor:pointer;color:red;text-decoration: underline;"
@click="gotoOffer(item)">查看报价单</a>
</template>
</td>
</tr>
<tr>
<td style="width:70px;text-align:center;">
日期:
</td>
<td colspan="2">
<el-date-picker class="w150" type="date" v-model="offerQMsg.QStartDate"
:picker-options="offerBeginDateBefore" value-format="yyyy-MM-dd" placeholder>
</el-date-picker>
<el-date-picker class="w150" type="date" v-model="offerQMsg.QEndDate"
:picker-options="offerBeginDateAfter" value-format="yyyy-MM-dd" placeholder>
</el-date-picker>
</td>
<td>
<input type="button" class="normalBtn" value="查询" @click="getOfferQuery(item.CreateBy)">
</td>
</tr>
</table>
<table class="singeRowTable" style="margin-top:20px;">
<tr v-for="oItem in offerDataList ">
<td>
<input type="checkbox" v-model="oItem.IsCheck" @click="clickOfferItem(oItem)" />
</td>
<td>
{{oItem.LineName}}<br />
{{oItem.LtName}}
</td>
<td>
{{oItem.CustomerName}}
</td>
<td>
{{oItem.CreateByName}}/{{oItem.CreateTimeStr}}
</td>
</tr>
<tr v-if="offerDataList.length>0">
<td colspan="4" style="text-align:center;">
<input type="button" class="normalBtn" value="保存" @click="saveOffer(item)" />
</td>
</tr>
</table>
<a slot="reference" title="报价单"
style="cursor:pointer;color:rgb(71, 191, 140);text-decoration: underline;display:none;">报价单</a>
</el-popover>
</div>
</div> </div>
</div> </div>
<div class="el-col" style="width:200px;"> <div class="el-col" style="width:200px;">
...@@ -738,7 +857,8 @@ ...@@ -738,7 +857,8 @@
<span>{{$t('visa.v_visaInformation')}}</span> <span>{{$t('visa.v_visaInformation')}}</span>
</p> </p>
<p v-if="item.VisaFileList.length!==0" v-for="(item2, index2) in item.VisaFileList" :key="index2"> <p v-if="item.VisaFileList.length!==0" v-for="(item2, index2) in item.VisaFileList" :key="index2">
<span style="cursor:pointer;text-decoration: underline;" @click="downloadFile(item2)">{{item2.Name}}</span> <span style="cursor:pointer;text-decoration: underline;"
@click="downloadFile(item2)">{{item2.Name}}</span>
</p> </p>
<p> <p>
<span>{{$t('visa.v_gvisa')}}</span> <span>{{$t('visa.v_gvisa')}}</span>
...@@ -764,29 +884,34 @@ ...@@ -764,29 +884,34 @@
</div> </div>
<div class="el-col"> <div class="el-col">
<div class="d7"> <div class="d7">
<el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary" style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}} <el-button @click.native='goUrl("RegistrationList", item.TCID,"报名清单")' type="primary"
style="background:#00C6FF; border-color:#00C6FF">{{$t('Operation.Op_registrationList')}}
</el-button> </el-button>
<el-dropdown trigger="click" style="margin-bottom:5px;" v-if="IsModifyTravelControl==1"> <el-dropdown trigger="click" style="margin-bottom:5px;" v-if="IsModifyTravelControl==1">
<span class="el-dropdown-link">{{$t('pub.updateMsg')}} <span class="el-dropdown-link">{{$t('pub.updateMsg')}}
<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 v-if="item.TeamType!=3" @click.native="goToOpenTravel('TravelManager2',item.ID,0)"> <el-dropdown-item v-if="item.TeamType!=3"
@click.native="goToOpenTravel('TravelManager2',item.ID,0)">
{{$t('Operation.Op_xilieModyfi')}} {{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-else @click.native="goToOpenTravel('TravelManager6',item.ID,0)"> <el-dropdown-item v-else @click.native="goToOpenTravel('TravelManager6',item.ID,0)">
{{$t('Operation.Op_xilieModyfi')}} {{$t('Operation.Op_xilieModyfi')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.TeamType!=3" @click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)"> <el-dropdown-item v-if="item.TeamType!=3"
@click.native="goTonowTeam('TravelManager2',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}} {{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-else @click.native="goTonowTeam('TravelManager6',item.ID,item.TCID,item.TCNUM)"> <el-dropdown-item v-else
@click.native="goTonowTeam('TravelManager6',item.ID,item.TCID,item.TCNUM)">
{{$t('Operation.Op_dangtuanModify')}} {{$t('Operation.Op_dangtuanModify')}}
</el-dropdown-item> </el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
<el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary" style="background:#67c23a; border-color:#67c23a"> <el-button @click='goUrlMake("GroupAdvertising",item.LineID,item.TCID,"团期广告")' type="primary"
style="background:#67c23a; border-color:#67c23a">
{{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}} {{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
</el-button> </el-button>
<el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C"> <el-button @click="ckOPremark(item)" type="primary" style="background:#F16C3C; border-color:#F16C3C">
...@@ -797,10 +922,12 @@ ...@@ -797,10 +922,12 @@
<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="SetGroupRecommendType(item,1)" v-if="item.b2b&&item.GroupRecommendType==0"> <el-dropdown-item @click.native="SetGroupRecommendType(item,1)"
v-if="item.b2b&&item.GroupRecommendType==0">
{{$t('op.Setjingpin')}} {{$t('op.Setjingpin')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="SetGroupRecommendType(item,0)" v-if="item.b2b&&item.GroupRecommendType==1"> <el-dropdown-item @click.native="SetGroupRecommendType(item,0)"
v-if="item.b2b&&item.GroupRecommendType==1">
{{$t('op.CancelSetjp')}} {{$t('op.CancelSetjp')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)"> <el-dropdown-item @click.native="goTeamBalance(item.TCID,item.OutBranchId)">
...@@ -810,7 +937,8 @@ ...@@ -810,7 +937,8 @@
{{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item> {{$t('Operation.Op_tripDownLoad')}}</el-dropdown-item>
<el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}} <el-dropdown-item @click.native="removeTeamInfo(item.TCID)">{{$t('system.table_delete')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1" @click.native="setUpPlat(item)">{{$t('Operation.Op_shangjia')}} <el-dropdown-item v-if="item.TCState==2||item.TCState==0||item.TCState==1"
@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)"> <el-dropdown-item v-if="item.TCState==3" @click.native="Setshelves(item.TCID)">
{{$t('Operation.Op_xiajia')}} {{$t('Operation.Op_xiajia')}}
...@@ -824,13 +952,16 @@ ...@@ -824,13 +952,16 @@
</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>
<el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)" @click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">{{$t('Operation.Op_shouruDan')}} <el-dropdown-item v-if="item.Status==2&&showSureOrder('P_Query_Income_ConfirmInfo',item.CreateBy)"
@click.native="goSureOrder('priceIncomeConfirmInfo',item.TCID)">{{$t('Operation.Op_shouruDan')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''" @click.native="goB2B(item.ConfigId, item.TCID , 1)"> <el-dropdown-item v-if="CurrentUserInfo.B2BDomain!=''"
@click.native="goB2B(item.ConfigId, item.TCID , 1)">
{{$t('Operation.Op_b2bView')}} {{$t('Operation.Op_b2bView')}}
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 2)" v-if="item.LineID!=2&&item.LineID!=8"> <el-dropdown-item @click.native="goB2B(item.ConfigId, item.TCID , 2)"
v-if="item.LineID!=2&&item.LineID!=8">
直客版预览 直客版预览
</el-dropdown-item> </el-dropdown-item>
...@@ -845,7 +976,8 @@ ...@@ -845,7 +976,8 @@
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>{{$t('op.LookPassengerSurvey')}} <div v-if="item.ScoreNum >= 0" @click='goInvetig("investigationList", item.TCID, 0)'>
{{$t('op.LookPassengerSurvey')}}
</div> </div>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
...@@ -872,19 +1004,25 @@ ...@@ -872,19 +1004,25 @@
<div class="TCL_remarkTitle">{{$t('op.DJBZTH')}}：</div> <div class="TCL_remarkTitle">{{$t('op.DJBZTH')}}：</div>
<div class="TCL_Content">{{item.DMCNum}}</div> <div class="TCL_Content">{{item.DMCNum}}</div>
</div> </div>
<div class="clearfix TCL-redType" v-if="(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' "> <div class="clearfix TCL-redType"
v-if="(item.DmcRemarkLast&&item.DmcRemarkLast.DMCRemark!='') || item.HotelDiningBus.HotelChangeState>0 || item.HotelDiningBus.DiningChangeState>0 || item.HotelDiningBus.ResultBusTypeStr!='' ">
<div class="TCL_remarkTitle">{{$t('Operation.Op_dijieRemark')}}：</div> <div class="TCL_remarkTitle">{{$t('Operation.Op_dijieRemark')}}：</div>
<div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}} <div class="TCL_Content">{{item.DmcRemarkLast!=null? item.DmcRemarkLast.DMCRemark:''}}
<a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)" style="color:blue;cursor:pointer">{{$t('Operation.Op_HotelChange')}}</a> <a v-if="item.HotelDiningBus.HotelChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,1)"
<a v-if="item.HotelDiningBus.DiningChangeState>0" @click="goHotelDiningBus(item,item.HotelDiningBus,2)" style="color:blue;cursor:pointer">{{$t('Operation.Op_HotelChange')}}</a> style="color:blue;cursor:pointer">{{$t('Operation.Op_HotelChange')}}</a>
<a v-if="item.HotelDiningBus.ResultBusTypeStr!=''">{{$t('Operation.Op_carType')}}:{{item.HotelDiningBus.ResultBusTypeStr}}</a> <a v-if="item.HotelDiningBus.DiningChangeState>0"
@click="goHotelDiningBus(item,item.HotelDiningBus,2)"
style="color:blue;cursor:pointer">{{$t('Operation.Op_HotelChange')}}</a>
<a
v-if="item.HotelDiningBus.ResultBusTypeStr!=''">{{$t('Operation.Op_carType')}}:{{item.HotelDiningBus.ResultBusTypeStr}}</a>
</div> </div>
</div> </div>
</div> </div>
</li> </li>
</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" layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"> <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
...@@ -938,16 +1076,19 @@ ...@@ -938,16 +1076,19 @@
<button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" type="primary" @click="SetSellingPoints">{{$t('pub.sureBtn')}}</button>
</div> </div>
</div> </div>
<div class="combottomDiv OPremarkDiv" v-if="queryCommonData.UploadWORDTip" v-loading="queryCommonData.uploadLoading"> <div class="combottomDiv OPremarkDiv" v-if="queryCommonData.UploadWORDTip"
v-loading="queryCommonData.uploadLoading">
<div class="combottomTitle"> <div class="combottomTitle">
<template v-if="queryCommonData.UploadItem.Type==1"> {{$t('Operation.Op_scTrip')}}</template> <template v-if="queryCommonData.UploadItem.Type==1"> {{$t('Operation.Op_scTrip')}}</template>
<template v-else> {{$t('op.UploadFFB')}}</template> <template v-else> {{$t('op.UploadFFB')}}</template>
<button style="float:right;margin-right:100px;" class="hollowFixedBtn" type="primary" @click="queryCommonData.UploadWORDTip = false">{{$t('pub.cancelBtn')}} <button style="float:right;margin-right:100px;" class="hollowFixedBtn" type="primary"
@click="queryCommonData.UploadWORDTip = false">{{$t('pub.cancelBtn')}}
</button> </button>
</div> </div>
<el-form label-width="100px"> <el-form label-width="100px">
<el-col :span="8" class="_pic_upload"> <el-col :span="8" class="_pic_upload">
<el-upload :http-request="uploadFileBtn" drag :multiple="true" :show-file-list="false" action="" accept="*.doc,*.docx"> <el-upload :http-request="uploadFileBtn" drag :multiple="true" :show-file-list="false" action=""
accept="*.doc,*.docx">
<i class="el-icon-plus avatar-uploader-icon"></i> <i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t('active.ld_djscwj')}}</div> <div class="el-upload__text">{{$t('active.ld_djscwj')}}</div>
</el-upload> </el-upload>
...@@ -957,11 +1098,11 @@ ...@@ -957,11 +1098,11 @@
</div> </div>
</template> </template>
<script> <script>
import commonHotelInfo from "../../commonPage/commonHotelInfo.vue"; import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
export default { export default {
provide(){ provide() {
return{ return {
reload:this.reload reload: this.reload
} }
}, },
data() { data() {
...@@ -1079,6 +1220,13 @@ export default { ...@@ -1079,6 +1220,13 @@ export default {
HotelId: 0, //酒店编号 HotelId: 0, //酒店编号
HotelUseTime: "" //酒店使用时间 HotelUseTime: "" //酒店使用时间
}, },
//报价单查询条件
offerQMsg: {
CreateBy: 0, //报价单创建人
QStartDate: "", //报价单开始时间
QEndDate: "", //报价单结束时间
},
offerDataList: [], //报价单列表
remarkMsg: { remarkMsg: {
TCID: 0, TCID: 0,
OPRemark: "", OPRemark: "",
...@@ -1088,8 +1236,7 @@ export default { ...@@ -1088,8 +1236,7 @@ export default {
//本团卖点 //本团卖点
ProductRecommend: "" ProductRecommend: ""
}, },
flightStatus: [ flightStatus: [{
{
Id: 0, Id: 0,
Name: "不限", Name: "不限",
Checked: true Checked: true
...@@ -1106,8 +1253,7 @@ export default { ...@@ -1106,8 +1253,7 @@ export default {
} }
], ],
//联运状态 //联运状态
unionStatus: [ unionStatus: [{
{
Id: -1, Id: -1,
Name: "全部", Name: "全部",
Checked: true Checked: true
...@@ -1137,7 +1283,10 @@ export default { ...@@ -1137,7 +1283,10 @@ export default {
colspanLength: 5 //跨行 colspanLength: 5 //跨行
}, },
//更新可售机票数量 //更新可售机票数量
updateAirticketObj: { TCID: 0, CanSellTicketNum: 2 }, updateAirticketObj: {
TCID: 0,
CanSellTicketNum: 2
},
IsModifyTravelControl: 0, //分公司是否有修改团控权限 IsModifyTravelControl: 0, //分公司是否有修改团控权限
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
...@@ -1154,7 +1303,25 @@ export default { ...@@ -1154,7 +1303,25 @@ export default {
let startTime = new Date(this.queryMsg.StartGroupDate); let startTime = new Date(this.queryMsg.StartGroupDate);
return startTime.getTime() >= time.getTime(); return startTime.getTime() >= time.getTime();
} }
},
//报价单列表
offerBeginDateBefore: {
disabledDate: time => {
if (this.offerQMsg.QEndDate == null) {
return false;
} else {
let endTime = new Date(this.offerQMsg.QEndDate);
return endTime.getTime() < time.getTime();
}
} }
},
offerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.offerQMsg.QStartDate);
return startTime.getTime() >= time.getTime();
}
},
}; };
}, },
components: { components: {
...@@ -1163,7 +1330,7 @@ export default { ...@@ -1163,7 +1330,7 @@ export default {
//监听器 //监听器
watch: { watch: {
// 方法1 // 方法1
'$route' (to, from) { //监听路由是否变化 '$route'(to, from) { //监听路由是否变化
location.reload() location.reload()
}, },
}, },
...@@ -1193,7 +1360,7 @@ export default { ...@@ -1193,7 +1360,7 @@ export default {
//关闭散客机票 //关闭散客机票
closeAirticket(TCID) { closeAirticket(TCID) {
var that = this; var that = this;
this.Confirm("是否要关闭可售机票?", function() { this.Confirm("是否要关闭可售机票?", function () {
var tempMsg = { var tempMsg = {
TCID: TCID, TCID: TCID,
CanSellTicketNum: 0 CanSellTicketNum: 0
...@@ -1214,7 +1381,7 @@ export default { ...@@ -1214,7 +1381,7 @@ export default {
}); });
}, },
// 跳转调查列表 // 跳转调查列表
goInvetig: function(path, tcid, orderId) { goInvetig: function (path, tcid, orderId) {
this.$router.push({ this.$router.push({
name: path, name: path,
query: { query: {
...@@ -1263,7 +1430,7 @@ export default { ...@@ -1263,7 +1430,7 @@ export default {
err => {} err => {}
); );
}, },
downloadFile: function(item) { downloadFile: function (item) {
let reg = /^http(s)?:\/\/(.*?)\//; let reg = /^http(s)?:\/\/(.*?)\//;
this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name); this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name);
}, },
...@@ -1289,8 +1456,7 @@ export default { ...@@ -1289,8 +1456,7 @@ export default {
//获取线路列表 //获取线路列表
getLineList() { getLineList() {
this.apipost( this.apipost(
"line_post_GetList", "line_post_GetList", {
{
LineDirection: 2 LineDirection: 2
}, },
res => { res => {
...@@ -1339,8 +1505,7 @@ export default { ...@@ -1339,8 +1505,7 @@ export default {
//获取航空公司 //获取航空公司
getAirlineList() { getAirlineList() {
this.apipost( this.apipost(
"airline_post_GetList", "airline_post_GetList", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.AirlineList = res.data.data; this.queryCommonData.AirlineList = res.data.data;
...@@ -1360,8 +1525,7 @@ export default { ...@@ -1360,8 +1525,7 @@ export default {
IsLeave: "0" IsLeave: "0"
}; };
this.apipost( this.apipost(
"admin_get_EmployeeGetList", "admin_get_EmployeeGetList", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.EmployeeList = res.data.data; this.queryCommonData.EmployeeList = res.data.data;
...@@ -1556,7 +1720,7 @@ export default { ...@@ -1556,7 +1720,7 @@ export default {
//单团酒店下架 //单团酒店下架
RemoveHotelJourneyOrder(TCID) { RemoveHotelJourneyOrder(TCID) {
var that = this; var that = this;
this.Confirm("是否要下架酒店?下架过后将释放酒店库存!", function() { this.Confirm("是否要下架酒店?下架过后将释放酒店库存!", function () {
let msg = { let msg = {
TCID: TCID TCID: TCID
}; };
...@@ -1679,7 +1843,7 @@ export default { ...@@ -1679,7 +1843,7 @@ export default {
}); });
}, },
goB2B(ConfigId, tcid, type) { goB2B(ConfigId, tcid, type) {
if(type==1){ if (type == 1) {
var B2BDomain = this.CurrentUserInfo.B2BDomain; var B2BDomain = this.CurrentUserInfo.B2BDomain;
window.open( window.open(
"http://www.oytour.com/#/detailTwo/" + "http://www.oytour.com/#/detailTwo/" +
...@@ -1689,12 +1853,12 @@ export default { ...@@ -1689,12 +1853,12 @@ export default {
"/preview", "/preview",
"_blank" "_blank"
); );
}else{ } else {
var B2BDomain = this.CurrentUserInfo.B2BDomain; var B2BDomain = this.CurrentUserInfo.B2BDomain;
window.open( window.open(
"http://www.oytour.com/#/newTrip" +'?ID='+encodeURIComponent(ConfigId) + "http://www.oytour.com/#/newTrip" + '?ID=' + encodeURIComponent(ConfigId) +
"&" + "&" +
'tcid='+tcid, 'tcid=' + tcid,
"_blank" "_blank"
); );
} }
...@@ -1757,7 +1921,7 @@ export default { ...@@ -1757,7 +1921,7 @@ export default {
//删除团期 //删除团期
removeTeamInfo(TCID) { removeTeamInfo(TCID) {
var that = this; var that = this;
that.Confirm("是否删除?", function() { that.Confirm("是否删除?", function () {
var msg = { var msg = {
TCID: TCID TCID: TCID
}; };
...@@ -1787,8 +1951,7 @@ export default { ...@@ -1787,8 +1951,7 @@ export default {
getSellorCompany() { getSellorCompany() {
//出团公司 //出团公司
this.apipost( this.apipost(
"sellorder_post_GetBranchList", "sellorder_post_GetBranchList", {},
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.companyList = res.data.data; this.queryCommonData.companyList = res.data.data;
...@@ -2043,6 +2206,61 @@ export default { ...@@ -2043,6 +2206,61 @@ export default {
"_" + "_" +
second second
); );
},
//报价单查询
getOfferQuery(createBy) {
this.offerQMsg.CreateBy = createBy;
this.offerQMsg.CreateBy = 0;
this.apipost("travel_get_GetOfferListExtService", this.offerQMsg, res => {
if (res.data.resultCode == 1) {
this.offerDataList = res.data.data;
} else {
this.Info(res.data.message);
}
});
},
//报价单选中
clickOfferItem(oItem) {
this.offerDataList.forEach(item => {
item.IsCheck = false;
});
oItem.IsCheck = true;
},
//保存报价单
saveOffer(item) {
var offerId = 0;
this.offerDataList.forEach(item => {
if (item.IsCheck) {
offerId = item.OfferId;
}
});
if (offerId > 0) {
var updateMsg = {
OfferId: offerId,
ConfigId: item.ID
};
this.apipost("travel_post_UpdateConfigOfferIdService", updateMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getControlList();
} else {
this.Info(res.data.message);
}
});
} else {
this.Info("请选择报价单!");
}
},
//跳转到报价单
gotoOffer(item) {
this.$router.push({
path: 'QuotationNewPrice',
query: {
offerid: item.Config_OfferId,
blank: 'y',
tab: '报价单'
}
});
} }
}, },
filters: { filters: {
...@@ -2148,5 +2366,6 @@ export default { ...@@ -2148,5 +2366,6 @@ export default {
} }
this.getControlList(); this.getControlList();
} }
}; };
</script> </script>
src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue
View file @ e2d3dc4e
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
SingleRoomShareMoney: 0, //单房差分摊费用 SingleRoomShareMoney: 0, //单房差分摊费用
InlandTrafficShareMoney: 0, //内陆段交通分摊费用 InlandTrafficShareMoney: 0, //内陆段交通分摊费用
OtherShareMoney: 0, //杂费分摊费用 OtherShareMoney: 0, //杂费分摊费用
OtherRemark: "", //其他价格备注
}, },
CostCurrencyList: [], //选择的币种 CostCurrencyList: [], //选择的币种
CostNumberList: [], //人数 CostNumberList: [], //人数
...@@ -112,6 +113,7 @@ ...@@ -112,6 +113,7 @@
BackVisaPrice: 0, //退签证费 BackVisaPrice: 0, //退签证费
BackSafeMoney: 0, //退保险费 BackSafeMoney: 0, //退保险费
ContractUrl: "", //合同地址 ContractUrl: "", //合同地址
PriceRemark: "", //定价备注
}, },
LineList: [], //线路列表 LineList: [], //线路列表
loading: false loading: false
...@@ -166,8 +168,13 @@ ...@@ -166,8 +168,13 @@
}, },
getPostData() { getPostData() {
let configId = this.$route.query.configId; let configId = this.$route.query.configId;
let offerId = 0;
if (this.$route.query.offerid) {
offerId = this.$route.query.offerid;
}
let msg = { let msg = {
ID: configId ID: configId,
offerId: offerId
}; };
this.apipost( this.apipost(
"travel_get_GetMyTravelInfo_V2", "travel_get_GetMyTravelInfo_V2",
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ e2d3dc4e
...@@ -246,7 +246,6 @@ ...@@ -246,7 +246,6 @@
) { ) {
//to do something //to do something
} else { } else {
//this.$set(this.FeatureData, "DayList", data);
this.$refs.TravelFeature.setNewDate(data); this.$refs.TravelFeature.setNewDate(data);
} }
}, },
......
src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue
View file @ e2d3dc4e
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<span class="TDTextspan">{{$t('sm.jhcfchengshi')}}</span> <span class="TDTextspan">{{$t('sm.jhcfchengshi')}}</span>
<span> <span>
<el-form-item prop="StartCityId"> <el-form-item prop="StartCityId">
<el-select :disabled="isOpenGroup" class='w200' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId" <el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.StartCityId"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'> <el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'>
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</span> </span>
<span class="TDTextspan">{{$t('sm.jhcfchengshi')}}返回抵达城市</span> <span class="TDTextspan">返回抵达城市</span>
<span> <span>
<el-form-item prop="ReturnArriveCityId"> <el-form-item prop="ReturnArriveCityId">
<el-select :disabled="isOpenGroup" class='w200' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId" <el-select :disabled="isOpenGroup" class='w120' :placeholder="$t('pub.pleaseSel')" v-model="subConfig.ReturnArriveCityId"
filterable> filterable>
<el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='SelectDefaultValue'></el-option>
<el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'> <el-option v-for="item in StartCity" :label='item.startCityName' :value='item.ID' :key='item.ID'>
......
src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue
View file @ e2d3dc4e
...@@ -9,10 +9,12 @@ ...@@ -9,10 +9,12 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0&&!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0&&!isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
...@@ -47,7 +49,8 @@ ...@@ -47,7 +49,8 @@
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;{{$t('sm.hour')}} @keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;{{$t('sm.hour')}}
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>&nbsp;&nbsp;{{$t('sm.Minute')}} @keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>
&nbsp;&nbsp;{{$t('sm.Minute')}}
</div> </div>
</div> </div>
</div> </div>
...@@ -92,10 +95,12 @@ ...@@ -92,10 +95,12 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"> <el-tooltip v-if="!isOpenGroup" class="item" effect="dark" :content="$t('system.table_delete')"
placement="top-start">
<i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeDinnerTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0&&!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0&&!isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
...@@ -178,8 +183,7 @@ ...@@ -178,8 +183,7 @@
}; };
return { return {
//其他餐食 //其他餐食
otherDinner: [ otherDinner: [{
{
Id: 1, Id: 1,
Name: this.$t('sm.jiudiannxyzc'), Name: this.$t('sm.jiudiannxyzc'),
City: 0, City: 0,
...@@ -216,7 +220,7 @@ ...@@ -216,7 +220,7 @@
}, },
{ {
ID: -2, ID: -2,
Name:this.$t('sm.jiudianxy'), Name: this.$t('sm.jiudianxy'),
City: 0, City: 0,
About: "", About: "",
PicPath: "" PicPath: ""
...@@ -335,6 +339,7 @@ ...@@ -335,6 +339,7 @@
this.subItemObj.childItem.ImaArray = []; this.subItemObj.childItem.ImaArray = [];
var dinnerImgList = obj.PicPath.split(","); var dinnerImgList = obj.PicPath.split(",");
for (var i = 0; i < dinnerImgList.length; i++) { for (var i = 0; i < dinnerImgList.length; i++) {
if (i <= 3) {
var fileObj = this.$commonUtils.FileObject(); var fileObj = this.$commonUtils.FileObject();
fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i]; fileObj.Url = this.domainManager().ViittoFileUrl + dinnerImgList[i];
fileObj.Name = ""; fileObj.Name = "";
...@@ -342,6 +347,7 @@ ...@@ -342,6 +347,7 @@
} }
} }
} }
}
}, },
//获取餐厅套餐列表 //获取餐厅套餐列表
getDinnerMealList(event) { getDinnerMealList(event) {
......
src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue
View file @ e2d3dc4e
...@@ -6,24 +6,28 @@ ...@@ -6,24 +6,28 @@
<span class="TDTripType">{{$t('hotel.hotel')}}</span> <span class="TDTripType">{{$t('hotel.hotel')}}</span>
</div> </div>
<span class="datePickContent" style="display:none"> <span class="datePickContent" style="display:none">
<el-form-item > <el-form-item>
<el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')" v-model="subItemObj.childItem.TimeType"> <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')"
v-model="subItemObj.childItem.TimeType">
<el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'> <el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</span> </span>
<div class="delSpan"> <div class="delSpan">
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start" > <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="!isOpenGroup">
<i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -31,9 +35,11 @@ ...@@ -31,9 +35,11 @@
<div class="TDLeftPlan"> <div class="TDLeftPlan">
<span>{{$t('sm.ruzhujiudian')}}</span> <span>{{$t('sm.ruzhujiudian')}}</span>
<span> <span>
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'" :rules="hotelTripRules.HotelId"> <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.HotelId'"
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelId" :rules="hotelTripRules.HotelId">
@visible-change="getHotelList($event)" @change="changeHotelList()"> <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
v-model="subItemObj.childItem.HotelId" @visible-change="getHotelList($event)"
@change="changeHotelList()">
<el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option>
<el-option v-for="item in QHotelList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'> <el-option v-for="item in QHotelList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
...@@ -41,13 +47,15 @@ ...@@ -41,13 +47,15 @@
</el-form-item> </el-form-item>
</span> </span>
<span class="HD_hotelru"> <span class="HD_hotelru">
<el-checkbox :disabled="isOpenGroup" v-model="subItemObj.childItem.IsSameLevel" :checked="subItemObj.childItem.IsSameLevel===CheckedVaule" <el-checkbox :disabled="isOpenGroup" v-model="subItemObj.childItem.IsSameLevel"
:true-label="CheckedVaule" :false-label="UnCheckedVaule" border size="mini">{{$t('sm.tongjijiudian')}}</el-checkbox> :checked="subItemObj.childItem.IsSameLevel===CheckedVaule" :true-label="CheckedVaule"
:false-label="UnCheckedVaule" border size="mini">{{$t('sm.tongjijiudian')}}</el-checkbox>
</span> </span>
<span class="comTravelLeft">{{$t('sm.fangxingxz')}}</span> <span class="comTravelLeft">{{$t('sm.fangxingxz')}}</span>
<span> <span>
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.HotelProductId" <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
@visible-change="getHotelProductList($event)" @change="changeHotelProductList()"> v-model="subItemObj.childItem.HotelProductId" @visible-change="getHotelProductList($event)"
@change="changeHotelProductList()">
<el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='Diner.DefaultSelectValue'></el-option>
<el-option v-for="item in QHotelProductList" :label='item.Name' :value='item.ID' :key='item.ID'> <el-option v-for="item in QHotelProductList" :label='item.Name' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
...@@ -57,8 +65,8 @@ ...@@ -57,8 +65,8 @@
<span class="TDhotelDiner">{{$t('sm.jiudianhancan')}}</span> <span class="TDhotelDiner">{{$t('sm.jiudianhancan')}}</span>
<span> <span>
<el-checkbox-group v-model="Diner.UseDinerCked"> <el-checkbox-group v-model="Diner.UseDinerCked">
<el-checkbox v-for="item in Diner.UseDinnerArray" :disabled="isOpenGroup||!varCanChecked(item)" :label="item.Id" <el-checkbox v-for="item in Diner.UseDinnerArray" :disabled="isOpenGroup||!varCanChecked(item)"
:key='item.Id'>{{item.Name}}</el-checkbox> :label="item.Id" :key='item.Id'>{{item.Name}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</span> </span>
</span> </span>
...@@ -66,8 +74,9 @@ ...@@ -66,8 +74,9 @@
</div> </div>
</div> </div>
<div class="TP_edit"> <div class="TP_edit">
<my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description" <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit> v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</div> </div>
<div class="SiencDiv clearfix"> <div class="SiencDiv clearfix">
<div class="ScLeftImg"> <div class="ScLeftImg">
...@@ -76,16 +85,20 @@ ...@@ -76,16 +85,20 @@
<img v-else :src="item.Url" /> <img v-else :src="item.Url" />
<div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)"> <div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)">
<div class="clearfix" style="text-align:center;"> <div class="clearfix" style="text-align:center;">
<div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i></div> <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)" v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div> </div>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)" v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div> <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)"
v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)"
v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="rightAddImg"> <div class="rightAddImg">
<el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg" :data="subItemObj.childItem" <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg"
:multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> :data="subItemObj.childItem" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<i class="iconfont icon-img_haha"></i> <i class="iconfont icon-img_haha"></i>
</el-upload> </el-upload>
</div> </div>
...@@ -99,16 +112,19 @@ ...@@ -99,16 +112,19 @@
<span class="TDTripType">{{$t('hotel.hotel')}}</span> <span class="TDTripType">{{$t('hotel.hotel')}}</span>
</div> </div>
<div class="delSpan"> <div class="delSpan">
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" > <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="!isOpenGroup">
<i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeHotelTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -139,13 +155,13 @@ ...@@ -139,13 +155,13 @@
<div class="ScLeftImg"> <div class="ScLeftImg">
<div class="TFimgList" v-for="(item,index) in subItemObj.childItem.ImaArray" :key="item.subCode"> <div class="TFimgList" v-for="(item,index) in subItemObj.childItem.ImaArray" :key="item.subCode">
<img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png" /> <img v-if="!item.Url" src="../../../assets/img/bg_c3@3x.png" />
<img v-else :src="item.Url" @click="getPic(subItemObj.childItem.ImaArray,index)"/> <img v-else :src="item.Url" @click="getPic(subItemObj.childItem.ImaArray,index)" />
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div v-if="dspNone" class="viewBigPicLayer myPiclayer" @click="colseLayer"> <div v-if="dspNone" class="viewBigPicLayer myPiclayer" @click="colseLayer">
<i @click="colseLayer" class="el-icon-circle-close-outline clolseViewBigPicLayer" ></i> <i @click="colseLayer" class="el-icon-circle-close-outline clolseViewBigPicLayer"></i>
<el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click"> <el-carousel height="600px" :initial-index='initialIndex' :interval="5000" trigger="click">
<el-carousel-item v-for="(item,index) in picObj" :key="index"> <el-carousel-item v-for="(item,index) in picObj" :key="index">
<img style="width:100%;" :src="item.Url" /> <img style="width:100%;" :src="item.Url" />
...@@ -155,8 +171,8 @@ ...@@ -155,8 +171,8 @@
</div> </div>
</template> </template>
<script> <script>
import MyEdit from "../../EditTemplate.vue"; import MyEdit from "../../EditTemplate.vue";
export default { export default {
props: [ props: [
"subItemObj", "subItemObj",
"DefaultList", "DefaultList",
...@@ -192,8 +208,8 @@ export default { ...@@ -192,8 +208,8 @@ export default {
font: false, //字体 font: false, //字体
narrative: true //叙述, narrative: true //叙述,
}, },
dspNone:false, dspNone: false,
initialIndex:0, initialIndex: 0,
//选中同级酒店 //选中同级酒店
CheckedVaule: 1, CheckedVaule: 1,
//不选中 //不选中
...@@ -206,8 +222,7 @@ export default { ...@@ -206,8 +222,7 @@ export default {
Diner: { Diner: {
DefaultSelectValue: 0, DefaultSelectValue: 0,
UseDinerCked: [], UseDinerCked: [],
UseDinnerType: [ UseDinnerType: [{
{
Id: "1", Id: "1",
Name: this.$t('sm.zao') Name: this.$t('sm.zao')
}, },
...@@ -225,18 +240,14 @@ export default { ...@@ -225,18 +240,14 @@ export default {
//酒店验证 //酒店验证
hotelTripRules: { hotelTripRules: {
//时间类型验证 //时间类型验证
TimeType: [ TimeType: [{
{
validator: TimeTypeValidate, validator: TimeTypeValidate,
trigger: "change" trigger: "change"
} }],
], HotelId: [{
HotelId: [
{
validator: HotelIdValidate, validator: HotelIdValidate,
trigger: "change" trigger: "change"
} }]
]
}, },
TheDayUserDinner: [] //当天餐厅用餐情况 TheDayUserDinner: [] //当天餐厅用餐情况
}; };
...@@ -281,7 +292,15 @@ export default { ...@@ -281,7 +292,15 @@ export default {
that.Diner.UseDinnerArray = []; that.Diner.UseDinnerArray = [];
that.subItemObj.childItem.ImaArray = []; that.subItemObj.childItem.ImaArray = [];
that.subItemObj.childItem.Description = obj.Descriptions; that.subItemObj.childItem.Description = obj.Descriptions;
if (obj.imgList && obj.imgList.length > 4) {
obj.imgList.forEach((sItem, sIndex) => {
if (sIndex <= 3) {
that.subItemObj.childItem.ImaArray.push(sItem);
}
})
} else {
that.subItemObj.childItem.ImaArray = obj.imgList; that.subItemObj.childItem.ImaArray = obj.imgList;
}
that.subItemObj.childItem.IsUseDinner = obj.IsUseDinner; that.subItemObj.childItem.IsUseDinner = obj.IsUseDinner;
that.subItemObj.childItem.HotelName = obj.Name; that.subItemObj.childItem.HotelName = obj.Name;
let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType; let useDinnerTypeStr = that.subItemObj.childItem.UseDinnerType;
...@@ -338,8 +357,7 @@ export default { ...@@ -338,8 +357,7 @@ export default {
getHotelProductList(event) { getHotelProductList(event) {
if (event) { if (event) {
this.apipost( this.apipost(
"dict_post_HotelProduc_GetList", "dict_post_HotelProduc_GetList", {
{
Hotel_ID: this.subItemObj.childItem.HotelId Hotel_ID: this.subItemObj.childItem.HotelId
}, },
res => { res => {
...@@ -418,20 +436,20 @@ export default { ...@@ -418,20 +436,20 @@ export default {
}, },
//左右移动 //左右移动
toExchangeImg(dayNum, subIndex, imgIndex, IsMove) { toExchangeImg(dayNum, subIndex, imgIndex, IsMove) {
this.$parent.$parent.ExchangeImg(dayNum, subIndex, imgIndex,IsMove); this.$parent.$parent.ExchangeImg(dayNum, subIndex, imgIndex, IsMove);
}, },
colseLayer(){ colseLayer() {
this.dspNone=false; this.dspNone = false;
}, },
getPic(obj,index){ getPic(obj, index) {
this.picObj=obj this.picObj = obj
this.dspNone=true; this.dspNone = true;
this.initialIndex = index; this.initialIndex = index;
}, },
getItemLabel(item){ getItemLabel(item) {
let returnName = item.Name; let returnName = item.Name;
if(item.Inventory>=0){ if (item.Inventory >= 0) {
returnName = returnName+ " " +item.Inventory; returnName = returnName + " " + item.Inventory;
} }
return returnName; return returnName;
} }
...@@ -457,7 +475,7 @@ export default { ...@@ -457,7 +475,7 @@ export default {
watch: { watch: {
subItemObj: { subItemObj: {
//深度监听，可监听到对象、数组的变化 //深度监听，可监听到对象、数组的变化
handler: function(val, oldVal) { handler: function (val, oldVal) {
this.subItemObj.childItem.HotelImg = JSON.stringify( this.subItemObj.childItem.HotelImg = JSON.stringify(
this.subItemObj.childItem.ImaArray this.subItemObj.childItem.ImaArray
); );
...@@ -465,24 +483,25 @@ export default { ...@@ -465,24 +483,25 @@ export default {
deep: true deep: true
}, },
"Diner.UseDinerCked": { "Diner.UseDinerCked": {
handler: function(val, oldVal) { handler: function (val, oldVal) {
this.subItemObj.childItem.UseDinnerType = this.Diner.UseDinerCked.join( this.subItemObj.childItem.UseDinnerType = this.Diner.UseDinerCked.join(
"," ","
); );
} }
}, },
DinnerList: { DinnerList: {
handler: function(val, oldVal) { handler: function (val, oldVal) {
this.initTheDayUserDinner(); this.initTheDayUserDinner();
}, },
deep: true deep: true
}, },
"subItemObj.childItem.QCity": { "subItemObj.childItem.QCity": {
handler: function(val, oldVal) { handler: function (val, oldVal) {
this.getHotelList(); this.getHotelList();
}, },
deep: true deep: true
} }
} }
}; };
</script> </script>
src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue
View file @ e2d3dc4e
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
</div> </div>
<span class="datePickContent" style="display:none;"> <span class="datePickContent" style="display:none;">
<el-form-item> <el-form-item>
<el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')" v-model="subItemObj.childItem.TimeType"> <el-select :disabled="isOpenGroup" class="w160" :placeholder="$t('sm.qxztime')"
v-model="subItemObj.childItem.TimeType">
<el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'> <el-option v-for="item in TimeTypeList" :label='item.Name' :value='item.Id' :key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -17,13 +18,16 @@ ...@@ -17,13 +18,16 @@
<el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
<i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-chakan" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="!isOpenGroup">
<i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -31,9 +35,11 @@ ...@@ -31,9 +35,11 @@
<div class="TDLeftPlan"> <div class="TDLeftPlan">
<span>{{$t('sm.scenChoosse')}}</span> <span>{{$t('sm.scenChoosse')}}</span>
<span> <span>
<el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'" :rules="scienTripRules.CouponsId"> <el-form-item :prop="'DayList.'+index+'.dayArray.'+subIndex+'.childItem.CouponsId'"
<el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.CouponsId" :rules="scienTripRules.CouponsId">
@visible-change="getQScenicList($event)" @change="changeQScenicList()"> <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable
v-model="subItemObj.childItem.CouponsId" @visible-change="getQScenicList($event)"
@change="changeQScenicList()">
<el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option> <el-option :label="$t('pub.unlimitedSel')" :value='DefaultSelectValue'></el-option>
<el-option v-for="item in QScenicList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'> <el-option v-for="item in QScenicList" :label='getItemLabel(item)' :value='item.ID' :key='item.ID'>
</el-option> </el-option>
...@@ -55,13 +61,15 @@ ...@@ -55,13 +61,15 @@
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时 @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
<el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes" <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
@keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>&nbsp;&nbsp;分钟 @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>
&nbsp;&nbsp;分钟
</div> </div>
</div> </div>
</div> </div>
<div class="TP_edit"> <div class="TP_edit">
<my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]" v-bind:editValue="subItemObj.childItem.Description" <my-edit v-if="isShowEdit" v-on:edit-value="subItemObj.childItem.Description = arguments[0]"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit> v-bind:editValue="subItemObj.childItem.Description" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</div> </div>
<div class="SiencDiv clearfix"> <div class="SiencDiv clearfix">
<div class="ScLeftImg"> <div class="ScLeftImg">
...@@ -70,18 +78,20 @@ ...@@ -70,18 +78,20 @@
<img v-else :src="item.Url" /> <img v-else :src="item.Url" />
<div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)"> <div class="imgzhe" @click="getPic(subItemObj.childItem.ImaArray,index)">
<div class="clearfix" style="text-align:center;"> <div class="clearfix" style="text-align:center;">
<div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i></div> <div class="re-delte" @click.stop="delImg(index,subItemObj)"><i class="iconfont icon-xingzhuang"></i>
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)" v-if="index!=0"><i </div>
class="iconfont icon-zuoyi"></i></div> <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,0)"
<div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)" v-if="index!=subItemObj.childItem.ImaArray.length-1"><i v-if="index!=0"><i class="iconfont icon-zuoyi"></i></div>
class="iconfont icon-youyi"></i></div> <div class="re-delte" @click.stop="toExchangeImg(subItemObj.childItem.DayNum,subIndex,index,1)"
v-if="index!=subItemObj.childItem.ImaArray.length-1"><i class="iconfont icon-youyi"></i></div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="rightAddImg"> <div class="rightAddImg">
<el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg" :data="subItemObj.childItem" <el-upload :file-list="subItemObj.childItem.ImaArray" :http-request="uploadScenImg"
:multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp" :show-file-list="false" action=""> :data="subItemObj.childItem" :multiple="true" accept="image/jpeg,image/gif,image/png,image/bmp"
:show-file-list="false" action="">
<i class="iconfont icon-img_haha"></i> <i class="iconfont icon-img_haha"></i>
</el-upload> </el-upload>
</div> </div>
...@@ -97,13 +107,16 @@ ...@@ -97,13 +107,16 @@
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" v-if="!isShowEdit"> <el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start" v-if="!isShowEdit">
<i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i> <i class="iconfont icon-bianji" @click="isShowEdit=!isShowEdit"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start" v-if="!isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start"
v-if="!isOpenGroup">
<i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i> <i class="iconfont icon-xingzhuang" @click="removeScienTrip(subItemObj.childItem.DayNum,subIndex)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start" v-if="subIndex!=0 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.shangyi')" placement="top-start"
v-if="subIndex!=0 && !isOpenGroup">
<i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i> <i class="iconfont icon-shangyi" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,0)"></i>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start" v-if="subIndex!=subTotalIndex-1 && !isOpenGroup"> <el-tooltip class="item" effect="dark" :content="$t('sm.xiayi')" placement="top-start"
v-if="subIndex!=subTotalIndex-1 && !isOpenGroup">
<i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i> <i class="iconfont icon-xiayi1" @click="MoveItem(subItemObj.childItem.DayNum,subIndex,1)"></i>
</el-tooltip> </el-tooltip>
</div> </div>
...@@ -248,6 +261,7 @@ ...@@ -248,6 +261,7 @@
if (obj.PicPath != undefined && obj.PicPath != "") { if (obj.PicPath != undefined && obj.PicPath != "") {
var scenImgList = obj.PicPath.split(","); var scenImgList = obj.PicPath.split(",");
for (var i = 0; i < scenImgList.length; i++) { for (var i = 0; i < scenImgList.length; i++) {
if (i <= 3) {
var fileObj = that.$commonUtils.FileObject(); var fileObj = that.$commonUtils.FileObject();
if (scenImgList[i] != "") { if (scenImgList[i] != "") {
fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i]; fileObj.Url = that.domainManager().ViittoFileUrl + scenImgList[i];
...@@ -255,6 +269,8 @@ ...@@ -255,6 +269,8 @@
that.subItemObj.childItem.ImaArray.push(fileObj); that.subItemObj.childItem.ImaArray.push(fileObj);
} }
} }
}
} }
} }
} }
...@@ -326,10 +342,10 @@ ...@@ -326,10 +342,10 @@
this.dspNone = true; this.dspNone = true;
this.initialIndex = index; this.initialIndex = index;
}, },
getItemLabel(item){ getItemLabel(item) {
let returnName = item.Name; let returnName = item.Name;
if(item.Inventory>=0){ if (item.Inventory >= 0) {
returnName = returnName+ " " +item.Inventory; returnName = returnName + " " + item.Inventory;
} }
return returnName; return returnName;
} }
......
src/components/scenicSpot/scenicRecommentList.vue
View file @ e2d3dc4e
...@@ -325,6 +325,9 @@ ...@@ -325,6 +325,9 @@
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button type="primary" icon="el-icon-edit" circle @click="GetScenic(item.Id)"></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="GetScenic(item.Id)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="预览" placement="top">
<el-button type="primary" icon="iconfont icon-view" circle @click="goView(item.Id)"></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="danger" icon="iconfont icon-img_delete_small" circle <el-button type="danger" icon="iconfont icon-img_delete_small" circle
@click="removeScenicRecomment(item.Id)"></el-button> @click="removeScenicRecomment(item.Id)"></el-button>
...@@ -673,6 +676,18 @@ ...@@ -673,6 +676,18 @@
err => {} err => {}
); );
} }
},
//跳转至预览页面
goView(id){
this.$router.push({
name: 'ScenicStrategyview',
query: {
id: id,
blank: 'y',
tab: name
}
})
} }
}, },
mounted() { mounted() {
......
src/router/config.js
View file @ e2d3dc4e
...@@ -4430,7 +4430,14 @@ export default { ...@@ -4430,7 +4430,14 @@ export default {
title: '电子合同' title: '电子合同'
} }
}, },
{
path: '/ScenicStrategyview', //景点攻略预览
name: 'ScenicStrategyview',
component: resolve => require(['@/components/ScenicStrategyview'], resolve),
meta: {
title: '景点攻略预览'
}
},
{ {
path: '/supplierLogin', //供应商登录 path: '/supplierLogin', //供应商登录
name: '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