Merge branch 'warunee-dev' into develop

src/modules/06_retirement/components/ListRetirement/TableList.vue

@@ -247,8 +247,8 @@ const clickDelete = () => {
           modalNote.value = false;
         });
     })
-    .onCancel(() => {})
+    .onCancel(() => { })
-    .onDismiss(() => {});
+    .onDismiss(() => { });
 };
 // note
 // const fetchReason = async (prop: string) => {
@@ -293,8 +293,8 @@ const saveNote = () => {
           modalNote.value = false;
         });
     })
-    .onCancel(() => {})
+    .onCancel(() => { })
-    .onDismiss(() => {});
+    .onDismiss(() => { });
 };
 
 const UpdateListId = (retireld: string, pId: string) => {
@@ -431,33 +431,18 @@ const paginationLabel = (start: number, end: number, total: number) => {
 
 <template>
   <div class="toptitle text-dark col-12 row items-center">
-    <q-btn
+    <q-btn icon="mdi-arrow-left" unelevated round dense flat color="primary" class="q-mr-sm" @click="backHistory" />
-      icon="mdi-arrow-left"
-      unelevated
-      round
-      dense
-      flat
-      color="primary"
-      class="q-mr-sm"
-      @click="backHistory"
-    />
     รายชื่อผู้เกษียณอายุราชการ
   </div>
   <div>
     <q-card class="col-12 q-pa-md">
       <div class="row col-12 q-pb-sm">
         <div class="row">
-          <AddList
+          <AddList :dataProfile="dataProfile" :retireld="retireld" :profile-id="profileId" :UpdateListId="UpdateListId"
-            :dataProfile="dataProfile"
+            v-if="statusReport === false &&
-            :retireld="retireld"
-            :profile-id="profileId"
-            :UpdateListId="UpdateListId"
-            v-if="
-              statusReport === false &&
               (typeReport == 'ADD' || typeReport == '' || typeReport == null) &&
               statusUpload !== true
-            "
+              " />
-          />
 
           <!-- <q-btn flat round style="color: #016987;" icon="save" @click="saveList">
           <q-tooltip>บันทึกข้อมูล</q-tooltip>
@@ -465,104 +450,45 @@ const paginationLabel = (start: number, end: number, total: number) => {
           <q-btn color="primary" flat round icon="mdi-dots-vertical">
             <q-menu>
               <q-list style="min-width: 100px">
-                <q-item
+                <q-item clickable v-close-popup type="a" @click="openmodalEditReport()" target="_blank">
-                  clickable
+                  <q-item-section avatar><q-icon color="primary" name="mdi-pencil" /></q-item-section>
-                  v-close-popup
-                  type="a"
-                  @click="openmodalEditReport()"
-                  target="_blank"
-                >
-                  <q-item-section avatar
-                    ><q-icon color="primary" name="mdi-pencil"
-                  /></q-item-section>
                   <q-item-section>แก้ไข มติ อ.ก.ก. </q-item-section>
                 </q-item>
                 <q-separator />
-                <q-item
+                <q-item clickable v-close-popup type="a" @click="downloadAttachment('pdf', retireld)" target="_blank">
-                  clickable
+                  <q-item-section avatar><q-icon color="red" name="mdi-file-pdf" /></q-item-section>
-                  v-close-popup
-                  type="a"
-                  @click="downloadAttachment('pdf', retireld)"
-                  target="_blank"
-                >
-                  <q-item-section avatar
-                    ><q-icon color="red" name="mdi-file-pdf"
-                  /></q-item-section>
                   <q-item-section>ไฟล์ .PDF</q-item-section>
                 </q-item>
-                <q-item
+                <q-item clickable v-close-popup type="a" @click="downloadAttachment('docx', retireld)" target="_blank">
-                  clickable
+                  <q-item-section avatar><q-icon color="blue" name="mdi-file-word" /></q-item-section>
-                  v-close-popup
-                  type="a"
-                  @click="downloadAttachment('docx', retireld)"
-                  target="_blank"
-                >
-                  <q-item-section avatar
-                    ><q-icon color="blue" name="mdi-file-word"
-                  /></q-item-section>
                   <q-item-section>ไฟล์ .docx</q-item-section>
                 </q-item>
               </q-list>
             </q-menu>
             <q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
           </q-btn>
-          <q-file
+          <q-file bg-color="white" clearable outlined dense v-model="fileUpload" accept=".pdf"
-            bg-color="white"
+            :style="fileUpload === null ? 'width: 150px' : 'width: auto'" label="อัปโหลดไฟล์"
-            clearable
+            v-if="statusUpload !== true">
-            outlined
-            dense
-            v-model="fileUpload"
-            accept=".pdf"
-            :style="fileUpload === null ? 'width: 150px' : 'width: auto'"
-            label="อัปโหลดไฟล์"
-            v-if="statusUpload !== true"
-          >
             <template v-slot:prepend>
               <q-icon color="light-blue" name="attach_file" />
               <q-tooltip>อัปโหลดไฟล์</q-tooltip>
             </template>
           </q-file>
-          <q-btn
+          <q-btn flat round color="light-blue" icon="upload" @click="uploadFile(fileUpload)" v-if="fileUpload !== null" />
-            flat
-            round
-            color="light-blue"
-            icon="upload"
-            @click="uploadFile(fileUpload)"
-            v-if="fileUpload !== null"
-          />
         </div>
         <q-space />
         <div class="row">
           <q-tabs shrink>
-            <q-input
+            <q-input borderless outlined dense debounce="300" v-model="filter" placeholder="ค้นหา"
-              borderless
+              style="max-width: 200px" class="q-ml-sm">
-              outlined
-              dense
-              debounce="300"
-              v-model="filter"
-              placeholder="ค้นหา"
-              style="max-width: 200px"
-              class="q-ml-sm"
-            >
               <template v-slot:append>
                 <q-icon name="search" />
               </template>
             </q-input>
-            <q-select
+            <q-select v-model="visibleColumns" multiple outlined dense options-dense
-              v-model="visibleColumns"
+              :display-value="$q.lang.table.columns" emit-value map-options :options="columns" option-value="name"
-              multiple
+              options-cover style="min-width: 150px" class="gt-xs q-ml-sm">
-              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="gt-xs q-ml-sm"
-            >
               <!-- <template v-slot:option="{ opt }">
                 <div>{{ opt.label }}</div>
                 <div class="sublabel">{{ opt.sublabel }}</div>
@@ -573,20 +499,9 @@ const paginationLabel = (start: number, end: number, total: number) => {
       </div>
 
       <div>
-        <q-table
+        <q-table flat dense bordered :rows="rows" :columns="columns" row-key="order" class="custom-header-table"
-          flat
+          :filter="filter" :visible-columns="visibleColumns" no-data-label="ไม่มีข้อมูล"
-          dense
+          :pagination-label="paginationLabel" v-model:pagination="pagination">
-          bordered
-          :rows="rows"
-          :columns="columns"
-          row-key="order"
-          class="custom-header-table"
-          :filter="filter"
-          :visible-columns="visibleColumns"
-          no-data-label="ไม่มีข้อมูล"
-          :pagination-label="paginationLabel"
-          v-model:pagination="pagination"
-        >
           <template v-slot:header="props">
             <q-tr :props="props">
               <q-th v-for="col in props.cols" :key="col.name" :props="props">
@@ -598,46 +513,30 @@ const paginationLabel = (start: number, end: number, total: number) => {
                 </div>
               </q-th>
               <q-th auto-width />
-              <q-th
+              <q-th auto-width v-if="(typeReport === 'EDIT' ||
-                auto-width
+                typeReport === null ||
-                v-if="
+                typeReport === '') &&
-                  (typeReport === 'EDIT' ||
+                statusReport === false &&
-                    typeReport === null ||
+                statusUpload !== true
-                    typeReport === '') &&
+                " />
-                  statusReport === false &&
+              <q-th auto-width v-if="(typeReport === 'REMOVE' ||
-                  statusUpload !== true
+                typeReport === null ||
-                "
+                typeReport === '') &&
-              />
+                statusReport === false &&
-              <q-th
+                statusUpload !== true
-                auto-width
+                " />
-                v-if="
-                  (typeReport === 'REMOVE' ||
-                    typeReport === null ||
-                    typeReport === '') &&
-                  statusReport === false &&
-                  statusUpload !== true
-                "
-              />
             </q-tr>
           </template>
           <template v-slot:body="props">
-            <q-tr
+            <q-tr :props="props" class="cursor-pointer" :style="props.row.profileId === profileId && 'color: #26a69a;'"
-              :props="props"
+              @click.stop="router.push(`/registry/${props.row.profileId}`)">
-              class="cursor-pointer"
-              :style="props.row.profileId === profileId && 'color: #26a69a;'"
-              @click.stop="router.push(`/registry/${props.row.profileId}`)"
-            >
               <q-td key="order" :props="props">{{ props.row.order }} </q-td>
               <!-- <q-td key="fixname" :props="props">{{ props.row.fixname }}</q-td> -->
               <q-td key="name" :props="props">{{
                 props.row.fixname + props.row.name
               }}</q-td>
-              <q-td
+              <q-td class="table_ellipsis" key="organizationOrganization" :props="props">{{
-                class="table_ellipsis"
+                props.row.organizationOrganization }}</q-td>
-                key="organizationOrganization"
-                :props="props"
-                >{{ props.row.organizationOrganization }}</q-td
-              >
               <q-td key="positionType" :props="props">{{
                 props.row.positionType
               }}</q-td>
@@ -659,96 +558,40 @@ const paginationLabel = (start: number, end: number, total: number) => {
               <q-td class="table_ellipsis" key="bureau" :props="props">{{
                 props.row.bureau
               }}</q-td>
-              <q-td>
-                <!-- <q-btn
-                  :props="props"
-                  flat
-                  round
-                  class="text-teal-5"
-                  icon="mdi-note"
-                  dense
-                  v-if="retireld_params !== undefined"
-                  @click="
-                    fetchReason(props.row.id), (modalNote = true), (note = '')
-                  "
-                >
-                  <q-tooltip>โน้ต</q-tooltip></q-btn
-                > -->
-                <!-- <q-btn
-                  flat
-                  round
-                  color="blue"
-                  dense
-                  icon="mdi-file-account"
-                  @click.stop="router.push(`/registry/${props.row.profileId}`)"
-                >
-                  <q-tooltip>ดูข้อมูลทะเบียนประวัติ</q-tooltip>
-                </q-btn> -->
-              </q-td>
 
-              <q-td
+              <q-td auto-width v-if="(typeReport === 'EDIT' ||
-                auto-width
-                v-if="
-                  (typeReport === 'EDIT' ||
                     typeReport === null ||
                     typeReport === '') &&
                   statusReport === false &&
                   statusUpload !== true
-                "
+                  ">
-              >
+                <q-btn flat round color="primary" icon="mdi-pencil" dense @click.stop="
-                <q-btn
+                  (modalNote = true),
-                  flat
+                  (note = props.row.reason),
-                  round
+                  (action = 'edit'),
-                  color="primary"
+                  (retireProfileId = props.row.id)
-                  icon="mdi-pencil"
+                  ">
-                  dense
-                  @click.stop="
-                    (modalNote = true),
-                      (note = props.row.reason),
-                      (action = 'edit'),
-                      (retireProfileId = props.row.id)
-                  "
-                >
                   <q-tooltip>กรอกเหตุผล</q-tooltip>
                 </q-btn>
               </q-td>
-              <q-td
+              <q-td auto-width v-if="(typeReport === 'REMOVE' ||
-                auto-width
+                typeReport === null ||
-                v-if="
+                typeReport === '') &&
-                  (typeReport === 'REMOVE' ||
+                statusReport === false &&
-                    typeReport === null ||
+                statusUpload !== true
-                    typeReport === '') &&
+                ">
-                  statusReport === false &&
+                <q-btn flat round class="text-red-14" icon="mdi-delete" dense @click.stop="
-                  statusUpload !== true
+                  (modalNote = true),
-                "
+                  (action = 'delete'),
-              >
+                  (note = props.row.reason),
-                <q-btn
+                  (retireProfileId = props.row.id)
-                  flat
+                  "><q-tooltip>ลบข้อมูล</q-tooltip></q-btn>
-                  round
-                  class="text-red-14"
-                  icon="mdi-delete"
-                  dense
-                  @click.stop="
-                    (modalNote = true),
-                      (action = 'delete'),
-                      (note = props.row.reason),
-                      (retireProfileId = props.row.id)
-                  "
-                  ><q-tooltip>ลบข้อมูล</q-tooltip></q-btn
-                >
               </q-td>
             </q-tr>
           </template>
           <template v-slot:pagination="scope">
-            <q-pagination
+            <q-pagination v-model="pagination.page" color="primary" :max="scope.pagesNumber" :max-pages="5" size="sm"
-              v-model="pagination.page"
+              boundary-links direction-links></q-pagination>
-              color="primary"
-              :max="scope.pagesNumber"
-              :max-pages="5"
-              size="sm"
-              boundary-links
-              direction-links
-            ></q-pagination>
           </template>
         </q-table>
       </div>
@@ -757,49 +600,29 @@ const paginationLabel = (start: number, end: number, total: number) => {
 
   <!-- note -->
   <q-dialog v-model="modalNote">
-    <q-card style="width: 700px; max-width: 80vw">
+    <q-card style="width: 50vw;">
-      <q-card-section class="q-pt-none">
+      <DialogHeader tittle="กรอกเหตุผล" :close="closeDialog" />
-        <DialogHeader tittle="กรอกเหตุผล" :close="closeDialog" />
+      <q-separator />
-      </q-card-section>
       <q-card-section class="q-pt-none bg-grey-1">
-        <q-input
+        <div class="row q-col-gutter-sm">
-          outlined
+          <div class="col-12">
-          dense
+
-          lazy-rules
+            <q-input outlined dense lazy-rules v-model="note" :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
-          v-model="note"
+              :label="`${'กรอกเหตุผล'}`" type="textarea" />
-          :rules="[(val) => !!val || 'กรุณากรอกเหตุผล']"
+
-          :label="`${'กรอกเหตุผล'}`"
+          </div>
-          type="textarea"
+        </div>
-        />
       </q-card-section>
 
       <q-card-actions align="right">
-        <q-btn
+        <q-btn v-if="action === 'delete'" label="บันทึก" color="secondary" :disable="visibleNote" @click="clickDelete" />
-          v-if="action === 'delete'"
+        <q-btn v-else label="บักทึก" color="secondary" @click="saveNote" :disable="visibleNote" />
-          label="บันทึก"
-          color="secondary"
-          :disable="visibleNote"
-          @click="clickDelete"
-        />
-        <q-btn
-          v-else
-          label="บักทึก"
-          color="secondary"
-          @click="saveNote"
-          :disable="visibleNote"
-        />
       </q-card-actions>
     </q-card>
   </q-dialog>
 
-  <DialogPopupReason
+  <DialogPopupReason :modal="modalEdit" title="แก้ไขมติ อ.ก.ก." label="มติ อ.ก.ก." :click-close="closemodalEditReport"
-    :modal="modalEdit"
+    :savaForm="saveEdiitReport" :textReport="textReport" />
-    title="แก้ไขมติ อ.ก.ก."
-    label="มติ อ.ก.ก."
-    :click-close="closemodalEditReport"
-    :savaForm="saveEdiitReport"
-    :textReport="textReport"
-  />
 </template>
 
 <style lang="scss" scope>