From a2302b8ffae307057de8f8fe43494a3e77756352 Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 15 Dec 2023 16:18:00 +0700
Subject: [PATCH] =?UTF-8?q?list=20=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3=E0=B8=AA?=
 =?UTF-8?q?=E0=B8=B1=E0=B9=88=E0=B8=87=E0=B8=82=E0=B8=AD=E0=B8=87=E0=B8=A7?=
 =?UTF-8?q?=E0=B8=B4=E0=B8=99=E0=B8=B1=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../4_Result/DialogSendToCommand.vue          | 14 +++--
 .../7_ListSuspend/DialogSendToCommand.vue     | 60 +++++++++++++++++--
 2 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
index d74a64938..99ae2e718 100644
--- a/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue
@@ -22,7 +22,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 
 const type = ref<string>("");
-const rows = ref<DataListRow[]>([])
+const rows = ref<DataListRow[]>([]);
 const $q = useQuasar();
 const selected = ref<ResponseData[]>([]);
 const mixin = useCounterMixin();
@@ -124,9 +124,11 @@ const fecthTypeOption = async () => {
     .then((res) => {
       optionsType.value = res.data.result.filter(
         (e: OpType) =>
-          e.commandCode === "C-PM-26" ||
+          e.commandCode === "C-PM-19" ||
+          e.commandCode === "C-PM-20" ||
           e.commandCode === "C-PM-27" ||
-          e.commandCode === "C-PM-28"
+          e.commandCode === "C-PM-28" ||
+          e.commandCode === "C-PM-29"
       );
     })
     .catch((e) => {
@@ -140,9 +142,11 @@ const fecthTypeOption = async () => {
 watchEffect(() => {
   if (props.Modal === true) {
     selected.value = [];
-    type.value = ''
+    type.value = "";
     //  console.log(props.data.status)
-    rows.value = props.data.persons.filter((item: any) => item.status !== 'REPORT');
+    rows.value = props.data.persons.filter(
+      (item: any) => item.status !== "REPORT"
+    );
   }
 });
 
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
index b83c3fb67..e94acbda9 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
@@ -1,11 +1,12 @@
 <script setup lang="ts">
-import { ref, computed, watch } from "vue";
+import { ref, computed, watch, onMounted } from "vue";
 import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import DialogHeader from "@/components/DialogHeader.vue";
 
 import type { QTableProps } from "quasar";
 import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
+import type { OpType } from "@/modules/05_placement/interface/response/Main";
 
 import http from "@/plugins/http";
 import config from "@/app.config";
@@ -14,7 +15,7 @@ import config from "@/app.config";
 const $q = useQuasar();
 const selected = ref<any>([]);
 const mixin = useCounterMixin();
-const {  success, dialogConfirm } = mixin;
+const { showLoader, success, messageError, dialogConfirm, hideLoader } = mixin;
 const emit = defineEmits([
   "update:filterKeyword2",
   "update:selected",
@@ -130,20 +131,71 @@ function updateInput(value: any) {
 function Reset() {
   emit("update:filterKeyword2", "");
 }
+
+const type = ref<string>("");
+//----(ดึงข้อมูลประเภทคำสั่ง)------//
+const optionsType = ref<[]>([]);
+const fecthTypeOption = async () => {
+  showLoader();
+  await http
+    .get(config.API.typeOrder())
+    .then((res) => {
+      optionsType.value = res.data.result.filter(
+        (e: OpType) =>
+          e.commandCode === "C-PM-25" || e.commandCode === "C-PM-26"
+      );
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {
+      hideLoader();
+    });
+};
+
 // watch([()=>props.modal],() => {
 //   selected.value = props.modal ? [] : [];
 //   if (props.modal === true) {
 //     selected.value = props.rows2;
 //   }
 // });
+onMounted(() => {
+  fecthTypeOption();
+});
 </script>
+
 <template>
   <q-dialog v-model="props.modal">
     <q-card style="width: 1200px; max-width: 80vw">
       <DialogHeader tittle="ส่งไปออกคำสั่ง" :close="closeModal" />
       <q-separator />
       <q-card-section class="q-pt-none">
-        <div class="row justify-end">
+        <div class="row justify-between">
+          <div class="col-5">
+            <q-toolbar style="padding: 0">
+              <q-select
+                outlined
+                dense
+                v-model="type"
+                :options="optionsType"
+                label="ประเภทคำสั่ง"
+                style="width: 400px; max-width: auto"
+                emit-value
+                map-options
+                option-label="name"
+                option-value="id"
+                use-input
+                ><template v-slot:no-option>
+                  <q-item>
+                    <q-item-section class="text-grey">
+                      ไม่มีข้อมูล
+                    </q-item-section>
+                  </q-item>
+                </template>
+              </q-select>
+            </q-toolbar>
+          </div>
+
           <div class="col-5">
             <q-toolbar style="padding: 0">
               <q-input
@@ -166,7 +218,7 @@ function Reset() {
                   />
                 </template>
               </q-input>
-              
+
               <q-select
                 v-model="visibleColumns2"
                 multiple