Merge branch 'develop' into devTee

2025-09-15 12:52:04 +07:00 · 2025-09-15 12:52:04 +07:00 · 1c22f00a0e
commit 1c22f00a0e
parent 33c13b5ef9 a30e3bbdd1
1 changed files with 12 additions and 5 deletions
--- a/src/modules/02_organization/components/TableMain.vue
+++ b/src/modules/02_organization/components/TableMain.vue
@ -961,11 +961,6 @@ watch(
                    ? props.row.positionIsSelected
                    : "-"
                }}
-                {{
-                  props.row.isCondition && props.row.conditionReason
-                    ? `(${props.row.conditionReason})`
-                    : ""
-                }}
                <q-btn
                  v-if="props.row.positionIsSelected != 'ว่าง'"
                  size="12px"
@ -984,6 +979,18 @@ watch(
                >
                  <q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip>
                </q-btn>
+                <!-- <br
+                  v-if="
+                    props.row.isCondition &&
+                    props.row.conditionReason &&
+                    props.row.positionIsSelected != 'ว่าง'
+                  "
+                /> -->
+                {{
+                  props.row.isCondition && props.row.conditionReason
+                    ? `\r(${props.row.conditionReason})`
+                    : ""
+                }}
              </div>
            </div>
            <div v-else>