Commit 51a4b95f authored by youjie's avatar youjie

no message

parent 199ae380
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<script> <script>
import OrderList from './OrderList.vue'; import OrderList from './OrderList.vue';
export default { export default {
props:['pagesTitle','type','OrderId'], props:['pagesTitle','dataObj'],
components: { OrderList }, components: { OrderList },
data() { data() {
return { return {
...@@ -206,14 +206,14 @@ ...@@ -206,14 +206,14 @@
pagesTitle(val,oldval){ pagesTitle(val,oldval){
this.Title = val this.Title = val
}, },
type(val,oldval){ dataObj:{
this.msg.OrderType = val handler(val, oldVal) {
this.GetList() this.msg.OrderType = val.tab
}, this.msg.OrderId = val.OrderId
OrderId(val,oldval){
this.msg.OrderId = val
this.GetList() this.GetList()
}, },
deep: true,
}
}, },
methods: { methods: {
getEmployee() { //员工 getEmployee() { //员工
......
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
<div class="row-c"> <div class="row-c">
<div> <div>
<div <div
class="orderType cf fz12 active" class="orderType cf fz12 activeB"
> >
行程用车 行程用车
</div> </div>
...@@ -919,8 +919,8 @@ ...@@ -919,8 +919,8 @@
</el-row> </el-row>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button @click="isShowPrice = false">取 消</el-button> <el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="submitTripBusOffer('drivermsg')">确 定</el-button> <el-button type="primary" @click="driverdetermine">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
</div> </div>
......
...@@ -5,16 +5,16 @@ ...@@ -5,16 +5,16 @@
<div> <div>
<el-tabs v-model="tab" @tab-click="handleClick"> <el-tabs v-model="tab" @tab-click="handleClick">
<el-tab-pane label="团队订单" name="0"> <el-tab-pane label="团队订单" name="0">
<TeamOrder :pagesTitle="pagesTitle"></TeamOrder> <TeamOrder :pagesTitle="pagesTitle" :OrderId="OrderId"></TeamOrder>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="接机订单" name="1"> <el-tab-pane label="接机订单" name="1">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder> <BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="送机订单" name="2"> <el-tab-pane label="送机订单" name="2">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder> <BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="包车订单" name="3"> <el-tab-pane label="包车订单" name="3">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder> <BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -27,17 +27,31 @@ ...@@ -27,17 +27,31 @@
data() { data() {
return { return {
pagesTitle: '销售', pagesTitle: '销售',
tab:'1' tab:'1',
OrderId: '',
dataObj:{
tab:'1',
OrderId: 0,
}
}; };
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val,oldval){
} },
// dataObj:{
// handler(val, oldVal) {
// this.dataObj.OrderType = val.tab
// this.dataObj.OrderId = val.OrderId
// },
// deep: true,
// immediate: true,
// }
}, },
methods: { methods: {
handleClick(tab, event){ handleClick(tab, event){
this.tab = tab.name this.tab = tab.name
this.dataObj.tab = tab.name
} }
}, },
created() { created() {
...@@ -45,9 +59,15 @@ ...@@ -45,9 +59,15 @@
}, },
mounted() { mounted() {
if(this.$route.query.OrderType){ if(this.$route.query.OrderType){
this.OrderId = this.$route.query.OrderId
this.tab = this.$route.query.OrderType this.tab = this.$route.query.OrderType
this.dataObj.OrderId = this.$route.query.OrderId
this.dataObj.tab = this.$route.query.OrderType
}else{ }else{
this.tab = '0' this.tab = '0'
this.OrderId = 0
this.dataObj.OrderId = 0
this.dataObj.tab = '1'
} }
}, },
}; };
......
<style> <style>
</style> </style>
<template> <template>
<div> <div>
<el-tabs v-model="tab" @tab-click="handleClick"> <el-tabs v-model="tab" @tab-click="handleClick">
<el-tab-pane label="团队订单" name="0"> <el-tab-pane label="团队订单" name="0">
<TeamOrder></TeamOrder> <TeamOrder :pagesTitle="pagesTitle" :OrderId="OrderId"></TeamOrder>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="接机订单" name="1"> <el-tab-pane label="接机订单" name="1">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder> <BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="送机订单" name="2"> <el-tab-pane label="送机订单" name="2">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder> <BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="包车订单" name="3"> <el-tab-pane label="包车订单" name="3">
<BookAcarOrder :pagesTitle="pagesTitle" :type="tab"></BookAcarOrder> <BookAcarOrder :pagesTitle="pagesTitle" :dataObj="dataObj"></BookAcarOrder>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</template> </template>
<script> <script>
import BookAcarOrder from './components/BookAcarOrder.vue'; import BookAcarOrder from './components/BookAcarOrder.vue';
import TeamOrder from '../../busManagement/tripBusOrder.vue'; import TeamOrder from '../../busManagement/tripBusOrder.vue';
export default { export default {
...@@ -27,17 +27,31 @@ ...@@ -27,17 +27,31 @@
data() { data() {
return { return {
pagesTitle: 'OP', pagesTitle: 'OP',
tab:'1' tab:'1',
OrderId: '',
dataObj:{
tab:'1',
OrderId: 0,
}
}; };
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val,oldval){
} },
// dataObj:{
// handler(val, oldVal) {
// this.dataObj.OrderType = val.tab
// this.dataObj.OrderId = val.OrderId
// },
// deep: true,
// immediate: true,
// }
}, },
methods: { methods: {
handleClick(tab, event){ handleClick(tab, event){
this.tab = tab.name this.tab = tab.name
this.dataObj.tab = tab.name
} }
}, },
created() { created() {
...@@ -45,15 +59,21 @@ ...@@ -45,15 +59,21 @@
}, },
mounted() { mounted() {
if(this.$route.query.OrderType){ if(this.$route.query.OrderType){
this.OrderId = this.$route.query.OrderId
this.tab = this.$route.query.OrderType this.tab = this.$route.query.OrderType
this.dataObj.OrderId = this.$route.query.OrderId
this.dataObj.tab = this.$route.query.OrderType
}else{ }else{
this.tab = '0' this.tab = '0'
this.OrderId = 0
this.dataObj.OrderId = 0
this.dataObj.tab = '1'
} }
}, },
}; };
</script> </script>
<style> <style>
</style> </style>
...@@ -398,6 +398,7 @@ ...@@ -398,6 +398,7 @@
}, },
OrderId(val,oldval){ OrderId(val,oldval){
this.msg.OrderId = val this.msg.OrderId = val
this.getList()
}, },
}, },
methods: { methods: {
......
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