ปรับ ui วินัย กรรมการ

src/modules/11_discipline/components/2_InvestigateFacts/Form.vue

@@ -148,6 +148,7 @@ const objectInvestigate: MyObjectInvestigateRef = {
 };
 
 const rows = ref([]);
+const rowsChack = ref([]);
 const statusStep = computed(() => {
   return route.name === "/discipline-disciplinaryEdit" ? true : false;
 });
@@ -161,9 +162,7 @@ const dateEndInputStyle = computed(() => {
       new Date(currentDate.getTime() + 7 * 24 * 60 * 60 * 1000);
 
   console.log(isInNext7Days);
-  return isInNext7Days
-    ? { textDecoration: "underline", color: "red", borderColor: "red" }
-    : {};
+  return isInNext7Days ? "input-alert" : "";
 });
 
 const initialPagination = ref<any>({
@@ -307,10 +306,10 @@ watch(props.data, async () => {
       email: item.email,
       phone: item.phone,
       duty: item.duty,
+      check: "props",
     }));
 
     rows.value = dataMap;
-
     const dataList = dataMap.map((item: any) => item.id);
     formData.directors = dataList;
   }
@@ -481,6 +480,7 @@ async function getList() {
 function returnDirector(data: any) {
   const dataList = data.map((item: any) => item.id);
   formData.directors = dataList;
+
   rows.value = data;
   changeFormData();
   clickClose();
@@ -759,21 +759,14 @@ onMounted(async () => {
                                 {{ props.rowIndex + 1 }}
                               </div>
                               <div v-else-if="col.name == 'info'">
-                                <q-btn
-                                  size="14px"
-                                  flat
-                                  round
-                                  dense
-                                  color="info"
-                                  icon="info"
-                                  @click="
-                                    router.push(
-                                      `/registry/${props.row.personId}`
-                                    )
-                                  "
-                                  ><q-tooltip
-                                    >ดูข้อมูลในทะเบียนประวัติ</q-tooltip
-                                  ></q-btn
+                                <router-link
+                                  target="_blank"
+                                  :to="`/registry/${props.row.personId}`"
+                                  ><q-icon name="info" color="info" size="sm"
+                                    ><q-tooltip
+                                      >ดูข้อมูลในทะเบียนประวัติ</q-tooltip
+                                    >
+                                  </q-icon></router-link
                                 >
                               </div>
                               <div
@@ -1019,6 +1012,11 @@ onMounted(async () => {
                           </div>
                           <div class="col-3">
                             <datepicker
+                              :class="
+                                formData.status !== 'NEW'
+                                  ? ''
+                                  : dateEndInputStyle
+                              "
                               menu-class-name="modalfix"
                               v-model="formData.investigationDateEnd"
                               :readonly="
@@ -1063,7 +1061,6 @@ onMounted(async () => {
                                       `${'กรุณาเลือกวันที่สิ้นสุดการสืบสวน'}`,
                                   ]"
                                   :label="`${'วันที่สิ้นสุดการสืบสวน'}`"
-                                  :input-style="dateEndInputStyle"
                                 >
                                   <template v-slot:prepend>
                                     <q-icon
@@ -1168,10 +1165,10 @@ onMounted(async () => {
                               {{ col.value }}
                             </div>
                           </q-td>
-                          <q-td>
+                          <q-td class="text-right">
                             <!-- แก้ไขกรรมการ -->
                             <q-btn
-                              v-if="!isReadonly"
+                              v-if="!isReadonly && props.row.check === 'props'"
                               dense
                               size="12px"
                               flat
@@ -1598,7 +1595,6 @@ onMounted(async () => {
 </template>
 
 <style scope>
-
 .q-banner {
   min-height: 25px;
 }