-
-
-
+
+
+
+
+
+
-
-
-
- ไม่มีข้อมูล
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
-
-
-
-
-
- วิธีการพัฒนา
-
-
-
-
-
- 70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)
-
-
-
-
-
-
-
-
-
- 20 การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)
-
-
-
-
-
-
-
-
- 10 การฝึกอบรมอื่นๆ
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ รายละเอียด
+
+
+
+
+
+
+
+
+
+ วิธีการพัฒนา
+
+
+
+
+
+ 70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)
+
+
+
+
+
+
+
+
+
+ 20 การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)
+
+
+
+
+
+
+
+
+ 10 การฝึกอบรมอื่นๆ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/04_registryPerson/router.ts b/src/modules/04_registryPerson/router.ts
index 68da2a53a..d0a1e17ba 100644
--- a/src/modules/04_registryPerson/router.ts
+++ b/src/modules/04_registryPerson/router.ts
@@ -8,6 +8,8 @@ const detailPage = () =>
// รายการคำร้องขอแก้ไขทะเบียนประวัติ
const requestEdit = () =>
import("@/modules/04_registryPerson/views/requestEditView.vue");
+const requestEditPage = () =>
+ import("@/modules/04_registryPerson/components/requestEdit/requestEditPage.vue");
const Page01_Detail = () =>
import(
"@/modules/04_registryPerson/components/requestEdit/Page01_Detail.vue"
@@ -64,6 +66,16 @@ export default [
Role: "STAFF",
},
},
+ {
+ path: "/registry-officer/request-edit-page/:id",
+ name: "registryNewRequestEditPage",
+ component: requestEditPage,
+ meta: {
+ Auth: true,
+ Key: "SYS_REGISTRY_OFFICER",
+ Role: "STAFF",
+ },
+ },
{
path: "/registry-officer/request-edit/personal/:id",
name: "registryNewRequestEdit/personal",
diff --git a/src/modules/04_registryPerson/store.ts b/src/modules/04_registryPerson/store.ts
index a8a8398ce..4483f3c4a 100644
--- a/src/modules/04_registryPerson/store.ts
+++ b/src/modules/04_registryPerson/store.ts
@@ -25,8 +25,12 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
const posLevelOps = ref
([]);
const yearOps = ref([]);
const mode = ref("table");
- const isLeave = ref(false)
-
+ const isLeave = ref(false);
+ const tabs = ref("Main");
+ const tabsManu = ref([
+ { name: "ข้อมูลส่วนตัว", id: "Main" },
+ { name: "ข้อมูลการพัฒนารายบุคคล (IDP)", id: "IDP" },
+ ]);
function fetchType(data: DataType[]) {
posTypeMain.value = data;
const list: DataOption[] = data.map((e: DataType) => ({
@@ -88,6 +92,8 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
mode,
formFilter,
labelOption,
- isLeave
+ isLeave,
+ tabs,
+ tabsManu,
};
});
diff --git a/src/modules/04_registryPerson/views/requestEditView.vue b/src/modules/04_registryPerson/views/requestEditView.vue
index 6166c5de2..59e17d30c 100644
--- a/src/modules/04_registryPerson/views/requestEditView.vue
+++ b/src/modules/04_registryPerson/views/requestEditView.vue
@@ -3,18 +3,13 @@ import { ref } from "vue";
import { useRouter } from "vue-router";
-import type { DataOption } from "@/modules/04_registryPerson/interface/index/Main";
+import { useRegistryNewDataStore } from "@/modules/04_registryPerson/store";
import TabInformation from "@/modules/04_registryPerson/components/requestEdit/01_TabInformation.vue";
import TabIDP from "@/modules/04_registryPerson/components/requestEdit/02_TabIDP.vue";
const router = useRouter();
-
-const tabs = ref("Main");
-const tabsManu = ref([
- { name: "ข้อมูลส่วนตัว", id: "Main" },
- { name: "ข้อมูลการพัฒนารายบุคคล (IDP)", id: "IDP" },
-]);
+const store = useRegistryNewDataStore();
@@ -38,14 +33,14 @@ const tabsManu = ref([
([
-
+
diff --git a/src/modules/05_placement/components/probation/MainProbation.vue b/src/modules/05_placement/components/probation/MainProbation.vue
index 45638a2ee..b0861850f 100644
--- a/src/modules/05_placement/components/probation/MainProbation.vue
+++ b/src/modules/05_placement/components/probation/MainProbation.vue
@@ -34,14 +34,17 @@ const paging = ref(true);
const filterRef2 = ref(null);
const attrs = ref(useAttrs());
const paging2 = ref(true);
+const fillterStatus = ref([]);
const fillter = ref("");
const filterKeyword = ref("");
const filterKeyword2 = ref("");
const rows = ref([]);
const rows2 = ref([]);
+const dataUpdate = ref([]);
const Opfillter = ref([]);
const Opfillter2 = ref([]);
const formProbation = reactive({ keyword: "", pageSize: 10, page: 1 });
+const formMain = reactive({ keyword: "", pageSize: 10, page: 1 });
const maxPage = ref(1);
const modalAdd = ref(false);
@@ -237,22 +240,22 @@ const columns2 = ref([
/** get ข้อมูล */
async function getpersonalList() {
- rows.value = [];
showLoader();
await http
.get(
config.API.probationPersonalList() +
`?status=${fillter.value}&page=${pagination.value.page}&pageSize=${pagination.value.rowsPerPage}&keyword=${filterKeyword.value}`
)
- .then((res) => {
- rows.value = res.data.data.data;
+ .then(async (res) => {
+ const data = await res.data.data.data;
+ const resTotal = await res.data.data.total;
+ rows.value = data;
+ fillterStatus.value = data;
+ dataUpdate.value = rows.value;
Opfillter.value = storeFn.optionStatusProbation;
Opfillter2.value = storeFn.optionStatusProbation;
-
- totalList.value = Math.ceil(
- res.data.data.total / pagination.value.rowsPerPage
- );
- total.value = res.data.data.total;
+ totalList.value = Math.ceil(resTotal / pagination.value.rowsPerPage);
+ total.value = resTotal;
hideLoader();
})
.catch((e) => {
@@ -288,6 +291,15 @@ function updatePagination(newPagination: any) {
formProbation.pageSize = newPagination.rowsPerPage;
}
+/**
+ * function updatePagination
+ * @param newPagination ข้อมูล Pagination ใหม่
+ */
+function updatePaginationMain(newPagination: any) {
+ pagination.value.page = 1;
+ pagination.value.rowsPerPage = newPagination.rowsPerPage;
+}
+
async function filterKeyword2Fn(page: number) {
page !== 1 ? (formProbation.page = 1) : await onclickAddProbation();
}
@@ -366,6 +378,7 @@ async function clickClose() {
function resetFilter() {
filterKeyword.value = "";
filterRef.value.focus();
+ getSearchMain()
}
/** reset ฟิลเตอร์ ใน dialog */
@@ -374,6 +387,11 @@ function resetFilter2() {
filterRef2.value.focus();
}
+function paginationLabel(start: string, end: string, total: string) {
+ if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
+ else return start + "-" + end + " ใน " + total;
+}
+
function paginationLabel2(start: string, end: string, total: string) {
if (paging2.value == true) return " " + start + "-" + end + " ใน " + total;
else return start + "-" + end + " ใน " + total;
@@ -441,14 +459,19 @@ function closeAdd() {
topic.value = "แต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ";
}
-function getSearch() {
- pagination.value.page = 1;
- getpersonalList();
+function getSearchMain(){
+ pagination.value.page = 1
+ getpersonalList()
}
+
+watch([() => formProbation.page, () => formProbation.pageSize], () => {
+ onclickAddProbation();
+});
+
watch(
() => pagination.value.rowsPerPage,
- () => {
- getSearch();
+ async () => {
+ getSearchMain()
}
);
@@ -478,7 +501,7 @@ onMounted(async () => {
:borderless="false"
:outlined="true"
:hide-dropdown-icon="false"
- @update:model-value="getpersonalList()"
+ @update:model-value="getSearchMain()"
@filter="filterFn"
use-input
behavior="menu"
@@ -530,7 +553,7 @@ onMounted(async () => {
outlined
debounce="300"
placeholder="ค้นหา"
- @keydown.enter.prevent="getSearch"
+ @keydown.enter.prevent="getSearchMain()"
>
@@ -563,14 +586,15 @@ onMounted(async () => {