From f76b55407fa69cea1ea1d8aab309ea81e564b70c Mon Sep 17 00:00:00 2001 From: "DESKTOP-1R2VSQH\\Lenovo ThinkPad E490" Date: Tue, 25 Feb 2025 17:33:45 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=87=E0=B8=B4=E0=B8=99=E0=B9=80?= =?UTF-8?q?=E0=B8=94=E0=B8=B7=E0=B8=AD=E0=B8=99=20=3D=3D>=20Sort?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../02_salaryEmployee/TabCriteria.vue | 20 +++++++++---------- .../02_salaryEmployee/TabStructure.vue | 8 ++++---- .../04_salaryLists/DialogAddPerson.vue | 10 +++++----- .../04_salaryLists/TableTypeOther.vue | 8 ++++---- .../04_salaryLists/TableTypePending.vue | 16 +++++++-------- .../DialogAddPerson.vue | 10 +++++----- .../05_salaryListsEmployee/TableTypeOther.vue | 8 ++++---- .../TableTypePending.vue | 14 ++++++------- src/modules/13_salary/views/01_salaryMain.vue | 9 ++++----- .../13_salary/views/03_salaryRound.vue | 11 +++++----- 10 files changed, 56 insertions(+), 58 deletions(-) diff --git a/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue b/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue index bbc40f44d..95b5d6ed0 100644 --- a/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue +++ b/src/modules/13_salary/components/02_salaryEmployee/TabCriteria.vue @@ -34,7 +34,7 @@ const columns = ref([ name: "no", align: "left", label: "ลำดับ", - sortable: true, + sortable: false, field: "name", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -43,7 +43,7 @@ const columns = ref([ name: "posType", align: "left", label: "กลุ่มงาน", - sortable: true, + sortable: false, field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -52,7 +52,7 @@ const columns = ref([ name: "posName", align: "left", label: "ตำแหน่ง", - sortable: true, + sortable: false, field: "posName", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -61,7 +61,7 @@ const columns = ref([ name: "posLevel", align: "left", label: "ระดับชั้นงาน", - sortable: true, + sortable: false, field: "posLevel", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -70,7 +70,7 @@ const columns = ref([ name: "rateOldMin", align: "left", label: "อัตราค่าจ้าง ขั้นต่ำสุด", - sortable: true, + sortable: false, field: "rateOldMin", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -79,7 +79,7 @@ const columns = ref([ name: "groupOld", align: "left", label: "อัตราค่าจ้าง กลุ่มบัญชีค่าจ่าง", - sortable: true, + sortable: false, field: "groupOld", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -88,7 +88,7 @@ const columns = ref([ name: "rateMaxOld", align: "left", label: "อัตราค่าจ้าง ขั้นสูงสุดเดิม", - sortable: true, + sortable: false, field: "rateMaxOld", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -97,7 +97,7 @@ const columns = ref([ name: "groupRateHigh", align: "left", label: "อัตราค่าจ้างสูงกว่า ฯ กลุ่มบัญชีค่าจ่าง", - sortable: true, + sortable: false, field: "groupRateHigh", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -106,7 +106,7 @@ const columns = ref([ name: "rateHighMax", align: "left", label: "อัตราค่าจ้างสูงกว่า ฯ ขั้นสูงใหม่", - sortable: true, + sortable: false, field: "rateHighMax", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -115,7 +115,7 @@ const columns = ref([ name: "reson", align: "left", label: "หมายเหตุ", - sortable: true, + sortable: false, field: "reson", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue b/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue index f0f1951e8..d9853b4f2 100644 --- a/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue +++ b/src/modules/13_salary/components/02_salaryEmployee/TabStructure.vue @@ -54,7 +54,7 @@ const columns = ref([ name: "name", align: "left", label: "ชื่อผังบัญชีอัตราค่าจ้าง", - sortable: true, + sortable: false, field: "name", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -63,7 +63,7 @@ const columns = ref([ name: "group", align: "left", label: "กลุ่มของผังบัญชีอัตราค่าจ้าง", - sortable: true, + sortable: false, field: "group", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -72,7 +72,7 @@ const columns = ref([ name: "startDate", align: "left", label: "วันที่มีผลบังคับใช้", - sortable: true, + sortable: false, field: "startDate", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -81,7 +81,7 @@ const columns = ref([ name: "isActive", align: "left", label: "สถานะการใช้งาน", - sortable: true, + sortable: false, field: "isActive", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue b/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue index bb55475d5..621805e96 100644 --- a/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue +++ b/src/modules/13_salary/components/04_salaryLists/DialogAddPerson.vue @@ -47,7 +47,7 @@ const columns = ref([ name: "citizenId", align: "left", label: "เลขประจำตัวประชาชน", - sortable: true, + sortable: false, field: "citizenId", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -57,7 +57,7 @@ const columns = ref([ align: "left", label: "ชื่อ-นามสกุล", field: "fullName", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -65,7 +65,7 @@ const columns = ref([ name: "position", align: "left", label: "ตำแหน่งในสายงาน", - sortable: true, + sortable: false, field: "position", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -74,7 +74,7 @@ const columns = ref([ name: "posType", align: "left", label: "ประเภทตำเเหน่ง", - sortable: true, + sortable: false, field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -83,7 +83,7 @@ const columns = ref([ name: "posLevel", align: "left", label: "ระดับตำเเหน่ง", - sortable: true, + sortable: false, field: "posLevel", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue index 9b6d9d27f..5016f77df 100644 --- a/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/04_salaryLists/TableTypeOther.vue @@ -51,7 +51,7 @@ const baseColumns = ref([ name: "no", align: "left", label: "ลำดับ", - sortable: true, + sortable: false, field: "no", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -60,7 +60,7 @@ const baseColumns = ref([ name: "posNo", align: "left", label: "ตำแหน่งเลขที่", - sortable: true, + sortable: false, field: "posNo", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -70,7 +70,7 @@ const baseColumns = ref([ align: "left", label: "ชื่อ-นามสกุล", field: "fullName", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -78,7 +78,7 @@ const baseColumns = ref([ name: "position", align: "left", label: "ตำแหน่งในสายงาน", - sortable: true, + sortable: false, field: "position", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue index d97b35014..79e951409 100644 --- a/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue +++ b/src/modules/13_salary/components/04_salaryLists/TableTypePending.vue @@ -51,7 +51,7 @@ const columns = ref([ name: "no", align: "left", label: "ลำดับ", - sortable: true, + sortable: false, field: "no", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -60,7 +60,7 @@ const columns = ref([ name: "fullName", align: "left", label: "ชื่อ-นามสกุล", - sortable: true, + sortable: false, field: "fullName", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -69,7 +69,7 @@ const columns = ref([ name: "posType", align: "left", label: "ประเภทตำแหน่ง", - sortable: true, + sortable: false, field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -78,7 +78,7 @@ const columns = ref([ name: "posExecutive", align: "left", label: "ตำแหน่งทางการบริหาร", - sortable: true, + sortable: false, field: "posExecutive", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -88,7 +88,7 @@ const columns = ref([ align: "left", label: "ตำแหน่งในสายงาน", field: "position", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -97,7 +97,7 @@ const columns = ref([ align: "left", label: "ระดับตำแหน่ง", field: "posLevel", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -106,7 +106,7 @@ const columns = ref([ align: "left", label: "เงินเดือน", field: "amount", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -114,7 +114,7 @@ const columns = ref([ name: "organization", align: "left", label: "สังกัด", - sortable: true, + sortable: false, field: "organization", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue index 4dbd8cb5d..ec61c618e 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogAddPerson.vue @@ -47,7 +47,7 @@ const columns = ref([ name: "citizenId", align: "left", label: "เลขประจำตัวประชาชน", - sortable: true, + sortable: false, field: "citizenId", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -57,7 +57,7 @@ const columns = ref([ align: "left", label: "ชื่อ-นามสกุล", field: "fullName", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -65,7 +65,7 @@ const columns = ref([ name: "position", align: "left", label: "ตำแหน่ง", - sortable: true, + sortable: false, field: "position", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -74,7 +74,7 @@ const columns = ref([ name: "posType", align: "left", label: "กลุ่มงาน", - sortable: true, + sortable: false, field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -83,7 +83,7 @@ const columns = ref([ name: "posLevelName", align: "left", label: "ระดับชั้นงาน", - sortable: true, + sortable: false, field: "posLevelName", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue index dab17b705..ea764988f 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue @@ -49,7 +49,7 @@ const baseColumns = ref([ name: "no", align: "left", label: "ลำดับ", - sortable: true, + sortable: false, field: "no", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -58,7 +58,7 @@ const baseColumns = ref([ name: "posNo", align: "left", label: "ตำแหน่งเลขที่", - sortable: true, + sortable: false, field: "posNo", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -68,7 +68,7 @@ const baseColumns = ref([ align: "left", label: "ชื่อ-นามสกุล", field: "fullName", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -76,7 +76,7 @@ const baseColumns = ref([ name: "position", align: "left", label: "ตำแหน่ง", - sortable: true, + sortable: false, field: "position", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue index d631edcfa..74aa79900 100644 --- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue +++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypePending.vue @@ -51,7 +51,7 @@ const columns = ref([ name: "no", align: "left", label: "ลำดับ", - sortable: true, + sortable: false, field: "no", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -60,7 +60,7 @@ const columns = ref([ name: "fullName", align: "left", label: "ชื่อ-นามสกุล", - sortable: true, + sortable: false, field: "fullName", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -69,7 +69,7 @@ const columns = ref([ name: "posType", align: "left", label: "กลุ่มงาน", - sortable: true, + sortable: false, field: "posType", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -79,7 +79,7 @@ const columns = ref([ align: "left", label: "ตำแหน่ง", field: "position", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -88,7 +88,7 @@ const columns = ref([ align: "left", label: "ระดับชั้นงาน", field: "posLevel", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -118,7 +118,7 @@ const columns = ref([ align: "left", label: "ค่าจ้าง", field: "amount", - sortable: true, + sortable: false, headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -126,7 +126,7 @@ const columns = ref([ name: "organization", align: "left", label: "สังกัด", - sortable: true, + sortable: false, field: "organization", headerStyle: "font-size: 14px", style: "font-size: 14px", diff --git a/src/modules/13_salary/views/01_salaryMain.vue b/src/modules/13_salary/views/01_salaryMain.vue index 7822aa219..efe688621 100644 --- a/src/modules/13_salary/views/01_salaryMain.vue +++ b/src/modules/13_salary/views/01_salaryMain.vue @@ -46,7 +46,7 @@ const columns = ref([ name: "name", align: "left", label: "ชื่อผังบัญชีอัตราเงินเดือน", - sortable: true, + sortable: false, field: "name", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -55,7 +55,7 @@ const columns = ref([ name: "posList", align: "left", label: "ประเภทผังบัญชีเงินเดือน", - sortable: true, + sortable: false, field: "posList", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -64,7 +64,7 @@ const columns = ref([ name: "startDate", align: "left", label: "วันที่มีผลบังคับใช้", - sortable: true, + sortable: false, field: "startDate", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -73,7 +73,7 @@ const columns = ref([ name: "isActive", align: "center", label: "สถานะการใช้งาน", - sortable: true, + sortable: false, field: "isActive", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -275,7 +275,6 @@ onMounted(() => { map-options :options="columns" option-value="name" - style="min-width: 140px" class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" /> diff --git a/src/modules/13_salary/views/03_salaryRound.vue b/src/modules/13_salary/views/03_salaryRound.vue index 154053978..555e057bb 100644 --- a/src/modules/13_salary/views/03_salaryRound.vue +++ b/src/modules/13_salary/views/03_salaryRound.vue @@ -61,7 +61,7 @@ const columns = ref([ name: "period", align: "left", label: "รอบการขึ้นเงินเดือน", - sortable: true, + sortable: false, field: "period", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -70,7 +70,7 @@ const columns = ref([ name: "year", align: "left", label: "ปีงบประมาณ", - sortable: true, + sortable: false, field: "year", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -79,7 +79,7 @@ const columns = ref([ name: "effectiveDate", align: "left", label: "วันที่มีผลบังคับใช้", - sortable: true, + sortable: false, field: "effectiveDate", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -88,7 +88,7 @@ const columns = ref([ name: "isActive", align: "left", label: "สถานะการใช้งาน", - sortable: true, + sortable: false, field: "isActive", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -97,7 +97,7 @@ const columns = ref([ name: "isClose", align: "left", label: "สถานะการปิดรอบ", - sortable: true, + sortable: false, field: "isClose", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -335,7 +335,6 @@ onMounted(async () => { map-options :options="dataStore.columns" option-value="name" - style="min-width: 140px" class="col-xs-12 col-sm-3 col-md-2" />