From 1a294be701a09e7aef971d56805ab97a256d5d8d Mon Sep 17 00:00:00 2001
From: waruneeta <warunee.auy@gmail.com>
Date: Fri, 1 Sep 2023 16:18:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=AD=E0=B8=B1=E0=B8=9E=E0=B9=82=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=94=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B1=E0=B8=9A=E0=B9=82=E0=B8=AD=E0=B8=99=20=E0=B9=81?=
 =?UTF-8?q?=E0=B8=A5=E0=B8=B0=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20validate=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84=E0=B8=B3?=
 =?UTF-8?q?=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Receive/receiveMain.vue        | 418 +++++-------------
 .../components/RepatriationOrder/step03.vue   |   2 +-
 2 files changed, 118 insertions(+), 302 deletions(-)

diff --git a/src/modules/05_placement/components/Receive/receiveMain.vue b/src/modules/05_placement/components/Receive/receiveMain.vue
index f921eecec..d5971fee1 100644
--- a/src/modules/05_placement/components/Receive/receiveMain.vue
+++ b/src/modules/05_placement/components/Receive/receiveMain.vue
@@ -274,8 +274,21 @@ onMounted(() => {
 });
 
 const SaveData = async () => {
-  await addUpload();
-  await clickCloseUpload();
+  const formData = new FormData();
+  formData.append("File", files.value);
+  showLoader();
+  await http
+    .put(config.API.receiveFile(personalId.value), formData)
+    .then(() => {
+      success($q, "บันทึกข้อมูลสำเร็จ");
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(async () => {
+      await clickCloseUpload();
+      hideLoader();
+    });
 };
 
 const fecthlistRecevice = async () => {
@@ -323,33 +336,33 @@ const fecthlistRecevice = async () => {
     });
 };
 
-const fileUploadDoc = async (val: any) => {
-  nameFile.value = val[0].name;
-  fileUpload.value = val;
-};
+// const fileUploadDoc = async (val: any) => {
+//   nameFile.value = val[0].name;
+//   fileUpload.value = val;
+// };
 
-const addUpload = async () => {
-  if (fileUpload.value.length > 0) {
-    const blob = fileUpload.value.slice(0, fileUpload.value[0].size);
-    const newFile = new File(blob, nameFile.value, {
-      type: fileUpload.value[0].type,
-    });
-    const formData = new FormData();
-    formData.append("", newFile);
-    showLoader();
-    await http
-      .put(config.API.receiveFile(personalId.value), formData)
-      .then(() => {
-        success($q, "บันทึกข้อมูลสำเร็จ");
-      })
-      .catch((e) => {
-        messageError($q, e);
-      })
-      .finally(async () => {
-        hideLoader();
-      });
-  }
-};
+// const addUpload = async () => {
+//   if (fileUpload.value.length > 0) {
+//     const blob = fileUpload.value.slice(0, fileUpload.value[0].size);
+//     const newFile = new File(blob, nameFile.value, {
+//       type: fileUpload.value[0].type,
+//     });
+//     const formData = new FormData();
+//     formData.append("", newFile);
+//     showLoader();
+//     await http
+//       .put(config.API.receiveFile(personalId.value), formData)
+//       .then(() => {
+//         success($q, "บันทึกข้อมูลสำเร็จ");
+//       })
+//       .catch((e) => {
+//         messageError($q, e);
+//       })
+//       .finally(async () => {
+//         hideLoader();
+//       });
+//   }
+// };
 
 const resetFilter = () => {
   filterKeyword.value = "";
@@ -454,64 +467,27 @@ 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">
@@ -525,31 +501,16 @@ 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">
                         {{
@@ -557,20 +518,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>
@@ -581,122 +542,53 @@ 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>
-                        <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>
@@ -720,61 +612,24 @@ 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
@@ -787,12 +642,7 @@ 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 }}
@@ -803,36 +653,29 @@ 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>
@@ -849,11 +692,7 @@ 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>
@@ -862,12 +701,7 @@ 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>
@@ -878,14 +712,7 @@ const saveOrder = async () => {
       <q-card-section class="q-pt-none">
         <div class="col-12 row items-center q-col-gutter-sm">
           <div class="col-12">
-            <q-file
-              outlined
-              dense
-              v-model="files"
-              @added="fileUploadDoc"
-              label="อัพโหลดเอกสาร"
-              lazy-rules
-            >
+            <q-file outlined dense v-model="files" label="อัพโหลดเอกสาร" lazy-rules>
               <!-- :rules="[
                     (val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน',
                   ]" -->
@@ -898,25 +725,14 @@ const saveOrder = async () => {
       </q-card-section>
       <q-card-actions class="text-primary q-py-sm">
         <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>
     </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>
diff --git a/src/modules/05_placement/components/RepatriationOrder/step03.vue b/src/modules/05_placement/components/RepatriationOrder/step03.vue
index 4baeab77f..4532181c5 100644
--- a/src/modules/05_placement/components/RepatriationOrder/step03.vue
+++ b/src/modules/05_placement/components/RepatriationOrder/step03.vue
@@ -86,7 +86,7 @@ const save = () => {
 const validateForm = () => {
   return (
     fileOrder.value !== null &&
-    fileOrder.value !== null &&
+    fileTailer.value !== null &&
     order.value.trim() !== ""
   );
 };