Merge branch 'fix/refresh-button' into 'master'

Fix/refresh button

See merge request CIEFWorldwideSdnBhd/exchange!123
This commit is contained in:
Jack Goh
2018-08-17 03:33:18 +00:00
2 changed files with 20 additions and 5 deletions
+9 -1
View File
@@ -1,7 +1,7 @@
<template>
<div>
<div align="right">
<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking()">Refresh</el-button>
<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking(); RefreshBookingTableComplete()">Refresh</el-button>
</div>
<!-- Booking Table -->
@@ -176,6 +176,14 @@ export default {
})
})
},
RefreshBookingTableComplete() {
let $this = this
this.loading_btn = true
axios.get(this.completeBookingurl).then(response => {
this.loading_btn = false;
this.bookingTableComplete = response.data.data
})
},
makePagination(data){
let pagination ={
current_page: data.current_page,
+11 -4
View File
@@ -278,7 +278,7 @@
<br>
<hr>
<div align="right">
<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking()">Refresh</el-button></div>
<el-button :loading="loading_btn" type="primary" size="mini" @click="RefreshBooking(); RefreshBookingTableComplete()">Refresh</el-button></div>
<!-- Booking Table -->
<el-tabs type="border-card" class="table-switch">
@@ -527,8 +527,7 @@ export default {
this.getBooking();
this.initBooking();
this.getRate();
this.getCompleteBooking();
this.listen();
this.getBookingTableComplete();
},
methods: {
// listen to update rate changes
@@ -568,7 +567,7 @@ export default {
$this.makePagination(response.data)
})
},
getCompleteBooking(){
getBookingTableComplete(){
let $this = this
axios.get(this.completeBookingurl).then(response => {
this.bookingTableComplete = response.data.data
@@ -615,6 +614,14 @@ export default {
})
})
},
RefreshBookingTableComplete() {
let $this = this
this.loading_btn = true
axios.get(this.completeBookingurl).then(response => {
this.loading_btn = false;
this.bookingTableComplete = response.data.data
})
},
makePagination(data){
let pagination ={
current_page: data.current_page,