From 082debf2e5db6b06ff5fd089a571cb8dddb4ac10 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 29 Oct 2024 12:33:18 +0700 Subject: [PATCH 1/4] fixing code workflow & get assign --- src/components/Workflow/Main.vue | 4 ++-- src/modules/02_organization/views/main.vue | 3 +-- .../components/Other/OtherDetail.vue | 24 ------------------- .../components/resign/ResignReject.vue | 2 +- .../components/2_Leave/DetailLeave.vue | 2 +- .../components/2_Leave/DetailLeaveReject.vue | 6 ++++- src/modules/17_acting/views/main.vue | 3 +-- 7 files changed, 11 insertions(+), 33 deletions(-) diff --git a/src/components/Workflow/Main.vue b/src/components/Workflow/Main.vue index a4bb315e6..618a6936f 100644 --- a/src/components/Workflow/Main.vue +++ b/src/components/Workflow/Main.vue @@ -53,8 +53,8 @@ const typeSelectPerson = ref(""); //รายการระบบที่ต้องการ disable step 3 หรือรองสุดท้าย const displayArray = [ "REGISTRY_PROFILE", - "RETIREMENT_RESIFNATION", - "LEAVE_LIST", + "SYS_RETIREMENT", + "SYS_LEAVE_LIST", ]; async function fetchCheckState() { diff --git a/src/modules/02_organization/views/main.vue b/src/modules/02_organization/views/main.vue index ec07f4a0c..974fe7088 100644 --- a/src/modules/02_organization/views/main.vue +++ b/src/modules/02_organization/views/main.vue @@ -30,7 +30,6 @@ import DialogCreateCommandORG from "@/modules/18_command/components/DialogCreate const $q = useQuasar(); const { showLoader, hideLoader, messageError, date2Thai } = useCounterMixin(); const store = useOrganizational(); -const keycloakSystem = ref("ORG_COMMAND"); /** ตัวแปร*/ const modalNewStructure = ref(false); // เพิ่มโครงสร้าง @@ -130,7 +129,7 @@ function onClickHistory(id: string, name: string) { async function workflowSystem() { showLoader(); http - .get(config.API.workflowKeycloakSystem(keycloakSystem.value)) + .get(config.API.workflowKeycloakSystem("SYS_ORG")) .then((res) => { const data = res.data.result; store.isOfficer = data.isOfficer; diff --git a/src/modules/05_placement/components/Other/OtherDetail.vue b/src/modules/05_placement/components/Other/OtherDetail.vue index 04204d097..9f797cbc6 100644 --- a/src/modules/05_placement/components/Other/OtherDetail.vue +++ b/src/modules/05_placement/components/Other/OtherDetail.vue @@ -32,12 +32,8 @@ const { success, } = mixin; -const isOfficer = ref(null); -const isStaff = ref(null); - const paramsId = route.params.id; const myForm = ref(null); -const roleAdmin = ref(false); const dataProfile = ref(); //ข้อมุลส่วนตัว const edit = ref(false); const status = ref(""); @@ -143,27 +139,7 @@ const getClass = (val: boolean) => { }; }; -async function getWorkFlow() { - showLoader(); - await http - .get(config.API.workflowKeycloakSystem("ORG_COMMAND")) - .then(async (res) => { - const data = await res.data.result; - isOfficer.value = data.isOfficer; - isStaff.value = data.isStaff; - roleAdmin.value = data.isOfficer; - hideLoader(); - }) - .catch((e) => { - messageError($q, e); - hideLoader(); - }) - .finally(() => {}); -} - onMounted(async () => { - getWorkFlow(); - fetchData(); }); diff --git a/src/modules/06_retirement/components/resign/ResignReject.vue b/src/modules/06_retirement/components/resign/ResignReject.vue index 422b67dd6..4763e922e 100644 --- a/src/modules/06_retirement/components/resign/ResignReject.vue +++ b/src/modules/06_retirement/components/resign/ResignReject.vue @@ -836,7 +836,7 @@ onMounted(async () => { ref="workflowRef" v-model:is-check-data="isCheckData" :id="id" - sys-name="RETIREMENT_RESIFNATION" + sys-name="SYS_RETIREMENT" /> diff --git a/src/modules/09_leave/components/2_Leave/DetailLeave.vue b/src/modules/09_leave/components/2_Leave/DetailLeave.vue index 0119a7956..bdb15c37e 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeave.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeave.vue @@ -808,7 +808,7 @@ onMounted(async () => { ref="workflowRef" :id="paramsId" v-model:is-check-data="isCheckData" - sys-name="LEAVE_LIST" + sys-name="SYS_LEAVE_LIST" /> diff --git a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue index ded00d4b5..68adf2d30 100644 --- a/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue +++ b/src/modules/09_leave/components/2_Leave/DetailLeaveReject.vue @@ -709,7 +709,11 @@ async function onClickDownloadFile(id: string, fileName: string, type: string) {
- +
diff --git a/src/modules/17_acting/views/main.vue b/src/modules/17_acting/views/main.vue index 20f9458fa..43d65d707 100644 --- a/src/modules/17_acting/views/main.vue +++ b/src/modules/17_acting/views/main.vue @@ -29,7 +29,6 @@ const { showLoader, hideLoader, messageError, dialogRemove } = useCounterMixin(); /** โครงสร้าง*/ -const keycloakSystem = ref("ORG_COMMAND"); const expanded = ref>([]); const filter = ref(""); const nodeTree = ref([]); @@ -261,7 +260,7 @@ function onDelete(id: string) { function getWorkFlow() { showLoader(); http - .get(config.API.workflowKeycloakSystem(keycloakSystem.value)) + .get(config.API.workflowKeycloakSystem("SYS_ACTING")) .then((res) => { const data = res.data.result; storeActing.isOfficer = data.isOfficer; From c51a3f975bca15bba85eae7d00e0129099d4fde5 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 29 Oct 2024 13:50:33 +0700 Subject: [PATCH 2/4] updated code --- src/modules/05_placement/components/Transfer/TransferDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/05_placement/components/Transfer/TransferDetail.vue b/src/modules/05_placement/components/Transfer/TransferDetail.vue index ca9200c82..04b1404c3 100644 --- a/src/modules/05_placement/components/Transfer/TransferDetail.vue +++ b/src/modules/05_placement/components/Transfer/TransferDetail.vue @@ -696,7 +696,7 @@ onMounted(async () => { ref="workflowRef" v-model:is-check-data="isCheckData" :id="transferId" - :sys-name="'PLACEMENT_TRANSFER'" + :sys-name="'SYS_TRANSFER_REQ'" :onUpdateStatus="onUpdateStatus" /> From e5fca5ea0f76c992d102fe549f1898242ad0085e Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 29 Oct 2024 13:51:10 +0700 Subject: [PATCH 3/4] updated --- src/components/Workflow/Main.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Workflow/Main.vue b/src/components/Workflow/Main.vue index 618a6936f..36077aef8 100644 --- a/src/components/Workflow/Main.vue +++ b/src/components/Workflow/Main.vue @@ -113,7 +113,7 @@ function onChangeState() { .then(async () => { await fetchCheckState(); if ( - props.sysName === "PLACEMENT_TRANSFER" && + props.sysName === "SYS_TRANSFER_REQ" && state.value === itemState.value.length - 1 ) { props.onUpdateStatus?.(); From 8f3926994a941d50e5dd5eab92e250166b9d836e Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 29 Oct 2024 13:51:58 +0700 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=84=E0=B8=A3=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=87=E0=B8=A3=E0=B8=B2=E0=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/3_result/DialogResults.vue | 26 +++++++-- .../07_insignia/interface/response/Main.ts | 6 +- src/modules/07_insignia/storeResult.ts | 6 +- .../07_insignia/views/03_ResultMain.vue | 55 ++++++++++++------- 4 files changed, 62 insertions(+), 31 deletions(-) diff --git a/src/modules/07_insignia/components/3_result/DialogResults.vue b/src/modules/07_insignia/components/3_result/DialogResults.vue index f2638ae10..53a5ae00d 100644 --- a/src/modules/07_insignia/components/3_result/DialogResults.vue +++ b/src/modules/07_insignia/components/3_result/DialogResults.vue @@ -10,7 +10,8 @@ import config from "@/app.config"; /** * import Type */ -import type { DataOption } from "@/modules/04_registry/components/profileType"; +// import type { DataOption } from "@/modules/04_registry/components/profileType"; +import type { OptionData } from "@/modules/07_insignia/interface/index/Main"; import DialogHeader from "@/components/DialogHeader.vue"; @@ -76,10 +77,10 @@ const affiliationReceived = ref(""); //สังกัด ณ วัน const receivedate = ref(); //วันที่ได้รับพระราชทานเครื่องราชอิสริยาภรณ์ const announceDate = ref(); //วันที่ const invoiceDate = ref(null); //วันที่จ่ายใบกำกับ -const filterinsigniaOp2 = ref([]); //ตัวเลือกเครื่องราชอิสริยาภรณ์ +const filterinsigniaOp2 = ref([]); //ตัวเลือกเครื่องราชอิสริยาภรณ์ const employeeClass = ref(""); //ขรก.สามัญ/ลูกจ้างประจำ //ประเภท ขรก.สามัญ/ลูกจ้างประจำ -const employeeClassOps = ref([ +const employeeClassOps = ref([ { id: "officer", name: "ข้าราชการ กทม.สามัญ" }, { id: "employee", name: "ลูกจ้างประจำ" }, ]); @@ -267,7 +268,7 @@ function filterSelector(val: string, update: Function, name: string) { if (name === "insigniaOp2") { brand.value = val ? "" : brand.value; filterinsigniaOp2.value = DataStore.insigniaOp2.filter( - (v: DataOption) => v.name.toLowerCase().indexOf(needle) > -1 + (v: OptionData) => v.name.toLowerCase().indexOf(needle) > -1 ); } }); @@ -486,6 +487,14 @@ watch(props, () => { class="cursor-pointer" /> + @@ -578,6 +587,14 @@ watch(props, () => { class="cursor-pointer" /> + @@ -651,6 +668,7 @@ watch(props, () => { borderless :enableTimePicker="false" week-start="0" + :readonly="disbleStatus" >