From ab0bb6673d616924c3274a3d6a51a39094c439ae Mon Sep 17 00:00:00 2001
From: setthawutttty <stw.ttty@gmail.com>
Date: Tue, 5 Sep 2023 11:23:43 +0700
Subject: [PATCH] no message

---
 .../04_registry/components/Assessment.vue     |   4 +-
 src/modules/04_registry/components/Coin.vue   |   4 +-
 .../04_registry/components/Discipline.vue     |   4 +-
 .../04_registry/components/Document.vue       |   8 +-
 .../04_registry/components/Education.vue      |   4 +-
 .../components/Information/Certicate.vue      |   4 +-
 .../components/Information/OldName.vue        |   9 +-
 .../04_registry/components/Insignia.vue       |   4 +-
 src/modules/04_registry/components/Leave.vue  |   5 +-
 src/modules/04_registry/components/Other.vue  |   5 +-
 .../04_registry/components/Profile.vue        |   5 +-
 src/modules/04_registry/components/Record.vue |   4 +-
 src/modules/04_registry/components/Salary.vue |   4 +-
 src/modules/04_registry/components/Talent.vue |   5 +-
 src/modules/04_registry/components/Train.vue  |   4 +-
 src/modules/04_registry/components/Work.vue   |   5 +-
 .../components/Receive/DialogHeader.vue       |   2 +-
 .../components/Receive/receiveMain.vue        | 378 ++++++++++++++----
 18 files changed, 352 insertions(+), 106 deletions(-)

diff --git a/src/modules/04_registry/components/Assessment.vue b/src/modules/04_registry/components/Assessment.vue
index 981e8cc44..4511f29bf 100644
--- a/src/modules/04_registry/components/Assessment.vue
+++ b/src/modules/04_registry/components/Assessment.vue
@@ -43,7 +43,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขผลการประเมินการปฏิบัติราชการ</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Coin.vue b/src/modules/04_registry/components/Coin.vue
index f189eff8b..8e6ee0123 100644
--- a/src/modules/04_registry/components/Coin.vue
+++ b/src/modules/04_registry/components/Coin.vue
@@ -44,7 +44,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขประกาศเกียรติคุณ</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Discipline.vue b/src/modules/04_registry/components/Discipline.vue
index b2c4f2bc0..1ad6664d8 100644
--- a/src/modules/04_registry/components/Discipline.vue
+++ b/src/modules/04_registry/components/Discipline.vue
@@ -42,7 +42,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขวินัย</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Document.vue b/src/modules/04_registry/components/Document.vue
index 26d54ea01..7eb3972ed 100644
--- a/src/modules/04_registry/components/Document.vue
+++ b/src/modules/04_registry/components/Document.vue
@@ -31,7 +31,9 @@
                   color="blue"
                   icon="mdi-download-outline"
                   @click="downloadData(file.file)"
-                />
+                  >
+              <q-tooltip>ดาวน์โหลดเอกสารหลักฐาน</q-tooltip>
+              </q-btn>
                 <q-btn
                   class="gt-xs"
                   size="12px"
@@ -42,7 +44,9 @@
                   icon="mdi-delete-outline"
                   v-show="edit"
                   @click="deleteData(file.id)"
-                />
+                >
+              <q-tooltip>ลบเอกสารหลักฐาน</q-tooltip>
+              </q-btn>
               </div>
             </q-item-section>
           </q-item>
diff --git a/src/modules/04_registry/components/Education.vue b/src/modules/04_registry/components/Education.vue
index 75756891b..85fe41a88 100644
--- a/src/modules/04_registry/components/Education.vue
+++ b/src/modules/04_registry/components/Education.vue
@@ -56,7 +56,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขประวัติการศึกษา</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Information/Certicate.vue b/src/modules/04_registry/components/Information/Certicate.vue
index 43bc56bed..5248f136d 100644
--- a/src/modules/04_registry/components/Information/Certicate.vue
+++ b/src/modules/04_registry/components/Information/Certicate.vue
@@ -46,7 +46,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขใบอนุญาตประกอบอาชีพ</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Information/OldName.vue b/src/modules/04_registry/components/Information/OldName.vue
index 3aa1e5125..a4a8fecc7 100644
--- a/src/modules/04_registry/components/Information/OldName.vue
+++ b/src/modules/04_registry/components/Information/OldName.vue
@@ -41,7 +41,9 @@
                 size="14px"
                 icon="mdi-file-document-outline"
                 @click="openFile(props.row.file)"
