diff --git a/src/modules/14_IDP/component/DialogDevelop.vue b/src/modules/14_IDP/component/DialogDevelop.vue deleted file mode 100644 index bbc1239..0000000 --- a/src/modules/14_IDP/component/DialogDevelop.vue +++ /dev/null @@ -1,528 +0,0 @@ - - - - - diff --git a/src/modules/14_IDP/router.ts b/src/modules/14_IDP/router.ts index 654998f..82ce6de 100644 --- a/src/modules/14_IDP/router.ts +++ b/src/modules/14_IDP/router.ts @@ -3,6 +3,8 @@ */ const idpMain = () => import("@/modules/14_IDP/views/main.vue"); +const idpRegistry = () => import("@/modules/14_IDP/views/registry.vue"); +const idpRegistryDetail = () => import("@/modules/14_IDP/views/registry.vue"); export default [ { @@ -14,4 +16,22 @@ export default [ Key: [14], }, }, + { + path: "/idp-registry", + name: "idpRegistry", + component: idpRegistry, + meta: { + Auth: true, + Key: [14], + }, + }, + { + path: "/idp-registry-detail/:id", + name: "idpRegistryDetail", + component: idpRegistryDetail, + meta: { + Auth: true, + Key: [14], + }, + }, ]; diff --git a/src/modules/14_IDP/views/main.vue b/src/modules/14_IDP/views/main.vue index dd512e4..355fd8c 100644 --- a/src/modules/14_IDP/views/main.vue +++ b/src/modules/14_IDP/views/main.vue @@ -10,8 +10,6 @@ import { useIndividualDevelopmentPlan } from "@/modules/14_IDP/store"; // ดึ import type { DataOption, RowsListMain } from "@/modules/14_IDP/interface/Main"; -import DialogDevelop from "@/modules/14_IDP/component/DialogDevelop.vue"; - const $q = useQuasar(); const router = useRouter(); const mixin = useCounterMixin(); @@ -169,7 +167,7 @@ function clearStatus() { /** ฟังชั่น เปิด popup */ function openAdd() { - modalAdd.value = true; + router.push("/idp-registry"); } function onDelete(id: string) { @@ -267,9 +265,12 @@ function updatePagination(newPagination: any) { * @param id id row */ function onDetail(id: string) { - modalAdd.value = true; - isEdit.value = true; - idRow.value = id; + router.push(`/idp-registry-detail/${id}`); +} + +function getSerach(){ + pagination.value.page = 1 + getListData() } watch( @@ -315,7 +316,7 @@ onMounted(async () => { option-value="id" :options="statusOptions" style="width: 250px" - @update:model-value="getListData()" + @update:model-value="getSerach()" @filter="(inputValue:string, doneFn:Function) => filterOption(inputValue, doneFn ) " @@ -345,7 +346,7 @@ onMounted(async () => { outlined dense label="ค้นหา" - @keydown.enter="getListData()" + @keydown.enter="getSerach()" style="width: 200px" > @@ -381,7 +382,7 @@ onMounted(async () => { row-key="id" :paging="true" :visible-columns="visibleColumns" - :rows-per-page-options="[1, 25, 50, 100]" + :rows-per-page-options="[10, 25, 50, 100]" @update:pagination="updatePagination" > diff --git a/src/modules/14_IDP/views/registry.vue b/src/modules/14_IDP/views/registry.vue new file mode 100644 index 0000000..f03ff61 --- /dev/null +++ b/src/modules/14_IDP/views/registry.vue @@ -0,0 +1,545 @@ + +