ดักค่าว่าง การออกคำสั่ง บรรจุ
This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490
parent
c072e8dc61
commit
eba56761ce
10 changed files with 776 additions and 232 deletions
|
|
@ -4,18 +4,22 @@ import type { QTableProps } from "quasar";
|
||||||
import { useQuasar } from "quasar";
|
import { useQuasar } from "quasar";
|
||||||
import { useRouter } from "vue-router";
|
import { useRouter } from "vue-router";
|
||||||
import { useCounterMixin } from "@/stores/mixin";
|
import { useCounterMixin } from "@/stores/mixin";
|
||||||
import { useTransferDataStore } from "@/modules/05_placement/store"
|
import { useTransferDataStore } from "@/modules/05_placement/store";
|
||||||
import Dialogbody from "@/modules/05_placement/components/AppointMent/Dialogbody.vue"
|
import Dialogbody from "@/modules/05_placement/components/AppointMent/Dialogbody.vue";
|
||||||
import DialogOrgTree from "@/modules/05_placement/components/AppointMent/AppointmentModal.vue";
|
import DialogOrgTree from "@/modules/05_placement/components/AppointMent/AppointmentModal.vue";
|
||||||
import type { listAppointType,resData,orgFilter } from "@/modules/05_placement/interface/response/AppointMent"
|
import type {
|
||||||
import type { OpType } from "@/modules/05_placement/interface/response/Main"
|
listAppointType,
|
||||||
|
resData,
|
||||||
|
orgFilter,
|
||||||
|
} from "@/modules/05_placement/interface/response/AppointMent";
|
||||||
|
import type { OpType } from "@/modules/05_placement/interface/response/Main";
|
||||||
import http from "@/plugins/http";
|
import http from "@/plugins/http";
|
||||||
import config from "@/app.config";
|
import config from "@/app.config";
|
||||||
|
|
||||||
const $q = useQuasar();
|
const $q = useQuasar();
|
||||||
const modal = ref<boolean>(false);
|
const modal = ref<boolean>(false);
|
||||||
const storeFn = useTransferDataStore();
|
const storeFn = useTransferDataStore();
|
||||||
const { statusText } = storeFn
|
const { statusText } = storeFn;
|
||||||
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
|
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
|
||||||
const {
|
const {
|
||||||
showLoader,
|
showLoader,
|
||||||
|
|
@ -167,15 +171,30 @@ const fecthlistappointment = async () => {
|
||||||
status: statusText(e.status),
|
status: statusText(e.status),
|
||||||
createdAt: date2Thai(e.createdAt),
|
createdAt: date2Thai(e.createdAt),
|
||||||
birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth),
|
birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth),
|
||||||
|
educationOld: e.educationOld,
|
||||||
|
organizationPositionOld: e.organizationPositionOld,
|
||||||
|
positionTypeOld: e.positionTypeOld,
|
||||||
|
positionLevelOld: e.positionLevelOld,
|
||||||
|
positionNumberOld: e.positionNumberOld,
|
||||||
|
salary: e.salary,
|
||||||
|
positionDate: e.positionDate,
|
||||||
}));
|
}));
|
||||||
rows2.value = rows.value.filter(
|
rows2.value = rows.value.filter(
|
||||||
(e: orgFilter) =>
|
(e: orgFilter) =>
|
||||||
e.orgName !== null &&
|
e.orgName !== null &&
|
||||||
e.status !== "ส่งรายชื่อไปออกคำสั่ง" &&
|
e.status !== "ส่งรายชื่อไปออกคำสั่ง" &&
|
||||||
e.status !== "ออกคำสั่งเสร็จแล้ว"
|
e.status !== "ออกคำสั่งเสร็จแล้ว" &&
|
||||||
|
e.educationOld &&
|
||||||
|
e.organizationPositionOld &&
|
||||||
|
e.positionTypeOld &&
|
||||||
|
e.positionLevelOld &&
|
||||||
|
e.positionNumberOld &&
|
||||||
|
e.salary !== null &&
|
||||||
|
e.positionDate
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
|
messageError($q, e);
|
||||||
})
|
})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
hideLoader();
|
hideLoader();
|
||||||
|
|
@ -241,7 +260,6 @@ const nextPage = (id: string) => {
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
fecthlistappointment();
|
fecthlistappointment();
|
||||||
});
|
});
|
||||||
|
|
@ -255,27 +273,65 @@ onMounted(() => {
|
||||||
<div class="row q-pa-md">
|
<div class="row q-pa-md">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="row col-12">
|
<div class="row col-12">
|
||||||
<q-btn @click="popup()" size="14px" flat round color="add" icon="mdi-account-arrow-right">
|
<q-btn
|
||||||
|
@click="popup()"
|
||||||
|
size="14px"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
color="add"
|
||||||
|
icon="mdi-account-arrow-right"
|
||||||
|
>
|
||||||
<q-tooltip>ส่งไปออกคำสั่งแต่งตั้ง-เลื่อน-ย้าย</q-tooltip>
|
<q-tooltip>ส่งไปออกคำสั่งแต่งตั้ง-เลื่อน-ย้าย</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
|
|
||||||
<q-space />
|
<q-space />
|
||||||
<q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef" outlined
|
<q-input
|
||||||
debounce="300" placeholder="ค้นหา">
|
class="col-xs-12 col-sm-3 col-md-2"
|
||||||
|
standout
|
||||||
|
dense
|
||||||
|
v-model="filterKeyword"
|
||||||
|
ref="filterRef"
|
||||||
|
outlined
|
||||||
|
debounce="300"
|
||||||
|
placeholder="ค้นหา"
|
||||||
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon v-if="filterKeyword == ''" name="search" />
|
<q-icon v-if="filterKeyword == ''" name="search" />
|
||||||
<q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
|
<q-icon
|
||||||
|
v-if="filterKeyword !== ''"
|
||||||
|
name="clear"
|
||||||
|
class="cursor-pointer"
|
||||||
|
@click="resetFilter"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
</q-input>
|
</q-input>
|
||||||
|
|
||||||
<q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
|
<q-select
|
||||||
emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
|
v-model="visibleColumns"
|
||||||
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" />
|
multiple
|
||||||
|
outlined
|
||||||
|
dense
|
||||||
|
options-dense
|
||||||
|
:display-value="$q.lang.table.columns"
|
||||||
|
emit-value
|
||||||
|
map-options
|
||||||
|
:options="columns"
|
||||||
|
option-value="name"
|
||||||
|
options-cover
|
||||||
|
style="min-width: 150px"
|
||||||
|
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-12 q-pt-sm">
|
<div class="col-12 q-pt-sm">
|
||||||
<d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="citizenId"
|
<d-table
|
||||||
:visible-columns="visibleColumns" v-model:pagination="pagination">
|
:columns="columns"
|
||||||
|
:rows="rows"
|
||||||
|
:filter="filterKeyword"
|
||||||
|
row-key="citizenId"
|
||||||
|
:visible-columns="visibleColumns"
|
||||||
|
v-model:pagination="pagination"
|
||||||
|
>
|
||||||
<template v-slot:header="props">
|
<template v-slot:header="props">
|
||||||
<q-tr :props="props">
|
<q-tr :props="props">
|
||||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||||
|
|
@ -286,27 +342,60 @@ onMounted(() => {
|
||||||
</template>
|
</template>
|
||||||
<template v-slot:body="props">
|
<template v-slot:body="props">
|
||||||
<q-tr :props="props" class="cursor-pointer">
|
<q-tr :props="props" class="cursor-pointer">
|
||||||
<q-td key="no" :props="props" @click="nextPage(props.row.personalId)">
|
<q-td
|
||||||
|
key="no"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.rowIndex + 1 }}
|
{{ props.rowIndex + 1 }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="citizenId" :props="props" @click="nextPage(props.row.personalId)">
|
<q-td
|
||||||
|
key="citizenId"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.citizenId }}
|
{{ props.row.citizenId }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="fullname" :props="props" @click="nextPage(props.row.personalId)">
|
<q-td
|
||||||
|
key="fullname"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.fullname }}
|
{{ props.row.fullname }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="organizationName" :props="props" @click="nextPage(props.row.personalId)">
|
<q-td
|
||||||
<div v-if="props.row.orgName !== null ||
|
key="organizationName"
|
||||||
props.row.positionPath !== null
|
:props="props"
|
||||||
">
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="
|
||||||
|
props.row.orgName !== null ||
|
||||||
|
props.row.positionPath !== null
|
||||||
|
"
|
||||||
|
>
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
<div class="text-weight-medium">
|
<div class="text-weight-medium">
|
||||||
{{ props.row.orgName !== null ? props.row.orgName : "-" }}
|
{{
|
||||||
{{ props.row.organizationShortName !== null ? `(${props.row.organizationShortName})` : "" }}
|
props.row.orgName !== null ? props.row.orgName : "-"
|
||||||
|
}}
|
||||||
|
{{
|
||||||
|
props.row.organizationShortName !== null
|
||||||
|
? `(${props.row.organizationShortName})`
|
||||||
|
: ""
|
||||||
|
}}
|
||||||
</div>
|
</div>
|
||||||
<div class="text-weight-light">
|
<div class="text-weight-light">
|
||||||
{{ props.row.positionPath !== null ? props.row.positionPath : "-" }}
|
{{
|
||||||
{{ props.row.positionNumber !== null ? `(${props.row.positionNumber})` : "" }}
|
props.row.positionPath !== null
|
||||||
|
? props.row.positionPath
|
||||||
|
: "-"
|
||||||
|
}}
|
||||||
|
{{
|
||||||
|
props.row.positionNumber !== null
|
||||||
|
? `(${props.row.positionNumber})`
|
||||||
|
: ""
|
||||||
|
}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -316,29 +405,73 @@ onMounted(() => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="birthday" :props="props" @click="nextPage(props.row.personalId)">
|
<q-td
|
||||||
|
key="birthday"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.birthday }}
|
{{ props.row.birthday }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="createdAt" :props="props" @click="nextPage(props.row.personalId)">
|
<q-td
|
||||||
|
key="createdAt"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.createdAt }}
|
{{ props.row.createdAt }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="status" :props="props" @click="nextPage(props.row.personalId)">
|
<q-td
|
||||||
|
key="status"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.status }}
|
{{ props.row.status }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td auto-width>
|
<q-td auto-width>
|
||||||
<q-btn v-if="props.row.status !== 'ส่งรายชื่อไปออกคำสั่ง' &&
|
<q-btn
|
||||||
props.row.status !== 'ออกคำสั่งแล้ว'
|
v-if="
|
||||||
" icon="mdi-dots-vertical" size="12px" color="grey-7" flat round dense>
|
props.row.status !== 'ส่งรายชื่อไปออกคำสั่ง' &&
|
||||||
<q-menu transition-show="jump-down" transition-hide="jump-up">
|
props.row.status !== 'ออกคำสั่งแล้ว'
|
||||||
|
"
|
||||||
|
icon="mdi-dots-vertical"
|
||||||
|
size="12px"
|
||||||
|
color="grey-7"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
>
|
||||||
|
<q-menu
|
||||||
|
transition-show="jump-down"
|
||||||
|
transition-hide="jump-up"
|
||||||
|
>
|
||||||
<q-list dense style="min-width: 100px">
|
<q-list dense style="min-width: 100px">
|
||||||
<q-item clickable v-close-popup @click="openModalTree(props.row.personalId)">
|
<q-item
|
||||||
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
|
clickable
|
||||||
<q-icon color="primary" size="xs" name="mdi-bookmark-outline" />
|
v-close-popup
|
||||||
|
@click="openModalTree(props.row.personalId)"
|
||||||
|
>
|
||||||
|
<q-item-section
|
||||||
|
style="min-width: 0px"
|
||||||
|
avatar
|
||||||
|
class="q-py-sm"
|
||||||
|
>
|
||||||
|
<q-icon
|
||||||
|
color="primary"
|
||||||
|
size="xs"
|
||||||
|
name="mdi-bookmark-outline"
|
||||||
|
/>
|
||||||
</q-item-section>
|
</q-item-section>
|
||||||
<q-item-section>เลือกหน่วยงาน/ตำแหน่ง</q-item-section>
|
<q-item-section>เลือกหน่วยงาน/ตำแหน่ง</q-item-section>
|
||||||
</q-item>
|
</q-item>
|
||||||
<q-item clickable v-close-popup @click="clickDelete(props.row.personalId)">
|
<q-item
|
||||||
<q-item-section style="min-width: 0px" avatar class="q-py-sm">
|
clickable
|
||||||
|
v-close-popup
|
||||||
|
@click="clickDelete(props.row.personalId)"
|
||||||
|
>
|
||||||
|
<q-item-section
|
||||||
|
style="min-width: 0px"
|
||||||
|
avatar
|
||||||
|
class="q-py-sm"
|
||||||
|
>
|
||||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||||
<q-icon color="red" size="xs" name="mdi-delete" />
|
<q-icon color="red" size="xs" name="mdi-delete" />
|
||||||
</q-item-section>
|
</q-item-section>
|
||||||
|
|
@ -366,6 +499,11 @@ onMounted(() => {
|
||||||
:nextPage="nextPage"
|
:nextPage="nextPage"
|
||||||
:fecthlistappointment="fecthlistappointment"
|
:fecthlistappointment="fecthlistappointment"
|
||||||
/>
|
/>
|
||||||
<DialogOrgTree v-model:modal="modalTree" :close="closeModalTree" :personal="personal" :personalId="personalId" />
|
<DialogOrgTree
|
||||||
|
v-model:modal="modalTree"
|
||||||
|
:close="closeModalTree"
|
||||||
|
:personal="personal"
|
||||||
|
:personalId="personalId"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
<style scoped lang="scss"></style>
|
<style scoped lang="scss"></style>
|
||||||
|
|
|
||||||
|
|
@ -150,9 +150,19 @@ const fecthlistOthet = async () => {
|
||||||
status: r.status ?? "-",
|
status: r.status ?? "-",
|
||||||
statustext: statusText(r.status ?? ""),
|
statustext: statusText(r.status ?? ""),
|
||||||
fullname: `${r.prefix ?? ""}${r.firstname ?? ""} ${r.lastname ?? ""}`,
|
fullname: `${r.prefix ?? ""}${r.firstname ?? ""} ${r.lastname ?? ""}`,
|
||||||
|
amountOld: r.amountOld,
|
||||||
|
positionDate: r.positionDate,
|
||||||
}));
|
}));
|
||||||
rows2.value = rows.value.filter(
|
rows2.value = rows.value.filter(
|
||||||
(e: listMain) => e.status !== "REPORT" && e.status !== "DONE"
|
(e: listMain) =>
|
||||||
|
e.status !== "REPORT" &&
|
||||||
|
e.status !== "DONE" &&
|
||||||
|
e.organizationPositionOld &&
|
||||||
|
e.positionTypeOld &&
|
||||||
|
e.positionLevelOld &&
|
||||||
|
e.positionNumberOld &&
|
||||||
|
e.amountOld !== null &&
|
||||||
|
e.positionDate
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,15 @@ const popup = () => {
|
||||||
(r.status == "WAITTING" ||
|
(r.status == "WAITTING" ||
|
||||||
r.status == "PENDING" ||
|
r.status == "PENDING" ||
|
||||||
r.status == "APPROVE") &&
|
r.status == "APPROVE") &&
|
||||||
r.positionNumber != null
|
r.positionNumber != null &&
|
||||||
|
r.educationOld &&
|
||||||
|
r.organizationPositionOld &&
|
||||||
|
r.positionTypeOld &&
|
||||||
|
r.positionLevelOld &&
|
||||||
|
r.positionNumberOld &&
|
||||||
|
r.amountOld !== null
|
||||||
);
|
);
|
||||||
|
|
||||||
rows2.value = row;
|
rows2.value = row;
|
||||||
modal.value = true;
|
modal.value = true;
|
||||||
};
|
};
|
||||||
|
|
@ -147,27 +154,28 @@ const columns = ref<QTableProps["columns"]>([
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
//save file
|
//save file
|
||||||
const SaveData = async () => {
|
const SaveData = async () => {
|
||||||
myForm.value.validate().then((result: boolean) => {
|
myForm.value.validate().then((result: boolean) => {
|
||||||
if (result) {
|
if (result) {
|
||||||
const formData = new FormData();
|
const formData = new FormData();
|
||||||
formData.append("File", files.value);
|
formData.append("File", files.value);
|
||||||
showLoader();
|
showLoader();
|
||||||
http
|
http
|
||||||
.put(config.API.receiveFile(personalId.value), formData)
|
.put(config.API.receiveFile(personalId.value), formData)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
success($q, "บันทึกข้อมูลสำเร็จ");
|
success($q, "บันทึกข้อมูลสำเร็จ");
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
})
|
})
|
||||||
.finally(async () => {
|
.finally(async () => {
|
||||||
await clickCloseUpload();
|
await clickCloseUpload();
|
||||||
hideLoader();
|
hideLoader();
|
||||||
|
});
|
||||||
});
|
}
|
||||||
}})};
|
});
|
||||||
|
};
|
||||||
|
|
||||||
const fecthlistRecevice = async () => {
|
const fecthlistRecevice = async () => {
|
||||||
showLoader();
|
showLoader();
|
||||||
|
|
@ -175,6 +183,7 @@ const fecthlistRecevice = async () => {
|
||||||
.get(config.API.receiveData())
|
.get(config.API.receiveData())
|
||||||
.then((res: any) => {
|
.then((res: any) => {
|
||||||
const response = res.data.result;
|
const response = res.data.result;
|
||||||
|
|
||||||
listRecevice.value = response;
|
listRecevice.value = response;
|
||||||
let list: ResponseRow[] = [];
|
let list: ResponseRow[] = [];
|
||||||
response.map((e: ResponseData) => {
|
response.map((e: ResponseData) => {
|
||||||
|
|
@ -194,12 +203,23 @@ const fecthlistRecevice = async () => {
|
||||||
organizationShortName: e.organizationShortName,
|
organizationShortName: e.organizationShortName,
|
||||||
positionNumber: e.positionNumber,
|
positionNumber: e.positionNumber,
|
||||||
positionPath: e.positionPath,
|
positionPath: e.positionPath,
|
||||||
birthday: e.dateOfBirth == null ? "-" : date2Thai(e.dateOfBirth) &&
|
birthday:
|
||||||
e.dateOfBirth.toString() === "0001-01-01T00:00:00" ? "-" : date2Thai(e.dateOfBirth),
|
e.dateOfBirth == null
|
||||||
|
? "-"
|
||||||
|
: date2Thai(e.dateOfBirth) &&
|
||||||
|
e.dateOfBirth.toString() === "0001-01-01T00:00:00"
|
||||||
|
? "-"
|
||||||
|
: date2Thai(e.dateOfBirth),
|
||||||
status: e.status,
|
status: e.status,
|
||||||
statusText: statusText(e.status ?? ""),
|
statusText: statusText(e.status ?? ""),
|
||||||
createdAt: e.createdAt !== null ? new Date(e.createdAt) : null,
|
createdAt: e.createdAt !== null ? new Date(e.createdAt) : null,
|
||||||
dateText: e.createdAt !== null ? date2Thai(e.createdAt) : "-",
|
dateText: e.createdAt !== null ? date2Thai(e.createdAt) : "-",
|
||||||
|
educationOld: e.educationOld ?? "",
|
||||||
|
organizationPositionOld: e.organizationPositionOld ?? "",
|
||||||
|
positionTypeOld: e.positionTypeOld,
|
||||||
|
positionLevelOld: e.positionLevelOld,
|
||||||
|
positionNumberOld: e.positionNumberOld,
|
||||||
|
amountOld: e.amountOld,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
rows.value = list;
|
rows.value = list;
|
||||||
|
|
@ -231,7 +251,7 @@ const clickClose = () => {
|
||||||
// ปิดโมเดลอัปเดตไฟล์
|
// ปิดโมเดลอัปเดตไฟล์
|
||||||
const clickCloseUpload = () => {
|
const clickCloseUpload = () => {
|
||||||
modalupload.value = false;
|
modalupload.value = false;
|
||||||
files.value = null
|
files.value = null;
|
||||||
};
|
};
|
||||||
// ปิดโมเดลโครงสร้าง
|
// ปิดโมเดลโครงสร้าง
|
||||||
const openModalTree = (id: string) => {
|
const openModalTree = (id: string) => {
|
||||||
|
|
@ -292,26 +312,62 @@ onMounted(() => {
|
||||||
<q-btn flat round color="primary" @click="add" icon="mdi-plus">
|
<q-btn flat round color="primary" @click="add" icon="mdi-plus">
|
||||||
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
|
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
<q-btn size="14px" flat round color="add" icon="mdi-account-arrow-right" @click="popup()" >
|
<q-btn
|
||||||
|
size="14px"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
color="add"
|
||||||
|
icon="mdi-account-arrow-right"
|
||||||
|
@click="popup()"
|
||||||
|
>
|
||||||
<q-tooltip>ส่งไปออกคำสั่งรับโอน</q-tooltip>
|
<q-tooltip>ส่งไปออกคำสั่งรับโอน</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
<q-space />
|
<q-space />
|
||||||
<q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword"
|
<q-input
|
||||||
ref="filterRef" outlined debounce="300" placeholder="ค้นหา" >
|
class="col-xs-12 col-sm-3 col-md-2"
|
||||||
|
standout
|
||||||
|
dense
|
||||||
|
v-model="filterKeyword"
|
||||||
|
ref="filterRef"
|
||||||
|
outlined
|
||||||
|
debounce="300"
|
||||||
|
placeholder="ค้นหา"
|
||||||
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon v-if="filterKeyword == ''" name="search" />
|
<q-icon v-if="filterKeyword == ''" name="search" />
|
||||||
<q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
|
<q-icon
|
||||||
|
v-if="filterKeyword !== ''"
|
||||||
|
name="clear"
|
||||||
|
class="cursor-pointer"
|
||||||
|
@click="resetFilter"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
</q-input>
|
</q-input>
|
||||||
<q-select v-model="visibleColumns" multiple outlined dense options-dense
|
<q-select
|
||||||
:display-value="$q.lang.table.columns" emit-value map-options
|
v-model="visibleColumns"
|
||||||
:options="columns" option-value="name" options-cover style="min-width: 150px"
|
multiple
|
||||||
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" />
|
outlined
|
||||||
|
dense
|
||||||
|
options-dense
|
||||||
|
:display-value="$q.lang.table.columns"
|
||||||
|
emit-value
|
||||||
|
map-options
|
||||||
|
:options="columns"
|
||||||
|
option-value="name"
|
||||||
|
options-cover
|
||||||
|
style="min-width: 150px"
|
||||||
|
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-12 q-pt-sm">
|
<div class="col-12 q-pt-sm">
|
||||||
<d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="fullname"
|
<d-table
|
||||||
:visible-columns="visibleColumns" >
|
:columns="columns"
|
||||||
|
:rows="rows"
|
||||||
|
:filter="filterKeyword"
|
||||||
|
row-key="fullname"
|
||||||
|
:visible-columns="visibleColumns"
|
||||||
|
>
|
||||||
<template v-slot:header="props">
|
<template v-slot:header="props">
|
||||||
<q-tr :props="props">
|
<q-tr :props="props">
|
||||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||||
|
|
@ -322,25 +378,60 @@ onMounted(() => {
|
||||||
</template>
|
</template>
|
||||||
<template v-slot:body="props">
|
<template v-slot:body="props">
|
||||||
<q-tr :props="props" class="cursor-pointer">
|
<q-tr :props="props" class="cursor-pointer">
|
||||||
<q-td key="no" :props="props" @click="nextPage(props.row.personalId)">
|
<q-td
|
||||||
|
key="no"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.rowIndex + 1 }}
|
{{ props.rowIndex + 1 }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="citizenId" :props="props" @click="nextPage(props.row.personalId)" >
|
<q-td
|
||||||
|
key="citizenId"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.citizenId }}
|
{{ props.row.citizenId }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="fullname" :props="props" @click="nextPage(props.row.personalId)" >
|
<q-td
|
||||||
|
key="fullname"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.fullname }}
|
{{ props.row.fullname }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="organizationName" :props="props" @click="nextPage(props.row.personalId)" >
|
<q-td
|
||||||
<div v-if=" props.row.orgName !== null || props.row.positionPath !== null " >
|
key="organizationName"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
v-if="
|
||||||
|
props.row.orgName !== null ||
|
||||||
|
props.row.positionPath !== null
|
||||||
|
"
|
||||||
|
>
|
||||||
<div class="col-4">
|
<div class="col-4">
|
||||||
<div class="text-weight-medium">
|
<div class="text-weight-medium">
|
||||||
{{ props.row.orgName !== null ? props.row.orgName : "-" }}
|
{{
|
||||||
{{ props.row.organizationShortName !== null ? `(${props.row.organizationShortName})` : "" }}
|
props.row.orgName !== null ? props.row.orgName : "-"
|
||||||
|
}}
|
||||||
|
{{
|
||||||
|
props.row.organizationShortName !== null
|
||||||
|
? `(${props.row.organizationShortName})`
|
||||||
|
: ""
|
||||||
|
}}
|
||||||
</div>
|
</div>
|
||||||
<div class="text-weight-light">
|
<div class="text-weight-light">
|
||||||
{{ props.row.positionPath !== null ? props.row.positionPath : "-" }}
|
{{
|
||||||
{{ props.row.positionNumber !== null ? `(${props.row.positionNumber})` : "" }}
|
props.row.positionPath !== null
|
||||||
|
? props.row.positionPath
|
||||||
|
: "-"
|
||||||
|
}}
|
||||||
|
{{
|
||||||
|
props.row.positionNumber !== null
|
||||||
|
? `(${props.row.positionNumber})`
|
||||||
|
: ""
|
||||||
|
}}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -350,46 +441,119 @@ onMounted(() => {
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="birthday" :props="props" @click="nextPage(props.row.personalId)" >
|
<q-td
|
||||||
|
key="birthday"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.birthday }}
|
{{ props.row.birthday }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="dateText" :props="props" @click="nextPage(props.row.personalId)" >
|
<q-td
|
||||||
|
key="dateText"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.dateText }}
|
{{ props.row.dateText }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="statusText" :props="props" @click="nextPage(props.row.personalId)" >
|
<q-td
|
||||||
|
key="statusText"
|
||||||
|
:props="props"
|
||||||
|
@click="nextPage(props.row.personalId)"
|
||||||
|
>
|
||||||
{{ props.row.statusText }}
|
{{ props.row.statusText }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td auto-width>
|
<q-td auto-width>
|
||||||
<q-btn icon="mdi-dots-vertical" size="12px" color="grey-7"
|
<q-btn
|
||||||
flat round dense >
|
icon="mdi-dots-vertical"
|
||||||
<q-menu transition-show="jump-down" transition-hide="jump-up" >
|
size="12px"
|
||||||
|
color="grey-7"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
>
|
||||||
|
<q-menu
|
||||||
|
transition-show="jump-down"
|
||||||
|
transition-hide="jump-up"
|
||||||
|
>
|
||||||
<q-list dense style="min-width: 100px">
|
<q-list dense style="min-width: 100px">
|
||||||
<q-item clickable v-close-popup @click="openModalTree(props.row.personalId)"
|
<q-item
|
||||||
:disable=" props.row.status == 'REPORT' || props.row.status == 'DONE' " >
|
clickable
|
||||||
<q-item-section style="min-width: 0px" avatar class="q-py-sm" >
|
v-close-popup
|
||||||
<q-icon :color=" props.row.status == 'REPORT' || props.row.status == 'DONE' ? 'grey' : 'primary' "
|
@click="openModalTree(props.row.personalId)"
|
||||||
size="xs" name="mdi-bookmark-outline" />
|
:disable="
|
||||||
|
props.row.status == 'REPORT' ||
|
||||||
|
props.row.status == 'DONE'
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<q-item-section
|
||||||
|
style="min-width: 0px"
|
||||||
|
avatar
|
||||||
|
class="q-py-sm"
|
||||||
|
>
|
||||||
|
<q-icon
|
||||||
|
:color="
|
||||||
|
props.row.status == 'REPORT' ||
|
||||||
|
props.row.status == 'DONE'
|
||||||
|
? 'grey'
|
||||||
|
: 'primary'
|
||||||
|
"
|
||||||
|
size="xs"
|
||||||
|
name="mdi-bookmark-outline"
|
||||||
|
/>
|
||||||
</q-item-section>
|
</q-item-section>
|
||||||
<q-item-section
|
<q-item-section
|
||||||
>เลือกหน่วยงานที่รับโอน</q-item-section
|
>เลือกหน่วยงานที่รับโอน</q-item-section
|
||||||
>
|
>
|
||||||
</q-item>
|
</q-item>
|
||||||
<q-item clickable v-close-popup
|
<q-item
|
||||||
@click="openUpload(props.row.personalId)" :disable=" props.row.status == 'REPORT' || props.row.status == 'DONE' ">
|
clickable
|
||||||
<q-item-section style="min-width: 0px" avatar class="q-py-sm" >
|
v-close-popup
|
||||||
<q-icon size="xs" name="attach_file"
|
@click="openUpload(props.row.personalId)"
|
||||||
:color=" props.row.status == 'REPORT' || props.row.status == 'DONE' ? 'grey' : 'blue' " />
|
:disable="
|
||||||
|
props.row.status == 'REPORT' ||
|
||||||
|
props.row.status == 'DONE'
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<q-item-section
|
||||||
|
style="min-width: 0px"
|
||||||
|
avatar
|
||||||
|
class="q-py-sm"
|
||||||
|
>
|
||||||
|
<q-icon
|
||||||
|
size="xs"
|
||||||
|
name="attach_file"
|
||||||
|
:color="
|
||||||
|
props.row.status == 'REPORT' ||
|
||||||
|
props.row.status == 'DONE'
|
||||||
|
? 'grey'
|
||||||
|
: 'blue'
|
||||||
|
"
|
||||||
|
/>
|
||||||
</q-item-section>
|
</q-item-section>
|
||||||
<q-item-section>อัปโหลดเอกสาร</q-item-section>
|
<q-item-section>อัปโหลดเอกสาร</q-item-section>
|
||||||
</q-item>
|
</q-item>
|
||||||
<q-item clickable v-close-popup @click="openDelete(props.row.personalId)"
|
<q-item
|
||||||
:disable=" props.row.status == 'REPORT' || props.row.status == 'DONE' " >
|
clickable
|
||||||
<q-item-section style="min-width: 0px" avatar class="q-py-sm" >
|
v-close-popup
|
||||||
|
@click="openDelete(props.row.personalId)"
|
||||||
|
:disable="
|
||||||
|
props.row.status == 'REPORT' ||
|
||||||
|
props.row.status == 'DONE'
|
||||||
|
"
|
||||||
|
>
|
||||||
|
<q-item-section
|
||||||
|
style="min-width: 0px"
|
||||||
|
avatar
|
||||||
|
class="q-py-sm"
|
||||||
|
>
|
||||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||||
<q-icon
|
<q-icon
|
||||||
:color="
|
:color="
|
||||||
props.row.status == 'REPORT' ||
|
props.row.status == 'REPORT' ||
|
||||||
props.row.status == 'DONE' ? 'grey' : 'red' "
|
props.row.status == 'DONE'
|
||||||
|
? 'grey'
|
||||||
|
: 'red'
|
||||||
|
"
|
||||||
size="xs"
|
size="xs"
|
||||||
name="mdi-delete"
|
name="mdi-delete"
|
||||||
/>
|
/>
|
||||||
|
|
@ -423,8 +587,18 @@ onMounted(() => {
|
||||||
<q-card-section class="q-py-sm">
|
<q-card-section class="q-py-sm">
|
||||||
<div class="col-12 row items-center q-col-gutter-sm">
|
<div class="col-12 row items-center q-col-gutter-sm">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<q-file ref="myForm" outlined dense v-model="files" label="อัปโหลดเอกสาร" lazy-rules
|
<q-file
|
||||||
:rules="[(val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน']" hide-bottom-space >
|
ref="myForm"
|
||||||
|
outlined
|
||||||
|
dense
|
||||||
|
v-model="files"
|
||||||
|
label="อัปโหลดเอกสาร"
|
||||||
|
lazy-rules
|
||||||
|
:rules="[
|
||||||
|
(val) => val || 'กรุณาเลือกไฟล์หนังสือถึงหน่วยงานที่รับโอน',
|
||||||
|
]"
|
||||||
|
hide-bottom-space
|
||||||
|
>
|
||||||
<template v-slot:prepend>
|
<template v-slot:prepend>
|
||||||
<q-icon name="attach_file" />
|
<q-icon name="attach_file" />
|
||||||
</template>
|
</template>
|
||||||
|
|
@ -435,7 +609,13 @@ onMounted(() => {
|
||||||
<q-separator />
|
<q-separator />
|
||||||
<div class="row q-px-sm q-py-xs">
|
<div class="row q-px-sm q-py-xs">
|
||||||
<q-space />
|
<q-space />
|
||||||
<q-btn flat round color="public" @click="SaveData()" icon="mdi-content-save-outline" >
|
<q-btn
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
color="public"
|
||||||
|
@click="SaveData()"
|
||||||
|
icon="mdi-content-save-outline"
|
||||||
|
>
|
||||||
<q-tooltip>บันทึก</q-tooltip>
|
<q-tooltip>บันทึก</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
|
|
@ -155,9 +155,17 @@ const openModalOrder = () => {
|
||||||
openModal();
|
openModal();
|
||||||
const row = rows.value.filter(
|
const row = rows.value.filter(
|
||||||
(item: officerType) =>
|
(item: officerType) =>
|
||||||
item.status == "WAITTING" ||
|
(item.status == "WAITTING" ||
|
||||||
item.status == "PENDING" ||
|
item.status == "PENDING" ||
|
||||||
item.status == "APPROVE"
|
item.status == "APPROVE") &&
|
||||||
|
item.organizationPositionOld &&
|
||||||
|
item.positionTypeOld &&
|
||||||
|
item.positionLevelOld &&
|
||||||
|
item.positionNumberOld &&
|
||||||
|
item.salary !== null &&
|
||||||
|
item.organization &&
|
||||||
|
item.date &&
|
||||||
|
item.dateRepatriation
|
||||||
);
|
);
|
||||||
rows2.value = row;
|
rows2.value = row;
|
||||||
};
|
};
|
||||||
|
|
@ -187,6 +195,7 @@ const getData = async () => {
|
||||||
positionNumberOld: item.positionNumberOld,
|
positionNumberOld: item.positionNumberOld,
|
||||||
organizationPositionOld: item.organizationPositionOld,
|
organizationPositionOld: item.organizationPositionOld,
|
||||||
isActive: item.isActive,
|
isActive: item.isActive,
|
||||||
|
dateRepatriation: item.dateRepatriation,
|
||||||
}));
|
}));
|
||||||
})
|
})
|
||||||
.catch((e) => {})
|
.catch((e) => {})
|
||||||
|
|
@ -224,26 +233,63 @@ onMounted(async () => {
|
||||||
<q-separator />
|
<q-separator />
|
||||||
<div class="row q-pa-md">
|
<div class="row q-pa-md">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
|
|
||||||
<div class="row col-12">
|
<div class="row col-12">
|
||||||
<q-btn flat round size="14px" color="add" icon="mdi-account-arrow-right" @click="openModalOrder" >
|
<q-btn
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
size="14px"
|
||||||
|
color="add"
|
||||||
|
icon="mdi-account-arrow-right"
|
||||||
|
@click="openModalOrder"
|
||||||
|
>
|
||||||
<q-tooltip>ส่งไปออกคำสั่งส่งตัวกลับ</q-tooltip>
|
<q-tooltip>ส่งไปออกคำสั่งส่งตัวกลับ</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
<q-space />
|
<q-space />
|
||||||
<q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef"
|
<q-input
|
||||||
outlined debounce="300" placeholder="ค้นหา" >
|
class="col-xs-12 col-sm-3 col-md-2"
|
||||||
|
standout
|
||||||
|
dense
|
||||||
|
v-model="filterKeyword"
|
||||||
|
ref="filterRef"
|
||||||
|
outlined
|
||||||
|
debounce="300"
|
||||||
|
placeholder="ค้นหา"
|
||||||
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon v-if="filterKeyword == ''" name="search" />
|
<q-icon v-if="filterKeyword == ''" name="search" />
|
||||||
<q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
|
<q-icon
|
||||||
|
v-if="filterKeyword !== ''"
|
||||||
|
name="clear"
|
||||||
|
class="cursor-pointer"
|
||||||
|
@click="resetFilter"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
</q-input>
|
</q-input>
|
||||||
<q-select class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" v-model="visibleColumns" multiple outlined
|
<q-select
|
||||||
dense options-dense :display-value="$q.lang.table.columns" emit-value map-options :options="columns"
|
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
|
||||||
option-value="name" options-cover style="min-width: 150px" />
|
v-model="visibleColumns"
|
||||||
|
multiple
|
||||||
|
outlined
|
||||||
|
dense
|
||||||
|
options-dense
|
||||||
|
:display-value="$q.lang.table.columns"
|
||||||
|
emit-value
|
||||||
|
map-options
|
||||||
|
:options="columns"
|
||||||
|
option-value="name"
|
||||||
|
options-cover
|
||||||
|
style="min-width: 150px"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-12 q-pt-sm">
|
<div class="col-12 q-pt-sm">
|
||||||
<d-table :columns="columns" :rows="rows" :filter="filterKeyword" row-key="id" :visible-columns="visibleColumns" >
|
<d-table
|
||||||
|
:columns="columns"
|
||||||
|
:rows="rows"
|
||||||
|
:filter="filterKeyword"
|
||||||
|
row-key="id"
|
||||||
|
:visible-columns="visibleColumns"
|
||||||
|
>
|
||||||
<template v-slot:header="props">
|
<template v-slot:header="props">
|
||||||
<q-tr :props="props">
|
<q-tr :props="props">
|
||||||
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
<q-th v-for="col in props.cols" :key="col.name" :props="props">
|
||||||
|
|
@ -252,45 +298,89 @@ onMounted(async () => {
|
||||||
<q-th auto-width />
|
<q-th auto-width />
|
||||||
</q-tr>
|
</q-tr>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<template v-slot:body="props">
|
<template v-slot:body="props">
|
||||||
<q-tr :props="props" class="cursor-pointer">
|
<q-tr :props="props" class="cursor-pointer">
|
||||||
<q-td key="no" :props="props" @click="openDetail(props.row.id)">
|
<q-td key="no" :props="props" @click="openDetail(props.row.id)">
|
||||||
{{ props.rowIndex + 1 }}
|
{{ props.rowIndex + 1 }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="fullname" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="fullname"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.fullname }}
|
{{ props.row.fullname }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="posNo" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="posNo"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.posNo }}
|
{{ props.row.posNo }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="position" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="position"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.position }}
|
{{ props.row.position }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="positionLevel" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="positionLevel"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.positionLevel }}
|
{{ props.row.positionLevel }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="organizationPositionOld" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="organizationPositionOld"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
<div class="table_ellipsis">
|
<div class="table_ellipsis">
|
||||||
{{ props.row.organizationPositionOld }}
|
{{ props.row.organizationPositionOld }}
|
||||||
</div>
|
</div>
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="organization" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="organization"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
<div class="table_ellipsis">
|
<div class="table_ellipsis">
|
||||||
{{ props.row.organization }}
|
{{ props.row.organization }}
|
||||||
</div>
|
</div>
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="createdAt" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="createdAt"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.createdAt }}
|
{{ props.row.createdAt }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="statusText" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="statusText"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.statusText }}
|
{{ props.row.statusText }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td auto-width>
|
<q-td auto-width>
|
||||||
<q-btn icon="delete" size="14px" flat round dense
|
<q-btn
|
||||||
:color="props.row.status == 'REPORT' || props.row.status == 'DONE' ? 'grey' : 'red-7'"
|
icon="delete"
|
||||||
|
size="14px"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
:color="
|
||||||
|
props.row.status == 'REPORT' || props.row.status == 'DONE'
|
||||||
|
? 'grey'
|
||||||
|
: 'red-7'
|
||||||
|
"
|
||||||
@click="clickDelete(props.row.fullname, props.row.id)"
|
@click="clickDelete(props.row.fullname, props.row.id)"
|
||||||
:disable="props.row.status == 'REPORT' || props.row.status == 'DONE'" >
|
:disable="
|
||||||
|
props.row.status == 'REPORT' || props.row.status == 'DONE'
|
||||||
|
"
|
||||||
|
>
|
||||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
</q-td>
|
</q-td>
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ const rows = ref<ResponseData[]>([]);
|
||||||
const rows2 = ref<ResponseData[]>([]);
|
const rows2 = ref<ResponseData[]>([]);
|
||||||
const filters = ref<ResponseData[]>([]);
|
const filters = ref<ResponseData[]>([]);
|
||||||
|
|
||||||
//ค้นหา คอลัมน์ คอลัมน์ที่แสดง
|
//ค้นหา คอลัมน์ คอลัมน์ที่แสดง
|
||||||
const visibleColumns = ref<string[]>([
|
const visibleColumns = ref<string[]>([
|
||||||
"no",
|
"no",
|
||||||
"fullname",
|
"fullname",
|
||||||
|
|
@ -135,20 +135,30 @@ const columns = ref<QTableProps["columns"]>([
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
||||||
const openModal = () => (modal.value = true);
|
const openModal = () => (modal.value = true);
|
||||||
const closeModal = () => {
|
const closeModal = () => {
|
||||||
modal.value = false
|
modal.value = false;
|
||||||
filterKeyword2.value = ""
|
filterKeyword2.value = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
// เปิดโมเดล
|
// เปิดโมเดล
|
||||||
const openModalOrder = () => {
|
const openModalOrder = () => {
|
||||||
|
console.log(filters.value);
|
||||||
|
|
||||||
openModal();
|
openModal();
|
||||||
const row = filters.value.filter(
|
const row = filters.value.filter(
|
||||||
(r: ResponseData) =>
|
(r: ResponseData) =>
|
||||||
r.status == "WAITTING" || r.status == "PENDING" || r.status == "APPROVE"
|
(r.status == "WAITTING" ||
|
||||||
|
r.status == "PENDING" ||
|
||||||
|
r.status == "APPROVE") &&
|
||||||
|
r.createdAt &&
|
||||||
|
r.organizationPositionOld &&
|
||||||
|
r.positionTypeOld &&
|
||||||
|
r.positionLevel &&
|
||||||
|
r.posNo &&
|
||||||
|
r.salary !== null &&
|
||||||
|
r.organization &&
|
||||||
|
r.createdAt
|
||||||
);
|
);
|
||||||
rows2.value = row;
|
rows2.value = row;
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -170,16 +170,20 @@ const openDetail = (id: string) => {
|
||||||
};
|
};
|
||||||
const openModal = () => (modal.value = true);
|
const openModal = () => (modal.value = true);
|
||||||
const closeModal = () => {
|
const closeModal = () => {
|
||||||
modal.value = false
|
modal.value = false;
|
||||||
filterKeyword2.value = "";
|
filterKeyword2.value = "";
|
||||||
};
|
};
|
||||||
const openModalOrder = () => {
|
const openModalOrder = () => {
|
||||||
openModal();
|
openModal();
|
||||||
const row = rows.value.filter(
|
const row = rows.value.filter(
|
||||||
(item: officerType) =>
|
(item: officerType) =>
|
||||||
item.status == "WAITTING" ||
|
(item.status == "WAITTING" ||
|
||||||
item.status == "PENDING" ||
|
item.status == "PENDING" ||
|
||||||
item.status == "APPROVE"
|
item.status == "APPROVE") &&
|
||||||
|
item.organizationPositionOld &&
|
||||||
|
item.organization &&
|
||||||
|
item.dateStart &&
|
||||||
|
item.dateEnd
|
||||||
);
|
);
|
||||||
rows2.value = row;
|
rows2.value = row;
|
||||||
};
|
};
|
||||||
|
|
@ -213,7 +217,7 @@ const getData = async () => {
|
||||||
}));
|
}));
|
||||||
})
|
})
|
||||||
.catch((e) => {})
|
.catch((e) => {})
|
||||||
.finally(() => {
|
.finally(() => {
|
||||||
hideLoader();
|
hideLoader();
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
@ -246,21 +250,53 @@ onMounted(async () => {
|
||||||
<div class="row q-pa-md">
|
<div class="row q-pa-md">
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="row col-12">
|
<div class="row col-12">
|
||||||
<q-btn @click="openModalOrder" size="14px" flat round color="add" icon="mdi-account-arrow-right" >
|
<q-btn
|
||||||
|
@click="openModalOrder"
|
||||||
|
size="14px"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
color="add"
|
||||||
|
icon="mdi-account-arrow-right"
|
||||||
|
>
|
||||||
<q-tooltip>ส่งไปออกคำสั่งช่วยราชการ</q-tooltip>
|
<q-tooltip>ส่งไปออกคำสั่งช่วยราชการ</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
<q-space />
|
<q-space />
|
||||||
<q-input class="col-xs-12 col-sm-3 col-md-2" standout dense v-model="filterKeyword" ref="filterRef"
|
<q-input
|
||||||
outlined debounce="300" placeholder="ค้นหา" >
|
class="col-xs-12 col-sm-3 col-md-2"
|
||||||
|
standout
|
||||||
|
dense
|
||||||
|
v-model="filterKeyword"
|
||||||
|
ref="filterRef"
|
||||||
|
outlined
|
||||||
|
debounce="300"
|
||||||
|
placeholder="ค้นหา"
|
||||||
|
>
|
||||||
<template v-slot:append>
|
<template v-slot:append>
|
||||||
<q-icon v-if="filterKeyword == ''" name="search" />
|
<q-icon v-if="filterKeyword == ''" name="search" />
|
||||||
<q-icon v-if="filterKeyword !== ''" name="clear" class="cursor-pointer" @click="resetFilter" />
|
<q-icon
|
||||||
|
v-if="filterKeyword !== ''"
|
||||||
|
name="clear"
|
||||||
|
class="cursor-pointer"
|
||||||
|
@click="resetFilter"
|
||||||
|
/>
|
||||||
</template>
|
</template>
|
||||||
</q-input>
|
</q-input>
|
||||||
|
|
||||||
<q-select v-model="visibleColumns" multiple outlined dense options-dense :display-value="$q.lang.table.columns"
|
<q-select
|
||||||
emit-value map-options :options="columns" option-value="name" options-cover style="min-width: 150px"
|
v-model="visibleColumns"
|
||||||
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm" />
|
multiple
|
||||||
|
outlined
|
||||||
|
dense
|
||||||
|
options-dense
|
||||||
|
:display-value="$q.lang.table.columns"
|
||||||
|
emit-value
|
||||||
|
map-options
|
||||||
|
:options="columns"
|
||||||
|
option-value="name"
|
||||||
|
options-cover
|
||||||
|
style="min-width: 150px"
|
||||||
|
class="col-xs-12 col-sm-3 col-md-2 q-ml-sm"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-12 q-pt-sm">
|
<div class="col-12 q-pt-sm">
|
||||||
|
|
@ -291,42 +327,90 @@ onMounted(async () => {
|
||||||
>
|
>
|
||||||
{{ props.row.fullname }}
|
{{ props.row.fullname }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="posNo" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="posNo"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.posNo }}
|
{{ props.row.posNo }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="position" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="position"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.position }}
|
{{ props.row.position }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="positionLevel" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="positionLevel"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.positionLevel }}
|
{{ props.row.positionLevel }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="organizationPositionOld" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="organizationPositionOld"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
<div class="table_ellipsis">
|
<div class="table_ellipsis">
|
||||||
{{ props.row.organizationPositionOld }}
|
{{ props.row.organizationPositionOld }}
|
||||||
</div>
|
</div>
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="organization" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="organization"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
<div class="table_ellipsis">
|
<div class="table_ellipsis">
|
||||||
{{ props.row.organization }}
|
{{ props.row.organization }}
|
||||||
</div>
|
</div>
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="dateStart" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="dateStart"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.dateStart }}
|
{{ props.row.dateStart }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="dateEnd" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="dateEnd"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.dateEnd }}
|
{{ props.row.dateEnd }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="createdAt" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="createdAt"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.createdAt }}
|
{{ props.row.createdAt }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td key="statusText" :props="props" @click="openDetail(props.row.id)" >
|
<q-td
|
||||||
|
key="statusText"
|
||||||
|
:props="props"
|
||||||
|
@click="openDetail(props.row.id)"
|
||||||
|
>
|
||||||
{{ props.row.statusText }}
|
{{ props.row.statusText }}
|
||||||
</q-td>
|
</q-td>
|
||||||
<q-td auto-width>
|
<q-td auto-width>
|
||||||
<q-btn icon="delete" size="14px" flat round dense
|
<q-btn
|
||||||
:color=" props.row.status == 'REPORT' || props.row.status == 'DONE' ? 'grey' : 'red-7' "
|
icon="delete"
|
||||||
|
size="14px"
|
||||||
|
flat
|
||||||
|
round
|
||||||
|
dense
|
||||||
|
:color="
|
||||||
|
props.row.status == 'REPORT' || props.row.status == 'DONE'
|
||||||
|
? 'grey'
|
||||||
|
: 'red-7'
|
||||||
|
"
|
||||||
@click="clickDelete(props.row.fullname, props.row.id)"
|
@click="clickDelete(props.row.fullname, props.row.id)"
|
||||||
:disable=" props.row.status == 'REPORT' || props.row.status == 'DONE' " >
|
:disable="
|
||||||
|
props.row.status == 'REPORT' || props.row.status == 'DONE'
|
||||||
|
"
|
||||||
|
>
|
||||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||||
</q-btn>
|
</q-btn>
|
||||||
</q-td>
|
</q-td>
|
||||||
|
|
|
||||||
|
|
@ -1,84 +1,105 @@
|
||||||
interface listAppointType {
|
interface listAppointType {
|
||||||
personalId:string
|
personalId: string
|
||||||
citizenId:number
|
citizenId: number
|
||||||
fullname:string
|
fullname: string
|
||||||
organizationName:string
|
organizationName: string
|
||||||
orgName:string
|
orgName: string
|
||||||
organizationShortName:string
|
organizationShortName: string
|
||||||
positionNumber:string
|
positionNumber: string
|
||||||
positionPath:string
|
positionPath: string
|
||||||
status:string
|
status: string
|
||||||
createdAt:string
|
createdAt: string
|
||||||
birthday:string
|
birthday: string
|
||||||
|
educationOld: string
|
||||||
|
organizationPositionOld: string
|
||||||
|
positionTypeOld: string
|
||||||
|
positionLevelOld: string
|
||||||
|
positionNumberOld: string
|
||||||
|
salary: number
|
||||||
|
positionDate: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
interface resData {
|
interface resData {
|
||||||
id:string
|
id: string
|
||||||
citizenId:number
|
citizenId: number
|
||||||
prefix:string
|
prefix: string
|
||||||
firstname:string
|
firstname: string
|
||||||
lastname:string
|
lastname: string
|
||||||
organizationName:string
|
organizationName: string
|
||||||
organizationShortName:string
|
organizationShortName: string
|
||||||
positionNumber:string
|
positionNumber: string
|
||||||
positionPath:string
|
positionPath: string
|
||||||
status:string
|
status: string
|
||||||
createdAt:Date
|
createdAt: Date
|
||||||
dateOfBirth:Date
|
dateOfBirth: Date
|
||||||
|
educationOld: string
|
||||||
|
organizationPositionOld: string
|
||||||
|
positionTypeOld: string
|
||||||
|
positionLevelOld: string
|
||||||
|
positionNumberOld: string
|
||||||
|
salary: number
|
||||||
|
positionDate: Date
|
||||||
}
|
}
|
||||||
interface orgFilter{
|
interface orgFilter {
|
||||||
orgName:string
|
orgName: string
|
||||||
status:string
|
status: string
|
||||||
|
educationOld: string
|
||||||
|
organizationPositionOld: string
|
||||||
|
positionTypeOld: string
|
||||||
|
positionLevelOld: string
|
||||||
|
positionNumberOld: string
|
||||||
|
salary: number
|
||||||
|
positionDate: Date
|
||||||
}
|
}
|
||||||
interface appointmentData{
|
interface appointmentData {
|
||||||
citizenId:string
|
citizenId: string
|
||||||
prefixId?:string
|
prefixId?: string
|
||||||
firstname?:string
|
firstname?: string
|
||||||
lastname?:string
|
lastname?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
interface UserData {
|
interface UserData {
|
||||||
personalId: string;
|
personalId: string;
|
||||||
citizenId: string;
|
citizenId: string;
|
||||||
fullname: string;
|
fullname: string;
|
||||||
organizationName: string ;
|
organizationName: string;
|
||||||
orgName: string ;
|
orgName: string;
|
||||||
organizationShortName: string ;
|
organizationShortName: string;
|
||||||
positionNumber: string ;
|
positionNumber: string;
|
||||||
positionPath: string;
|
positionPath: string;
|
||||||
status: string;
|
status: string;
|
||||||
createdAt: string;
|
createdAt: string;
|
||||||
birthday: string;
|
birthday: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
interface ResponseData {
|
||||||
|
data: {
|
||||||
|
result: {
|
||||||
|
citizenId: string
|
||||||
|
profileId: string;
|
||||||
|
prefix: string;
|
||||||
|
firstname: string;
|
||||||
|
lastname: string;
|
||||||
|
organizationPositionOld: string;
|
||||||
|
positionLevelOld: string;
|
||||||
|
positionTypeOld: string;
|
||||||
|
status: string;
|
||||||
|
educationOld: string;
|
||||||
|
positionNumberOld: string;
|
||||||
|
salary: number;
|
||||||
|
reason: string;
|
||||||
|
positionDate: Date;
|
||||||
|
avatar: string;
|
||||||
|
|
||||||
interface ResponseData {
|
|
||||||
data: {
|
|
||||||
result: {
|
|
||||||
citizenId:string
|
|
||||||
profileId: string;
|
|
||||||
prefix: string;
|
|
||||||
firstname: string;
|
|
||||||
lastname: string;
|
|
||||||
organizationPositionOld: string;
|
|
||||||
positionLevelOld: string;
|
|
||||||
positionTypeOld: string;
|
|
||||||
status: string;
|
|
||||||
educationOld: string;
|
|
||||||
positionNumberOld: string;
|
|
||||||
salary: number;
|
|
||||||
reason: string;
|
|
||||||
positionDate: Date;
|
|
||||||
avatar: string;
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
};
|
||||||
|
}
|
||||||
export type {
|
export type {
|
||||||
listAppointType,
|
listAppointType,
|
||||||
resData,
|
resData,
|
||||||
orgFilter,
|
orgFilter,
|
||||||
appointmentData,
|
appointmentData,
|
||||||
UserData,
|
UserData,
|
||||||
ResponseData
|
ResponseData
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -20,6 +20,8 @@ interface listMain {
|
||||||
status: string;
|
status: string;
|
||||||
statustext: string;
|
statustext: string;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
|
amountOld: number;
|
||||||
|
positionDate: Date
|
||||||
}
|
}
|
||||||
//ข้อมูลจาก api
|
//ข้อมูลจาก api
|
||||||
interface listMainAPI {
|
interface listMainAPI {
|
||||||
|
|
@ -44,6 +46,8 @@ interface listMainAPI {
|
||||||
status: string;
|
status: string;
|
||||||
statustext: string;
|
statustext: string;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
|
amountOld: number;
|
||||||
|
positionDate: Date
|
||||||
}
|
}
|
||||||
|
|
||||||
interface OtherdataInterface {
|
interface OtherdataInterface {
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,13 @@ interface ResponseRow {
|
||||||
statusText: string;
|
statusText: string;
|
||||||
createdAt: Date | null;
|
createdAt: Date | null;
|
||||||
dateText: string | null;
|
dateText: string | null;
|
||||||
|
educationOld: string
|
||||||
|
organizationPositionOld: string
|
||||||
|
positionTypeOld: string
|
||||||
|
positionLevelOld: string
|
||||||
|
positionNumberOld: string
|
||||||
|
amountOld: number
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ResponseData {
|
interface ResponseData {
|
||||||
|
|
@ -55,6 +62,7 @@ interface ResponseData {
|
||||||
recruitDate: Date;
|
recruitDate: Date;
|
||||||
salary: number;
|
salary: number;
|
||||||
status: string;
|
status: string;
|
||||||
|
amountOld: number
|
||||||
}
|
}
|
||||||
|
|
||||||
export type { ResponseTitle, ResponseData, ResponseRow };
|
export type { ResponseTitle, ResponseData, ResponseRow };
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,7 @@ interface officerType {
|
||||||
isActive: boolean;
|
isActive: boolean;
|
||||||
dateEnd: string;
|
dateEnd: string;
|
||||||
dateStart: string;
|
dateStart: string;
|
||||||
|
dateRepatriation: Date
|
||||||
|
|
||||||
}
|
}
|
||||||
interface ResponseData {
|
interface ResponseData {
|
||||||
data: {
|
data: {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue