diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 7a24050a..230c6b25 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -152,7 +152,7 @@ - + @@ -161,7 +161,7 @@ - @@ -176,74 +176,94 @@ -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Date : {{ bookingConfirmTable.date }}
Customer Marking : {{ bookingConfirmTable.marking }}
Payment for (Order No.) : {{ bookingConfirmTable.payment_order }}
Payment Method : {{ bookingConfirmTable.payment_method }}
Remarks : {{ bookingConfirmTable.remark }}
CNY/RMB : - RM {{ bookingConfirmTable.amount }} -
+ Service Charges : - RM {{ bookingConfirmTable.service_charge }} -
Rate : - {{ bookingConfirmTable.rate }} -
- RM {{ bookingConfirmTable.subtotal }} -
+ Tax : - RM {{ bookingConfirmTable.taxAmount }} -
+ Billing Charge : - RM {{ bookingConfirmTable.billingChargeAmount }} -
Bank In Amount : - RM {{ bookingConfirmTable.bankin_amount }} -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Date : {{ bookingConfirmTable.date }}
Customer Marking : {{ bookingConfirmTable.marking }}
Payment for (Order No.) : {{ bookingConfirmTable.order_no }}
Payment for : {{ bookingConfirmTable.payment_for }}
Payment Method : {{ bookingConfirmTable.payment_method }}
Remarks : {{ bookingConfirmTable.remark }}
CNY/RMB : + CNY {{ bookingConfirmTable.amount }} +
+ Service Charges : + CNY {{ bookingConfirmTable.service_charge }} +
/ Rate : + {{ bookingConfirmTable.rate }} +
+ MYR {{ bookingConfirmTable.subtotal }} +
+ Tax : + MYR {{ bookingConfirmTable.taxAmount }} +
+ Billing Charge : + MYR {{ bookingConfirmTable.billingChargeAmount }} +
Bank In Amount : + MYR {{ bookingConfirmTable.bankin_amount }} +
China Beneficiary Acc :
+ Name : {{ bookingConfirmTable.acc_name }}
+ Account No. : {{ bookingConfirmTable.acc_no }}
Bank In Amount :RM {{ bookingConfirmTable.bankin_amount }}
Confirm @@ -353,16 +373,26 @@ export default { account_num: '' }, rules: { - /*amount: [{ + // order_no: [{ + // required: true, + // message: 'Please input order number', + // trigger: 'change' + // }], + payment_for: [{ + required: true, + message: 'Please input payment for', + trigger: 'change' + }], + amount: [{ required: true, message: 'Please input amount', trigger: 'change' - }],*/ + } ], bank_name: [{ required: true, message: 'Please input bank name', trigger: 'change' - }], + } ], account_name: [{ required: true, message: 'Please input account name', @@ -377,8 +407,7 @@ export default { required: true, message: 'Please input account number', trigger: 'change' - } - ] + }] }, term: '', options1: [{ @@ -511,13 +540,6 @@ export default { }) return } - if ((this.booking.amount < 0) || isNaN(this.booking.amount)) { - this.$message({ - message: 'Amount must be a number greater than 0', - type: 'warning' - }) - return - } this.dialogFormVisible = true this.term = newterm }, @@ -530,6 +552,7 @@ export default { }) return } + this.loading = true this.$refs[formName].validate((valid) => { if (valid) { @@ -559,10 +582,10 @@ export default { console.log(error) }) } else { - this.loading = false - this.$message({ + this.loading = false + this.$message({ showClose: true, - message: 'Please fill the booking form.', + message: 'Please fill the booking form in full.', type: 'error', duration: 10000 })