Merge branch 'develop' into devTee

src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue

@@ -329,6 +329,9 @@ async function fetchDatadetail() {
     formData.persons = props.data.persons ?? [];
     formData.disciplinaryDateStart = props.data.disciplinaryDateStart ?? null;
     formData.disciplinaryDateEnd = props.data.disciplinaryDateEnd ?? null;
+    formData.daysExtend = props.data.daysExtend ?? 0;
+    formData.disciplinaryDateInvestigation = props.data.disciplinaryDateInvestigation ?? null;
+    formData.disciplinaryDateResult = props.data.disciplinaryDateResult ?? null;
     disciplineDisciplinary_DocSummaryEvidences.value =
       props.data.disciplineDisciplinary_DocSummaryEvidences;
     disciplineDisciplinary_DocRecordAccusers.value =
@@ -338,6 +341,9 @@ async function fetchDatadetail() {
     disciplineDisciplinary_DocOthers.value =
       props.data.disciplineDisciplinary_DocOthers;
 
+    disciplineDisciplinary_DocRelevants.value =
+      props.data.disciplineDisciplinary_DocRelevants;
+
     /** MAP รายชื่อกรรมการ หน้าหลัก */
     let datalistDirector: responseType[] = formData.directors.map(
       (e: directorType) => ({
@@ -1292,9 +1298,7 @@ onMounted(async () => {
                               (val) =>
                                 !!val || `${'กรุณาเลือกร้ายแรง/ไม่ร้ายแรง'}`,
                             ]"
-                            :options="
+                            :options="investigateDis.causeTextOptions"
-                              investigateDis.causeTextOptions
-                            "
                             label="ร้ายแรง/ไม่ร้ายแรง"
                             emit-value
                             map-options

src/modules/11_discipline/components/4_Result/DialogSendToCommand.vue

@@ -192,7 +192,7 @@ const fecthTypeOption = async () => {
     .then((res) => {
       optionsType.value = res.data.result.filter(
         (e: OpType) =>
-          e.commandCode === "C-PM-25" || e.commandCode === "C-PM-26"
+          e.commandCode === "C-PM-26" || e.commandCode === "C-PM-27" || e.commandCode === "C-PM-28"
       );
     })
     .catch((e) => {

src/modules/11_discipline/components/7_ListSuspend/DialogHeader.vue

@@ -1,39 +0,0 @@
-<script setup lang="ts">
-/** props*/
-const props = defineProps({
-  title: String,
-  close: {
-    type: Function,
-    default: () => console.log("not function"),
-  },
-});
-
-/**
- * ฟังก์ชั่น close
- */
-const close = async () => {
-  props.close();
-};
-</script>
-<template>
-  <q-toolbar class="q-py-md">
-    <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>
-</template>
-
-<style scoped lang="scss">
-.header-text {
-  font-size: 18px;
-  font-weight: 600;
-  line-height: 26px;
-  color: #35373c;
-}
-</style>

src/modules/11_discipline/components/7_ListSuspend/DialogSendToCommand.vue

@@ -4,7 +4,7 @@ import { useQuasar } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import type { QTableProps } from "quasar";
 import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
-import DialogHeader from "@/modules/11_discipline/components/7_ListSuspend/DialogHeader.vue";
+import DialogHeader from "@/components/DialogHeader.vue";
 import http from "@/plugins/http";
 import config from "@/app.config";
 
@@ -151,7 +151,7 @@ watchEffect(() => {
 <template>
   <q-dialog v-model="props.modal">
     <q-card style="width: 1200px; max-width: 80vw">
-      <DialogHeader title="ส่งไปออกคำสั่ง" :close="closeModal" />
+      <DialogHeader tittle="ส่งไปออกคำสั่ง" :close="closeModal" />
       <q-separator />
       <q-card-section class="q-pt-none">
         <div class="row justify-end">

src/modules/11_discipline/store/InvestigateDisStore.ts

@@ -30,9 +30,9 @@ export const useInvestigateDisStore = defineStore(
 
     const offenseDetailsOps = ref<DataOption[]>([
       { id: "NOT_SPECIFIED", name: "ยังไม่ระบุ" },
-      { id: "NOT_DEADLY", name: "ไม่ร้ายแรง" },
+      { id: "HAVE_CAUSE", name: "มีมูล" },
-      { id: "DEADLY", name: "ร้ายแรง" },
+      { id: "NO_CAUSE", name: "ไม่มีมูล" },
-    ]);
+  ]);
 
     const optionsfaultLevel = ref<DataOptioGroup[]>([
       { id: "0", name: "ไม่ร้ายแรง", disable: true },