浏览代码

fix: member master

父节点
当前提交
4cebfb3b22

+ 4
- 5
public/js/resources_js_pages_member_Create_vue.js 查看文件

@@ -431,7 +431,7 @@ __webpack_require__.r(__webpack_exports__);
431 431
     });
432 432
     (0,_components_useFormErrorReset__WEBPACK_IMPORTED_MODULE_5__.useFormErrorReset)(form);
433 433
 
434
-    var _useVehicle = (0,_useVehicle__WEBPACK_IMPORTED_MODULE_4__.useVehicle)(form, props.typeMember.maxVehicles),
434
+    var _useVehicle = (0,_useVehicle__WEBPACK_IMPORTED_MODULE_4__.useVehicle)(props, form),
435 435
         listVehicle = _useVehicle.listVehicle,
436 436
         vehicleClear = _useVehicle.vehicleClear,
437 437
         vehicleOnDelete = _useVehicle.vehicleOnDelete,
@@ -1472,11 +1472,10 @@ __webpack_require__.r(__webpack_exports__);
1472 1472
 
1473 1473
 
1474 1474
 
1475
-function useVehicle(form, maxVehicles) {
1476
-  var initialVehicles = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
1475
+function useVehicle(props, form) {
1477 1476
   var listVehicle = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
1478 1477
   (0,vue__WEBPACK_IMPORTED_MODULE_0__.onMounted)(function () {
1479
-    initialVehicles.forEach(function (val) {
1478
+    props.initialVehicles.forEach(function (val) {
1480 1479
       return listVehicle.push(val);
1481 1480
     });
1482 1481
   });
@@ -1534,7 +1533,7 @@ function useVehicle(form, maxVehicles) {
1534 1533
     try {
1535 1534
       form.clearErrors('plat_number', 'max_vehicle_id');
1536 1535
       vehicleAddValidation();
1537
-      var typeVehicle = maxVehicles.filter(function (maxVehicle) {
1536
+      var typeVehicle = props.typeMember.maxVehicles.filter(function (maxVehicle) {
1538 1537
         return maxVehicle.value === form.max_vehicle_id;
1539 1538
       })[0];
1540 1539
       listVehicle.push({

+ 4
- 5
public/js/resources_js_pages_member_Edit_vue.js 查看文件

@@ -445,7 +445,7 @@ __webpack_require__.r(__webpack_exports__);
445 445
     });
446 446
     (0,_components_useFormErrorReset__WEBPACK_IMPORTED_MODULE_6__.useFormErrorReset)(form);
447 447
 
448
-    var _useVehicle = (0,_useVehicle__WEBPACK_IMPORTED_MODULE_5__.useVehicle)(form, props.typeMember.maxVehicles, props.initialVehicles),
448
+    var _useVehicle = (0,_useVehicle__WEBPACK_IMPORTED_MODULE_5__.useVehicle)(props, form),
449 449
         listVehicle = _useVehicle.listVehicle,
450 450
         vehicleOnDelete = _useVehicle.vehicleOnDelete,
451 451
         vehicleOnAdd = _useVehicle.vehicleOnAdd;
@@ -1548,11 +1548,10 @@ __webpack_require__.r(__webpack_exports__);
1548 1548
 
1549 1549
 
1550 1550
 
1551
-function useVehicle(form, maxVehicles) {
1552
-  var initialVehicles = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
1551
+function useVehicle(props, form) {
1553 1552
   var listVehicle = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
1554 1553
   (0,vue__WEBPACK_IMPORTED_MODULE_0__.onMounted)(function () {
1555
-    initialVehicles.forEach(function (val) {
1554
+    props.initialVehicles.forEach(function (val) {
1556 1555
       return listVehicle.push(val);
1557 1556
     });
1558 1557
   });
@@ -1610,7 +1609,7 @@ function useVehicle(form, maxVehicles) {
1610 1609
     try {
1611 1610
       form.clearErrors('plat_number', 'max_vehicle_id');
1612 1611
       vehicleAddValidation();
1613
-      var typeVehicle = maxVehicles.filter(function (maxVehicle) {
1612
+      var typeVehicle = props.typeMember.maxVehicles.filter(function (maxVehicle) {
1614 1613
         return maxVehicle.value === form.max_vehicle_id;
1615 1614
       })[0];
1616 1615
       listVehicle.push({

+ 3
- 4
public/js/resources_js_pages_member_useVehicle_js.js 查看文件

@@ -19,11 +19,10 @@ __webpack_require__.r(__webpack_exports__);
19 19
 
20 20
 
21 21
 
22
-function useVehicle(form, maxVehicles) {
23
-  var initialVehicles = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
22
+function useVehicle(props, form) {
24 23
   var listVehicle = (0,vue__WEBPACK_IMPORTED_MODULE_0__.reactive)([]);
25 24
   (0,vue__WEBPACK_IMPORTED_MODULE_0__.onMounted)(function () {
26
-    initialVehicles.forEach(function (val) {
25
+    props.initialVehicles.forEach(function (val) {
27 26
       return listVehicle.push(val);
28 27
     });
29 28
   });
@@ -81,7 +80,7 @@ function useVehicle(form, maxVehicles) {
81 80
     try {
82 81
       form.clearErrors('plat_number', 'max_vehicle_id');
83 82
       vehicleAddValidation();
84
-      var typeVehicle = maxVehicles.filter(function (maxVehicle) {
83
+      var typeVehicle = props.typeMember.maxVehicles.filter(function (maxVehicle) {
85 84
         return maxVehicle.value === form.max_vehicle_id;
86 85
       })[0];
87 86
       listVehicle.push({

+ 1
- 1
public/js/vue.js 查看文件

@@ -58466,7 +58466,7 @@ module.exports = JSON.parse('{"name":"axios","version":"0.21.4","description":"P
58466 58466
 /******/ 		// This function allow to reference async chunks
58467 58467
 /******/ 		__webpack_require__.u = (chunkId) => {
58468 58468
 /******/ 			// return url for filenames based on template
58469
-/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"85a497d97d470da0","resources_js_pages_auth_Login_vue":"b69ff437d119c92b","resources_js_pages_auth_ResetPassword_vue":"9bc29d6465cc0c53","resources_js_pages_auth_VerifyEmail_vue":"f88499b46d5f110c","resources_js_pages_expense_Create_vue":"6b317317dd1facc1","resources_js_pages_expense_Index_vue":"f327c35b5ad8e14e","resources_js_pages_expense_Show_vue":"3733d151f20dd403","resources_js_pages_expense_tableHeader_js":"5b2c3a80fb697fff","resources_js_pages_home_Index_vue":"d37b07ec9a0de76b","resources_js_pages_member_Create_vue":"f4b63befa49f6e26","resources_js_pages_member_Edit_vue":"0b21680b5e4d46ee","resources_js_pages_member_Index_vue":"40ca1ddbbabb9e2f","resources_js_pages_member_tableHeader_js":"04203ba8e978ad6d","resources_js_pages_member_useVehicle_js":"ac8f621505df8bfa","resources_js_pages_mutation_Report_vue":"90f53c276fcf49e9","resources_js_pages_mutation_tableHeader_js":"2c25ede9c3d1ff83","resources_js_pages_parkingfee_Create_vue":"3b5d007865a3175b","resources_js_pages_topup_Create_vue":"32cf0789dbb7fa35","resources_js_pages_topup_Index_vue":"c1090dc1adf89b8a","resources_js_pages_topup_Show_vue":"6fc93ef73b921bef","resources_js_pages_topup_tableHeader_js":"03d60ae1a3c0ef0b","resources_js_pages_typemember_Create_vue":"a03beb0602482c6e","resources_js_pages_typemember_Edit_vue":"306820cc3330dbb0","resources_js_pages_typemember_Index_vue":"636b8e7509320ec1","resources_js_pages_typemember_tableHeader_js":"02f8a6c57093a7fe","resources_js_pages_typemember_useVehicle_js":"4172632bbd2a9293","resources_js_pages_typevehicle_Create_vue":"473e9a1484d5a361","resources_js_pages_typevehicle_Edit_vue":"771320873aaeb34e","resources_js_pages_typevehicle_Index_vue":"3f5b8f7cd6431c9c","resources_js_pages_typevehicle_tableHeader_js":"9616b18c4a750c3f","resources_js_pages_user_Create_vue":"c0966eacbaebe9f3","resources_js_pages_user_Edit_vue":"d72a87bfe38c706a","resources_js_pages_user_Index_vue":"b105362e3311d405","resources_js_pages_user_Show_vue":"9fd2ebf7d82aac77","resources_js_pages_user_tableHeader_js":"21d48ec8ebf81ea7"}[chunkId] + "";
58469
+/******/ 			return "js/" + chunkId + ".js?id=" + {"node_modules_chart_js_auto_auto_esm_js":"10c6b388645ceb22","resources_js_pages_auth_ForgotPassword_vue":"85a497d97d470da0","resources_js_pages_auth_Login_vue":"b69ff437d119c92b","resources_js_pages_auth_ResetPassword_vue":"9bc29d6465cc0c53","resources_js_pages_auth_VerifyEmail_vue":"f88499b46d5f110c","resources_js_pages_expense_Create_vue":"6b317317dd1facc1","resources_js_pages_expense_Index_vue":"f327c35b5ad8e14e","resources_js_pages_expense_Show_vue":"3733d151f20dd403","resources_js_pages_expense_tableHeader_js":"5b2c3a80fb697fff","resources_js_pages_home_Index_vue":"d37b07ec9a0de76b","resources_js_pages_member_Create_vue":"801768e4d79c6630","resources_js_pages_member_Edit_vue":"6cd514e698b0f96a","resources_js_pages_member_Index_vue":"40ca1ddbbabb9e2f","resources_js_pages_member_tableHeader_js":"04203ba8e978ad6d","resources_js_pages_member_useVehicle_js":"aaef02e47d24d84c","resources_js_pages_mutation_Report_vue":"90f53c276fcf49e9","resources_js_pages_mutation_tableHeader_js":"2c25ede9c3d1ff83","resources_js_pages_parkingfee_Create_vue":"3b5d007865a3175b","resources_js_pages_topup_Create_vue":"32cf0789dbb7fa35","resources_js_pages_topup_Index_vue":"c1090dc1adf89b8a","resources_js_pages_topup_Show_vue":"6fc93ef73b921bef","resources_js_pages_topup_tableHeader_js":"03d60ae1a3c0ef0b","resources_js_pages_typemember_Create_vue":"a03beb0602482c6e","resources_js_pages_typemember_Edit_vue":"306820cc3330dbb0","resources_js_pages_typemember_Index_vue":"636b8e7509320ec1","resources_js_pages_typemember_tableHeader_js":"02f8a6c57093a7fe","resources_js_pages_typemember_useVehicle_js":"4172632bbd2a9293","resources_js_pages_typevehicle_Create_vue":"473e9a1484d5a361","resources_js_pages_typevehicle_Edit_vue":"771320873aaeb34e","resources_js_pages_typevehicle_Index_vue":"3f5b8f7cd6431c9c","resources_js_pages_typevehicle_tableHeader_js":"9616b18c4a750c3f","resources_js_pages_user_Create_vue":"c0966eacbaebe9f3","resources_js_pages_user_Edit_vue":"d72a87bfe38c706a","resources_js_pages_user_Index_vue":"b105362e3311d405","resources_js_pages_user_Show_vue":"9fd2ebf7d82aac77","resources_js_pages_user_tableHeader_js":"21d48ec8ebf81ea7"}[chunkId] + "";
58470 58470
 /******/ 		};
58471 58471
 /******/ 	})();
58472 58472
 /******/ 	

+ 1
- 1
resources/js/pages/member/Create.vue 查看文件

@@ -24,7 +24,7 @@ const form = useForm({
24 24
 
25 25
 useFormErrorReset(form)
26 26
 
27
-const { listVehicle, vehicleClear, vehicleOnDelete, vehicleOnAdd } = useVehicle(form, props.typeMember.maxVehicles)
27
+const { listVehicle, vehicleClear, vehicleOnDelete, vehicleOnAdd } = useVehicle(props, form)
28 28
 
29 29
 const formSent = () => {
30 30
   form

+ 1
- 5
resources/js/pages/member/Edit.vue 查看文件

@@ -28,11 +28,7 @@ const form = useForm({
28 28
 
29 29
 useFormErrorReset(form)
30 30
 
31
-const { listVehicle, vehicleOnDelete, vehicleOnAdd } = useVehicle(
32
-  form,
33
-  props.typeMember.maxVehicles,
34
-  props.initialVehicles
35
-)
31
+const { listVehicle, vehicleOnDelete, vehicleOnAdd } = useVehicle(props, form)
36 32
 
37 33
 const confirm = useConfirm()
38 34
 

+ 5
- 3
resources/js/pages/member/useVehicle.js 查看文件

@@ -3,11 +3,11 @@ import { Inertia } from '@inertiajs/inertia'
3 3
 import { usePage } from '@inertiajs/inertia-vue3'
4 4
 import FormValidationError from '@/utils/formValidationError'
5 5
 
6
-export function useVehicle(form, maxVehicles, initialVehicles = []) {
6
+export function useVehicle(props, form) {
7 7
   const listVehicle = reactive([])
8 8
 
9 9
   onMounted(() => {
10
-    initialVehicles.forEach((val) => listVehicle.push(val))
10
+    props.initialVehicles.forEach((val) => listVehicle.push(val))
11 11
   })
12 12
 
13 13
   watch(
@@ -61,7 +61,9 @@ export function useVehicle(form, maxVehicles, initialVehicles = []) {
61 61
 
62 62
       vehicleAddValidation()
63 63
 
64
-      const typeVehicle = maxVehicles.filter((maxVehicle) => maxVehicle.value === form.max_vehicle_id)[0]
64
+      const typeVehicle = props.typeMember.maxVehicles.filter(
65
+        (maxVehicle) => maxVehicle.value === form.max_vehicle_id
66
+      )[0]
65 67
 
66 68
       listVehicle.push({
67 69
         platNumber: form.plat_number.toUpperCase(),