Merge branch 'develop' into devTee

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

@@ -6,7 +6,7 @@ import { useQuasar } from "quasar";
 import config from "@/app.config";
 import http from "@/plugins/http";
 import { useCounterMixin } from "@/stores/mixin";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { QTableProps } from "quasar";
 import type {

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

@@ -7,7 +7,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useComplainstDataStore } from "@/modules/11_discipline/store/ComplaintsStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { OptionData } from "@/modules/07_insignia/interface/index/Main";
 import type { DataOption } from "@/modules/11_discipline/interface/index/Main";

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

@@ -7,7 +7,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateFactStore } from "@/modules/11_discipline/store/InvestigateFactStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { ArrayPersonAdd } from "../../interface/response/investigate";
 import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";

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

@@ -9,7 +9,7 @@ import http from "@/plugins/http";
 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/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { FormData } from "@/modules/11_discipline/interface/request/investigateFact";
 import type { OptionData } from "@/modules/07_insignia/interface/index/Main";

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

@@ -7,7 +7,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useInvestigateDisStore } from "@/modules/11_discipline/store/InvestigateDisStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type {
   PersonsArray,

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

@@ -9,7 +9,7 @@ import config from "@/app.config";
 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/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type {
   FormData,

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

@@ -7,7 +7,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { DataListRow } from "@/modules/11_discipline/interface/request/result";
 import type {

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

@@ -7,7 +7,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useDisciplineResultStore } from "@/modules/11_discipline/store/ResultStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type {
   FormData,

src/modules/11_discipline/components/8_AppealComplain/Form.vue

@@ -8,7 +8,7 @@ import http from "@/plugins/http";
 import config from "@/app.config";
 import { useCounterMixin } from "@/stores/mixin";
 import { useAppealComplainStore } from "@/modules/11_discipline/store/AppealComplainStore";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type {
   MyObjectAppealRef,

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

@@ -2,7 +2,7 @@ import { defineStore } from "pinia";
 import { ref } from "vue";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type { DataOption } from "@/modules/11_discipline/interface/index/Main";
 import type {

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/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 const mainStore = useDisciplineMainStore();
 
 const mixin = useCounterMixin();

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

@@ -3,7 +3,7 @@ import { ref } from "vue";
 import type { QTableProps } from "quasar";
 
 import { useCounterMixin } from "@/stores/mixin";
-import { useDisciplineMainStore } from "@/modules/11_discipline/store/main";
+import { useDisciplineMainStore } from "@/modules/11_discipline/store/Main";
 
 import type {
   DataOption,

src/modules/18_command/components/Main/TableMain.vue

@@ -126,7 +126,7 @@ function onCancel(id: string) {
         .put(config.API.commandAction(id, "cancel"))
         .then(async () => {
           await fetchListCommand();
-          success($q, "ยกเลิกรายการสำเร็จ");
+          success($q, "ลบรายการสำเร็จ");
         })
         .catch((err) => {
           messageError($q, err);
@@ -135,8 +135,8 @@ function onCancel(id: string) {
           hideLoader();
         });
     },
-    "ยืนยันการยกเลิกการออกคำสั่ง",
+    "ยืนยันการลบคำสั่ง",
-    "ต้องการยืนยันการยกเลิกการออกคำสั่งนี้ใช่หรือไม่ ?"
+    "ต้องการยืนยันการลบคำสั่งนี้ใช่หรือไม่?"
   );
 }
 
@@ -180,8 +180,8 @@ function onDeleteCommand(id: string) {
           hideLoader();
         });
     },
-    "ยืนยันการลบคำสั่ง",
+    "ยืนยันการลบคำสั่งออกจากระบบ",
-    "ต้องการยืนยืนยันการลบคำสั่งนี้ใช่หรือไม่ ?"
+    "หากคุณกดยืนยันคำสั่งจะถูกลบออกจากระบบทันที ต้องการยืนยืนยันการลบคำสั่งนี้ใช่หรือไม่?"
   );
 }
 
