Merge branch 'develop' into devTee

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>