Merge branch 'develop' into nice_dev

# Conflicts:
#	src/modules/02_organizationalNew/views/main.vue

.gitignore

@@ -26,3 +26,5 @@ coverage
 *.njsproj
 *.sln
 *.sw?
+
+package-lock.json

package.json

@@ -33,7 +33,7 @@
     "pinia": "^2.0.29",
     "quasar": "^2.11.1",
     "structure-chart": "^0.0.9",
-    "vue": "^3.2.45",
+    "vue": "^3.4.15",
     "vue-currency-input": "^3.0.5",
     "vue-router": "^4.1.6",
     "vue3-datepicker": "^0.3.4",

src/modules/01_metadataNew/components/insignia/InsigniaDetail.vue

@@ -1,15 +1,120 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
-import { useRouter } from "vue-router";
+import { useRouter, useRoute } from "vue-router";
-import InsigniaDetail from "@/modules/01_metadataNew/components/insignia/InsigniaList.vue";
+import InsigniaList from "@/modules/01_metadataNew/components/insignia/InsigniaList.vue";
-
 const router = useRouter();
-
+const route = useRoute();
 const nameType = ref<string>("");
+import { useCounterMixin } from "@/stores/mixin";
+import type {
+  DetailResponse,
+  DetailRow,
+} from "@/modules/01_metadataNew/interface/response/insignia/Insignia";
 
+const row = ref<DetailRow[]>();
+const mixin = useCounterMixin();
+const { date2Thai } = mixin;
+const id = ref<string>(route.params.id.toString());
 function fetchName(name: string) {
   nameType.value = name;
 }
+
+const data = ref<DetailResponse[]>([
+  {
+    id: "1",
+    level: 1,
+    shortName: "จ.ม.",
+    insigniaType: "ชั้นต่ำกว่าสายสะพาย",
+    insigniaTypeId: "1",
+    note: "-",
+    name: "จัตุรถาภรณ์มงกุฎไทย",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "System Administrator",
+    isActive: true,
+  },
+  {
+    id: "2",
+    level: 1,
+    shortName: "จ.ช.",
+    insigniaType: "ชั้นต่ำกว่าสายสะพาย",
+    insigniaTypeId: "1",
+    note: "-",
+    name: "จัตุรถาภรณ์ช้างเผือก",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+    isActive: false,
+  },
+  {
+    id: "1",
+    level: 1,
+    shortName: "บ.ม.",
+    insigniaType: "ชั้นสายสะพาย",
+    insigniaTypeId: "2",
+    note: "-",
+    name: "เบญจมาภรณ์มงกุฎไทย",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+    isActive: true,
+  },
+  {
+    id: "2",
+    level: 1,
+    shortName: "ท.ม.",
+    insigniaType: "ชั้นสายสะพาย",
+    insigniaTypeId: "2",
+    note: "-",
+    name: "ทวีติยาภรณ์มงกุฎไทย",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+    isActive: true,
+  },
+  {
+    id: "1",
+    level: 1,
+    shortName: "บ.ช.",
+    insigniaType: "เหรียญบำเหน็จในราชการ",
+    insigniaTypeId: "3",
+    note: "-",
+    name: "เบญจมาภรณ์ช้างเผือก",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "สาวิตรี ศรีสมัย",
+    isActive: true,
+  },
+  {
+    id: "2",
+    level: 1,
+    shortName: "ท.ม.",
+    insigniaType: "เหรียญบำเหน็จในราชการ",
+    insigniaTypeId: "3",
+    note: "-",
+    name: "ทวีติยาภรณ์มงกุฎไทย",
+    createdAt: new Date(),
+    lastUpdatedAt: new Date(),
+    lastUpdateFullName: "System Administrator",
+    isActive: true,
+  },
+]);
+
+function fetchData() {
+  const datafilter = data.value.find((e) => e.insigniaTypeId === id.value);
+  console.log(datafilter);
+  datafilter && fetchName(datafilter.insigniaType);
+  const list = data.value.map((e) => ({
+    ...e,
+    createdAt: e.createdAt ? date2Thai(e.createdAt) : "",
+    lastUpdatedAt: e.lastUpdatedAt ? date2Thai(e.lastUpdatedAt) : "",
+  }));
+  row.value = list.filter((e) => e.insigniaTypeId === id.value);
+}
+
+onMounted(() => {
+  fetchData();
+});
 </script>
 <template>
   <div class="toptitle text-dark col-12 row items-center">
@@ -27,7 +132,11 @@ function fetchName(name: string) {
   </div>
 
   <q-card flat bordered>
-    <InsigniaDetail @update:fetchName="fetchName" />
+    <InsigniaList
+      :data="row"
+      @update:fetchName="fetchName"
+      :nameType="nameType"
+    />
   </q-card>
 </template>
 

src/modules/01_metadataNew/components/insignia/InsigniaList.vue

@@ -1,12 +1,15 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useRouter } from "vue-router";
+import dialogHeader from "@/components/DialogHeader.vue";
+import { useQuasar } from "quasar";
 
 const router = useRouter();
 const mixin = useCounterMixin();
