Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/11_discipline/components/4_Result/Form.vue
#	src/modules/11_discipline/store/ResultStore.ts

src/modules/11_discipline/components/1_Complaint/EditPage.vue

@@ -15,7 +15,7 @@ import type {
 } from "@/modules/11_discipline/interface/request/complaint";
 import { useCounterMixin } from "@/stores/mixin";
 import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 
 const complainstStore = useComplainstDataStore();
 const mainStore = useDisciplineMainStore();
@@ -378,3 +378,4 @@ onMounted(() => {
     />
   </div>
 </template>
+@/modules/11_discipline/store/store

src/modules/11_discipline/components/1_Complaint/Form.vue

@@ -12,7 +12,7 @@ import type {
 /** importStroe*/
 import { useCounterMixin } from "@/stores/mixin";
 import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 
 import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
 import config from "@/app.config";
@@ -366,7 +366,7 @@ onMounted(() => {
           <q-card bordered>
             <div class="col-12 row q-pa-md">
               <div class="col-xs-12 col-sm-12 row q-col-gutter-md">
-                <div class="col-xs-12 col-sm-3" id="respondentType">
+                <div class="col-xs-12 col-sm-4" id="respondentType">
                   <q-select
                     for="SelectrespondentType"
                     v-model="formData.respondentType"
@@ -400,7 +400,7 @@ onMounted(() => {
                 </div>
 
                 <div
-                  class="col-xs-12 col-sm-3"
+                  class="col-xs-12 col-sm-4"
                   v-if="formData.respondentType === 'ORGANIZATION'"
                   id="organizationId"
                 >
@@ -425,7 +425,7 @@ onMounted(() => {
                   />
                 </div>
 
-                <div class="col-xs-12 col-sm-3" id="consideredAgency">
+                <div class="col-xs-12 col-sm-4" id="consideredAgency">
                   <q-select
                     ref="consideredAgencyRef"
                     for="selectAgency"
@@ -997,3 +997,4 @@ onMounted(() => {
   min-height: 25px;
 }
 </style>
+@/modules/11_discipline/store/store

src/modules/11_discipline/components/1_Complaint/TableComplaint.vue

@@ -4,7 +4,7 @@ import { ref, onMounted, watch } from "vue";
 import type { QTableProps } from "quasar";
 // importStroe
 import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
-import { useRoute, useRouter } from "vue-router";
+import { useRouter } from "vue-router";
 const currentPage = ref<number>(1);
 const router = useRouter();
 const complainstStore = useComplainstDataStore();

src/modules/11_discipline/components/2_InvestigateFacts/EditPage.vue

@@ -5,7 +5,7 @@ import FormInvestigatefacts from "@/modules/11_discipline/components/2_Investiga
 import { useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 import { useQuasar } from "quasar";
 import PopupSendToNext from "@/modules/11_discipline/components/PopupSendToNext.vue";
 import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
@@ -14,7 +14,6 @@ import type {
   ArrayPerson,
   ArrayFileList,
 } from "@/modules/11_discipline/interface/request/complaint";
-import type { QTableProps } from "quasar";
 
 import config from "@/app.config";
 import http from "@/plugins/http";
@@ -382,4 +381,4 @@ watch(
   padding: 0;
   background-color: #f0f3f3;
 }
-</style>
+</style>

src/modules/11_discipline/components/2_InvestigateFacts/Form.vue

@@ -2,14 +2,13 @@
 import { useRouter, useRoute } from "vue-router";
 import { onMounted, ref, watch, reactive, computed } from "vue";
 import { useQuasar } from "quasar";
-import type { QTableProps } from "quasar";
 import DialogDirector from "@/modules/11_discipline/components/DialogDirector.vue";
 import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
-import Table from "@/modules/11_discipline/components/3_InvestigateDisciplinary/DirectorTable.vue";
+import Table from "@/modules/11_discipline/components/DirectorTable.vue";
 import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 
 import type {
   FormData,
@@ -1333,3 +1332,4 @@ onMounted(async () => {
   min-height: 25px;
 }
 </style>
+@/modules/11_discipline/store/store

src/modules/11_discipline/components/2_InvestigateFacts/MainPage.vue

@@ -11,15 +11,8 @@ import http from "@/plugins/http";
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
 const dataInvestigate = useInvestigateFactStore();
 const mixin = useCounterMixin();
-const {
-  date2Thai,
-  success,
-  messageError,
-  showLoader,
-  hideLoader,
-  dialogConfirm,
-  dialogRemove,
-} = mixin;
+const { messageError, showLoader, hideLoader } = mixin;
+
 const $q = useQuasar(); //ใช้ noti quasar
 
 /** ค้นหาข้อมูลในตาราง */

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

@@ -5,7 +5,6 @@ import { useRouter, useRoute } from "vue-router";
 import type { QTableProps } from "quasar";
 import http from "@/plugins/http";
 import config from "@/app.config";
-import DialogDirector from "@/modules/11_discipline/components/DialogDirector.vue";
 /**import component*/
 import FormComplaints from "@/modules/11_discipline/components/1_Complaint/Form.vue"; //เรื่องร้องเรียน
 import FormInvestigatefacts from "@/modules/11_discipline/components/2_InvestigateFacts/Form.vue"; //สืบสวนข้อเท็จจริง

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

@@ -24,15 +24,14 @@ import type { DataOptionRes } from "@/modules/11_discipline/interface/response/M
 /** import components*/
 import DialogAddPersonal from "@/components/Dialogs/AddPersonal.vue";
 import DialogDirector from "@/modules/11_discipline/components/DialogDirector.vue";
-import Table from "@/modules/11_discipline/components/3_InvestigateDisciplinary/DirectorTable.vue";
+import Table from "@/modules/11_discipline/components/DirectorTable.vue";
 import UploadFile from "@/modules/11_discipline/components/UploadFile.vue";
 
 /** import store*/
 import { useCounterMixin } from "@/stores/mixin";
 import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
 import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
-import { co } from "@fullcalendar/core/internal-common";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 
 const complainstStore = useComplainstDataStore();
 const investigateDis = useInvestigateDisStore();
@@ -1388,3 +1387,4 @@ onMounted(async () => {
   />
   <!-- :fecthlistappointment="fecthlistappointment" -->
 </template>
+@/modules/11_discipline/store/store

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

@@ -8,7 +8,7 @@ import { useRouter, useRoute } from "vue-router";
 import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
 import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 
 import type {
   FormData,
@@ -144,7 +144,6 @@ watch(
   async () => {
     console.log(props.data);
     respondentType.value = props.data.respondentType;
-    mainStore.rowsAdd = props.data.persons
     await fetchDatadetail();
     await fetchOrganization();
   }

src/modules/11_discipline/interface/request/complaint.ts

@@ -33,6 +33,7 @@ interface ArrayPerson {
     salary:number|null
     organization:string
 }
+
 interface ArrayFileList {
     id:string
     pathName:string

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

@@ -10,7 +10,7 @@ import type {
 } from "@/modules/11_discipline/interface/response/complaint";
 import type { ArrayPerson } from "@/modules/11_discipline/interface/request/complaint";
 import type { QTableProps } from "quasar";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 const mainStore = useDisciplineMainStore();
 
 const mixin = useCounterMixin();

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

@@ -12,7 +12,7 @@ import type {
   ListData,
   ocListType,
 } from "@/modules/11_discipline/interface/response/investigate";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
 const mainStore = useDisciplineMainStore();
 
 const mixin = useCounterMixin();

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

@@ -12,8 +12,13 @@ import type {
 } from "@/modules/11_discipline/interface/response/result";
 import { useCounterMixin } from "@/stores/mixin";
 
+<<<<<<< HEAD
 import { useDisciplineMainStore } from "@/modules/11_discipline/store";
 
+=======
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useCounterMixin } from "@/stores/mixin";
+>>>>>>> develop
 const mixin = useCounterMixin();
 const storeMain = useDisciplineMainStore();
 const { date2Thai } = mixin;
@@ -251,7 +256,6 @@ export const useDisciplineResultStore = defineStore(
       fetchList,
       rows,
       rows2,
-      fecthDirector,
       visibleColumns,
       columns,
       visibleColumnsDirector,