Skip to content

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

no message

parent f2b30ee3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2140 additions and 29 deletions
src/components/Hotel/singleProduct/HotelList.vue
View file @ 848ec65d
......@@ -99,7 +99,7 @@
@close="close"></TableOperation>
</el-dialog>
<!-- 购物车 -->
<ListCar v-if="rightCarOpen" @close="close" @success="success" @editor="editor"></ListCar>
<ListCar v-if="rightCarOpen" :crmOrderObj="crmOrderObj" @close="close" @success="success" @editor="editor"></ListCar>
<!-- 酒店详情信息 -->
<el-dialog custom-class="w800" title="酒店详情" :visible.sync="showHotelDetails" center @close="close">
<hotelDetails :hotelId="HotelDetailId"></hotelDetails>
......@@ -178,7 +178,8 @@
dataList: [],
isShow: false,
loading: false,
HOTEL_memorandum: false
HOTEL_memorandum: false,
crmOrderObj: null
};
},
watch: {
......@@ -320,6 +321,10 @@
},
},
mounted() {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
}
this.HotelLength = localStorage.getItem("HotelLength")?localStorage.getItem("HotelLength"):0
let userinfo = this.getLocalStorage();
......
src/components/Hotel/singleProduct/components/ListCar.vue
View file @ 848ec65d
......@@ -67,6 +67,10 @@
<div v-if="cars.length==0" style="text-align: center;padding: 20px 0;">暂无数据</div>
</div>
<div class="ListCar-bottom" v-if="cars.length>0">
<div v-if="crmOrderObj" style="margin-bottom: 10px;">
<span style="color: red;">引流人：{{crmOrderObj.LureEmpNmae}} </span>
<span style="color: #2AAEF2;">/客人：{{crmOrderObj.CRMGuestName}}</span>
</div>
<el-form label-width="60px" :model="parameters" :rules="rules" ref="parameters">
<el-row :gutter="20">
<el-col :span="12">
......@@ -123,6 +127,10 @@
<script>
export default {
props: {
crmOrderObj: {
type: Object,
require: false
},
HotelRow: {
type: Object,
require: false
......@@ -146,7 +154,9 @@
TCNum: '', //=团队时 传递 组团号
ContactName: '', //=散客时 传递 联系人
ContactNumber: '', //=散客时 传递 联系人电话
OrderId: 0
OrderId: 0,
LureEmpId: 0,
CRMGuestId: 0,
},
currentIndex: 0,
currentI: 0,
......@@ -184,6 +194,18 @@
};
},
watch: {
crmOrderObj: {
handler: function (val, oldVal) {
this.crmOrderObj = val
console.log(this.crmOrderObj)
if(this.crmOrderObj){
this.parameters.LureEmpId = val.LureEmpId//引流id
this.parameters.CRMGuestId = val.CRMGuestId //客人ID
}
},
deep: true,
immediate: true
},
cars: {
handler: function (val, oldVal) {
this.HotelLength = this.cars.length
......@@ -396,7 +418,7 @@
}
.ListCar-content{
padding: 20px 15px;
height: calc(100% - 195px);
height: calc(100% - 230px);
overflow: auto;
}
.ListCar-list{
......
src/components/SalesModule/productQuery.vue
View file @ 848ec65d
......@@ -549,6 +549,10 @@
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer">
<p>
{{ $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">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" />
<input type="button" class="normalBtn" :value="$t('salesModule.SignImdi')" @click="submitForm('addMsg')" />
......@@ -1833,6 +1837,8 @@
SonControlID: "-1",
IsShowMessagesMoney: "2",
QuotationUrl: "", //单团附件
LureEmpId: 0,//引流id
CRMGuestId: 0, //客人ID
},
uploadLloading: false,
employeeMsg: {
......@@ -1966,6 +1972,7 @@
S_Travel_Share: false, //分享权限
userInfo: {},
TotalNumber: 0,
crmOrderObj: null
};
},
components: {
......@@ -3627,6 +3634,12 @@
}
},
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.GetSupperOrderEditAuth();
......
src/components/SalesModule/productQueryOne.vue
View file @ 848ec65d
......@@ -178,6 +178,10 @@
<div class="productQuerybottomLayer ownScrollbarStyle" v-show="isShowLayer">
<p>
{{$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">
<input type="button" class="hollowFixedBtn" :value="$t('pub.cancelBtn')" @click="cancelSubmit()" />
<input type="button" class="normalBtn" :value="$t('salesModule.SignImdi')" @click="submitForm('addMsg')" />
......@@ -1064,7 +1068,9 @@
SonControlID: '-1',
IsShowMessagesMoney: '2',
GuestList: [],
GatherAddress: ''
GatherAddress: '',
LureEmpId: 0,//引流id
CRMGuestId: 0, //客人ID
},
GuestList: [
{
......@@ -1280,6 +1286,7 @@
countryList: [],//国籍
//当前登录用户信息
CurrentUserInfo: {},
crmOrderObj: null,
}
},
components: {
......@@ -2451,6 +2458,13 @@
},
},
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
}
this.userId = this.getLocalStorage().EmployeeId
this.msg.BranchId = this.getLocalStorage().RB_Branch_id.toString()
if (this.$route.query.id) {
......
src/components/SalesVisa/VisaProductAddOrder.vue
View file @ 848ec65d
......@@ -344,7 +344,11 @@
layout="total,prev, pager, next, jumper" :page-size="this.msg.pageSize" :total="total">
</el-pagination>
<div class="_mc_edit _scrollbar" :class="addShow==true?'edHeight':''">
<p class="_tit">{{$t('Operation.Op_signUp')}}
<p class="_tit">{{$t('Operation.Op_signUp')}}
<span v-if="crmOrderObj">
<span style="color: red;">引流人：{{crmOrderObj.LureEmpNmae}} </span>
<span style="color: #2AAEF2;">/客人：{{crmOrderObj.CRMGuestName}}</span>
</span>
<span class="fr">
<button class="hollowFixedBtn" type="button" @click="cancelEdit()">{{$t('pub.cancelBtn')}}</button>
<button type="button" class="normalBtn" @click="saveVisa()">{{$t('pub.saveBtn')}}</button>
......@@ -495,7 +499,9 @@
LeaveCountryFlight: '',
VisaPlanId: 0,
DepartDate: '',
ClientType: '1'
ClientType: '1',
LureEmpId: 0,//引流id
CRMGuestId: 0, //客人ID
},
rules: {
PeopleNum: [{
......@@ -531,6 +537,7 @@
total: 0,
addShow: false,
currentPage: 1,
crmOrderObj: null
}
},
methods: {
......@@ -705,6 +712,8 @@
}, err => {})
},
saveVisa() { // 保存
console.log(this.addMsg,'===')
// return
this.$refs['addMsg'].validate((valid) => {
if (valid) {
this.apipost('dmc_get_visa_SetVisaOrder', this.addMsg, res => {
......@@ -723,7 +732,9 @@
EnterCountryFlight: '',
LeaveCountryFlight: '',
VisaPlanId: 0,
DepartDate: ''
DepartDate: '',
LureEmpId: 0,
CRMGuestId: 0
}
this.$message.success(res.data.message)
this.addShow = false
......@@ -758,6 +769,12 @@
},
},
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
}
this.userId = this.getLocalStorage().EmployeeId
this.msg.RB_Branch_Id = this.getLocalStorage().RB_Branch_id.toString()
this.getList()
......
src/components/SingleAirTicket/TicketOrder.vue 0 → 100644
View file @ 848ec65d
<style>
</style>
<template>
<div>
<TicketOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></TicketOrder>
</div>
</template>
<script>
import TicketOrder from './components/TicketOrder.vue';
export default {
components: { TicketOrder },
data() {
return {
pagesTitle: '销售',
dataObj:{
OrderId: '',
}
};
},
watch: {
pagesTitle(val,oldval){
},
},
methods: {
},
created() {
},
mounted() {
if(this.$route.query.OrderId){
this.dataObj.OrderId = this.$route.query.OrderId
}
},
};
</script>
<style>
</style>
src/components/SingleAirTicket/components/OrderList.vue 0 → 100644
View file @ 848ec65d
This diff is collapsed.
src/components/SingleAirTicket/components/TicketOrder.vue 0 → 100644
View file @ 848ec65d
This diff is collapsed.
src/components/busManagement/BookAcar/CharterPreview.vue
View file @ 848ec65d
......@@ -305,6 +305,10 @@
<div class="list-left">
<h6 @click="showCardHandler">{{detailsObj.Name}}</h6>
<p style="color: #9e9e9e;font-size: 13px;">请在出发前一天的23:00前完成预定</p>
<div v-if="crmOrderObj">
<span style="color: red;">引流人：{{crmOrderObj.LureEmpNmae}} </span>
<span style="color: #2AAEF2;">/客人：{{crmOrderObj.CRMGuestName}}</span>
</div>
<!-- <div>
<span>地址： {{detailsObj.CityList2[0].CountryName }}{{detailsObj.CityList2[0].CityName}}</span>
<a @click="showCardHandler"><i class="el-icon-map-location"></i> 地图</a>
......@@ -438,8 +442,8 @@
placeholder="请输入上车地点">
</el-input>
<span @click="clickMapAddress(1,1,msg.GetonAddress)"
class="el-icon-location" style="font-size: 16px;color: #E95252;position: absolute;right: 10px;top: 15px;"></span>
<!-- <span @click="clickMapAddress(1,1,msg.GetonAddress)"
class="el-icon-location" style="font-size: 16px;color: #E95252;position: absolute;right: 10px;top: 15px;"></span> -->
</el-form-item>
</li>
<li v-if="msg.OrderType!=2">
......@@ -637,6 +641,8 @@
Mobile:'',//电话
ProductId: '',
CarId: '',//产品类型ID
LureEmpId: 0,
CRMGuestId: 0,
},
types: [],
isCheck: false,
......@@ -712,7 +718,8 @@
}
],
},
detailsRow: null
detailsRow: null,
crmOrderObj: null
};
},
methods: {
......@@ -980,7 +987,12 @@
},
mounted() {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.LureEmpId = this.crmOrderObj.LureEmpId//引流id
this.msg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
}
},
created() {
this.msg.OrderId = this.$route.query.OrderId
......
src/components/busManagement/BookAcar/addEditVehicle.vue
View file @ 848ec65d
......@@ -284,6 +284,10 @@
<div class="listone-list">
<div class="list-left">
<p style="color: #9e9e9e;font-size: 13px;">请在出发前一天的23:00前完成预定</p>
<div v-if="crmOrderObj">
<span style="color: red;">引流人：{{crmOrderObj.LureEmpNmae}} </span>
<span style="color: #2AAEF2;">/客人：{{crmOrderObj.CRMGuestName}}</span>
</div>
</div>
</div>
</div>
......@@ -500,7 +504,9 @@
// UseType: null,//用车类型（接口返下拉列表）
// TripInfo: "",//行程信息
// }
]
],
LureEmpId: 0,
CRMGuestId: 0,
},
types: [],
isCheck: false,
......@@ -584,7 +590,8 @@
},
vehicletop: [],
listvehicle: [],
SeatNum:0
SeatNum:0,
crmOrderObj: null,
};
},
methods: {
......@@ -801,6 +808,12 @@
},
mounted() {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.LureEmpId = this.crmOrderObj.LureEmpId//引流id
this.msg.CRMGuestId = this.crmOrderObj.CRMGuestId //客人ID
}
let userInfo = this.getLocalStorage();
this.msg.UseCompName = userInfo.GroupName
this.msg.UseName = userInfo.emName
......
src/components/busManagement/BookAcar/list.vue
View file @ 848ec65d
......@@ -314,6 +314,7 @@
},
detailsObj:{},
showDetails: false,
crmOrderObj: null
};
},
watch: {
......@@ -334,6 +335,7 @@
name: 'CharterAddEditVehicle',
query: {
blank: "y",
crmOrderObj: this.crmOrderObj?this.crmOrderObj:null,
tab: "新增团订"
}
});
......@@ -344,6 +346,7 @@
query: {
id: id,
OrderDate: this.FormartDate(new Date(this.msg.Q_Date)),
crmOrderObj: this.crmOrderObj?this.crmOrderObj:null,
blank: "y",
tab: "订单预览"
}
......@@ -445,7 +448,10 @@
},
mounted() {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
this.crmOrderObj = this.$route.query.crmOrderObj
}
},
created() {
this.getProvinceList();
......
src/components/scenicSpot/Singleticket/OrderPreview.vue
View file @ 848ec65d
......@@ -279,6 +279,10 @@
<div class="list-left">
<h6 @click="showCardHandler">{{detailsObj.Name}}</h6>
<p style="color: #9e9e9e;font-size: 13px;">请在游玩前一天的23:00前完成预定</p>
<div v-if="crmOrderObj">
<span style="color: red;">引流人：{{crmOrderObj.LureEmpNmae}} </span>
<span style="color: #2AAEF2;">/客人：{{crmOrderObj.CRMGuestName}}</span>
</div>
<!-- <div>
<span>地址： {{detailsObj.CityName}} {{detailsObj.Address}}</span>
<a @click="showCardHandler"><i class="el-icon-map-location"></i> 地图</a>
......@@ -480,6 +484,8 @@
Mobile:'',
CouponsId:'',//景点id
DetailList:[],
LureEmpId: 0,
CRMGuestId: 0,
},
types: [],
isCheck: false,
......@@ -515,7 +521,8 @@
trigger: 'blur'
}],
},
detailsRow: null
detailsRow: null,
crmOrderObj: null
};
},
methods: {
......@@ -682,7 +689,12 @@
},
mounted() {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
this.crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.LureEmpId = this.crmOrderObj.LureEmpId
this.msg.CRMGuestId = this.crmOrderObj.CRMGuestId
}
},
created() {
this.msg.CouponsId = this.$route.query.id
......
src/components/scenicSpot/Singleticket/SingleticketList.vue
View file @ 848ec65d
......@@ -150,7 +150,7 @@
<div class="flexOne domesticScenic">
<div class="query-box">
<ul>
<li>
<!-- <li>
<span>
<em>{{ $t('system.quety_area') }}</em>
<el-select v-model="msg.QProvince" filterable @change="getProvinceList(msg.QProvince, 2)"
......@@ -163,7 +163,7 @@
<el-option v-for="item in cityList" :key="item.ID" :label="item.Name" :value="item.ID"></el-option>
</el-select>
</span>
</li>
</li> -->
<li><span><em>日期</em>
<el-date-picker v-model='msg.OpenTime' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
:picker-options="beforeCheck" laceholder="门票日期">
......@@ -294,7 +294,7 @@ export default {
msg: {
pageIndex: 1,
pageSize: 16,
QCountry: '651',
QCountry: '0',//651
QProvince: 0,
QCity: 0,
QDistrict: 0,
......@@ -312,6 +312,7 @@ export default {
},
detailsObj: {},
showDetails: false,
crmOrderObj: null,
};
},
watch: {
......@@ -333,6 +334,7 @@ export default {
query: {
id: id,
OpenTime: this.FormartDate(new Date(this.msg.OpenTime)),
crmOrderObj: this.crmOrderObj?this.crmOrderObj:null,
blank: "y",
tab: "订单预览"
}
......@@ -427,7 +429,10 @@ export default {
},
mounted() {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
this.crmOrderObj = this.$route.query.crmOrderObj
}
},
created() {
this.getProvinceList("651", 1);
......
src/router/config.js
View file @ 848ec65d
......@@ -2110,6 +2110,14 @@ export default {
title: '用车订单'
},
},
{
path: '/CRMTicketOrder', //crm单项机票订单
name: 'CRMTicketOrder',
component: resolve => require(['@/components/SingleAirTicket/TicketOrder'], resolve),
meta: {
title: '单机票订单'
},
},
{
path: '/CharterAddEditVehicle', //新增/编辑团订
name: 'CharterAddEditVehicle',
......@@ -2229,7 +2237,8 @@ export default {
meta: {
title: '签证已确认'
},
}, {
},
{
path: '/TravelManager', //团控配置
name: 'TravelManager',
component: resolve => require(['@/components/TravelManager/TravelGroupControl/TravelManager'], resolve),
......@@ -2319,13 +2328,6 @@ export default {
meta: {
title: '在线申请'
},
}, {
path: '/airplaneOrder', //订单列表
name: 'airplaneOrder',
component: resolve => require(['@/components/TravelManager/TravelTeam/orderInfo'], resolve),
meta: {
title: '订单列表'
},
}, {
path: '/TravelSupplier', //供应商列表
name: 'TravelSupplier',
......
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