-              />
+              >
+            <q-tooltip>ไฟล์เอกสารหลักฐาน</q-tooltip>
+            </q-btn>
               <q-btn
                 color="info"
                 flat
@@ -50,7 +52,10 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+              <q-tooltip>ประวัติการเปลี่ยนชื่อ-นามสกุล
+</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Insignia.vue b/src/modules/04_registry/components/Insignia.vue
index 57251332b..263f9c8bc 100644
--- a/src/modules/04_registry/components/Insignia.vue
+++ b/src/modules/04_registry/components/Insignia.vue
@@ -49,7 +49,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+                <q-tooltip> ประวัติแก้ไขเครื่องราชอิสริยาภรณ์</q-tooltip>
+              </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Leave.vue b/src/modules/04_registry/components/Leave.vue
index ff4f5da94..bfe8d8cd8 100644
--- a/src/modules/04_registry/components/Leave.vue
+++ b/src/modules/04_registry/components/Leave.vue
@@ -66,7 +66,10 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขการลา
+</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Other.vue b/src/modules/04_registry/components/Other.vue
index 5acb4b600..f0bb6042d 100644
--- a/src/modules/04_registry/components/Other.vue
+++ b/src/modules/04_registry/components/Other.vue
@@ -39,7 +39,10 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขอื่นๆ
+</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Profile.vue b/src/modules/04_registry/components/Profile.vue
index 1272fb36d..d4c427a2a 100644
--- a/src/modules/04_registry/components/Profile.vue
+++ b/src/modules/04_registry/components/Profile.vue
@@ -213,6 +213,7 @@
               <q-separator />
             </q-list>
           </q-menu>
+          <q-tooltip>ส่งรายชื่อ</q-tooltip>
         </q-btn>
 
         <q-btn
@@ -380,7 +381,9 @@
                     @click="deletePhoto(n.id)"
                     class="bg-white"
                     style="color: #ff8080"
-                  />
+                  >
+                <q-tooltip>ลบรูปภาพ</q-tooltip>
+                </q-btn>
                 </div>
               </q-img>
             </div>
diff --git a/src/modules/04_registry/components/Record.vue b/src/modules/04_registry/components/Record.vue
index a3fb990ee..a4f73b7ba 100644
--- a/src/modules/04_registry/components/Record.vue
+++ b/src/modules/04_registry/components/Record.vue
@@ -42,7 +42,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขวันที่มิได้ปฏิบัติหน้าที่อยู่ในเขตที่ได้มีประกาศใช้กฎอัยการศึก</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Salary.vue b/src/modules/04_registry/components/Salary.vue
index e1c337205..07713d2f3 100644
--- a/src/modules/04_registry/components/Salary.vue
+++ b/src/modules/04_registry/components/Salary.vue
@@ -66,7 +66,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขตำแหน่ง/เงินเดือน</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Talent.vue b/src/modules/04_registry/components/Talent.vue
index 868a2305e..4affa9891 100644
--- a/src/modules/04_registry/components/Talent.vue
+++ b/src/modules/04_registry/components/Talent.vue
@@ -36,7 +36,10 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขความสามารถพิเศษ
+</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Train.vue b/src/modules/04_registry/components/Train.vue
index 8928f623c..dcd017ccb 100644
--- a/src/modules/04_registry/components/Train.vue
+++ b/src/modules/04_registry/components/Train.vue
@@ -49,7 +49,9 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขการฝึกอบรม/ดูงาน</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/04_registry/components/Work.vue b/src/modules/04_registry/components/Work.vue
index 1754fcaa6..3164b60a1 100644
--- a/src/modules/04_registry/components/Work.vue
+++ b/src/modules/04_registry/components/Work.vue
@@ -46,7 +46,10 @@
                 size="14px"
                 icon="mdi-history"
                 @click="clickHistory(props.row)"
-              />
+              >
+            <q-tooltip>ประวัติแก้ไขปฏิบัติราชการพิเศษ
+</q-tooltip>
+            </q-btn>
             </q-td>
           </q-tr>
         </template>
diff --git a/src/modules/05_placement/components/Receive/DialogHeader.vue b/src/modules/05_placement/components/Receive/DialogHeader.vue
index a20e917b0..2f033f3ff 100644
--- a/src/modules/05_placement/components/Receive/DialogHeader.vue
+++ b/src/modules/05_placement/components/Receive/DialogHeader.vue
@@ -11,7 +11,7 @@ const close = async () => {
 };
 </script>
 <template>
