diff --git a/src/components/Dialogs/PopupReason.vue b/src/components/Dialogs/PopupReason.vue
index e2e8d82af..0878d5bb3 100644
--- a/src/components/Dialogs/PopupReason.vue
+++ b/src/components/Dialogs/PopupReason.vue
@@ -1,5 +1,5 @@
@@ -498,6 +509,8 @@ const resetFilter = () => {
:visible-columns="visibleColumns"
:filter="filter"
row-key="name"
+ :pagination-label="paginationLabel"
+ v-model:pagination="pagination"
>
diff --git a/src/modules/07_insignia/store.ts b/src/modules/07_insignia/store.ts
index 83fdc9a20..f1c4f2f40 100644
--- a/src/modules/07_insignia/store.ts
+++ b/src/modules/07_insignia/store.ts
@@ -6,6 +6,7 @@ const mixin = useCounterMixin();
const { date2Thai } = mixin;
export const useInsigniaDataStore = defineStore("insignia", () => {
+ const isLock = ref(false)
let optionsTypeOc = ref([]);
let typeOc = ref("");
const agency = ref("");
@@ -13,6 +14,8 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
const listinsignia = ref([]);
const typeinsignia = ref("all");
let typeinsigniaOptions = ref([{ id: "all", name: "ทั้งหมด" }]);
+ const employeeClass = ref("all");
+ const employeeClassOps = ref([{ name: "ทั้งหมด", id: "all" }, { name: "ข้าราชการ กทม.สามัญ", id: "officer" }, { name: "ลูกจ้างประจำ", id: "perm" }])
const typeReport = ref("");
const titleReport = ref("");
@@ -23,8 +26,10 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
};
const fetchData = async (data: any) => {
+ console.log(data);
+
if (data !== null) {
- rows.value = await data.map((e: any) => ({
+ let datalist = await data.map((e: any) => ({
id: e.id,
citizenId: e.citizenId,
profileId: e.profileId,
@@ -38,8 +43,10 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
insigniaLevel: e.level,
dateSend: date2Thai(e.requestDate),
requestNote: e.requestNote,
+ employeeType: profileType(e.profileType),
}));
- listinsignia.value = await rows.value;
+ rows.value = await datalist
+ listinsignia.value = await datalist;
filtertypeInsignia();
} else rows.value = [];
};
@@ -81,6 +88,29 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
}
}
};
+ const selectEmployeeClass = (employeeClass: string) => {
+ if (employeeClass == "officer") {
+ let list = listinsignia.value.filter((e: any) => e.employeeType === "ข้าราชการ กทม.สามัญ")
+ rows.value = list
+ } else if (employeeClass === "perm") {
+ let list = listinsignia.value.filter((e: any) => e.employeeType === "ลูกจ้างประจำ")
+ rows.value = list
+ } else rows.value = listinsignia.value
+ }
+ const convertOcid = (oc: string) => {
+ let ocdata = optionsTypeOc.value.find((e: any) => e.name === oc)
+ if (ocdata) {
+ return ocdata.id
+ } else return ""
+ }
+ const profileType = (val: string) => {
+ switch (val) {
+ case "officer":
+ return "ข้าราชการ กทม.สามัญ";
+ case "employee":
+ return "ลูกจ้างประจำ";
+ }
+ }
return {
optionsTypeOc,
@@ -93,7 +123,12 @@ export const useInsigniaDataStore = defineStore("insignia", () => {
fetchOption,
searchFilterTable,
setTypeandTitle,
+ convertOcid,
typeReport,
titleReport,
+ selectEmployeeClass,
+ employeeClass,
+ employeeClassOps,
+ isLock
};
});
diff --git a/src/modules/07_insignia/views/ResultPage.vue b/src/modules/07_insignia/views/ResultPage.vue
index f4d4335fc..7c042af8a 100644
--- a/src/modules/07_insignia/views/ResultPage.vue
+++ b/src/modules/07_insignia/views/ResultPage.vue
@@ -114,7 +114,7 @@ const columns = ref([
{
name: "citizenId",
align: "left",
- label: "เลขบัตรประชาชน",
+ label: "เลขประจำตัวประชาชน",
field: "citizenId",
sortable: true,
sort: (a: string, b: string) =>
@@ -358,6 +358,17 @@ const resetFilter = () => {
filter.value = "";
filterRef.value!.focus();
};
+const pagination = ref({
+ sortBy: "name",
+ descending: false,
+ page: 1,
+ rowsPerPage: 10,
+});
+const paging = ref(true);
+const paginationLabel = (start: number, end: number, total: number) => {
+ if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
+ else return start + "-" + end + " ใน " + total;
+};
@@ -598,6 +609,8 @@ const resetFilter = () => {
:visible-columns="visibleColumns"
:filter="filter"
row-key="name"
+ :pagination-label="paginationLabel"
+ v-model:pagination="pagination"
>
diff --git a/src/modules/10_order/components/step/step01.vue b/src/modules/10_order/components/step/step01.vue
index 3fa2545a4..03006b381 100644
--- a/src/modules/10_order/components/step/step01.vue
+++ b/src/modules/10_order/components/step/step01.vue
@@ -416,8 +416,8 @@ const fecthExamRoundOption = async (commandCode: string) => {
};
const submit = async () => {
- console.log(nameCommand.value);
- console.log(CommandOption.value);
+ // console.log(nameCommand.value);
+ // console.log(CommandOption.value);
let signBy = null;
if (!nameCommand.value.length) {
diff --git a/src/modules/10_order/components/step/step02.vue b/src/modules/10_order/components/step/step02.vue
index ca455b5d7..6c9d77746 100644
--- a/src/modules/10_order/components/step/step02.vue
+++ b/src/modules/10_order/components/step/step02.vue
@@ -172,9 +172,9 @@ const statuscode = computed(() => {
orderTypeCode.value === "c-pm-14" ||
orderTypeCode.value === "c-pm-21"
) {
- return true;
+ return false;
}
- return false;
+ return true;
});
const dialogDeleteData = async (id: string) => {
dialogRemove($q, () => deleteData(id));