diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue index d6450acea..56ac10518 100644 --- a/src/components/Dialogs/DialogOrgSelect.vue +++ b/src/components/Dialogs/DialogOrgSelect.vue @@ -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); diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue index 88129e23c..b72607430 100644 --- a/src/components/Dialogs/DialogOrgSelectEmployee.vue +++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue @@ -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); }) diff --git a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue index bc8ac6786..9d06a7da3 100644 --- a/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue +++ b/src/modules/05_placement/components/PersonalList/DialogSelectOrg.vue @@ -93,7 +93,7 @@ function updateSelected(data: TreeMain) { if (props?.dataRow?.nodeId === data.orgTreeId) { positionId.value = props?.dataRow?.posmasterId; seletcId.value = props?.dataRow?.positionId; - datePos.value = props?.dataRow?.reportingDateFullDate; + datePos.value = props?.dataRow?.reportingDate; } else { positionId.value = ""; seletcId.value = ""; @@ -237,6 +237,8 @@ async function onClickSubmit() { posExecutiveName: selectedPos.value[0].posExecutiveName, reportingDate: convertDateToAPI(datePos.value), posmasterId: dataPosMaster.id, + positionExecutiveField: selectedPos.value[0].positionExecutiveField, //ด้านทางการบริหาร + positionArea: selectedPos.value[0].positionArea, //ด้าน/สาขา }; await http diff --git a/src/modules/05_placement/interface/request/Main.ts b/src/modules/05_placement/interface/request/Main.ts index 6c9f24f1f..d28d1cbc5 100644 --- a/src/modules/05_placement/interface/request/Main.ts +++ b/src/modules/05_placement/interface/request/Main.ts @@ -17,9 +17,9 @@ interface ItemTabs { name: string; } -interface DataOptions{ - id:string, - name:string +interface DataOptions { + id: string; + name: string; } interface FormOrderPlacementMainData { Order: string; @@ -153,6 +153,8 @@ interface FormDataAppoint { posmasterId: string; posExecutiveName?: string; typeCommand: string; + positionExecutiveField?: string; + positionArea?: string; } export type { FormPlacementMainData, @@ -171,5 +173,5 @@ export type { MemBerType, PersonsAppointData, FormDataAppoint, - DataOptions + DataOptions, }; diff --git a/src/modules/05_placement/views/03_receiveMain.vue b/src/modules/05_placement/views/03_receiveMain.vue index 8a7583d81..8fec84eac 100644 --- a/src/modules/05_placement/views/03_receiveMain.vue +++ b/src/modules/05_placement/views/03_receiveMain.vue @@ -366,6 +366,8 @@ async function onSave(data: FormDataAppoint) { reportingDate: data.reportingDate, posmasterId: data.posmasterId, typeCommand: data.typeCommand, + positionExecutiveField: data.positionExecutiveField, + positionArea: data.positionArea, }; showLoader(); diff --git a/src/modules/05_placement/views/06_appointPromoteMain.vue b/src/modules/05_placement/views/06_appointPromoteMain.vue index be986ad4d..00fa8f0f8 100644 --- a/src/modules/05_placement/views/06_appointPromoteMain.vue +++ b/src/modules/05_placement/views/06_appointPromoteMain.vue @@ -319,6 +319,8 @@ async function onSave(data: FormDataAppoint) { posExecutiveName: data.posExecutiveName, posmasterId: data.posmasterId, typeCommand: data.typeCommand, + positionExecutiveField: data.positionExecutiveField, + positionArea: data.positionArea, }; showLoader(); diff --git a/src/modules/05_placement/views/08_otherMain.vue b/src/modules/05_placement/views/08_otherMain.vue index 9ab2ed2bc..95a9fdb3c 100644 --- a/src/modules/05_placement/views/08_otherMain.vue +++ b/src/modules/05_placement/views/08_otherMain.vue @@ -274,6 +274,8 @@ async function onSaveSelectOrg(data: any) { reportingDate: data.reportingDate, posmasterId: data.posmasterId, typeCommand: data.typeCommand, + positionExecutiveField: data.positionExecutiveField, + positionArea: data.positionArea, }; showLoader();