Skip to content

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

no message

parent 04338c5b
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 41 deletions
src/components/Hotel/reservation/HotelOrderList.vue
View file @ 9dc0e915
......@@ -366,6 +366,12 @@
mounted() {
this.Datelist = this.getyMDOne()
this.userInfo = this.getLocalStorage();
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
console.log(crmOrderObj.OrderId,'======酒店订单')
}
this.getEmployee()
this.GetList();
......
src/components/SalesModule/groupTourOrder.vue
View file @ 9dc0e915
......@@ -4785,6 +4785,11 @@
} else {
this.msg.QStartDate = new Date().Format("yyyy-MM-dd");
}
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
console.log(crmOrderObj.OrderId,'======跟团订单')
}
this.getEmployee();
this.getList();
this.getLineList();
......
src/components/SalesModule/groupTourOrderOne.vue
View file @ 9dc0e915
......@@ -4238,6 +4238,11 @@
this.msg.tempOrderId = this.$route.query.id
}
this.msg.QStartDate = new Date().Format('yyyy-MM-dd')
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
console.log(crmOrderObj.OrderId,'======一日游订单')
}
this.getEmployee()
this.getList()
this.getLineList()
......
src/components/SalesVisa/VisaProductEditOrder.vue
View file @ 9dc0e915
......@@ -827,6 +827,11 @@
},
},
mounted() {
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
console.log(crmOrderObj.OrderId,'======签证订单')
}
this.qjGroupId = this.QjGroupId();
this.userInfo = this.getLocalStorage();
this.getList()
......
src/components/SingleAirTicket/components/OrderList.vue
View file @ 9dc0e915
......@@ -534,7 +534,9 @@
'el-icon-refresh cF1416C': item.OrderStatus == 6
}"
>
{{item.OrderStatusName}}{{item.OrderStatus}}</i>
{{item.OrderStatusName}}
<!-- {{item.OrderStatus}} -->
</i>
<!-- <div class="Order-list-Status" :class="item.OrderStatus=='1'?'one':
(item.OrderStatus=='2'?'two':
(item.OrderStatus=='3'?'three':
......@@ -613,7 +615,8 @@
(scope.row.TicketStatus==5?'Black':''))))">
{{item.TicketStatusName}}
</span>
<i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'" class="cp iconfont iconpingzhengchaxun Credentials"
<i v-if="scope.row.TicketStatus!=1&&scope.row.TicketVoucherList!=[]&&scope.row.CancelVoucherList!=[]&&scope.row.TicketStatusName!='无需机票'"
class="c3FC4FF cursor-pointer el-icon-document-checked"
@click="viewCredentials(scope.row)"></i>
</template>
</el-table-column>
......@@ -621,27 +624,22 @@
<template slot-scope="scope">
<span @click="scope.row.VisaStatus=='1'?AmendVisa(scope.row):''"
class="tatusText"
:class="scope.row.VisaStatus==1?'grey'+' cp':
:class="scope.row.VisaStatus==1?'grey'+' cursor-pointer':
(scope.row.VisaStatus==2?'success':
(scope.row.VisaStatus==0?'Black':''))">
{{scope.row.VisaStatus==1?'未出签':(scope.row.VisaStatus==2?'已出签':'无需签证')}}
</span>
<i v-if="scope.row.VisaStatus==2" class="cp iconfont iconpingzhengchaxun Credentials"
<i v-if="scope.row.VisaStatus==2" class="c3FC4FF cursor-pointer el-icon-document-checked"
@click="CheckOutDetails(scope.row)"></i>
</template>
</el-table-column>
<el-table-column label="数量" style="background:#EAEAEA">
<template slot-scope="scope">
{{ scope.row.Num }}
</template>
</el-table-column>
<el-table-column
label="小计"
label="操作"
min-width="70"
style="background:#EAEAEA"
>
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Money.toFixed(2) }}</span>
<span class="fz15 fbold"></span>
</template>
</el-table-column>
<template slot="append" v-if="item.Remark">
......@@ -649,7 +647,7 @@
</template>
</el-table>
</div>
<el-table :data="[item]" style="width:100%" border v-if="item.OrderStatus!=3">
<!-- <el-table :data="[item]" style="width:100%" border v-if="item.OrderStatus!=3">
<el-table-column label="实收" min-width="100">
<template slot-scope="scope">
<span class="fz15 fbold">{{ scope.row.Income ? scope.row.Income : "-" }}</span>
......@@ -677,7 +675,7 @@
<span class="fz15 fbold">{{ scope.row.Income-scope.row.CostMoney-scope.row.Refund>0?scope.row.Income-scope.row.CostMoney-scope.row.Refund:'-' }}</span>
</template>
</el-table-column>
</el-table>
</el-table> -->
<div class="row justify-sb mt mb20">
<div class="column px15 bgf5 radius5 flex-g pa relative">
<div class="fz12">收款单据</div>
......@@ -1159,10 +1157,19 @@
type = 2
}else{
type = num
}
let data = {
// path: "ChoiceAddFinancialDocuments",
type: type,
OtherType: 55,
ReFinanceId: row.OrderId,
ReFinanceId2: num,
GuestId: row.GuestId,
RelevanceFrId: row.selectedType, // 单据类型
}
this.BillMakingMsg.ReFinanceId = row.OrderId;
this.BillMakingMsg.ReFinanceId2 = num;
this.BillMakingMsg.OtherType = 67;
this.BillMakingMsg.OtherType = 55;
let text = "";
let query = {};
if (num == 1) {
......@@ -1176,8 +1183,14 @@
blank: "y",
tab: `新增${text}单据`,
Type: type,
tradeObj: JSON.stringify(this.BillMakingMsg)
crmOrderObj: JSON.stringify(data)
};
this.$store.commit("ChoiceAddFinancialDocuments");
this.$router.push({
path: "/ChoiceAddFinancialDocuments",
query
});
return
this.queryObj = query
if(!Offset){
this.$store.commit("ChoiceAddFinancialDocuments");
......
src/components/busManagement/BookAcar/components/BookAcarOrder.vue
View file @ 9dc0e915
......@@ -214,6 +214,7 @@
this.GetList()
},
deep: true,
immediate: true
}
},
methods: {
......
src/components/busManagement/BookAcar/order.vue
View file @ 9dc0e915
......@@ -3,9 +3,9 @@
<template>
<div>
<el-tabs v-model="tab" @tab-click="handleClick">
<el-tabs v-model="dataObj.tab" @tab-click="handleClick">
<el-tab-pane label="团队订单" name="0">
<TeamOrder :pagesTitle="pagesTitle" :OrderId="OrderId"></TeamOrder>
<TeamOrder :pagesTitle="pagesTitle" :OrderId="dataObj.OrderId"></TeamOrder>
</el-tab-pane>
<el-tab-pane label="接机订单" name="1">
<BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
......@@ -27,8 +27,6 @@
data() {
return {
pagesTitle: '销售',
tab:'1',
OrderId: '',
dataObj:{
tab:'1',
OrderId: '',
......@@ -50,7 +48,6 @@
},
methods: {
handleClick(tab, event){
this.tab = tab.name
this.dataObj.tab = tab.name
}
},
......@@ -59,18 +56,22 @@
},
mounted() {
if(this.$route.query.OrderType){
this.OrderId = this.$route.query.OrderId
this.dataObj.OrderId = this.$route.query.OrderId
if(this.$route.query.Type<4){
this.tab = this.$route.query.Type
this.dataObj.tab = this.$route.query.Type
}else{
this.tab = '0'
this.dataObj.tab = '0'
}
}else{
this.tab = '0'
this.OrderId = ''
}else if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.dataObj.OrderId = crmOrderObj.OrderId
if(crmOrderObj.Type<4){
this.dataObj.tab = this.$route.query.Type
}else{
this.dataObj.tab = '0'
}
console.log(crmOrderObj.OrderId,'======包车订单销售')
} else{
this.dataObj.OrderId = ''
this.dataObj.tab = '0'
}
......
src/components/busManagement/BookAcar/orderOP.vue
View file @ 9dc0e915
......@@ -3,9 +3,9 @@
<template>
<div>
<el-tabs v-model="tab" @tab-click="handleClick">
<el-tabs v-model="dataObj.tab" @tab-click="handleClick">
<el-tab-pane label="团队订单" name="0">
<TeamOrder :pagesTitle="pagesTitle" :OrderId="OrderId"></TeamOrder>
<TeamOrder :pagesTitle="pagesTitle" :OrderId="dataObj.OrderId"></TeamOrder>
</el-tab-pane>
<el-tab-pane label="接机订单" name="1">
<BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
......@@ -27,8 +27,6 @@
data() {
return {
pagesTitle: 'OP',
tab:'1',
OrderId: '',
dataObj:{
tab:'1',
OrderId: '',
......@@ -50,7 +48,6 @@
},
methods: {
handleClick(tab, event){
this.tab = tab.name
this.dataObj.tab = tab.name
}
},
......@@ -59,18 +56,22 @@
},
mounted() {
if(this.$route.query.OrderType){
this.OrderId = this.$route.query.OrderId
this.dataObj.OrderId = this.$route.query.OrderId
if(this.$route.query.Type<4){
this.tab = this.$route.query.Type
this.dataObj.tab = this.$route.query.Type
}else{
this.tab = '0'
this.dataObj.tab = '0'
}
}else{
this.tab = '0'
this.OrderId = ''
}else if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.dataObj.OrderId = crmOrderObj.OrderId
if(crmOrderObj.Type<4){
this.dataObj.tab = this.$route.query.Type
}else{
this.dataObj.tab = '0'
}
console.log(crmOrderObj.OrderId,'======包车订单OP')
} else{
this.dataObj.OrderId = ''
this.dataObj.tab = '0'
}
......
src/components/busManagement/tripBusOrder.vue
View file @ 9dc0e915
......@@ -418,10 +418,14 @@
pagesTitle(val,oldval){
this.Title = val
},
OrderId(val,oldval){
this.msg.OrderId = val
this.getList()
},
OrderId:{
handler(val, oldVal) {
this.msg.OrderId = val
this.getList()
},
deep: true,
immediate: true
}
},
methods: {
getEmployee() { //员工
......
src/components/scenicSpot/reservation/ReservationOrder.vue
View file @ 9dc0e915
......@@ -469,6 +469,12 @@ export default {
if (this.$route.query.OrderId) {
this.msg.OrderId = this.$route.query.OrderId
}
// crm自动登陆传过来的参数
if(this.$route.query.crmOrderObj){
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.OrderId = crmOrderObj.OrderId
console.log(crmOrderObj.OrderId,'======门票订单')
}
},
mounted() {
this.Datelist = this.getyMDOne()
......
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