diff --git a/src/modules/04_registryPerson/views/listView.vue b/src/modules/04_registryPerson/views/listView.vue index 59a2f3ca0..2aa948d3e 100644 --- a/src/modules/04_registryPerson/views/listView.vue +++ b/src/modules/04_registryPerson/views/listView.vue @@ -584,17 +584,19 @@ onMounted(async () => { - + +
+ +
diff --git a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue index 2c25a9b55..7dd6fe0b0 100644 --- a/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue +++ b/src/modules/05_placement/components/AppointEmployee/AppointEmployeeDetail.vue @@ -274,7 +274,7 @@ onMounted(() => { -
+
{ />
-
+
{ />
-
+
{ />
-
+
diff --git a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue index 80a242288..c1b83d016 100644 --- a/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue +++ b/src/modules/05_placement/components/AppointMent/AppointMentDetail.vue @@ -258,7 +258,7 @@ onMounted(() => {
-
+
{ />
-
+
{ />
-
+
{ />
-
+
diff --git a/src/modules/05_placement/components/Other/OtherDetail.vue b/src/modules/05_placement/components/Other/OtherDetail.vue index 9f797cbc6..af9a9ed34 100644 --- a/src/modules/05_placement/components/Other/OtherDetail.vue +++ b/src/modules/05_placement/components/Other/OtherDetail.vue @@ -261,7 +261,7 @@ onMounted(async () => { />
-
+
{ />
-
+
{ />
-
+
{ />
-
+
diff --git a/src/modules/05_placement/components/Receive/receiveDetail.vue b/src/modules/05_placement/components/Receive/receiveDetail.vue index ce3e5882e..b31b0e63d 100644 --- a/src/modules/05_placement/components/Receive/receiveDetail.vue +++ b/src/modules/05_placement/components/Receive/receiveDetail.vue @@ -930,7 +930,7 @@ onMounted(async () => { type="textarea" />
-
+
{ :label="`${'ประเภทตำแหน่ง'}`" />
-
+
{ :label="`${'ระดับตำแหน่ง'}`" />
-
+
{ :label="`${'เลขที่'}`" />
-
+
{ />
-
+
{ />
-
+
{ />
-
+
{ />
-
+
diff --git a/src/modules/05_placement/components/Transfer/TransferDetail.vue b/src/modules/05_placement/components/Transfer/TransferDetail.vue index 04b1404c3..a51a98417 100644 --- a/src/modules/05_placement/components/Transfer/TransferDetail.vue +++ b/src/modules/05_placement/components/Transfer/TransferDetail.vue @@ -547,7 +547,7 @@ onMounted(async () => {
-
+
{ :label="`${'ประเภทตำแหน่ง'}`" />
-
+
{ :label="`${'ระดับตำแหน่ง'}`" />
-
+
{ :label="`${'เลขที่'}`" />
-
+
diff --git a/src/modules/05_placement/views/02_transferMain.vue b/src/modules/05_placement/views/02_transferMain.vue index 6c6020f97..492ac0ac5 100644 --- a/src/modules/05_placement/views/02_transferMain.vue +++ b/src/modules/05_placement/views/02_transferMain.vue @@ -150,7 +150,6 @@ function openModalOrder() { r.positionTypeOld && r.positionLevelOld && r.positionNumberOld && - r.salary !== null && r.organization && r.date ); diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue index c7e87c92e..73d14e553 100644 --- a/src/modules/05_placement/views/03_receiveMain.vue +++ b/src/modules/05_placement/views/03_receiveMain.vue @@ -288,8 +288,7 @@ function openModalOrder() { r.organizationPositionOld && r.positionTypeOld && r.positionLevelOld && - r.positionNumberOld && - r.amountOld !== null + r.positionNumberOld ); rows2.value = row; diff --git a/src/modules/05_placement/views/05_repatriateMain.vue b/src/modules/05_placement/views/05_repatriateMain.vue index 4d34fd26d..ced5d2b01 100644 --- a/src/modules/05_placement/views/05_repatriateMain.vue +++ b/src/modules/05_placement/views/05_repatriateMain.vue @@ -204,7 +204,6 @@ function openModalOrder() { item.positionTypeOld && item.positionLevelOld && item.positionNumberOld && - item.salary !== null && item.organization && item.date && item.dateRepatriation diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue index 080e054cb..cac9e7ac5 100644 --- a/src/modules/05_placement/views/06_appointPromoteMain.vue +++ b/src/modules/05_placement/views/06_appointPromoteMain.vue @@ -178,7 +178,6 @@ async function fecthlistappointment() { e.positionTypeOld && e.positionLevelOld && e.positionNumberOld && - e.salary !== null && e.positionDate ); }) diff --git a/src/modules/05_placement/views/07_appointEmployeeMain.vue b/src/modules/05_placement/views/07_appointEmployeeMain.vue index 07c7fea7e..a528ffe6d 100644 --- a/src/modules/05_placement/views/07_appointEmployeeMain.vue +++ b/src/modules/05_placement/views/07_appointEmployeeMain.vue @@ -176,7 +176,6 @@ async function fecthlistappointment() { e.positionTypeOld && e.positionLevelOld && e.positionNumberOld && - e.salary !== null && e.positionDate ); }) diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue index 3f2d557fa..477405ff9 100644 --- a/src/modules/05_placement/views/08_otherMain.vue +++ b/src/modules/05_placement/views/08_otherMain.vue @@ -148,7 +148,6 @@ async function fecthlistOthet() { e.positionTypeOld && e.positionLevelOld && e.positionNumberOld && - e.amountOld !== null && e.positionDate && e.leaveDate !== null ); diff --git a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue index 381e74c69..e55eb95fb 100644 --- a/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue +++ b/src/modules/06_retirement/components/Discharged/dischargedRegistry.vue @@ -379,14 +379,14 @@ onMounted(async () => {
- + /> -->
diff --git a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue index 9b9dad098..74cda44d8 100644 --- a/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue +++ b/src/modules/06_retirement/components/DismissOrder/DismissOrder.vue @@ -140,7 +140,6 @@ function openModalOrder() { r.positionTypeOld && r.positionLevelOld && r.positionNumberOld && - r.salary && r.organization && r.date ); diff --git a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue index cb74848b7..055b653e6 100644 --- a/src/modules/06_retirement/components/DismissOrder/outRegistry.vue +++ b/src/modules/06_retirement/components/DismissOrder/outRegistry.vue @@ -118,15 +118,15 @@ async function onSubmit() { showLoader(); await http .put(config.API.outByid(dataId), body) - .then(() => { + .then(async () => { + await getData(); success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ"); edit.value = false; }) .catch((e) => { messageError($q, e); }) - .finally(async () => { - await getData(); + .finally(() => { hideLoader(); }); }, @@ -247,7 +247,7 @@ onMounted(async () => { />
-
+
{ />
-
+
{ />
-
+
{ />
-
+
diff --git a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue index dc9fe0cf1..f66c154fb 100644 --- a/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue +++ b/src/modules/06_retirement/components/Expulsion/expulsionRegistry.vue @@ -381,14 +381,14 @@ onMounted(async () => {
- + /> -->
diff --git a/src/modules/06_retirement/components/resign/ResignByid.vue b/src/modules/06_retirement/components/resign/ResignByid.vue index 54b349f75..b91dff6a9 100644 --- a/src/modules/06_retirement/components/resign/ResignByid.vue +++ b/src/modules/06_retirement/components/resign/ResignByid.vue @@ -1162,7 +1162,7 @@ onMounted(async () => { />
-
+
{ />
-
+
{ />
-
+
{ />
-
+
diff --git a/src/modules/06_retirement/components/resign/ResignReject.vue b/src/modules/06_retirement/components/resign/ResignReject.vue index 31c899fed..7e60ae7da 100644 --- a/src/modules/06_retirement/components/resign/ResignReject.vue +++ b/src/modules/06_retirement/components/resign/ResignReject.vue @@ -583,7 +583,7 @@ onMounted(async () => { />
-
+
{ />
-
+
{ />
-
+
{ />
-
+
diff --git a/src/modules/06_retirement/components/resign/Table.vue b/src/modules/06_retirement/components/resign/Table.vue index c90d73d20..36be36071 100644 --- a/src/modules/06_retirement/components/resign/Table.vue +++ b/src/modules/06_retirement/components/resign/Table.vue @@ -165,7 +165,6 @@ async function openModalOrder() { r.positionTypeOld && r.positionLevelOld && r.positionNumberOld && - r.salary && r.location && r.sendDate ); diff --git a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue index d4ed36914..2fedcbbfc 100644 --- a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue +++ b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue @@ -11,7 +11,7 @@ import { useDisciplineSuspendStore } from "@/modules/11_discipline/store/Suspend /**Import type */ import type { QForm } from "quasar"; -import type { dataDetail } from "@/modules/11_discipline/interface/response/suspend"; +import type { DataDetail } from "@/modules/11_discipline/interface/response/suspend"; import type { DataProfile } from "@/modules/05_placement/interface/index/Main"; import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue"; @@ -46,7 +46,7 @@ const roleAdmin = ref(false); const edit = ref(false); const dataProfile = ref(); -const data = reactive({ +const data = reactive({ id: "", personId: "", citizenId: "", @@ -311,7 +311,7 @@ onMounted(async () => {
-
+
{ />
-
+
{ />
-
+
{ />
-
+
diff --git a/src/modules/11_discipline/interface/response/suspend.ts b/src/modules/11_discipline/interface/response/suspend.ts index 0bf18c5ec..9cb23a0e1 100644 --- a/src/modules/11_discipline/interface/response/suspend.ts +++ b/src/modules/11_discipline/interface/response/suspend.ts @@ -46,7 +46,7 @@ interface dataType { disciplinaryCaseFault: string; } -interface dataDetail { +interface DataDetail { id: string; personId: string; citizenId: string; @@ -91,4 +91,4 @@ interface DataOption { id: string; name: string; } -export type { listData, dataType, dataDetail, DataOption }; +export type { listData, dataType, DataDetail, DataOption }; diff --git a/src/modules/18_command/components/Step/2_ListPersons.vue b/src/modules/18_command/components/Step/2_ListPersons.vue index 5dec013ae..0e931b0a1 100644 --- a/src/modules/18_command/components/Step/2_ListPersons.vue +++ b/src/modules/18_command/components/Step/2_ListPersons.vue @@ -464,5 +464,7 @@ onMounted(async () => { :get-data="getPersonList" :select-person-data="selectPersonData" :type="formCommandList.commandTypeName" + :command-code="formCommandList.commandCode" + :command-sys-id="formCommandList.commandSysId" /> diff --git a/src/modules/18_command/components/Step/Dialog2_Salary.vue b/src/modules/18_command/components/Step/Dialog2_Salary.vue index c2ab684eb..4e4b03f39 100644 --- a/src/modules/18_command/components/Step/Dialog2_Salary.vue +++ b/src/modules/18_command/components/Step/Dialog2_Salary.vue @@ -1,5 +1,5 @@