diff --git a/src/modules/11_discipline/components/1_Complaint/EditPage.vue b/src/modules/11_discipline/components/1_Complaint/EditPage.vue index 68e0a98aa..067a12b9a 100644 --- a/src/modules/11_discipline/components/1_Complaint/EditPage.vue +++ b/src/modules/11_discipline/components/1_Complaint/EditPage.vue @@ -132,11 +132,11 @@ const columns = ref([ style: "font-size: 14px", }, { - name: "positionLevel", + name: "posLevelName", align: "left", label: "ระดับ", sortable: true, - field: "positionLevel", + field: "posLevelName", headerStyle: "font-size: 14px", style: "font-size: 14px", }, @@ -171,7 +171,7 @@ const visibleColumns = ref([ "name", "posNo", "position", - "positionLevel", + "posLevelName", "salary", "organization", ]); diff --git a/src/modules/11_discipline/components/PopupSendToNext.vue b/src/modules/11_discipline/components/PopupSendToNext.vue index 8e0b28f57..c527c9f7d 100644 --- a/src/modules/11_discipline/components/PopupSendToNext.vue +++ b/src/modules/11_discipline/components/PopupSendToNext.vue @@ -223,7 +223,7 @@ watch( }}
- {{ col.value }} + {{ col.value ? col.value:'-' }}
diff --git a/src/modules/11_discipline/store/Main.ts b/src/modules/11_discipline/store/Main.ts index 5bf475a8b..5266ce6cb 100644 --- a/src/modules/11_discipline/store/Main.ts +++ b/src/modules/11_discipline/store/Main.ts @@ -201,11 +201,11 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { style: "font-size: 14px", }, { - name: "positionLevel", + name: "posLevelName", align: "left", label: "ระดับ", sortable: true, - field: "positionLevel", + field: "posLevelName", headerStyle: "font-size: 14px", style: "font-size: 14px", format(val, row) { @@ -248,7 +248,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => { "name", "posNo", "position", - "positionLevel", + "posLevelName", "salary", "organization", ]);