Merge branch 'develop' of github.com:Frappet/hrms-user into develop

* 'develop' of github.com:Frappet/hrms-user:
  แก้ ฟิลเตอร์
  fix
  ลบปุ่ม
  no message
  แก้แบบมอบหมายงานฯ ไม่เเสดง

src/modules/03_retire/views/addRetire.vue

@@ -219,13 +219,17 @@ onMounted(async () => {
             style="padding-bottom: 0px"
           >
             <div class="q-pl-sm text-grey-7" v-if="dataDetail.cancelReason">
-              เหตุผลการขอยกเลิก:
+              เหตุผลการขอยกเลิก :
               <spen class="text-red">{{ dataDetail.cancelReason }}</spen>
             </div>
 
             <q-space />
             <q-btn
-              v-if="dataDetail.statusMain !== 'CANCEL' && checkCancleLeave"
+              v-if="
+                dataDetail.statusMain !== 'CANCEL' &&
+                dataDetail.statusMain !== 'DONECANCEL' &&
+                checkCancleLeave
+              "
               unelevated
               color="orange"
               label="ยกเลิกการลาออก"
@@ -235,7 +239,8 @@ onMounted(async () => {
 
             <q-btn
               v-else-if="
-                dataDetail.statusMain === 'CANCEL' &&
+                (dataDetail.statusMain === 'CANCEL' ||
+                  dataDetail.statusMain === 'DONECANCEL') &&
                 dataStore.officerType == 'OFFICER'
               "
               unelevated

src/modules/10_registry/04_Achievement/03_Insignia.vue

@@ -23,7 +23,8 @@ const rowsHistoryData = ref<InsigniaFormType[]>([]);
 const $q = useQuasar();
 const mode = ref<boolean>($q.screen.gt.xs);
 const mixin = useCounterMixin();
-const { showLoader, hideLoader, messageError, date2Thai,onSearchDataTable } = mixin;
+const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } =
+  mixin;
 
 const modalHistory = ref<boolean>(false);
 /** ตัวแปรข้อมูล */
@@ -78,6 +79,9 @@ const columns = ref<QTableProps["columns"]>([
     field: "insigniaId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (val, row) => {
+      return `${row.insignia.name} (${row.insignia.shortName})`;
+    },
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -87,6 +91,9 @@ const columns = ref<QTableProps["columns"]>([
     label: "ลำดับชั้น",
     sortable: true,
     field: (v) => v.insignia.insigniaType.name,
+    format: (val, row) => {
+      return `${row.insignia.insigniaType.name}`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>
@@ -278,6 +285,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     field: "insigniaId",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
+    format: (val, row) => {
+      return `${row.insignia.name} (${row.insignia.shortName})`;
+    },
     sort: (a: string, b: string) =>
       a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
   },
@@ -287,6 +297,9 @@ const columnsHistory = ref<QTableProps["columns"]>([
     label: "ลำดับชั้น",
     sortable: true,
     field: (v) => v.insignia.insigniaType.name,
+    format: (val, row) => {
+      return `${row.insignia.insigniaType.name}`;
+    },
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
     sort: (a: string, b: string) =>

src/modules/10_registry/Dialog/DialogHistory.vue

@@ -24,6 +24,7 @@ const props = defineProps({
 });
 function close() {
   modal.value = false;
+  filter.value = ''
 }
 
 function dateThaiRange(val: [Date, Date]) {

src/modules/15_probationReport/components/03_AssignPage.vue

@@ -763,7 +763,7 @@ async function DataSave(id: string) {
 /** get ข้อมูลรายการมอบหมาย */
 async function getAssign() {
   await http
-    .get(config.API.probationsGetAssign(probationStore.assignId))
+    .get(config.API.probationsGetAssignNew(probationStore.assignId))
     .then((res) => {
       isEdit.value = false;
       const data = res.data.result;
@@ -1094,42 +1094,12 @@ onMounted(async () => {
 </script>
 
 <template>
-  <q-form
-    greedy
-    @submit.prevent
-    @validation-success="
-      probationStore.assignId !== undefined
-        ? saveEdit(probationStore.assignId)
-        : saveData(personalId)
-    "
-  >
+  <q-form>
     <div class="q-pa-sm">
       <div class="toptitle text-dark col-12 row items-center">
-        <q-btn
-          icon="mdi-arrow-left"
-          unelevated
-          round
-          dense
-          flat
-          color="primary"
-          class="q-mr-sm"
-          @click="router.go(-1)"
-          v-if="routeName == 'probationWorkAdd'"
-        />
-
-        <div v-if="routeName == 'probationWorkAdd'">
-          เพิ่มแบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ
-        </div>
-        <div v-else class="col-12 row q-gutter-md">
+        <div class="col-12 row q-gutter-md">
           <div>แบบมอบหมายงานการทดลองปฏิบัติหน้าที่ราชการ</div>
-          <q-btn
-            v-if="!isEdit"
-            size="12px"
-            flat
-            dense
-            icon="mdi-download"
-            color="primary"
-          >
+          <q-btn size="12px" flat dense icon="mdi-download" color="primary">
             <q-tooltip>ดาวน์โหลด</q-tooltip>
             <q-menu>
               <q-list style="min-width: 150px">
@@ -1156,50 +1126,6 @@ onMounted(async () => {
               </q-list>
             </q-menu>
           </q-btn>
-
-          <div v-if="!isEdit">
-            <q-btn
-              v-if="
-                !checkRoutePermisson &&
-                probationStore.dataPermissions?.tab1.isEdit
-              "
-              dense
-              flat
-              round
-              color="edit"
-              @click="edit()"
-              icon="edit"
-            >
-              <q-tooltip>แก้ไขข้อมูล</q-tooltip>
-            </q-btn>
-          </div>
-
-          <div v-else>
-            <q-btn
-              v-if="!checkRoutePermisson"
-              dense
-              flat
-              round
-              color="red"
-              @click="cancel()"
-              icon="mdi-undo"
-            >
-              <q-tooltip>ยกเลิก</q-tooltip>
-            </q-btn>
-            <!-- @click="saveEdit(assignId)" -->
-            <q-btn
-              v-if="!checkRoutePermisson"
-              dense
-              flat
-              class="q-ml-md"
-              round
-              color="public"
-              type="submit"
-              icon="mdi-content-save-outline"
-            >
-              <q-tooltip>บันทึกข้อมูล</q-tooltip>
-            </q-btn>
-          </div>
         </div>
       </div>
 
@@ -2889,16 +2815,6 @@ onMounted(async () => {
             </div>
           </div>
         </div>
-        <q-separator v-show="routeName == 'probationWorkAdd'" />
-        <div
-          v-show="routeName == 'probationWorkAdd'"
-          class="flex justify-end q-pa-sm q-gutter-sm"
-        >
-          <q-btn unelevated label="บันทึก" type="submit" color="public"
-            ><q-tooltip>บันทึกข้อมูล</q-tooltip></q-btn
-          >
-        </div>
-        <!-- @click="saveData(personalId)" -->
       </div>
     </div>
   </q-form>

src/modules/15_probationReport/interface/Main.ts

@@ -71,6 +71,13 @@ interface ProbationReportType {
   pass_result: number;
   evaluate_date: Date;
 }
+
+interface FileType{
+  path:string
+  pathname:string
+  fileName:string
+  title:string
+}
 export type {
   ListDataText,
   DataSurvey,
@@ -78,4 +85,5 @@ export type {
   AppointTopicMain,
   AppointTopic,
   ProbationReportType,
+  FileType
 };

src/modules/15_probationReport/views/main.vue

@@ -11,6 +11,7 @@ import { useProbationReport } from "@/modules/15_probationReport/store";
 import type {
   DataSurvey,
   ProbationReportType,
+  FileType,
 } from "@/modules/15_probationReport/interface/Main";
 
 import SurveyPage from "@/modules/15_probationReport/components/01_SurveyPage.vue";
@@ -25,9 +26,12 @@ const { showLoader, hideLoader, messageError } = mixin;
 
 const dataSurvey = ref<any>(null);
 const isData = ref<boolean>(true);
-const dataProbation = ref<string>("");
-const dataResult1 = ref<string>("");
-const dataResult2 = ref<string>("");
+const dataProbation = ref<FileType[]>([]);
+const dataResult1 = ref<FileType[]>([]);
+const dataResult2 = ref<FileType[]>([]);
+// const dataProbation = ref<string>("");
+// const dataResult1 = ref<string>("");
+// const dataResult2 = ref<string>("");
 
 const formDataResult = ref<ProbationReportType>({
   develop_orientation_score: 0,
@@ -115,15 +119,15 @@ async function getSalary(
   id: string,
   name: string,
   group: string,
-  val: Ref<string>
+  val: Ref<FileType[]>
 ) {
   await http
     .get(config.API.developmentSalaryFile(name, group, id))
     .then((res) => {
-      val.value = res.data.fileName;
+      val.value = res.data ? res.data : [];
     })
     .catch((e) => {
-      messageError($q, e);
+      // messageError($q, e);
     });
 }
 
@@ -170,16 +174,20 @@ onMounted(async () => {
           >
             <q-tab name="SURVEY" label="แบบสํารวจความคิดเห็น" />
             <q-tab
-              v-if="dataResult1"
+              v-if="dataResult1.length > 0"
               name="RESULT1"
               label="ผลการประเมินการฯ ครั้งที่ 1"
             />
             <q-tab
-              v-if="dataResult2"
+              v-if="dataResult2.length > 0"
               name="RESULT2"
               label="ผลการประเมินการฯ ครั้งที่ 2"
             />
-            <q-tab v-if="dataProbation" name="ASSIGN" label="แบบมอบหมายงานฯ" />
+            <q-tab
+              v-if="dataProbation.length > 0"
+              name="ASSIGN"
+              label="แบบมอบหมายงานฯ"
+            />
           </q-tabs>
 
           <q-separator />