Merge branch 'develop' into devTee

src/modules/19_condition/view/Main.vue

@@ -94,11 +94,21 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "positionIsSelected",
+    name: "isCondition",
     align: "left",
-    label: "คนครอง",
+    label: "ตำแหน่งติดเงื่อนไง",
     sortable: false,
-    field: "positionIsSelected",
+    field: "isCondition",
+    headerStyle: "font-size: 14px",
+    style: "font-size: 14px",
+  },
+
+  {
+    name: "conditionReason",
+    align: "left",
+    label: "หมายเหตุ",
+    sortable: false,
+    field: "conditionReason",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -428,7 +438,10 @@ onMounted(async () => {
                     :key="col.name"
                     :props="props"
                   >
-                    <div>
+                    <div v-if="col.name === 'isCondition'">
+                      <q-icon name="check" color="primary" />
+                    </div>
+                    <div v-else>
                       {{ col.value ? col.value : "-" }}
                     </div>
                   </q-td>