Skip to content

S
SuperMan
Commit 804dcd76 authored by 吴春's avatar 吴春
Browse files
Options

1

parent be2f5a0b
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 3 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 804dcd76
...@@ -1249,6 +1249,20 @@ ...@@ -1249,6 +1249,20 @@
</el-popover> </el-popover>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" >
<el-form-item :label="$t('salesModule.GoFlight')" prop="PlatformOrder">
<el-select v-model="AirTicketIdList" multiple clearable collapse-tags placeholder="请选择">
<el-option
v-for="item in PriceFight"
:key="item.AirLineTicketId"
:label="item.FlightStr"
:value="item.AirLineTicketId">
<!-- <span style="float: left">{{ item.AirLineTicketId }}</span> -->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.FlightStr }}</span> -->
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="4"> &nbsp;</el-col> <el-col :span="4"> &nbsp;</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -2767,6 +2781,8 @@ ...@@ -2767,6 +2781,8 @@
IsChargeLossOrders: 0, IsChargeLossOrders: 0,
Unit_PriceList: [], //成交单价下拉数据 Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0, LessMoney: 0,
AirTicketIdList:[],
PriceFight:[],
addMsg: { addMsg: {
GroupTypeNeedHouse: "0", GroupTypeNeedHouse: "0",
OrderForm: 1, OrderForm: 1,
...@@ -2815,6 +2831,7 @@ ...@@ -2815,6 +2831,7 @@
AirticketNum: "0", AirticketNum: "0",
ScenicRefundArr: [], ScenicRefundArr: [],
ScenicList: [], //2025-07-14 add bY:W ScenicList: [], //2025-07-14 add bY:W
AirTicketIds:"",
GoCityTime: "", GoCityTime: "",
BackCityTime: "", BackCityTime: "",
CommissionSharePeople: "-1", CommissionSharePeople: "-1",
...@@ -3824,6 +3841,27 @@ ...@@ -3824,6 +3841,27 @@
(err) => {} (err) => {}
); );
}, },
getPriceBindflight(TCID) {
this.PriceFight=[];
this.apipost(
"AirTicket_get_GetSellPriceBindPriceService", {
TCID,
},
(res) => {
if (res.data.resultCode == 1) {
this.PriceFight = res.data.data;
if(this.addMsg.AirTicketIds.length>0){
this.AirTicketIdList= this.addMsg.AirTicketIds.split(',').map(Number); // ["1", "2", "3"]
}else{
if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
}
}
}
}
);
},
platformOrderMethods() { platformOrderMethods() {
if (this.addMsg.PlatformOrder == "") { if (this.addMsg.PlatformOrder == "") {
this.addMsg.MinOrderPrice = 0; this.addMsg.MinOrderPrice = 0;
...@@ -3931,6 +3969,18 @@ ...@@ -3931,6 +3969,18 @@
this.addMsg.OneSex = x.OneSex; this.addMsg.OneSex = x.OneSex;
this.addMsg.PlatformAccount = ""; this.addMsg.PlatformAccount = "";
this.getScenicRefund(obj.tcid); this.getScenicRefund(obj.tcid);
this.getPriceBindflight(obj.tcid);
if(this.addMsg.AirTicketIds.length>0){
console.log("this.addMsg.AirTicketIds.split(',')",this.addMsg.AirTicketIds.split(','));
this.AirTicketIdList= this.addMsg.AirTicketIds.split(',').map(Number); // ["1", "2", "3"]
console.log("this.AirTicketIdList",this.AirTicketIdList);
}else{
if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
}
}
this.getPriceBindflight(obj.tcid);
this.getPlatformAccount( this.getPlatformAccount(
obj.platformAccountTypeId, obj.platformAccountTypeId,
obj.platformAccount obj.platformAccount
...@@ -4074,8 +4124,12 @@ ...@@ -4074,8 +4124,12 @@
this.addObj = res.data.data.modelPrice; this.addObj = res.data.data.modelPrice;
let x = res.data.data.model; let x = res.data.data.model;
this.addMsg = x; this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr; this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid); this.getScenicRefund(obj.tcid);
this.getPriceBindflight(obj.tcid);
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString(); this.addMsg.CustomerType = x.CustomerType.toString();
...@@ -4663,7 +4717,10 @@ ...@@ -4663,7 +4717,10 @@
this.SOMsg.ApplyReason = ""; this.SOMsg.ApplyReason = "";
}, },
clearMsg() { clearMsg() {
this.addMsg.OrderId = "0"; this.PriceFight=[];
this.AirTicketIdList=[];
this.addMsg.AirTicketIds = "";
this.addMsg.OrderId = "0";
this.addMsg.TCID = "0"; this.addMsg.TCID = "0";
this.addMsg.IsIntermodal = "2"; this.addMsg.IsIntermodal = "2";
this.addMsg.IsReturnIntermodal = "2"; this.addMsg.IsReturnIntermodal = "2";
...@@ -4800,6 +4857,9 @@ ...@@ -4800,6 +4857,9 @@
this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount; this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
this.addMsg.IsDealDiscount = 1; this.addMsg.IsDealDiscount = 1;
this.addMsg.ScenicRefundArr = []; this.addMsg.ScenicRefundArr = [];
if(this.AirTicketIdList!=null&&this.AirTicketIdList.length>0){
this.addMsg.AirTicketIds =this.AirTicketIdList.map(String).join(',');
}
this.apipost( this.apipost(
"sellorder_post_SetOrderInfo_02", "sellorder_post_SetOrderInfo_02",
this.addMsg, this.addMsg,
......
src/components/SalesModule/groupTourOrderByTuan.vue
View file @ 804dcd76
...@@ -1544,6 +1544,18 @@ ...@@ -1544,6 +1544,18 @@
</div> </div>
</div> </div>
</el-col> </el-col>
<el-col :span="4" >
<el-form-item :label="$t('salesModule.GoFlight')" prop="PlatformOrder">
<el-select v-model="AirTicketIdList" multiple clearable collapse-tags placeholder="请选择">
<el-option
v-for="item in PriceFight"
:key="item.AirLineTicketId"
:label="item.FlightStr"
:value="item.AirLineTicketId">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
...@@ -3443,9 +3455,12 @@ ...@@ -3443,9 +3455,12 @@
IsChargeLossOrders: 0, IsChargeLossOrders: 0,
Unit_PriceList: [], //成交单价下拉数据 Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0, LessMoney: 0,
AirTicketIdList:[],
PriceFight:[],
addMsg: { addMsg: {
GroupTypeNeedHouse: "0", GroupTypeNeedHouse: "0",
OrderForm: "", OrderForm: "",
AirTicketIds:"",
OrderId: "0", OrderId: "0",
TCID: "0", TCID: "0",
CustomerType: "", CustomerType: "",
...@@ -4465,8 +4480,6 @@ ...@@ -4465,8 +4480,6 @@
x.Number = 0; x.Number = 0;
} }
}) })
console.log("addMsg.ScenicList", this.addMsg.ScenicList);
this.getTotalPrice(); this.getTotalPrice();
this.getTicheng(); this.getTicheng();
}, },
...@@ -4507,6 +4520,26 @@ ...@@ -4507,6 +4520,26 @@
}, },
(err) => {} (err) => {}
); );
},
getPriceBindflight(TCID) {
this.PriceFight=[];
this.apipost(
"AirTicket_get_GetSellPriceBindPriceService", {
TCID,
},
(res) => {
if (res.data.resultCode == 1) {
this.PriceFight = res.data.data;
if(this.addMsg.AirTicketIds.length>0){
this.AirTicketIdList= this.addMsg.AirTicketIds.split(',').map(Number); // ["1", "2", "3"]
}else{
if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
}
}
}
}
);
}, },
getScenicRefund_Old(TCID, OrderId) { getScenicRefund_Old(TCID, OrderId) {
this.OrderId = OrderId; this.OrderId = OrderId;
...@@ -4670,6 +4703,15 @@ ...@@ -4670,6 +4703,15 @@
obj.platformAccountTypeId, obj.platformAccountTypeId,
obj.platformAccount obj.platformAccount
); );
this.getPriceBindflight(obj.tcid);
if(this.addMsg.AirTicketIds.length>0){
this.AirTicketIdList= this.addMsg.AirTicketIds.split(',').map(Number); // ["1", "2", "3"]
console.log("this.AirTicketIdList",this.AirTicketIdList);
}else{
if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
}
}
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString(); this.addMsg.CustomerType = x.CustomerType.toString();
...@@ -4831,6 +4873,8 @@ ...@@ -4831,6 +4873,8 @@
this.addMsg = x; this.addMsg = x;
this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr; this.addMsg.ScenicRefundArr = res.data.data.ScenicRefundArr;
this.getScenicRefund(obj.tcid, obj.orderId); this.getScenicRefund(obj.tcid, obj.orderId);
this.getPriceBindflight(obj.tcid);
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString(); this.addMsg.CustomerType = x.CustomerType.toString();
...@@ -5454,6 +5498,9 @@ ...@@ -5454,6 +5498,9 @@
clearMsg() { clearMsg() {
this.addMsg.OrderId = "0"; this.addMsg.OrderId = "0";
this.addMsg.TCID = "0"; this.addMsg.TCID = "0";
this.addMsg.AirTicketIds = "";
this.PriceFight=[];
this.AirTicketIdList=[];
this.addMsg.IsIntermodal = "2"; this.addMsg.IsIntermodal = "2";
this.addMsg.IsReturnIntermodal = "2"; this.addMsg.IsReturnIntermodal = "2";
this.addMsg.Unit_Price = "0"; this.addMsg.Unit_Price = "0";
...@@ -5578,6 +5625,9 @@ ...@@ -5578,6 +5625,9 @@
this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount; this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
this.addMsg.IsDealDiscount = 1; this.addMsg.IsDealDiscount = 1;
this.addMsg.ScenicRefundArr = []; this.addMsg.ScenicRefundArr = [];
if(this.AirTicketIdList!=null&&this.AirTicketIdList.length>0){
this.addMsg.AirTicketIds =this.AirTicketIdList.map(String).join(',');
}
this.apipost( this.apipost(
"sellorder_post_SetOrderInfo_02", "sellorder_post_SetOrderInfo_02",
this.addMsg, this.addMsg,
...@@ -5655,6 +5705,9 @@ ...@@ -5655,6 +5705,9 @@
Number(this.addMsg.AirticketNum); Number(this.addMsg.AirticketNum);
this.addMsg.IsChildrenTour = this.IsChildrenTour; this.addMsg.IsChildrenTour = this.IsChildrenTour;
this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount; this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
if(this.AirTicketIdList!=null&&this.AirTicketIdList.length>0){
this.addMsg.AirTicketIds =this.AirTicketIdList.map(String).join(',');
}
this.apipost( this.apipost(
"sellorder_post_SetOrderInfoForAirTicket", "sellorder_post_SetOrderInfoForAirTicket",
this.addMsg, this.addMsg,
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 804dcd76
...@@ -1754,6 +1754,18 @@ ...@@ -1754,6 +1754,18 @@
</el-popover> </el-popover>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" >
<el-form-item :label="$t('salesModule.GoFlight')" prop="PlatformOrder">
<el-select v-model="AirTicketIdList" multiple clearable collapse-tags placeholder="请选择">
<el-option
v-for="item in PriceFight"
:key="item.AirLineTicketId"
:label="item.FlightStr"
:value="item.AirLineTicketId">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="4"> <el-col :span="4">
...@@ -4205,9 +4217,12 @@ ...@@ -4205,9 +4217,12 @@
OpSetLossMoney: 0, OpSetLossMoney: 0,
Unit_PriceList: [], //成交单价下拉数据 Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0, LessMoney: 0,
AirTicketIdList:[],
PriceFight:[],
addMsg: { addMsg: {
IsOPUpdate: 1, //2019-09-23 Add by:W IsOPUpdate: 1, //2019-09-23 Add by:W
GroupTypeNeedHouse: "0", GroupTypeNeedHouse: "0",
AirTicketIds:"",
OrderId: "0", OrderId: "0",
TCID: "0", TCID: "0",
CustomerType: "", CustomerType: "",
...@@ -4252,6 +4267,7 @@ ...@@ -4252,6 +4267,7 @@
AirticketNum: "0", AirticketNum: "0",
ScenicRefundArr: [], ScenicRefundArr: [],
ScenicList: [], //2025-07-14 add bY:W ScenicList: [], //2025-07-14 add bY:W
GoCityTime: "", GoCityTime: "",
BackCityTime: "", BackCityTime: "",
CommissionSharePeople: "-1", CommissionSharePeople: "-1",
...@@ -4937,6 +4953,9 @@ ...@@ -4937,6 +4953,9 @@
obj.PlatformAccountTypeId, obj.PlatformAccountTypeId,
obj.PlatformAccount obj.PlatformAccount
); );
this.getPriceBindflight(obj.TCID);
this.SetOutCityId = res.data.data.SetOutCityId; this.SetOutCityId = res.data.data.SetOutCityId;
this.reOutCityId = res.data.data.SetBackCityId; this.reOutCityId = res.data.data.SetBackCityId;
this.addMsg.CustomerType = x.CustomerType.toString(); this.addMsg.CustomerType = x.CustomerType.toString();
...@@ -5489,6 +5508,28 @@ ...@@ -5489,6 +5508,28 @@
(err) => {} (err) => {}
); );
}, },
getPriceBindflight(TCID) {
this.PriceFight=[];
this.AirTicketIdList=[];
this.apipost(
"AirTicket_get_GetSellPriceBindPriceService", {
TCID,
},
(res) => {
if (res.data.resultCode == 1) {
this.PriceFight = res.data.data;
if(this.addMsg.AirTicketIds.length>0){
this.AirTicketIdList= this.addMsg.AirTicketIds.split(',').map(Number);
}
else{
if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
}
}
}
}
);
},
getScenicRefund_V1(TCID, OrderId) { getScenicRefund_V1(TCID, OrderId) {
this.OrderId = OrderId; this.OrderId = OrderId;
let msg = { let msg = {
...@@ -6071,6 +6112,9 @@ ...@@ -6071,6 +6112,9 @@
this.SOMsg.ApplyReason = ""; this.SOMsg.ApplyReason = "";
}, },
clearMsg() { clearMsg() {
this.PriceFight=[];
this.AirTicketIdList=[];
this.addMsg.AirTicketIds = "";
this.addMsg.OrderId = "0"; this.addMsg.OrderId = "0";
this.addMsg.TCID = "0"; this.addMsg.TCID = "0";
this.addMsg.IsIntermodal = "2"; this.addMsg.IsIntermodal = "2";
...@@ -6105,6 +6149,7 @@ ...@@ -6105,6 +6149,7 @@
this.addMsg.PlatformOrder = ""; this.addMsg.PlatformOrder = "";
this.ddlyList = []; this.ddlyList = [];
this.addMsg.ScenicList = []; this.addMsg.ScenicList = [];
this.addMsg.AirTicketIds="";
this.addMsg.Remarks = ""; this.addMsg.Remarks = "";
this.addMsg.MinOrderPrice = ""; this.addMsg.MinOrderPrice = "";
this.addMsg.LuggageNum = ""; this.addMsg.LuggageNum = "";
...@@ -6211,6 +6256,9 @@ ...@@ -6211,6 +6256,9 @@
this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount; this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
this.addMsg.IsDealDiscount = 1; this.addMsg.IsDealDiscount = 1;
this.addMsg.ScenicRefundArr = []; this.addMsg.ScenicRefundArr = [];
if(this.AirTicketIdList!=null&&this.AirTicketIdList.length>0){
this.addMsg.AirTicketIds =this.AirTicketIdList.map(String).join(',');
}
this.apipost( this.apipost(
"sellorder_post_SetOrderInfo_02", "sellorder_post_SetOrderInfo_02",
this.addMsg, this.addMsg,
......
src/components/orderCommon/order-form2.vue
View file @ 804dcd76
...@@ -720,6 +720,21 @@ ...@@ -720,6 +720,21 @@
</el-popover> </el-popover>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="4" >
<el-form-item :label="$t('salesModule.GoFlight')" prop="PlatformOrder">
<el-select v-model="AirTicketIdList" multiple clearable collapse-tags placeholder="请选择">
<el-option
v-for="item in PriceFight"
:key="item.AirLineTicketId"
:label="item.FlightStr"
:value="item.AirLineTicketId">
<!-- <span style="float: left">{{ item.AirLineTicketId }}</span> -->
<!-- <span style="float: right; color: #8492a6; font-size: 13px">{{ item.FlightStr }}</span> -->
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row> </el-row>
<template v-if="pagesTitle == '当地游产品'"> <template v-if="pagesTitle == '当地游产品'">
...@@ -934,6 +949,7 @@ ...@@ -934,6 +949,7 @@
AirticketNum: "0", AirticketNum: "0",
ScenicRefundArr: [], ScenicRefundArr: [],
ScenicList: [], //可退景点人数 ScenicList: [], //可退景点人数
AirTicketIds:"",
GoCityTime: "", GoCityTime: "",
BackCityTime: "", BackCityTime: "",
CommissionSharePeople: "0", CommissionSharePeople: "0",
...@@ -1101,6 +1117,8 @@ ...@@ -1101,6 +1117,8 @@
joinTypeList: [], //参团类型列表 joinTypeList: [], //参团类型列表
tradeWayList: [], //交易方式列表 tradeWayList: [], //交易方式列表
ScenicRefundList: [], //可退景点列表 ScenicRefundList: [], //可退景点列表
PriceFight:[],//团绑定的航班信息
AirTicketIdList:[],//选中的航班信息
employeeList: [], //员工列表 employeeList: [], //员工列表
PlatformAccountList: [], //平台账户绑定列表 PlatformAccountList: [], //平台账户绑定列表
PlatformAccountList1: [], //所有平台账户列表 PlatformAccountList1: [], //所有平台账户列表
...@@ -2136,6 +2154,8 @@ ...@@ -2136,6 +2154,8 @@
}, },
//清空表单信息 //清空表单信息
clearMsg() { clearMsg() {
this.AirTicketIdList=[];
this.PriceFight=[];
this.DiscountAmountId = null; this.DiscountAmountId = null;
this.DiscountAmountObj = {}; this.DiscountAmountObj = {};
this.ScenicRefundList = []; this.ScenicRefundList = [];
...@@ -2151,6 +2171,7 @@ ...@@ -2151,6 +2171,7 @@
IndustryCategory: "", IndustryCategory: "",
ContactName: "", ContactName: "",
ContactMobile: "", ContactMobile: "",
AirTicketIds:"",
CustomerId: "", CustomerId: "",
CustomerChildrenId: "", CustomerChildrenId: "",
DepartureCityId: "0", DepartureCityId: "0",
...@@ -2337,6 +2358,10 @@ ...@@ -2337,6 +2358,10 @@
this.addMsg.IsChildrenTour = this.priceObj.IsSupportChildren; this.addMsg.IsChildrenTour = this.priceObj.IsSupportChildren;
this.addMsg.IsBirdDiscount = this.priceObj.IsBirdDiscount; this.addMsg.IsBirdDiscount = this.priceObj.IsBirdDiscount;
if(this.AirTicketIdList!=null&&this.AirTicketIdList.length>0){
this.addMsg.AirTicketIds =this.AirTicketIdList.map(String).join(',');
}
let url; let url;
if (this.PProductType == 1) { if (this.PProductType == 1) {
...@@ -2473,6 +2498,24 @@ ...@@ -2473,6 +2498,24 @@
} }
); );
}, },
getPriceBindflight(TCID) {
this.PriceFight=[];
this.apipost(
"AirTicket_get_GetSellPriceBindPriceService", {
TCID,
},
(res) => {
if (res.data.resultCode == 1) {
this.PriceFight = res.data.data;
this.addMsg.AirTicketIds = ''; // 设置默认值
if(Array.isArray(this.PriceFight) && this.PriceFight.length>0 ){
this.AirTicketIdList.push(this.PriceFight[0].AirLineTicketId);
}
}
}
);
},
//获取交易方式 //获取交易方式
getTradeWay() { getTradeWay() {
this.apipost("sellorder_get_GetSellTradeWayEnumList", {}, (res) => { this.apipost("sellorder_get_GetSellTradeWayEnumList", {}, (res) => {
...@@ -2794,6 +2837,7 @@ ...@@ -2794,6 +2837,7 @@
//监听TCID变化 //监听TCID变化
PTCID: function (oldValue, newVal) { PTCID: function (oldValue, newVal) {
this.getScenicRefund(this.PTCID); // 可退景点 this.getScenicRefund(this.PTCID); // 可退景点
this.getPriceBindflight(this.PTCID); // 团绑定的航班信息
}, },
'addMsg.CustomerId': { 'addMsg.CustomerId': {
handler(oldValue, newVal) { handler(oldValue, newVal) {
......
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