diff --git a/src/modules/10_registry/02_Government/07_Position.vue b/src/modules/10_registry/02_Government/07_Position.vue index fc84f61..6f076ee 100644 --- a/src/modules/10_registry/02_Government/07_Position.vue +++ b/src/modules/10_registry/02_Government/07_Position.vue @@ -198,11 +198,11 @@ const baseColumns = ref([ a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { - name: "commandCode", + name: "commandName", align: "left", label: "ประเภทคำสั่ง", sortable: true, - field: "commandCode", + field: "commandName", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => @@ -301,7 +301,7 @@ const baseVisibleColumns = ref([ "positionExecutive", "amount", "commandNo", - "commandCode", + "commandName", "commandDateSign", "organization", "remark", diff --git a/src/modules/10_registry/03_Salary/01_Salary.vue b/src/modules/10_registry/03_Salary/01_Salary.vue index c11c51a..25bb95f 100644 --- a/src/modules/10_registry/03_Salary/01_Salary.vue +++ b/src/modules/10_registry/03_Salary/01_Salary.vue @@ -182,11 +182,11 @@ const baseColumns = ref([ a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { - name: "commandCode", + name: "commandName", align: "left", label: "ประเภทคำสั่ง", sortable: true, - field: "commandCode", + field: "commandName", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) => @@ -316,7 +316,7 @@ const visibleColumns = ref([ "positionSalaryAmount", "mouthSalaryAmount", "commandNo", - "commandCode", + "commandName", "commandDateSign", "organization", "remark", @@ -349,7 +349,7 @@ const visibleColumnsHistory = ref([ "positionSalaryAmount", "mouthSalaryAmount", "commandNo", - "commandCode", + "commandName", "commandDateSign", "organization", "remark", @@ -509,11 +509,11 @@ const baseColumnsHistory = ref([ a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }), }, { - name: "commandCode", + name: "commandName", align: "left", label: "ประเภทคำสั่ง", sortable: true, - field: "commandCode", + field: "commandName", headerStyle: "font-size: 14px", style: "font-size: 14px", sort: (a: string, b: string) =>