@@ -36,7 +36,7 @@
:borderless="false"
:outlined="true"
:hide-dropdown-icon="false"
- style="min-width: 150px;"
+ style="min-width: 150px"
@update:model-value="searchFilterTable"
/>
@@ -126,7 +126,7 @@
-
+
{{ props.rowIndex + 1 }}
@@ -178,7 +178,9 @@ import type {
FormMainProbation2,
} from "@/modules/05_placement/interface/request/Main";
import { useQuasar } from "quasar";
+import { useRouter } from "vue-router";
+const router = useRouter();
const $q = useQuasar(); //ใช้ noti quasar
const modal = ref(false);
const pagination = ref({
@@ -334,6 +336,7 @@ const clickDelete = (id: string) => {
const clickAdd = () => {
// modal.value = true;
+ router.push("/retirement/list");
};
const clickClose = async () => {
modal.value = false;
@@ -366,6 +369,9 @@ const paginationLabel = (start: string, end: string, total: string) => {
if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
else return start + "-" + end + " ใน " + total;
};
+const nextPage = () => {
+ router.push("/retirement/list");
+};
diff --git a/src/modules/07_insignia/components/Coin.vue b/src/modules/07_insignia/components/Coin.vue
new file mode 100644
index 000000000..ca851d7bd
--- /dev/null
+++ b/src/modules/07_insignia/components/Coin.vue
@@ -0,0 +1,516 @@
+
+
+
+ ประวัติการยื่นขอพระราชทานเหรียญจักรพรรดิมาลา
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.rowIndex + 1 }}
+
+
+
+ {{ props.value }}
+
+
+
+
+
+
+
+ บันทึกผลการได้รับพระราชทานเครื่องราชย์อิสริยสภรณ์
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ year + 543 }}
+
+
+ {{ parseInt(value + 543) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ props.rowIndex + 1 }}
+
+
+
+ {{ props.value }}
+
+
+
+
+
+
+ รางงานเครื่องราชอิสริยาภรณ์
+
+
+
+
+
+
+
+
+
+ รายงาน ขร.1 - ขร.4
+
+
+
+
+
+
+
+
+ รายงานผลการจ่ายใบกำกับ
+
+
+
+
+
+
+
+ รายชื่อข้าราชการสามัญฯ ที่ได้รับ/ไม่ได้รับใบกำกับ
+
+
+
+
+
+
+ รายงาน ขร.1 - ขร.4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ หน้าที่ {{ page }} จาก {{ numOfPages }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ หน้าที่ {{ page }} จาก {{ numOfPages }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ หน้าที่ {{ page }} จาก {{ numOfPages }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ หน้าที่ {{ page }} จาก {{ numOfPages }}
+
+
+
+
+
+
+
รายชื่อลูกจ้างชั่วคราว
-
-
-
- เพิ่มข้อมูล
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ เพิ่มข้อมูล
+
+
+
+
+
+
+
-
+
+
+
+
+
diff --git a/src/modules/09_coin/interface/index/Main.ts b/src/modules/09_coin/interface/index/Main.ts
new file mode 100644
index 000000000..e4ea7770c
--- /dev/null
+++ b/src/modules/09_coin/interface/index/Main.ts
@@ -0,0 +1 @@
+export type {};
diff --git a/src/modules/09_coin/interface/request/Main.ts b/src/modules/09_coin/interface/request/Main.ts
new file mode 100644
index 000000000..e4ea7770c
--- /dev/null
+++ b/src/modules/09_coin/interface/request/Main.ts
@@ -0,0 +1 @@
+export type {};
diff --git a/src/modules/09_coin/interface/response/Main.ts b/src/modules/09_coin/interface/response/Main.ts
new file mode 100644
index 000000000..e4ea7770c
--- /dev/null
+++ b/src/modules/09_coin/interface/response/Main.ts
@@ -0,0 +1 @@
+export type {};
diff --git a/src/modules/09_coin/router.ts b/src/modules/09_coin/router.ts
new file mode 100644
index 000000000..3626006be
--- /dev/null
+++ b/src/modules/09_coin/router.ts
@@ -0,0 +1,18 @@
+/**
+ * Router เครื่องราชอิสริยาภรณ์ (insignia)
+ */
+
+const Main = () => import("@/modules/09_coin/views/Main.vue");
+
+export default [
+ {
+ path: "/coin",
+ name: "coin",
+ component: Main,
+ meta: {
+ Auth: true,
+ Key: [9],
+ Role: "coin",
+ },
+ },
+];
diff --git a/src/modules/09_coin/store.ts b/src/modules/09_coin/store.ts
new file mode 100644
index 000000000..a1e6a7fe0
--- /dev/null
+++ b/src/modules/09_coin/store.ts
@@ -0,0 +1,5 @@
+import { defineStore } from "pinia";
+
+export const useCoinDataStore = defineStore("coin", () => {
+ return {};
+});
diff --git a/src/modules/09_coin/views/Main.vue b/src/modules/09_coin/views/Main.vue
new file mode 100644
index 000000000..b127c8a26
--- /dev/null
+++ b/src/modules/09_coin/views/Main.vue
@@ -0,0 +1,12 @@
+
+
+
+
+ เหรียญจักรพรรดิมาลา
+
+
+
+
+
+
+
diff --git a/src/router/index.ts b/src/router/index.ts
index 496100f83..28211f6e6 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -12,6 +12,7 @@ import ModulePlacement from "@/modules/05_placement/router";
import ModuleRetirement from "@/modules/06_retirement/router";
import ModuleInsignia from "@/modules/07_insignia/router";
import ModuleRegistryEmployee from "@/modules/08_registryEmployee/router";
+import ModuleCoin from "@/modules/09_coin/router";
// TODO: ใช้หรือไม่?
import keycloak from "@/plugins/keycloak";
@@ -42,6 +43,7 @@ const router = createRouter({
...ModuleRetirement,
...ModuleInsignia,
...ModuleRegistryEmployee,
+ ...ModuleCoin,
],
},
/**
diff --git a/src/views/MainLayout.vue b/src/views/MainLayout.vue
index 8b5c465b2..e461e089f 100644
--- a/src/views/MainLayout.vue
+++ b/src/views/MainLayout.vue
@@ -716,7 +716,10 @@ if (keycloak.tokenParsed != null) {
expand-icon="mdi-chevron-down"
expanded-icon="mdi-chevron-up"
v-if="
- menuItem.key == 3 || menuItem.key == 5 || menuItem.key == 6
+ menuItem.key == 3 ||
+ menuItem.key == 5 ||
+ menuItem.key == 6 ||
+ menuItem.key == 8
"
>
@@ -727,7 +730,7 @@ if (keycloak.tokenParsed != null) {
font-size="20px"
/>
- {{ menuItem.label }}
+ {{ menuItem.label }}
@@ -751,7 +754,9 @@ if (keycloak.tokenParsed != null) {
:to="{ name: `${subMenu2.path}` }"
>
- {{ subMenu2.label }}
+ {{ subMenu2.label }}
+
@@ -781,7 +786,9 @@ if (keycloak.tokenParsed != null) {
:to="{ name: `${subMenu.path}` }"
>
- {{ subMenu.label }}
+ {{
+ subMenu.label
+ }}
@@ -930,7 +937,7 @@ if (keycloak.tokenParsed != null) {
.menuSub .q-item {
border-radius: 0 100px 100px 0;
margin-right: 2%;
- font-weight: 500 ;
+ font-weight: 500;
}
.expan2 .q-item {
padding-left: 10%;
@@ -938,8 +945,8 @@ if (keycloak.tokenParsed != null) {
/* .menuSubAct {
background: #1e2529d9;
} */
-.font-400{
- font-weight: 400 ;
+.font-400 {
+ font-weight: 400;
}
.expan2 .menuSubHover {
padding-left: 30%;