diff --git a/src/interface/request/main/main.ts b/src/interface/request/main/main.ts index faf46e4d3..f3f39af82 100644 --- a/src/interface/request/main/main.ts +++ b/src/interface/request/main/main.ts @@ -213,8 +213,8 @@ const menuList = readonly([ }, { key: 9, - icon: "mdi-medal-outline", - activeIcon: "mdi-medal", + icon: "o_contact_page", + activeIcon: "contact_page", label: "ทะเบียนประวัติลูกจ้าง", path: "registryEmployee", role: "registryEmployee", diff --git a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue index 09bc164d9..d8baff11e 100644 --- a/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue +++ b/src/modules/05_placement/components/OrderPlacement/MainOrderPlacement.vue @@ -527,8 +527,8 @@ const OriginalDataFetch = async () => { // ดูรายการหน้าต่อไป const redirectToPage = (id?: number) => { - // router.push({ name: 'placementDetail'}); - // router.push(`/placement/order/detail`); + router.push({ name: "placementDetail" }); + router.push(`/placement/order/detail`); }; const clickDelete = (id: string) => { diff --git a/src/modules/05_placement/components/OrderPlacement/step/step01.vue b/src/modules/05_placement/components/OrderPlacement/step/step01.vue index 80d650866..be299f242 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step01.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step01.vue @@ -370,7 +370,7 @@
- @@ -497,10 +497,12 @@ const filterSelector = (val: any, update: Function, filtername: string) => { }; const submit = async () => { - await myForm.value!.validate().then((result: boolean) => { - if (result == false) { - } - }); + next(); + // await myForm.value!.validate().then((result: boolean) => { + // if (result) { + // next(); + // } + // }); }; /** diff --git a/src/modules/05_placement/components/OrderPlacement/step/step03.vue b/src/modules/05_placement/components/OrderPlacement/step/step03.vue index 3f8dd9f8b..22e908679 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step03.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step03.vue @@ -92,7 +92,7 @@ :outlined="true" dense lazy-rules - v-model="filter" + v-model="props.row.mutiselect" :rules="[(val:any) => !!val || `${'กรุณาเลือกช่องทางการส่งสำเนา'}`,(val:any) => val.length > 0 || `${'กรุณาเลือกช่องทางการส่งสำเนา'}`]" :label="`${'เลือกช่องทางการส่งสำเนา'}`" emit-value @@ -359,6 +359,7 @@ const { dialogMessage, messageError, showLoader, hideLoader } = mixin; const myForm = ref(); const filterRef = ref(); const filter = ref(""); +const mutiselect = ref([]); const modal = ref(false); const search = ref(""); const expanded = ref([]); @@ -366,6 +367,7 @@ const selected = ref(""); const nodesTree = ref([]); const send = ref([]); const selectedModal = ref([]); +const test = ref([]); const filterModal = ref(""); const visibleColumnsModal = ref(["no", "idcard", "name"]); const columnsModal = [ @@ -519,7 +521,7 @@ const columns = [ }, ]; -const rows = [ +const rows = ref([ { no: "0ac56905-1a74-4606-a120-233340adde95", name: "นางนัทธ์ เหล่าสกุล", @@ -527,6 +529,7 @@ const rows = [ send: "", position: "ผู้อำนวยการ", agency: "กลุ่มงานช่วยบริหาร", + mutiselect: [], }, { no: "0de607a0-b094-4a6d-9e30-979343ab5e53", @@ -535,6 +538,7 @@ const rows = [ send: "", position: "นักจัดการทั่วไป", agency: "กลุ่มงานช่วยบริหาร", + mutiselect: [], }, { no: "93ca7366-2a35-4f94-a331-9c23c9ea78d3", @@ -543,6 +547,7 @@ const rows = [ send: "", position: "นักจัดการทั่วไป", agency: "กลุ่มงานช่วยบริหาร", + mutiselect: [], }, { no: "d3777c19-2bd0-42df-90ce-c3eeeee55ac6", @@ -551,6 +556,7 @@ const rows = [ send: "", position: "นักจัดการทั่วไป", agency: "กลุ่มงานช่วยบริหาร", + mutiselect: [], }, { no: "1ccead6f-a851-4291-b3ab-a20757ecddbd", @@ -559,6 +565,7 @@ const rows = [ send: "", position: "นักจัดการทั่วไป", agency: "กลุ่มงานช่วยบริหาร", + mutiselect: [], }, { no: "1ccead6f-a851-4291-b3ab-a20757ecddbd", @@ -567,6 +574,7 @@ const rows = [ send: "", position: "นิติกร", agency: "กลุ่มงานนิติกร", + mutiselect: [], }, { no: "1ccead6f-a851-4291-b3ab-a20757ecddbd", @@ -575,6 +583,7 @@ const rows = [ send: "", position: "นิติกร", agency: "กลุ่มงานนิติกร", + mutiselect: [], }, { no: "1ccead6f-a851-4291-b3ab-a20757ecddbd", @@ -583,6 +592,7 @@ const rows = [ send: "", position: "นิติกร", agency: "กลุ่มงานนิติกร", + mutiselect: [], }, { no: "1ccead6f-a851-4291-b3ab-a20757ecddbd", @@ -591,6 +601,7 @@ const rows = [ send: "", position: "นิติกร", agency: "กลุ่มงานนิติกร", + mutiselect: [], }, { no: "1ccead6f-a851-4291-b3ab-a20757ecddbd", @@ -599,6 +610,7 @@ const rows = [ send: "", position: "นิติกร", agency: "กลุ่มงานนิติกร", + mutiselect: [], }, { no: "1ccead6f-a851-4291-b3ab-a20757ecddbd", @@ -607,8 +619,9 @@ const rows = [ send: "", position: "นิติกร", agency: "กลุ่มงานนิติกร", + mutiselect: [], }, -]; +]); onMounted(async () => { await nodeTree(); diff --git a/src/modules/05_placement/components/OrderPlacement/step/step04.vue b/src/modules/05_placement/components/OrderPlacement/step/step04.vue index e10dbd022..e28ec4e50 100644 --- a/src/modules/05_placement/components/OrderPlacement/step/step04.vue +++ b/src/modules/05_placement/components/OrderPlacement/step/step04.vue @@ -132,40 +132,146 @@
@@ -181,9 +287,13 @@ label="เลือกรายชื่อส่งสำเนา" > - - + + + + + + + + + + + + + + + + + + + diff --git a/src/router/index.ts b/src/router/index.ts index 130834586..496100f83 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -11,6 +11,7 @@ import ModuleRegistry from "@/modules/04_registry/router"; import ModulePlacement from "@/modules/05_placement/router"; import ModuleRetirement from "@/modules/06_retirement/router"; import ModuleInsignia from "@/modules/07_insignia/router"; +import ModuleRegistryEmployee from "@/modules/08_registryEmployee/router"; // TODO: ใช้หรือไม่? import keycloak from "@/plugins/keycloak"; @@ -40,6 +41,7 @@ const router = createRouter({ ...ModulePlacement, ...ModuleRetirement, ...ModuleInsignia, + ...ModuleRegistryEmployee, ], }, /**