From e9ee7e7f40f4c85ee11ca4b5b8ad8d460d75d989 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 28 May 2024 15:14:34 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9C=E0=B8=B1=E0=B8=87=E0=B8=9A=E0=B8=B1?= =?UTF-8?q?=E0=B8=8D=E0=B8=8A=E0=B8=B5=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=88?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=A5=E0=B8=B9=E0=B8=81=E0=B8=88?= =?UTF-8?q?=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=88?= =?UTF-8?q?=E0=B8=B3=20=3D>=20=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=20field?= =?UTF-8?q?=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/00_support/router.ts | 13 +++ .../04_registryNew/views/detailView.vue | 1 - .../DialogEmployeeChart.vue | 2 + .../salaryEmployeeChart/TabStructure.vue | 15 ++-- src/views/TestManagement.vue | 89 +++++++++++++++++++ 5 files changed, 114 insertions(+), 6 deletions(-) create mode 100644 src/views/TestManagement.vue diff --git a/src/modules/00_support/router.ts b/src/modules/00_support/router.ts index 659c27e00..d2762cfc7 100644 --- a/src/modules/00_support/router.ts +++ b/src/modules/00_support/router.ts @@ -2,6 +2,8 @@ const supportMain = () => import("@/modules/00_support/views/MainPage.vue"); const supportCategory = () => import("@/modules/00_support/views/ManageCategory.vue"); +const testView = () => import("@/views/TestManagement.vue"); + export default [ { path: "/support", @@ -23,4 +25,15 @@ export default [ Role: "support", }, }, + + { + path: "/test", + name: "testView", + component: testView, + meta: { + Auth: true, + Key: [1.1], + Role: "support", + }, + }, ]; diff --git a/src/modules/04_registryNew/views/detailView.vue b/src/modules/04_registryNew/views/detailView.vue index c259d03d0..06e726228 100644 --- a/src/modules/04_registryNew/views/detailView.vue +++ b/src/modules/04_registryNew/views/detailView.vue @@ -271,7 +271,6 @@ function onClickDownloadKp7(type: string) { }) .then((res) => { const data = res.data; - console.log(data); const blob = new Blob([data], { type: "application/pdf" }); const url = URL.createObjectURL(blob); const link = document.createElement("a"); diff --git a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue index 2055d9ca2..3cf367eaa 100644 --- a/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue +++ b/src/modules/13_salary/components/salaryEmployeeChart/DialogEmployeeChart.vue @@ -127,6 +127,8 @@ watch( () => { if (modal.value && props.isStatusEdit) { fetchSalaryDetail(props.data.id); + } else { + isReadonly.value = false; } } ); diff --git a/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue b/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue index fb868e4ed..75d7a99be 100644 --- a/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue +++ b/src/modules/13_salary/components/salaryEmployeeChart/TabStructure.vue @@ -66,11 +66,11 @@ const columns = ref([ style: "font-size: 14px", }, { - name: "date", + name: "startDate", align: "left", label: "วันที่มีผลบังคับใช้", sortable: true, - field: "date", + field: "startDate", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -85,7 +85,12 @@ const columns = ref([ }, ]); const rows = ref([]); -const visibleColumns = ref(["name", "group", "date", "isActive"]); +const visibleColumns = ref([ + "name", + "group", + "startDate", + "isActive", +]); /** List Mune*/ const itemMenu = ref([ @@ -229,8 +234,8 @@ function onClickDelete(id: string) { /** function เปิด dialog เพิ่มผังบัญชีค่าจ้างลูกจ้างประจำ*/ function onClickAdd() { - modalDialogEmployeeChart.value = true; isStatusEdit.value = false; + modalDialogEmployeeChart.value = true; } /** functionn fetch ข้อมูลรายการหน้าแรก*/ @@ -324,7 +329,7 @@ onMounted(() => {