UI วินัย

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

@@ -22,6 +22,7 @@ import DialogDirector from "@/modules/11_discipline/components/DialogDirector.vu
 import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
 import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
 import DialogAddDate from "@/modules/11_discipline/components/DialogAddDate.vue";
+import DialogSendTerminate from "@/modules/11_discipline/components/2_InvestigateFacts/DialogSendTerminate.vue";
 
 const modalPersonal = ref<boolean>(false);
 const personId = ref<string>("");
@@ -852,7 +853,7 @@ onMounted(async () => {
                 <q-btn
                   class="q-pa-sm"
                   color="orange"
-                  label="ส่งรายชื่อไปออกคำสั่งยุติเรื่อง"
+                  label="ส่งรายชื่อไปยุติเรื่อง"
                   @click="openModal"
                 />
               </div>
@@ -1008,6 +1009,14 @@ onMounted(async () => {
                                   : "-"
                               }}
                             </div>
+                            <div v-else-if="col.name === 'isSend'">
+                              <q-icon
+                                v-if="props.row.isSend == 'DONE'"
+                                name="check"
+                                size="sm"
+                                color="primary"
+                              ></q-icon>
+                            </div>
                             <div v-else>
                               {{ col.value ?? "-" }}
                             </div>
@@ -1764,7 +1773,15 @@ onMounted(async () => {
     :lists="props.data.investigationExtendHistory"
   />
 
-  <PopupSendToNext
+  <DialogSendTerminate
+    v-model:modal="modalPopup"
+    :rows="mainStore.rowsCheck"
+    :columns="mainStore.columnsDirector"
+    :visible-columns="mainStore.visibleColumnsDirector"
+    :fetch-data="fetchData"
+  />
+
+  <!-- <PopupSendToNext
     v-model:modal="modalPopup"
     :close="closePopup"
     title="ส่งรายชื่อไปออกคำสั่งยุติเรื่อง"
@@ -1774,7 +1791,7 @@ onMounted(async () => {
     @return-person="emitPerson"
     :checked-val="false"
     :fetch-data="fetchData"
-  />
+  /> -->
 
   <PopupPersonal
     :modal="modalPersonal"
@@ -1792,7 +1809,7 @@ onMounted(async () => {
   />
 </template>
 
-<style scope>
+<style scoped>
 .q-banner {
   min-height: 25px;
 }