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

Merge branch 'too/fix-bug2' into 'master'

Browse Source 
fix bug

See merge request CIEFWorldwideSdnBhd/exchange!92
This commit is contained in:
Jack Goh
2018-07-28 01:54:56 +00:00
parent b239f13344 27dce5b114
commit 1571dd3da4
5 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -3,7 +3,7 @@
/public/storage
/public/js
/public/css
public/mix-manifest.json
/public/mix-manifest.json
/storage/*.key
/vendor/**
/.idea
resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+4 -6
View File
@@ -221,7 +221,7 @@
</el-date-picker>
</el-form-item> -->
<el-form-item prop="actual_transfer_amount">
<el-input v-model="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
<el-input v-model.number="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
</el-form-item>
<el-form-item prop="details">
@@ -273,11 +273,9 @@
details: null,
},
rules: {
actual_transfer_amount: [{
required: true,
message: 'Please input transfer amount',
trigger: 'change'
}],
actual_transfer_amount: [
{ required: true, message: 'Please input amount',trigger: 'change'},
{ type: 'number', message: 'Amount must be a number',trigger: 'change'}],
// date: [{
// required: true,
// message: 'Please input date',
resources/assets/js/pages/admin/home.vue
+7 -1
View File
@@ -57,7 +57,13 @@
<!-- Booking Table-end -->
</div>
</template>
<style type="text/css">
.el-table__column-filter-trigger i {
font-size: 18px;
font-weight: 900;
vertical-align: sub;
}
</style>
<script>
import axios from 'axios'
resources/assets/js/pages/booking/uploadUserBankSlip.vue
+1 -1
View File
@@ -10,7 +10,7 @@
<br>
</div>
<div v-else align="center">
<h1>Waiting For Payment</h1>
<h1>Please Upload Bankslip</h1>
</div>
<div class="row">
resources/assets/js/pages/home.vue
+9 -16
View File
@@ -152,16 +152,16 @@
<el-input v-model="bookingForm.order_no" placeholder="Order No." style="width: 80%" required="true" />
</el-form-item>
<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.account_name" placeholder="China Beneficiary Name" 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.bank_name" type="text" placeholder="Bank Name" 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-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.account_num" type="text" placeholder="Account Number" style="width: 80%"
/>
</el-form-item>
<el-form-item>
@@ -186,7 +186,7 @@
<td>Customer Marking : </td>
<td> {{ bookingConfirmTable.marking }}</td>
</tr>
<tr>
<tr v-if="bookingConfirmTable.order_no != null">
<td>Payment for (Order No.) : </td>
<td> {{ bookingConfirmTable.order_no }}</td>
</tr>
@@ -262,13 +262,6 @@
<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">
@@ -380,11 +373,11 @@ export default {
account_num: ''
},
rules: {
order_no: [{
required: true,
message: 'Please input order number',
trigger: 'change'
}],
// order_no: [{
// required: true,
// message: 'Please input order number',
// trigger: 'change'
// }],
payment_for: [{
required: true,
message: 'Please input payment for',