cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix booking confirmation

Browse Source
This commit is contained in:
weiweitoo
2018-07-21 14:16:39 +08:00
parent 1b874d0800
commit a0f80aa41b
1 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/pages/home.vue
+48 -30
View File
@@ -141,19 +141,19 @@
<!-- Form_popup -->
<el-dialog :visible.sync="dialogFormVisible" :fullscreen="true" title="Booking" center>
<el-form ref="bookingForm" :model="bookingForm" :rules="rules">
<el-form ref="bookingForm" :model="bookingForm[0]" :rules="rules">
<div align="center">
<el-form-item prop="account_name">
<el-input v-model="bookingForm.account_name" placeholder="China Beneficiary Account" style="width: 80%" required="true" />
<el-input v-model="bookingForm[0].account_name" placeholder="China Beneficiary Account" style="width: 80%" required="true" />
</el-form-item>
<el-form-item prop="bank_name">
<el-input v-model="bookingForm.bank_name" type="text" placeholder="Bank Name / AliPay / WechatPay" style="width: 80%" />
<el-input v-model="bookingForm[0].bank_name" type="text" placeholder="Bank Name / AliPay / WechatPay" style="width: 80%" />
</el-form-item>
<el-form-item prop="bank_branch">
<el-input v-model="bookingForm.bank_branch" type="text" placeholder="Branch / 分行/支行" style="width: 80%" />
<el-input v-model="bookingForm[0].bank_branch" type="text" placeholder="Branch / 分行/支行" style="width: 80%" />
</el-form-item>
<el-form-item prop="account_num">
<el-input v-model="bookingForm.account_num" type="text" placeholder="Account Number / AliPay_ID / WechatPay_ID" style="width: 80%"
<el-input v-model="bookingForm[0].account_num" type="text" placeholder="Account Number / AliPay_ID / WechatPay_ID" style="width: 80%"
/>
</el-form-item>
<el-form-item>
@@ -178,25 +178,21 @@
<td>Customer Marking : </td>
<td> {{ bookingConfirmTable.marking }}</td>
</tr>
<tr>
<td>Payment for (Order No.) : </td>
<td> {{ bookingConfirmTable.payment_order }}</td>
</tr>
<tr>
<td>Payment Method : </td>
<td> {{ bookingConfirmTable.payment_method }}</td>
</tr>
<tr>
<td>CNY/RMB : </td>
<td> {{ bookingConfirmTable.amount }}</td>
<td>Remarks : </td>
<td> {{ bookingConfirmTable.remark }}</td>
</tr>
<tr>
<td>+ Service Charge : </td>
<td> RMB {{ bookingConfirmTable.service_charge }}</td>
</tr>
<tr>
<td> RATE :</td>
<td> {{ bookingConfirmTable.rate }}</td>
</tr>
<tr>
<td>China Beneficiary Acc :</td>
<td> {{ bookingForm.account_name }}</td>
<td></td>
<td></td>
</tr>
<tr>
<td>CNY/RMB :</td>
@@ -235,11 +231,40 @@
</td>
</tr>
<tr>
<td>Bank in Amount :</td>
<td>Bank In Amount :</td>
<td>
<b> RM {{ bookingConfirmTable.bankin_amount }}</b>
</td>
</tr>
<tr>
<td>China Beneficiary Acc :</td>
<td></td>
</tr>
<tr>
<td>
<div v-for="(item,index) in bookingForm" align="center">
{{index+1}}) {{ item.account_name }} {{ item.account_num }}
<br/>
</div>
</td>
<td>
</td>
</tr>
<tr>
<td>Bank In Amount :</td>
<td><b>RM {{ bookingConfirmTable.bankin_amount }}</b></td>
</tr>
<tr>
<td></td>
<td></td>
</tr>
<tr>
<td align="center" colspan="2">
<b>CIEF WORLDWIDE SDN. BHD.(1134596-M)</b>
<br/>
<b>MBB 568603010762</b>
</td>
</tr>
</tbody>
</table>
<span slot="footer" class="dialog-footer">
@@ -343,13 +368,12 @@ export default {
amount: '',
rate: ''
},
bookingForm: {
// amount: '',
bookingForm: [{
account_name: '',
bank_name: '',
bank_branch: '',
account_num: ''
},
}],
rules: {
amount: [{
required: true,
@@ -459,8 +483,6 @@ export default {
})
})
},
makePagination(data){
let pagination ={
current_page: data.current_page,
@@ -511,12 +533,11 @@ export default {
this.loading = false
console.log(response)
this.bookingConfirmTable = response.data;
this.bookingConfirmTable.payment_for = 'Full Payment';//For future purpose?
this.bookingConfirmTable.remark = '';//For future purpose?
this.bookingConfirmTable.payment_for = 'Full Payment';//For future purpose
this.bookingConfirmTable.remark = '';//For future purpose
this.bookingConfirmTable.payment_order = '';//For future purpose
this.dialogFormVisible = false
this.dialogFormVisible1 = true
console.log(this.bookingConfirmTable);
console.log(this.bookingForm);
})
.catch((error) => {
this.$message({
@@ -550,8 +571,6 @@ export default {
amount: this.booking.amount,
term: this.term
}
console.log(newBooking)
axios.post('api/booking', newBooking)
.then((response) => {
this.loading = false
@@ -560,7 +579,6 @@ export default {
name: 'booking.user.upload',
params: {id: response.data.id }
})
// pass variable to another router
})
.catch((error) => {