-const { date2Thai, dialogRemove } = mixin;
+const { date2Thai, dialogRemove, dialogConfirm } = mixin;
+const $q = useQuasar();
 const columns = ref<QTableProps["columns"]>([
   {
     name: "level",
@@ -123,8 +126,9 @@ const isActive = ref<boolean>(false);
 const name = ref<string>("");
 const shortName = ref<string>("");
 const note = ref<string>("");
-const insigniaTypeId = ref<string>("บำเหน็จ");
+const insigniaTypeId = ref<string>("");
-
+const nameRef = ref<any>(null);
+const shortNameRef = ref<any>(null);
 const dialogStatus = ref<string>("");
 const visibleColumns = ref<string[]>([
   "level",
@@ -138,30 +142,36 @@ const visibleColumns = ref<string[]>([
   "note",
 ]);
 
-const row = ref([
+const props = defineProps({
-  {
+  data: { type: Object },
-    level: 1,
+  nameType: { type: String },
-    shortName: "เทส",
+});
-    insigniaType: "บำเหน็จ",
+
-    note: "-",
+function closeDialog() {
-    name: "testInside1",
+  dialog.value = false;
-    createdAt: date2Thai(new Date()),
+}
-    lastUpdatedAt: date2Thai(new Date()),
+
-    lastUpdateFullName: "TestTest",
+function validateForm() {
-    isActive: true,
+  nameRef.value.validate();
-  },
+  shortNameRef.value.validate();
-  {
+  onSubmit();
-    level: 2,
+}
-    shortName: "เทส2",
+
-    insigniaType: "บำนาญ",
+async function onSubmit() {
-    note: "-",
+  if (name.value.length > 0 && shortName.value.length > 0) {
-    name: "testInside2",
+    dialogConfirm(
-    createdAt: date2Thai(new Date()),
+      $q,
-    lastUpdatedAt: date2Thai(new Date()),
+      async () => {
-    lastUpdateFullName: "TestTest",
+        console.log("สำเร็จ");
-    isActive: false,
+        closeDialog();
-  },
+        name.value = "";
-]);
+        shortName.value = "";
+      },
+      "ยืนยันการบันทึกข้อมูล",
+      "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+    );
+  }
+}
 </script>
 
 <template>
@@ -204,7 +214,7 @@ const row = ref([
     <d-table
       ref="table"
       :columns="columns"
-      :rows="row"
+      :rows="props.data"
       :filter="filterKeyword"
       row-key="name"
       flat
@@ -292,52 +302,164 @@ const row = ref([
     </d-table>
 
     <q-dialog v-model="dialog" class="dialog" persistent>
-      <q-card style="width: 400px">
+      <q-card style="min-width: 350px" class="bg-grey-11">
-        <q-card-section class="flex justify-between">
+        <form @submit.prevent="validateForm">
-          <div v-if="dialogStatus == 'edit'" class="text-h6">แก้ไข</div>
+          <q-card-section class="flex justify-between" style="padding: 0">
-          <div v-else class="text-h6">เพิ่ม</div>
+            <dialog-header
-          <q-btn flat v-close-popup round dense icon="close" color="red" />
+              :tittle="dialogStatus == 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
-        </q-card-section>
+              :close="closeDialog"
+            />
+          </q-card-section>
 
-        <q-card-section class="q-pt-none q-gutter-md">
+          <q-separator color="grey-4" />
-          <q-input
+          <q-card-section class="q-pa-none">
-            outlined
+            <q-input
-            v-model="insigniaTypeId"
+              outlined
-            label="ลำดับชั้นเครื่องราชฯ"
+              :model-value="nameType"
-            dense
+              label="ลำดับชั้นเครื่องราชฯ"
-            readonly
+              dense
-          />
+              lazy-rules
-          <q-input outlined v-model="name" label="ชื่อเครื่องราชฯ" dense />
+              borderless
-          <q-input outlined v-model="shortName" label="ชื่อย่อ" dense />
+              class="col-12 bg-white q-ma-md"
-          <q-input
+              hide-bottom-space
-            outlined
+              readonly
-            v-model="note"
+            />
-            type="textarea"
+            <q-input
-            label="หมายเหตุ"
+              ref="nameRef"
-            dense
+              outlined
-          />
+              v-model="name"
-          <div class="row justify-between q-mt-md">
+              label="ชื่อเครื่องราช"
-            <span class="text-bold"> สถานะการใช้งาน </span>
+              dense
-            <q-toggle v-model="isActive" dense />
+              lazy-rules
-          </div>
+              borderless
-        </q-card-section>
+              class="col-12 bg-white q-ma-md"
+              :rules="[
+                (val) => val.length > 0 || 'กรุณากรอกลำดับชั้นเครื่องราชฯ',
+              ]"
+              hide-bottom-space
+            />
+            <q-input
+              ref="shortNameRef"
+              outlined
+              v-model="shortName"
+              label="ชื่อย่อ"
+              dense
+              lazy-rules
+              borderless
+              class="col-12 bg-white q-ma-md"
+              :rules="[
+                (val) => val.length > 0 || 'กรุณากรอกลำดับชั้นเครื่องราชฯ',
+              ]"
+              hide-bottom-space
+            />
+            <q-input
+              outlined
+              v-model="note"
+              label="หมายเหตุ"
+              dense
+              type="textarea"
+              borderless
+              class="col-12 bg-white q-ma-md"
+              hide-bottom-space
+            />
+            <div
+              class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
+            >
+              <div class="row items-center q-my-sm justify-between">
+                <p class="q-ma-none">สถานะการใช้งาน</p>
+                <label class="toggle-control">
+                  <input type="checkbox" dense v-model="isActive" @change="" />
+                  <span class="control"></span>
+                </label>
+              </div>
+            </div>
+          </q-card-section>
 
-        <q-card-actions align="right">
+          <q-card-actions align="right">
-          <q-btn
+            <q-btn
-            flat
+              id="onSubmit"
-            label="ตกลง"
+              type="submit"
-            color="primary"
+              dense
-            v-close-popup
+              unelevated
-            @click="
+              label="บันทึก"
-              () => {
+              color="public"
-                (name = ''), (isActive = false);
+              class="q-px-md"
-              }
+            >
-            "
+              <q-tooltip>บันทึกข้อมูล</q-tooltip>
-          />
+            </q-btn>
-        </q-card-actions>
+          </q-card-actions>
+        </form>
       </q-card>
     </q-dialog>
   </div>
 </template>
 
-<style></style>
+<style scoped lang="scss">
+.border_custom {
+  border-radius: 6px !important;
+  border: 1px solid #e1e1e1;
+}
+$toggle-background-color-on: #06884d;
+$toggle-background-color-off: darkgray;
+$toggle-control-color: white;
+$toggle-width: 40px;
+$toggle-height: 25px;
+$toggle-gutter: 3px;
+$toggle-radius: 50%;
+$toggle-control-speed: 0.15s;
+$toggle-control-ease: ease-in;
+
+// These are our computed variables
+// change at your own risk.
+$toggle-radius: $toggle-height / 2;
+$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
+
+.toggle-control {
+  display: block;
+  position: relative;
+  padding-left: $toggle-width;
+  margin-bottom: 12px;
+  cursor: pointer;
+  font-size: 22px;
+  user-select: none;
+
+  input {
+    position: absolute;
+    opacity: 0;
+    cursor: pointer;
+    height: 0;
+    width: 0;
+  }
+
+  input:checked ~ .control {
+    background-color: $toggle-background-color-on;
+
+    &:after {
+      left: $toggle-width - $toggle-control-size - $toggle-gutter;
+    }
+  }
+
+  .control {
+    position: absolute;
+    top: -7px;
+    left: -15px;
+    height: $toggle-height;
+    width: $toggle-width;
+    border-radius: $toggle-radius;
+    background-color: $toggle-background-color-off;
+    transition: background-color $toggle-control-speed $toggle-control-ease;
+
+    &:after {
+      content: "";
+      position: absolute;
+      left: $toggle-gutter;
+      top: $toggle-gutter;
+      width: $toggle-control-size;
+      height: $toggle-control-size;
+      border-radius: $toggle-radius;
+      background: $toggle-control-color;
+      transition: left $toggle-control-speed $toggle-control-ease;
+    }
+  }
+}
+</style>

src/modules/01_metadataNew/components/insignia/InsigniaType.vue

@@ -1,12 +1,16 @@
 <script setup lang="ts">
-import { ref } from "vue";
+import { ref, onMounted } from "vue";
 import type { QTableProps } from "quasar";
 import { useCounterMixin } from "@/stores/mixin";
 import { useRouter } from "vue-router";
+import { useInsigniaDataStore } from "@/modules/01_metadataNew/stores/InsigniaStore";
+import dialogHeader from "@/components/DialogHeader.vue";
+import { useQuasar } from "quasar";
 
+const store = useInsigniaDataStore();
 const router = useRouter();
 const mixin = useCounterMixin();
-const { date2Thai, dialogRemove } = mixin;
+const { dialogRemove, dialogConfirm } = mixin;
 const columns = ref<QTableProps["columns"]>([
   {
     name: "name",
@@ -65,11 +69,13 @@ const columns = ref<QTableProps["columns"]>([
   },
 ]);
 
+const $q = useQuasar();
+
 const filterKeyword = ref<string>("");
 const dialog = ref<boolean>(false);
 const isActive = ref<boolean>(false);
 const name = ref<string>("");
-
+const nameRef = ref<any>(null);
 const dialogStatus = ref<string>("");
 const visibleColumns = ref<string[]>([
   "name",
@@ -79,28 +85,68 @@ const visibleColumns = ref<string[]>([
   "isActive",
 ]);
 
-const row = ref([
+// const row = ref([]);
-  {
-    id: "",
-    name: "test",
-    createdAt: date2Thai(new Date()),
-    lastUpdatedAt: date2Thai(new Date()),
-    lastUpdateFullName: "TestTest",
-    isActive: true,
-  },
-  {
-    id: "",
-    name: "test2",
-    createdAt: date2Thai(new Date()),
-    lastUpdatedAt: date2Thai(new Date()),
-    lastUpdateFullName: "TestTest",
-    isActive: false,
-  },
-]);
 
-function onclickDetail(data: (typeof row)["value"][number]) {
+function fetchData() {
-  const id = data.id;
+  const data = [
-  router.push(`/master-data/insignia/detail/test`);
+    {
+      id: "1",
+      name: "ชั้นต่ำกว่าสายสะพาย",
+      createdAt: new Date(),
+      lastUpdatedAt: new Date(),
+      lastUpdateFullName: "สาวิตรี ศรีสมัย",
+      isActive: true,
+    },
+    {
+      id: "2",
+      name: "ชั้นสายสะพาย",
+      createdAt: new Date(),
+      lastUpdatedAt: new Date(),
+      lastUpdateFullName: "System Administrator",
+      isActive: false,
+    },
+    {
+      id: "3",
+      name: "เหรียญบำเหน็จในราชการ",
+      createdAt: new Date(),
+      lastUpdatedAt: new Date(),
+      lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
+      isActive: false,
+    },
+  ];
+  store.fetchData(data);
+}
+
+onMounted(async () => {
+  fetchData();
+});
+
+function closeDialog() {
+  dialog.value = false;
+}
+
+function onclickDetail(id: string) {
+  router.push(`/master-data/insignia/detail/${id}`);
+}
+
+function validateForm() {
+  nameRef.value.validate();
+  onSubmit();
+}
+
+async function onSubmit() {
+  if (name.value.length > 0) {
+    dialogConfirm(
+      $q,
+      async () => {
+        console.log("สำเร็จ");
+        closeDialog();
+        name.value = "";
+      },
+      "ยืนยันการบันทึกข้อมูล",
+      "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?"
+    );
+  }
 }
 </script>
 
@@ -143,7 +189,7 @@ function onclickDetail(data: (typeof row)["value"][number]) {
   <d-table
     ref="table"
     :columns="columns"
-    :rows="row"
+    :rows="store.row"
     :filter="filterKeyword"
     row-key="name"
     flat
@@ -165,7 +211,7 @@ function onclickDetail(data: (typeof row)["value"][number]) {
       <q-tr
         :props="props"
         class="cursor-pointer"
-        @click.stop="onclickDetail(props.row)"
+        @click.stop="onclickDetail(props.row.id)"
       >
         <q-td v-for="col in props.cols" :key="col.id">
           <div v-if="col.name == 'isActive'">
@@ -230,36 +276,128 @@ function onclickDetail(data: (typeof row)["value"][number]) {
   </d-table>
 
   <q-dialog v-model="dialog" class="dialog" persistent>
-    <q-card style="width: 400px">
+    <q-card style="min-width: 350px" class="bg-grey-11">
-      <q-card-section class="flex justify-between">
+      <form @submit.prevent="validateForm">
-        <div v-if="dialogStatus == 'edit'" class="text-h6">แก้ไข</div>
+        <q-card-section class="flex justify-between" style="padding: 0">
-        <div v-else class="text-h6">เพิ่ม</div>
+          <dialog-header
-        <q-btn flat v-close-popup round dense icon="close" color="red" />
+            :tittle="dialogStatus == 'edit' ? 'แก้ไขข้อมูล' : 'เพิ่มข้อมูล'"
-      </q-card-section>
+            :close="closeDialog"
+          />
+        </q-card-section>
 
-      <q-card-section class="q-pt-none">
+        <q-separator color="grey-4" />
-        <q-input outlined v-model="name" label="ลำดับชั้นเครื่องราชฯ" dense />
+        <q-card-section class="q-pa-none">
-        <div class="row justify-between q-mt-md">
+          <q-input
-          <span class="text-bold"> สถานะการใช้งาน </span>
+            ref="nameRef"
-          <q-toggle v-model="isActive" dense />
+            outlined
-        </div>
+            v-model="name"
-      </q-card-section>
+            label="ลำดับชั้นเครื่องราชฯ"
+            dense
+            lazy-rules
+            borderless
+            class="col-12 bg-white q-ma-md"
+            :rules="[
+              (val) => val.length > 0 || 'กรุณากรอกลำดับชั้นเครื่องราชฯ',
+            ]"
+            hide-bottom-space
+          />
+          <div
+            class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
+          >
+            <div class="row items-center q-my-sm justify-between">
+              <p class="q-ma-none">สถานะการใช้งาน</p>
+              <label class="toggle-control">
+                <input type="checkbox" dense v-model="isActive" @change="" />
+                <span class="control"></span>
+              </label>
+            </div>
+          </div>
+        </q-card-section>
 
-      <q-card-actions align="right">
+        <q-card-actions align="right">
-        <q-btn
+          <q-btn
-          flat
+            id="onSubmit"
-          label="ตกลง"
+            type="submit"
-          color="primary"
+            dense
-          v-close-popup
+            unelevated
-          @click="
+            label="บันทึก"
-            () => {
+            color="public"
-              (name = ''), (isActive = false);
+            class="q-px-md"
-            }
+          >
-          "
+            <q-tooltip>บันทึกข้อมูล</q-tooltip>
-        />
+          </q-btn>
-      </q-card-actions>
+        </q-card-actions>
+      </form>
     </q-card>
   </q-dialog>
 </template>
 
-<style></style>
+<style scoped lang="scss">
+.border_custom {
+  border-radius: 6px !important;
+  border: 1px solid #e1e1e1;
+}
+$toggle-background-color-on: #06884d;
+$toggle-background-color-off: darkgray;
+$toggle-control-color: white;
+$toggle-width: 40px;
+$toggle-height: 25px;
+$toggle-gutter: 3px;
+$toggle-radius: 50%;
+$toggle-control-speed: 0.15s;
+$toggle-control-ease: ease-in;
+
+// These are our computed variables
+// change at your own risk.
+$toggle-radius: $toggle-height / 2;
+$toggle-control-size: $toggle-height - ($toggle-gutter * 2);
+
+.toggle-control {
+  display: block;
+  position: relative;
+  padding-left: $toggle-width;
+  margin-bottom: 12px;
+  cursor: pointer;
+  font-size: 22px;
+  user-select: none;
+
+  input {
+    position: absolute;
+    opacity: 0;
+    cursor: pointer;
+    height: 0;
+    width: 0;
+  }
+
+  input:checked ~ .control {
+    background-color: $toggle-background-color-on;
+
+    &:after {
+      left: $toggle-width - $toggle-control-size - $toggle-gutter;
+    }
+  }
+
+  .control {
+    position: absolute;
+    top: -7px;
+    left: -15px;
+    height: $toggle-height;
+    width: $toggle-width;
+    border-radius: $toggle-radius;
+    background-color: $toggle-background-color-off;
+    transition: background-color $toggle-control-speed $toggle-control-ease;
+
+    &:after {
+      content: "";
+      position: absolute;
+      left: $toggle-gutter;
+      top: $toggle-gutter;
+      width: $toggle-control-size;
+      height: $toggle-control-size;
+      border-radius: $toggle-radius;
+      background: $toggle-control-color;
+      transition: left $toggle-control-speed $toggle-control-ease;
+    }
+  }
+}
+</style>

src/modules/01_metadataNew/interface/response/insignia/Insignia.ts

@@ -1,18 +1,33 @@
-//ข้อมูล
+interface DataResponse {
-interface ResponseHistoryObject {
+  createdAt: Date;
-  createdAt?: Date;
+  id: string;
-  createdFullName: String;
+  isActive: boolean;
-  createdUserId: String;
-  id: String;
-  isActive: Boolean;
   lastUpdateFullName: String;
-  lastUpdateUserId: String;
+  lastUpdatedAt: Date;
-  lastUpdatedAt?: Date;
+  name: string;
-  level: number;
-  name: String;
-  shortName: String;
-  insigniaType?: any;
-  note: string;
 }
 
-export type { ResponseHistoryObject };
+interface DataRow {
+  createdAt: string | null;
+  id: string;
+  isActive: boolean;
+  lastUpdateFullName: String;
+  lastUpdatedAt: string | null;
+  name: string;
+}
+
+interface DetailResponse extends DataResponse {
+  note: string;
+  shortName: string;
+  insigniaType: string;
+  insigniaTypeId: string;
+  level: number;
+}
+
+interface DetailRow
+  extends Omit<DetailResponse, "createdAt" | "lastUpdatedAt"> {
+  createdAt: string | null;
+  lastUpdatedAt: string | null;
+}
+
+export type { DataResponse, DataRow, DetailResponse, DetailRow };

src/modules/01_metadataNew/stores/InsigniaStore.ts

@@ -0,0 +1,28 @@
+import { defineStore } from "pinia";
+import { ref } from "vue";
+import type {
+  DataResponse,
+  DataRow,
+} from "../interface/response/insignia/Insignia";
+import { useCounterMixin } from "@/stores/mixin";
+
+const { date2Thai } = useCounterMixin();
+
+export const useInsigniaDataStore = defineStore("insigniaData", () => {
+  const row = ref<DataRow[]>();
+  function fetchData(data: DataResponse[]) {
+    console.log(data);
+    const list = data.map((e) => ({
+      ...e,
+      createdAt: e.createdAt ? date2Thai(e.createdAt) : "",
+      lastUpdatedAt: e.lastUpdatedAt ? date2Thai(e.lastUpdatedAt) : "",
+    }));
+    console.log(list);
+    row.value = list;
+  }
+
+  return {
+    fetchData,
+    row,
+  };
+});

src/modules/02_organizationalNew/components/DialogFormAgency.vue

@@ -0,0 +1,212 @@
+<script setup lang="ts">
+import { ref, reactive, watch } from "vue";
+import { useQuasar } from "quasar";
+import { useCounterMixin } from "@/stores/mixin";
+import DialogHeader from "@/components/DialogHeader.vue";
+import type {
+  FormDataAgency,
+  FormAgencyRef,
+  DataOption,
+} from "@/modules/02_organizationalNew/interface/index/Main";
+
+const props = defineProps({
+  modal: Boolean,
+  close: Function,
+});
+
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const { dialogConfirm } = mixin;
+
+const ocLevelOp = ref<DataOption[]>([]);
+
+const ocNameRef = ref<Object | null>(null);
+const shortNameRef = ref<Object | null>(null);
+const ocNoRef = ref<Object | null>(null);
+const ocLevelRef = ref<Object | null>(null);
+const telOutRef = ref<Object | null>(null);
+const telInRef = ref<Object | null>(null);
+const telRef = ref<Object | null>(null);
+
+const formData = reactive<FormDataAgency>({
+  ocName: "",
+  shortName: "",
+  ocNo: "",
+  ocLevel: "",
+  telOut: "",
+  telIn: "",
+  tel: "",
+});
+
+/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
+const objectComplaintsRef: FormAgencyRef = {
+  ocName: ocNameRef,
+  shortName: shortNameRef,
+  ocNo: ocNoRef,
+  ocLevel: ocLevelRef,
+  telOut: telOutRef,
+  telIn: telInRef,
+  tel: telRef,
+};
+
+/** ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม */
+function validateForm() {
+  const hasError = [];
+  for (const key in objectComplaintsRef) {
+    if (Object.prototype.hasOwnProperty.call(objectComplaintsRef, key)) {
+      const property = objectComplaintsRef[key];
+      if (property.value && typeof property.value.validate === "function") {
+        const isValid = property.value.validate();
+        hasError.push(isValid);
+      }
+    }
+  }
+  if (hasError.every((result) => result === true)) {
+    onSubmit();
+  } else {
+  }
+}
+
+/** ฟังชั่น บันทึก */
+function onSubmit() {
+  dialogConfirm($q, () => {
+    console.log(formData)
+  });
+}
+
+watch(
+  () => props.modal,
+  () => {
+    if (props.modal === true) {
+      ocLevelOp.value = [
+        {
+          id: "id1",
+          name: "id1",
+        },
+        {
+          id: "id2",
+          name: "id2",
+        },
+      ];
+    }
+  }
+);
+</script>
+<template>
+  <template>
+    <q-dialog v-model="props.modal" persistent>
+      <q-card style="min-width: 50vw">
+        <form @submit.prevent="validateForm">
+          <DialogHeader :tittle="`เพิ่มหน่วยงาน`" :close="props.close" />
+          <q-separator />
+
+          <q-card-section>
+            <div class="row q-col-gutter-sm">
+              <div class="col-4">
+                <q-input
+                  v-model="formData.ocName"
+                  ref="ocNameRef"
+                  dense
+                  outlined
+                  for="#ocName"
+                  label="สรุปผลการพิจารณา"
+                  hide-bottom-space
+                  :rules="[(val) => !!val || `${'กรุณากรอกสรุปผลการพิจารณา'}`]"
+                />
+              </div>
+              <div class="col-2">
+                <q-input
+                  v-model="formData.shortName"
+                  ref="shortNameRef"
+                  dense
+                  outlined
+                  for="#shortName"
+                  label="ชื่อย่อ"
+                  hide-bottom-space
+                  :rules="[(val) => !!val || `${'กรุณากรอกชื่อย่อ'}`]"
+                />
+              </div>
+              <div class="col-2">
+                <q-input
+                  v-model="formData.ocNo"
+                  ref="ocNoRef"
+                  dense
+                  outlined
+                  for="#ocNo"
+                  label="รหัสหน่วยงาน"
+                  hide-bottom-space
+                  :rules="[(val) => !!val || `${'กรุณากรอกรหัสหน่วยงาน'}`]"
+                />
+              </div>
+              <div class="col-4">
+                <q-select
+                  for="#ocLevel"
+                  ref="ocLevelRef"
+                  dense
+                  hide-bottom-space
+                  outlined
+                  option-label="name"
+                  option-value="id"
+                  emit-value
+                  map-options
+                  v-model="formData.ocLevel"
+                  :options="ocLevelOp"
+                  label="ระดับของหน่วยงาน"
+                  :rules="[(val) => !!val || `${'กรุณาเลือกระดับของหน่วยงาน'}`]"
+                  lazy-rules
+                />
+              </div>
+              <div class="col-4">
+                <q-input
+                  v-model="formData.telOut"
+                  ref="telOutRef"
+                  dense
+                  outlined
+                  for="#telOut"
+                  label="หมายเลขโทรศัพท์ที่ติดต่อจากภายนอก"
+                  hide-bottom-space
+                  :rules="[
+                    (val) =>
+                      !!val ||
+                      `${'กรุณากรอกหมายเลขโทรศัพท์ที่ติดต่อจากภายนอก'}`,
+                  ]"
+                />
+              </div>
+              <div class="col-4">
+                <q-input
+                  v-model="formData.telIn"
+                  ref="telInRef"
+                  dense
+                  outlined
+                  for="#telIn"
+                  label="หมายเลขโทรศัพท์ที่ติดต่อจากภายใน"
+                  hide-bottom-space
+                  :rules="[
+                    (val) =>
+                      !!val || `${'กรุณากรอกหมายเลขโทรศัพท์ที่ติดต่อจากภายใน'}`,
+                  ]"
+                />
+              </div>
+              <div class="col-4">
+                <q-input
+                  v-model="formData.tel"
+                  ref="telRef"
+                  dense
+                  outlined
+                  for="#tel"
+                  label="หมายเลขโทรสาร"
+                  hide-bottom-space
+                  :rules="[(val) => !!val || `${'กรุณากรอกหมายเลขโทรสาร'}`]"
+                />
+              </div>
+            </div>
+          </q-card-section>
+          <q-separator />
+          <q-card-actions align="right" class="bg-white text-teal">
+            <q-btn type="submit" :label="`บันทึก`" color="public" />
+          </q-card-actions>
+        </form>
+      </q-card>
+    </q-dialog>
+  </template>
+</template>

src/modules/02_organizationalNew/components/DialogFormDateTime.vue

@@ -0,0 +1,115 @@
+<script setup lang="ts">
+import { ref } from "vue";
+import { useQuasar } from "quasar";
+import { useCounterMixin } from "@/stores/mixin";
+import DialogHeader from "@/components/DialogHeader.vue";
+import type { FormDateTimeRef } from "@/modules/02_organizationalNew/interface/index/Main";
+
+const props = defineProps({
+  modal: Boolean,
+  close: Function,
+});
+
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const { dialogConfirm, date2Thai } = mixin;
+
+const dateTimeRef = ref<Object | null>(null);
+
+const dateTime = ref<Date>();
+
+/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
+const objectRef: FormDateTimeRef = {
+  dateTime: dateTimeRef,
+};
+
+/** ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม */
+function validateForm() {
+  const hasError = [];
+  for (const key in objectRef) {
+    if (Object.prototype.hasOwnProperty.call(objectRef, key)) {
+      const property = objectRef[key];
+      if (property.value && typeof property.value.validate === "function") {
+        const isValid = property.value.validate();
+        hasError.push(isValid);
+      }
+    }
+  }
+  if (hasError.every((result) => result === true)) {
+    onSubmit();
+  } else {
+  }
+}
+
+/** ฟังชั่น บันทึก */
+function onSubmit() {
+  dialogConfirm($q, () => {
+    console.log(dateTime.value);
+  });
+}
+</script>
+<template>
+  <template>
+    <q-dialog v-model="props.modal" persistent>
+      <q-card style="min-width: 10vw">
+        <form @submit.prevent="validateForm">
+          <DialogHeader :tittle="`ตั้งเวลาเผยแพร่`" :close="props.close" />
+          <q-separator />
+
+          <q-card-section>
+            <div class="row q-col-gutter-sm">
+              <div class="col-12">
+                <datepicker
+                  menu-class-name="modalfix"
+                  v-model="dateTime"
+                  :locale="'th'"
+                  autoApply
+                  borderless
+                  :enableTimePicker="false"
+                  week-start="0"
+                >
+                  <template #year="{ year }">
+                    {{ year + 543 }}
+                  </template>
+                  <template #year-overlay-value="{ value }">
+                    {{ parseInt(value + 543) }}
+                  </template>
+                  <template #trigger>
+                    <q-input
+                      for="#dateTime"
+                      ref="dateTimeRef"
+                      outlined
+                      dense
+                      hide-bottom-space
+                      :model-value="
+                        dateTime != null ? date2Thai(dateTime) : null
+                      "
+                      label="วันเวลาเผยแพร่"
+                      :rules="[
+                        (val) => !!val || `${'กรุณาเลือกวันเวลาเผยแพร่'}`,
+                      ]"
+                      lazy-rules
+                    >
+                      <template v-slot:prepend>
+                        <q-icon
+                          name="event"
+                          class="cursor-pointer"
+                          style="color: var(--q-primary)"
+                        >
+                        </q-icon>
+                      </template>
+                    </q-input>
+                  </template>
+                </datepicker>
+              </div>
+            </div>
+          </q-card-section>
+          <q-separator />
+          <q-card-actions align="right" class="bg-white text-teal">
+            <q-btn type="submit" :label="`บันทึก`" color="public" />
+          </q-card-actions>
+        </form>
+      </q-card>
+    </q-dialog>
+  </template>
+</template>

src/modules/02_organizationalNew/components/DialogFormPosition.vue

@@ -0,0 +1,241 @@
+<script setup lang="ts">
+import { ref, reactive, watch } from "vue";
+import { useQuasar } from "quasar";
+import { useCounterMixin } from "@/stores/mixin";
+import type { QTableProps } from "quasar";
+import DialogHeader from "@/components/DialogHeader.vue";
+import type {
+  FormDataPosition,
+  FormPositionRef,
+  DataOption,
+} from "@/modules/02_organizationalNew/interface/index/Main";
+
+const props = defineProps({
+  modal: Boolean,
+  close: Function,
+});
+
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const { dialogConfirm } = mixin;
+
+const rows = ref<any[]>([]);
+const ocLevelOp = ref<DataOption[]>([]);
+
+const prefixNoRef = ref<Object | null>(null);
+const positionNoRef = ref<Object | null>(null);
+
+const formData = reactive<FormDataPosition>({
+  prefixNo: "",
+  positionNo: "",
+  suffixNo: "",
+  confirm: false,
+});
+
+/** maping ref เข้าตัวแปรเพื่อเตรียมตรวจสอบ */
+const objectPositionRef: FormPositionRef = {
+  prefixNo: prefixNoRef,
+  positionNo: positionNoRef,
+};
+
+const columns = ref<QTableProps["columns"]>([
+    {
+      name: "no",
+      align: "left",
+      label: "ลำดับ",
+      sortable: false,
+      field: "no",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "positionType",
+      align: "left",
+      label: "ประเภทตำเเหน่ง",
+      sortable: true,
+      field: "positionType",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "positionLevel",
+      align: "left",
+      label: "ระดับตำแหน่ง ด้าน/สาขา",
+      sortable: true,
+      field: "positionLevel",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "positionAdmin",
+      align: "left",
+      label: "ตำแหน่งทางการบริหาร",
+      sortable: true,
+      field: "positionAdmin",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "other",
+      align: "left",
+      label: "ฯลฯ",
+      sortable: true,
+      field: "other",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+
+  ]);
+  const visibleColumns = ref<string[]>([
+    "no",
+    "positionType",
+    "positionLevel",
+    "positionAdmin",
+    "other",
+  ]);
+
+/** ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม */
+function validateForm() {
+  const hasError = [];
+  for (const key in objectPositionRef) {
+    if (Object.prototype.hasOwnProperty.call(objectPositionRef, key)) {
+      const property = objectPositionRef[key];
+      if (property.value && typeof property.value.validate === "function") {
+        const isValid = property.value.validate();
+        hasError.push(isValid);
+      }
+    }
+  }
+  if (hasError.every((result) => result === true)) {
+    onSubmit();
+  } else {
+  }
+}
+
+/** ฟังชั่น บันทึก */
+function onSubmit() {
+  dialogConfirm($q, () => {
+    console.log(formData);
+  });
+}
+
+watch(
+  () => props.modal,
+  () => {
+    if (props.modal === true) {
+      ocLevelOp.value = [
+        {
+          id: "id1",
+          name: "id1",
+        },
+        {
+          id: "id2",
+          name: "id2",
+        },
+      ];
+    }
+  }
+);
+</script>
+<template>
+  <template>
+    <q-dialog v-model="props.modal" persistent>
+      <q-card style="min-width: 50vw">
+        <form @submit.prevent="validateForm">
+          <DialogHeader :tittle="`เพิ่มตำแหน่ง`" :close="props.close" />
+          <q-separator />
+
+          <q-card-section>
+            <div class="row q-col-gutter-sm">
+              <div class="col-4">
+                <q-input
+                  v-model="formData.prefixNo"
+                  ref="prefixNoRef"
+                  dense
+                  outlined
+                  for="#prefixNo"
+                  label="Prefix เลขที่ตำเเหน่ง"
+                  hide-bottom-space
+                  :rules="[
+                    (val) => !!val || `${'กรุณากรอกPrefix เลขที่ตำเเหน่ง'}`,
+                  ]"
+                />
+              </div>
+              <div class="col-4">
+                <q-input
+                  v-model="formData.positionNo"
+                  ref="positionNoRef"
+                  dense
+                  outlined
+                  for="#positionNo"
+                  label="เลขที่ตำแหน่ง"
+                  hide-bottom-space
+                  :rules="[(val) => !!val || `${'กรุณากรอกเลขที่ตำแหน่ง'}`]"
+                />
+              </div>
+              <div class="col-4">
+                <q-input
+                  v-model="formData.suffixNo"
+                  dense
+                  outlined
+                  for="#suffixNo"
+                  label="Suffix เลขที่ตำแหน่ง"
+                />
+              </div>
+              <div class="col-12">
+                <d-table
+                  ref="table"
+                  :columns="columns"
+                  :rows="rows"
+                  row-key="idcard"
+                  flat
+                  bordered
+                  :paging="true"
+                  dense
+                  class="custom-header-table"
+                  :visible-columns="visibleColumns"
+                >
+                  <template v-slot:header="props">
+                    <q-tr :props="props">
+                      <q-th
+                        v-for="col in props.cols"
+                        :key="col.name"
+                        :props="props"
+                        style="color: #000000; font-weight: 500"
+                      >
+                        <span class="text-weight-medium">{{ col.label }}</span>
+                      </q-th>
+                    </q-tr>
+                  </template>
+                  <template v-slot:body="props">
+                    <q-tr :props="props" class="cursor-pointer">
+                      <q-td
+                        v-for="col in props.cols"
+                        :key="col.name"
+                        :props="props"
+                      >
+                        <div v-if="col.name == 'no'">
+                          {{ props.rowIndex + 1 }}
+                        </div>
+                        <div v-else>
+                          {{ col.value }}
+                        </div>
+                      </q-td>
+                    </q-tr>
+                  </template>
+                </d-table>
+              </div>
+              <div class="col-12 q-mt-sm">
+                <q-checkbox dense v-model="formData.confirm" label="ไม่ผูกกับตำแหน่งก่อนหน้า" color="teal" />
+              </div>
+            </div>
+          </q-card-section>
+          <q-separator />
+          <q-card-actions align="right" class="bg-white text-teal">
+            <q-btn type="submit" :label="`บันทึก`" color="public" />
+          </q-card-actions>
+        </form>
+      </q-card>
+    </q-dialog>
+  </template>
+</template>

src/modules/02_organizationalNew/components/DialogHistory.vue

@@ -0,0 +1,114 @@
+<script setup lang="ts">
+import { ref, reactive, watch } from "vue";
+import { useQuasar } from "quasar";
+import { useCounterMixin } from "@/stores/mixin";
+import type { QTableProps } from "quasar";
+import DialogHeader from "@/components/DialogHeader.vue";
+
+const props = defineProps({
+  modal: Boolean,
+  close: Function,
+});
+
+const $q = useQuasar();
+const mixin = useCounterMixin();
+const { dialogConfirm } = mixin;
+
+const rows = ref<any[]>([]);
+
+
+const columns = ref<QTableProps["columns"]>([
+    {
+      name: "no",
+      align: "left",
+      label: "ลำดับ",
+      sortable: false,
+      field: "no",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "name",
+      align: "left",
+      label: "ชื่อ",
+      sortable: true,
+      field: "name",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+    {
+      name: "lastUpdatedAt",
+      align: "left",
+      label: "วันที่แก้ไข",
+      sortable: true,
+      field: "lastUpdatedAt",
+      headerStyle: "font-size: 14px",
+      style: "font-size: 14px",
+    },
+
+  ]);
+  const visibleColumns = ref<string[]>([
+    "no",
+    "name",
+    "lastUpdatedAt",
+  ]);
+
+</script>
+<template>
+  <template>
+    <q-dialog v-model="props.modal" persistent>
+      <q-card style="min-width: 40vw">
+          <DialogHeader :tittle="`ประวัติโครงสร้าง`" :close="props.close" />
+          <q-separator />
+
+          <q-card-section>
+            <div class="row q-col-gutter-sm">
+              <div class="col-12">
+                <d-table
+                  ref="table"
+                  :columns="columns"
+                  :rows="rows"
+                  row-key="idcard"
+                  flat
+                  bordered
+                  :paging="true"
+                  dense
+                  class="custom-header-table"
+                  :visible-columns="visibleColumns"
+                >
+                  <template v-slot:header="props">
+                    <q-tr :props="props">
+                      <q-th
+                        v-for="col in props.cols"
+                        :key="col.name"
+                        :props="props"
+                        style="color: #000000; font-weight: 500"
+                      >
+                        <span class="text-weight-medium">{{ col.label }}</span>
+                      </q-th>
+                    </q-tr>
+                  </template>
+                  <template v-slot:body="props">
+                    <q-tr :props="props" class="cursor-pointer">
+                      <q-td
+                        v-for="col in props.cols"
+                        :key="col.name"
+                        :props="props"
+                      >
+                        <div v-if="col.name == 'no'">
+                          {{ props.rowIndex + 1 }}
+                        </div>
+                        <div v-else>
+                          {{ col.value }}
+                        </div>
+                      </q-td>
+                    </q-tr>
+                  </template>
+                </d-table>
+              </div>
+            </div>
+          </q-card-section>
+      </q-card>
+    </q-dialog>
+  </template>
+</template>

src/modules/02_organizationalNew/interface/index/Main.ts

@@ -7,4 +7,39 @@ interface DataOption {
   name: string;
 }
 
-export type { Pagination, DataOption };
+interface FormDataAgency {
+ocName:string
+shortName:string
+ocNo:string
+ocLevel:string
+telOut:string
+telIn:string
+tel:string
+}
+interface FormDataPosition {
+prefixNo:string
+positionNo:string
+suffixNo:string
+confirm:boolean
+}
+
+interface FormAgencyRef {
+  ocName: object | null;
+  shortName: object | null;
+  ocNo: object | null;
+  ocLevel: object | null;
+  telOut: object | null;
+  telIn: object | null;
+  tel: object | null;
+  [key: string]: any;
+}
+interface FormPositionRef {
+  prefixNo: object | null;
+  positionNo: object | null;
+  [key: string]: any;
+}
+interface FormDateTimeRef {
+  dateTime: object | null;
+  [key: string]: any;
+}
+export type { Pagination, DataOption,FormDataAgency,FormDataPosition,FormAgencyRef,FormPositionRef,FormDateTimeRef };