Skip to content

S
SuperMan
Commit a0083ac1 authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents c9419aa2 a02b446e
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 828 deletions
src/components/SalesModule/productQuery2.vue
View file @ a0083ac1
...@@ -445,189 +445,27 @@ ...@@ -445,189 +445,27 @@
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<productOrderList :loading="loading" :list="list"></productOrderList> <!-- 产品列表 -->
<productOrderList :loading="loading" :list="list" @success="reSearchPage"></productOrderList>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<el-dialog custom-class="ComTeamPlan_info_box" :title="tripTitle" :visible.sync="outerVisible" center>
<commonTeamInfo ref="comTeam"></commonTeamInfo>
</el-dialog>
<el-dialog custom-class="w450" title="行程下载" :visible.sync="travelControlTripLayerShow" center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
</tripDownLoadCommon>
</el-dialog>
<!-- 下单 -->
<div class="buy-box" v-show="isShowTeamOrder">
<orderForm @success="reSearchPage" @close="closeForm"
:PTCID="teamInfo.TCID"
:POrderId="0"
:PBranchId="0"
:PProductType="1"
:showCity="true"
:productObj="teamInfo">
</orderForm>
</div>
</div> </div>
</template> </template>
<script> <script>
import commonTeamInfo from "../commonPage/commonTeamInfo.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import carousel from "../commonPage/carousel.vue";
import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
import orderForm from "../orderCommon/order-form.vue";
import productOrderList from "../orderCommon/productOrderList.vue"; import productOrderList from "../orderCommon/productOrderList.vue";
export default { export default {
data() { data() {
return { return {
pickerOptions0: {
disabledDate: (time) => {
let starTime = new Date(this.starTime);
return time.getTime() > starTime.getTime();
},
},
pickerOptions1: {
disabledDate: (time) => {
let endTime = new Date(this.endTime);
return time.getTime() < endTime.getTime() - 5.64e7;
},
},
//当前登录用户信息 //当前登录用户信息
CurrentUserInfo: {}, CurrentUserInfo: {},
travelControlTripLayerShow: false,
wxLoading: false,
HightUnitPrice: "2",
userId: "", userId: "",
customerId: "",
createByInfo: "",
starTime: "",
endTime: "",
stratPrice: "",
stratPriceShow: false,
returnPrice: "",
returnPriceShow: false,
minPrice: 0,
loading: true, loading: true,
loading2: false,
outerVisible: false,
tripTitle: "",
currentPage: 1, currentPage: 1,
total: 0, total: 0,
addObj: {},
Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0,
addMsg: {
GroupTypeNeedHouse: "0",
OrderId: "0",
OneSex: "0",
TCID: "0",
CustomerType: "",
GroupType: "",
IndustryCategory: "",
ContactName: "",
ContactMobile: "",
CustomerId: "",
DepartureCityId: "",
ReturnArriveCityId: "",
IsIntermodal: "2",
IsReturnIntermodal: "2",
Unit_Price: "0",
TC_Price: "0",
ManNum: "0",
ChirdNum: "0",
ChirdNoNeedBedNum: "0",
ChirdNeedBedNum: "0",
BabyNum: "0",
OldPeopleNum: "0",
SingleRoomNum: "0",
PreferPrice: 0,
YSeatNum: "0",
ESeatNum: "0",
FSeatNum: "0",
Commission: "0",
ClientSource: "",
BrandId: "",
TradeWay: "2",
PlatformAccount: "",
PlatformOrder: "",
GuestNum: 0,
IsChildrenTour: "0",
IsBirdDiscount: "0",
PredictRoomNum: "0",
BigRoomNum: "0",
TripleRoomNum: "0",
TradeDate: "",
CostType: "",
Remarks: "",
VisaNum: "0",
SafeNum: "0",
AirticketNum: "0",
ScenicRefundArr: [],
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: "-1",
CommissionShareMoney: "0",
OrderForm: "1",
SonControlID: "-1",
IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件
LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID
},
uploadLloading: false,
employeeMsg: {
BranchId: "-1",
IsLeave: 0,
},
rules: {
CustomerType: [{
required: true,
message: "请选择客户类型",
trigger: "change",
}, ],
CustomerId: [{
required: false,
message: "请选择客户门店",
trigger: "change",
}, ],
DepartureCityId: [{
required: true,
message: "请选择出发城市",
trigger: "change",
}, ],
GroupType: [{
required: true,
message: "请选择参团类型",
trigger: "change",
}, ],
ClientSource: [{
required: true,
message: "请选择客人来源",
trigger: "change",
}, ],
TradeWay: [{
required: true,
message: "请选择交易方式",
trigger: "change",
}, ],
ContactName: [{
required: true,
message: "请输入联系人姓名",
trigger: "blur",
}, ],
ContactMobile: [{
required: true,
message: "请输入联系人电话",
trigger: "blur",
},
{
pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
message: "请输入正确的手机",
},
],
},
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
...@@ -652,7 +490,6 @@ ...@@ -652,7 +490,6 @@
RateOn: "-1", RateOn: "-1",
Title: "", //团名 Title: "", //团名
}, },
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
list: [], list: [],
LineList: [], LineList: [],
LineTeamList: [], LineTeamList: [],
...@@ -662,119 +499,19 @@ ...@@ -662,119 +499,19 @@
salePlace: [], salePlace: [],
startCityList: [], startCityList: [],
startCityList1: [], startCityList1: [],
tripDetails: [],
ssptList: [],
remarkMsg: {
zc: "",
bzc: "",
fjf: "",
ye: "",
lr: "",
dd: "",
df: "",
dc: "",
srf: "",
qz: "",
qzf: "",
},
otherRemark: "",
ScenicRefundList: [],
PlatformAccountList: [],
ScenicRefundMoney: 0,
TCIDList: null, TCIDList: null,
tripObj: {
tcid: 0,
configId: 0,
cityId: 0,
orderId: 0,
},
SingleDMCPricex: 0, // 单地接;
SingleDMCPrice: 0, // 单地接;
showHotelObj: {
showPrice: false,
showPay: false,
showZhan: false,
},
PlatformAccountList1: [],
PlatformAccountList2: [],
qjGroupId: -1,
S_Travel_Share: false, //分享权限
userInfo: {}, userInfo: {},
TotalNumber: 0,
crmOrderObj: null, crmOrderObj: null,
isShowTeamOrder: false, //是否显示订单弹窗
teamInfo: {}, //团队信息
}; };
}, },
components: { components: {
productOrderList, productOrderList
orderForm,
commonTeamInfo: commonTeamInfo,
tripDownLoadCommon: tripDownLoadCommon,
carousel: carousel,
commonHotelInfo: commonHotelInfo,
},
filters: {
priceFormat(value) {
if (value == null) {
return 0.0;
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
return x1 + x2;
},
priceFormat2(value) {
if (value == null) {
return "已包含";
}
let nStr = value.toFixed(2);
nStr += "";
let x = nStr.split(".");
let x1 = x[0];
let x2 = x.length > 1 ? "." + x[1] : "";
var rgx = /(\d+)(\d{3})/;
while (rgx.test(x1)) {
x1 = x1.replace(rgx, "$1" + "," + "$2");
}
let result = x1 + x2;
if (result === "0.00") {
result = "已包含";
}
return result;
},
}, },
methods: { methods: {
//刷新页面 //刷新页面
reSearchPage() { reSearchPage() {
this.isShowTeamOrder = false;
this.teamInfo = {};
this.getList(); this.getList();
}, },
//关闭窗口
closeForm() {
this.isShowTeamOrder = false;
this.teamInfo = {};
},
// 分享权限
GetSupperOrderEditAuth() {
var actionCode = this.$AuthCode.S_Travel_Share;
this.CheckUserAuth(actionCode, (res) => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.S_Travel_Share = true;
}
});
},
downloadFile(item) {
let reg = /^http(s)?:\/\/(.*?)\//;
this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name);
},
// 结束日期不能大于开始日期 // 结束日期不能大于开始日期
dataDui() { dataDui() {
if (this.msg.StartTime > this.msg.EndTime && this.msg.EndTime !== "") { if (this.msg.StartTime > this.msg.EndTime && this.msg.EndTime !== "") {
...@@ -782,87 +519,6 @@ ...@@ -782,87 +519,6 @@
this.msg.EndTime = ""; this.msg.EndTime = "";
} }
}, },
// 获取微信二维码
getWxCode(key) {
this.wxLoading = false;
if (this.list[key].wxImage === "") {
this.wxLoading = true;
this.apipost(
"TaskManagemnet_get_GetWeiXinShare", {
ConfigId: this.list[key].ConfigID,
TCID: this.list[key].TCID,
},
(res) => {
if (res.data.resultCode == 1) {
let url = res.data.data;
this.list[key].wxImage = url;
this.wxLoading = false;
} else {
this.$message.error("二维码获取失败");
}
},
(err) => {}
);
}
},
toTrip(obj) {
this.tripObj.tcid = obj.TCID;
this.tripObj.configId = obj.ConfigID;
this.tripObj.cityId = obj.StartCityID;
this.tripObj.orderId = 0;
this.travelControlTripLayerShow = true;
},
hideTripDown() {
this.travelControlTripLayerShow = false;
},
goUrl(path, id, tcmun) {
this.$router.push({
name: path,
query: {
id: id,
tcmun: tcmun,
blank: "y",
tab: "团报名清单",
},
});
},
goUrlX(item) {
this.$router.push({
name: "GroupAdvertising",
query: {
LineID: item.LineID,
TCID: item.TCID,
blank: "y",
tab: "团期广告",
},
});
},
//获取航班详情
getDetails(index) {
this.tripDetails = this.list[index].flightList;
},
goBuy(obj) {
this.teamInfo = obj;
this.isShowTeamOrder = true;
return
this.addObj = obj;
this.addMsg.DepartureCityId = obj.StartCityID;
this.addMsg.ReturnArriveCityId = obj.ReturnArriveCityId;
this.addMsg.GoCityTime = this.starTime = obj.StartCityTime;
this.addMsg.BackCityTime = this.endTime = obj.BackCityTime;
this.addMsg.SonControlID = obj.SonControlID;
this.SingleDMCPrice = obj.SingleDMCPrice;
this.SingleDMCPricex = obj.SingleDMCPrice;
},
getJourney(id, TCID, title) {
var that = this;
this.tripTitle = title;
this.$nextTick(() => {
that.$refs.comTeam.GetTrip(id, TCID);
});
that.outerVisible = true;
},
getList() { getList() {
this.loading = true; this.loading = true;
this.apipost( this.apipost(
...@@ -1013,26 +669,6 @@ ...@@ -1013,26 +669,6 @@
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
this.currentPage = 1; this.currentPage = 1;
}, },
clickHotel(TCID, LineId, LineteamId) {
var msg = {
TCID: TCID,
LineId: LineId,
LineteamId: LineteamId,
};
this.apipost(
"b2b_post_SetHotelClickService",
msg,
(res) => {
if (res.data.resultCode == 1) {}
},
(err) => {}
);
},
//直客版行程
goB2B(item) {
var B2BDomain = this.CurrentUserInfo.B2BDomain;
this.$tripUtils.GotoB2CPage(B2BDomain, item.ConfigID, item.TCID);
},
}, },
mounted() { mounted() {
// crm自动登陆传过来的参数 // crm自动登陆传过来的参数
...@@ -1041,13 +677,10 @@ ...@@ -1041,13 +677,10 @@
this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
} }
let userInfo = this.getLocalStorage();
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.GetSupperOrderEditAuth();//分享权限 this.CurrentUserInfo = this.userInfo ;
this.qjGroupId = this.QjGroupId(); this.userId = this.userInfo.EmployeeId;
this.CurrentUserInfo = userInfo; this.msg.BranchId = this.userInfo.RB_Branch_id.toString();
this.userId = userInfo.EmployeeId;
this.msg.BranchId = userInfo.RB_Branch_id.toString();
if (this.$route.query.id) { if (this.$route.query.id) {
this.msg.BranchId = "-1"; this.msg.BranchId = "-1";
this.msg.TCID = this.$route.query.id; this.msg.TCID = this.$route.query.id;
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ a0083ac1
...@@ -2164,7 +2164,7 @@ ...@@ -2164,7 +2164,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="14" class="RL_Order"> <td colspan="15" class="RL_Order">
<span class="RL-remarkTitle" v-if="item.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span> <span class="RL-remarkTitle" v-if="item.GuestList.length > 0">{{ $t("salesModule.MD") }}:</span>
<p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0"> <p class="RL-redType RL-remarkCon" v-if="item.GuestList.length > 0">
<span style="color: blue !important" v-for="childItem in item.GuestList" <span style="color: blue !important" v-for="childItem in item.GuestList"
...@@ -2218,7 +2218,7 @@ ...@@ -2218,7 +2218,7 @@
</p> </p>
</div> </div>
</td> </td>
<td colspan="4" style="height: 40px; cursor: pointer"> <td colspan="5" style="height: 40px; cursor: pointer">
<div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"> <div @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)">
<span>收款单据：</span> <span>收款单据：</span>
<span v-for="(item2, index2) in item.FinanceList" :key="index2"> <span v-for="(item2, index2) in item.FinanceList" :key="index2">
...@@ -2947,7 +2947,7 @@ ...@@ -2947,7 +2947,7 @@
<tbody> <tbody>
<tr> <tr>
<td></td> <td></td>
<td colspan="15"> <td colspan="16">
{{ $t("ground.bentuanjiwei") }}: {{ $t("ground.bentuanjiwei") }}:
<span class="RL-redType">{{ ConfigData.Config.YSeat }}Y + {{ ConfigData.Config.CSeat }}E <span class="RL-redType">{{ ConfigData.Config.YSeat }}Y + {{ ConfigData.Config.CSeat }}E
+ {{ ConfigData.Config.FSeat }}F </span>&nbsp; {{ $t("ground.syjiwei") }}: + {{ ConfigData.Config.FSeat }}F </span>&nbsp; {{ $t("ground.syjiwei") }}:
......
src/components/TravelManager/TravelList/todayOrderTotal.vue
View file @ a0083ac1
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
</div> </div>
</td> </td>
<td <td
:colspan="isEditOrderCreate == 1 ? 9 : 8" :colspan="isEditOrderCreate == 1 ? 10 : 9"
class="groupTourOrder_tickets" class="groupTourOrder_tickets"
style="height: 20px; cursor: pointer" style="height: 20px; cursor: pointer"
@click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)" @click="goUrlSFD('SalesFinancialDetail', '销售财务单据', item)"
......
src/components/orderCommon/order-form.vue
View file @ a0083ac1
...@@ -27,6 +27,10 @@ ...@@ -27,6 +27,10 @@
<div class="commonOrderForm"> <div class="commonOrderForm">
<p class="title"> <p class="title">
{{ $t("salesModule.SignImdi") }} {{ $t("salesModule.SignImdi") }}
<span v-if="crmOrderObj">
<span style="color: red;">引流人：{{crmOrderObj.LureEmpNmae}} </span>
<span style="color: #2AAEF2;">/客人：{{crmOrderObj.CRMGuestName}}</span>
</span>
<span class="fr"> <span class="fr">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" /> <input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" />
<input type="button" class="normalBtn" :value="$t('salesModule.SignImdi')" @click="submitForm('addMsg')" /> <input type="button" class="normalBtn" :value="$t('salesModule.SignImdi')" @click="submitForm('addMsg')" />
...@@ -571,6 +575,8 @@ ...@@ -571,6 +575,8 @@
SonControlID: "-1", SonControlID: "-1",
IsShowMessagesMoney: "2", IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件 QuotationUrl: "", //单团附件
LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID
}, },
uploadLloading: false, uploadLloading: false,
rules: { rules: {
...@@ -651,6 +657,7 @@ ...@@ -651,6 +657,7 @@
SingleDMCPrice: 0, // 单地接; SingleDMCPrice: 0, // 单地接;
TotalNumber: 0, //总人数 TotalNumber: 0, //总人数
priceObj: {}, //团期价格信息 priceObj: {}, //团期价格信息
crmOrderObj: null
}; };
}, },
filters: { filters: {
...@@ -1328,59 +1335,80 @@ ...@@ -1328,59 +1335,80 @@
}, },
//清空表单信息 //清空表单信息
clearMsg() { clearMsg() {
this.addMsg.OrderId = "0"; this.addMsg = {
this.addMsg.TCID = "0"; price: 0,
this.addMsg.IsIntermodal = "2"; GroupTypeNeedHouse: 0,
this.addMsg.IsReturnIntermodal = "2"; OrderId: 0,
this.addMsg.Unit_Price = "0"; OneSex: 0,
this.addMsg.TC_Price = "0"; TCID: 0,
this.addMsg.ManNum = "0"; CustomerType: "",
this.addMsg.ChirdNum = "0"; GroupType: "",
this.addMsg.ChirdNeedBedNum = "0"; IndustryCategory: "",
this.addMsg.BabyNum = "0"; ContactName: "",
this.addMsg.OldPeopleNum = "0"; ContactMobile: "",
this.addMsg.SingleRoomNum = "0"; CustomerId: "",
this.addMsg.PreferPrice = "0"; DepartureCityId: 0,
this.addMsg.YSeatNum = "0"; ReturnArriveCityId: "",
this.addMsg.ESeatNum = "0"; IsIntermodal: "2",
this.addMsg.FSeatNum = "0"; IsReturnIntermodal: "2",
this.addMsg.Commission = "0"; Unit_Price: 0,
this.addMsg.BrandId = ""; TC_Price: 0,
this.addMsg.PlatformAccount = ""; ManNum: 0, // 成人数量
this.addMsg.TradeWay = "2"; ChirdNum: 0, // 小孩数量
this.addMsg.GuestNum = "0"; ChirdNoNeedBedNum: 0,
this.addMsg.IsChildrenTour = "0"; ChirdNeedBedNum: 0,
this.addMsg.OrderId = "0"; BabyNum: 0,
this.addMsg.IsBirdDiscount = "0"; OldPeopleNum: 0,
this.addMsg.PredictRoomNum = "0"; SingleRoomNum: 0,
this.addMsg.BigRoomNum = "0"; PreferPrice: 0,
this.addMsg.TripleRoomNum = "0"; YSeatNum: 0,
this.addMsg.TradeDate = ""; ESeatNum: 0,
this.addMsg.CostType = ""; FSeatNum: 0,
this.addMsg.PlatformOrder = ""; Commission: 0,
ClientSource: 0,
BrandId: 0,
TradeWay: "2",
PlatformAccount: "",
PlatformOrder: "",
GuestNum: 0,
IsChildrenTour: 0,
IsBirdDiscount: 0,
PredictRoomNum: 0,
BigRoomNum: 0,
TripleRoomNum: 0,
TradeDate: "",
CostType: "",
Remarks: "",
VisaNum: 0,
SafeNum: 0,
AirticketNum: 0,
ScenicRefundArr: [],
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: 0,
CommissionShareMoney: 0,
OrderForm: "1",
SonControlID: "-1",
IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件
LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID
}
this.remarkMsg = {
zc: "",
bzc: "",
fjf: "",
ye: "",
lr: "",
dd: "",
df: "",
dc: "",
srf: "",
qz: "",
qzf: "",
}
this.clientSourceList = []; this.clientSourceList = [];
this.addMsg.Remarks = "";
this.addMsg.MinOrderPrice = "";
this.addMsg.VisaNum = "0";
this.addMsg.SafeNum = "0";
this.addMsg.AirticketNum = "0";
this.addMsg.ScenicRefundArr = []; this.addMsg.ScenicRefundArr = [];
this.ScenicRefundMoney = 0;
this.addMsg.CommissionSharePeople = "-1";
this.addMsg.CommissionShareMoney = "0";
this.addMsg.IsShowMessagesMoney = "2";
this.addMsg.OneSex = "0";
this.remarkMsg.zc = "";
this.remarkMsg.bzc = "";
this.remarkMsg.fjf = "";
this.remarkMsg.ye = "";
this.remarkMsg.lr = "";
this.remarkMsg.dd = "";
this.remarkMsg.df = "";
this.remarkMsg.dc = "";
this.remarkMsg.srf = "";
this.remarkMsg.qz = "";
this.remarkMsg.qzf = "";
}, },
saveOrder() { saveOrder() {
// 判断单团类型 // 判断单团类型
...@@ -1776,21 +1804,39 @@ ...@@ -1776,21 +1804,39 @@
this.getCityList(); this.getCityList();
//获取交易方式 //获取交易方式
this.getTradeWay(); this.getTradeWay();
// crm自动登陆传过来的参数
if (this.$route.query.crmOrderObj) {
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
}
}, },
watch: { watch: {
productObj:{ productObj:{
handler(oldValue, newVal){ handler(oldValue, newVal){
this.clearMsg();
this.getTravelPirceInfo()
this.addMsg.DepartureCityId = oldValue.StartCityID this.addMsg.DepartureCityId = oldValue.StartCityID
this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId this.addMsg.ReturnArriveCityId = oldValue.ReturnArriveCityId
} this.addMsg.GoCityTime = this.starTime = oldValue.StartCityTime;
this.addMsg.BackCityTime = this.endTime = oldValue.BackCityTime;
// crm自动登陆传过来的参数
if (this.$route.query.crmOrderObj) {
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
}
},
deep: true
}, },
//监听TCID变化 //监听TCID变化
PTCID: function (oldValue, newVal) { PTCID: function (oldValue, newVal) {
if (oldValue != newVal) { // if (oldValue != newVal) {
this.clearMsg(); // this.clearMsg();
this.getTravelPirceInfo() // this.getTravelPirceInfo()
} // }
} }
} }
}; };
......
src/components/orderCommon/productOrderList.vue
View file @ a0083ac1
...@@ -246,9 +246,10 @@ ...@@ -246,9 +246,10 @@
} }
.productQueryList li .d7 { .productQueryList li .d7 {
width: 10%; width: auto;
min-width: 160px;
text-align: center; text-align: center;
padding: 40px 0 0 40px; padding: 40px 20px;
border-right: none; border-right: none;
} }
...@@ -965,6 +966,26 @@ ...@@ -965,6 +966,26 @@
<div class="noData" v-else> <div class="noData" v-else>
{{ $t("system.content_noData") }} {{ $t("system.content_noData") }}
</div> </div>
<!-- 产品详情 -->
<el-dialog custom-class="ComTeamPlan_info_box" :title="tripTitle" :visible.sync="outerVisible" center>
<commonTeamInfo ref="comTeam"></commonTeamInfo>
</el-dialog>
<!-- 行程下载 -->
<el-dialog custom-class="w450" title="行程下载" :visible.sync="travelControlTripLayerShow" center>
<tripDownLoadCommon ref="tripDownLoadCommon" :tripObj="tripObj" @headCallBack="hideTripDown" :downType="1">
</tripDownLoadCommon>
</el-dialog>
<!-- 下单 -->
<div class="buy-box" v-show="isShowTeamOrder">
<orderForm @success="reSearchPage" @close="closeForm"
:PTCID="teamInfo.TCID"
:POrderId="0"
:PBranchId="0"
:PProductType="1"
:showCity="true"
:productObj="teamInfo">
</orderForm>
</div>
</div> </div>
</template> </template>
...@@ -979,203 +1000,14 @@ ...@@ -979,203 +1000,14 @@
props:['loading','list'], props:['loading','list'],
data() { data() {
return { return {
pickerOptions0: {
disabledDate: (time) => {
let starTime = new Date(this.starTime);
return time.getTime() > starTime.getTime();
},
},
pickerOptions1: {
disabledDate: (time) => {
let endTime = new Date(this.endTime);
return time.getTime() < endTime.getTime() - 5.64e7;
},
},
//当前登录用户信息 //当前登录用户信息
CurrentUserInfo: {}, CurrentUserInfo: {},
travelControlTripLayerShow: false, travelControlTripLayerShow: false,
wxLoading: false, wxLoading: false,
HightUnitPrice: "2",
userId: "", userId: "",
customerId: "",
createByInfo: "",
starTime: "",
endTime: "",
stratPrice: "",
stratPriceShow: false,
returnPrice: "",
returnPriceShow: false,
minPrice: 0,
loading2: false,
outerVisible: false, outerVisible: false,
tripTitle: "", tripTitle: "",
currentPage: 1,
total: 0,
addObj: {},
Unit_PriceList: [], //成交单价下拉数据
LessMoney: 0,
addMsg: {
GroupTypeNeedHouse: "0",
OrderId: "0",
OneSex: "0",
TCID: "0",
CustomerType: "",
GroupType: "",
IndustryCategory: "",
ContactName: "",
ContactMobile: "",
CustomerId: "",
DepartureCityId: "",
ReturnArriveCityId: "",
IsIntermodal: "2",
IsReturnIntermodal: "2",
Unit_Price: "0",
TC_Price: "0",
ManNum: "0",
ChirdNum: "0",
ChirdNoNeedBedNum: "0",
ChirdNeedBedNum: "0",
BabyNum: "0",
OldPeopleNum: "0",
SingleRoomNum: "0",
PreferPrice: 0,
YSeatNum: "0",
ESeatNum: "0",
FSeatNum: "0",
Commission: "0",
ClientSource: "",
BrandId: "",
TradeWay: "2",
PlatformAccount: "",
PlatformOrder: "",
GuestNum: 0,
IsChildrenTour: "0",
IsBirdDiscount: "0",
PredictRoomNum: "0",
BigRoomNum: "0",
TripleRoomNum: "0",
TradeDate: "",
CostType: "",
Remarks: "",
VisaNum: "0",
SafeNum: "0",
AirticketNum: "0",
ScenicRefundArr: [],
GoCityTime: "",
BackCityTime: "",
CommissionSharePeople: "-1",
CommissionShareMoney: "0",
OrderForm: "1",
SonControlID: "-1",
IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件
LureEmpId: 0, //引流id
CRMGuestId: 0, //客人ID
},
uploadLloading: false,
employeeMsg: {
BranchId: "-1",
IsLeave: 0,
},
rules: {
CustomerType: [{
required: true,
message: "请选择客户类型",
trigger: "change",
}, ],
CustomerId: [{
required: false,
message: "请选择客户门店",
trigger: "change",
}, ],
DepartureCityId: [{
required: true,
message: "请选择出发城市",
trigger: "change",
}, ],
GroupType: [{
required: true,
message: "请选择参团类型",
trigger: "change",
}, ],
ClientSource: [{
required: true,
message: "请选择客人来源",
trigger: "change",
}, ],
TradeWay: [{
required: true,
message: "请选择交易方式",
trigger: "change",
}, ],
ContactName: [{
required: true,
message: "请输入联系人姓名",
trigger: "blur",
}, ],
ContactMobile: [{
required: true,
message: "请输入联系人电话",
trigger: "blur",
},
{
pattern: /^(0|86|17951)?(13[0-9]|15[012356789]|17[012356789]|18[0-9]|19[0-9]|14[57])[0-9]{8}$/,
message: "请输入正确的手机",
},
],
},
msg: {
pageIndex: 1,
pageSize: 10,
LineId: "-1",
LineTeamId: "-1",
AimPlaceId: "-1",
TCID: "",
StartTime: "",
EndTime: "",
BranchId: "-1",
CityId: "-1",
DaysTrip: "",
SalePlat: [],
minGroupSize: "",
maxGroupSize: "",
minApplySize: "",
maxApplySize: "",
FlightID: "-1",
TCIDList: "",
WarningQuery: "-1",
RateOnDay: "-1",
RateOn: "-1",
Title: "", //团名
},
defaultImg: 'this.src="' + require("../../assets/img/bg_z1@2x.png") + '"',
LineList: [],
LineTeamList: [],
AimPlaceList: [],
airlineList: [],
companyList: [],
salePlace: [],
startCityList: [],
startCityList1: [],
tripDetails: [], tripDetails: [],
ssptList: [],
remarkMsg: {
zc: "",
bzc: "",
fjf: "",
ye: "",
lr: "",
dd: "",
df: "",
dc: "",
srf: "",
qz: "",
qzf: "",
},
otherRemark: "",
ScenicRefundList: [],
PlatformAccountList: [],
ScenicRefundMoney: 0,
TCIDList: null, TCIDList: null,
tripObj: { tripObj: {
tcid: 0, tcid: 0,
...@@ -1183,19 +1015,14 @@ ...@@ -1183,19 +1015,14 @@
cityId: 0, cityId: 0,
orderId: 0, orderId: 0,
}, },
SingleDMCPricex: 0, // 单地接;
SingleDMCPrice: 0, // 单地接;
showHotelObj: { showHotelObj: {
showPrice: false, showPrice: false,
showPay: false, showPay: false,
showZhan: false, showZhan: false,
}, },
PlatformAccountList1: [],
PlatformAccountList2: [],
qjGroupId: -1, qjGroupId: -1,
S_Travel_Share: false, //分享权限 S_Travel_Share: false, //分享权限
userInfo: {}, userInfo: {},
TotalNumber: 0,
crmOrderObj: null, crmOrderObj: null,
isShowTeamOrder: false, //是否显示订单弹窗 isShowTeamOrder: false, //是否显示订单弹窗
teamInfo: {}, //团队信息 teamInfo: {}, //团队信息
...@@ -1203,10 +1030,10 @@ ...@@ -1203,10 +1030,10 @@
}, },
components: { components: {
orderForm, orderForm,
commonTeamInfo: commonTeamInfo, commonTeamInfo,
tripDownLoadCommon: tripDownLoadCommon, tripDownLoadCommon,
carousel: carousel, carousel,
commonHotelInfo: commonHotelInfo, commonHotelInfo,
}, },
filters: { filters: {
priceFormat(value) { priceFormat(value) {
...@@ -1249,7 +1076,7 @@ ...@@ -1249,7 +1076,7 @@
reSearchPage() { reSearchPage() {
this.isShowTeamOrder = false; this.isShowTeamOrder = false;
this.teamInfo = {}; this.teamInfo = {};
this.getList(); this.$emit("success");
}, },
//关闭窗口 //关闭窗口
closeForm() { closeForm() {
...@@ -1269,13 +1096,6 @@ ...@@ -1269,13 +1096,6 @@
let reg = /^http(s)?:\/\/(.*?)\//; let reg = /^http(s)?:\/\/(.*?)\//;
this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name); this.downloadFileRename(item.FullUrl.replace(reg, ""), item.Name);
}, },
// 结束日期不能大于开始日期
dataDui() {
if (this.msg.StartTime > this.msg.EndTime && this.msg.EndTime !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.EndTime = "";
}
},
// 获取微信二维码 // 获取微信二维码
getWxCode(key) { getWxCode(key) {
this.wxLoading = false; this.wxLoading = false;
...@@ -1338,16 +1158,6 @@ ...@@ -1338,16 +1158,6 @@
goBuy(obj) { goBuy(obj) {
this.teamInfo = obj; this.teamInfo = obj;
this.isShowTeamOrder = true; this.isShowTeamOrder = true;
return
this.addObj = obj;
this.addMsg.DepartureCityId = obj.StartCityID;
this.addMsg.ReturnArriveCityId = obj.ReturnArriveCityId;
this.addMsg.GoCityTime = this.starTime = obj.StartCityTime;
this.addMsg.BackCityTime = this.endTime = obj.BackCityTime;
this.addMsg.SonControlID = obj.SonControlID;
this.SingleDMCPrice = obj.SingleDMCPrice;
this.SingleDMCPricex = obj.SingleDMCPrice;
}, },
getJourney(id, TCID, title) { getJourney(id, TCID, title) {
var that = this; var that = this;
...@@ -1357,156 +1167,6 @@ ...@@ -1357,156 +1167,6 @@
}); });
that.outerVisible = true; that.outerVisible = true;
}, },
getList() {
this.loading = true;
this.apipost(
"TaskManagemnet_get_GetSellProductCenter",
this.msg,
(res) => {
if (res.data.resultCode == 1) {
this.loading = false;
this.total = res.data.data.count;
for (let i = 0; i < res.data.data.pageData.length; i++) {
res.data.data.pageData[i]["wxImage"] = "";
}
this.list = res.data.data.pageData;
} else {
this.Error(res.data.message);
}
},
(err) => {}
);
},
// 线路
getLineList() {
this.apipost("line_post_GetAllList_V2", {
LineDirection: 0
}, (res) => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
}
});
},
//获取系列列表
getLineTeamList(lineId) {
this.LineTeamList = [];
this.apipost(
"team_post_GetList", {
lineID: lineId,
isTOOP: 1,
},
(res) => {
if (res.data.resultCode == 1) {
this.msg.LineTeamId = "-1";
this.LineTeamList = res.data.data;
}
}
);
},
//获取目的地列表
getAimPlaceList(lineId, lineTeamId) {
let myLineId = lineId === "" ? this.msg.LineId : lineId;
let myLineTeamId = lineTeamId === "" ? this.msg.LineTeamId : lineTeamId;
this.AimPlaceList = [];
this.apipost(
"team_post_GetListForCascading", {
LineID: myLineId,
LtID: myLineTeamId,
},
(res) => {
if (res.data.resultCode == 1) {
this.msg.AimPlaceId = "-1";
this.AimPlaceList = res.data.data;
}
}
);
},
// 出发城市、目的地
getStartList() {
this.apipost("sellorder_get_GetAllStartCity", {}, (res) => {
if (res.data.resultCode == 1) {
this.startCityList = res.data.data;
} else {}
});
},
getStartList1() {
this.apipost(
"city_post_GetList", {
isDefault: -1,
priceType: -1,
},
(res) => {
if (res.data.resultCode == 1) {
this.startCityList1 = res.data.data;
} else {}
}
);
},
// 公司
getCompanyList() {
let RB_Group_id = this.CurrentUserInfo.RB_Group_id;
let msg = {
Status: 0,
is_show: 0,
RB_Group_Id: RB_Group_id,
};
this.apipost(
"admin_get_BranchGetList",
msg,
(res) => {
if (res.data.resultCode == 1) {
this.companyList = [{
Id: "-1",
BName: "不限",
}, ];
res.data.data.forEach((x) => {
var obj = {
Id: "",
BName: "",
};
obj.Id = x.Id.toString();
obj.BName = x.BName;
this.companyList.push(obj);
});
}
},
(err) => {}
);
},
getAirlineList() {
//获取航空公司*
let msg = {};
this.apipost(
"airline_post_GetList",
msg,
(res) => {
this.airlineList = res.data.data;
},
(err) => {}
);
},
getSalePlace() {
this.apipost(
"travel_get_GetTravelSelectEnum", {},
(res) => {
if (res.data.resultCode == 1) {
this.salePlace = res.data.data.SalePlat;
}
},
(err) => {}
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1;
},
clickHotel(TCID, LineId, LineteamId) { clickHotel(TCID, LineId, LineteamId) {
var msg = { var msg = {
TCID: TCID, TCID: TCID,
...@@ -1529,37 +1189,14 @@ ...@@ -1529,37 +1189,14 @@
}, },
}, },
mounted() { mounted() {
// crm自动登陆传过来的参数
if (this.$route.query.crmOrderObj) {
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.addMsg.LureEmpId = this.crmOrderObj.LureEmpId //引流id
this.addMsg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
}
let userInfo = this.getLocalStorage();
this.userInfo = this.getLocalStorage(); this.userInfo = this.getLocalStorage();
this.GetSupperOrderEditAuth();//分享权限 this.GetSupperOrderEditAuth();//分享权限
this.qjGroupId = this.QjGroupId(); this.qjGroupId = this.QjGroupId();
this.CurrentUserInfo = userInfo; this.CurrentUserInfo = this.userInfo ;
this.userId = userInfo.EmployeeId; this.userId = this.userInfo.EmployeeId;
this.msg.BranchId = userInfo.RB_Branch_id.toString();
if (this.$route.query.id) {
this.msg.BranchId = "-1";
this.msg.TCID = this.$route.query.id;
}
if (this.$route.query.TCIDList) { if (this.$route.query.TCIDList) {
this.msg.TCIDList = this.TCIDList = this.$route.query.TCIDList; this.TCIDList = this.$route.query.TCIDList;
}
if (this.msg.StartTime === "") {
let nowDay = this.FormartDate(new Date());
this.msg.StartTime = nowDay;
} }
// this.getCompanyList();//公司
// this.getList();//产品列表
// this.getLineList();//线路
// this.getSalePlace();//销售平台
// this.getAirlineList();//获取航空公司
// this.getStartList();//出发城市
// this.getStartList1();//目的地
}, },
}; };
......
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