diff --git a/app/Http/Controllers/BookingSupplierController.php b/app/Http/Controllers/BookingSupplierController.php index 7f84c087..0c7fb17e 100644 --- a/app/Http/Controllers/BookingSupplierController.php +++ b/app/Http/Controllers/BookingSupplierController.php @@ -84,6 +84,7 @@ class BookingSupplierController extends Controller $supplier_booking->acc_name = $booking->account_name; $supplier_booking->acc_no = $booking->account_num; // TODO : standardize acc_no $supplier_booking->bank_name = $booking->bank_name; + $supplier_booking->bank_branch = $booking->bank_branch; } else{ @@ -91,6 +92,7 @@ class BookingSupplierController extends Controller $supplier_booking->acc_name = $beneficiary->company_name; $supplier_booking->acc_no = $beneficiary->acc_no; $supplier_booking->bank_name = $beneficiary->bank_name; + $supplier_booking->bank_branch = $beneficiary->bank_branch; } return response()->json($supplier_booking ,200); diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 72705c4a..1bec13fb 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -551,6 +551,7 @@ ctx.fillText("户名 : " + binding.value.acc_name, column2X - 40, rowHeight[22] - 60); ctx.fillText(binding.value.acc_no, column2X - 40, rowHeight[22] - 40); ctx.fillText(binding.value.bank_name , column2X - 40, rowHeight[22] - 20); + ctx.fillText(binding.value.bank_branch , column2X - 40, rowHeight[22] - 2); ctx.font = "13px Arial"; }, 1000,canvasElement,binding); diff --git a/resources/assets/js/pages/settings/admin-credit-setting.vue b/resources/assets/js/pages/settings/admin-credit-setting.vue index f776a0c8..d5273fd0 100644 --- a/resources/assets/js/pages/settings/admin-credit-setting.vue +++ b/resources/assets/js/pages/settings/admin-credit-setting.vue @@ -40,22 +40,12 @@ this.getCreditSetting(); }, methods: { - ValidateAll : function(){ - var working; - this.$validator.validateAll().then((result) => { - working = result; - }).catch(() => { - }); - }, getCreditSetting() { axios.get('/api/setting-credit').then(response => { this.credit_setting = response.data }) }, updateCreditSetting (){ - if(this.ValidateAll()) - return; - this.loading_btn = true axios.put('/api/setting-credit', this.credit_setting) .then((response) => {