Merge branch 'develop' into devTee

2025-04-03 17:38:39 +07:00 · 2025-04-03 17:38:39 +07:00 · bfb9acfb05
commit bfb9acfb05
parent 3793b30da1 de81595300
10 changed files with 42 additions and 14 deletions
--- a/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue
+++ b/src/modules/06_retirement/components/06_dismissOrder/DialogSendToCommand.vue
@ -261,7 +261,10 @@ watchEffect(() => {
                      {{ props.rowIndex + 1 }}
                    </div>

-                    <div v-else-if="col.name == 'org'" class="text-html">
+                    <div
+                      v-else-if="col.name == 'organizationPositionOld'"
+                      class="text-html"
+                    >
                      {{
                        props.row.organizationPositionOld
                          ? props.row.organizationPositionOld