diff --git a/src/modules/02_organizationalNew/components/DialogAddPosition.vue b/src/modules/02_organizationalNew/components/DialogAddPosition.vue index 257e63801..192f4e602 100644 --- a/src/modules/02_organizationalNew/components/DialogAddPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogAddPosition.vue @@ -7,13 +7,9 @@ import DialogHeader from "@/components/DialogHeader.vue"; import http from "@/plugins/http"; import config from "@/app.config"; import type { - FormDataPosition, - FormPositionRef, DataOption, FormPositionSelect, - RowDetailPositions, FormPositionSelectRef, - ListMenu, } from "@/modules/02_organizationalNew/interface/index/Main"; import type { diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue index 7ec039b5e..0b182fbcf 100644 --- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue @@ -37,7 +37,7 @@ const props = defineProps({ shortName: { type: String, required: true }, }); -const isEdit = ref(false) +const isEdit = ref(false); const modalAdd = ref(false); const reqMaster = defineModel("reqMaster", { required: true }); const isReadonly = ref(false); // อ่านได้อย่างเดียว @@ -117,6 +117,7 @@ const formData = reactive({ prefixNo: "", positionNo: "", suffixNo: "", + reason: "", }); const formPositionSelect = reactive({ @@ -239,6 +240,7 @@ async function fetchPosition(id: string) { formData.prefixNo = data.posMasterNoPrefix; formData.positionNo = data.posMasterNo; formData.suffixNo = data.posMasterNoSuffix; + formData.reason = data.reason; rows.value = data.positions; }) .catch((err) => { @@ -358,15 +360,16 @@ function onSubmit() { posDictField: e.positionField, //สายงาน posTypeId: e.posTypeId, //*ประเภทตำแหน่ง posLevelId: e.posLevelId, //*ระดับตำแหน่ง - posExecutiveId: e.posExecutiveId ? e.posExecutiveId:'', //ตำแหน่งทางการบริหาร + posExecutiveId: e.posExecutiveId ? e.posExecutiveId : "", //ตำแหน่งทางการบริหาร posDictExecutiveField: e.positionExecutiveField, //ด้านทางการบริหาร posDictArea: e.positionArea, //ด้าน/สาขา - isSpecial: e.isSpecial, + isSpecial: e.isSpecial, })); const body = { posMasterNoPrefix: formData.prefixNo, //*Prefix นำหน้าเลขที่ตำแหน่ง เป็น Optional (ไม่ใช่อักษรย่อของหน่วยงาน/ส่วนราชการ) posMasterNo: Number(formData.positionNo), //*เลขที่ตำแหน่ง เป็นตัวเลข posMasterNoSuffix: formData.suffixNo, //Suffix หลังเลขที่ตำแหน่ง เช่น ช. + reason: formData.reason, //Suffix หลังเลขที่ตำแหน่ง เช่น ช. orgRootId: props.orgLevel === 0 ? props.treeId : null, //Id สำนัก orgChild1Id: props.orgLevel === 1 ? props.treeId : null, orgChild2Id: props.orgLevel === 2 ? props.treeId : null, @@ -502,7 +505,7 @@ function editDetiail(data: RowDetailPositions) { isEdit.value = true; modalAdd.value = true; dataCopy.value = data; - console.log(isEdit.value) + console.log(isEdit.value); } /** @@ -633,52 +636,70 @@ async function emitSearch(keyword: string, typeSelect: string) {
-
- +
+
+ +
+
+ +
+
+ +
+
+ +
-
+ +
-
-
- -
-
-
+
diff --git a/src/modules/02_organizationalNew/interface/index/Main.ts b/src/modules/02_organizationalNew/interface/index/Main.ts index 598a075b1..368efa449 100644 --- a/src/modules/02_organizationalNew/interface/index/Main.ts +++ b/src/modules/02_organizationalNew/interface/index/Main.ts @@ -30,6 +30,7 @@ interface FormDataPosition { prefixNo: string; positionNo: string; suffixNo: string; + reason?: string; } interface FormDataNewStructure { diff --git a/src/modules/14_KPI/views/round.vue b/src/modules/14_KPI/views/round.vue index 9629d1560..0350374d4 100644 --- a/src/modules/14_KPI/views/round.vue +++ b/src/modules/14_KPI/views/round.vue @@ -333,7 +333,7 @@ onMounted(() => { ดาวน์โหลด --> - { " /> - + -->