diff --git a/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue b/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue index 34833037a..6b998694f 100644 --- a/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue +++ b/src/modules/01_metadataNew/components/personal/07ListEducationLevel.vue @@ -71,7 +71,7 @@ const columns = [ ] as const satisfies QTableProps["columns"]; const $q = useQuasar(); - +const editId = ref(""); const filterKeyword = ref(""); const dialog = ref(false); const educationLevel = ref(""); @@ -139,6 +139,8 @@ onMounted(async () => { () => { dialogStatus = 'create'; dialog = true; + educationLevel = ''; + educationRank = undefined; } " > @@ -211,6 +213,9 @@ onMounted(async () => { () => { dialogStatus = 'edit'; dialog = true; + editId = props.row.id; + educationLevel = props.row.name; + educationRank = props.row.rank; } " > @@ -223,7 +228,12 @@ onMounted(async () => {
@@ -241,7 +251,7 @@ onMounted(async () => { ("personalName"); const dialogStatus = defineModel("dialogStatus"); const editId = defineModel("editId"); const dialog = defineModel("dialog"); -const educationRank = defineModel("rank"); +const educationRank = defineModel("educationRank"); const props = defineProps({ fetchData: { type: Function, @@ -52,6 +52,7 @@ async function onSubmit() { : props.editData(editId.value); closeDialog(); data.value = ""; + educationRank.value = undefined; }, "ยืนยันการบันทึกข้อมูล", "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?" diff --git a/src/modules/01_metadataNew/stores/positionListStore.ts b/src/modules/01_metadataNew/stores/positionListStore.ts index 30df6859f..17afb8238 100644 --- a/src/modules/01_metadataNew/stores/positionListStore.ts +++ b/src/modules/01_metadataNew/stores/positionListStore.ts @@ -9,8 +9,8 @@ import { useCounterMixin } from "@/stores/mixin"; const { date2Thai } = useCounterMixin(); export const usePositionDataStore = defineStore("PositionData", () => { + const pathLocation = ref("list_position"); const row = ref([]); - const name = ref([]); function save(data: DataResponse[], id: string) { const list = data.map((e) => ({ ...e, @@ -26,5 +26,6 @@ export const usePositionDataStore = defineStore("PositionData", () => { return { save, row, + pathLocation, }; }); diff --git a/src/modules/01_metadataNew/views/position.vue b/src/modules/01_metadataNew/views/position.vue index 5c38468f6..bd15a4547 100644 --- a/src/modules/01_metadataNew/views/position.vue +++ b/src/modules/01_metadataNew/views/position.vue @@ -4,8 +4,10 @@ import { ref, onMounted } from "vue"; import ListPosition from "@/modules/01_metadataNew/components/position/01ListPosition.vue"; import ListType from "@/modules/01_metadataNew/components/position/02ListType.vue"; import ListExecutive from "@/modules/01_metadataNew/components/position/04ListExecutive.vue"; -const currentTab = ref("list_position"); +import { usePositionDataStore } from "../stores/positionListStore"; +// const store.pathLocation = ref("list_position"); const tabs = ref>([]); +const store = usePositionDataStore(); onMounted(() => { const tabsPerson = [ @@ -23,7 +25,7 @@ onMounted(() => { { {
- - - + + +
diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue index 9d4811211..398c1fcf2 100644 --- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue @@ -405,7 +405,10 @@ function onSubmitSelectEdit() { posDictField: formPositionSelect.positionField, //สายงาน posTypeId: formPositionSelect.positionType, //*ประเภทตำแหน่ง posLevelId: formPositionSelect.positionLevel, //*ระดับตำแหน่ง - posExecutiveId: formPositionSelect.positionExecutive, //ตำแหน่งทางการบริหาร + posExecutiveId: + formPositionSelect.positionExecutive !== "" + ? formPositionSelect.positionExecutive + : null, //ตำแหน่งทางการบริหาร posDictExecutiveField: formPositionSelect.positionExecutiveField, //ด้านทางการบริหาร posDictArea: formPositionSelect.positionArea, //ด้าน/สาขา }; diff --git a/src/modules/04_registry/components/Information/top.vue b/src/modules/04_registry/components/Information/top.vue index 8f92674b7..5c0d55de4 100644 --- a/src/modules/04_registry/components/Information/top.vue +++ b/src/modules/04_registry/components/Information/top.vue @@ -15,71 +15,74 @@ {{ header }}
-
- - แก้ไขข้อมูล - - - บันทึกข้อมูล - - - ยกเลิก - -
-
- - เพิ่มข้อมูล - - +
+ +
+ + เพิ่มข้อมูล + +
-
- - เพิ่มข้อมูล - -