From 1958d4db7dc9af77b32f5be3dde5eb0748fcce68 Mon Sep 17 00:00:00 2001 From: waruneeauy Date: Wed, 3 Apr 2024 14:53:18 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84=E0=B8=AD?= =?UTF-8?q?=E0=B8=A5=E0=B8=B1=E0=B8=A1=E0=B8=99=E0=B9=8C=E0=B9=80=E0=B8=A5?= =?UTF-8?q?=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99=E0=B8=84=E0=B9=88=E0=B8=B2?= =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87=E0=B8=A5=E0=B8=B9=E0=B8=81?= =?UTF-8?q?=E0=B8=88=E0=B9=89=E0=B8=B2=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SalaryEmployeeLists/TableTypeOther.vue | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue index 440fd76c6..c8dac4995 100644 --- a/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue +++ b/src/modules/13_salary/components/SalaryEmployeeLists/TableTypeOther.vue @@ -76,15 +76,6 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posLevel", - align: "left", - label: "ระดับชั้นงาน", - sortable: false, - field: "posLevel", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, { name: "posType", align: "left", @@ -170,12 +161,12 @@ const visibleColumns = ref([ "position", "posType", "posLevel", + "group", + "salaryLevel", "amount", "amountUse", "positionSalaryAmount", "isRetired", - "group", - "salaryLevel", ]); /** modalDialog*/ @@ -315,7 +306,7 @@ watch( store.roundMainCode === 'OCT' ? columns : columns - ? columns.slice(0, 12) + ? columns.slice(0, 11) : [] " option-value="name" @@ -331,7 +322,7 @@ watch( store.roundMainCode === 'OCT' ? columns : columns - ? columns.slice(0, 10) + ? columns.slice(0, 11) : [] " :rows="props.rows"