Compare commits
No commits in common. "dev" and "v1.1.92" have entirely different histories.
114 changed files with 446 additions and 2821 deletions
|
|
@ -36,7 +36,6 @@
|
|||
"moment": "^2.29.4",
|
||||
"pdf-lib": "^1.17.1",
|
||||
"pinia": "^2.0.29",
|
||||
"pinia-plugin-persistedstate": "^3.2.3",
|
||||
"quasar": "^2.11.1",
|
||||
"socket.io-client": "^4.7.4",
|
||||
"structure-chart": "^0.0.9",
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -194,7 +194,6 @@ export default {
|
|||
`${orgProfile}${type}/profileid/position`,
|
||||
uploadProfile: (type: string, id: string) =>
|
||||
`${organization}/upload/${type}-profileSalaryTemp/${id}`,
|
||||
sortOrderByDate: `${orgProfile}/salaryTemp/sort-order`,
|
||||
|
||||
workflowCommanderOperate: `${workflow}/commander/operate`,
|
||||
workflowCommanderSign: `${workflow}/commander/sign`,
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ export default {
|
|||
specialTime: () => `${leave}/admin/edit`,
|
||||
specialTimeApprove: (id: string) => `${leave}/admin/edit/approve/${id}`,
|
||||
specialTimeReject: (id: string) => `${leave}/admin/edit/reject/${id}`,
|
||||
specialTimeApproveLists: `${leave}/admin/edit/approve-list`,
|
||||
|
||||
/** รายการลา*/
|
||||
leaveType: () => `${leave}/type`,
|
||||
|
|
@ -64,5 +63,4 @@ export default {
|
|||
`${leave}/report/download/time-records/${type}`,
|
||||
|
||||
leaveTask: `${leave}/admin/leave-task/process`,
|
||||
leavePendingJobs: `${leave}/pending-jobs/`,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -98,9 +98,6 @@ export default {
|
|||
`${env.API_URI}/placement/candidate/pdf/${candidateId}`,
|
||||
|
||||
downloadCandidateExam: (id: string) =>
|
||||
`${exam_report}candidate/candidate-new/${id}`,
|
||||
`${periodExam}download/candidate-exam/${id}`,
|
||||
downloadPassExam: (id: string) => `${periodExam}download/pass-exam/${id}`,
|
||||
|
||||
downloadCandidatePassExam: (id: string) =>
|
||||
`${exam_report}candidate/pass-new/${id}`,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ export default {
|
|||
uploadCandidates: (id: string) => `${recruit}candidate/${id}`,
|
||||
uploadResult: (id: string) => `${recruit}result/${id}`,
|
||||
getImportHistory: (id: string) => `${recruit}history/${id}`,
|
||||
getImportStatus: (jobId: string) => `${recruit}import/status/${jobId}`,
|
||||
|
||||
//upload
|
||||
periodRecruitDoc: (examId: string) => `${recruit}doc/${examId}`,
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import config from "@/app.config";
|
|||
import type { PropType } from "vue";
|
||||
import type { FormProfile } from "@/interface/main";
|
||||
import type { DataProfile } from "@/modules/05_placement/interface/index/Main";
|
||||
import avatarMain from "@/assets/avatar_user.jpg";
|
||||
|
||||
/** importComponents*/
|
||||
import PopupPersonal from "@/components/Dialogs/PopupPersonalNew.vue";
|
||||
|
|
@ -92,11 +91,8 @@ function fetchProfile(id: string, name: string) {
|
|||
if (profile.avatar === "") {
|
||||
http
|
||||
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, `${name}`))
|
||||
.then((res) => {
|
||||
.then(async (res) => {
|
||||
profile.avatar = res.data.downloadUrl;
|
||||
})
|
||||
.catch(() => {
|
||||
profile.avatar = avatarMain;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@
|
|||
round
|
||||
dense
|
||||
@click="close"
|
||||
@keydown.enter.prevent
|
||||
@keydown.space.prevent
|
||||
style="color: #ff8080; background-color: #ffdede"
|
||||
/>
|
||||
</q-toolbar>
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import http from "@/plugins/http";
|
|||
import config from "@/app.config";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useStructureTree } from "@/stores/structureTree";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
|
||||
import type { QTableProps } from "quasar";
|
||||
import type {
|
||||
|
|
@ -263,7 +262,6 @@ async function getDataTable(id: string, level: number = 0) {
|
|||
posType: posType.value ? posType.value : "",
|
||||
isAll: isAll.value,
|
||||
isBlank: isBlank.value,
|
||||
profileId: type.value === "MOVE" ? props.dataRows.profileId : undefined,
|
||||
};
|
||||
|
||||
await http
|
||||
|
|
@ -284,12 +282,12 @@ async function getDataTable(id: string, level: number = 0) {
|
|||
const listPosNo: DataPositionNo[] = dataMain.map((e: PositionMain) => ({
|
||||
id: e.id,
|
||||
isPosition: e.isPosition,
|
||||
posMasterNo: formatPosmasterNo(
|
||||
e.orgShortname,
|
||||
e.posMasterNoPrefix,
|
||||
e.posMasterNo.toString(),
|
||||
e.posMasterNoSuffix
|
||||
),
|
||||
posMasterNo:
|
||||
e.orgShortname +
|
||||
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
|
||||
" " +
|
||||
e.posMasterNo +
|
||||
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
|
||||
positionName: e.positionName,
|
||||
posTypeName: e.posTypeName,
|
||||
posLevelName: e.posLevelName,
|
||||
|
|
@ -514,7 +512,6 @@ function onSubmit() {
|
|||
posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
|
||||
posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
|
||||
posExecutiveName: selectedPos.value[0].posExecutiveName, //ชื่อตำแหน่ง
|
||||
posExecutiveId: selectedPos.value[0].posExecutiveId, //ชื่อตำแหน่ง
|
||||
reportingDate: convertDateToAPI(datePos.value),
|
||||
posmasterId: dataPosMaster.id,
|
||||
typeCommand: type.value,
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ import http from "@/plugins/http";
|
|||
import config from "@/app.config";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useStructureTree } from "@/stores/structureTree";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
|
||||
import type { QTableProps } from "quasar";
|
||||
import type {
|
||||
|
|
@ -233,8 +232,7 @@ function close() {
|
|||
|
||||
async function getDataTable(id: string, level: number = 0) {
|
||||
showLoader();
|
||||
positionNo.value = [];
|
||||
rowsData.value = [];
|
||||
|
||||
const body = {
|
||||
node: level,
|
||||
nodeId: id,
|
||||
|
|
@ -264,12 +262,11 @@ async function getDataTable(id: string, level: number = 0) {
|
|||
const listPosNo: DataPositionNo[] = dataMain.map((e: PositionMain) => ({
|
||||
id: e.id,
|
||||
isPosition: e.isPosition,
|
||||
posMasterNo: formatPosmasterNo(
|
||||
e.orgShortname,
|
||||
e.posMasterNoPrefix,
|
||||
e.posMasterNo.toString(),
|
||||
e.posMasterNoSuffix
|
||||
),
|
||||
posMasterNo:
|
||||
e.orgShortname +
|
||||
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
|
||||
e.posMasterNo +
|
||||
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
|
||||
positionName: e.positionName,
|
||||
posTypeName: e.posTypeName,
|
||||
posLevelName: e.posLevelName,
|
||||
|
|
@ -305,7 +302,9 @@ async function getDataTable(id: string, level: number = 0) {
|
|||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
setTimeout(() => {
|
||||
hideLoader();
|
||||
}, 1000);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import type {
|
|||
GovermentEmpTemp,
|
||||
} from "@/components/information/interface/response/Government";
|
||||
import type { Avatar } from "@/components/information/interface/response/avatar";
|
||||
import avatarMain from "@/assets/avatar_user.jpg";
|
||||
|
||||
/** importStore*/
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
|
@ -168,9 +167,9 @@ async function fetchInformation(id: string) {
|
|||
avatar.position = data.position ? data.position : "-";
|
||||
//ถ้ามีรูปเรียก Function fetchProfile เรียกข้อมูลรูปโปรไฟล์
|
||||
if (data.avatarName) {
|
||||
fetchProfile(data.id as string, data.avatarName);
|
||||
await fetchProfile(data.id as string, data.avatarName);
|
||||
} else {
|
||||
avatar.avatar = avatarMain;
|
||||
avatar.avatar = "";
|
||||
}
|
||||
|
||||
if (props.id) {
|
||||
|
|
@ -261,14 +260,11 @@ async function fetchProfileGovTemp(id: string) {
|
|||
* @param id profileID
|
||||
* @param avatarName ชื่อไฟล์
|
||||
*/
|
||||
function fetchProfile(id: string, avatarName: string) {
|
||||
http
|
||||
async function fetchProfile(id: string, avatarName: string) {
|
||||
await http
|
||||
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
|
||||
.then((res) => {
|
||||
avatar.avatar = res.data.downloadUrl;
|
||||
})
|
||||
.catch(() => {
|
||||
avatar.avatar = avatarMain;
|
||||
.then(async (res) => {
|
||||
avatar.avatar = await res.data.downloadUrl;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,6 @@ import th from "quasar/lang/th";
|
|||
import "@vuepic/vue-datepicker/dist/main.css";
|
||||
import http from "./plugins/http";
|
||||
import { createPinia } from "pinia";
|
||||
import piniaPluginPersistedstate from "pinia-plugin-persistedstate";
|
||||
|
||||
// import './assets/main.css'
|
||||
|
||||
|
|
@ -21,7 +20,6 @@ import filters from "./plugins/filters";
|
|||
|
||||
const app = createApp(App);
|
||||
const pinia = createPinia();
|
||||
pinia.use(piniaPluginPersistedstate);
|
||||
|
||||
// เพิ่ม Global Filters ลงใน App
|
||||
app.config.globalProperties.$filters = filters;
|
||||
|
|
|
|||
|
|
@ -89,11 +89,6 @@ const formData = reactive<FormDataAgency>({
|
|||
DIVISION_CODE: "",
|
||||
SECTION_CODE: "",
|
||||
JOB_CODE: "",
|
||||
ROOT_CODE: "",
|
||||
CHILD1_CODE: "",
|
||||
CHILD2_CODE: "",
|
||||
CHILD3_CODE: "",
|
||||
CHILD4_CODE: "",
|
||||
});
|
||||
|
||||
/**
|
||||
|
|
@ -165,11 +160,6 @@ function onSubmit() {
|
|||
DIVISION_CODE: formData.DIVISION_CODE,
|
||||
SECTION_CODE: formData.SECTION_CODE,
|
||||
JOB_CODE: formData.JOB_CODE,
|
||||
ROOT_CODE: formData.ROOT_CODE,
|
||||
CHILD1_CODE: formData.CHILD1_CODE,
|
||||
CHILD2_CODE: formData.CHILD2_CODE,
|
||||
CHILD3_CODE: formData.CHILD3_CODE,
|
||||
CHILD4_CODE: formData.CHILD4_CODE,
|
||||
};
|
||||
|
||||
// เพิ่มข้อมูล
|
||||
|
|
@ -199,20 +189,18 @@ function onSubmit() {
|
|||
body
|
||||
)
|
||||
.then(async () => {
|
||||
await Promise.all([
|
||||
await props.fetchDataTree(store.draftId),
|
||||
await props.fetchDataTree(store.draftId);
|
||||
await props.edit?.(
|
||||
props.dataNode?.orgTreeId,
|
||||
type,
|
||||
body,
|
||||
props.dataNode?.orgRootCode
|
||||
),
|
||||
);
|
||||
await props.fetchDataTable(
|
||||
props?.dataNode?.orgTreeId,
|
||||
props?.dataNode?.orgLevel,
|
||||
false
|
||||
),
|
||||
]);
|
||||
);
|
||||
await success($q, "บันทึกข้อมูลสำเร็จ");
|
||||
closeClear();
|
||||
})
|
||||
|
|
@ -243,11 +231,6 @@ function closeClear() {
|
|||
formData.isCommission = false;
|
||||
formData.isInformation = false;
|
||||
formData.misId = "";
|
||||
formData.ROOT_CODE = "";
|
||||
formData.CHILD1_CODE = "";
|
||||
formData.CHILD2_CODE = "";
|
||||
formData.CHILD3_CODE = "";
|
||||
formData.CHILD4_CODE = "";
|
||||
formData.DEPARTMENT_CODE = "";
|
||||
formData.DIVISION_CODE = "";
|
||||
formData.SECTION_CODE = "";
|
||||
|
|
@ -473,7 +456,6 @@ watch(
|
|||
else {
|
||||
props.dataNode?.orgLevel === 1 && checkOfficer();
|
||||
if (props.dataNode) {
|
||||
console.log(props.dataNode);
|
||||
formData.orgName = props.dataNode.orgTreeName;
|
||||
formData.orgShortName = props.dataNode.orgTreeShortName;
|
||||
formData.orgCode = props.dataNode.orgTreeCode;
|
||||
|
|
@ -492,11 +474,6 @@ watch(
|
|||
formData.DIVISION_CODE = props.dataNode.DIVISION_CODE;
|
||||
formData.SECTION_CODE = props.dataNode.SECTION_CODE;
|
||||
formData.JOB_CODE = props.dataNode.JOB_CODE;
|
||||
formData.ROOT_CODE = props.dataNode.ROOT_CODE;
|
||||
formData.CHILD1_CODE = props.dataNode.CHILD1_CODE;
|
||||
formData.CHILD2_CODE = props.dataNode.CHILD2_CODE;
|
||||
formData.CHILD3_CODE = props.dataNode.CHILD3_CODE;
|
||||
formData.CHILD4_CODE = props.dataNode.CHILD4_CODE;
|
||||
orgLevelOption.value =
|
||||
props.dataNode.orgTreeRank === "DEPARTMENT"
|
||||
? orgLevelOptionMain.value
|
||||
|
|
@ -753,66 +730,6 @@ watch(
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<div class="col-12 row q-col-gutter-sm">
|
||||
<div class="col">
|
||||
<q-input
|
||||
v-model="formData.ROOT_CODE"
|
||||
dense
|
||||
outlined
|
||||
label="ROOT CODE"
|
||||
hide-bottom-space
|
||||
:class="classInput(false)"
|
||||
maxlength="3"
|
||||
/>
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-input
|
||||
v-model="formData.CHILD1_CODE"
|
||||
dense
|
||||
outlined
|
||||
label="CHILD1 CODE"
|
||||
hide-bottom-space
|
||||
:class="classInput(false)"
|
||||
maxlength="3"
|
||||
/>
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-input
|
||||
v-model="formData.CHILD2_CODE"
|
||||
dense
|
||||
outlined
|
||||
label="CHILD2 CODE"
|
||||
hide-bottom-space
|
||||
:class="classInput(false)"
|
||||
maxlength="3"
|
||||
/>
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-input
|
||||
v-model="formData.CHILD3_CODE"
|
||||
dense
|
||||
outlined
|
||||
label="CHILD3 CODE"
|
||||
hide-bottom-space
|
||||
:class="classInput(false)"
|
||||
maxlength="3"
|
||||
/>
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-input
|
||||
v-model="formData.CHILD4_CODE"
|
||||
dense
|
||||
outlined
|
||||
label="CHILD4 CODE"
|
||||
hide-bottom-space
|
||||
:class="classInput(false)"
|
||||
maxlength="3"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<q-input
|
||||
v-model="formData.responsibility"
|
||||
|
|
|
|||
|
|
@ -213,9 +213,7 @@ function formatHistoryOwnerData(data: HistoryPos[]) {
|
|||
return data.map((item) => ({
|
||||
...item,
|
||||
fullname: item.firstName
|
||||
? `${item.prefix || ""}${item.firstName || ""} ${
|
||||
item.lastName || ""
|
||||
}`.trim()
|
||||
? `${item.prefix}${item.firstName} ${item.lastName}`.trim()
|
||||
: "ว่าง",
|
||||
}));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ const modal = defineModel<boolean>("modal", { required: true });
|
|||
let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
|
||||
const totalPage = defineModel<number>("totalPage", { required: true });
|
||||
const nodeTree = defineModel<OrgTree[]>("nodeTree", { required: true });
|
||||
const columns = defineModel<QTableProps['columns']>("columns", {});
|
||||
const columns = defineModel<QTableProps[]>("columns", {});
|
||||
const rows = defineModel<PosMaster2[]>("rows", { required: true });
|
||||
const props = defineProps({
|
||||
fetchDataTree: {
|
||||
|
|
|
|||
|
|
@ -36,11 +36,6 @@ const formData = reactive({
|
|||
responsibility: "", //หน้าที่ความรับผิดชอบ
|
||||
isCommission: "", //สำนักปลัด
|
||||
isDeputy: "", //สำนักงาน กก.
|
||||
rootCode: "", //ROOT CODE
|
||||
child1Code: "", //CHILD1 CODE
|
||||
child2Code: "", //CHILD2 CODE
|
||||
child3Code: "", //CHILD3 CODE
|
||||
child4Code: "", //CHILD4 CODE
|
||||
});
|
||||
|
||||
/**
|
||||
|
|
@ -81,11 +76,6 @@ async function fetchDetailTree(id: string, type: string) {
|
|||
formData.responsibility = data.responsibility ? data.responsibility : "-";
|
||||
formData.isDeputy = data.isDeputy ? "ใช่" : "-";
|
||||
formData.isCommission = data.isCommission ? "ใช่" : "-";
|
||||
formData.rootCode = data.ROOT_CODE ? data.ROOT_CODE : "-";
|
||||
formData.child1Code = data.CHILD1_CODE ? data.CHILD1_CODE : "-";
|
||||
formData.child2Code = data.CHILD2_CODE ? data.CHILD2_CODE : "-";
|
||||
formData.child3Code = data.CHILD3_CODE ? data.CHILD3_CODE : "-";
|
||||
formData.child4Code = data.CHILD4_CODE ? data.CHILD4_CODE : "-";
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
|
|
@ -218,41 +208,6 @@ watch(
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-sm q-mb-xs">
|
||||
<div class="col-4 text-bold">ROOT CODE</div>
|
||||
<div class="col-8 text-grey-8">
|
||||
<p>{{ formData.rootCode }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-sm q-mb-xs">
|
||||
<div class="col-4 text-bold">CHILD1 CODE</div>
|
||||
<div class="col-8 text-grey-8">
|
||||
<p>{{ formData.child1Code }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-sm q-mb-xs">
|
||||
<div class="col-4 text-bold">CHILD2 CODE</div>
|
||||
<div class="col-8 text-grey-8">
|
||||
<p>{{ formData.child2Code }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-sm q-mb-xs">
|
||||
<div class="col-4 text-bold">CHILD3 CODE</div>
|
||||
<div class="col-8 text-grey-8">
|
||||
<p>{{ formData.child3Code }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-sm q-mb-xs">
|
||||
<div class="col-4 text-bold">CHILD4 CODE</div>
|
||||
<div class="col-8 text-grey-8">
|
||||
<p>{{ formData.child4Code }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row q-col-gutter-sm q-mb-xs">
|
||||
<div class="col-4 text-bold">หน้าที่ความรับผิดชอบ</div>
|
||||
<div class="col-8 text-grey-8">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import { checkPermission } from "@/utils/permissions";
|
|||
import { updateCurrentPage } from "@/utils/function";
|
||||
import { useOrganizational } from "@/modules/02_organization/store/organizational";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
|
||||
/** importType*/
|
||||
import type { QTableProps } from "quasar";
|
||||
|
|
@ -206,14 +205,6 @@ const columns = ref<QTableProps["columns"]>([
|
|||
sortable: false,
|
||||
field: "posMasterNo",
|
||||
headerStyle: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortname,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNoMain,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
},
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
|
|
@ -1133,7 +1124,7 @@ watch(
|
|||
<DialogMovePos
|
||||
v-model:modal="modalDialogMMove"
|
||||
v-model:nodeTree="nodeTree"
|
||||
v-model:columns="columns"
|
||||
v-model:columns="columns as QTableProps[]"
|
||||
v-model:rows="posMaster"
|
||||
v-model:totalPage="totalPage"
|
||||
v-model:reqMaster="reqMaster"
|
||||
|
|
|
|||
|
|
@ -44,11 +44,6 @@ interface FormDataAgency {
|
|||
DIVISION_CODE: string;
|
||||
SECTION_CODE: string;
|
||||
JOB_CODE: string;
|
||||
ROOT_CODE: string;
|
||||
CHILD1_CODE: string;
|
||||
CHILD2_CODE: string;
|
||||
CHILD3_CODE: string;
|
||||
CHILD4_CODE: string;
|
||||
}
|
||||
|
||||
interface FormDataPosition {
|
||||
|
|
|
|||
|
|
@ -108,11 +108,6 @@ export const useOrganizational = defineStore("organizationalStore", () => {
|
|||
posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName,
|
||||
posExecutiveName: e.posExecutiveName,
|
||||
isSit: e.isSit,
|
||||
orgShortname: e.orgShortname,
|
||||
posMasterNoPrefix: e.posMasterNoPrefix,
|
||||
posMasterNoSuffix: e.posMasterNoSuffix,
|
||||
posMasterNoMain: e.posMasterNo,
|
||||
|
||||
}));
|
||||
|
||||
return newPosMaster || [];
|
||||
|
|
|
|||
|
|
@ -56,7 +56,6 @@ const optionsStatus = ref<ExamResultOption[]>([
|
|||
{ label: "ขาดสอบ", value: "missed_exam" },
|
||||
{ label: "ผ่าน", value: "pass" },
|
||||
{ label: "ไม่ผ่าน", value: "notpass" },
|
||||
{ label: "อื่น ๆ", value: "other" },
|
||||
]);
|
||||
|
||||
const emit = defineEmits([
|
||||
|
|
|
|||
|
|
@ -363,59 +363,37 @@ async function downloadFileDashboard() {
|
|||
}
|
||||
|
||||
async function clickPassExam() {
|
||||
try {
|
||||
showLoader();
|
||||
const res = await http.get(
|
||||
config.API.downloadCandidatePassExam(examId.value),
|
||||
{
|
||||
headers: {
|
||||
"Content-Type": "application/pdf",
|
||||
Accept: "application/pdf",
|
||||
},
|
||||
responseType: "blob",
|
||||
}
|
||||
);
|
||||
const url = window.URL.createObjectURL(new Blob([res.data]));
|
||||
const link = document.createElement("a");
|
||||
link.href = url;
|
||||
link.setAttribute(
|
||||
"download",
|
||||
`Candidate_Dashboard_${dateToISO(new Date())}` + ".pdf"
|
||||
);
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
document.body.removeChild(link);
|
||||
window.URL.revokeObjectURL(url);
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
await http
|
||||
.get(config.API.downloadPassExam(examId.value))
|
||||
.then(async (res) => {
|
||||
const data = res.data.result;
|
||||
data.reportName = `Candidate_Dashboard_${dateToISO(new Date())}`;
|
||||
await genReport(data, data.reportName, "pdf");
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function clickCandidateList() {
|
||||
try {
|
||||
showLoader();
|
||||
const res = await http.get(config.API.downloadCandidateExam(examId.value), {
|
||||
headers: {
|
||||
"Content-Type": "application/pdf",
|
||||
Accept: "application/pdf",
|
||||
},
|
||||
responseType: "blob",
|
||||
});
|
||||
const url = window.URL.createObjectURL(new Blob([res.data]));
|
||||
const link = document.createElement("a");
|
||||
link.href = url;
|
||||
link.setAttribute("download", "รายชื่อผู้มีสิทธิ์สอบ" + ".pdf");
|
||||
document.body.appendChild(link);
|
||||
link.click();
|
||||
document.body.removeChild(link);
|
||||
window.URL.revokeObjectURL(url);
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
await http
|
||||
.get(config.API.downloadCandidateExam(examId.value))
|
||||
.then(async (res) => {
|
||||
const data = res.data.result;
|
||||
data.reportName = `Candidate_Dashboard_${dateToISO(new Date())}`;
|
||||
await genReport(data, data.reportName, "pdf");
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function onCheckShowExaminfo() {
|
||||
|
|
@ -571,20 +549,8 @@ watch(
|
|||
</q-btn>
|
||||
</div>
|
||||
<div>
|
||||
<q-btn
|
||||
icon="mdi-download"
|
||||
round
|
||||
color="green-6"
|
||||
flat
|
||||
:disable="attrs.rows.length === 0"
|
||||
>
|
||||
<q-tooltip>
|
||||
{{
|
||||
attrs.rows.length !== 0
|
||||
? "ดาวน์โหลดไฟล์"
|
||||
: "ไม่มีข้อมูลผู้สอบคัดเลือก"
|
||||
}}</q-tooltip
|
||||
>
|
||||
<q-btn icon="mdi-download" round color="green-6" flat>
|
||||
<q-tooltip>ดาวน์โหลดไฟล์</q-tooltip>
|
||||
<q-menu>
|
||||
<q-list style="min-width: 100px">
|
||||
<!-- <q-item clickable v-close-popup @click="downloadFileDashboard">
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@ interface RequestPeriodCompete {
|
|||
order: number;
|
||||
year: number;
|
||||
announcementDate: string | null;
|
||||
rootDnaId: string;
|
||||
scoreExpireDate: string | null;
|
||||
}
|
||||
|
||||
interface RequestPeriodDisable {
|
||||
|
|
@ -65,8 +63,6 @@ interface RequestPeriodDisable {
|
|||
round: number;
|
||||
year: number;
|
||||
announcementDate: string | null;
|
||||
rootDnaId: string;
|
||||
scoreExpireDate: string | null;
|
||||
}
|
||||
|
||||
interface RequestPosition {
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ export default [
|
|||
component: PeriodDisable,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: "SYS_EXAM_SELECT_PERIOD_DIS",
|
||||
Key: "SYS_EXAM_SELECT_LISTNAME",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
|
|
@ -242,7 +242,7 @@ export default [
|
|||
component: PeriodDisableAdd,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: "SYS_EXAM_SELECT_PERIOD_DIS",
|
||||
Key: "SYS_EXAM_SELECT_LISTNAME",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
|
|
@ -252,7 +252,7 @@ export default [
|
|||
component: PeriodDisableAdd,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: "SYS_EXAM_SELECT_PERIOD_DIS",
|
||||
Key: "SYS_EXAM_SELECT_LISTNAME",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
|
|
@ -262,7 +262,7 @@ export default [
|
|||
component: MainDisableDetail,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: "SYS_EXAM_SELECT_PERIOD_DIS",
|
||||
Key: "SYS_EXAM_SELECT_LISTNAME",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
|
|
@ -272,7 +272,7 @@ export default [
|
|||
component: MainDisableEx,
|
||||
meta: {
|
||||
Auth: true,
|
||||
Key: "SYS_EXAM_SELECT_PERIOD_DIS",
|
||||
Key: "SYS_EXAM_SELECT_LISTNAME",
|
||||
Role: "STAFF",
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<!-- page:จัดการรอบการสอบ สรรหา -->
|
||||
<script setup lang="ts">
|
||||
import type { QTableProps } from "quasar";
|
||||
import { onMounted, ref, watch } from "vue";
|
||||
import { onMounted, ref } from "vue";
|
||||
import { useRouter } from "vue-router";
|
||||
import { useQuasar } from "quasar";
|
||||
import genReport from "@/plugins/genreport";
|
||||
|
|
@ -11,9 +11,6 @@ import config from "@/app.config";
|
|||
import { checkPermission } from "@/utils/permissions";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
import { useUploadProgressStore } from "@/stores/uploadProgress";
|
||||
import { useSocketStore } from "@/stores/socket";
|
||||
import { storeToRefs } from "pinia";
|
||||
|
||||
import type { Pagination } from "@/modules/03_recruiting/interface/index/Main";
|
||||
import type {
|
||||
|
|
@ -36,14 +33,9 @@ const {
|
|||
messageError,
|
||||
onSearchDataTable,
|
||||
dialogRemove,
|
||||
dialogMessage,
|
||||
} = mixin;
|
||||
|
||||
const router = useRouter();
|
||||
const uploadProgress = useUploadProgressStore();
|
||||
const socketStore = useSocketStore();
|
||||
const { notificationCounter } = storeToRefs(socketStore);
|
||||
|
||||
const name = ref<string>("");
|
||||
const year = ref<number>(calculateFiscalYear(new Date()) + 543);
|
||||
const order = ref<number>(1);
|
||||
|
|
@ -57,11 +49,6 @@ const modalScore = ref<boolean>(false);
|
|||
const modalCandidate = ref<boolean>(false);
|
||||
const modalResult = ref<boolean>(false);
|
||||
const selected_row_id = ref<string>("");
|
||||
const jobStatus = ref<{
|
||||
candidate?: "running" | "completed" | "failed";
|
||||
score?: "running" | "completed" | "failed";
|
||||
result?: "running" | "completed" | "failed";
|
||||
}>({});
|
||||
const rowsHistory = ref<ResponseHistoryObject[]>([]); //select data history
|
||||
const tittleHistory = ref<string>("ประวัติการนำเข้าข้อมูล"); //
|
||||
const filterHistory = ref<string>(""); //search data table history
|
||||
|
|
@ -75,54 +62,6 @@ const textTittle = ref<string>("");
|
|||
const textTittleScore = ref<string>("");
|
||||
const textTittleCandidate = ref<string>("");
|
||||
const textTittleResult = ref<string>("");
|
||||
|
||||
// Dialog message constants
|
||||
const UPLOAD_RUNNING_DIALOG = {
|
||||
title: "ไม่สามารถอัปโหลดไฟล์ได้",
|
||||
message: "อยู่ระหว่างนำเข้าข้อมูล ระบบจะแจ้งผลให้ทราบทันทีเมื่อเสร็จสิ้น",
|
||||
icon: "mdi-progress-alert",
|
||||
btnLabel: "ตกลง",
|
||||
color: "primary",
|
||||
};
|
||||
|
||||
const UPLOAD_SUCCESS_DIALOG = {
|
||||
title: "อัปโหลดไฟล์สำเร็จ",
|
||||
message:
|
||||
"ระบบกำลังนำเข้าข้อมูลคุณสามารถใช้งานเมนูอื่นในระหว่างนี้ได้ โดยระบบจะแจ้งผลการดำเนินการให้ทราบทันทีเมื่อเสร็จสิ้น",
|
||||
icon: "check",
|
||||
btnLabel: "ตกลง",
|
||||
color: "primary",
|
||||
};
|
||||
|
||||
// Function to show upload running dialog
|
||||
function showUploadRunningDialog() {
|
||||
dialogMessage(
|
||||
$q,
|
||||
UPLOAD_RUNNING_DIALOG.title,
|
||||
UPLOAD_RUNNING_DIALOG.message,
|
||||
UPLOAD_RUNNING_DIALOG.icon,
|
||||
UPLOAD_RUNNING_DIALOG.btnLabel,
|
||||
UPLOAD_RUNNING_DIALOG.color,
|
||||
undefined,
|
||||
undefined,
|
||||
true
|
||||
);
|
||||
}
|
||||
|
||||
// Function to show upload success dialog
|
||||
function showUploadSuccessDialog() {
|
||||
dialogMessage(
|
||||
$q,
|
||||
UPLOAD_SUCCESS_DIALOG.title,
|
||||
UPLOAD_SUCCESS_DIALOG.message,
|
||||
UPLOAD_SUCCESS_DIALOG.icon,
|
||||
UPLOAD_SUCCESS_DIALOG.btnLabel,
|
||||
UPLOAD_SUCCESS_DIALOG.color,
|
||||
undefined,
|
||||
undefined,
|
||||
true
|
||||
);
|
||||
}
|
||||
const rows = ref<ResponseRecruitPeriod[]>([]);
|
||||
const rowsData = ref<ResponseRecruitPeriod[]>([]);
|
||||
const initialPagination = ref<Pagination>({
|
||||
|
|
@ -396,15 +335,9 @@ function clickDetail(id: string) {
|
|||
* @param id รอบสอบเเข่งขัน
|
||||
*/
|
||||
async function clickUpload(id: string) {
|
||||
selected_row_id.value = id;
|
||||
const isRunning = await checkJobStatus(id, "candidate");
|
||||
|
||||
if (isRunning) {
|
||||
showUploadRunningDialog();
|
||||
} else {
|
||||
modalCandidate.value = true;
|
||||
textTittleCandidate.value = "นำเข้าผู้สมัครสอบแข่งขัน";
|
||||
}
|
||||
selected_row_id.value = id;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -412,15 +345,9 @@ async function clickUpload(id: string) {
|
|||
* @param id รอบสอบเเข่งขัน
|
||||
*/
|
||||
async function clickEdit(id: string) {
|
||||
selected_row_id.value = id;
|
||||
const isRunning = await checkJobStatus(id, "score");
|
||||
|
||||
if (isRunning) {
|
||||
showUploadRunningDialog();
|
||||
} else {
|
||||
modalScore.value = true;
|
||||
textTittleScore.value = "นำเข้าบัญชีรวมคะแนน";
|
||||
}
|
||||
selected_row_id.value = id;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -428,57 +355,9 @@ async function clickEdit(id: string) {
|
|||
* @param id รอบสอบเเข่งขัน
|
||||
*/
|
||||
async function clickResult(id: string) {
|
||||
selected_row_id.value = id;
|
||||
const isRunning = await checkJobStatus(id, "result");
|
||||
|
||||
if (isRunning) {
|
||||
showUploadRunningDialog();
|
||||
} else {
|
||||
modalResult.value = true;
|
||||
textTittleResult.value = "นำเข้าไฟล์ผลการสอบ";
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* ตรวจสอบสถานะการนำเข้าข้อมูล
|
||||
* @param id รอบสอบเเข่งขัน
|
||||
* @param type ประเภทไฟล์ที่ต้องการตรวจสอบ
|
||||
* @return true ถ้ากำลัง running, false ถ้าไม่มี job หรือ job เสร็จแล้ว
|
||||
*/
|
||||
async function checkJobStatus(
|
||||
id: string,
|
||||
type: "candidate" | "score" | "result"
|
||||
): Promise<boolean> {
|
||||
const uploads = uploadProgress.pendingUploads.filter(
|
||||
(u) => u.periodId === id && u.type === type
|
||||
);
|
||||
|
||||
let hasRunningJob = false;
|
||||
|
||||
for (const upload of uploads) {
|
||||
try {
|
||||
const res = await http.get(config.API.getImportStatus(upload.jobId));
|
||||
const status = res.data.result.status.toLowerCase(); // 'running', 'completed', 'failed'
|
||||
|
||||
if (status === "completed" || status === "failed") {
|
||||
status === "completed" && fetchData();
|
||||
uploadProgress.removeUpload(upload.jobId);
|
||||
} else if (status === "running") {
|
||||
jobStatus.value[type] = "running";
|
||||
hasRunningJob = true;
|
||||
}
|
||||
} catch (e) {
|
||||
// if error, remove from pending
|
||||
uploadProgress.removeUpload(upload.jobId);
|
||||
}
|
||||
}
|
||||
|
||||
// if no running jobs, clear status
|
||||
if (!uploadProgress.isUploading(id, type)) {
|
||||
jobStatus.value[type] = undefined;
|
||||
}
|
||||
|
||||
return hasRunningJob;
|
||||
selected_row_id.value = id;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -584,13 +463,11 @@ async function checkSaveCandidate() {
|
|||
await http
|
||||
.post(config.API.uploadCandidates(selected_row_id.value), fd)
|
||||
.then((res) => {
|
||||
const jobId = res.data.result.jobId;
|
||||
uploadProgress.addUpload(jobId, selected_row_id.value, "candidate");
|
||||
success($q, UPLOAD_SUCCESS_DIALOG.message);
|
||||
|
||||
success($q, "นำเข้าข้อมูลผู้สมัครสอบสำเร็จ");
|
||||
modalCandidate.value = false;
|
||||
files_candidate.value = null;
|
||||
selected_row_id.value = "";
|
||||
fetchData();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -600,7 +477,7 @@ async function checkSaveCandidate() {
|
|||
});
|
||||
}
|
||||
|
||||
/** บันทึด คะเแนน */
|
||||
/** บันทึด คะเเนน */
|
||||
async function checkSaveScore() {
|
||||
const fd = new FormData();
|
||||
fd.append("attachment", files_score.value[0]);
|
||||
|
|
@ -608,12 +485,11 @@ async function checkSaveScore() {
|
|||
await http
|
||||
.post(config.API.saveScores(selected_row_id.value), fd)
|
||||
.then((res) => {
|
||||
const jobId = res.data.result.jobId;
|
||||
uploadProgress.addUpload(jobId, selected_row_id.value, "score");
|
||||
success($q, UPLOAD_SUCCESS_DIALOG.message);
|
||||
success($q, "นำเข้าข้อมูลผลคะแนนสอบสำเร็จ");
|
||||
modalScore.value = false;
|
||||
files_score.value = null;
|
||||
selected_row_id.value = "";
|
||||
fetchData();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -631,12 +507,11 @@ async function checkSaveResult() {
|
|||
await http
|
||||
.post(config.API.uploadResult(selected_row_id.value), fd)
|
||||
.then((res) => {
|
||||
const jobId = res.data.result.jobId;
|
||||
uploadProgress.addUpload(jobId, selected_row_id.value, "result");
|
||||
success($q, UPLOAD_SUCCESS_DIALOG.message);
|
||||
success($q, "นำเข้าข้อมูลผลการสอบแข่งขันฯ (บัญชีรายชื่อ)");
|
||||
modalResult.value = false;
|
||||
files_result.value = null;
|
||||
selected_row_id.value = "";
|
||||
fetchData();
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -657,9 +532,6 @@ async function checkSave() {
|
|||
await http
|
||||
.post(config.API.saveCandidates, fd)
|
||||
.then((res) => {
|
||||
const jobId = res.data.result.jobId;
|
||||
uploadProgress.addUpload(jobId, selected_row_id.value, "period");
|
||||
|
||||
success($q, "นำเข้าข้อมูลผู้สมัครสอบแข่งขันสำเร็จ");
|
||||
modalAdd.value = false;
|
||||
fetchData();
|
||||
|
|
@ -685,18 +557,12 @@ onMounted(async () => {
|
|||
hideLoader();
|
||||
await fetchData();
|
||||
});
|
||||
|
||||
/** Watch notification counter on socket */
|
||||
watch(notificationCounter, () => {
|
||||
fetchData();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="toptitle text-dark col-12 row items-center">
|
||||
จัดการรอบสอบแข่งขัน
|
||||
</div>
|
||||
|
||||
<q-card flat bordered class="col-12 q-mt-sm q-pt-sm q-pa-md">
|
||||
<div>
|
||||
<Table
|
||||
|
|
@ -803,16 +669,16 @@ watch(notificationCounter, () => {
|
|||
</div>
|
||||
<div v-else-if="col.name == 'examCount'" class="table_ellipsis2">
|
||||
<q-btn
|
||||
v-if="
|
||||
(col.value == null || col.value == '0') &&
|
||||
checkPermission($route)?.attrIsUpdate
|
||||
"
|
||||
flat
|
||||
dense
|
||||
size="12px"
|
||||
color="green"
|
||||
round
|
||||
@click.stop.prevent="clickUpload(props.row.id)"
|
||||
v-if="
|
||||
(col.value == null || col.value == '0') &&
|
||||
checkPermission($route)?.attrIsUpdate
|
||||
"
|
||||
>
|
||||
<q-icon name="mdi-file-excel-outline" size="20px" />
|
||||
<q-tooltip>นำเข้าไฟล์ผู้สมัครสอบ</q-tooltip>
|
||||
|
|
@ -849,9 +715,6 @@ watch(notificationCounter, () => {
|
|||
</div>
|
||||
<div v-else-if="col.name == 'scoreCount'" class="table_ellipsis2">
|
||||
<q-btn
|
||||
v-if="
|
||||
col.value == null && checkPermission($route)?.attrIsUpdate
|
||||
"
|
||||
:disable="props.row.examCount == 0"
|
||||
flat
|
||||
dense
|
||||
|
|
@ -859,6 +722,9 @@ watch(notificationCounter, () => {
|
|||
round
|
||||
color="green"
|
||||
@click.stop.prevent="clickEdit(props.row.id)"
|
||||
v-if="
|
||||
col.value == null && checkPermission($route)?.attrIsUpdate
|
||||
"
|
||||
>
|
||||
<q-icon name="mdi-file-excel-outline" size="20px" />
|
||||
<!-- นำเข้าไฟล์ผลคะแนนสอบ -->
|
||||
|
|
@ -885,11 +751,6 @@ watch(notificationCounter, () => {
|
|||
|
||||
<div v-else-if="col.name == 'result'" class="table_ellipsis2">
|
||||
<q-btn
|
||||
v-if="
|
||||
(props.row.score == null ||
|
||||
props.row.score.resultCount == 0) &&
|
||||
checkPermission($route)?.attrIsUpdate
|
||||
"
|
||||
:disable="props.row.score == null"
|
||||
flat
|
||||
dense
|
||||
|
|
@ -897,6 +758,11 @@ watch(notificationCounter, () => {
|
|||
color="green"
|
||||
round
|
||||
@click.stop.prevent="clickResult(props.row.id)"
|
||||
v-if="
|
||||
(props.row.score == null ||
|
||||
props.row.score.resultCount == 0) &&
|
||||
checkPermission($route)?.attrIsUpdate
|
||||
"
|
||||
>
|
||||
<q-icon name="mdi-file-excel-outline" size="20px" />
|
||||
<q-tooltip>นำเข้าไฟล์ผลการสอบ (บัญชีรายชื่อ)</q-tooltip>
|
||||
|
|
@ -1055,12 +921,12 @@ watch(notificationCounter, () => {
|
|||
|
||||
<q-dialog v-model="modalCandidate" persistent>
|
||||
<q-card style="width: 600px">
|
||||
<q-form ref="myFormScore">
|
||||
<DialogHeadTemplate
|
||||
:title="textTittleCandidate"
|
||||
:close="clickCloseCandidate"
|
||||
title-type="ข้อมูลผู้สมัครสอบ"
|
||||
/>
|
||||
<q-form ref="myFormScore">
|
||||
<q-separator />
|
||||
<q-card-section>
|
||||
<div class="col-12 row items-center q-col-gutter-sm">
|
||||
|
|
@ -1099,12 +965,12 @@ watch(notificationCounter, () => {
|
|||
|
||||
<q-dialog v-model="modalScore" persistent>
|
||||
<q-card style="width: 600px">
|
||||
<q-form ref="myFormScore">
|
||||
<DialogHeadTemplate
|
||||
:title="textTittleScore"
|
||||
:close="clickCloseScore"
|
||||
title-type="บัญชีรวมคะแนน"
|
||||
/>
|
||||
<q-form ref="myFormScore">
|
||||
<q-separator />
|
||||
<q-card-section>
|
||||
<div class="col-12 row items-center q-col-gutter-sm">
|
||||
|
|
@ -1143,12 +1009,12 @@ watch(notificationCounter, () => {
|
|||
|
||||
<q-dialog v-model="modalResult" persistent>
|
||||
<q-card style="width: 600px">
|
||||
<q-form ref="myFormScore">
|
||||
<DialogHeadTemplate
|
||||
:title="textTittleResult"
|
||||
:close="clickCloseResult"
|
||||
title-type="ผลการสอบ (บัญชีรายชื่อ)"
|
||||
/>
|
||||
<q-form ref="myFormScore">
|
||||
<q-separator />
|
||||
<q-card-section>
|
||||
<div class="col-12 row items-center q-col-gutter-sm">
|
||||
|
|
|
|||
|
|
@ -2,13 +2,11 @@
|
|||
import { onMounted, ref, watch, computed } from "vue";
|
||||
import { useQuasar, QForm } from "quasar";
|
||||
import { useRouter, useRoute } from "vue-router";
|
||||
import { storeToRefs } from "pinia";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
import { usePositionKeycloakStore } from "@/stores/positionKeycloak";
|
||||
|
||||
import type { RequestPeriodCompete } from "@/modules/03_recruiting/interface/request/Period";
|
||||
import type {
|
||||
|
|
@ -18,7 +16,6 @@ import type {
|
|||
|
||||
const $q = useQuasar(); // show dialog
|
||||
const mixin = useCounterMixin();
|
||||
const { dataPositionKeycloak } = storeToRefs(usePositionKeycloakStore());
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const {
|
||||
|
|
@ -56,7 +53,6 @@ const fileImgDataUpload = ref<File[]>([]);
|
|||
const fileImgs = ref<UploadType[]>([]);
|
||||
const id = ref<string>("");
|
||||
const edit = ref<boolean>(false);
|
||||
const scoreExpireDate = ref<Date | null>(null); //วันหมดอายุบัญชี
|
||||
|
||||
/** กลับไปหน้าหลัก */
|
||||
function clickBack() {
|
||||
|
|
@ -102,7 +98,6 @@ async function fetchData() {
|
|||
|
||||
fileDocs.value = files;
|
||||
fileImgs.value = images;
|
||||
scoreExpireDate.value = data.scoreExpireDate;
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -258,11 +253,6 @@ function sendData() {
|
|||
year: yearly.value,
|
||||
announcementDate:
|
||||
dateAnnounce.value !== null ? convertDateToAPI(dateAnnounce.value) : null,
|
||||
scoreExpireDate:
|
||||
scoreExpireDate.value !== null
|
||||
? convertDateToAPI(scoreExpireDate.value)
|
||||
: null,
|
||||
rootDnaId: !edit.value ? dataPositionKeycloak.value.rootDnaId : undefined,
|
||||
};
|
||||
return valueData;
|
||||
}
|
||||
|
|
@ -365,13 +355,6 @@ function dateThaiRange(val: [Date, Date]) {
|
|||
return `${date2Thai(val[0], true)} - ${date2Thai(val[1], true)}`;
|
||||
}
|
||||
}
|
||||
function onUpdateScoreExpireDate(val: Date | null) {
|
||||
if (val) {
|
||||
const newDate = new Date(val);
|
||||
newDate.setFullYear(newDate.getFullYear() + 2);
|
||||
scoreExpireDate.value = newDate;
|
||||
}
|
||||
}
|
||||
|
||||
watch(organizationShortName, (count: DataOption2, prevCount: DataOption2) => {
|
||||
organizationNameOptions.value = [];
|
||||
|
|
@ -468,7 +451,6 @@ onMounted(async () => {
|
|||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-4 col-md-2" v-if="announcementExam">
|
||||
<q-input
|
||||
outlined
|
||||
|
|
@ -484,7 +466,6 @@ onMounted(async () => {
|
|||
input-class="text-right"
|
||||
></q-input>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-4 col-md-3" v-if="announcementExam">
|
||||
<datepicker
|
||||
v-model="dateExam"
|
||||
|
|
@ -520,7 +501,6 @@ onMounted(async () => {
|
|||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-3 col-md-3">
|
||||
<datepicker
|
||||
v-model="dateAnnouncement"
|
||||
|
|
@ -563,7 +543,6 @@ onMounted(async () => {
|
|||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
|
||||
<datepicker
|
||||
v-model="dateRegister"
|
||||
|
|
@ -589,7 +568,6 @@ onMounted(async () => {
|
|||
dateRegister != null ? dateThaiRange(dateRegister) : null
|
||||
"
|
||||
:label="`${'วันที่สมัคร'}`"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -603,7 +581,6 @@ onMounted(async () => {
|
|||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="col-xs-12 col-sm-3 col-md-3"
|
||||
v-if="announcementExam && isFeeNotZero"
|
||||
|
|
@ -633,7 +610,6 @@ onMounted(async () => {
|
|||
"
|
||||
:label="`${'วันที่ชำระเงิน'}`"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกวันที่ชำระเงิน'}`]"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -656,7 +632,6 @@ onMounted(async () => {
|
|||
borderless
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
@update:model-value="onUpdateScoreExpireDate"
|
||||
>
|
||||
<template #year="{ year }">
|
||||
{{ year + 543 }}
|
||||
|
|
@ -674,48 +649,6 @@ onMounted(async () => {
|
|||
"
|
||||
:label="`${'วันประกาศผลสอบ'}`"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกวันประกาศผลสอบ'}`]"
|
||||
hide-bottom-space
|
||||
>
|
||||
<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 class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
|
||||
<datepicker
|
||||
v-model="scoreExpireDate"
|
||||
: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
|
||||
outlined
|
||||
dense
|
||||
class="full-width datepicker q-mb-md"
|
||||
:model-value="
|
||||
scoreExpireDate != null ? date2Thai(scoreExpireDate) : null
|
||||
"
|
||||
:label="`${'วันหมดอายุบัญชี'}`"
|
||||
clearable
|
||||
@clear="scoreExpireDate = null"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
|
|||
|
|
@ -309,8 +309,8 @@ async function fetchData(actionType?: string) {
|
|||
if (data.length > 0) {
|
||||
data.map((r: ResponseRecruitPeriod) => {
|
||||
if (r.score != null) {
|
||||
r.scoreCount = r.score.scoreCount ? r.score.scoreCount : 0;
|
||||
r.scoreImportDate = r.score.importDate ? r.score.importDate : "-";
|
||||
r.scoreCount = r.score.scoreCount;
|
||||
r.scoreImportDate = r.score.importDate;
|
||||
}
|
||||
result.push(r);
|
||||
});
|
||||
|
|
@ -715,11 +715,7 @@ onMounted(async () => {
|
|||
<q-tooltip>นำเข้าไฟล์ผลคะแนนสอบ</q-tooltip>
|
||||
</q-btn>
|
||||
<div v-else>
|
||||
{{
|
||||
props.row.score
|
||||
? props.row.score.scoreCount.toLocaleString()
|
||||
: "-"
|
||||
}}
|
||||
{{ props.row.score.scoreCount.toLocaleString() }}
|
||||
<q-btn
|
||||
v-if="checkPermission($route)?.attrIsUpdate"
|
||||
dense
|
||||
|
|
@ -754,11 +750,7 @@ onMounted(async () => {
|
|||
<q-tooltip>นำเข้าไฟล์ผลการสอบ (บัญชีรายชื่อ)</q-tooltip>
|
||||
</q-btn>
|
||||
<div v-else>
|
||||
{{
|
||||
props.row.score
|
||||
? props.row.score.resultCount.toLocaleString()
|
||||
: "-"
|
||||
}}
|
||||
{{ props.row.score.resultCount.toLocaleString() }}
|
||||
<q-btn
|
||||
v-if="checkPermission($route)?.attrIsUpdate"
|
||||
dense
|
||||
|
|
|
|||
|
|
@ -3,13 +3,11 @@
|
|||
import { onMounted, ref, watch } from "vue";
|
||||
import { useQuasar, QForm } from "quasar";
|
||||
import { useRouter, useRoute } from "vue-router";
|
||||
import { storeToRefs } from "pinia";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { calculateFiscalYear } from "@/utils/function";
|
||||
import { usePositionKeycloakStore } from "@/stores/positionKeycloak";
|
||||
|
||||
import type { RequestPeriodDisable } from "@/modules/03_recruiting/interface/request/Period";
|
||||
import type {
|
||||
|
|
@ -19,7 +17,6 @@ import type {
|
|||
|
||||
const $q = useQuasar(); // show dialog
|
||||
const mixin = useCounterMixin();
|
||||
const { dataPositionKeycloak } = storeToRefs(usePositionKeycloakStore());
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const {
|
||||
|
|
@ -47,7 +44,7 @@ const positionPathOptions = ref<DataOption2[]>([]);
|
|||
const organizationShortName = ref<DataOption2>({ id: "", name: "" });
|
||||
const organizationName = ref<DataOption2>({ id: "", name: "" });
|
||||
const organizationNameOptions = ref<DataOption2[]>([]);
|
||||
const scoreExpireDate = ref<Date | null>(null); //วันหมดอายุบัญชี
|
||||
|
||||
const fileDocDataUpload = ref<File[]>([]);
|
||||
const fileDocs = ref<UploadType[]>([]);
|
||||
const fileImgDataUpload = ref<File[]>([]);
|
||||
|
|
@ -93,7 +90,6 @@ async function fetchData() {
|
|||
data.announcementDate != null ? new Date(data.announcementDate) : null;
|
||||
fileDocs.value = data.documents;
|
||||
fileImgs.value = data.images;
|
||||
scoreExpireDate.value = data.scoreExpireDate;
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -163,11 +159,6 @@ function sendData() {
|
|||
year: yearly.value,
|
||||
announcementDate:
|
||||
dateAnnounce.value !== null ? convertDateToAPI(dateAnnounce.value) : null,
|
||||
rootDnaId: !edit.value ? dataPositionKeycloak.value.rootDnaId : undefined,
|
||||
scoreExpireDate:
|
||||
scoreExpireDate.value !== null
|
||||
? convertDateToAPI(scoreExpireDate.value)
|
||||
: null,
|
||||
};
|
||||
return valueData;
|
||||
}
|
||||
|
|
@ -357,14 +348,6 @@ function dateThaiRange(val: [Date, Date] | null) {
|
|||
}
|
||||
}
|
||||
|
||||
function onUpdateScoreExpireDate(val: Date | null) {
|
||||
if (val) {
|
||||
const newDate = new Date(val);
|
||||
newDate.setFullYear(newDate.getFullYear() + 2);
|
||||
scoreExpireDate.value = newDate;
|
||||
}
|
||||
}
|
||||
|
||||
watch(organizationShortName, (count: DataOption2, prevCount: DataOption2) => {
|
||||
organizationNameOptions.value = [];
|
||||
});
|
||||
|
|
@ -403,7 +386,7 @@ onMounted(async () => {
|
|||
<q-form ref="myForm">
|
||||
<q-card-section class="q-pa-md">
|
||||
<div class="col-xs-12 col-sm-8"></div>
|
||||
<div class="col-12 row q-col-gutter-sm">
|
||||
<div class="col-12 row items-center q-col-gutter-x-sm">
|
||||
<div class="col-xs-12 col-sm-6">
|
||||
<q-input
|
||||
outlined
|
||||
|
|
@ -415,10 +398,8 @@ onMounted(async () => {
|
|||
(val:string) =>
|
||||
!!val || `${'กรุณากรอกชื่อรอบคัดเลือก/ชื่อประกาศ'}`,
|
||||
]"
|
||||
hide-bottom-space
|
||||
></q-input>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-4 col-md-1" v-if="announcementExam">
|
||||
<q-input
|
||||
outlined
|
||||
|
|
@ -428,10 +409,8 @@ onMounted(async () => {
|
|||
dense
|
||||
lazy-rules
|
||||
:rules="[(val:number) => val > 0 || `${'กรุณากรอกรอบการสอบให้ถูกต้อง'}`]"
|
||||
hide-bottom-space
|
||||
></q-input>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-4 col-md-1" v-if="announcementExam">
|
||||
<datepicker
|
||||
v-model="yearly"
|
||||
|
|
@ -452,7 +431,6 @@ onMounted(async () => {
|
|||
:model-value="yearly + 543"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกปีงบประมาณ'}`]"
|
||||
:label="`${'ปีงบประมาณ'}`"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -478,7 +456,6 @@ onMounted(async () => {
|
|||
:rules="[
|
||||
(val:any) => val >= 0 || `${'กรุณากรอกค่าธรรมเนียมให้ถูกต้อง'}`,
|
||||
]"
|
||||
hide-bottom-space
|
||||
></q-input>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
|
||||
|
|
@ -503,7 +480,6 @@ onMounted(async () => {
|
|||
:model-value="dateExam != null ? date2Thai(dateExam) : null"
|
||||
:label="`${'วันที่สอบ'}`"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกวันที่สอบ'}`]"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -537,11 +513,10 @@ onMounted(async () => {
|
|||
<q-input
|
||||
outlined
|
||||
dense
|
||||
class="full-width datepicker"
|
||||
class="full-width datepicker q-mb-md"
|
||||
:model-value="dateThaiRange(dateAnnouncement)"
|
||||
:label="`${'วันที่ประกาศ'}`"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกวันที่ประกาศ'}`]"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -575,11 +550,10 @@ onMounted(async () => {
|
|||
<q-input
|
||||
outlined
|
||||
dense
|
||||
class="full-width datepicker"
|
||||
class="full-width datepicker q-mb-md"
|
||||
:model-value="dateThaiRange(dateRegister)"
|
||||
:label="`${'วันที่สมัคร'}`"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกวันที่สมัคร'}`]"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -616,13 +590,12 @@ onMounted(async () => {
|
|||
<q-input
|
||||
outlined
|
||||
dense
|
||||
class="full-width datepicker"
|
||||
class="full-width datepicker q-mb-md"
|
||||
:model-value="
|
||||
datePayment != null ? dateThaiRange(datePayment) : null
|
||||
"
|
||||
:label="`${'วันที่ชำระเงิน'}`"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกวันที่ชำระเงิน'}`]"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
@ -645,7 +618,6 @@ onMounted(async () => {
|
|||
borderless
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
@update:model-value="onUpdateScoreExpireDate"
|
||||
>
|
||||
<template #year="{ year }">
|
||||
{{ year + 543 }}
|
||||
|
|
@ -657,54 +629,12 @@ onMounted(async () => {
|
|||
<q-input
|
||||
outlined
|
||||
dense
|
||||
class="full-width datepicker"
|
||||
class="full-width datepicker q-mb-md"
|
||||
:model-value="
|
||||
dateAnnounce != null ? date2Thai(dateAnnounce) : null
|
||||
"
|
||||
:label="`${'วันประกาศผลสอบ'}`"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือกวันประกาศผลสอบ'}`]"
|
||||
hide-bottom-space
|
||||
>
|
||||
<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 class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
|
||||
<datepicker
|
||||
v-model="scoreExpireDate"
|
||||
: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
|
||||
outlined
|
||||
dense
|
||||
class="full-width datepicker"
|
||||
:model-value="
|
||||
scoreExpireDate != null ? date2Thai(scoreExpireDate) : null
|
||||
"
|
||||
:label="`${'วันหมดอายุบัญชี'}`"
|
||||
clearable
|
||||
@clear="scoreExpireDate = null"
|
||||
hide-bottom-space
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
|
|||
|
|
@ -93,7 +93,6 @@ const examTypeOptions = [
|
|||
{ name: "แพทย์", id: "docter" },
|
||||
];
|
||||
const category = ref<string>("");
|
||||
const scoreExpireDate = ref<Date | null>(null);
|
||||
|
||||
const fileDocDataUpload = ref<File[]>([]);
|
||||
const fileDocs = ref<UploadType[]>([]);
|
||||
|
|
@ -334,7 +333,6 @@ async function fetchData() {
|
|||
refNo1.value = data.refNo1;
|
||||
reason.value = data.reason;
|
||||
graduationYearLock.value = data.graduationYearLock;
|
||||
scoreExpireDate.value = data.scoreExpireDate;
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
@ -508,10 +506,6 @@ function sendData() {
|
|||
refNo1: refNo1.value,
|
||||
reason: reason.value,
|
||||
graduationYearLock: Number(graduationYearLock.value),
|
||||
scoreExpireDate:
|
||||
scoreExpireDate.value != null
|
||||
? convertDateToAPI(scoreExpireDate.value)
|
||||
: null,
|
||||
};
|
||||
return valueData;
|
||||
}
|
||||
|
|
@ -945,14 +939,6 @@ watch(
|
|||
}
|
||||
);
|
||||
|
||||
function onUpdateScoreExpireDate(val: Date | null) {
|
||||
if (val) {
|
||||
const newDate = new Date(val);
|
||||
newDate.setFullYear(newDate.getFullYear() + 2);
|
||||
scoreExpireDate.value = newDate;
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
hideLoader();
|
||||
if (route.params.id != undefined) {
|
||||
|
|
@ -1256,7 +1242,6 @@ onMounted(async () => {
|
|||
borderless
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
@update:model-value="onUpdateScoreExpireDate"
|
||||
>
|
||||
<template #year="{ year }">
|
||||
{{ year + 543 }}
|
||||
|
|
@ -1290,51 +1275,8 @@ onMounted(async () => {
|
|||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-3 col-md-3" v-if="announcementExam">
|
||||
<datepicker
|
||||
v-model="scoreExpireDate"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
:readonly="checkRoutePermisson"
|
||||
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
|
||||
outlined
|
||||
:readonly="checkRoutePermisson"
|
||||
dense
|
||||
class="full-width datepicker q-mb-md"
|
||||
:model-value="
|
||||
scoreExpireDate != null ? date2Thai(scoreExpireDate) : null
|
||||
"
|
||||
:label="`${'วันหมดอายุบัญชี'}`"
|
||||
clearable
|
||||
@clear="scoreExpireDate = null"
|
||||
hide-bottom-space
|
||||
>
|
||||
<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 class="col-xs-12 col-sm-2 col-md-2" v-if="announcementExam">
|
||||
<div class="row col-12" v-if="announcementExam">
|
||||
<div class="col-xs-12 col-md-2">
|
||||
<q-input
|
||||
outlined
|
||||
v-model="graduationYearLock"
|
||||
|
|
@ -1348,6 +1290,7 @@ onMounted(async () => {
|
|||
type="number"
|
||||
></q-input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12" v-if="announcementExam">
|
||||
<div class="col-12 q-mb-sm">
|
||||
|
|
|
|||
|
|
@ -16,11 +16,9 @@ import type {
|
|||
DisciplineOps,
|
||||
DataOption,
|
||||
} from "@/modules/04_registryPerson/interface/index/discipline";
|
||||
import type { Discipline } from "@/modules/04_registryPerson/interface/response/Discipline";
|
||||
|
||||
import DialogHeader from "@/components/DialogHeader.vue";
|
||||
import DialogHistory from "@/modules/04_registryPerson/components/detail/DialogHistory.vue";
|
||||
import DialogPreviewCommand from "@/modules/18_command/components/DialogPreviewCommand.vue";
|
||||
|
||||
const route = useRoute();
|
||||
const $q = useQuasar();
|
||||
|
|
@ -49,9 +47,6 @@ const empType = ref<string>(pathRegistryEmp(route.name?.toString() ?? ""));
|
|||
const isLeave = defineModel<boolean>("isLeave", {
|
||||
required: true,
|
||||
});
|
||||
const citizenId = defineModel<string>("citizenId", {
|
||||
required: true,
|
||||
});
|
||||
|
||||
const baseColumns = ref<QTableColumn[]>([
|
||||
{
|
||||
|
|
@ -157,8 +152,8 @@ const baseVisibleColumns = ref<string[]>([
|
|||
"lastUpdatedAt",
|
||||
]);
|
||||
|
||||
const rows = ref<Discipline[]>([]); //รายการวินัย
|
||||
const rowsMain = ref<Discipline[]>([]); //รายการวินัย
|
||||
const rows = ref<RequestItemsObject[]>([]); //รายการวินัย
|
||||
const rowsMain = ref<RequestItemsObject[]>([]); //รายการวินัย
|
||||
const mode = ref<string>("table"); //การแสดงผล Table card
|
||||
const filterKeyword = ref<string>(""); //คำค้นหา
|
||||
|
||||
|
|
@ -249,10 +244,6 @@ const fileUpload = ref<File | null>(null);
|
|||
const fileData = ref<ResFileData | null>(null);
|
||||
const isUpload = ref<boolean>(false);
|
||||
|
||||
const modalCommand = ref<boolean>(false);
|
||||
const command = ref<string>("");
|
||||
const commandId = ref<string>("");
|
||||
|
||||
/**
|
||||
* function ค้นหา คำใน option
|
||||
* @param val คำค้นหา
|
||||
|
|
@ -314,7 +305,7 @@ async function fetchData(id: string) {
|
|||
* กดเลือกข้อมูลที่จะแก้ไข
|
||||
* @param props ค่า props ใน row ที่เลือก
|
||||
*/
|
||||
async function openDialogEdit(props: Discipline) {
|
||||
async function openDialogEdit(props: RequestItemsObject) {
|
||||
showLoader();
|
||||
try {
|
||||
modal.value = true;
|
||||
|
|
@ -487,12 +478,6 @@ function handleDelete(id: string) {
|
|||
});
|
||||
}
|
||||
|
||||
function openViewCommand(data: Discipline) {
|
||||
command.value = data.refCommandNo;
|
||||
commandId.value = data.refCommandId;
|
||||
modalCommand.value = true;
|
||||
}
|
||||
|
||||
/** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
|
||||
onMounted(() => {
|
||||
fetchData(profileId.value);
|
||||
|
|
@ -636,19 +621,7 @@ onMounted(() => {
|
|||
:key="col.id"
|
||||
:class="props.row.isEntry ? 'text-grey' : ''"
|
||||
>
|
||||
<div
|
||||
v-if="col.name == 'refCommandNo' && props.row.refCommandId"
|
||||
@click="col.value ? openViewCommand(props.row) : null"
|
||||
:class="
|
||||
col.value
|
||||
? 'table_ellipsis text-blue cursor-pointer'
|
||||
: 'table_ellipsis'
|
||||
"
|
||||
>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
<q-tooltip v-if="col.value">ดูคำสั่ง</q-tooltip>
|
||||
</div>
|
||||
<div v-else>
|
||||
<div>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
|
@ -1002,13 +975,6 @@ onMounted(() => {
|
|||
:visible-columns="visibleColumnsHistory"
|
||||
:fetch-data="fetchDataHistory"
|
||||
/>
|
||||
|
||||
<DialogPreviewCommand
|
||||
v-model:modal="modalCommand"
|
||||
v-model:command="command"
|
||||
v-model:command-id="commandId"
|
||||
:citizen-id="citizenId"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style scoped></style>
|
||||
|
|
|
|||
|
|
@ -866,8 +866,7 @@ onMounted(() => {
|
|||
outlined
|
||||
dense
|
||||
:model-value="date2Thai(formData.dateEnd)"
|
||||
clearable
|
||||
@clear="formData.dateEnd = null"
|
||||
:rules="[(val:string) => !!val || `${'กรุณาเลือก วันที่สิ้นสุด'}`]"
|
||||
hide-bottom-space
|
||||
:label="`${'วันที่สิ้นสุด'}`"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -58,10 +58,7 @@ const storeRegistry = useRegistryNewDataStore();
|
|||
<Info :is-leave="storeRegistry.isLeave" />
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="2">
|
||||
<Discipline
|
||||
:is-leave="storeRegistry.isLeave"
|
||||
:citizen-id="storeRegistry.citizenId"
|
||||
/>
|
||||
<Discipline :is-leave="storeRegistry.isLeave" />
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="3">
|
||||
<Leave :is-leave="storeRegistry.isLeave" />
|
||||
|
|
|
|||
|
|
@ -96,11 +96,11 @@ const columnsHistory = ref<QTableColumn[]>([
|
|||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||
},
|
||||
{
|
||||
name: "prefixMain",
|
||||
name: "prefix",
|
||||
align: "left",
|
||||
label: "คำนำหน้าชื่อ",
|
||||
sortable: true,
|
||||
field: "prefixMain",
|
||||
field: "prefix",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
sort: (a: string, b: string) =>
|
||||
|
|
@ -256,7 +256,7 @@ const columnsHistory = ref<QTableColumn[]>([
|
|||
]);
|
||||
const visibleColumnsHistory = ref<string[]>([
|
||||
"citizenId",
|
||||
"prefixMain",
|
||||
"prefix",
|
||||
"rank",
|
||||
"firstName",
|
||||
"lastName",
|
||||
|
|
@ -408,8 +408,7 @@ function calculateMinDate() {
|
|||
|
||||
function prefixRankRule() {
|
||||
return [
|
||||
() =>
|
||||
!!formData.rank || !!formData.prefix || "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
|
||||
() => !!formData.rank || !!formData.prefix || "กรุณาเลือกคำนำหน้าชื่อ หรือยศ",
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -589,8 +588,6 @@ onMounted(() => {
|
|||
|
||||
<div class="col-xs-6 col-sm-6 col-md-6">
|
||||
<q-select
|
||||
:readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
|
||||
:class="checkPermission($route)?.attrOwnership === 'OWNER' ? 'inputgreen' : ''"
|
||||
dense
|
||||
outlined
|
||||
use-input
|
||||
|
|
@ -605,6 +602,7 @@ onMounted(() => {
|
|||
option-value="name"
|
||||
v-model="formData.prefix"
|
||||
clearable
|
||||
class="inputgreen"
|
||||
:options="store.Ops.prefixOps"
|
||||
:label="dataLabel.prefix"
|
||||
:rules="prefixRankRule()"
|
||||
|
|
@ -642,24 +640,24 @@ onMounted(() => {
|
|||
</div>
|
||||
<div class="col-xs-6 col-sm-6 col-md-6">
|
||||
<q-input
|
||||
:readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
|
||||
dense
|
||||
outlined
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
v-model="formData.firstName"
|
||||
class="inputgreen"
|
||||
:label="dataLabel.firstName"
|
||||
:rules="[(val: string) => !!val || `${'กรุณากรอก ชื่อ'}`]"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-xs-6 col-sm-6 col-md-6">
|
||||
<q-input
|
||||
:readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
|
||||
dense
|
||||
outlined
|
||||
lazy-rules
|
||||
hide-bottom-space
|
||||
v-model="formData.lastName"
|
||||
class="inputgreen"
|
||||
:label="dataLabel.lastName"
|
||||
:rules="[(val: string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
|
||||
/>
|
||||
|
|
@ -723,7 +721,6 @@ onMounted(() => {
|
|||
</div>
|
||||
<div class="col-xs-6 col-sm-6 col-md-6">
|
||||
<q-select
|
||||
:readonly="checkPermission($route)?.attrOwnership !== 'OWNER'"
|
||||
dense
|
||||
outlined
|
||||
use-input
|
||||
|
|
@ -738,6 +735,7 @@ onMounted(() => {
|
|||
option-label="name"
|
||||
option-value="name"
|
||||
v-model="formData.gender"
|
||||
class="inputgreen"
|
||||
:options="store.Ops.genderOps"
|
||||
:label="dataLabel.gender"
|
||||
@filter="(inputValue: string,
|
||||
|
|
|
|||
|
|
@ -59,7 +59,6 @@ const changeNameData = reactive<FormChangeName>({
|
|||
profileId: profileId.value,
|
||||
prefixId: "", // id คำนำหน้า
|
||||
prefix: "", // คำนำหน้า
|
||||
rank: "", // ยศ
|
||||
firstName: "", // ชื่อ
|
||||
lastName: "", // นามสกุล
|
||||
status: "", // สถานะ
|
||||
|
|
@ -70,13 +69,11 @@ const selection = ref<string[]>([]); // ตัวเลือก
|
|||
const prefixChange = ref<string | null | undefined>(""); // เปลี่ยนคำนำหน้า
|
||||
const firstNameChange = ref<string | null | undefined>(""); // เปลียนชื่อ
|
||||
const lastNameChange = ref<string | null | undefined>(""); // เปลี่ยนนามสกุล
|
||||
const rankChange = ref<string | null | undefined>(""); // เปลี่ยนยศ
|
||||
|
||||
const profileInfo = ref<DataProfile>(); // ข้อมูล Profile
|
||||
|
||||
const statusOption = ref<string[]>([
|
||||
"เปลี่ยนคำนำหน้าชื่อ",
|
||||
"เปลี่ยนยศ",
|
||||
"เปลี่ยนชื่อ",
|
||||
"เปลี่ยนนามสกุล",
|
||||
"เปลี่ยนชื่อ-นามสกุล",
|
||||
|
|
@ -87,7 +84,6 @@ const statusOption = ref<string[]>([
|
|||
const statusOptionFilter = ref<string[]>([
|
||||
"เปลี่ยนคำนำหน้าชื่อ",
|
||||
"เปลี่ยนชื่อ",
|
||||
"เปลี่ยนยศ",
|
||||
"เปลี่ยนนามสกุล",
|
||||
"เปลี่ยนชื่อ-นามสกุล",
|
||||
"เปลี่ยนคำนำหน้าชื่อ และชื่อ",
|
||||
|
|
@ -111,17 +107,6 @@ const columns = ref<QTableProps["columns"]>([
|
|||
sort: (a: string, b: string) =>
|
||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||
},
|
||||
{
|
||||
name: "rank",
|
||||
align: "left",
|
||||
label: "ยศ",
|
||||
sortable: true,
|
||||
field: "rank",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
sort: (a: string, b: string) =>
|
||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||
},
|
||||
{
|
||||
name: "firstName",
|
||||
align: "left",
|
||||
|
|
@ -171,7 +156,6 @@ const columns = ref<QTableProps["columns"]>([
|
|||
]);
|
||||
const visibleColumns = ref<string[]>([
|
||||
"prefix",
|
||||
"rank",
|
||||
"firstName",
|
||||
"lastName",
|
||||
"lastUpdateFullName",
|
||||
|
|
@ -231,7 +215,6 @@ function onSubmit() {
|
|||
firstName: changeNameData.firstName,
|
||||
lastName: changeNameData.lastName,
|
||||
status: changeNameData.status,
|
||||
rank: changeNameData.rank,
|
||||
documentId: changeNameData.documentId,
|
||||
})
|
||||
.then(async (res) => {
|
||||
|
|
@ -363,14 +346,6 @@ function filterSelector(val: string, update: Function, refData: string) {
|
|||
);
|
||||
});
|
||||
break;
|
||||
|
||||
case "rankOps":
|
||||
update(() => {
|
||||
store.Ops.rankOps = store.OpsFilter.rankOps.filter(
|
||||
(v: DataOption) => v.name.indexOf(val) > -1
|
||||
);
|
||||
});
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
|
@ -415,14 +390,12 @@ watch(
|
|||
changeNameData.prefix,
|
||||
changeNameData.firstName,
|
||||
changeNameData.lastName,
|
||||
changeNameData.rank,
|
||||
],
|
||||
() => {
|
||||
submitDisable.value =
|
||||
changeNameData.prefix === prefixChange.value &&
|
||||
changeNameData.firstName === firstNameChange.value &&
|
||||
changeNameData.lastName === lastNameChange.value &&
|
||||
changeNameData.rank === rankChange.value;
|
||||
changeNameData.lastName === lastNameChange.value;
|
||||
}
|
||||
);
|
||||
|
||||
|
|
@ -438,9 +411,6 @@ watch(
|
|||
if (!selection.value.includes("lastname")) {
|
||||
changeNameData.lastName = lastNameChange.value;
|
||||
}
|
||||
if (!selection.value.includes("rank")) {
|
||||
changeNameData.rank = rankChange.value;
|
||||
}
|
||||
}
|
||||
);
|
||||
/** ทำงานเมื่อ Components ถูกเรียกใช้งาน*/
|
||||
|
|
@ -478,11 +448,9 @@ onMounted(async () => {
|
|||
changeNameData.prefix = profileInfo?.prefixMain;
|
||||
changeNameData.firstName = profileInfo?.firstName;
|
||||
changeNameData.lastName = profileInfo?.lastName;
|
||||
changeNameData.rank = profileInfo?.rank;
|
||||
prefixChange = changeNameData.prefix;
|
||||
firstNameChange = changeNameData.firstName;
|
||||
lastNameChange = changeNameData.lastName;
|
||||
rankChange = changeNameData.rank;
|
||||
changeNameData.status = '';
|
||||
dialogStatus = 'create';
|
||||
submitDisable = true;
|
||||
|
|
@ -565,7 +533,7 @@ onMounted(async () => {
|
|||
:class="props.row.isEntry ? 'text-grey' : ''"
|
||||
>
|
||||
<div class="table_ellipsis">
|
||||
{{ col.value ? col.value : "-" }}
|
||||
{{ col.value }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
||||
|
|
@ -595,17 +563,12 @@ onMounted(async () => {
|
|||
<div class="row q-mb-sm">
|
||||
<div class="col-12">
|
||||
<div class="row">
|
||||
<div class="q-col-gutter-sm">
|
||||
<div class="q-gutter-sm">
|
||||
<q-checkbox
|
||||
v-model="selection"
|
||||
val="prefix"
|
||||
label="เปลี่ยนคำนำหน้าชื่อ"
|
||||
/>
|
||||
<q-checkbox
|
||||
v-model="selection"
|
||||
val="rank"
|
||||
label="เปลี่ยนยศ"
|
||||
/>
|
||||
<q-checkbox
|
||||
v-model="selection"
|
||||
val="firstname"
|
||||
|
|
@ -646,30 +609,6 @@ onMounted(async () => {
|
|||
) "
|
||||
/>
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-select
|
||||
:readonly="!selection.includes('rank')"
|
||||
v-model="changeNameData.rank"
|
||||
:options="store.Ops.rankOps"
|
||||
label="ยศ"
|
||||
dense
|
||||
:class="!selection.includes('rank') ? '' : 'inputgreen'"
|
||||
outlined
|
||||
use-input
|
||||
hide-selected
|
||||
fill-input
|
||||
lazy-rules
|
||||
emit-value
|
||||
map-options
|
||||
hide-bottom-space
|
||||
input-debounce="0"
|
||||
option-label="name"
|
||||
option-value="name"
|
||||
@filter="(inputValue:string,
|
||||
doneFn:Function) => filterSelector(inputValue, doneFn,'rankOps'
|
||||
) "
|
||||
/>
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-input
|
||||
:readonly="!selection.includes('firstname')"
|
||||
|
|
|
|||
|
|
@ -66,7 +66,6 @@ interface FormChangeName {
|
|||
profileId: string;
|
||||
prefixId: string | null | undefined;
|
||||
prefix: string | null | undefined;
|
||||
rank: string | null | undefined;
|
||||
firstName: string | null | undefined;
|
||||
lastName: string | null | undefined;
|
||||
status: string | null | undefined;
|
||||
|
|
|
|||
|
|
@ -1,23 +0,0 @@
|
|||
interface Discipline {
|
||||
createdAt: Date | null;
|
||||
createdFullName: string;
|
||||
createdUserId: string;
|
||||
date: Date | null;
|
||||
detail: string;
|
||||
id: string;
|
||||
isDeleted: false;
|
||||
isEntry: false;
|
||||
isUpload: true;
|
||||
lastUpdateFullName: string;
|
||||
lastUpdateUserId: string;
|
||||
lastUpdatedAt: Date | null;
|
||||
level: string;
|
||||
profileEmployeeId: string;
|
||||
profileId: string;
|
||||
refCommandDate: Date | null;
|
||||
refCommandNo: string;
|
||||
refCommandId: string;
|
||||
unStigma: string;
|
||||
}
|
||||
|
||||
export type { Discipline };
|
||||
|
|
@ -25,7 +25,8 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
|
|||
{
|
||||
id: "posNo",
|
||||
name:
|
||||
route.name === "registryNew" || route.name === "registryRetireOfficer"
|
||||
route.name === "registryNew" ||
|
||||
route.name === "registryRetireOfficer"
|
||||
? "เลขที่ตำแหน่ง"
|
||||
: "ตำแหน่งเลขที่",
|
||||
},
|
||||
|
|
@ -129,8 +130,6 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
|
|||
return "ให้ออกจากราชการ";
|
||||
case "DISCIPLINE_TEMP_SUSPEND":
|
||||
return "ให้ออกจากราชการไว้ก่อน";
|
||||
case "RETIRE_MILITARY":
|
||||
return "ลาออกเพื่อไปรับราชการทหาร";
|
||||
default:
|
||||
return "";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -121,8 +121,7 @@ const itemsMenu = computed(() => {
|
|||
if (
|
||||
leaveType.value === "DISCIPLINE_TEMP_SUSPEND" ||
|
||||
leaveType.value === "RETIRE_RESIGN" ||
|
||||
leaveType.value === "DISCIPLINE_SUSPEND" ||
|
||||
leaveType.value === "RETIRE_MILITARY"
|
||||
leaveType.value === "DISCIPLINE_SUSPEND"
|
||||
) {
|
||||
return (
|
||||
baseItemsMenu.value?.filter(
|
||||
|
|
@ -324,10 +323,10 @@ async function uploadFileURL(uploadUrl: string, file: any) {
|
|||
* ฟังก์ชันดึงข้อมูลรูปโปรไฟล์
|
||||
* @param id โปรไฟล์
|
||||
*/
|
||||
function fetchProfile(id: string) {
|
||||
http
|
||||
async function fetchProfile(id: string) {
|
||||
await http
|
||||
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, fileName.value))
|
||||
.then((res) => {
|
||||
.then(async (res) => {
|
||||
profilePicture.value = res.data.downloadUrl;
|
||||
})
|
||||
.catch(() => {
|
||||
|
|
@ -404,7 +403,7 @@ async function fetchDataPersonal() {
|
|||
|
||||
fileName.value = res.data.result.avatarName;
|
||||
if (formDetail.value?.avatarName) {
|
||||
fetchProfile(profileId.value);
|
||||
await fetchProfile(profileId.value);
|
||||
} else {
|
||||
profilePicture.value = avatar;
|
||||
}
|
||||
|
|
@ -858,8 +857,7 @@ onMounted(async () => {
|
|||
])) ||
|
||||
leaveType === 'DISCIPLINE_TEMP_SUSPEND' ||
|
||||
leaveType === 'RETIRE_RESIGN' ||
|
||||
leaveType === 'DISCIPLINE_SUSPEND' ||
|
||||
leaveType === 'RETIRE_MILITARY'
|
||||
leaveType === 'DISCIPLINE_SUSPEND'
|
||||
"
|
||||
size="md"
|
||||
rounded
|
||||
|
|
|
|||
|
|
@ -437,6 +437,66 @@ function classColorRow(isDelete: boolean, isEdit: boolean, isEntry: boolean) {
|
|||
/** ฟังก์ชันดาวน์โหลดไฟล Excel */
|
||||
function exportToExcel() {
|
||||
exportToExcelPosition(rows.value);
|
||||
// const newData = rows.value.map((e: DataPosition) => {
|
||||
// return {
|
||||
// commandDateAffect: date2Thai(e.commandDateAffect),
|
||||
// positionName: e.positionName,
|
||||
// positionType: e.positionType,
|
||||
// positionLevel: e.positionLevel
|
||||
// ? e.positionLevel
|
||||
// : e.positionCee
|
||||
// ? e.positionCee
|
||||
// : "",
|
||||
// positionExecutive: e.positionExecutive,
|
||||
// amount: e.amount,
|
||||
// mouthSalaryAmount: e.mouthSalaryAmount,
|
||||
// positionSalaryAmount: e.positionSalaryAmount,
|
||||
// organization: findOrgName({
|
||||
// root: e.orgRoot,
|
||||
// child1: e.orgChild1,
|
||||
// child2: e.orgChild2,
|
||||
// child3: e.orgChild3,
|
||||
// child4: e.orgChild4,
|
||||
// }),
|
||||
// posNo:
|
||||
// e.posNoAbb && e.posNo
|
||||
// ? `${e.posNoAbb} ${e.posNo}`
|
||||
// : e.posNo
|
||||
// ? e.posNo
|
||||
// : "",
|
||||
// posNumCodeSit:
|
||||
// e.posNumCodeSitAbb && e.posNumCodeSit
|
||||
// ? `${e.posNumCodeSit} (${e.posNumCodeSitAbb})`
|
||||
// : e.posNumCodeSit
|
||||
// ? e.posNumCodeSit
|
||||
// : "",
|
||||
// commandNo:
|
||||
// e.commandNo && e.commandYear
|
||||
// ? `${e.commandNo}/${Number(e.commandYear) + 543}`
|
||||
// : "",
|
||||
// commandDateSign: date2Thai(e.commandDateSign),
|
||||
// commandCode: store.convertCommandCodeName(e.commandCode),
|
||||
// remark: e.remark,
|
||||
// };
|
||||
// });
|
||||
|
||||
// const headers = columns.value.map((item: any) => item.label) || []; // หัวคอลัมน์ภาษาไทย
|
||||
// const worksheet = XLSX.utils.json_to_sheet(newData, {
|
||||
// header: visibleColumns.value,
|
||||
// });
|
||||
|
||||
// //แทรกหัวคอลัมน์ภาษาไทย (ใช้ A1, B1, C1 แทน)
|
||||
// XLSX.utils.sheet_add_aoa(worksheet, [headers], { origin: "A1" });
|
||||
|
||||
// // Create a new workbook and append the worksheet
|
||||
// const workbook = XLSX.utils.book_new();
|
||||
|
||||
// XLSX.utils.book_append_sheet(
|
||||
// workbook,
|
||||
// worksheet,
|
||||
// `รายการประวัติตำแหน่งเงินเดือน`
|
||||
// );
|
||||
// XLSX.writeFile(workbook, "รายการประวัติตำแหน่งเงินเดือน.xlsx");
|
||||
}
|
||||
|
||||
const commandCodeOptions = ref<DataOption[]>(store.commandCodeData); //รายการปรเภทคำสั่ง
|
||||
|
|
@ -871,29 +931,6 @@ function onCancelUpload() {
|
|||
excelPreviewModal.value = false;
|
||||
}
|
||||
|
||||
/** ฟังก์ชันจัดเรียงข้อมูลตามวันที่*/
|
||||
function handleSortByDate() {
|
||||
dialogConfirm(
|
||||
$q,
|
||||
async () => {
|
||||
try {
|
||||
showLoader();
|
||||
await http.put(config.API.sortOrderByDate, {
|
||||
type: empType.value.toLocaleUpperCase(),
|
||||
profileId: profileId.value,
|
||||
});
|
||||
await fetchData();
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
hideLoader();
|
||||
}
|
||||
},
|
||||
"ยืนยันการจัดลำดับ",
|
||||
"ต้องการยืนยันการจัดลำดับข้อมูลตามวันที่คำสั่งมีผลใช่หรือไม่?"
|
||||
);
|
||||
}
|
||||
|
||||
onMounted(async () => {
|
||||
await Promise.all([fetchData(), fetchType()]);
|
||||
});
|
||||
|
|
@ -929,23 +966,8 @@ onMounted(async () => {
|
|||
icon="mdi-sort"
|
||||
@click="modalSort = true"
|
||||
>
|
||||
<q-tooltip>จัดลำดับข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
|
||||
<q-btn
|
||||
v-if="
|
||||
tabs === 'PENDING' && statusCheckEdit == 'PENDING' && isConfirmEdit
|
||||
"
|
||||
class="q-ml-sm"
|
||||
round
|
||||
flat
|
||||
dense
|
||||
color="indigo-5"
|
||||
icon="mdi-calendar-export"
|
||||
@click="handleSortByDate()"
|
||||
<q-tooltip>จัดลำดับข้อมูล</q-tooltip></q-btn
|
||||
>
|
||||
<q-tooltip>จัดลำดับตามวันที่คำสั่งมีผล</q-tooltip>
|
||||
</q-btn>
|
||||
<q-space />
|
||||
<div>
|
||||
<q-btn
|
||||
|
|
|
|||
|
|
@ -316,10 +316,9 @@ onMounted(() => {
|
|||
:model-value="
|
||||
dateEnd !== null ? date2Thai(dateEnd) : null
|
||||
"
|
||||
:rules="edit ? [(val:string) => !!val || `${'กรุณาเลือกตั้งแต่วัน'}`]:[]"
|
||||
hide-bottom-space
|
||||
:label="`${'ถึงวันที่'}`"
|
||||
clearable
|
||||
@clear="dateEnd = null"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
|
|
|
|||
|
|
@ -48,12 +48,12 @@ const props = defineProps({
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- <div class="col">
|
||||
<div class="col">
|
||||
<div class="header-text-right q-px-xs">จำนวนครั้งที่สมัครสอบ</div>
|
||||
<div class="sub-text-right q-px-xs q-pb-sm">
|
||||
{{ props.data.examRound ? props.data.examRound : "-" }}
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</q-card>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -525,14 +525,14 @@ watch(props, () => {
|
|||
<div class="col-7 header-sub-text">
|
||||
<div class="q-pb-sm">ผลการสอบ</div>
|
||||
<div class="q-pb-sm">ลำดับที่สอบได้</div>
|
||||
<!-- <div class="q-pb-sm">จำนวนครั้งที่สมัครสอบ</div> -->
|
||||
<div class="q-pb-sm">จำนวนครั้งที่สมัครสอบ</div>
|
||||
</div>
|
||||
<div class="col-5 sub-text-exam">
|
||||
<div class="q-pb-sm">
|
||||
{{ personalForm?.pass }}
|
||||
</div>
|
||||
<div class="q-pb-sm">{{ personalForm?.examNumber }}</div>
|
||||
<!-- <div class="q-pb-sm">{{ personalForm?.examRound }}</div> -->
|
||||
<div class="q-pb-sm">{{ personalForm?.examRound }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -242,7 +242,7 @@ watch(
|
|||
v.code === "C-PM-04" ||
|
||||
v.code === "C-PM-06")) ||
|
||||
((status?.examTypeName === "สอบคัดเลือก" ||
|
||||
status?.examTypeName === "คัดเลือกอื่นๆ") &&
|
||||
status?.examTypeName === "คัดเลือกคนพิการ") &&
|
||||
(v.code === "C-PM-02" ||
|
||||
v.code === "C-PM-03" ||
|
||||
v.code === "C-PM-04" ||
|
||||
|
|
|
|||
|
|
@ -165,9 +165,7 @@ async function fetchDataTable(id: string, level: number = 0) {
|
|||
(e) => e !== props.dataRow?.posmasterId
|
||||
);
|
||||
|
||||
positionNo.value = posMain.filter(
|
||||
(e: DataPositionNo) => !newUse.includes(e.id)
|
||||
);
|
||||
positionNo.value = posMain.filter((e: DataPositionNo) => !newUse.includes(e.id));
|
||||
} else {
|
||||
positionNo.value = posMain.filter(
|
||||
(e: DataPositionNo) => !positionUse.value.includes(e.id)
|
||||
|
|
@ -243,7 +241,6 @@ async function onClickSubmit() {
|
|||
posLevelId: selectedPos.value[0].posLevelId, //ชื่อตำแหน่ง
|
||||
posLevelName: selectedPos.value[0].posLevelName, //ชื่อตำแหน่ง
|
||||
posExecutiveName: selectedPos.value[0].posExecutiveName,
|
||||
posExecutiveId: selectedPos.value[0].posExecutiveId,
|
||||
reportingDate: convertDateToAPI(datePos.value),
|
||||
posmasterId: dataPosMaster.id,
|
||||
positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
|
||||
|
|
@ -293,10 +290,7 @@ watch(
|
|||
if (modal.value) {
|
||||
await fetchPositionUes();
|
||||
if (props?.dataRow?.node !== null && props?.dataRow?.nodeId !== null) {
|
||||
await fetchPosFind(
|
||||
props?.dataRow?.node ?? 0,
|
||||
props?.dataRow?.nodeId ?? ""
|
||||
);
|
||||
await fetchPosFind(props?.dataRow?.node ?? 0, props?.dataRow?.nodeId ?? "");
|
||||
} else {
|
||||
expanded.value = [];
|
||||
}
|
||||
|
|
@ -351,7 +345,7 @@ function onPosType() {
|
|||
watch(
|
||||
[isAll, isBlank, () => isPosition.value],
|
||||
([newAll, newBlank, newPos], [oldAll, oldBlank, oldPos]) => {
|
||||
const shouldFetch = newAll !== oldAll || newBlank !== oldBlank;
|
||||
const shouldFetch = (newAll !== oldAll) || (newBlank !== oldBlank);
|
||||
const isSelectMode = newPos === "select" && oldPos !== "select";
|
||||
|
||||
if (shouldFetch || isSelectMode) {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, onMounted, watch, reactive, computed, type PropType } from "vue";
|
||||
import { ref, onMounted, watch, reactive, computed } from "vue";
|
||||
import { useQuasar, QForm } from "quasar";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
|
|
@ -48,7 +48,7 @@ const {
|
|||
/** รับค่ามาจากหน้าหลัก */
|
||||
const props = defineProps({
|
||||
statCard: {
|
||||
type: Function as PropType<() => Promise<void>>,
|
||||
type: Function,
|
||||
default: () => console.log("getStat"),
|
||||
},
|
||||
});
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ const dataMapToSend = computed(() => {
|
|||
return selected.value.map((i: any) => ({
|
||||
id: i.id,
|
||||
profileId: i.profileId,
|
||||
prefix: i.rank ? i.rank : i.prefix,
|
||||
prefix: i.prefix,
|
||||
firstName: i.firstName,
|
||||
lastName: i.lastName,
|
||||
citizenId: i.citizenId,
|
||||
|
|
@ -89,9 +89,7 @@ const columns2 = ref<QTableProps["columns"]>([
|
|||
sort: (a: string, b: string) =>
|
||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||
format(val, row) {
|
||||
return `${row.rank ? row.rank : row.prefix ?? ""}${row.firstName ?? ""} ${
|
||||
row.lastName ?? ""
|
||||
}`;
|
||||
return `${row.prefix ?? ""}${row.firstName ?? ""} ${row.lastName ?? ""}`;
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -112,11 +110,9 @@ const columns2 = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return row.positionTypeOld && row.positionTypeOl !== "-"
|
||||
return row.positionTypeOld
|
||||
? `${row.positionTypeOld}${
|
||||
row.positionLevelOld && row.positionLevelOld !== "-"
|
||||
? `(${row.positionLevelOld})`
|
||||
: ""
|
||||
row.positionLevelOld ? `(${row.positionLevelOld})` : ""
|
||||
}`
|
||||
: "";
|
||||
},
|
||||
|
|
|
|||
|
|
@ -341,7 +341,7 @@ watch(
|
|||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
:disable="!commandType ? true : false"
|
||||
:disable="commandType"
|
||||
v-model="scope.selected"
|
||||
/>
|
||||
</template>
|
||||
|
|
@ -352,7 +352,7 @@ watch(
|
|||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
:disable="!commandType ? true : false"
|
||||
:disable="commandType"
|
||||
v-model="props.selected"
|
||||
/>
|
||||
</q-td>
|
||||
|
|
|
|||
|
|
@ -97,8 +97,6 @@ const develop_result_option = ref<any>([
|
|||
|
||||
const isCheckFile = ref<boolean>(false);
|
||||
|
||||
const isSelectionPartfour = ref<boolean>(false);
|
||||
|
||||
// score
|
||||
const score1 = computed(() => {
|
||||
if (
|
||||
|
|
@ -214,21 +212,20 @@ const percent_sum: any = computed(() => {
|
|||
});
|
||||
const score4 = computed(() => {
|
||||
return (
|
||||
Number(orientation.value) +
|
||||
(Number(orientation.value) +
|
||||
Number(self_learning.value) +
|
||||
Number(training_seminar.value) +
|
||||
(isSelectionPartfour.value ? Number(other_training.value) : 0)
|
||||
Number(other_training.value)) /
|
||||
4
|
||||
);
|
||||
});
|
||||
const score5 = computed(() => {
|
||||
const rawTotal =
|
||||
const total =
|
||||
(Number(orientation_percent.value) +
|
||||
Number(self_learning_percent.value) +
|
||||
Number(training_seminar_percent.value) +
|
||||
Number(other_training_percent.value)) /
|
||||
(isSelectionPartfour.value ? 4 : 3);
|
||||
|
||||
const total = Math.trunc(rawTotal);
|
||||
4;
|
||||
|
||||
develop_result.value = total > 60 ? 1 : 0;
|
||||
|
||||
|
|
@ -1136,20 +1133,10 @@ onMounted(async () => {
|
|||
<q-separator class="q-my-xs" />
|
||||
<div class="row q-gutter-md align-center q-pl-md">
|
||||
<div class="col-8">
|
||||
<q-checkbox
|
||||
class="q-mr-sm"
|
||||
dense
|
||||
v-model="isSelectionPartfour"
|
||||
@update:model-value="
|
||||
other_training = 0;
|
||||
other_training_percent = 0;
|
||||
"
|
||||
/>
|
||||
4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-input
|
||||
:disable="!isSelectionPartfour"
|
||||
outlined
|
||||
dense
|
||||
type="number"
|
||||
|
|
@ -1161,7 +1148,6 @@ onMounted(async () => {
|
|||
</div>
|
||||
<div class="col">
|
||||
<q-input
|
||||
:disable="!isSelectionPartfour"
|
||||
outlined
|
||||
dense
|
||||
type="number"
|
||||
|
|
|
|||
|
|
@ -90,8 +90,6 @@ const develop_result_option = ref<any>([
|
|||
// footer
|
||||
const dateAutherise = ref<any>(null);
|
||||
|
||||
const isSelectionPartfour = ref<boolean>(false);
|
||||
|
||||
onMounted(() => {
|
||||
fecthAssign(assignId.value);
|
||||
});
|
||||
|
|
@ -241,21 +239,20 @@ const percent_sum: any = computed(() => {
|
|||
});
|
||||
const score4 = computed(() => {
|
||||
return (
|
||||
Number(orientation.value) +
|
||||
(Number(orientation.value) +
|
||||
Number(self_learning.value) +
|
||||
Number(training_seminar.value) +
|
||||
(isSelectionPartfour.value ? Number(other_training.value) : 0)
|
||||
Number(other_training.value)) /
|
||||
4
|
||||
);
|
||||
});
|
||||
const score5 = computed(() => {
|
||||
const rawTotal =
|
||||
const total =
|
||||
(Number(orientation_percent.value) +
|
||||
Number(self_learning_percent.value) +
|
||||
Number(training_seminar_percent.value) +
|
||||
Number(other_training_percent.value)) /
|
||||
(isSelectionPartfour.value ? 4 : 3);
|
||||
|
||||
const total = Math.trunc(rawTotal);
|
||||
4;
|
||||
|
||||
develop_result.value = total > 60 ? 1 : 0;
|
||||
|
||||
|
|
@ -1217,20 +1214,10 @@ watch(lengthdiscipline_level, (newLength) => {
|
|||
<q-separator class="q-my-xs" />
|
||||
<div class="row q-gutter-md align-center q-pl-md">
|
||||
<div class="col-8">
|
||||
<q-checkbox
|
||||
class="q-mr-sm"
|
||||
dense
|
||||
v-model="isSelectionPartfour"
|
||||
@update:model-value="
|
||||
other_training = 0;
|
||||
other_training_percent = 0;
|
||||
"
|
||||
/>
|
||||
4. การอบรมอื่น ๆ ตามที่หน่วยงานกำหนด (ถ้ามี)
|
||||
</div>
|
||||
<div class="col">
|
||||
<q-input
|
||||
:disable="!isSelectionPartfour"
|
||||
outlined
|
||||
dense
|
||||
type="number"
|
||||
|
|
@ -1244,7 +1231,6 @@ watch(lengthdiscipline_level, (newLength) => {
|
|||
outlined
|
||||
dense
|
||||
type="number"
|
||||
:disable="!isSelectionPartfour"
|
||||
v-model="other_training_percent"
|
||||
:rules="[(val:number) => val <= 100 || 'ร้อยละต้องไม่เกิน 100']"
|
||||
hide-bottom-space
|
||||
|
|
|
|||
|
|
@ -152,7 +152,6 @@ interface FormDataAppoint {
|
|||
reportingDate: string;
|
||||
posmasterId: string;
|
||||
posExecutiveName?: string;
|
||||
posExecutiveId?: string;
|
||||
typeCommand: string;
|
||||
positionExecutiveField?: string;
|
||||
positionArea?: string;
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import type {
|
|||
} from "@/modules/05_placement/interface/request/Main";
|
||||
import type { FormOrderPlacementMainData } from "@/modules/05_placement/interface/request/Main";
|
||||
|
||||
export const useProfileDataStore = defineStore("profilePlacenent", () => {
|
||||
interface profile {
|
||||
main: { columns: String[] };
|
||||
education: { columns: String[] };
|
||||
|
|
@ -28,7 +29,6 @@ interface profile {
|
|||
document: { columns: String[] };
|
||||
}
|
||||
|
||||
export const useProfileDataStore = defineStore("profilePlacenent", () => {
|
||||
const birthDate = ref<Date>(new Date());
|
||||
const retireText = ref<string | null>(null);
|
||||
const changeRetireText = (val: string | null) => {
|
||||
|
|
@ -87,15 +87,15 @@ export const useProfileDataStore = defineStore("profilePlacenent", () => {
|
|||
changeRetireText,
|
||||
};
|
||||
});
|
||||
interface placement {
|
||||
mappingPosition: { columns: String[] };
|
||||
}
|
||||
export const usePlacementDataStore = defineStore("placement", () => {
|
||||
const mixin = useCounterMixin(); //เรียกฟังก์ชันกลาง
|
||||
const tabsMain = ref<string>("probation");
|
||||
const isOfficer = ref<boolean | null>(null);
|
||||
const isStaff = ref<boolean | null>(null);
|
||||
const { hideLoader } = mixin;
|
||||
interface placement {
|
||||
mappingPosition: { columns: String[] };
|
||||
}
|
||||
const placementData = ref<placement>({
|
||||
mappingPosition: { columns: [] },
|
||||
});
|
||||
|
|
@ -218,10 +218,10 @@ export const usePlacementDataStore = defineStore("placement", () => {
|
|||
isStaff,
|
||||
};
|
||||
});
|
||||
export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
|
||||
interface placementOrder {
|
||||
mappingPosition: { columns: String[] };
|
||||
}
|
||||
export const useOrderPlacementDataStore = defineStore("placementOrder", () => {
|
||||
const placementOrderData = ref<placementOrder>({
|
||||
mappingPosition: { columns: [] },
|
||||
});
|
||||
|
|
@ -369,8 +369,6 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
|
|||
]);
|
||||
const statusOp = ref<DataOptions[]>(statusMainOp.value);
|
||||
|
||||
const statusDelete = ["REPORT", "WAITING", "DONE"];
|
||||
|
||||
const statusText = (val: string) => {
|
||||
switch (val) {
|
||||
case "WAITTING":
|
||||
|
|
@ -440,6 +438,5 @@ export const useTransferDataStore = defineStore("transferDataStore", () => {
|
|||
statusOp,
|
||||
statusMainOp,
|
||||
filterOption,
|
||||
statusDelete,
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { defineStore } from "pinia";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import { ref } from "vue";
|
||||
/** importType*/
|
||||
import type { PositionMaim } from "@/modules/05_placement/interface/response/SelectOrg";
|
||||
import type { DataPositionNo } from "@/modules/05_placement/interface/index/SelectOrg";
|
||||
|
|
@ -12,13 +12,11 @@ export const useSelectOrgStore = defineStore("selectorg", () => {
|
|||
const listPosNo: DataPositionNo[] = data.map((e: PositionMaim) => ({
|
||||
id: e.id,
|
||||
isPosition: e.isPosition,
|
||||
posMasterNo: formatPosmasterNo(
|
||||
e.orgShortname,
|
||||
e.posMasterNoPrefix,
|
||||
e.posMasterNo.toString(),
|
||||
e.posMasterNoSuffix
|
||||
),
|
||||
|
||||
posMasterNo:
|
||||
e.orgShortname +
|
||||
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : " ") +
|
||||
e.posMasterNo +
|
||||
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : " "),
|
||||
positionName: e.positionName,
|
||||
posTypeName: e.posTypeName,
|
||||
posLevelName: e.posLevelName,
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
import { ref, onMounted, computed } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
|
||||
import { useRouter, useRoute } from "vue-router";
|
||||
import { useRouter } from "vue-router";
|
||||
import {
|
||||
checkPermission,
|
||||
checkPermissionList,
|
||||
|
|
@ -20,19 +20,11 @@ import DialogOrders from "@/modules/05_placement/components/Transfer/DialogOrder
|
|||
|
||||
const $q = useQuasar();
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const mixin = useCounterMixin();
|
||||
const store = useTransferDataStore();
|
||||
const { statusText, filterOption } = useTransferDataStore();
|
||||
const {
|
||||
date2Thai,
|
||||
messageError,
|
||||
showLoader,
|
||||
hideLoader,
|
||||
onSearchDataTable,
|
||||
dialogRemove,
|
||||
success,
|
||||
} = mixin;
|
||||
const { date2Thai, messageError, showLoader, hideLoader, onSearchDataTable } =
|
||||
mixin;
|
||||
|
||||
const modal = ref<boolean>(false); //ส่งไปออกคำสั่ง
|
||||
const dataTransfer = ref<ResponseData[]>([]); //ช่อมูลรายการขอโอน
|
||||
|
|
@ -149,15 +141,6 @@ const visibleColumns = ref<string[]>([
|
|||
"createdAt",
|
||||
]);
|
||||
|
||||
const isPermissionDelete = computed(() => {
|
||||
return (status: string) => {
|
||||
return (
|
||||
checkPermission(route)?.attrOwnership === "OWNER" &&
|
||||
!store.statusDelete.includes(status)
|
||||
);
|
||||
};
|
||||
});
|
||||
|
||||
/** ฟังก์ชันดึงข้อมูรายการขอโอน*/
|
||||
async function fetchData() {
|
||||
showLoader();
|
||||
|
|
@ -211,21 +194,6 @@ function onSearch() {
|
|||
);
|
||||
}
|
||||
|
||||
function handleDelete(id: string) {
|
||||
dialogRemove($q, async () => {
|
||||
try {
|
||||
showLoader();
|
||||
await http.delete(config.API.transfer + `/admin/${id}`);
|
||||
await fetchData();
|
||||
success($q, "ลบข้อมูลสำเร็จ");
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* ทำงานเมื่อ Components ถูกเรียกใช้งาน
|
||||
* จะเรียกใช้ fetchData เพื่อดึงข้อมูลรายการขอโอน
|
||||
|
|
@ -369,18 +337,6 @@ onMounted(async () => {
|
|||
>
|
||||
<q-tooltip>รายละเอียด</q-tooltip>
|
||||
</q-btn>
|
||||
|
||||
<q-btn
|
||||
v-if="isPermissionDelete(props.row.status)"
|
||||
flat
|
||||
round
|
||||
dense
|
||||
icon="mdi-delete"
|
||||
color="red"
|
||||
@click.prevent="handleDelete(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td v-for="col in props.cols" :key="col.id">
|
||||
<div v-if="col.name === 'no'">
|
||||
|
|
|
|||
|
|
@ -133,11 +133,9 @@ const columns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return row.positionTypeOld && row.positionTypeOld !== "-"
|
||||
return row.positionTypeOld
|
||||
? `${row.positionTypeOld}${
|
||||
row.positionLevelOld && row.positionLevelOld !== "-"
|
||||
? `(${row.positionLevelOld})`
|
||||
: ""
|
||||
row.positionLevelOld ? `(${row.positionLevelOld})` : ""
|
||||
}`
|
||||
: "";
|
||||
},
|
||||
|
|
@ -313,7 +311,7 @@ function openDelete(id: string) {
|
|||
dialogRemove($q, async () => {
|
||||
showLoader();
|
||||
await http
|
||||
.delete(config.API.receiveData() + `/admin/${id}`)
|
||||
.delete(config.API.receiveDataId(id))
|
||||
.then(async () => {
|
||||
await fecthlistRecevice();
|
||||
await success($q, "ลบข้อมูลสำเร็จ");
|
||||
|
|
@ -382,7 +380,6 @@ async function onSave(data: FormDataAppoint) {
|
|||
typeCommand: data.typeCommand,
|
||||
positionExecutiveField: data.positionExecutiveField,
|
||||
positionArea: data.positionArea,
|
||||
posExecutiveId: data.posExecutiveId,
|
||||
};
|
||||
|
||||
showLoader();
|
||||
|
|
@ -606,10 +603,8 @@ onMounted(async () => {
|
|||
|
||||
<q-item
|
||||
v-if="
|
||||
checkPermission($route)?.attrOwnership ===
|
||||
'OWNER' &&
|
||||
checkPermission($route)?.attrIsDelete &&
|
||||
props.row.status !== 'REPORT' &&
|
||||
props.row.status !== 'WAITING' &&
|
||||
props.row.status !== 'DONE'
|
||||
"
|
||||
clickable
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ const columns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return row.positionNumberOld ?? "-";
|
||||
return findPosMasterNoOld(row);
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
@ -236,7 +236,8 @@ function openModalOrder() {
|
|||
item.status == "APPROVE") &&
|
||||
item.organizationPositionOld &&
|
||||
item.organization &&
|
||||
item.dateStart
|
||||
item.dateStart &&
|
||||
item.dateEnd
|
||||
);
|
||||
rows2.value = row;
|
||||
rows2Data.value = row;
|
||||
|
|
|
|||
|
|
@ -457,7 +457,6 @@ async function onSave(data: FormDataAppoint) {
|
|||
typeCommand: data.typeCommand,
|
||||
positionExecutiveField: data.positionExecutiveField,
|
||||
positionArea: data.positionArea,
|
||||
posExecutiveId: data.posExecutiveId,
|
||||
};
|
||||
|
||||
showLoader();
|
||||
|
|
|
|||
|
|
@ -286,7 +286,6 @@ async function onSaveSelectOrg(data: any) {
|
|||
typeCommand: data.typeCommand,
|
||||
positionExecutiveField: data.positionExecutiveField,
|
||||
positionArea: data.positionArea,
|
||||
posExecutiveId: data.posExecutiveId,
|
||||
};
|
||||
|
||||
showLoader();
|
||||
|
|
|
|||
|
|
@ -5,12 +5,10 @@ import { useQuasar } from "quasar";
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useRetirementDataStore } from "@/modules/06_retirement/store/Main";
|
||||
import { useRoleWorkflowDataStore } from "@/stores/roleWorkflow";
|
||||
import { useCommandMainStore } from "@/modules/18_command/store/Main";
|
||||
|
||||
import type { PropType } from "vue";
|
||||
import type { QTableProps } from "quasar";
|
||||
import type { ResponseItems } from "@/modules/06_retirement/interface/response/Main";
|
||||
import type { ListCommand } from "@/modules/18_command/interface/index/Main";
|
||||
|
||||
import DialogHeader from "@/components/DialogHeader.vue";
|
||||
import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCommand.vue";
|
||||
|
|
@ -18,7 +16,6 @@ import DialogCreateCommand from "@/modules/18_command/components/DialogCreateCom
|
|||
/** use */
|
||||
const $q = useQuasar();
|
||||
const stroe = useRetirementDataStore();
|
||||
const storeCommand = useCommandMainStore();
|
||||
const { fetchDataCheckIsoffice } = useRoleWorkflowDataStore();
|
||||
const { statusText } = stroe;
|
||||
const selected = ref<ResponseItems[]>([]);
|
||||
|
|
@ -50,10 +47,6 @@ const props = defineProps({
|
|||
cancel: { type: Boolean, default: false },
|
||||
});
|
||||
|
||||
const commandType = ref<string>("");
|
||||
const commandMainOp = ref<ListCommand[]>([]); //ข้อมูลรายการคำสั่ง
|
||||
const commandOp = ref<ListCommand[]>([]); //ตัวเลือกคำสั่ง
|
||||
|
||||
//Table
|
||||
const filterKeyword = defineModel<string>("filterKeyword", { required: true });
|
||||
const rowsData = ref<ResponseItems[]>([]);
|
||||
|
|
@ -176,11 +169,6 @@ const visibleColumns = ref<string[]>([
|
|||
]);
|
||||
|
||||
const modalCommand = ref<boolean>(false);
|
||||
const isDisable = computed(() => {
|
||||
return props.mainTabs === "1"
|
||||
? selected.value.length === 0 || commandType.value === ""
|
||||
: selected.value.length === 0;
|
||||
});
|
||||
|
||||
/** popup ยืนยันส่งัว */
|
||||
function saveOrder() {
|
||||
|
|
@ -222,19 +210,6 @@ async function fetchCheckOfficer() {
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* ฟิลเตอร์ คำสั่ง
|
||||
* @param val ค่าจาก Input
|
||||
* @param update Funtion quasar
|
||||
*/
|
||||
function filterSelector(val: string, update: Function) {
|
||||
update(() => {
|
||||
commandOp.value = commandMainOp.value.filter(
|
||||
(v: ListCommand) => v.name.indexOf(val) > -1
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
watch(
|
||||
() => props.modal,
|
||||
async (val) => {
|
||||
|
|
@ -256,11 +231,6 @@ watch(
|
|||
|
||||
rowsData.value = data ? data : [];
|
||||
rowsDataMain.value = data ? data : [];
|
||||
commandType.value = "";
|
||||
const dataCommandTypes = await storeCommand.getCommandTypes();
|
||||
commandMainOp.value = dataCommandTypes.filter(
|
||||
(e: ListCommand) => e.code === "C-PM-17" || e.code === "C-PM-48"
|
||||
);
|
||||
} else {
|
||||
rowsData.value = [];
|
||||
rowsDataMain.value = [];
|
||||
|
|
@ -268,7 +238,6 @@ watch(
|
|||
}
|
||||
);
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<q-dialog v-model="props.modal" persistent>
|
||||
<q-card style="min-width: 85%">
|
||||
|
|
@ -280,33 +249,6 @@ watch(
|
|||
<q-card-section>
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-12 row">
|
||||
<q-select
|
||||
v-if="props.mainTabs === '1'"
|
||||
v-model="commandType"
|
||||
dense
|
||||
outlined
|
||||
label="ประเภทคำสั่ง"
|
||||
:options="commandOp"
|
||||
option-label="name"
|
||||
option-value="code"
|
||||
emit-value
|
||||
map-options
|
||||
use-input
|
||||
hide-selected
|
||||
fill-input
|
||||
@update:model-value="onSearch"
|
||||
@filter="(inputValue:string,
|
||||
doneFn:Function) => filterSelector(inputValue, doneFn
|
||||
) "
|
||||
>
|
||||
<template v-slot:no-option>
|
||||
<q-item>
|
||||
<q-item-section class="text-grey">
|
||||
ไม่มีข้อมูล
|
||||
</q-item-section>
|
||||
</q-item>
|
||||
</template>
|
||||
</q-select>
|
||||
<q-space />
|
||||
<q-input
|
||||
borderless
|
||||
|
|
@ -390,7 +332,7 @@ watch(
|
|||
<q-btn
|
||||
label="ส่งไปออกคำสั่ง"
|
||||
@click="saveOrder"
|
||||
:disable="isDisable"
|
||||
:disable="selected.length === 0"
|
||||
color="public"
|
||||
/>
|
||||
</q-card-actions>
|
||||
|
|
@ -399,7 +341,7 @@ watch(
|
|||
|
||||
<DialogCreateCommand
|
||||
v-model:modal="modalCommand"
|
||||
:command-type-code="props.mainTabs === '1' ? commandType : 'C-PM-41'"
|
||||
:command-type-code="props.mainTabs === '1' ? 'C-PM-17' : 'C-PM-41'"
|
||||
:persons="dataMapToSend"
|
||||
:fetch-data="props.fecthList"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@ const {
|
|||
success,
|
||||
dialogConfirm,
|
||||
dialogRemove,
|
||||
convertDateToAPI,
|
||||
} = mixin;
|
||||
|
||||
/** ตัวแปร */
|
||||
|
|
@ -478,8 +477,9 @@ function onSubmitConditions() {
|
|||
function onSubmitAttached() {
|
||||
dialogConfirm($q, async () => {
|
||||
const formData = new FormData();
|
||||
const send: string = convertDateToAPI(date.value) ?? "";
|
||||
const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
|
||||
const send = date.value !== null ? new Date(date.value).toUTCString() : "";
|
||||
const activeDate =
|
||||
dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
|
||||
formData.append("Location", location.value);
|
||||
formData.append("SendDate", send);
|
||||
formData.append("ActiveDate", activeDate);
|
||||
|
|
@ -771,13 +771,10 @@ onMounted(async () => {
|
|||
<q-space />
|
||||
<div
|
||||
v-if="
|
||||
(!checkRoutePermisson &&
|
||||
!checkRoutePermisson &&
|
||||
isStaff &&
|
||||
status === 'WAITTING' &&
|
||||
checkPermission($route)?.attrIsUpdate) ||
|
||||
(!checkRoutePermisson &&
|
||||
((isStaff && group === '1.1' && approveStep === 'st1') ||
|
||||
(isOfficer && group !== '1.1' && approveStep === 'st3')))
|
||||
checkPermission($route)?.attrIsUpdate
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ const {
|
|||
hideLoader,
|
||||
success,
|
||||
dialogConfirm,
|
||||
convertDateToAPI,
|
||||
} = useCounterMixin();
|
||||
|
||||
const checkRoutePermisson = ref<boolean>(route.name == "resignDetailreject");
|
||||
|
|
@ -314,8 +313,9 @@ async function clickCancel() {
|
|||
function onSubmitAttached() {
|
||||
dialogConfirm($q, () => {
|
||||
const formData = new FormData();
|
||||
const send: string = convertDateToAPI(date.value) ?? "";
|
||||
const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
|
||||
const send = date.value !== null ? new Date(date.value).toUTCString() : "";
|
||||
const activeDate =
|
||||
dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
|
||||
formData.append("Location", location.value);
|
||||
formData.append("SendDate", send);
|
||||
formData.append("ActiveDate", activeDate);
|
||||
|
|
|
|||
|
|
@ -33,8 +33,7 @@ const {
|
|||
showLoader,
|
||||
hideLoader,
|
||||
onSearchDataTable,
|
||||
dialogRemove,
|
||||
success,
|
||||
findOrgName,
|
||||
} = mixin;
|
||||
|
||||
/** Table */
|
||||
|
|
@ -258,21 +257,6 @@ function onSearch() {
|
|||
);
|
||||
}
|
||||
|
||||
function handleDelete(id: string) {
|
||||
dialogRemove($q, async () => {
|
||||
try {
|
||||
showLoader();
|
||||
await http.delete(config.API.listResign() + `/admin/${id}`);
|
||||
await fecthlist();
|
||||
success($q, "ลบข้อมูลสำเร็จ");
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**Hook */
|
||||
onMounted(async () => {
|
||||
status.value = stroeResign.formQurey.status;
|
||||
|
|
@ -324,11 +308,7 @@ onMounted(async () => {
|
|||
color="primary"
|
||||
icon="mdi-account-arrow-right"
|
||||
>
|
||||
<q-tooltip>{{
|
||||
`ส่งไปออกคำสั่ง${
|
||||
stroeResign.mainTabs == "2" ? "ยกเลิกการ" : ""
|
||||
}ลาออก`
|
||||
}}</q-tooltip>
|
||||
<q-tooltip>{{ `ส่งไปออกคำสั่ง${stroeResign.mainTabs == '2'?"ยกเลิกการ":''}ลาออก` }}</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
<q-space />
|
||||
|
|
@ -413,26 +393,6 @@ onMounted(async () => {
|
|||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
|
||||
<q-btn
|
||||
v-if="
|
||||
checkPermission($route)?.attrOwnership === 'OWNER' &&
|
||||
props.row.status !== 'REPORT' &&
|
||||
props.row.status !== 'WAITING' &&
|
||||
props.row.status !== 'DONE' &&
|
||||
props.row.status !== 'CANCELING' &&
|
||||
props.row.status !== 'CANCEL' &&
|
||||
stroeResign.mainTabs === '1'
|
||||
"
|
||||
flat
|
||||
dense
|
||||
round
|
||||
color="red"
|
||||
icon="delete"
|
||||
@click.prevent="handleDelete(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td v-for="col in props.cols" :key="col.id">
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -801,11 +801,10 @@ onMounted(async () => {
|
|||
<q-space />
|
||||
<div
|
||||
v-if="
|
||||
(!checkRoutePermisson &&
|
||||
!checkRoutePermisson &&
|
||||
isStaff &&
|
||||
status === 'WAITTING' &&
|
||||
checkPermission($route)?.attrIsUpdate) ||
|
||||
(!checkRoutePermisson && isStaff && approveStep === 'st1')
|
||||
checkPermission($route)?.attrIsUpdate
|
||||
"
|
||||
>
|
||||
<q-btn
|
||||
|
|
|
|||
|
|
@ -38,7 +38,6 @@ const {
|
|||
hideLoader,
|
||||
success,
|
||||
dialogConfirm,
|
||||
convertDateToAPI,
|
||||
} = mixin;
|
||||
|
||||
/** ตัวแปร */
|
||||
|
|
@ -302,9 +301,9 @@ async function clickCancel() {
|
|||
function onSubmitAttached() {
|
||||
dialogConfirm($q, () => {
|
||||
const formData = new FormData();
|
||||
const send: string = convertDateToAPI(date.value) ?? "";
|
||||
const activeDate: string = convertDateToAPI(dateLeave.value) ?? "";
|
||||
|
||||
const send = date.value !== null ? new Date(date.value).toUTCString() : "";
|
||||
const activeDate =
|
||||
dateLeave.value !== null ? new Date(dateLeave.value).toUTCString() : "";
|
||||
formData.append("Location", location.value);
|
||||
formData.append("SendDate", send);
|
||||
formData.append("ActiveDate", activeDate);
|
||||
|
|
|
|||
|
|
@ -27,15 +27,8 @@ const stroeResign = useDataStore();
|
|||
const { statusText } = stroe;
|
||||
const router = useRouter();
|
||||
const mixin = useCounterMixin();
|
||||
const {
|
||||
messageError,
|
||||
date2Thai,
|
||||
showLoader,
|
||||
hideLoader,
|
||||
onSearchDataTable,
|
||||
dialogRemove,
|
||||
success,
|
||||
} = mixin;
|
||||
const { messageError, date2Thai, showLoader, hideLoader, onSearchDataTable } =
|
||||
mixin;
|
||||
|
||||
/** Table */
|
||||
const rows = ref<ResponseItems[]>([]);
|
||||
|
|
@ -136,7 +129,7 @@ const columns = ref<QTableProps["columns"]>([
|
|||
sortable: true,
|
||||
field: "status",
|
||||
format(val, row) {
|
||||
return stroeResign.mainTabsEMP === "1"
|
||||
return stroeResign.mainTabs === "1"
|
||||
? statusText(row.status)
|
||||
: statusText(row.status, "อนุญาต");
|
||||
},
|
||||
|
|
@ -259,21 +252,6 @@ function onSearch() {
|
|||
);
|
||||
}
|
||||
|
||||
function handleDelete(id: string) {
|
||||
dialogRemove($q, async () => {
|
||||
try {
|
||||
showLoader();
|
||||
await http.delete(config.API.listResignEMP() + `/admin/${id}`);
|
||||
await fecthlist();
|
||||
success($q, "ลบข้อมูลสำเร็จ");
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**Hook */
|
||||
onMounted(async () => {
|
||||
statusEMP.value = stroeResign.formQureyEMP.status;
|
||||
|
|
@ -413,26 +391,6 @@ onMounted(async () => {
|
|||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
|
||||
<q-btn
|
||||
v-if="
|
||||
checkPermission($route)?.attrOwnership === 'OWNER' &&
|
||||
props.row.status !== 'REPORT' &&
|
||||
props.row.status !== 'WAITING' &&
|
||||
props.row.status !== 'DONE' &&
|
||||
props.row.status !== 'CANCELING' &&
|
||||
props.row.status !== 'CANCEL' &&
|
||||
stroeResign.mainTabsEMP === '1'
|
||||
"
|
||||
flat
|
||||
dense
|
||||
round
|
||||
color="red"
|
||||
icon="delete"
|
||||
@click.prevent="handleDelete(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td v-for="col in props.cols" :key="col.id">
|
||||
<div
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import { useQuasar } from "quasar";
|
|||
import { useRoute } from "vue-router";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useStructureTree } from "@/stores/structureTree";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
|
|
@ -75,12 +74,7 @@ const columns = ref<QTableProps["columns"]>([
|
|||
sortable: true,
|
||||
field: "posMasterNo",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortname,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo.toString(),
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
return `${row.orgShortname} ${row.posMasterNo}`;
|
||||
},
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
|
|
|
|||
|
|
@ -212,7 +212,7 @@ watch(
|
|||
:close="close"
|
||||
/>
|
||||
<q-separator color="grey-4" />
|
||||
<q-card-section style="max-height: 55vh" class="scroll q-pa-none">
|
||||
<q-card-section style="max-height: 80vh" class="scroll q-pa-none">
|
||||
<div
|
||||
class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
|
||||
>
|
||||
|
|
@ -362,7 +362,6 @@ watch(
|
|||
</datepicker>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
|
||||
>
|
||||
|
|
@ -514,7 +513,6 @@ watch(
|
|||
</datepicker>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<q-input
|
||||
class="col-12 bg-white q-ma-md"
|
||||
outlined
|
||||
|
|
@ -524,8 +522,7 @@ watch(
|
|||
label="คำอธิบาย"
|
||||
hide-bottom-space
|
||||
type="textarea"
|
||||
/>
|
||||
|
||||
></q-input>
|
||||
<div
|
||||
class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
|
||||
>
|
||||
|
|
@ -544,7 +541,6 @@ watch(
|
|||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="col q-ma-md q-pa-sm bg-white border_custom text-weight-medium"
|
||||
>
|
||||
|
|
@ -563,7 +559,6 @@ watch(
|
|||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
|
||||
<q-separator color="grey-4" v-if="!isRead" />
|
||||
<div class="q-pa-sm" v-if="!isRead">
|
||||
<div class="row justify-end">
|
||||
|
|
|
|||
|
|
@ -1,263 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
import { onMounted, ref } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
|
||||
import type { QTableProps } from "quasar";
|
||||
import type { DataOption } from "@/interface/main";
|
||||
import type { DataPendingJobs } from "@/modules/09_leave/interface/response/work";
|
||||
|
||||
const $q = useQuasar();
|
||||
const { showLoader, hideLoader, messageError, date2Thai, onSearchDataTable } =
|
||||
useCounterMixin();
|
||||
|
||||
/** ข้อมูลตาราง*/
|
||||
const keyword = ref<string>("");
|
||||
const timeOutMinutes = ref<string>("30");
|
||||
const rowsMain = ref<DataPendingJobs[]>([]);
|
||||
const rows = ref<DataPendingJobs[]>([]);
|
||||
const columns = ref<QTableProps["columns"]>([
|
||||
{
|
||||
name: "no",
|
||||
align: "left",
|
||||
label: "ลำดับ",
|
||||
sortable: false,
|
||||
field: "no",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "createdFullName",
|
||||
align: "left",
|
||||
label: "ชื่อ-นามสกุล",
|
||||
sortable: true,
|
||||
field: "createdFullName",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "checkType",
|
||||
align: "left",
|
||||
label: "ลงเวลาเข้า/ลงเวลาออก",
|
||||
sortable: true,
|
||||
field: "checkType",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return val ? convertcheckType(val) : "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "status",
|
||||
align: "left",
|
||||
label: "สถานะ ",
|
||||
sortable: true,
|
||||
field: "status",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return val ? convertStatus(val) : "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "createdDate",
|
||||
align: "left",
|
||||
label: "ลงเวลาเมื่อ",
|
||||
sortable: true,
|
||||
field: "createdDate",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return val ? date2Thai(val, false, true) : "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "processingDate",
|
||||
align: "left",
|
||||
label: "เริ่มประมวลผล",
|
||||
sortable: true,
|
||||
field: "processingDate",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return val ? date2Thai(val, false, true) : "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "completedDate",
|
||||
align: "left",
|
||||
label: "ประมวลผลเสร็จ",
|
||||
sortable: true,
|
||||
field: "completedDate",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return val ? date2Thai(val, false, true) : "-";
|
||||
},
|
||||
},
|
||||
]);
|
||||
const visibleColumns = ref<string[]>([
|
||||
"no",
|
||||
"createdFullName",
|
||||
"checkType",
|
||||
"status",
|
||||
"createdDate",
|
||||
"processingDate",
|
||||
"completedDate",
|
||||
]);
|
||||
const timeOutMinutesOption = ref<DataOption[]>([
|
||||
{ id: "30", label: "30 นาที" },
|
||||
{ id: "60", label: "1 ชั่วโมง" },
|
||||
{ id: "1440", label: "1 วัน" },
|
||||
{ id: "10080", label: "7 วัน" },
|
||||
]);
|
||||
|
||||
/** ฟังก์ชันดึงข้อมูลจาก API */
|
||||
async function fetchData() {
|
||||
try {
|
||||
showLoader();
|
||||
const res = await http.get(
|
||||
`${config.API.leavePendingJobs}${Number(timeOutMinutes.value)}`
|
||||
);
|
||||
|
||||
rowsMain.value = res.data.result;
|
||||
serchDataTable();
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
hideLoader();
|
||||
}
|
||||
}
|
||||
|
||||
/** ฟังก์ชันค้นหาข้อมูลในตาราง */
|
||||
function serchDataTable() {
|
||||
rows.value = onSearchDataTable(
|
||||
keyword.value,
|
||||
rowsMain.value,
|
||||
columns.value ? columns.value : []
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* ฟังก์ชันแปลงสถานะเป็นข้อความ
|
||||
* @param val
|
||||
*/
|
||||
function convertStatus(val: string) {
|
||||
switch (val) {
|
||||
case "PENDING":
|
||||
return "รอดำเนินการ";
|
||||
case "COMPLETED":
|
||||
return "ดำเนินการเสร็จสิ้น";
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
function convertcheckType(val: string) {
|
||||
switch (val) {
|
||||
case "CHECK_OUT":
|
||||
return "ลงเวลาออก";
|
||||
case "CHECK_IN":
|
||||
return "ลงเวลาเข้า";
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
fetchData();
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="row items-center q-gutter-x-sm q-pb-sm">
|
||||
<q-select
|
||||
emit-value
|
||||
map-options
|
||||
outlined
|
||||
dense
|
||||
option-value="id"
|
||||
option-label="label"
|
||||
label="เวลาย้อนหลัง"
|
||||
use-input
|
||||
v-model="timeOutMinutes"
|
||||
hide-selected
|
||||
fill-input
|
||||
:options="timeOutMinutesOption"
|
||||
@update:model-value="fetchData"
|
||||
>
|
||||
<template v-slot:no-option>
|
||||
<q-item>
|
||||
<q-item-section class="text-grey"> ไม่มีข้อมูล </q-item-section>
|
||||
</q-item>
|
||||
</template>
|
||||
</q-select>
|
||||
<q-space />
|
||||
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
v-model="keyword"
|
||||
label="ค้นหา"
|
||||
@keydown.enter.prevent="serchDataTable"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
<q-select
|
||||
v-model="visibleColumns"
|
||||
multiple
|
||||
outlined
|
||||
dense
|
||||
options-dense
|
||||
:display-value="$q.lang.table.columns"
|
||||
emit-value
|
||||
map-options
|
||||
:options="columns"
|
||||
option-value="name"
|
||||
style="min-width: 140px"
|
||||
/>
|
||||
</div>
|
||||
<d-table
|
||||
:columns="columns"
|
||||
:rows="rows"
|
||||
row-key="id"
|
||||
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 ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</d-table>
|
||||
</template>
|
||||
|
||||
<style scoped></style>
|
||||
|
|
@ -97,7 +97,7 @@ watch(
|
|||
formData.note = "";
|
||||
} else if (props.editCheck === "PENDING") {
|
||||
if (props.detailData) {
|
||||
if (props.detailData.checkInEdit && props.detailData.checkOutEdit) {
|
||||
if (props.detailData.checkInEdit) {
|
||||
formData.checkIn = props.detailData.startTimeMorning;
|
||||
formData.checkOut = props.detailData.endTimeAfternoon;
|
||||
} else if (
|
||||
|
|
|
|||
|
|
@ -1,344 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, watch } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useSpecialTimeStore } from "@/modules/09_leave/stores/SpecialTimeStore";
|
||||
import { usePagination } from "@/composables/usePagination";
|
||||
|
||||
import type { QTableProps } from "quasar";
|
||||
import type { DataSpecialTime } from "@/modules/09_leave/interface/index/Main";
|
||||
|
||||
import DialogHeader from "@/components/DialogHeader.vue";
|
||||
|
||||
const $q = useQuasar();
|
||||
const store = useSpecialTimeStore();
|
||||
const {
|
||||
hideLoader,
|
||||
messageError,
|
||||
showLoader,
|
||||
success,
|
||||
date2Thai,
|
||||
dialogConfirm,
|
||||
dialogMessageNotify,
|
||||
dateToISO,
|
||||
} = useCounterMixin();
|
||||
const { pagination, params, onRequest } = usePagination("", fetchDataList);
|
||||
|
||||
/** props*/
|
||||
const modal = defineModel<boolean>("modal", { required: true });
|
||||
const props = defineProps({
|
||||
fetchData: { type: Function, default: () => {} },
|
||||
dateThaiRange: { type: Function, default: () => {} },
|
||||
columns: { type: Array as () => QTableProps["columns"], default: () => [] },
|
||||
visibleColumnsMain: { type: Array as () => string[], default: () => [] },
|
||||
});
|
||||
|
||||
const filterKeyword = ref<string>("");
|
||||
const filterStatus = ref<string>("PENDING");
|
||||
const filterDate = ref<[Date, Date] | null>([new Date(), new Date()]); //วันที่ประกาศ
|
||||
|
||||
const rows = ref<DataSpecialTime[]>([]);
|
||||
const visibleColumns = ref<string[]>(props.visibleColumnsMain);
|
||||
const selected = ref<DataSpecialTime[]>([]);
|
||||
const reason = ref<string>("");
|
||||
|
||||
/** ฟังก์ชันเรียกข้อมูลรายการลงเวลากรณีพิเศษ*/
|
||||
async function fetchDataList() {
|
||||
showLoader();
|
||||
selected.value = [];
|
||||
await http
|
||||
.get(config.API.specialTime(), {
|
||||
params: {
|
||||
...params.value,
|
||||
keyword: filterKeyword.value.trim(),
|
||||
status: filterStatus.value,
|
||||
startDate: filterDate.value ? dateToISO(filterDate.value[0]) : null,
|
||||
endDate: filterDate.value ? dateToISO(filterDate.value[1]) : null,
|
||||
},
|
||||
})
|
||||
.then(async (res) => {
|
||||
const result = await res.data.result;
|
||||
pagination.value.rowsNumber = result.total;
|
||||
if (result.data.length > 0) {
|
||||
rows.value = result.data.map((e: DataSpecialTime) => ({
|
||||
...e,
|
||||
date: date2Thai(new Date(e.createdAt), false, true),
|
||||
dateFix: date2Thai(new Date(e.checkDate)),
|
||||
timeMorning:
|
||||
e.startTimeMorning == null
|
||||
? "-"
|
||||
: e.checkInEdit == true
|
||||
? e.startTimeMorning + " - " + e.endTimeMorning
|
||||
: "-",
|
||||
timeAfternoon:
|
||||
e.startTimeAfternoon == null
|
||||
? "-"
|
||||
: e.checkOutEdit == true
|
||||
? e.startTimeAfternoon + " - " + e.endTimeAfternoon
|
||||
: "-",
|
||||
checkIn: e.checkInTime,
|
||||
checkOut: e.checkOutTime,
|
||||
checkInStatus: store.convertStatus(e.checkInStatus),
|
||||
checkOutStatus: store.convertStatus(e.checkOutStatus),
|
||||
checkInStatusMain: e.checkInStatus,
|
||||
checkOutStatusMain: e.checkOutStatus,
|
||||
}));
|
||||
} else {
|
||||
rows.value = [];
|
||||
}
|
||||
})
|
||||
.catch((e) => {
|
||||
rows.value = [];
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
|
||||
/** ฟังก์ชันบันทึกข้อมูล*/
|
||||
function onSubmit() {
|
||||
if (selected.value.length === 0) {
|
||||
dialogMessageNotify($q, "กรุณาเลือกอย่างน้อย 1 รายการ");
|
||||
} else {
|
||||
dialogConfirm($q, async () => {
|
||||
showLoader();
|
||||
const payload = selected.value.map((e: DataSpecialTime) => {
|
||||
let checkInTime: string;
|
||||
let checkOutTime: string;
|
||||
|
||||
if (e.checkInEdit && e.checkOutEdit) {
|
||||
checkInTime = e.startTimeMorning;
|
||||
checkOutTime = e.endTimeAfternoon;
|
||||
} else if (e.checkInEdit && !e.checkOutEdit) {
|
||||
checkInTime = e.startTimeMorning;
|
||||
checkOutTime = e.endTimeMorning;
|
||||
} else if (!e.checkInEdit && e.checkOutEdit) {
|
||||
checkInTime = e.startTimeAfternoon;
|
||||
checkOutTime = e.endTimeAfternoon;
|
||||
} else {
|
||||
checkInTime = e.checkInTime;
|
||||
checkOutTime = e.checkOutTime;
|
||||
}
|
||||
|
||||
return {
|
||||
recId: e.id,
|
||||
checkInTime,
|
||||
checkOutTime,
|
||||
checkInStatus: e.checkInEdit ? "NORMAL" : e.checkInStatusMain,
|
||||
checkOutStatus: e.checkOutEdit ? "NORMAL" : e.checkOutStatusMain,
|
||||
reason: reason.value,
|
||||
};
|
||||
});
|
||||
|
||||
try {
|
||||
await http.put(config.API.specialTimeApproveLists, payload);
|
||||
await props.fetchData();
|
||||
success($q, "บันทึกข้อมูลสำเร็จ");
|
||||
handleClose();
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
/** ฟังก์ชั่นค้นหาข้อมูล */
|
||||
function onSearchData() {
|
||||
pagination.value.page = 1;
|
||||
fetchDataList();
|
||||
}
|
||||
|
||||
/** ฟังก์ชันปิด*/
|
||||
function handleClose() {
|
||||
modal.value = false;
|
||||
selected.value = [];
|
||||
rows.value = [];
|
||||
reason.value = "";
|
||||
filterDate.value = [new Date(), new Date()];
|
||||
filterKeyword.value = "";
|
||||
pagination.value.page = 1;
|
||||
}
|
||||
|
||||
watch(modal, async (val) => {
|
||||
if (val) {
|
||||
await fetchDataList();
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<q-dialog v-model="modal" persistent>
|
||||
<q-card style="min-width: 800px">
|
||||
<q-form greedy @submit.prevent @validation-success="onSubmit">
|
||||
<DialogHeader
|
||||
tittle="อนุมัติการลงเวลากรณีพิเศษแบบหลายรายการ"
|
||||
:close="handleClose"
|
||||
/>
|
||||
<q-separator />
|
||||
<q-card-section class="row q-col-gutter-sm">
|
||||
<div class="col-12">
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-xs-12 col-sm-6 col-md-5">
|
||||
<datepicker
|
||||
v-model="filterDate"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
borderless
|
||||
range
|
||||
:enableTimePicker="false"
|
||||
week-start="0"
|
||||
@update:modelValue="onSearchData()"
|
||||
>
|
||||
<template #year="{ year }">
|
||||
{{ year + 543 }}
|
||||
</template>
|
||||
<template #year-overlay-value="{ value }">
|
||||
{{ parseInt(value + 543) }}
|
||||
</template>
|
||||
<template #trigger>
|
||||
<q-input
|
||||
outlined
|
||||
dense
|
||||
class="full-width datepicker"
|
||||
:model-value="
|
||||
filterDate != null ? dateThaiRange(filterDate) : null
|
||||
"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon
|
||||
name="event"
|
||||
class="cursor-pointer"
|
||||
style="color: var(--q-primary)"
|
||||
>
|
||||
</q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
</template>
|
||||
</datepicker>
|
||||
</div>
|
||||
|
||||
<q-space v-if="!$q.screen.xs && !$q.screen.sm" />
|
||||
<div class="col-xs-12 col-sm-6 col-md-4">
|
||||
<q-input
|
||||
standout
|
||||
dense
|
||||
v-model="filterKeyword"
|
||||
outlined
|
||||
placeholder="ค้นหาชื่อ-นามสกุล"
|
||||
@keydown.enter.prevent="onSearchData()"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon name="search" />
|
||||
</template>
|
||||
</q-input>
|
||||
</div>
|
||||
|
||||
<div class="col-xs-12 col-sm-6 col-md-2">
|
||||
<q-select
|
||||
v-model="visibleColumns"
|
||||
multiple
|
||||
outlined
|
||||
dense
|
||||
options-dense
|
||||
:display-value="$q.lang.table.columns"
|
||||
emit-value
|
||||
map-options
|
||||
:options="columns"
|
||||
option-value="name"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<span class="text-red"
|
||||
>*หมายเหตุเลือกทั้งหมดเฉพาะรายการที่แสดงเท่านั้น</span
|
||||
>
|
||||
<div class="col-12">
|
||||
<p-table
|
||||
:columns="columns"
|
||||
:rows="rows"
|
||||
row-key="id"
|
||||
flat
|
||||
bordered
|
||||
:paging="false"
|
||||
dense
|
||||
:visible-columns="visibleColumns"
|
||||
:rows-per-page-options="[10, 25, 50, 100]"
|
||||
v-model:pagination="pagination"
|
||||
@request="onRequest"
|
||||
selection="multiple"
|
||||
v-model:selected="selected"
|
||||
>
|
||||
<template v-slot:header-selection="scope">
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
v-model="scope.selected"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<template v-slot:body="props">
|
||||
<q-tr :props="props">
|
||||
<q-td>
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
v-model="props.selected"
|
||||
/>
|
||||
</q-td>
|
||||
<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-if="col.name === 'description'"
|
||||
class="table_ellipsis"
|
||||
>
|
||||
{{ col.value ?? "-" }}
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ col.value ?? "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
</template>
|
||||
</p-table>
|
||||
</div>
|
||||
|
||||
<div class="col-12">
|
||||
<q-input
|
||||
outlined
|
||||
v-model="reason"
|
||||
dense
|
||||
lazy-rules
|
||||
type="textarea"
|
||||
:rules="[(val:string) => !!val || 'กรุณาเหตุผลการอนุมัติ']"
|
||||
label="เหตุผลการอนุมัติ"
|
||||
hide-bottom-space
|
||||
rows="3"
|
||||
/>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-separator />
|
||||
<q-card-actions align="right">
|
||||
<q-btn label="บันทึก" color="public" id="onSubmit" type="submit">
|
||||
<q-tooltip>บันทึก</q-tooltip>
|
||||
</q-btn>
|
||||
</q-card-actions>
|
||||
</q-form>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
</template>
|
||||
|
||||
<style scoped></style>
|
||||
|
|
@ -228,12 +228,8 @@ onMounted(async () => {
|
|||
<template>
|
||||
<div class="q-mt-sm">
|
||||
<div class="row q-gutter-sm">
|
||||
<div class="col-3 scrollable-list">
|
||||
<q-list
|
||||
bordered
|
||||
class="rounded-borders"
|
||||
style="max-height: 80vh; overflow-y: auto"
|
||||
>
|
||||
<div class="col-3">
|
||||
<q-list bordered class="rounded-borders">
|
||||
<q-item
|
||||
v-for="(item, i) in filterLists"
|
||||
:key="i"
|
||||
|
|
|
|||
|
|
@ -260,14 +260,6 @@ const columns = ref<QTableProps["columns"]>([
|
|||
style: "font-size: 14px",
|
||||
},
|
||||
]);
|
||||
|
||||
const isSysCancel = computed(() => {
|
||||
return (
|
||||
formData.reasonOligarch === "อนุมัติการขอยกเลิกการลา โดยระบบ" &&
|
||||
statusCheck.value === "DELETE"
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
* ฟังก์ชั่นเรียกรายละเอียดของข้อมูล
|
||||
* @param paramsId รับ ID จาก paramID
|
||||
|
|
@ -1044,12 +1036,7 @@ onMounted(async () => {
|
|||
props.row.comment == ''
|
||||
"
|
||||
>
|
||||
<div v-if="isSysCancel" class="text-red-6">
|
||||
ยังไม่ได้แสดงความคิดเห็น
|
||||
</div>
|
||||
|
||||
<q-btn
|
||||
v-else
|
||||
dense
|
||||
:disable="
|
||||
statusCheck == 'NEW' ||
|
||||
|
|
@ -1146,13 +1133,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
<div class="col-12"><q-separator /></div>
|
||||
<div v-if="isSysCancel" class="row col-12 q-pa-md">
|
||||
<q-banner class="bg-red-2 text-red-6 full-width" rounded>
|
||||
ผู้มีอำนาจยังไม่ได้พิจารณา ใบลานี้ถูกยกเลิกแล้ว
|
||||
</q-banner>
|
||||
</div>
|
||||
|
||||
<div class="row col-12 q-pa-md" v-else>
|
||||
<div class="row col-12 q-pa-md">
|
||||
<div class="col-12 row bg-white q-col-gutter-md">
|
||||
<div class="col-xs-6 row items-start">
|
||||
<div class="col-12 text-weight-bold text-top">
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, reactive, onMounted, computed } from "vue";
|
||||
import { ref, reactive, onMounted } from "vue";
|
||||
import { useRoute, useRouter } from "vue-router";
|
||||
import { useQuasar } from "quasar";
|
||||
|
||||
|
|
@ -158,13 +158,6 @@ const isLoadData = ref<boolean>(false);
|
|||
const leaveType = ref<LeaveType[]>([]); //ประเภทการลา
|
||||
const checkForm = ref<string>(""); //เช็คประเภทการลา
|
||||
|
||||
const isSysCancel = computed(() => {
|
||||
return (
|
||||
formData.reasonOligarch === "อนุมัติการขอยกเลิกการลา โดยระบบ" &&
|
||||
statusCheck.value === "DELETE"
|
||||
);
|
||||
});
|
||||
|
||||
/**
|
||||
* ฟังก์เรียกข้อมูลรายละเอียดของการยกเลิกลา
|
||||
* @param paramsId รับ ID จาก paramID
|
||||
|
|
@ -776,13 +769,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
<q-separator />
|
||||
|
||||
<div v-if="isSysCancel" class="row col-12 q-pa-md">
|
||||
<q-banner class="bg-green-2 text-green-6 full-width" rounded>
|
||||
{{ formDataReject.leaveDirectorComment }}
|
||||
</q-banner>
|
||||
</div>
|
||||
<div class="row col-12 q-pa-md" v-else>
|
||||
<div class="row col-12 q-pa-md">
|
||||
<div class="col-12 row bg-white q-col-gutter-md">
|
||||
<div class="col-xs-6 row items-start">
|
||||
<div class="col-12 text-weight-bold text-top">
|
||||
|
|
@ -812,7 +799,7 @@ onMounted(async () => {
|
|||
|
||||
<div class="col-xs-6 row items-start">
|
||||
<div class="col-12 text-weight-bold text-top">
|
||||
ผลการพิจารณายกเลิกวันลา
|
||||
ผลการพิจารณา
|
||||
</div>
|
||||
<div class="col-12 text-detail">
|
||||
{{
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ const props = defineProps({
|
|||
const pageId = ref<string>(route.params.id as string);
|
||||
const keyword = ref<string>("");
|
||||
const isAct = ref<boolean>(false);
|
||||
const isAllDirector = ref<boolean>(false);
|
||||
|
||||
const total = ref<number>(0);
|
||||
const totalList = ref<number>(1);
|
||||
|
|
@ -106,7 +105,6 @@ async function getData() {
|
|||
page: pagination.value.page,
|
||||
keyword: keyword.value,
|
||||
isAct: isAct.value,
|
||||
isAllDirector: isAllDirector.value,
|
||||
keycloakId: props.keycloakUserId,
|
||||
type:
|
||||
props.profileType?.toLocaleLowerCase() === "officer"
|
||||
|
|
@ -198,7 +196,6 @@ function closeDialog() {
|
|||
modal.value = false;
|
||||
rows.value = [];
|
||||
selected.value = [];
|
||||
isAllDirector.value = false;
|
||||
}
|
||||
|
||||
watch(
|
||||
|
|
@ -234,45 +231,19 @@ watch(
|
|||
<q-card-section>
|
||||
<div class="row q-col-gutter-sm">
|
||||
<div class="col-12">
|
||||
<div class="row items-center q-mb-sm">
|
||||
<div class="row q-gutter-x-xs">
|
||||
<q-input
|
||||
dense
|
||||
outlined
|
||||
label="ค้นหา"
|
||||
v-model="keyword"
|
||||
class="col-grow"
|
||||
style="max-width: 400px"
|
||||
style="width: 300px"
|
||||
@keydown.enter.prevent="onSearchData()"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon name="search"></q-icon>
|
||||
</template>
|
||||
</q-input>
|
||||
|
||||
<q-space />
|
||||
|
||||
<q-btn
|
||||
color="primary"
|
||||
icon="search"
|
||||
label="ค้นหา"
|
||||
class="q-px-md"
|
||||
@click.prevent="onSearchData"
|
||||
style="width: 150px"
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div
|
||||
class="row items-center q-gutter-x-md text-subtitle2 text-grey-8"
|
||||
>
|
||||
<q-checkbox
|
||||
keep-color
|
||||
v-model="isAllDirector"
|
||||
label="หัวหน้าทั้งหน่วยงาน"
|
||||
color="primary"
|
||||
@update:model-value="onSearchData"
|
||||
>
|
||||
<q-tooltip>หัวหน้าทั้งหน่วยงาน</q-tooltip>
|
||||
</q-checkbox>
|
||||
<q-checkbox
|
||||
keep-color
|
||||
v-model="isAct"
|
||||
|
|
@ -282,9 +253,18 @@ watch(
|
|||
>
|
||||
<q-tooltip>แสดงเฉพาะรักษาการแทน </q-tooltip>
|
||||
</q-checkbox>
|
||||
<q-space />
|
||||
<q-btn
|
||||
color="primary"
|
||||
icon="search"
|
||||
label="ค้นหา"
|
||||
class="q-pa-sm"
|
||||
@click.prevent="onSearchData"
|
||||
style="width: 200px"
|
||||
>
|
||||
</q-btn>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-12 text-red">
|
||||
{{
|
||||
props.type == "APPROVER"
|
||||
|
|
|
|||
|
|
@ -1,59 +1,17 @@
|
|||
<script setup lang="ts">
|
||||
import { ref, onMounted, computed } from "vue";
|
||||
import { useQuasar } from "quasar";
|
||||
import { ref, onMounted, watch } from "vue";
|
||||
import type { QTableProps } from "quasar";
|
||||
import { useRouter, useRoute } from "vue-router";
|
||||
import { useRouter } from "vue-router";
|
||||
|
||||
import { checkPermission } from "@/utils/permissions";
|
||||
import { useLeavelistDataStore } from "@/modules/09_leave/stores/LeaveStore";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
const $q = useQuasar();
|
||||
const leaveStore = useLeavelistDataStore();
|
||||
const route = useRoute();
|
||||
const router = useRouter();
|
||||
const { showLoader, hideLoader, messageError, dialogRemove, success } =
|
||||
useCounterMixin();
|
||||
|
||||
const total = defineModel<number>("total", { required: true });
|
||||
const totalList = defineModel<number>("totalList", { required: true });
|
||||
const pagination = defineModel<any>("pagination", { required: true });
|
||||
const props = defineProps({
|
||||
getList: Function,
|
||||
rows: {
|
||||
type: Object,
|
||||
require: true,
|
||||
},
|
||||
page: {
|
||||
type: Number,
|
||||
require: true,
|
||||
},
|
||||
rowsPerPage: {
|
||||
type: Number,
|
||||
require: true,
|
||||
},
|
||||
maxPage: {
|
||||
type: Number,
|
||||
require: true,
|
||||
},
|
||||
totalList: {
|
||||
type: Number,
|
||||
require: true,
|
||||
},
|
||||
dataToobar: Object,
|
||||
});
|
||||
|
||||
const isPermissionDelete = computed(() => {
|
||||
return (status: string) => {
|
||||
return (
|
||||
checkPermission(route)?.attrOwnership === "OWNER" &&
|
||||
!leaveStore.statusDelete.includes(status) &&
|
||||
leaveStore.tabMenu === "1"
|
||||
);
|
||||
};
|
||||
});
|
||||
|
||||
/** ข้อมูลหัวตาราง รายการลา */
|
||||
const columnsLeave = ref<QTableProps["columns"]>([
|
||||
|
|
@ -254,6 +212,31 @@ const visibleReject = ref<string[]>([
|
|||
"status",
|
||||
]);
|
||||
|
||||
const props = defineProps({
|
||||
getList: Function,
|
||||
rows: {
|
||||
type: Object,
|
||||
require: true,
|
||||
},
|
||||
page: {
|
||||
type: Number,
|
||||
require: true,
|
||||
},
|
||||
rowsPerPage: {
|
||||
type: Number,
|
||||
require: true,
|
||||
},
|
||||
maxPage: {
|
||||
type: Number,
|
||||
require: true,
|
||||
},
|
||||
totalList: {
|
||||
type: Number,
|
||||
require: true,
|
||||
},
|
||||
dataToobar: Object,
|
||||
});
|
||||
|
||||
/** ไปหน้ารายละเอียด */
|
||||
function redirectToDetail(id: string) {
|
||||
const routePrefix = leaveStore.tabMenu === "1" ? "/leave" : "/leave-reject";
|
||||
|
|
@ -265,37 +248,6 @@ function updatePagination(newPagination: any) {
|
|||
pagination.value.rowsPerPage = newPagination.rowsPerPage;
|
||||
}
|
||||
|
||||
/**
|
||||
* ฟังก์ชันสำหรับดึงชื่อ CSS Class ตามสถานะ
|
||||
* @param statusText สถานะของรายการ
|
||||
*/
|
||||
function getStatusColor(statusText: string) {
|
||||
const statusMap: Record<string, string> = {
|
||||
APPROVE: "text-green-6",
|
||||
REJECT: "text-red",
|
||||
NEW: "text-blue",
|
||||
PENDING: "text-warning",
|
||||
// DELETE DELETING
|
||||
};
|
||||
|
||||
return statusMap[statusText.toUpperCase()] ?? "";
|
||||
}
|
||||
|
||||
function handleDelete(id: string) {
|
||||
dialogRemove($q, async () => {
|
||||
try {
|
||||
showLoader();
|
||||
await http.delete(config.API.leaveList() + `/${id}`);
|
||||
await props.getList?.();
|
||||
success($q, "ลบข้อมูลสำเร็จ");
|
||||
} catch (error) {
|
||||
messageError($q, error);
|
||||
} finally {
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/** Hook*/
|
||||
onMounted(() => {
|
||||
if (leaveStore.tabMenu === "1") {
|
||||
|
|
@ -345,23 +297,23 @@ onMounted(() => {
|
|||
>
|
||||
<q-tooltip>รายละเอียด</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
v-if="isPermissionDelete(props.row.statusText)"
|
||||
flat
|
||||
round
|
||||
dense
|
||||
icon="mdi-delete"
|
||||
color="red"
|
||||
@click.prevent="handleDelete(props.row.id)"
|
||||
>
|
||||
<q-tooltip>ลบข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</q-td>
|
||||
<q-td
|
||||
v-for="col in props.cols"
|
||||
:key="col.name"
|
||||
:props="props"
|
||||
:class="getStatusColor(props.row.statusText)"
|
||||
:class="
|
||||
props.row.statusText == 'REJECT'
|
||||
? 'text-red'
|
||||
: props.row.statusText == 'NEW'
|
||||
? 'text-blue'
|
||||
: props.row.statusText == 'PENDING'
|
||||
? 'text-warning'
|
||||
: props.row.statusText == 'DELETE' ||
|
||||
props.row.statusText == 'DELETING'
|
||||
? 'text-orange'
|
||||
: ''
|
||||
"
|
||||
>
|
||||
<div v-if="col.name == 'no'">
|
||||
{{
|
||||
|
|
|
|||
|
|
@ -68,8 +68,6 @@ interface DataSpecialTime {
|
|||
statusSort: number;
|
||||
timeAfternoon: string;
|
||||
timeMorning: string;
|
||||
checkInStatusMain: string;
|
||||
checkOutStatusMain: string;
|
||||
}
|
||||
export type {
|
||||
DataOption,
|
||||
|
|
|
|||
|
|
@ -98,26 +98,6 @@ interface DataProcess {
|
|||
errorMessage: string | null;
|
||||
}
|
||||
|
||||
interface DataPendingJobs {
|
||||
taskId: string;
|
||||
keycloakUserId: string;
|
||||
createdDate: string | Date;
|
||||
processingDate: string | Date;
|
||||
completedDate: string | Date;
|
||||
status: string;
|
||||
checkType: string;
|
||||
checkInId: string;
|
||||
errorMessage: string;
|
||||
additionalData: string;
|
||||
id: string;
|
||||
createdAt: string | Date;
|
||||
createdUserId: string;
|
||||
lastUpdatedAt: string;
|
||||
lastUpdateUserId: string;
|
||||
createdFullName: string;
|
||||
lastUpdateFullName: string;
|
||||
}
|
||||
|
||||
export type {
|
||||
TableRows,
|
||||
DataResLog,
|
||||
|
|
@ -125,5 +105,4 @@ export type {
|
|||
TableRowsTime,
|
||||
FormDetail,
|
||||
DataProcess,
|
||||
DataPendingJobs,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@ export const useLeavelistDataStore = defineStore("leave", () => {
|
|||
|
||||
const leaveType = ref<LeaveType[]>([]);
|
||||
|
||||
const statusDelete = ["APPROVE", "DELETING", "DELETE"];
|
||||
|
||||
/**
|
||||
* ฟังก์ชั่น fetchListLeave
|
||||
* @param data รับข้อมูลจาก Page
|
||||
|
|
@ -266,6 +264,5 @@ export const useLeavelistDataStore = defineStore("leave", () => {
|
|||
leaveTypeOption,
|
||||
leaveTypeList,
|
||||
fetchKeycloakPosition,
|
||||
statusDelete,
|
||||
};
|
||||
});
|
||||
|
|
|
|||
|
|
@ -9,7 +9,6 @@ import { useRoute } from "vue-router";
|
|||
import Tab1 from "@/modules/09_leave/components/02_WorkList/Tab1.vue";
|
||||
import Tab2 from "@/modules/09_leave/components/02_WorkList/Tab2.vue";
|
||||
import Tab3 from "@/modules/09_leave/components/02_WorkList/Tab3_Processed_Late.vue";
|
||||
import Tab4_Pending from "@/modules/09_leave/components/02_WorkList/Tab4_Pending.vue";
|
||||
|
||||
const stores = useWorklistDataStore();
|
||||
const route = useRoute();
|
||||
|
|
@ -22,10 +21,6 @@ const isPermissionTab3 = computed(() => {
|
|||
checkPermission(route)?.attrIsUpdate)
|
||||
);
|
||||
});
|
||||
|
||||
const isPermissionTab4 = computed(() => {
|
||||
return checkPermission(route)?.attrOwnership === "OWNER";
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
|
@ -51,7 +46,6 @@ const isPermissionTab4 = computed(() => {
|
|||
name="3"
|
||||
label="ประมวลผลการขาดราชการ/มาสาย"
|
||||
/>
|
||||
<q-tab v-if="isPermissionTab4" name="4" label="รอประมวลผล" />
|
||||
<!-- เพิ่มแท็บใหม่ -->
|
||||
</q-tabs>
|
||||
|
||||
|
|
@ -68,9 +62,6 @@ const isPermissionTab4 = computed(() => {
|
|||
<q-tab-panel name="3">
|
||||
<Tab3 />
|
||||
</q-tab-panel>
|
||||
<q-tab-panel name="4">
|
||||
<Tab4_Pending />
|
||||
</q-tab-panel>
|
||||
</q-tab-panels>
|
||||
</div>
|
||||
</q-card>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ import type {
|
|||
|
||||
import DialogReason from "@/components/Dialogs/PopupReason.vue";
|
||||
import DialogApprove from "@/modules/09_leave/components/04_SpecialTime/DialogApprove.vue";
|
||||
import DialogMultipleApprove from "@/modules/09_leave/components/04_SpecialTime/DialogMultipleApprove.vue";
|
||||
|
||||
const $q = useQuasar(); // show dialog
|
||||
const mixin = useCounterMixin();
|
||||
|
|
@ -48,7 +47,6 @@ const name = ref<string>("");
|
|||
const id = ref<string>("");
|
||||
const dateDialog = ref<string>("");
|
||||
const dateFixDialog = ref<string>("");
|
||||
const modalMultiple = ref<boolean>(false);
|
||||
|
||||
// ค้นหาในตาราง
|
||||
const filterKeyword = ref<string>("");
|
||||
|
|
@ -56,7 +54,7 @@ const filterStatus = ref<string>("PENDING");
|
|||
const filterDate = ref<[Date, Date] | null>([new Date(), new Date()]); //วันที่ประกาศ
|
||||
const optionStatus = ref<DataOption[]>(store.optionStatusMain);
|
||||
const rows = ref<DataSpecialTime[]>([]);
|
||||
const visibleColumns = ref<string[]>([
|
||||
const visibleColumns = ref<String[]>([
|
||||
"no",
|
||||
"fullName",
|
||||
"createdAt",
|
||||
|
|
@ -285,20 +283,6 @@ onMounted(async () => {
|
|||
<template>
|
||||
<div class="toptitle text-dark col-12 row items-center">
|
||||
รายการลงเวลากรณีพิเศษ
|
||||
<q-space />
|
||||
<q-btn
|
||||
v-if="
|
||||
checkPermission($route)?.attrIsUpdate &&
|
||||
checkPermission($route)?.attrIsGet
|
||||
"
|
||||
class="q-px-md"
|
||||
color="primary"
|
||||
dense
|
||||
unelevated
|
||||
@click="modalMultiple = true"
|
||||
>
|
||||
อนุมัติแบบหลายรายการ
|
||||
</q-btn>
|
||||
</div>
|
||||
|
||||
<q-card flat bordered class="col-12 q-pa-md">
|
||||
|
|
@ -508,14 +492,6 @@ onMounted(async () => {
|
|||
:detailData="detailData"
|
||||
:fetch-data="fetchData"
|
||||
/>
|
||||
|
||||
<DialogMultipleApprove
|
||||
v-model:modal="modalMultiple"
|
||||
:fetch-data="fetchData"
|
||||
:dateThaiRange="dateThaiRange"
|
||||
:columns="columns"
|
||||
:visibleColumnsMain="visibleColumns"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<style></style>
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ const id = ref<string>(route.params.id as string); // id รายการป
|
|||
const isLoadView = ref<boolean>(false); //แสดง view
|
||||
const modalHistory = ref<boolean>(false); //แสดง popup ประวัติการประเมิน
|
||||
// ข้อมูลผู้เซ็นเอกสาร
|
||||
const formCommand = reactive({
|
||||
const formCommand = reactive<FormCommand>({
|
||||
elementaryFullName: "", //ชื่อผู้บังคับบัญชาชั้นต้น
|
||||
elementaryPosition: "", //ตำแหน่งผู้บังคับบัญชาชั้นต้น
|
||||
abovelevelFullname: "", //ชื่อผู้บังคับบัญชาเหนือขึ้นไป 1 ระดับ
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
|
|||
const dataList: EvaluateList[] = data.map(
|
||||
(data: EvaluateRes) =>
|
||||
({
|
||||
...data,
|
||||
id: data.id,
|
||||
citizenId: data.citizenId,
|
||||
fullName: data.fullName,
|
||||
|
|
@ -134,7 +133,7 @@ export const useEvalutuonStore = defineStore("EvalutuonStore", () => {
|
|||
align: "left",
|
||||
label: "เลขที่ตำแหน่ง",
|
||||
sortable: true,
|
||||
field: "posNo",
|
||||
field: "positionNumber",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -351,7 +351,7 @@ onMounted(async () => {
|
|||
</div>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
{{ !col.value ? "-" : col.value }}
|
||||
</div>
|
||||
</q-td>
|
||||
</q-tr>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import { useQuasar } from "quasar";
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
|
||||
import { usePagination } from "@/composables/usePagination";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import config from "@/app.config";
|
||||
import http from "@/plugins/http";
|
||||
|
||||
|
|
@ -73,12 +72,9 @@ const columns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortName,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
return row.orgShortName && row.posMasterNo
|
||||
? `${row.orgShortName} ${row.posMasterNo}`
|
||||
: "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ import DialogMoveLevel from "@/modules/13_salary/components/04_salaryLists/Dialo
|
|||
/** importStore*/
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
|
||||
/** use*/
|
||||
const $q = useQuasar();
|
||||
|
|
@ -88,12 +87,9 @@ const baseColumns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortName,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
return row.orgShortName && row.posMasterNo
|
||||
? `${row.orgShortName} ${row.posMasterNo}`
|
||||
: "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ import DialogInfo from "@/modules/13_salary/components/DialogInfoMain.vue";
|
|||
/** importStore*/
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useSalaryListSDataStore } from "@/modules/13_salary/store/SalaryListsStore";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
|
|
@ -99,12 +98,9 @@ const columns = ref<QTableColumn[]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortName,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
return row.orgShortName && row.posMasterNo
|
||||
? `${row.orgShortName} ${row.posMasterNo}`
|
||||
: "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import { useQuasar } from "quasar";
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
|
||||
import { usePagination } from "@/composables/usePagination";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import config from "@/app.config";
|
||||
import http from "@/plugins/http";
|
||||
|
||||
|
|
@ -72,12 +71,9 @@ const columns = ref<QTableProps["columns"]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortName,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
return row.orgShortName && row.posMasterNo
|
||||
? `${row.orgShortName} ${row.posMasterNo}`
|
||||
: "-";
|
||||
},
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import { useQuasar } from "quasar";
|
|||
import { checkPermission } from "@/utils/permissions";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import config from "@/app.config";
|
||||
import http from "@/plugins/http";
|
||||
|
||||
|
|
@ -85,14 +84,6 @@ const baseColumns = ref<QTableProps["columns"]>([
|
|||
field: "orgShortName",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortName,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "position",
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import { checkPermission } from "@/utils/permissions";
|
|||
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useSalaryEmployeeListSDataStore } from "@/modules/13_salary/store/SalaryEmployeeListsStore";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
|
|
@ -99,12 +98,9 @@ const columns = ref<QTableColumn[]>([
|
|||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
format(val, row) {
|
||||
return formatPosmasterNo(
|
||||
row.orgShortName,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
return row.orgShortName && row.posMasterNo
|
||||
? `${row.orgShortName} ${row.posMasterNo}`
|
||||
: "-";
|
||||
},
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@ function fetchInformation() {
|
|||
citizenId.value = data.citizenId;
|
||||
|
||||
if (data.avatarName) {
|
||||
fetchProfile(data.id as string, data.avatarName);
|
||||
await fetchProfile(data.id as string, data.avatarName);
|
||||
} else {
|
||||
avatar.value = avatarMain;
|
||||
}
|
||||
|
|
@ -70,14 +70,11 @@ function fetchInformation() {
|
|||
* @param id profileId
|
||||
* @param avatarName ชื้อไฟล์
|
||||
*/
|
||||
function fetchProfile(id: string, avatarName: string) {
|
||||
async function fetchProfile(id: string, avatarName: string) {
|
||||
http
|
||||
.get(config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, avatarName))
|
||||
.then((res) => {
|
||||
.then(async (res) => {
|
||||
avatar.value = res.data.downloadUrl;
|
||||
})
|
||||
.catch(() => {
|
||||
avatar.value = avatarMain;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ import { useQuasar } from "quasar";
|
|||
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useKpiDataStore } from "@/modules/14_KPI/store";
|
||||
import avatar from "@/assets/avatar_user.jpg";
|
||||
|
||||
import DialogHeader from "@/components/DialogHeader.vue";
|
||||
import type { FormProfile } from "@/modules/14_KPI/interface/request/index";
|
||||
|
|
@ -66,7 +65,7 @@ async function fetchEvaluation() {
|
|||
await store.checkCompetency();
|
||||
await store.checkCompetencyDefaultCompetencyLevel();
|
||||
|
||||
fetchProfile(data.profileId);
|
||||
await fetchProfile(data.profileId);
|
||||
|
||||
plannedPoint.value = data.plannedPoint == null ? "" : data.plannedPoint;
|
||||
rolePoint.value = data.rolePoint == null ? "" : data.rolePoint;
|
||||
|
|
@ -82,8 +81,8 @@ async function fetchEvaluation() {
|
|||
// });
|
||||
}
|
||||
|
||||
function fetchProfile(id: string) {
|
||||
http
|
||||
async function fetchProfile(id: string) {
|
||||
await http
|
||||
.get(
|
||||
config.API.fileByFile("ทะเบียนประวัติ", "โปรไฟล์", id, `profile-${id}`)
|
||||
)
|
||||
|
|
@ -91,7 +90,6 @@ function fetchProfile(id: string) {
|
|||
store.dataEvaluation.avartar = res.data.downloadUrl;
|
||||
})
|
||||
.catch(() => {
|
||||
store.dataEvaluation.avartar = avatar;
|
||||
// profilePicture.value = avatar;
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ const modal = defineModel<boolean>("modal", { required: true });
|
|||
let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
|
||||
const totalPage = defineModel<number>("totalPage", { required: true });
|
||||
const nodeTree = defineModel<OrgTree[]>("nodeTree", { required: true });
|
||||
const columns = defineModel<QTableProps["columns"]>("columns", { required: true });
|
||||
const columns = defineModel<QTableProps[]>("columns", {});
|
||||
const rows = defineModel<PosMaster2[]>("rows", { required: true });
|
||||
const props = defineProps({
|
||||
fetchDataTree: {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@ import { useQuasar } from "quasar";
|
|||
import { useRoute } from "vue-router";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { usePositionEmp } from "@/modules/16_positionEmployee/store/organizational";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
|
|
@ -136,12 +135,11 @@ async function fetchTable() {
|
|||
const data = res.data.result.data;
|
||||
const list = data.map((e: PosMaster) => ({
|
||||
...e,
|
||||
posMasterNo: formatPosmasterNo(
|
||||
e.orgShortname,
|
||||
e.posMasterNoPrefix,
|
||||
e.posMasterNo.toString(),
|
||||
e.posMasterNoSuffix ?? ""
|
||||
),
|
||||
posMasterNo:
|
||||
(e.orgShortname !== null ? e.orgShortname : "") +
|
||||
(e.posMasterNoPrefix ? e.posMasterNoPrefix : "") +
|
||||
(e.posMasterNo !== null ? e.posMasterNo : "") +
|
||||
(e.posMasterNoSuffix !== null ? e.posMasterNoPrefix : ""),
|
||||
}));
|
||||
rows.value = list;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import { useQuasar } from "quasar";
|
|||
import { usePositionEmp } from "@/modules/16_positionEmployee/store/organizational";
|
||||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { checkPermission } from "@/utils/permissions";
|
||||
import { updateCurrentPage, formatPosmasterNo } from "@/utils/function";
|
||||
import { updateCurrentPage } from "@/utils/function";
|
||||
import genreport from "@/plugins/genreportxlsx";
|
||||
import config from "@/app.config";
|
||||
import http from "@/plugins/http";
|
||||
|
|
@ -145,13 +145,6 @@ const columns = ref<QTableProps["columns"]>([
|
|||
label: "ตำแหน่งเลขที่",
|
||||
sortable: false,
|
||||
field: "posMasterNo",
|
||||
format: (val: any, row: any) =>
|
||||
formatPosmasterNo(
|
||||
row.orgShortname,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNoMain,
|
||||
row.posMasterNoSuffix
|
||||
),
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -784,7 +777,7 @@ watch(
|
|||
<DialogMovePos
|
||||
v-model:modal="modalDialogMMove"
|
||||
v-model:nodeTree="nodeTree"
|
||||
v-model:columns="columns"
|
||||
v-model:columns="columns as QTableProps[]"
|
||||
v-model:rows="posMaster"
|
||||
v-model:totalPage="totalPage"
|
||||
v-model:reqMaster="reqMaster"
|
||||
|
|
|
|||
|
|
@ -80,10 +80,6 @@ export const usePositionEmp = defineStore("positionEmpStore", () => {
|
|||
posLevelName: e.isSit ? e.profilePoslevel : e.posLevelName,
|
||||
posExecutiveName: e.posExecutiveName,
|
||||
isSit: e.isSit,
|
||||
orgShortname: e.orgShortname,
|
||||
posMasterNoPrefix: e.posMasterNoPrefix,
|
||||
posMasterNoMain: e.posMasterNo,
|
||||
posMasterNoSuffix: e.posMasterNoSuffix,
|
||||
}));
|
||||
|
||||
return newPosMaster;
|
||||
|
|
|
|||
|
|
@ -113,6 +113,8 @@ const visibleColumns = ref<Array<string>>([
|
|||
|
||||
const modalAddOperator = ref<boolean>(false); // แสดงเพิ่มรายชื่อลงนามในแนบท้ายคำสั่ง
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* ฟังก์ชันบันทึกข้อมูลรายละเอียดคำสั่ง
|
||||
* และกำหนด isChangeData เป็น false
|
||||
|
|
@ -223,8 +225,6 @@ onMounted(async () => {
|
|||
formData.commandExcecuteDate = props.formCommandList.commandExcecuteDate;
|
||||
formData.isBangkok = !store.isIdofficer
|
||||
? null
|
||||
: props.formCommandList.commandCode === "C-PM-47"
|
||||
? "BANGKOK"
|
||||
: props.formCommandList.isBangkok;
|
||||
commandCode.value = props.formCommandList.commandCode;
|
||||
const [volume, chapter] = props.formCommandList.commandNo.split("/");
|
||||
|
|
@ -486,9 +486,12 @@ onMounted(async () => {
|
|||
/>
|
||||
</div>
|
||||
|
||||
<div class="col-12 q-gutter-sm" v-if="store.isIdofficer">
|
||||
<div
|
||||
class="col-12 q-gutter-sm"
|
||||
v-if="store.isIdofficer && commandCode !== 'C-PM-47'"
|
||||
>
|
||||
<q-radio
|
||||
:disable="store.readonly || commandCode === 'C-PM-47'"
|
||||
:disable="store.readonly"
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
|
|
@ -498,7 +501,7 @@ onMounted(async () => {
|
|||
/>
|
||||
|
||||
<q-radio
|
||||
:disable="store.readonly || commandCode === 'C-PM-47'"
|
||||
:disable="store.readonly"
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ import { storeToRefs } from "pinia";
|
|||
import { useCounterMixin } from "@/stores/mixin";
|
||||
import { useRoute } from "vue-router";
|
||||
import { useStructureTree } from "@/stores/structureTree";
|
||||
import { formatPosmasterNo } from "@/utils/function";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
|
||||
|
|
@ -72,18 +71,8 @@ const columns = ref<QTableProps["columns"]>([
|
|||
field: "posMasterNo",
|
||||
format(val, row) {
|
||||
return row.isSit
|
||||
? formatPosmasterNo(
|
||||
row.orgShortname,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo,
|
||||
row.posMasterNoSuffix
|
||||
) + " (นั่งทับตำแหน่ง)"
|
||||
: formatPosmasterNo(
|
||||
row.orgShortname,
|
||||
row.posMasterNoPrefix,
|
||||
row.posMasterNo,
|
||||
row.posMasterNoSuffix
|
||||
);
|
||||
? `${row.orgShortname} ${row.posMasterNo}(นั่งทับตำแหน่ง)`
|
||||
: `${row.orgShortname} ${row.posMasterNo}`;
|
||||
},
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
|
|
@ -218,7 +207,7 @@ async function fetchDataTree() {
|
|||
function onSelectedOrgTree(data: OrgTree) {
|
||||
orgTreeId.value = data.orgTreeId;
|
||||
orgLevel.value = data.orgLevel;
|
||||
onSearchDataTable();
|
||||
fetchDataTable();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ const modal = defineModel<boolean>("modal", { required: true });
|
|||
let reqMaster = defineModel<FilterMaster>("reqMaster", { required: true });
|
||||
const totalPage = defineModel<number>("totalPage", { required: true });
|
||||
const nodeTree = defineModel<OrgTree[]>("nodeTree", { required: true });
|
||||
const columns = defineModel<QTableProps["columns"]>("columns", {});
|
||||
const columns = defineModel<QTableProps[]>("columns", {});
|
||||
const rows = defineModel<PosMaster2[]>("rows", { required: true });
|
||||
const props = defineProps({
|
||||
fetchDataTree: {
|
||||
|
|
|
|||
|
|
@ -706,7 +706,7 @@ watch(
|
|||
</div>
|
||||
</q-card>
|
||||
|
||||
<!-- <div class="row col-12 q-pa-sm">
|
||||
<div class="row col-12 q-pa-sm">
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
|
|
@ -714,7 +714,7 @@ watch(
|
|||
v-model="isSit"
|
||||
label="นั่งทับตำแหน่ง"
|
||||
/>
|
||||
</div> -->
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-separator />
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue