diff --git a/src/modules/02_organizationalNew/components/DialogAddPosition.vue b/src/modules/02_organizationalNew/components/DialogAddPosition.vue index d71360d6d..64c972c6d 100644 --- a/src/modules/02_organizationalNew/components/DialogAddPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogAddPosition.vue @@ -23,6 +23,7 @@ import type { DataPosition, } from "@/modules/02_organizationalNew/interface/response/organizational"; +const isSpecial = ref(false) const props = defineProps({ emitSearch: Function, data: Object, @@ -114,6 +115,7 @@ function onSubmitSelectEdit() { : null, //ตำแหน่งทางการบริหาร posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา + isSpecial:isSpecial.value }; await http .post(config.API.orgPosPosition, body) @@ -145,6 +147,7 @@ async function clearFormPositionSelect() { formPositionSelect.positionExecutive = ""; formPositionSelect.positionExecutiveField = ""; formPositionSelect.positionArea = ""; + isSpecial.value = false setTimeout(async () => { isDisValidate.value = await false; }, 1000); @@ -374,6 +377,9 @@ watch( hide-bottom-space /> +
+ +
diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue index cad02c873..200672483 100644 --- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue @@ -34,7 +34,7 @@ const props = defineProps({ rowId: { type: String, default: "" }, fetchDataTable: Function, getSummary: Function, - shortName: {type: String, required: true} + shortName: { type: String, required: true }, }); const modalAdd = ref(false); @@ -521,7 +521,7 @@ watch( } ); -async function addPosition(data: RowDetailPositions) { +async function addPosition(data: RowDetailPositions) { const isIdExist = await rows.value.some( (item: any) => item.posExecutiveId == data.posExecutiveId && @@ -573,6 +573,7 @@ async function clearFormPositionSelect() { formPositionSelect.positionExecutive = ""; formPositionSelect.positionExecutiveField = ""; formPositionSelect.positionArea = ""; + setTimeout(async () => { isDisValidate.value = await false; }, 1000); @@ -706,7 +707,15 @@ async function emitSearch(keyword: string, typeSelect: string) { > {{ col.value ? col.value : "-" }} - +
+ {{ + props.row.posLevelName + ? props.row.isSpecial == true + ? `${props.row.posLevelName} (ฉ)` + : props.row.posLevelName + : "-" + }} +
{{ col.value ? col.value : "-" }}
@@ -862,6 +871,15 @@ async function emitSearch(keyword: string, typeSelect: string) { > {{ col.value ? col.value : "-" }} +
+ {{ + props.row.posLevelName + ? props.row.isSpecial == true + ? `${props.row.posLevelName} (ฉ)` + : props.row.posLevelName + : "-" + }} +
{{ col.value ? col.value : "-" }} diff --git a/src/modules/02_organizationalNew/components/TreeTable.vue b/src/modules/02_organizationalNew/components/TreeTable.vue index 12447c95e..b8d270194 100644 --- a/src/modules/02_organizationalNew/components/TreeTable.vue +++ b/src/modules/02_organizationalNew/components/TreeTable.vue @@ -460,7 +460,14 @@ async function onClickDownloadReport(val: string, name: string) {
- + {{ props.row.isSit ? col.value + " " + "(ทับที่)" : col.value }} - +
+ {{ + props.row.posLevelName + ? props.row.isSpecial == true + ? `${props.row.posLevelName} (ฉ)` + : props.row.posLevelName + : "-" + }} +
{{ col.value ? col.value : "-" }}