hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'oat_dev' into develop

Browse source
This commit is contained in:
oat 2024-02-02 15:02:35 +07:00
commit fe3a1367a6
9 changed files with 193 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/modules/01_metadataNew/components/personal/01ListPrefix.vue
View file

@ -64,7 +64,6 @@ const $q = useQuasar();
const filterKeyword = ref<string>("");
const dialog = ref<boolean>(false);
const prefix = ref<string>("");
const prefixRef = ref<any>(null);
const dialogStatus = ref<string>("");
const personalName = ref<string>("คำนำหน้าชื่อ");
const visibleColumns = ref<string[]>([
@ -74,35 +73,32 @@ const visibleColumns = ref<string[]>([
"lastUpdateFullName",
]);
function fetchData() {
const data = [
{
id: "1",
name: "ว่าที่ร้อยตรี",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "นางสาว",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "นาย",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
store.fetchData(data);
}
const data = [
{
id: "1",
name: "ว่าที่ร้อยตรี",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "นางสาว",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "นาย",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
onMounted(async () => {
fetchData();
store.fetchData(data);
});
</script>
@ -164,11 +160,7 @@ onMounted(async () => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click.stop="onclickDetail(props.row.id)"
>
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.id">
<div>
{{ col.value }}

57
src/modules/01_metadataNew/components/personal/02ListRank.vue
View file

@ -74,35 +74,32 @@ const visibleColumns = ref<string[]>([
"lastUpdateFullName",
]);
function fetchData() {
const data = [
{
id: "1",
name: "ยศ 1",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "ยศ 2",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "ยศ 3",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
store.fetchData(data);
}
const data = [
{
id: "1",
name: "ยศ 1",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "ยศ 2",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "ยศ 3",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
onMounted(async () => {
fetchData();
store.fetchData(data);
});
</script>
@ -164,11 +161,7 @@ onMounted(async () => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click.stop="onclickDetail(props.row.id)"
>
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.id">
<div>
{{ col.value }}

57
src/modules/01_metadataNew/components/personal/03ListBloodGroup.vue
View file

@ -74,35 +74,32 @@ const visibleColumns = ref<string[]>([
"lastUpdateFullName",
]);
function fetchData() {
const data = [
{
id: "1",
name: "A",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "AB",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "O",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
store.fetchData(data);
}
const data = [
{
id: "1",
name: "A",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "AB",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "O",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
onMounted(async () => {
fetchData();
store.fetchData(data);
});
</script>
@ -164,11 +161,7 @@ onMounted(async () => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click.stop="onclickDetail(props.row.id)"
>
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.id">
<div>
{{ col.value }}

57
src/modules/01_metadataNew/components/personal/04ListGender.vue
View file

@ -74,35 +74,32 @@ const visibleColumns = ref<string[]>([
"lastUpdateFullName",
]);
function fetchData() {
const data = [
{
id: "1",
name: "ชาย",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "หญิง",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "เพศทางเลือก",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
store.fetchData(data);
}
const data = [
{
id: "1",
name: "ชาย",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "หญิง",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "เพศทางเลือก",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
onMounted(async () => {
fetchData();
store.fetchData(data);
});
</script>
@ -164,11 +161,7 @@ onMounted(async () => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click.stop="onclickDetail(props.row.id)"
>
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.id">
<div>
{{ col.value }}

71
src/modules/01_metadataNew/components/personal/05ListReligion.vue
View file

@ -74,42 +74,39 @@ const visibleColumns = ref<string[]>([
"lastUpdateFullName",
]);
function fetchData() {
const data = [
{
id: "1",
name: "อิสลาม",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "พุทธ",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "ขงจื้อ",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
{
id: "4",
name: "คริสต์",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
store.fetchData(data);
}
const data = [
{
id: "1",
name: "อิสลาม",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "พุทธ",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "ขงจื้อ",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
{
id: "4",
name: "คริสต์",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
onMounted(async () => {
fetchData();
store.fetchData(data);
});
</script>
@ -171,11 +168,7 @@ onMounted(async () => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click.stop="onclickDetail(props.row.id)"
>
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.id">
<div>
{{ col.value }}

71
src/modules/01_metadataNew/components/personal/06ListRelationship.vue
View file

@ -74,42 +74,39 @@ const visibleColumns = ref<string[]>([
"lastUpdateFullName",
]);
function fetchData() {
const data = [
{
id: "1",
name: "เคยสมรสแต่ไม่ทราบสถานภาพสมรส",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "สมรส",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "แยกกันอยู่",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
{
id: "4",
name: "โสด",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
store.fetchData(data);
}
const data = [
{
id: "1",
name: "เคยสมรสแต่ไม่ทราบสถานภาพสมรส",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "สาวิตรี ศรีสมัย",
},
{
id: "2",
name: "สมรส",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "System Administrator",
},
{
id: "3",
name: "แยกกันอยู่",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
{
id: "4",
name: "โสด",
createdAt: new Date(),
lastUpdatedAt: new Date(),
lastUpdateFullName: "คณะกรรมการ ตรวจรับ",
},
];
onMounted(async () => {
fetchData();
store.fetchData(data);
});
</script>
@ -171,11 +168,7 @@ onMounted(async () => {
</q-tr>
</template>
<template v-slot:body="props">
<q-tr
:props="props"
class="cursor-pointer"
@click.stop="onclickDetail(props.row.id)"
>
<q-tr :props="props" class="cursor-pointer">
<q-td v-for="col in props.cols" :key="col.id">
<div>
{{ col.value }}

2
src/modules/01_metadataNew/components/personal/DialogForm.vue
View file

@ -6,7 +6,7 @@ import { useQuasar } from "quasar";
const $q = useQuasar();
const mixin = useCounterMixin();
const { dialogRemove, dialogConfirm } = mixin;
const { dialogConfirm } = mixin;
const dataRef = ref<any>(null);
const data = defineModel<string>("data", {

27
src/modules/01_metadataNew/interface/response/personal/personal.ts Normal file
View file

@ -0,0 +1,27 @@
interface DataResponse {
createdAt: Date;
id: string;
lastUpdateFullName: String;
lastUpdatedAt: Date;
prefix?: string;
rank?: string;
bloodgroup?: string;
gender?: string;
religion?: string;
relationship?: string;
}
interface DataRow {
createdAt: string | null;
id: string;
lastUpdateFullName: String;
lastUpdatedAt: string | null;
prefix?: string;
rank?: string;
bloodgroup?: string;
gender?: string;
religion?: string;
relationship?: string;
}
export type { DataResponse, DataRow };

2
src/modules/01_metadataNew/stores/personalStore.ts
View file

@ -3,7 +3,7 @@ import { ref } from "vue";
import type {
DataResponse,
DataRow,
} from "../interface/response/insignia/Insignia";
} from "../interface/response/personal/personal";
import { useCounterMixin } from "@/stores/mixin";
const { date2Thai } = useCounterMixin();