-  <q-toolbar class="q-py-md">
+  <q-toolbar class="q-py-sm">
     <q-toolbar-title class="header-text">{{ title }}</q-toolbar-title>
     <q-btn icon="close" unelevated round dense @click="close" style="color: #ff8080; background-color: #ffdede" />
   </q-toolbar>
diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index d5971fee1..a0ad7d8e7 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -272,12 +272,14 @@ const columns2 = ref<QTableProps["columns"]>([
 onMounted(() => {
   fecthlistRecevice();
 });
-
+const myForm = ref<any>();
 const SaveData = async () => {
+  myForm.value.validate().then((result: boolean) => {
+    if (result) {
   const formData = new FormData();
   formData.append("File", files.value);
   showLoader();
-  await http
+   http
     .put(config.API.receiveFile(personalId.value), formData)
     .then(() => {
       success($q, "บันทึกข้อมูลสำเร็จ");
@@ -288,8 +290,9 @@ const SaveData = async () => {
     .finally(async () => {
       await clickCloseUpload();
       hideLoader();
+
     });
-};
+}})};
 
 const fecthlistRecevice = async () => {
   showLoader();
@@ -385,6 +388,7 @@ const clickClose = () => {
 };
 const clickCloseUpload = () => {
   modalupload.value = false;
+  files.value = null
 };
 
 const openModalTree = (id: string) => {
@@ -453,6 +457,7 @@ const saveOrder = async () => {
     .finally(async () => {
       await fecthlistRecevice();
       hideLoader();
+      
     });
 };
 </script>
@@ -467,27 +472,64 @@ const saveOrder = async () => {
             <q-tooltip>เพิ่มข้อมูล</q-tooltip>
           </q-btn>
 
-          <q-btn @click="popup()" size="14px" flat round color="add" icon="mdi-account-arrow-right">
+          <q-btn
+            @click="popup()"
+            size="14px"
+            flat
+            round
+            color="add"
+            icon="mdi-account-arrow-right"
+          >
             <q-tooltip>ส่งไปออกคำสั่งรับโอน</q-tooltip>
           </q-btn>
 
           <q-space />
-          <q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
-            debounce="300" placeholder="ค้นหา">
+          <q-input
+            class="col-xs-12 col-sm-3 col-md-2"
+            standout
+            dense
+            v-model="filterKeyword"
+            ref="filterRef"
+            outlined
+            debounce="300"
+            placeholder="ค้นหา"
+          >
             <template v-slot:append>
               <q-icon v-if="filterKeyword == ''" name="search" />
-              <q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
+              <q-icon
+                v-if="filterKeyword !== ''"
+                name="clear"
+                class="cursor-pointer"
+                @click="resetFilter"
+              />
             </template>
           </q-input>
 
-          <q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
-            emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
-            class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" />
+          <q-select
+            v-model="visibleColumns"
+            multiple
+            outlined
+            dense
+            options-dense
+            :display-value="$q.lang.table.columns"
+            emit-value
+            map-options
+            :options="columns"
+            option-value="name"
+            options-cover
+            style="min-width: 150px"
+            class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
+          />
         </div>
 
         <div class="col-12 q-pt-sm">
-          <d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="fullname"
-            :visible-columns="visibleColumns">
+          <d-table
+            :columns="columns"
+            :rows="rows"
+            :filter="filterKeyword"
+            row-key="fullname"
+            :visible-columns="visibleColumns"
+          >
             <template v-slot:header="props">
               <q-tr :props="props">
                 <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -501,16 +543,31 @@ const saveOrder = async () => {
                 <q-td key="no" :props="props" @click="nextPage(props.row)">
                   {{ props.rowIndex + 1 }}
                 </q-td>
-                <q-td key="citizenId" :props="props" @click="nextPage(props.row)">
+                <q-td
+                  key="citizenId"
+                  :props="props"
+                  @click="nextPage(props.row)"
+                >
                   {{ props.row.citizenId }}
                 </q-td>
-                <q-td key="fullname" :props="props" @click="nextPage(props.row)">
+                <q-td
+                  key="fullname"
+                  :props="props"
+                  @click="nextPage(props.row)"
+                >
                   {{ props.row.fullname }}
                 </q-td>
-                <q-td key="organizationName" :props="props" @click="nextPage(props.row)">
-                  <div v-if="props.row.orgName !== null ||
-                    props.row.positionPath !== null
-                    ">
+                <q-td
+                  key="organizationName"
+                  :props="props"
+                  @click="nextPage(props.row)"
+                >
+                  <div
+                    v-if="
+                      props.row.orgName !== null ||
+                      props.row.positionPath !== null
+                    "
+                  >
                     <div class="col-4">
                       <div class="text-weight-medium">
                         {{
@@ -518,20 +575,20 @@ const saveOrder = async () => {
                         }}
                         {{
                           props.row.organizationShortName !== null
-                          ? `(${props.row.organizationShortName})`
-                          : ""
+                            ? `(${props.row.organizationShortName})`
+                            : ""
                         }}
                       </div>
                       <div class="text-weight-light">
                         {{
                           props.row.positionPath !== null
-                          ? props.row.positionPath
-                          : "-"
+                            ? props.row.positionPath
+                            : "-"
                         }}
                         {{
                           props.row.positionNumber !== null
-                          ? `(${props.row.positionNumber})`
-                          : ""
+                            ? `(${props.row.positionNumber})`
+                            : ""
                         }}
                       </div>
                     </div>
@@ -542,53 +599,122 @@ const saveOrder = async () => {
                     </div>
                   </div>
                 </q-td>
-                <q-td key="birthday" :props="props" @click="nextPage(props.row)">
+                <q-td
+                  key="birthday"
+                  :props="props"
+                  @click="nextPage(props.row)"
+                >
                   {{ props.row.birthday }}
                 </q-td>
-                <q-td key="dateText" :props="props" @click="nextPage(props.row)">
+                <q-td
+                  key="dateText"
+                  :props="props"
+                  @click="nextPage(props.row)"
+                >
                   {{ props.row.dateText }}
                 </q-td>
-                <q-td key="statusText" :props="props" @click="nextPage(props.row)">
+                <q-td
+                  key="statusText"
+                  :props="props"
+                  @click="nextPage(props.row)"
+                >
                   {{ props.row.statusText }}
                 </q-td>
                 <q-td auto-width>
-                  <q-btn icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
-                    <q-menu transition-show="jump-down" transition-hide="jump-up">
+                  <q-btn
+                    icon="mdi-dots-vertical"
+                    size="12px"
+                    color="grey-7"
+                    flat
+                    round
+                    dense
+                  >
+                    <q-menu
+                      transition-show="jump-down"
+                      transition-hide="jump-up"
+                    >
                       <q-list dense style="min-width: 100px">
-                        <q-item clickable v-close-popup @click="openModalTree(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
-                          props.row.status == 'DONE'
-                          ">
-                          <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                            <q-icon :color="props.row.status == 'REPORT' ||
+                        <q-item
+                          clickable
+                          v-close-popup
+                          @click="openModalTree(props.row.personalId)"
+                          :disable="
+                            props.row.status == 'REPORT' ||
+                            props.row.status == 'DONE'
+                          "
+                        >
+                          <q-item-section
+                            style="min-width: 0px"
+                            avatar
+                            class="q-py-sm"
+                          >
+                            <q-icon
+                              :color="
+                                props.row.status == 'REPORT' ||
                                 props.row.status == 'DONE'
-                                ? 'grey'
-                                : 'primary'
-                              " size="xs" name="mdi-bookmark-outline" />
+                                  ? 'grey'
+                                  : 'primary'
+                              "
+                              size="xs"
+                              name="mdi-bookmark-outline"
+                            />
                           </q-item-section>
-                          <q-item-section>เลือกหน่วยงานที่รับโอน</q-item-section>
+                          <q-item-section
+                            >เลือกหน่วยงานที่รับโอน</q-item-section
+                          >
                         </q-item>
-                        <q-item clickable v-close-popup @click="openUpload(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
-                          props.row.status == 'DONE'
-                          ">
-                          <q-item-section style="min-width: 0px" avatar class="q-py-sm">
-                            <q-icon :color="props.row.status == 'REPORT' ||
+                        <q-item
+                          clickable
+                          v-close-popup
+                          @click="openUpload(props.row.personalId)"
+                          :disable="
+                            props.row.status == 'REPORT' ||
+                            props.row.status == 'DONE'
+                          "
+                        >
+                          <q-item-section
+                            style="min-width: 0px"
+                            avatar
+                            class="q-py-sm"
+                          >
+                            <q-icon
+                              :color="
+                                props.row.status == 'REPORT' ||
                                 props.row.status == 'DONE'
-                                ? 'grey'
-                                : 'blue'
-                              " size="xs" name="attach_file" />
+                                  ? 'grey'
+                                  : 'blue'
+                              "
+                              size="xs"
+                              name="attach_file"
+                            />
                           </q-item-section>
-                          <q-item-section>อัพโหลดเอกสาร</q-item-section>
+                          <q-item-section>อัปโหลดเอกสาร</q-item-section>
                         </q-item>
-                        <q-item clickable v-close-popup @click="openDelete(props.row.personalId)" :disable="props.row.status == 'REPORT' ||
-                          props.row.status == 'DONE'
-                          ">
-                          <q-item-section style="min-width: 0px" avatar class="q-py-sm">
+                        <q-item
+                          clickable
+                          v-close-popup
+                          @click="openDelete(props.row.personalId)"
+                          :disable="
+                            props.row.status == 'REPORT' ||
+                            props.row.status == 'DONE'
+                          "
+                        >
+                          <q-item-section
+                            style="min-width: 0px"
+                            avatar
+                            class="q-py-sm"
+                          >
                             <q-tooltip>ลบข้อมูล</q-tooltip>
-                            <q-icon :color="props.row.status == 'REPORT' ||
+                            <q-icon
+                              :color="
+                                props.row.status == 'REPORT' ||
                                 props.row.status == 'DONE'
-                                ? 'grey'
-                                : 'red'
-                              " size="xs" name="mdi-delete" />
+                                  ? 'grey'
+                                  : 'red'
+                              "
+                              size="xs"
+                              name="mdi-delete"
+                            />
                           </q-item-section>
                           <q-item-section>ลบ</q-item-section>
                         </q-item>
@@ -612,24 +738,61 @@ const saveOrder = async () => {
         <div class="row justify-end">
           <div class="col-5">
             <q-toolbar style="padding: 0">
-              <q-input borderless outlined dense debounce="300" v-model="filterKeyword2" placeholder="ค้นหา"
-                style="width: 850px; max-width: auto">
+              <q-input
+                borderless
+                outlined
+                dense
+                debounce="300"
+                v-model="filterKeyword2"
+                placeholder="ค้นหา"
+                style="width: 850px; max-width: auto"
+              >
                 <template v-slot:append>
                   <q-icon v-if="filterKeyword2 == ''" name="search" />
-                  <q-icon v-if="filterKeyword2 !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
+                  <q-icon
+                    v-if="filterKeyword2 !== ''"
+                    name="clear"
+                    class="cursor-pointer"
+                    @click="resetFilter"
+                  />
                 </template>
               </q-input>
-              <q-select v-model="visibleColumns2" multiple outlined dense options-dense
-                :display-value="$q.lang.table.columns" emit-value map-options :options="columns2" option-value="name"
-                options-cover style="min-width: 150px" class="gt-xs q-ml-sm" />
+              <q-select
+                v-model="visibleColumns2"
+                multiple
+                outlined
+                dense
+                options-dense
+                :display-value="$q.lang.table.columns"
+                emit-value
+                map-options
+                :options="columns2"
+                option-value="name"
+                options-cover
+                style="min-width: 150px"
+                class="gt-xs q-ml-sm"
+              />
             </q-toolbar>
           </div>
         </div>
 
-        <d-table :columns="columns2" :rows="rows2" :filter="filterKeyword2" row-key="personalId" flat
-          :visible-columns="visibleColumns2" selection="multiple" v-model:selected="selected">
+        <d-table
+          :columns="columns2"
+          :rows="rows2"
+          :filter="filterKeyword2"
+          row-key="personalId"
+          flat
+          :visible-columns="visibleColumns2"
+          selection="multiple"
+          v-model:selected="selected"
+        >
           <template v-slot:header-selection="scope">
-            <q-checkbox keep-color color="primary" dense v-model="scope.selected" />
+            <q-checkbox
+              keep-color
+              color="primary"
+              dense
+              v-model="scope.selected"
+            />
           </template>
           <!-- <template v-slot:body-selection="scope">
             <q-checkbox
@@ -642,7 +805,12 @@ const saveOrder = async () => {
           <template v-slot:body="props">
             <q-tr :props="props" class="cursor-pointer">
               <q-td>
-                <q-checkbox keep-color color="primary" dense v-model="props.selected" />
+                <q-checkbox
+                  keep-color
+                  color="primary"
+                  dense
+                  v-model="props.selected"
+                />
               </q-td>
               <q-td key="no" :props="props">
                 {{ props.rowIndex + 1 }}
@@ -653,29 +821,36 @@ const saveOrder = async () => {
               <q-td key="fullname" :props="props" @click="nextPage(props.row)">
                 {{ props.row.fullname }}
               </q-td>
-              <q-td key="organizationName" :props="props" @click="nextPage(props.row)">
-                <div v-if="props.row.orgName !== null ||
-                  props.row.positionPath !== null
-                  ">
+              <q-td
+                key="organizationName"
+                :props="props"
+                @click="nextPage(props.row)"
+              >
+                <div
+                  v-if="
+                    props.row.orgName !== null ||
+                    props.row.positionPath !== null
+                  "
+                >
                   <div class="col-4">
                     <div class="text-weight-medium">
                       {{ props.row.orgName !== null ? props.row.orgName : "-" }}
                       {{
                         props.row.organizationShortName !== null
-                        ? `(${props.row.organizationShortName})`
-                        : ""
+                          ? `(${props.row.organizationShortName})`
+                          : ""
                       }}
                     </div>
                     <div class="text-weight-light">
                       {{
                         props.row.positionPath !== null
-                        ? props.row.positionPath
-                        : "-"
+                          ? props.row.positionPath
+                          : "-"
                       }}
                       {{
                         props.row.positionNumber !== null
-                        ? `(${props.row.positionNumber})`
-                        : ""
+                          ? `(${props.row.positionNumber})`
+                          : ""
                       }}
                     </div>
                   </div>
@@ -692,7 +867,11 @@ const saveOrder = async () => {
               <q-td key="dateText" :props="props" @click="nextPage(props.row)">
                 {{ props.row.dateText }}
               </q-td>
-              <q-td key="statusText" :props="props" @click="nextPage(props.row)">
+              <q-td
+                key="statusText"
+                :props="props"
+                @click="nextPage(props.row)"
+              >
                 {{ props.row.statusText }}
               </q-td>
             </q-tr>
@@ -701,38 +880,63 @@ const saveOrder = async () => {
       </q-card-section>
 
       <q-card-actions align="right" class="bg-white text-teal">
-        <q-btn label="ส่งไปออกคำสั่ง" @click="saveOrder" :disable="checkSelected" color="public" />
+        <q-btn
+          label="ส่งไปออกคำสั่ง"
+          @click="saveOrder"
+          :disable="checkSelected"
+          color="public"
+        />
       </q-card-actions>
     </q-card>
   </q-dialog>
 
   <q-dialog v-model="modalupload">
     <q-card style="width: 600px">
-      <DialogHeader title="อัพโหลดเอกสาร" :close="clickCloseUpload" />
-      <q-card-section class="q-pt-none">
+      <DialogHeader title="อัปโหลดเอกสาร" :close="clickCloseUpload" />
+      <q-separator />
+      <q-card-section class="q-py-sm">
         <div class="col-12 row items-center q-col-gutter-sm">
           <div class="col-12">
-            <q-file outlined dense v-model="files" label="อัพโหลดเอกสาร" lazy-rules>
-              <!-- :rules="[
-                    (val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน',
-                  ]" -->
+            <q-file
+              ref="myForm"
+              outlined
+              dense
+              v-model="files"
+              label="อัปโหลดเอกสาร"
+              lazy-rules
+              :rules="[(val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน']"
+              hide-bottom-space
+              >
               <template v-slot:prepend>
                 <q-icon name="attach_file" />
+
               </template>
             </q-file>
           </div>
         </div>
       </q-card-section>
-      <q-card-actions class="text-primary q-py-sm">
+      <q-separator />
+      <div class="row q-px-sm q-py-xs">
         <q-space />
-        <q-btn flat round color="public" @click="SaveData()" icon="mdi-content-save-outline">
+        <q-btn
+          flat
+          round
+          color="public"
+          @click="SaveData()"
+          icon="mdi-content-save-outline"
+        >
           <q-tooltip>บันทึก</q-tooltip>
         </q-btn>
-      </q-card-actions>
+      </div>
     </q-card>
   </q-dialog>
 
-  <DialogOrgTree v-model:modal="modalTree" :close="closeModalTree" :personal="personal" :personalId="personalId" />
+  <DialogOrgTree
+    v-model:modal="modalTree"
+    :close="closeModalTree"
+    :personal="personal"
+    :personalId="personalId"
+  />
   <!-- :personalId="personalId" -->
 </template>
 <style scoped lang="scss"></style>