Skip to content

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

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

parents 4303e0b1 b6e58b66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4739 additions and 956 deletions
src/assets/common/lang/zh.js
View file @ d0dc6ce4
......@@ -1312,6 +1312,19 @@ export const Operation = {
Op_localBranchPrice:'当地分公司价格',
Op_localdaiPrice:'当地代销商价格',
Op_localDangPrice:'当地当团利润归属',
Op_Country:'国别',
Op_WarningTeam:'预警团',
Op_TransportState:'联运状态',
Op_hide:'隐藏',
Op_TeamWarningSearch:'团控预警查询',
Op_daysChoice:'天数选择',
Op_Attendance:'上座率',
Op_warningSearch:'预警查询',
Op_TeamName:'团名',
Op_nei:'内',
Op_zhu:'主',
Op_lian:'联',
Op_jietuan:'结团',
}
export const rule = {
company: '请选择公司',
......
src/components/SalesModule/groupInquiry.vue
View file @ d0dc6ce4
......@@ -486,9 +486,9 @@
<div class="el-col">
<div class="d7">
<div>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==1" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_banliqianzheng')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==1" @click="goUrlZ('VisaApplicationDetails',item.LineID,item.TCID,item.TCNUM)">{{$t('visa.v_banliqianzheng')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==2" @click="goUrlZ('VisaApplicationDetails',item.LineID,item.TCID,item.TCNUM)">{{$t('visa.v_chakanjindu')}}</el-button>
<el-button type="primary" style='background:#00C6FF; border-color:#00C6FF' v-if="item.VisaStatus==3" @click="goUrlZ('VisaApplicationDetails',item.LineID,item.TCID,item.TCNUM)">{{$t('visa.v_chakanjieguo')}}</el-button>
</div>
<el-button v-if="item.LineID==14" @click="goUrlT('visaList2',item.TCID)" type="primary" style='background:#F16C3C; border-color:#F16C3C'>签证列表</el-button>
<!-- <el-button @click="goTeamBalance(item.TCID,item.OutBranchId)" type="primary" style='background:#00C6FF; border-color:#00C6FF'>团队支出</el-button> -->
......@@ -1378,8 +1378,8 @@ export default {
goUrlY(path, id) {
this.$router.push({ name: path, query: { id: id,blank:'y',tab:'旅客名单'} });
},
goUrlZ(path, id, num) {
this.$router.push({ name: path, query: { id: id, num: num,blank:'y',tab:'签证办理'} });
goUrlZ(path,LineID, id, num) {
this.$router.push({ name: path, query: { LineID:LineID,id: id, num: num,blank:'y',tab:'签证办理'} });
},
goUrlT(path, tcid) {
this.$router.push({ name: path, query: { tcid: tcid, blank:'y', tab:'签证列表'} });
......
src/components/Ticketing/TicketManager.vue
View file @ d0dc6ce4
......@@ -1299,7 +1299,7 @@
<li>
<span>
<em>编号</em>
<el-input v-model="msg.ID" placeholder="机票编号"></el-input>
<el-input v-model="msg.ID" placeholder="机票编号" @keyup.native="checkInteger(msg,'ID')"></el-input>
</span>
</li>
<li>
......@@ -2733,8 +2733,7 @@
this.chengeDelIdList = [];
this.apipost(
"ticket_get_GetEntityExtend", {
ID,
ID
ID:ID
},
res => {
if (res.data.resultCode == 1) {
......@@ -2751,8 +2750,6 @@
res.data.data.flightList.forEach((x, index) => {
this.chengeDelIdList.push(x.ID);
});
console.log(this.addMsg,'addmsg');
} else {
this.Warning(res.data.message);
}
......
src/components/TravelManager/Ticket/TravelticketManager.vue
View file @ d0dc6ce4
......@@ -622,6 +622,16 @@
<div class="flexOne TravelticketManager">
<div class="query-box">
<ul>
<li>
<span>
<em>线路</em>
<el-select v-model="Query.LineId" :placeholder="$t('pub.pleaseSel')" class="w120">
<el-option :label="$t('pub.unlimitedSel')" :value="0"></el-option>
<el-option v-for="item in LineList" :key="item.LineID" :label="item.LineName" :value="item.LineID">
</el-option>
</el-select>
</span>
</li>
<li>
<span class="hotel_name">
<em>起飞时间</em>
......@@ -650,6 +660,12 @@
</el-input>
</span>
</li>
<li>
<span>
<em>机票编号</em>
<el-input v-model="Query.ID" placeholder="机票编号" @keyup.native="checkInteger(Query,'ID')"></el-input>
</span>
</li>
<li>
<button class="hollowFixedBtn" type="button"
@click="resetPageIndex(),getList()">{{$t('pub.searchBtn')}}</button>
......@@ -806,10 +822,14 @@
<div class="TCID_cont PingFangSC">
团期：
<span v-show="item.PriceList.length==0">暂无</span>
<span class="Ticket_TCID" v-for="subItem in item.PriceList">({{subItem.TCID}}){{subItem.TCNUM}} &nbsp;</span>
<span class="Ticket_TCID" v-for="subItem in item.PriceList">({{subItem.TCID}}){{subItem.TCNUM}}
&nbsp;</span>
</div>
</el-col>
<el-col :span="16">
<el-col :span="6">
<div class="TCID_cont"> 采购人：<span style="color:red;">{{item.PurchaseManName}}</span> </div>
</el-col>
<el-col :span="10">
<div class="TCID_cont">
PNR：{{item.PNR}}
</div>
......@@ -847,6 +867,7 @@
data() {
return {
Query: {
LineId: 0, //线路编号
//页码
pageIndex: 1,
//每页显示条数
......@@ -872,7 +893,13 @@
currentPage: 1,
//起飞状态
FlyState: "0",
//是否查询采购人员(1-查询，0-不查询)
IsQueryPurchase: 1,
//机票编号
ID: "",
},
//线路列表
LineList: [],
//下拉框默认值
selectDefauleValue: 0,
//防止重复提交
......@@ -914,16 +941,21 @@
methods: {
getList() {
this.loading = true;
if (this.Query.ID == "") {
this.Query.ID = 0;
}
this.apipost(
"AirTicket_get_GetPageList",
this.Query,
res => {
this.loading = false;
this.loading = false;
if (res.data.resultCode == 1) {
this.Query.total = res.data.data.count;
this.noData = !this.Query.total > 0;
this.dataList = res.data.data.pageData;
console.log("dataList",this.dataList);
if (this.Query.ID == 0) {
this.Query.ID = "";
}
} else {
this.Warning(res.data.message);
}
......@@ -931,6 +963,18 @@
err => {}
);
},
//获取线路列表
GetLineList() {
this.apipost(
"line_post_GetAllList", {},
res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
},
err => {}
);
},
GetPlaceHolder() {
this.UseNum_placeholder =
"最多绑定" + this.bindAirticket.TotalNum + "个机位";
......@@ -998,6 +1042,7 @@
}
},
mounted() {
this.GetLineList();
this.initAirline();
this.getList();
}
......
src/components/TravelManager/TravelList/oneDayTrip.vue 0 → 100644
View file @ d0dc6ce4
This diff is collapsed.
src/components/TravelManager/TravelList/oneDayTripList.vue 0 → 100644
View file @ d0dc6ce4
This diff is collapsed.
src/components/VisaCenter/VisaApplicationDetails.vue
View file @ d0dc6ce4
......@@ -27,7 +27,6 @@
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsGroupSigned==1" :command='{id:item.Id,type:2}'>{{item.Name}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:2}'>其他</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
......@@ -35,11 +34,7 @@
{{$t('visa.v_gvisa')}}
<el-dropdown-menu slot="dropdown" >
<el-dropdown-item v-for="item in VisaManagementList" :key='item.Id' v-if="item.IsOrderSigned==1" :command='{id:item.Id,type:1}'>{{item.Name}}</el-dropdown-item>
<<<<<<< HEAD
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>{{$t('visaT.v_Othervisas')}}</el-dropdown-item>
=======
<el-dropdown-item v-if="LineID!=14" :command='{id:-1,type:1}'>其他</el-dropdown-item>
>>>>>>> 292691f5f6e9626c70936d1e9ce1f153541b45b3
</el-dropdown-menu>
</el-dropdown>
</div>
......@@ -140,7 +135,7 @@ export default {
Name:this.$t('visa.v_jujue')
},
],
LineID:0,
LineID:14,
}
},
watch:{},
......@@ -279,7 +274,7 @@ export default {
mounted(){
this.id = this.$route.query.id
this.num = this.$route.query.num;
this.LineID=this.$route.query.LineID;
this.LineID=this.$route.query.LineID?this.$route.query.LineID:this.LineID;
this.getVisaManagementList()
this.getData()
}
......
src/components/newTravelmanager/TravelGroupControl/TravelFeature.vue
View file @ d0dc6ce4
......@@ -8,7 +8,8 @@
<span class="foldList" @click="fold" v-if="isFold==1">点击展开</span>
<div class="TrfList clearfix">
<!-- 'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)-->
<div class="TFslide" v-for="item in TypeArray" :class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
<div class="TFslide" v-for="item in TypeArray"
:class="{'TFcked':item.isShow,'display_none':(item.TypeState===4 && FeatureData.FeatureType !== 4) || (item.TypeState===4 && !$route.query.configId)}"
@click="clickFeature(item)" :key="item.subCode">
<img v-bind:src="item.imgUrl">
<div>{{item.ckTitle}}</div>
......@@ -17,8 +18,8 @@
<div style="display:none">
<p style="padding:5px 0;">请选择下载word行程的主题颜色</p>
<el-radio-group v-model="FeatureData.TemplateId">
<el-radio-button v-for="item in templateColorArray" :class="`templateColorArray_${item.color}`" :label="item.id"
:key="item.id" :value="item.id">{{item.text}}</el-radio-button>
<el-radio-button v-for="item in templateColorArray" :class="`templateColorArray_${item.color}`"
:label="item.id" :key="item.id" :value="item.id">{{item.text}}</el-radio-button>
</el-radio-group>
<p style="padding:5px 0 0 0;"> </p>
</div>
......@@ -38,8 +39,8 @@
<img v-else :src="item.Url">
<div class="TFIMGzhe">
<div class="TFreupload" @click="updateTFimg(index)">
<el-upload :file-list="FeatureData.fileList" :http-request="reUpload" :multiple="true" accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false" action>
<el-upload :file-list="FeatureData.fileList" :http-request="reUpload" :multiple="true"
accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false" action>
<i class="iconfont icon-Edit"></i>
</el-upload>
</div>
......@@ -68,8 +69,9 @@
<div class="userDefined">
<!-- <quill-editor @change="onEditorChange($event)" v-model="FeatureData.FeatureContent">
</quill-editor>-->
<my-edit v-on:edit-value="FeatureData.FeatureContent = arguments[0]" v-bind:editValue="FeatureData.FeatureContent"
v-bind:toolbarShow="toolbar" v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
<my-edit v-on:edit-value="FeatureData.FeatureContent = arguments[0]"
v-bind:editValue="FeatureData.FeatureContent" v-bind:toolbarShow="toolbar"
v-bind:referenceList="DefaultList" v-bind:placeholder="placeholder"></my-edit>
</div>
</div>
<div class="TFright" v-if="FeatureData.FeatureType!=FeatureTypeState.userDefined">
......@@ -79,8 +81,8 @@
<img v-else :src="item.Url">
<div class="TFIMGzhe">
<div class="TFreupload" @click="updateTFimg(index)">
<el-upload :file-list="FeatureData.fileList" :http-request="reUpload" :multiple="true" accept="image/jpeg, image/gif, image/png, image/bmp"
:show-file-list="false" action>
<el-upload :file-list="FeatureData.fileList" :http-request="reUpload" :multiple="true"
accept="image/jpeg, image/gif, image/png, image/bmp" :show-file-list="false" action>
<i class="iconfont icon-Edit"></i>
</el-upload>
</div>
......@@ -94,7 +96,8 @@
<div v-if="FeatureData.FeatureType===FeatureTypeState.travelSpecial">
<new-feature ref='newFeature' :data='FeatureData'></new-feature>
</div>
<div v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
<div
v-if="(FeatureData.FeatureType===FeatureTypeState.travelSpecial2 || FeatureData.FeatureType===6 || FeatureData.FeatureType===7) && FeatureDataFlag">
<newFeature2 ref='newFeature2' :FeatureData='FeatureData'></newFeature2>
</div>
</div>
......@@ -139,7 +142,7 @@
newFeature2,
// newFeature3,
},
props: ["subConfigId", "FeatureData", "isNewConfig"],
props: ["subConfigId", "FeatureData", "isNewConfig", "TeamType"],
inject: ['loadConfigInfo'],
data() {
return {
......@@ -283,7 +286,7 @@
type: contentType
});
},
getHtml: function (postData, SaveType) {
getHtml: function (postData, SaveType, TeamType) {
var FeatureData = {
B2BRemark: postData.B2BRemark,
ConfigId: postData.ConfigId,
......@@ -303,13 +306,6 @@
WarmTip: postData.WarmTip,
TemplateId: postData.TemplateId
};
let flagWangYue = this.$route.query.flag;
if (flagWangYue == undefined || flagWangYue === "false" || !flagWangYue) {
flagWangYue = false;
} else {
flagWangYue = true;
}
if (this.$refs.newFeature != undefined) {
var obj = '';
try {
......@@ -329,8 +325,7 @@
setTimeout(() => {
try {
FeatureData.FeatureHtml = document.getElementById("newFeatureBox").innerHTML;
} catch (err) {
}
} catch (err) {}
this.apipost("travel_post_SetFeature", FeatureData, res => {
try {
this.$refs.newFeature.setReadOnly(false)
......@@ -343,13 +338,19 @@
if (res.data.resultCode == 1) {
//保存按钮跳转当当前页码
if (SaveType == 1) {
let path = flagWangYue ? 'TravelManager3' : 'TravelManager2';
let path = "TravelManager2";
if (TeamType == 0) {
path = "TravelManager2";
} else if (TeamType == 1) {
path = "TravelManager3";
} else if (TeamType == 2) {
path = "TravelManager4";
}
this.Success("保存成功");
if (flagWangYue || this.isNewConfig) {
if (this.isNewConfig) {
this.$router.push({
path: path,
query: {
flag: flagWangYue,
configId: FeatureData.ConfigId,
openState: 1
}
......@@ -363,8 +364,16 @@
}
//提交按钮和另存模板跳转团控列表
else if (SaveType == 2 || SaveType == 3) {
let path = "TravelControlList";
if (TeamType == 0) {
path = "TravelControlList";
} else if (TeamType == 1) {
path = "TravelControlListSale";
} else if (TeamType == 2) {
path = "oneDayTrip";
}
this.$router.push({
path: "TravelControlList",
path: path,
query: {
cache: true
}
......@@ -381,7 +390,8 @@
//切换tab事件
clickFeature(item) {
let state = this.FeatureData.FeatureType
if ((state === 4 && item.TypeState === 5) || (state === 4 && item.TypeState === 6) || (state === 4 && item.TypeState ===
if ((state === 4 && item.TypeState === 5) || (state === 4 && item.TypeState === 6) || (state === 4 && item
.TypeState ===
7)) {
this.$confirm('尊敬的用户，行程特色“1”切换为行程特色“2”将会清空行程特色“1”里面的所有内容，您确定切换吗？', {
confirmButtonText: '确定',
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ d0dc6ce4
......@@ -34,15 +34,18 @@
:TCNUM="TCNUM" id="firstAnchor" :LineList="LineList"></TravelConfig>
<TravelDaysTripDirect id="secondAnchor" @headCallBack="getDaysTrip" :NoticeParameters="NoticeParameters"
:subConfig="journeyList" :isOpenGroup="false" :IsDirect="PostConfig.IsDirect" v-bind:AllCityList="AllCityList"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData"></TravelDaysTripDirect>
<TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData"
v-bind:StartCity="StartCity" :UseTypeArray="UseTypeArray" :AirPickUp="AirPickUp" :AirSend="AirSend" @change="handlerChangeData" :TeamType="TeamType"></TravelDaysTripDirect>
<TravelFeature ref="TravelFeature" id="thirdAnchor" @featureCallBack="getFeature" :FeatureData="FeatureData" :TeamType="TeamType"
:isNewConfig="isNewConfig" @unlockFormCommit="unlockFormCommit"></TravelFeature>
<TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
:NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
<TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="!flagWangYue"
:PostConfig="PostConfig" :modifyTcid="modifyTcid"></TravelPrice>
<TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
:priceList="PriceList" v-else :PostConfig="PostConfig" :modifyTcid="modifyTcid"></TravelPrice2>
<TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
:PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice>
<TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
<TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==2"
:priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice3>
<div class="btnFixedDiv">
<div class="toTop" @click="backTop">
<i class="iconfont icon-huidaodingbu"></i>
......@@ -65,6 +68,7 @@
import TravelNotice from "../TravelGroupControl/TravelNotice";
import TravelPrice from "../TravelGroupControl/TravelPrice";
import TravelPrice2 from "../TravelGroupControl/TravelPrice2";
import TravelPrice3 from "../TravelGroupControl/TravelPrice3";
export default {
provide() {
......@@ -185,7 +189,7 @@
ckedNav: 1,
modifyType: 1, //1:系列团修改，2:单团修改
modifyTcid: 0, //修改单团期id
flagWangYue: null,
TeamType:'',
loading: false,
isNewConfig: true,
};
......@@ -196,7 +200,8 @@
TravelFeature: TravelFeature,
TravelNotice: TravelNotice,
TravelPrice: TravelPrice,
TravelPrice2: TravelPrice2
TravelPrice2: TravelPrice2,
TravelPrice3: TravelPrice3
},
methods: {
/*获取行程特色内容对象*/
......@@ -365,12 +370,8 @@
if (SaveType == 3) {
basicData.TravelInfoIsCopy = true;
}
//小包团
if (this.flagWangYue) {
basicData.TeamType = 1;
} else {
basicData.TeamType = 0;
}
basicData.TeamType=this.TeamType;
console.log("basicData",basicData);
this.apipost(
"travel_post_SetTravelConfigInfo",
......@@ -379,7 +380,7 @@
if (res.data.resultCode == 1) {
//配置编号
TripFeature.ConfigId = res.data.data;
this.$refs.TravelFeature.getHtml(TripFeature, SaveType);
this.$refs.TravelFeature.getHtml(TripFeature, SaveType,this.TeamType);
this.$refs.TravelPrice.closeHotelDialog();
this.$refs.TravelPrice.initStatus();
} else if (res.data.resultCode == 10009) {
......@@ -563,12 +564,16 @@
return dinnerObj;
},
firstLoadConfigInfo() {
if (this.$route.query.flag) {
this.flagWangYue = this.$route.query.flag === "false" ? false : true;
} else {
this.flagWangYue = false;
var routeName = this.$route.name;
if(routeName=='TravelManager2'){
this.TeamType=0;
}
if(routeName=='TravelManager3'){
this.TeamType=1;
}
if(routeName=='TravelManager4'){
this.TeamType=2;
}
let configId = this.$route.query.configId;
this.modifyTcid = this.$route.query.tcid;
this.TCNUM = this.$route.query.TCNUM;
......@@ -584,7 +589,7 @@
this.ConfigId = configId;
let msg = {
configId: configId,
isSale: this.flagWangYue
isSale: this.TeamType==1?true:false
};
this.loading = true;
this.apipost(
......@@ -715,7 +720,7 @@
this.loading = true;
this.apipost(
"travel_get_GetCommonTravelInfo", {
isSale: this.flagWangYue
isSale: this.TeamType==1?true:false
},
res => {
if (res.data.resultCode == 1) {
......@@ -723,7 +728,7 @@
if (tempData.LineList != null) {
let data = tempData.LineList;
let dataTwo = [];
if (this.flagWangYue) {
if ( this.TeamType==1) {
data.forEach(x => {
if (x.Is_PacketGroup == 1) {
dataTwo.push(x);
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue
View file @ d0dc6ce4
......@@ -673,7 +673,8 @@
<td class="_color_666">航段</td>
<td class="_color_666">时间</td>
<td class="_color_666">PNR</td>
<td class="_color_666">使用数量/剩余数量</td>
<td class="_color_666">机票数量</td>
<td class="_color_666">使用数量</td>
<td class="_color_666">绑定机位数</td>
</tr>
<tr v-for="fitem in selectFilghtList">
......@@ -687,10 +688,10 @@
<td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>
<td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
<td>{{fitem.PNR}}</td>
<td>{{fitem.UseAmount}} / {{fitem.RemainNum}}</td>
<td>{{fitem.TicketNum}}</td>
<td>{{fitem.UseAmount}}</td>
<td>
<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"
v-model="fitem.BindNum"></el-input>
<el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
</td>
</tr>
</table>
......@@ -811,7 +812,7 @@
<script>
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid"],
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid", "TeamType"],
data() {
return {
outerVisible: false,
......@@ -1106,7 +1107,8 @@
QFlightDateStart: this.QFlightDateStart,
QFlightDateEnd: this.QFlightDateEnd,
CreateBy: createBy,
AirTicketId: this.priceData.AirTicketId
AirTicketId: this.priceData.AirTicketId,
TCID:this.priceData.TCID
};
let that = this;
......@@ -1378,11 +1380,16 @@
);
},
//改变输入框的值
getFlightBindNum() {
getFlightBindNum(fitem) {
var TotalSeat =
parseInt(this.priceData.YSeat) +
parseInt(this.priceData.CSeat) +
parseInt(this.priceData.FSeat);
if(Number(fitem.TicketNum)-Number(fitem.OtherTeamUseNum)<Number(fitem.BindNum))
{
fitem.BindNum=0;
this.Error("最多只能绑定"+(Number(fitem.TicketNum)-Number(fitem.OtherTeamUseNum))+"个机位");
}
this.selectFilghtList.forEach((x, index) => {
if (x.IsSelected) {
this.priceData.AirticketBindList.forEach(y => {
......
src/components/newTravelmanager/TravelGroupControl/TravelPrice2.vue
View file @ d0dc6ce4
......@@ -546,29 +546,29 @@
</el-select>
</div>
<div class="TPright clearfix">
<el-form-item prop="ClearOrderHour" v-if="!flagWangYue">
<el-form-item prop="ClearOrderHour" v-if="TeamType==1">
<el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.ClearOrderHour"
@keyup.native="checkInteger(priceData,'ClearOrderHour')"
@blur="checkInteger(priceData,'ClearOrderHour')">
<template slot="prepend">自动清位</template>
</el-input>
</el-form-item>
<span class="TP_Sendprepend" v-if="!flagWangYue">送签时间</span>
<el-form-item prop="SendVisaTime" style="margin-top:1px;" v-if="!flagWangYue">
<span class="TP_Sendprepend" v-if="TeamType==1">送签时间</span>
<el-form-item prop="SendVisaTime" style="margin-top:1px;" v-if="TeamType==1">
<el-date-picker clearable class="w150" v-model="priceData.SendVisaTime" type="date"
value-format="yyyy-MM-dd"
:placeholder="$t('admin.admin_choDate')"></el-date-picker>
</el-form-item>
<el-form-item prop="OutBranchId" style="margin-top:1px;">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">出团公司</span>
<el-select class="w180" v-model="priceData.OutBranchId" :disabled="flagWangYue?true:false">
<el-select class="w180" v-model="priceData.OutBranchId" :disabled="TeamType==1">
<el-option :label="$t('pub.unlimitedSel')" :value="SelectOtherDefault"></el-option>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName"
:value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-top:1px;" v-if="!flagWangYue">
<el-form-item style="margin-top:1px;" v-if="TeamType==1">
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span>
<el-select class="w180 multiple_input" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}"
v-model="priceData.SaleBranchIdArray" multiple>
......@@ -579,7 +579,7 @@
<el-form-item style="margin-top:1px;" v-else>
<span class="TP_Sendprepend" style="margin:3px -1px 0 0">销售公司</span>
<el-select class="w180 multiple_input multiple_input2" :class="{'SaleBranchList':priceData.SaleBranchIdArray==''}"
:disabled="flagWangYue?true:false"
:disabled="TeamType==1"
v-model="priceData.SaleBranchIdArray" multiple>
<el-option v-for="item in companyList" :key="item.id" :label="item.bName"
:value="item.id"></el-option>
......@@ -587,26 +587,26 @@
</el-form-item>
</div>
<div class="TPright clearfix">
<el-form-item prop="YSeat" v-if="!flagWangYue">
<el-form-item prop="YSeat" v-if="TeamType==1">
<el-input placeholder="人数" class="w190" v-model="priceData.YSeat"
@keyup.native="checkInteger(priceData,'YSeat')">
<template slot="prepend">经济舱/上铺</template>
</el-input>
</el-form-item>
<el-form-item prop="CSeat" v-if="!flagWangYue">
<el-form-item prop="CSeat" v-if="TeamType==1">
<el-input placeholder="人数" class="w190" v-model="priceData.CSeat"
@keyup.native="checkInteger(priceData,'CSeat')">
<template slot="prepend">商务舱/中铺</template>
</el-input>
</el-form-item>
<el-form-item prop="FSeat" v-if="!flagWangYue">
<el-form-item prop="FSeat" v-if="TeamType==1">
<el-input placeholder="人数" class="w260" v-model="priceData.FSeat"
@keyup.native="checkInteger(priceData,'FSeat')">
<template slot="prepend">头等舱/下铺</template>
</el-input>
</el-form-item>
<el-form-item>
<el-input class="w290" v-model="priceData.Inventory" :disabled="flagWangYue?true:false">
<el-input class="w290" v-model="priceData.Inventory" :disabled="TeamType==1">
<template slot="prepend">最低成团人数</template>
</el-input>
</el-form-item>
......@@ -617,7 +617,7 @@
:value="item.Id"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="!flagWangYue">
<el-form-item v-if="TeamType==1">
<el-input placeholder="人数" class="w290" v-model="priceData.LeaderNum">
<template slot="prepend">领队人数</template>
</el-input>
......@@ -707,7 +707,7 @@
import TravelPriceFlightList from "../TravelGroupControl/TravelPriceFlightList.vue";
export default {
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid","PostDaysTrip"],
props: ["priceList", "priceIsDirect", "OfferList", "PostConfig", "modifyTcid","PostDaysTrip","TeamType"],
data() {
return {
currentDay: 1,
......@@ -771,7 +771,6 @@
currentPriceIndex: 0, //当前团期索引位置
showPriceList: [],
priceShowCount: 6,//团期展示条数
flagWangYue:false,
userID:null,
dijiebaojiaShow:false,
queryPriceListLoading:true,
......@@ -1392,8 +1391,7 @@
}
},created(){
localStorage.removeItem('queryFlightAirMsg');
this.flagWangYue = this.$route.query.flag === "false" ? false : true;
if(this.flagWangYue){
if(this.TeamType==1){
let userInfo = this.getLocalStorage();
this.priceData.OutBranchId = userInfo.RB_Branch_id;
this.userID = userInfo.EmployeeId;
......
src/components/newTravelmanager/travelLineTrip/HotelTrip.vue
View file @ d0dc6ce4
......@@ -100,9 +100,9 @@
</td>
<td valign="middle" colspan="5">
<!--酒店-->
<el-select v-if="!dayObj.isRead &&IsDirect==1" class="w478 Ht_hotelSelect" size="mini"
<el-select v-if="!dayObj.isRead &&IsDirect==1&&TeamType!=2" class="w478 Ht_hotelSelect" size="mini"
v-model="HotelChooseArray"
multiple :multiple-limit="flagWangYue?1:3" @visible-change="getHotelList($event)"
multiple :multiple-limit="TeamType==0?3:1" @visible-change="getHotelList($event)"
@change="changeHotelList()"
filterable placeholder="请选择">
<el-option v-for="item in QHotelList" :label="item.Name" :value="item.ID" :key="item.ID">
......@@ -129,7 +129,7 @@
</template>
<script>
export default {
props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig"],
props: ["dayObj", "DayList", "CurrentIndex", "WarmTripDescribe", "IsDirect", "subConfig","TeamType"],
data() {
return {
QHotelList: [],
......@@ -194,7 +194,6 @@
PicPath: ""
}
],
flagWangYue: null,
isFirstInitDinner: false //初始含有酒店列表，加载完酒店数据在初始化餐厅列表
};
},
......@@ -650,11 +649,6 @@
},
},
mounted() {
if (this.$route.query.flag) {
this.flagWangYue = this.$route.query.flag === "false" ? false : true;
} else {
this.flagWangYue = false;
}
this.initializationData();
},
watch: {
......
src/components/newTravelmanager/travelLineTrip/TravelDaysTrip_Direct.vue
View file @ d0dc6ce4
......@@ -146,6 +146,7 @@
v-bind:NoticeParameters="NoticeParameters"
v-bind:subConfig="subConfig"
@change="handlerChangeDateList"
:TeamType="TeamType"
></travelDaysTrip>
</div>
</div>
......@@ -168,8 +169,8 @@
"UseTypeArray",
"AirPickUp",
"AirSend",
"NoticeParameters"
"NoticeParameters",
"TeamType"
],
data() {
return {
......
src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue
View file @ d0dc6ce4
......@@ -229,7 +229,7 @@
</div>
</div>
<hotelTrip :dayObj="dayObj" :CurrentIndex="CurrentIndex" :DayList="DayList" :WarmTripDescribe="WarmTripDescribe"
:IsDirect="NoticeParameters.IsDirect" :subConfig="subConfig"></hotelTrip>
:IsDirect="NoticeParameters.IsDirect" :subConfig="subConfig" :TeamType="TeamType"></hotelTrip>
<div class="TD_OperaContent">
<div class="TD_ComIcon">
<i v-if="!dayObj.isRead" class="iconfont icon-chakan" @click="getRead"></i>
......@@ -276,7 +276,8 @@
"AirSend",
"DayList", //线路行程
"NoticeParameters",
"subConfig"
"subConfig",
"TeamType"
],
data() {
return {
......
src/router/config.js
View file @ d0dc6ce4
......@@ -1412,6 +1412,14 @@ export default {
title: '自主开团'
},
},
{
path: '/TravelManager4', //一日游开团
name: 'TravelManager4',
component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelManager2'], resolve),
meta: {
title: '自主开团'
},
},
{
path: '/BasicOpenGroup', //基础班团控配置
name: 'BasicOpenGroup',
......@@ -1427,6 +1435,14 @@ export default {
title: '团控列表'
},
},
{
path:'/oneDayTrip', //一日游
name:'oneDayTrip',
component: resolve => require(['@/components/TravelManager/TravelList/oneDayTrip'], resolve),
meta: {
title: '一日游'
},
},
{
path: '/priceIncomeConfirmInfo',///priceIncomeConfirmInfo
name: 'priceIncomeConfirmInfo',
......@@ -1450,7 +1466,14 @@ export default {
meta: {
title: '行程列表'
},
}, { //行程列表
}, {
path: '/oneDayTripList',
name: 'oneDayTripList',
component: resolve => require(['@/components/TravelManager/TravelList/oneDayTripList'], resolve),
meta: {
title: '一日游行程列表'
},
},{ //行程列表
path: '/SaleTripList',
name: 'SaleTripList',
component: resolve => require(['@/components/TravelManager/TravelList/SaleTripList'], resolve),
......
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