Skip to content

S
SuperMan
Commit 15124334 authored by youjie's avatar youjie
Browse files
Options

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

parents 9dc0e915 828e062a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2074 additions and 2229 deletions
src/components/SalesModule/groupTourOrder.vue
View file @ 15124334
......@@ -4390,6 +4390,7 @@
"app_today_visit_GetOrderMyCustomerList", {
typeId: id,
lineId: lineId,
IsLineId: 1,
},
(res) => {
if (res.data.resultCode == 1) {
......
src/components/SalesModule/planeTicketInquiry.vue
View file @ 15124334
......@@ -2155,7 +2155,8 @@
})
this.apipost('app_today_visit_GetOrderMyCustomerList', {
typeId: this.addMsg.CustomerType,
lineId: this.commonLineId
lineId: this.commonLineId,
IsLineId: 1,
}, res => {
if (res.data.resultCode == 1) {
this.khmdList = res.data.data
......
src/components/SalesModule/planeTourOrder.vue
View file @ 15124334
......@@ -2407,7 +2407,8 @@ export default {
getKhmdList(id, lineId) {
this.apipost(
"app_today_visit_GetOrderMyCustomerList",
{ typeId: id, lineId: lineId },
{ typeId: id, lineId: lineId,
IsLineId: 1, },
res => {
if (res.data.resultCode == 1) {
this.khmdList = res.data.data;
......
src/components/SalesModule/productQuery.vue
View file @ 15124334
......@@ -3321,6 +3321,7 @@
"app_today_visit_GetOrderMyCustomerList", {
typeId: this.addMsg.CustomerType,
lineId: this.addObj.LineID,
IsLineId: 1,
},
(res) => {
if (res.data.resultCode == 1) {
......
src/components/SalesModule/productQueryOne.vue
View file @ 15124334
......@@ -2261,7 +2261,8 @@
getKhmdList() {
this.apipost('app_today_visit_GetOrderMyCustomerList', {
typeId: this.addMsg.CustomerType,
lineId: this.addObj.LineID
lineId: this.addObj.LineID,
IsLineId: 1,
}, res => {
if (res.data.resultCode == 1) {
this.khmdList = res.data.data
......
src/components/TravelManager/TravelTeam/buyComponents/index.vue
View file @ 15124334
......@@ -1913,6 +1913,7 @@
"app_today_visit_GetOrderMyCustomerList", {
typeId: this.addMsg.CustomerType,
lineId: this.addObj.LineID,
IsLineId: 1,
},
(res) => {
if (res.data.resultCode == 1) {
......
src/components/TravelManager/TravelTeam/chooseCustomer.vue
View file @ 15124334
......@@ -2,10 +2,23 @@
</style>
<template>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>选择同行</span>
<el-button style="float: right; padding: 3px 0" type="text" @click="sureData">确认选择</el-button>
<div>
<div style="border: none; display: flex; margin-bottom: 20px">
<ul style="overflow: initial!important;display: flex; width: 100%">
<li style="display: flex">
<span style="width: 60px; line-height: 34px">
<em>{{$t('salesModule.keyWords')}}</em>
</span>
<el-input v-model="qMsg.CustomerName" :placeholder="$t('salesModule.InputPhone')"
@keyup.native="reSearchPage()"></el-input>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="reSearchPage()">
</li>
<li>
<el-button style="margin-left:10px;" size="small " type="primary" @click="sureData" round>确认选择</el-button>
</li>
</ul>
</div>
<div class="chooseCustomerInfo">
<el-table :data="dataList" style="width:100%" border v-loading='loading'
......@@ -37,7 +50,7 @@
layout="total,prev, pager, next, jumper" :page-size="qMsg.pageSize" :total="qMsg.total">
</el-pagination>
</div>
</el-card>
</div>
</template>
<script>
export default {
......@@ -46,6 +59,7 @@
loading: false,
dataList: [], //数据列表
qMsg: {
CustomerName: '',
pageIndex: 1,
currentPage: 1,
pageSize: 8,
......@@ -75,6 +89,10 @@
this.qMsg.pageIndex = val;
this.getCustomerList();
},
reSearchPage() {
this.qMsg.pageIndex = 1;
this.getCustomerList();
},
// 获取合作伙伴列表
getCustomerList() {
this.loading = true;
......@@ -95,7 +113,6 @@
}
);
},
},
};
......
src/components/TravelManager/TravelTeam/editTeamInfo.vue
View file @ 15124334
......@@ -200,7 +200,7 @@
<el-row>
<el-col :span="24">
<el-form-item label="业务名称" prop="GTeamName">
<el-input v-model="editForm.GTeamName"></el-input>
<el-input v-model="editForm.GTeamName" maxlength="300"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -213,7 +213,7 @@
<el-col :span="12">
<!--添加修改航班-->
<ul class="_add_hangban clearfix">
<li :class="addMsg.TicketType == 1 ? '_allWidth' : ''">
<li>
<span class="_add_go_label">{{ $t("Airticket.Air_go") }}</span>
<div class="_add_go" v-for="(item, index) in addMsg.flightList" :key="index">
<template v-if="item.TicketType == 1">
......@@ -249,7 +249,7 @@
<p>
<span>{{ $t("pub.addBtn") }}</span>
<span class="_add_btn" @click="addFlight()">{{
$t("pub.sureBtn")
$t("pub.saveBtn")
}}</span>
</p>
<span class="_add_hbh">
......@@ -321,7 +321,7 @@
<p>
<span>{{ $t("pub.addBtn") }}</span>
<span class="_add_btn" @click="addFlightReturn()">{{
$t("pub.sureBtn")
$t("pub.saveBtn")
}}</span>
</p>
<span class="_add_hbh">
......@@ -442,7 +442,8 @@
<el-col :span="24">
<el-form-item label="合作伙伴">
<template v-for="(subItem,subIndex) in friendList">
<el-tag :key="subIndex+10000" style="margin-right:10px;" closable @close="deleteCustomer(subIndex)">
<el-tag :key="subIndex+10000" style="margin-right:10px;" closable
@close="deleteCustomer(subItem,subIndex)">
{{subItem.CustomerName}}</el-tag>
</template>
<el-button @click="showCustomer">选择</el-button>
......@@ -476,11 +477,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-col :span="8">
&nbsp;
</el-col>
<el-col :span="8">
<el-button @click="closeForm()">关闭</el-button>&nbsp;
<el-button @click="submit" type="primary" :loading="saveLoading">
保存
</el-button>
</el-col>
<el-col :span="8">
&nbsp;
</el-col>
</el-row>
</div>
</el-form>
......@@ -538,12 +546,11 @@
friendList: [],
//新增修改航班信息
addMsg: {
TicketType: 2,
flightList: [],
},
AirportNameList: [],
BackAirportNameList: [],
airlineList: [],
AirportNameList: [], //去程航班列表
BackAirportNameList: [], //回程航班列表
airlineList: [], //航空公司列表
editForm: {
GTeamName: "", // 业务名称
StartDate: "", // 出发时间
......@@ -596,7 +603,6 @@
};
},
created() {
this.customers = []
this.initAirlines();
},
mounted() {
......@@ -605,9 +611,33 @@
}
},
methods: {
closeForm() {
//关闭弹窗并刷新页面
this.$emit("success");
},
//删除客户
deleteCustomer(index) {
this.friendList.splice(index, 1);
deleteCustomer(item, index) {
var that = this;
var tipMsg = "确认要删除此合作伙伴?"
that.Confirm(tipMsg, function () {
if (item.TPartnerId && item.TPartnerId > 0) {
that.apipost(
"travelteam_DeleteTravelTeamPartner", {
TPartnerId: item.TPartnerId
},
(res) => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
} else {
that.Error(res.data.message);
}
}
);
} else {
that.Success("删除合作伙伴成功!");
}
that.friendList.splice(index, 1);
})
},
//显示客户
showCustomer() {
......@@ -617,10 +647,14 @@
refreshPage(selectArray) {
if (selectArray && selectArray.length > 0) {
selectArray.forEach(item => {
this.friendList.push({
CustomerId: item.CustomerId,
CustomerName: item.CustomerName
})
let existsObj = this.friendList.find(qitem => qitem.CustomerId == item.CustomerId);
//不存在就添加
if (!existsObj) {
this.friendList.push({
CustomerId: item.CustomerId,
CustomerName: item.CustomerName
})
}
});
}
this.isShowCustomerDialog = false;
......@@ -633,21 +667,16 @@
},
(res) => {
if (res.data.resultCode == 1) {
this.editForm = res.data.data;
const {
TravelTeamFlightList,
TravelTeamPartnerList
} =
res.data.data;
TravelTeamFlightList.forEach((item) => {
item.IsTransfer = item.IsTransfer || 0;
item.TicketType = Math.random() > 0.5 ? 1 : 2;
});
this.addMsg.flightList = TravelTeamFlightList;
console.log("this.addMsg",this.addMsg);
this.friendList = TravelTeamPartnerList;
var tempObj = res.data.data;
this.editForm = tempObj;
if (tempObj.TravelTeamFlightList && tempObj.TravelTeamFlightList.length > 0) {
this.addMsg.flightList = tempObj.TravelTeamFlightList;
}
if (tempObj.TravelTeamPartnerList && tempObj.TravelTeamPartnerList.length > 0) {
this.friendList = tempObj.TravelTeamPartnerList;
}
} else {
this.$message.error(res.data.message);
this.Error(res.data.message);
}
}
);
......@@ -703,6 +732,7 @@
newList.TicketDepartureTime = x.DepartureTime;
newList.TicketArrivalTime = x.ArrivalTime;
newList.ID = this.addGoFlight.ID;
newList.TicketType = 1;
this.addMsg.flightList.push(newList);
}
});
......@@ -727,6 +757,7 @@
newList.TicketDepartureTime = x.DepartureTime;
newList.TicketArrivalTime = x.ArrivalTime;
newList.ID = this.returnTripData.ID;
newList.TicketType = 2;
this.addMsg.flightList.push(newList);
}
});
......
src/components/TravelManager/TravelTeam/priceGroup.vue
View file @ 15124334
......@@ -537,48 +537,10 @@
<template>
<div class="flexOne">
<div @click="showBuy = true"><el-button>下单</el-button></div>
<!-- <div @click="showBuy = true"><el-button>下单</el-button></div> -->
<!-- 查询条件 -->
<div class="productQuerySearch" v-if="!TCIDList">
<ul>
<li>
<span><em>{{ $t("scen.sc_cp") }}</em>
<el-select class="w150" v-model="msg.BranchId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option v-for="item in companyList" :label="item.BName" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
</span>
</li>
<li>
<span><em>{{ $t("advmanager.v_line") }}</em>
<el-select class="w150" v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" @change="
getLineTeamList(msg.LineId), getAimPlaceList(msg.LineId, '')
">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="(item,index) in LineList" :label="item.LineName" :value="item.LineID" :key="index">
</el-option>
</el-select>
</span>
</li>
<li>
<span><em>{{ $t("advmanager.v_xilie") }}</em>
<el-select class="w150" v-model="msg.LineTeamId" filterable :placeholder="$t('pub.pleaseSel')"
@change="getAimPlaceList('', msg.LineTeamId)">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="item in LineTeamList" :label="item.LtName" :value="item.LtID" :key="item.LtID">
</el-option>
</el-select>
</span>
</li>
<li>
<span><em>{{ $t("system.query_dest") }}</em>
<el-select class="w150" v-model="msg.AimPlaceId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="item in AimPlaceList" :label="item.PlaceName" :value="item.PlaceID" :key="item.PlaceID">
</el-option>
</el-select>
</span>
</li>
<li>
<span>
<em>{{ $t("visa.v_tuanhao") }}</em>
......@@ -594,73 +556,6 @@
type="date"></el-date-picker>
</span>
</li>
<li>
<span><em>{{ $t("system.table_goCity") }}</em>
<el-select class="w150" v-model="msg.CityId" filterable :placeholder="$t('pub.pleaseSel')">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="item in startCityList1" :label="item.startCityName" :value="item.ID" :key="item.ID">
</el-option>
</el-select>
</span>
</li>
<li style="
height: 34px;
line-height: 34px;
padding: 0 0 0 20px;
vertical-align: middle;
">
<el-popover width="270" trigger="click">
<div class="superSearchLayer">
<p>{{ $t("visa.v_tkgjcx") }}</p>
<div>
<span>{{ $t("system.query_airCompanyName") }}</span>
<el-select v-model="msg.FlightID" filterable :placeholder="$t('system.ph_buxian')" class="w150">
<el-option :label="$t('pub.unlimitedSel')" value="-1"></el-option>
<el-option v-for="item in airlineList" :key="item.AirLineId" :label="item.AlName"
:value="item.AirLineId">
</el-option>
</el-select>
</div>
<div>
<span>{{ $t("visa.v_xcdays") }}</span>
<el-input class="w150" v-model="msg.DaysTrip" @keyup.native="checkInteger(msg, 'DaysTrip')"></el-input>
</div>
<div>
<span>{{ $t("visa.v_teamnum") }}</span>
<el-input class="w69" v-model="msg.minGroupSize" @keyup.native="checkInteger(msg, 'minGroupSize')">
</el-input>
-
<el-input class="w69" v-model="msg.maxGroupSize" @keyup.native="checkInteger(msg, 'maxGroupSize')">
</el-input>
</div>
<div>
<span>{{ $t("leader.leader_registraNum") }}</span>
<el-input class="w69" v-model="msg.minApplySize" @keyup.native="checkInteger(msg, 'minApplySize')">
</el-input>
-
<el-input class="w69" v-model="msg.maxApplySize" @keyup.native="checkInteger(msg, 'maxApplySize')">
</el-input>
</div>
<div>
<span>{{ $t("Airticket.Air_salesPlatform") }}</span>
<el-select filterable multiple v-model="msg.SalePlat" :placeholder="$t('system.ph_buxian')"
class="w150 multiple_input">
<el-option v-for="item in salePlace" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</div>
<div>
<input type="button" style="width: 230px !important" class="normalBtn" :value="$t('pub.searchBtn')"
@click="
getList();
resetPageIndex();
" />
</div>
</div>
<span slot="reference" style="cursor: pointer">{{ $t("visa.v_gjchaxun") }}<i
class="el-icon-caret-bottom"></i></span>
</el-popover>
</li>
<li style="
height: 34px;
line-height: 34px;
......@@ -1190,7 +1085,6 @@
return;
}
}
addMsg.TCID = this.addObj.TCID;
addMsg.GuestNum =
Number(addMsg.ManNum) +
ChirdNum +
......@@ -1200,7 +1094,7 @@
addMsg.IsChildrenTour = this.addObj.IsSupportChildren;
addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
this.apipost(
"sellorder_post_SetOrderInfo",
"sellorder_post_SetTravelTeamOrderForB2B",
addMsg,
(res) => {
if (res.data.resultCode == 1) {
......@@ -1317,6 +1211,7 @@
goBuy(obj) {
this.showBuy = true;
this.buyInfo = obj
this.addObj = obj
},
getJourney(id, TCID, title) {
......@@ -1330,7 +1225,7 @@
getList() {
this.loading = true;
this.apipost(
"travelteam_GetTeavelTeamPage",
"sellorder_post_GetTravelTeamProductCenter",
this.msg,
(res) => {
if (res.data.resultCode == 1) {
......
src/components/TravelManager/TravelTeam/travelTeamList.vue
View file @ 15124334
......@@ -128,16 +128,11 @@
<i class="el-icon-arrow-down el-icon--right"></i>
</span>
<el-dropdown-menu slot="dropdown" class="travelControlDropDown">
<el-dropdown-item>
财务入账
<el-dropdown-item @click.native="goToOrderList(item)">
报名清单
</el-dropdown-item>
<el-dropdown-item>
财务审核
</el-dropdown-item>
<el-dropdown-item>
包机结算
</el-dropdown-item>
<el-dropdown-item>
<el-dropdown-item @click.native="DeleteTravelTeam(item)">
删除
</el-dropdown-item>
</el-dropdown-menu>
......@@ -157,7 +152,7 @@
</div>
</div>
<el-dialog class="app-attachment-dialog" width="900" :title="dialogTitle" :visible.sync="isShowEditTeamDialog"
:close-on-click-modal="false" >
:close-on-click-modal="false">
<editTeamInfo v-if="isShowEditTeamDialog" :Q_GTeamId="GTeamId" @success="refreshPage"></editTeamInfo>
</el-dialog>
</div>
......@@ -226,7 +221,26 @@
},
},
methods: {
//删除包机团
DeleteTravelTeam(item) {
var that = this;
var tipMsg = "确认要删除【" + item.GTeamName + "】包机团?"
that.Confirm(tipMsg, function () {
that.apipost(
"travelteam_DelTeavelTeam", {
GTeamId: item.GTeamId
},
(res) => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.refreshPage();
} else {
that.Error(res.data.message);
}
}
);
})
},
//新增修改包机团
editTeam(item) {
if (item) {
......@@ -292,6 +306,12 @@
}
);
},
//跳转到报名清单
goToOrderList(item) {
this.OpenNewPage('/RegistrationList', {
id: item.TCID
});
}
},
mounted() {
this.getTravelTeamList();
......
src/plug/index.js
View file @ 15124334
This diff is collapsed.
src/pubComponents/buyGroup.vue
View file @ 15124334
......@@ -669,6 +669,14 @@
TotalNumber: 0,
};
},
watch: {
info: {
handler: function() {
this.goBuy(this.info)
},
deep: true
}
},
components: {
},
filters: {
......@@ -1364,7 +1372,9 @@
}
this.autoRemarks("VisaNum", "不要签证数量");
},
// 计算价格
getTotalPrice(t) {
console.log('getTotalPrice', this.addObj)
if (t === 3) {
if (parseFloat(this.addMsg.Unit_Price).toString() === "NaN") {
this.$message.error("请输入正确的价格！");
......@@ -1416,14 +1426,14 @@
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)) -
this.addObj.BackVisaPrice *
(this.addObj.BackVisaPrice || 0) *
(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum) -
Number(this.addMsg.VisaNum));
let danfang =
let danfang =
Number(this.addMsg.SingleRoomNum) * this.addObj.SingleRoomPrice;
let ertongbed =
this.addObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) -
......@@ -1483,7 +1493,7 @@
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)) -
this.addObj.BackVisaPrice *
(this.addObj.BackVisaPrice || 0) *
(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
......@@ -1515,6 +1525,18 @@
dandijie =
this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
}
console.log('this.addObj.OtherPrice', this.addObj.OtherPrice, (Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)),this.addObj.VisaPrice,(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.OldPeopleNum)),(Number(this.addMsg.AirticketNum) +
Number(this.addMsg.ManNum) +
Number(this.addMsg.ChirdNum) +
Number(this.addMsg.BabyNum) +
Number(this.addMsg.OldPeopleNum) -
Number(this.addMsg.VisaNum)))
this.addMsg.PreferPrice =
dandijie +
lianyun +
......@@ -1666,13 +1688,18 @@
};
},
saveOrder() {
this.addMsg.TCID = this.addObj.TCID
console.log('saveOrder', this.addMsg)
this.$emit('change', this.addMsg)
},
// todo 购买的产品信息，需要从外部传入
goBuy(obj) {
console.log('goBuy', obj)
if(!obj) return
this.isUpdateSharePeople = false;
this.isShowLayer = true;
this.addObj = obj;
this.addObj.SingleDMCPrice = this.addObj.SingleDMCPrice || 0
this.addMsg.DepartureCityId = obj.StartCityID;
this.addMsg.ReturnArriveCityId = obj.ReturnArriveCityId;
......@@ -1784,6 +1811,7 @@
"app_today_visit_GetOrderMyCustomerList", {
typeId: this.addMsg.CustomerType,
lineId: this.addObj.LineID,
IsLineId: 1,
},
(res) => {
if (res.data.resultCode == 1) {
......@@ -1893,7 +1921,7 @@
if (this.addMsg.ClientSource == 4 && this.addMsg.Remarks.indexOf(text) == -1) {
this.addMsg.Remarks = '飞猪订单；' + this.addMsg.Remarks
}
}
},
},
mounted() {
let userInfo = this.getLocalStorage();
......@@ -1911,6 +1939,7 @@
let nowDay = this.FormartDate(new Date());
this.msg.StartTime = nowDay;
}
this.goBuy(this.info)
this.getEmployee();
this.getStartList();
this.getKhlxList();
......
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