diff --git a/src/modules/02_organization/components/DialogHistoryPos.vue b/src/modules/02_organization/components/DialogHistoryPos.vue
index 530597dfa..6e6b1de07 100644
--- a/src/modules/02_organization/components/DialogHistoryPos.vue
+++ b/src/modules/02_organization/components/DialogHistoryPos.vue
@@ -191,7 +191,17 @@ async function fetchHistoryPos(id: string) {
.get(pathAPI)
.then((res) => {
const data = res.data.result;
- rows.value = data;
+ rows.value =
+ props.historyType === "HISTORY"
+ ? data
+ : data.map((e: any) => ({
+ ...e,
+ fullname:
+ e.prefix && e.firstName && e.lastName
+ ? `${e.prefix ?? ""} ${e.firstName ?? ""} ${e.lastName ?? ""}`
+ : "-",
+ shortName: e.orgShortName,
+ }));
})
.catch((err) => {
messageError($q, err);
@@ -206,6 +216,10 @@ watch(
() => modal.value,
() => {
modal.value && props.rowId && fetchHistoryPos(props.rowId);
+
+ if (!modal.value) {
+ rows.value = [];
+ }
}
);
diff --git a/src/modules/02_organization/components/TableMain.vue b/src/modules/02_organization/components/TableMain.vue
index f54a78f80..031840028 100644
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@@ -859,6 +859,40 @@ watch(
+
+
+
+
+
+
+
+
+
+
+
+