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

fix bug select position, change field reportingDateFullDate to reportingDate, add send positionExecutiveField & positionArea

Browse source
This commit is contained in:
Warunee Tamkoo 2025-06-17 11:02:41 +07:00
parent 0ef46feabc
commit 20f95f1a69
7 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/Dialogs/DialogOrgSelect.vue
View file

@ -278,7 +278,8 @@ async function getDataTable(id: string, level: number = 0) {
isPosition: e.isPosition,
posMasterNo:
e.orgShortname +
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") + ' ' +
(e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
" " +
e.posMasterNo +
(e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
positionName: e.positionName,
@ -330,7 +331,7 @@ function updateSelected(data: DataTree) {
if (props?.dataRows?.nodeId === data.orgTreeId) {
positionId.value = props?.dataRows?.posmasterId;
seletcId.value = props?.dataRows?.positionId;
datePos.value = props?.dataRows?.reportingDateFullDate;
datePos.value = props?.dataRows?.reportingDate;
} else {
positionId.value = "";
seletcId.value = "";
@ -407,7 +408,7 @@ async function fetchPosFind(level: number, id: string) {
nodeId.value = id;
positionId.value = props?.dataRows?.posmasterId;
seletcId.value = props?.dataRows?.positionId;
datePos.value = props?.dataRows?.reportingDateFullDate;
datePos.value = props?.dataRows?.reportingDate;
getDataTable(nodeId.value, level);
})
@ -510,6 +511,8 @@ function onSubmit() {
reportingDate: datePos.value,
posmasterId: dataPosMaster.id,
typeCommand: type.value,
positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร
positionArea: selectedPos.value[0].positionArea, //ด้าน/สาขา
};
await props.onSubmit?.(body);

4
src/components/Dialogs/DialogOrgSelectEmployee.vue
View file

@ -315,7 +315,7 @@ function updateSelected(data: DataTree) {
if (props?.dataRows?.nodeId === data.orgTreeId) {
positionId.value = props?.dataRows?.posmasterId;
seletcId.value = props?.dataRows?.positionId;
datePos.value = props?.dataRows?.reportingDateFullDate;
datePos.value = props?.dataRows?.reportingDate;
} else {
positionId.value = "";
seletcId.value = "";
@ -392,7 +392,7 @@ async function fetchPosFind(level: number, id: string) {
nodeId.value = id;
positionId.value = props?.dataRows?.posmasterId;
seletcId.value = props?.dataRows?.positionId;
datePos.value = props?.dataRows?.reportingDateFullDate;
datePos.value = props?.dataRows?.reportingDate;
getDataTable(nodeId.value, level);
})