Merge branch 'develop' into dev

fix: convertCommandCodeName columns commandCode
2026-01-30 18:08:18 +07:00 · 2026-01-30 17:55:09 +07:00
2 changed files with 2 additions and 2 deletions
--- a/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
+++ b/src/modules/04_registryPerson/components/detail/GovernmentInformation/07_Position.vue
@ -210,7 +210,7 @@ const baseColumns = ref<QTableColumn[]>([
    sortable: true,
    field: "commandCode",
    format(val, row) {
-      return row.commandName;
+      return store.convertCommandCodeName(row.commandCode);
    },
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
--- a/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
+++ b/src/modules/04_registryPerson/components/detail/Salary/01_PositionSalary.vue
@ -215,7 +215,7 @@ const baseColumns = ref<QTableColumn[]>([
    sortable: true,
    field: "commandCode",
    format(val, row) {
-      return row.commandName;
+      return store.convertCommandCodeName(row.commandCode);
    },
    headerStyle: "font-size: 14px",
    style: "font-size: 14px",
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	72f3cdcdc0	Merge branch 'develop' into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 3m48s Details	2026-01-30 18:08:18 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	28fa6fbaf7	fix: convertCommandCodeName columns commandCode	2026-01-30 17:55:09 +07:00