diff --git a/src/modules/04_registryNew/components/TableView.vue b/src/modules/04_registryNew/components/TableView.vue index 3fbd2da6e..b8988c058 100644 --- a/src/modules/04_registryNew/components/TableView.vue +++ b/src/modules/04_registryNew/components/TableView.vue @@ -323,7 +323,9 @@ watch( > ดูทะเบียนประวัติ {{ - `${props.row.prefix}${props.row.firstName} ${props.row.lastName}` + `${props.row.prefix ? props.row.prefix : ""}${ + props.row.firstName + } ${props.row.lastName}` }}
{{ props.row.citizenId }}
@@ -347,7 +349,9 @@ watch(
{{ - `${props.row.prefix}${props.row.firstName} ${props.row.lastName}` + `${props.row.prefix ? props.row.prefix : ""}${ + props.row.firstName + } ${props.row.lastName}` }}
diff --git a/src/modules/04_registryNew/views/list.vue b/src/modules/04_registryNew/views/list.vue index efbce7087..93d4f45c5 100644 --- a/src/modules/04_registryNew/views/list.vue +++ b/src/modules/04_registryNew/views/list.vue @@ -70,9 +70,6 @@ function fetchType() { }) .catch((err) => { messageError($q, err); - }) - .finally(() => { - hideLoader(); }); } @@ -85,14 +82,10 @@ function fetchLevel() { }) .catch((err) => { messageError($q, err); - }) - .finally(() => { - hideLoader(); }); } function fetchOptionGroup() { - showLoader(); http .get(config.API.orgEmployeeType) .then((res) => { @@ -100,14 +93,10 @@ function fetchOptionGroup() { }) .catch((err) => { messageError($q, err); - }) - .finally(() => { - hideLoader(); }); } function fetchLevelGroup() { - showLoader(); http .get(config.API.orgEmployeelevel) .then((res) => { @@ -115,9 +104,6 @@ function fetchLevelGroup() { }) .catch((err) => { messageError($q, err); - }) - .finally(() => { - hideLoader(); }); }