From f28d71e2d60b38bbe0748dc9b6186a033aa029c4 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Thu, 1 May 2025 12:19:19 +0700 Subject: [PATCH 1/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=82?= =?UTF-8?q?=E0=B9=89=E0=B8=AD=E0=B8=84=E0=B8=A7=E0=B8=B2=E0=B8=A1=E0=B8=A5?= =?UTF-8?q?=E0=B8=B9=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A?= =?UTF-8?q?=E0=B8=B1=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/detail/Employee/01_DataEmployee.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue index 30248f407..7c6cc7c8f 100644 --- a/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue +++ b/src/modules/04_registryPerson/components/detail/Employee/01_DataEmployee.vue @@ -175,7 +175,7 @@ const columns = ref([ { name: "positionEmployeePositionId", align: "left", - label: "ตำแหน่งทางสายงาน", + label: "ตำแหน่ง", sortable: true, field: "positionEmployeePositionId", headerStyle: "font-size: 14px", @@ -391,7 +391,7 @@ onMounted(() => {
-
ตำแหน่งทางสายงาน
+
ตำแหน่ง
{{ dataEmployee.positionEmployeePositionId ?? "-" }} @@ -503,8 +503,8 @@ onMounted(() => { hide-bottom-space v-model="formData.positionEmployeePositionId" class="inputgreen" - label="ตำแหน่งทางสายงาน" - :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่งทางสายงาน'}`]" + label="ตำแหน่ง" + :rules="[(val: string) => !!val || `${'กรุณากรอกตำแหน่ง'}`]" />
From 990ec2a76528b45854c41227bd4ac6a9175ed8f8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 6 May 2025 14:22:29 +0700 Subject: [PATCH 2/6] =?UTF-8?q?fix=20=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99?= =?UTF-8?q?=E0=B9=88=E0=B8=87=20=E0=B8=A3=E0=B8=B0=E0=B8=9A=E0=B8=9A?= =?UTF-8?q?=E0=B9=81=E0=B8=95=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B9=89?= =?UTF-8?q?=E0=B8=87=20=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD?= =?UTF-8?q?=E0=B8=99=20=E0=B8=A2=E0=B9=89=E0=B8=B2=E0=B8=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialogs/DialogOrgSelect.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue index 36df4b511..d6450acea 100644 --- a/src/components/Dialogs/DialogOrgSelect.vue +++ b/src/components/Dialogs/DialogOrgSelect.vue @@ -278,7 +278,7 @@ async function getDataTable(id: string, level: number = 0) { isPosition: e.isPosition, posMasterNo: e.orgShortname + - (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") + + (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") + ' ' + e.posMasterNo + (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""), positionName: e.positionName, From 8c1f6fa7272f9e015149cdcc25ae71b335b3c4d5 Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 6 May 2025 15:48:06 +0700 Subject: [PATCH 3/6] =?UTF-8?q?fix=20=E0=B8=A3=E0=B8=B2=E0=B8=A2=E0=B8=81?= =?UTF-8?q?=E0=B8=B2=E0=B8=A3=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=82=E0=B8=AD?= =?UTF-8?q?=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/05_placement/views/03_receiveMain.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue index 9bc19e94f..aeeffb14b 100644 --- a/src/modules/05_placement/views/03_receiveMain.vue +++ b/src/modules/05_placement/views/03_receiveMain.vue @@ -610,6 +610,14 @@ onMounted(async () => { : "-" }}
+ +
+ {{ col.value ? col.value : "-" }} +
+
{{ props.row.createdAt ? date2Thai(props.row.createdAt) : "-" From 25550eb8bb9143d74b5285f259ca9d6d74484a75 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 6 May 2025 16:05:32 +0700 Subject: [PATCH 4/6] =?UTF-8?q?=E0=B8=A5=E0=B8=9A=E0=B8=A3=E0=B8=B0?= =?UTF-8?q?=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=8A=E0=B8=B1=E0=B9=89=E0=B8=99?= =?UTF-8?q?=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=81=E0=B8=AD=E0=B8=B1=E0=B8=95=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=81=E0=B8=B3=E0=B8=A5=E0=B8=B1=E0=B8=87=E0=B8=A5=E0=B8=B9?= =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/DialogAddPosition.vue | 4 +- .../components/DialogFormPosition.vue | 34 +++++----- .../components/DialogPositionDetail.vue | 4 +- .../components/DialogSelectPerson.vue | 63 +++++++++---------- .../20_positionTemp/components/TableMain.vue | 22 +++---- 5 files changed, 62 insertions(+), 65 deletions(-) diff --git a/src/modules/20_positionTemp/components/DialogAddPosition.vue b/src/modules/20_positionTemp/components/DialogAddPosition.vue index 478b5ee8b..69f9cb4cf 100644 --- a/src/modules/20_positionTemp/components/DialogAddPosition.vue +++ b/src/modules/20_positionTemp/components/DialogAddPosition.vue @@ -196,7 +196,7 @@ watch( />
-
+
diff --git a/src/modules/20_positionTemp/components/DialogFormPosition.vue b/src/modules/20_positionTemp/components/DialogFormPosition.vue index a3399fdd2..aa72dd354 100644 --- a/src/modules/20_positionTemp/components/DialogFormPosition.vue +++ b/src/modules/20_positionTemp/components/DialogFormPosition.vue @@ -59,7 +59,7 @@ const type = ref("positionName"); const optionFilter = ref([ { id: "positionName", name: "ชื่อตำแหน่ง" }, { id: "positionType", name: "กลุ่มงาน" }, - { id: "positionLevel", name: "ระดับชั้นงาน" }, + // { id: "positionLevel", name: "ระดับชั้นงาน" }, ]); const listMenu = ref([ @@ -122,21 +122,21 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posLevelName", - align: "left", - label: "ระดับชั้นงาน", - sortable: true, - field: "posLevelName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "posLevelName", + // align: "left", + // label: "ระดับชั้นงาน", + // sortable: true, + // field: "posLevelName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, ]); const visibleColumns = ref([ "no", "posDictName", "posTypeName", - "posLevelName", + // "posLevelName", ]); async function fetchPosition(id: string) { @@ -475,7 +475,7 @@ watch( > {{ col.value ? col.value : "-" }}
-
+
{{ col.value ? col.value : "-" }}
@@ -525,14 +525,14 @@ watch( class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md" > เลือกตำแหน่งที่ต้องการเพิ่ม - สร้างตำแหน่ง + > -->
@@ -671,7 +671,7 @@ watch( > {{ col.value ? col.value : "-" }}
-
+
{{ col.value ? col.value : "-" }} diff --git a/src/modules/20_positionTemp/components/DialogPositionDetail.vue b/src/modules/20_positionTemp/components/DialogPositionDetail.vue index 073e34490..da2416b69 100644 --- a/src/modules/20_positionTemp/components/DialogPositionDetail.vue +++ b/src/modules/20_positionTemp/components/DialogPositionDetail.vue @@ -48,7 +48,7 @@ function close() {
-
+
diff --git a/src/modules/20_positionTemp/components/DialogSelectPerson.vue b/src/modules/20_positionTemp/components/DialogSelectPerson.vue index 864c93b62..1e6413433 100644 --- a/src/modules/20_positionTemp/components/DialogSelectPerson.vue +++ b/src/modules/20_positionTemp/components/DialogSelectPerson.vue @@ -94,8 +94,7 @@ const visibleColumnsResult = ref([ "citizenId", "name", "posTypeName", - "posLevelName", - "positionName" + "positionName", ]); const columns = ref([ { @@ -126,15 +125,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posLevelName", - align: "left", - label: "ระดับชั้นงาน", - sortable: true, - field: "posLevelName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "posLevelName", + // align: "left", + // label: "ระดับชั้นงาน", + // sortable: true, + // field: "posLevelName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, ]); const columnsResult = ref([ { @@ -182,16 +181,15 @@ const columnsResult = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - - { - name: "posLevelName", - align: "left", - label: "ระดับชั้นงาน", - sortable: true, - field: "posLevelName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "posLevelName", + // align: "left", + // label: "ระดับชั้นงาน", + // sortable: true, + // field: "posLevelName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, ]); /** @@ -239,15 +237,15 @@ function inputEdit(val: boolean) { /** * function เรียกข้แมูลระดับตำแหน่ง */ -function updateSelectType(val: string) { - const listLevel: any = dataLevel.value.find((e: TypePos) => e.id === val); - levelOpsMain.value = listLevel?.posLevels.map((e: OptionLevel) => ({ - id: e.id, - name: e.posLevelName, - })); - levelOps.value = levelOpsMain.value; - formData.positionLevel = ""; -} +// function updateSelectType(val: string) { +// const listLevel: any = dataLevel.value.find((e: TypePos) => e.id === val); +// levelOpsMain.value = listLevel?.posLevels.map((e: OptionLevel) => ({ +// id: e.id, +// name: e.posLevelName, +// })); +// levelOps.value = levelOpsMain.value; +// formData.positionLevel = ""; +// } /** * ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม @@ -560,7 +558,6 @@ watch( :options="typeOps" emit-value dense - @update:model-value="updateSelectType" map-options outlined option-label="name" @@ -575,7 +572,7 @@ watch( /> -
+
([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posLevelName", - align: "left", - label: "ระดับชั้นงาน", - sortable: false, - field: "posLevelName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "posLevelName", + // align: "left", + // label: "ระดับชั้นงาน", + // sortable: false, + // field: "posLevelName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, { name: "positionIsSelected", align: "left", @@ -623,7 +623,7 @@ watch( : col.value }}
-
+
{{ props.row.positionIsSelected From bc9581edc0dabf325c436712f5b8d04d38f04a75 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 6 May 2025 16:19:12 +0700 Subject: [PATCH 5/6] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20label=20?= =?UTF-8?q?=E0=B8=95=E0=B8=B3=E0=B9=81=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialogs/PopupPersonalNew.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/components/Dialogs/PopupPersonalNew.vue b/src/components/Dialogs/PopupPersonalNew.vue index 3eb4c7f02..dd1d9ad50 100644 --- a/src/components/Dialogs/PopupPersonalNew.vue +++ b/src/components/Dialogs/PopupPersonalNew.vue @@ -477,7 +477,11 @@ watch(modal, (newValue) => { :model-value=" goverment.position ? goverment.position : '-' " - label="ตำแหน่ง" + :label=" + props.type.toLocaleLowerCase() == 'employee' + ? 'ตำแหน่ง' + : 'ตำแหน่งในสายงาน' + " />
@@ -615,7 +619,7 @@ watch(modal, (newValue) => { ? govermentTemp.positionEmployeePositionId : '-' " - label="ตำแหน่งทางสายงาน" + label="ตำแหน่ง" />
From 0ff6ad85f05338e23dfe694d6070e8cdc3c0acda Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Tue, 6 May 2025 16:33:45 +0700 Subject: [PATCH 6/6] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?= =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B8=94=E0=B9=8C=E0=B8=84=E0=B9=88?= =?UTF-8?q?=E0=B8=B2=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=A5=E0=B8=B9?= =?UTF-8?q?=E0=B8=81=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=8A=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=A7=E0=B8=84=E0=B8=A3=E0=B8=B2=E0=B8=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detail/Salary/01_PositionSalary.vue | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue index 115915860..81b5de3fa 100644 --- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue +++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue @@ -349,11 +349,26 @@ const baseVisibleColumns = ref([ const columns = computed(() => { if (empType.value !== "") { if (baseColumns.value) { - return baseColumns.value.filter( - (column) => - column.name !== "positionSalaryAmount" && - column.name !== "mouthSalaryAmount" + const filterBaseColumn = + empType.value != "-temp" + ? baseColumns.value.filter( + (column) => + column.name !== "positionSalaryAmount" && + column.name !== "positionExecutive" && // ลูกจ้างไม่มีตำแหน่งทางการบริหาร + column.name !== "mouthSalaryAmount" + ) + : baseColumns.value.filter( + (column) => + column.name !== "positionSalaryAmount" && + column.name !== "mouthSalaryAmount" && + column.name !== "positionExecutive" && // ลูกจ้างชั่วคราวไม่มีตำแหน่งทางการบริหาร + column.name !== "positionLevel" && // ลูกจ้างชั่วคราวไม่มีระดับชั้นงาน + column.name !== "posNo" // ลูกจ้างชั่วคราวไม่มีตำแหน่งเลขที่ + ); + visibleColumnsHistory.value = filterBaseColumn.map( + (e: QTableColumn) => e.name ); + return filterBaseColumn; } } return baseColumns.value.filter(