From 11c6259b906c96b5529ad0a4a4e9409573ff4bda Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 26 Dec 2023 11:23:22 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=84=E0=B8=A5=E0=B8=B5=E0=B8=A2?=
 =?UTF-8?q?=E0=B9=82=E0=B8=84=E0=B9=89=E0=B8=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/5_Report/DetailPage.vue        |  3 --
 .../6_BasicInformation/Director/Form.vue      |  2 --
 .../components/7_ListSuspend/DetailPage.vue   | 34 -------------------
 .../7_ListSuspend/DialogSendToCommand.vue     |  7 ----
 .../components/9_Order/TableOrder.vue         | 12 +++----
 .../11_discipline/store/ComplaintsStore.ts    |  1 -
 6 files changed, 6 insertions(+), 53 deletions(-)

diff --git a/src/modules/11_discipline/components/5_Report/DetailPage.vue b/src/modules/11_discipline/components/5_Report/DetailPage.vue
index 19fa79b52..8b01ca001 100644
--- a/src/modules/11_discipline/components/5_Report/DetailPage.vue
+++ b/src/modules/11_discipline/components/5_Report/DetailPage.vue
@@ -7,9 +7,6 @@ import { useQuasar } from "quasar";
 import type { DataOption } from "@/modules/11_discipline/interface/index/Main";
 import { useReportDataStore } from "@/modules/11_discipline/store/ReportStore";
 
-import http from "@/plugins/http";
-import config from "@/app.config";
-
 const date = ref<Date>();
 const dateEnd = ref<Date>();
 const route = useRoute();
diff --git a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
index 156f984e5..045a516a1 100644
--- a/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
+++ b/src/modules/11_discipline/components/6_BasicInformation/Director/Form.vue
@@ -15,8 +15,6 @@ const {
   messageError,
   showLoader,
   dialogMessageNotify,
-  dialogConfirm,
-  success,
   hideLoader,
 } = mixin;
 /**
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
index 763b7ff32..2b9c980da 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DetailPage.vue
@@ -289,26 +289,6 @@ onMounted(async () => {
     <q-form ref="myForm">
       <div class="row col-12 q-pa-md">
         <div class="col-12 row bg-white q-col-gutter-md">
-          <!-- <div class="col-xs-12 row items-center">
-            <div class="col-12">
-              <div class="text-weight-bold">ตำแหน่งและหน่วยงานเดิม</div>
-            </div>
-            <div class="col-12">
-              <q-input
-                :class="getClass(edit)"
-                :outlined="edit"
-                dense
-                lazy-rules
-                :readonly="!edit"
-                :borderless="!edit"
-                v-model="organizationPositionOld"
-                :rules="[(val) => !!val || `${'กรุณากรอกตำแหน่ง/สังกัด'}`]"
-                hide-bottom-space
-                :label="`${'ตำแหน่ง/สังกัด'}`"
-                type="textarea"
-              />
-            </div>
-          </div> -->
           <div class="col-xs-6 col-sm-3 row">
             <div class="col-12">
               <q-input
@@ -557,20 +537,6 @@ onMounted(async () => {
               type="textarea"
             />
           </div>
-          <!-- <div class="col-12">
-            <q-input
-              :class="getClass(edit)"
-              :outlined="edit"
-              dense
-              lazy-rules
-              :readonly="!edit"
-              :borderless="!edit"
-              v-model="reason"
-              hide-bottom-space
-              :label="`${'หมายเหตุ '}`"
-              type="textarea"
-            />
-          </div> -->
         </div>
       </div>
     </q-form>
diff --git a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
index f19d2a111..ed0e68db1 100644
--- a/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
+++ b/src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue
@@ -5,7 +5,6 @@ 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";
@@ -245,12 +244,6 @@ onMounted(() => {
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th auto-width>
-                <!-- <q-checkbox
-                  keep-color
-                  color="primary"
-                  dense
-                  v-model="props.selected"
-                /> -->
               </q-th>
               <q-th
                 v-for="col in props.cols"
diff --git a/src/modules/11_discipline/components/9_Order/TableOrder.vue b/src/modules/11_discipline/components/9_Order/TableOrder.vue
index e417a84cb..77d4e6f65 100644
--- a/src/modules/11_discipline/components/9_Order/TableOrder.vue
+++ b/src/modules/11_discipline/components/9_Order/TableOrder.vue
@@ -178,12 +178,6 @@ const visibleColumns = ref<string[]>([
   "orderStatusName",
 ]);
 
-/** โหลดข้อมูลเมื่อเข้าหน้านี้ */
-onMounted(() => {
-  OrderStore.columns = columns.value;
-  OrderStore.visibleColumns = visibleColumns.value;
-});
-
 /** pagination */
 const pagination = ref({
   descending: true,
@@ -210,6 +204,12 @@ const redirectToPage = (id?: string, status?: string) => {
   }
   router.push(`/discipline-order/detail/${id}?step=${step}`);
 };
+
+/** โหลดข้อมูลเมื่อเข้าหน้านี้ */
+onMounted(() => {
+  OrderStore.columns = columns.value;
+  OrderStore.visibleColumns = visibleColumns.value;
+});
 </script>
 
 <template>
diff --git a/src/modules/11_discipline/store/ComplaintsStore.ts b/src/modules/11_discipline/store/ComplaintsStore.ts
index 9af3721a2..50954926f 100644
--- a/src/modules/11_discipline/store/ComplaintsStore.ts
+++ b/src/modules/11_discipline/store/ComplaintsStore.ts
@@ -8,7 +8,6 @@ import type {
   DataListRow,
   ocListType,
 } from "@/modules/11_discipline/interface/response/complaint";
-import type { ArrayPerson } from "@/modules/11_discipline/interface/request/complaint";
 import type { QTableProps } from "quasar";
 import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 const mainStore = useDisciplineMainStore();