diff --git a/src/api/02_organizational/api.organization.ts b/src/api/02_organizational/api.organization.ts
index bcb7e54d9..5162b17e1 100644
--- a/src/api/02_organizational/api.organization.ts
+++ b/src/api/02_organizational/api.organization.ts
@@ -53,8 +53,6 @@ export default {
orgPosExecutiveById: (id: string) => `${orgPos}/executive/${id}`,
orgPosHistory: (id: string) => `${orgPos}/history/${id}`,
orgPosHistoryUpdate: (id: string) => `${orgPos}/history-update/${id}`,
- orgPosHistoryUpdateEmp: (id: string) =>
- `${orgEmployeePos}/history-update/${id}`,
orgSalaryPosition: `${orgPos}/position?keyword=&type=ALL`,
@@ -182,6 +180,7 @@ export default {
positionCondition: `${orgPos}/master/position-condition`,
positionConditionEmp: `${organization}/employee/pos/master/position-condition`,
+
keycloakLogSSO: `${organization}/keycloak/log/sso`,
reportOrgByType: (type: string) => `${reportOrg}/registry-${type}`,
diff --git a/src/modules/16_positionEmployee/components/DialogHistoryPos.vue b/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
index b41247633..48f5eac78 100644
--- a/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
+++ b/src/modules/16_positionEmployee/components/DialogHistoryPos.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/src/modules/16_positionEmployee/components/TableMain.vue b/src/modules/16_positionEmployee/components/TableMain.vue
index f56a0ab4e..765b1ca4e 100644
--- a/src/modules/16_positionEmployee/components/TableMain.vue
+++ b/src/modules/16_positionEmployee/components/TableMain.vue
@@ -78,7 +78,6 @@ const modalDialogSuccession = ref(false); // สืบทอดตำ
const modalDialogHistoryPos = ref(false); // ประวัติตำแหน่ง
const modalCondition = ref(false); // จัดการตำแหน่งติดเงื่อนไข
const dataCondition = ref();
-const historyType = ref(""); // ประวัติตำแหน่ง
const rowId = ref("");
const actionType = ref("");
@@ -108,12 +107,6 @@ const listMenu = ref([
type: "CONDITION",
color: "deep-orange",
},
- {
- label: "ประวัติคนครอง",
- icon: "history",
- type: "OWNER_HISTORY",
- color: "deep-purple",
- },
{
label: "ลบ",
icon: "delete",
@@ -254,20 +247,18 @@ const typeMove = ref("");
* @param type ประเภท [ALL,SINGER]
*/
function onClickMovePos(id: string, type: string) {
- rowId.value = id;
modalDialogMMove.value = !modalDialogMMove.value;
typeMove.value = type;
+ rowId.value = id;
}
/**
* function ดูประวัติตำแหน่ง
* @param id ID ตำแหน่ง
- * @param type ประเภท [ALL,SINGER]
*/
-function onClickHistoryPos(id: string, type: string) {
- rowId.value = id;
- historyType.value = type;
+function onClickHistoryPos(id: string) {
modalDialogHistoryPos.value = !modalDialogHistoryPos.value;
+ rowId.value = id;
}
/**
@@ -624,15 +615,13 @@ watch(
: item.type === 'MOVE'
? onClickMovePos(props.row.id, 'SINGER')
: item.type === 'HISTORY'
- ? onClickHistoryPos(props.row.id, item.type)
+ ? onClickHistoryPos(props.row.id)
: item.type === 'INHERIT'
? onClickInherit(props.row.id)
: item.type === 'COPY'
? onClickPosition('COPY', props.row.id)
: item.type === 'CONDITION'
? onClickCodition(props.row)
- : item.type === 'OWNER_HISTORY'
- ? onClickHistoryPos(props.row.ancestorDNA, item.type)
: null
"
>
@@ -789,11 +778,7 @@ watch(
/>
-
+