@@ -241,7 +241,6 @@ onMounted(() => {
                 <q-item
                   clickable
                   v-close-popup
-                  v-if="store.tabsMain !== 'CANCEL'"
                   @click.pervent="onRedirectToDetail('edit', props.row.id)"
                 >
                   <q-item-section>
@@ -296,9 +295,13 @@ onMounted(() => {
 
                 <!-- ยกเลิก ไม่แสดง Tabs ยกเลิก -->
                 <q-item
+                  v-if="
+                    store.tabsMain !== 'WAITING' &&
+                    store.tabsMain !== 'CANCEL' &&
+                    store.tabsMain !== 'REPORTED'
+                  "
                   clickable
                   v-close-popup
-                  v-if="store.tabsMain !== 'CANCEL'"
                   @click.pervent="onCancel(props.row.id)"
                 >
                   <q-item-section>
@@ -309,7 +312,7 @@ onMounted(() => {
                         name="close
                       "
                       />
-                      <div class="q-pl-md">ยกเลิก</div>
+                      <div class="q-pl-md">ลบ</div>
                     </div>
                   </q-item-section>
                 </q-item>

src/modules/18_command/components/Step/0_Main.vue

@@ -0,0 +1,3 @@
+<script setup lang="ts"></script>
+
+<template>ประมวลผลคำสั่ง</template>

src/modules/18_command/views/detail.vue

@@ -6,6 +6,7 @@ import { useCommandDetail } from "@/modules/18_command/store/DetailStore";
 
 import type { ItemTabs } from "@/modules/18_command/interface/index/Main";
 
+import Main from "@/modules/18_command/components/Step/0_Main.vue"; //ประมวลผลคำสั่ง
 import Detail from "@/modules/18_command/components/Step/1_Detail.vue"; //รายละเอียดคำสั่ง
 import ListPersons from "@/modules/18_command/components/Step/2_ListPersons.vue"; //รายชื่อผู้ออกคำสั่ง
 import ReceivedCopy from "@/modules/18_command/components/Step/3_ReceivedCopy.vue"; //รายชื่อผู้ได้รับสำเนาคำสั่ง
@@ -27,16 +28,17 @@ const readonly = ref<boolean>(route.name === "commandViewDetailPage"); //อ่
 const isChangeData = ref<boolean>(false); //การเปลี่ยนแปลงของข้อมูล
 //รายการ Tab ละเอียดคำสั่ง
 const tabsManu = ref<ItemTabs[]>([
+  { label: "ประมวลผลคำสั่ง", name: "Main" },
   { label: "รายละเอียดคำสั่ง", name: "Detail" },
   {
-    label: "รายชื่อผู้ออกคำสั่ง",
+    label: "รายชื่อผู้ได้รับคำสั่ง",
     name: "ListPersons",
   },
   {
     label: "รายชื่อผู้ได้รับสำเนาคำสั่ง",
     name: "ReceivedCopy",
   },
-  { label: "คำสั่งและบัญชีแนบท้าบ", name: "Attached" },
+  { label: "พรีวิวคำสั่ง", name: "Attached" },
 ]);
 
 /**
@@ -116,6 +118,16 @@ onMounted(() => {
       <q-separator />
 
       <q-tab-panels v-model="tabs" animated>
+        <q-tab-panel style="padding: 0px" name="Main">
+          <q-card>
+            <Main
+              ref="childDetailRef"
+              v-model:is-change-data="isChangeData"
+              :on-check-change-data="onCheckChangeData"
+            />
+          </q-card>
+        </q-tab-panel>
+
         <q-tab-panel style="padding: 0px" name="Detail">
           <q-card>
             <Detail

src/modules/18_command/views/lists.vue

@@ -21,10 +21,10 @@ const { showLoader, hideLoader, messageError } = useCounterMixin();
 //รายการ Tab รายการคำสั่ง
 const tabsManu = ref<ItemTabs[]>([
   { label: "แบบร่าง", name: "DRAFT" },
-  { label: "รอผู้มีอำนาจ", name: "PENDING" },
+  { label: "รอผู้มีอำนาจลงนามอนุมัติ", name: "PENDING" },
   { label: "รอออกคำสั่ง", name: "WAITING" },
   { label: "ออกคำสั่งเสร็จสิ้น", name: "REPORTED" },
-  { label: "ยกเลิก", name: "CANCEL" },
+  { label: "ลบ", name: "CANCEL" },
 ]);
 //ฟอร์มช้อมูลการค้นหา
 const queryParams = reactive<FormQuery>({