diff --git a/src/modules/01_metadataNew/components/position/01ListPosition.vue b/src/modules/01_metadataNew/components/position/01ListPosition.vue index 2822e3961..ce4df1e56 100644 --- a/src/modules/01_metadataNew/components/position/01ListPosition.vue +++ b/src/modules/01_metadataNew/components/position/01ListPosition.vue @@ -13,12 +13,13 @@ import type { import type { QTableProps } from "quasar"; import DialogAddPosition from "@/modules/01_metadataNew/components/position/DialogAddPosition.vue"; -const editPosition = ref(false) +const editPosition = ref(false); const modalAddPosition = ref(false); const levelOpsMain = ref([]); const dataLevel = ref(); const levelOps = ref([]); +const isSpecial = ref(false) const formPositionSelect = reactive({ positionId: "", posTypeId: "", @@ -29,6 +30,7 @@ const formPositionSelect = reactive({ positionExecutive: "", positionExecutiveField: "", positionArea: "", + isSpecial: false, }); const rows = ref([]); @@ -179,6 +181,7 @@ function copyDetiail(data: RowDetailPositions) { * @param data ข้อมูลตำแหน่ง */ function editDetiail(data: RowDetailPositions) { + console.log(data) formPositionSelect.positionId = data.id; formPositionSelect.posTypeId = data.posTypeId; formPositionSelect.positionName = data.positionName; @@ -188,8 +191,9 @@ function editDetiail(data: RowDetailPositions) { formPositionSelect.positionExecutive = data.posExecutiveId; formPositionSelect.positionExecutiveField = data.positionExecutiveField; formPositionSelect.positionArea = data.positionArea; + formPositionSelect.isSpecial = data.isSpecial; modalAddPosition.value = true; - editPosition.value = true + editPosition.value = true; } /** @@ -372,8 +376,17 @@ onMounted(() => {
{{ props.rowIndex + 1 }}
+
+ {{ + props.row.posLevelName + ? props.row.isSpecial == true + ? `${props.row.posLevelName} (ฉ)` + : props.row.posLevelName + : "-" + }} +
- {{ col.value }} + {{ col.value ? col.value:'-' }}
diff --git a/src/modules/01_metadataNew/components/position/DialogAddPosition.vue b/src/modules/01_metadataNew/components/position/DialogAddPosition.vue index 0b32d222e..e717fc4a2 100644 --- a/src/modules/01_metadataNew/components/position/DialogAddPosition.vue +++ b/src/modules/01_metadataNew/components/position/DialogAddPosition.vue @@ -32,7 +32,7 @@ const formPositionSelect = reactive({ positionArea: "", }); const $q = useQuasar(); - +const isSpecial = ref(false) const props = defineProps({ getData:Function }) @@ -102,6 +102,7 @@ function saveSelectEdit() { : formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร posDictExecutiveField: formPositionSelect.positionExecutiveField!==null?formPositionSelect.positionExecutiveField:'', //ด้านทางการบริหาร posDictArea: formPositionSelect.positionArea !== null ? formPositionSelect.positionArea:'', //ด้าน/สาขา + isSpecial:isSpecial.value }; await http .put(config.API.orgPosPositionById(formPositionSelect.positionId), body) @@ -135,11 +136,15 @@ function onSubmitSelectEdit() { posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง posExecutiveId: - formPositionSelect.positionExecutive == "" - ? null + formPositionSelect.positionExecutive == null + ? '' : formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร - posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร - posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา + posDictExecutiveField: formPositionSelect.positionExecutiveField == null ? '':formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร + posDictArea: formPositionSelect.positionArea == null ? '':formPositionSelect.positionArea, //ด้าน/สาขา + isSpecial:isSpecial.value + + + }; await http .post(config.API.orgPosPosition, body) @@ -245,6 +250,7 @@ watch( formPositionSelect.positionExecutiveField = dataList.positionExecutiveField; formPositionSelect.positionArea = dataList.positionArea; + isSpecial.value = dataList.isSpecial; } } } @@ -386,6 +392,9 @@ function close() { hide-bottom-space /> +
+ +
diff --git a/src/modules/01_metadataNew/interface/request/position/index.ts b/src/modules/01_metadataNew/interface/request/position/index.ts index 3471ddd38..70a272cb9 100644 --- a/src/modules/01_metadataNew/interface/request/position/index.ts +++ b/src/modules/01_metadataNew/interface/request/position/index.ts @@ -60,6 +60,7 @@ interface FormPositionSelect { positionExecutive: string; positionExecutiveField: string; positionArea: string; + isSpecial: boolean; } interface ListMenu { label: string; @@ -81,6 +82,7 @@ interface RowDetailPositions { posTypeId: string; posLevelId: string; posExecutiveId: string; + isSpecial: boolean; } interface RowListForm {