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

rollback search search report
All checks were successful
Build & Deploy on Dev / build (push) Successful in 3m6s
Details

Browse source
This commit is contained in:
kittapath 2026-01-09 19:25:37 +07:00
parent 9e0ee02fa3
commit 0c768e3626
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/05_placement/views/09_reportMain.vue
View file

@ -71,7 +71,7 @@ const splitterModel = ref<number>(14);
/** tree*/ /** tree*/
const filterTree = ref<string>(""); const filterTree = ref<string>("");
const nodeId = ref<string>(""); const nodeId = ref<string>("");
const orgTreeDnaId = ref<string>(""); const orgTreeId = ref<string>("");
const nodeLevel = ref<number>(0); const nodeLevel = ref<number>(0);
const node = ref<DataStructureTree[]>([]); const node = ref<DataStructureTree[]>([]);
const expanded = ref<string[]>([]); const expanded = ref<string[]>([]);
@ -96,7 +96,7 @@ function onSelectedNode(data: any) {
org.value = data.orgName; org.value = data.orgName;
nodeId.value = data.orgTreeId; nodeId.value = data.orgTreeId;
nodeLevel.value = data.orgLevel; nodeLevel.value = data.orgLevel;
orgTreeDnaId.value = data.orgTreeDnaId; orgTreeId.value = data.orgTreeId;
expandedModal.value = false; expandedModal.value = false;
} }
@ -110,7 +110,7 @@ function fetchDataReport() {
const queryParams = { const queryParams = {
nodeId: nodeId:
reportType.value.type === "probation" && reportType.value.id === "2" reportType.value.type === "probation" && reportType.value.id === "2"
? orgTreeDnaId.value ? orgTreeId.value
: nodeId.value, : nodeId.value,
node: nodeLevel.value, node: nodeLevel.value,
startDate: dateToISO(dateStart.value), startDate: dateToISO(dateStart.value),
@ -184,7 +184,7 @@ function clearFilter() {
org.value = ""; org.value = "";
nodeId.value = ""; nodeId.value = "";
nodeLevel.value = 0; nodeLevel.value = 0;
orgTreeDnaId.value = ""; orgTreeId.value = "";
reportType.value = undefined; reportType.value = undefined;
detailReport.value = undefined; detailReport.value = undefined;
pdfSrc.value = undefined; pdfSrc.value = undefined;

15
src/modules/09_leave/views/06_ReportMain.vue
View file

@ -112,7 +112,7 @@ const nodeId = ref<string>("");
const nodeLevel = ref<number>(0); const nodeLevel = ref<number>(0);
const node = ref<DataStructureTree[]>([]); const node = ref<DataStructureTree[]>([]);
const expanded = ref<string[]>([]); const expanded = ref<string[]>([]);
const orgTreeDnaId = ref<string>(""); const orgTreeId = ref<string>("");
/** ฟังก์ชันเรียกข้อมูลโครงสร้างหน่วยงาน*/ /** ฟังก์ชันเรียกข้อมูลโครงสร้างหน่วยงาน*/
async function fetchDataTree() { async function fetchDataTree() {
@ -136,7 +136,7 @@ function onSelectedNode(data: any) {
nodeId.value = data.orgTreeId; nodeId.value = data.orgTreeId;
nodeLevel.value = data.orgLevel; nodeLevel.value = data.orgLevel;
expandedModal.value = false; expandedModal.value = false;
orgTreeDnaId.value = data.orgTreeDnaId; orgTreeId.value = data.orgTreeId;
updateLeaveday(); updateLeaveday();
} }
@ -221,7 +221,7 @@ async function fetchLeaveday(
startDate: Date, startDate: Date,
endDate: Date endDate: Date
) { ) {
const nodeIdVal = typeReport.value === 3 ? orgTreeDnaId.value : nodeId.value; const nodeIdVal = typeReport.value === 3 ? orgTreeId.value : nodeId.value;
const body = { const body = {
type: type:
year === "FULL" year === "FULL"
@ -337,7 +337,7 @@ function filterOption(val: string, update: any, typeOp: string) {
function clearData() { function clearData() {
nodeId.value = ""; nodeId.value = "";
nodeLevel.value = 0; nodeLevel.value = 0;
orgTreeDnaId.value = ""; orgTreeId.value = "";
org.value = ""; org.value = "";
typeReport.value = null; typeReport.value = null;
yearType.value = "FULL"; yearType.value = "FULL";
@ -414,7 +414,7 @@ function getReport() {
: "WEEKLY", : "WEEKLY",
startDate: dateToISO(dateStart.value), startDate: dateToISO(dateStart.value),
endDate: dateToISO(dateEnd.value), endDate: dateToISO(dateEnd.value),
nodeId: orgTreeDnaId.value, nodeId: orgTreeId.value,
node: nodeLevel.value, node: nodeLevel.value,
}; };
http http
@ -847,7 +847,10 @@ onMounted(() => {
</template> </template>
</datepicker> </datepicker>
</div> </div>
<div class="col-12" v-if="yearType == 'MONTH' || leaveType == 'MONTH'"> <div
class="col-12"
v-if="yearType == 'MONTH' || leaveType == 'MONTH'"
>
<datepicker <datepicker
v-model="dateMonth" v-model="dateMonth"
:locale="'th'" :locale="'th'"