diff --git a/src/modules/02_organizationalNew/components/DialogFormPosition.vue b/src/modules/02_organizationalNew/components/DialogFormPosition.vue index dafa9c308..2e42c936f 100644 --- a/src/modules/02_organizationalNew/components/DialogFormPosition.vue +++ b/src/modules/02_organizationalNew/components/DialogFormPosition.vue @@ -40,7 +40,19 @@ const listMenu = ref([ label: "คัดลอก", icon: "mdi-content-copy", type: "copy", - color: "orange", + color: "blue-6", + }, + { + label: "แก้ไข", + icon: "edit", + type: "edit", + color: "primary", + }, + { + label: "ลบ", + icon: "delete", + type: "remove", + color: "red", }, ]); @@ -60,6 +72,7 @@ const formData = reactive({ }); const formPositionSelect = reactive({ + positionId: "", positionName: "", positionField: "", positionType: "", @@ -203,9 +216,14 @@ function onSubmit() { } /** ฟังชั่น บันทึก */ function onSubmitSelectEdit() { - dialogConfirm($q, () => { - console.log(formPositionSelect); - }); + dialogConfirm( + $q, + () => { + console.log(formPositionSelect); + }, + "ยืนยันการเพิ่มตำแหน่ง", + "ต้องการยืนยันการเพิ่มตำแหน่งนี้ใช่หรือไม่?" + ); } /** update เมื่อเปลี่ยน option */ @@ -221,31 +239,34 @@ async function searchInput() { // จำลอง const dataList = [ { - positionName: "test1", - positionField: "test1", - positionType: "test1", - positionLevel: "test1", - positionExecutive: "test1", - positionExecutiveField: "test1", - positionArea: "test1", + positionId: "x1", + positionName: "นักกายภาพบำบัด", + positionField: "จัดการงานทั่วไป", + positionType: "วิชาการ", + positionLevel: "ชำนาญการ", + positionExecutive: "การพยาบาลทั่วไป", + positionExecutiveField: "การพยาบาลทั่วไป", + positionArea: "การพยาบาลทั่วไป", }, { - positionName: "test2", - positionField: "test2", - positionType: "test2", - positionLevel: "test2", - positionExecutive: "test2", - positionExecutiveField: "test2", - positionArea: "test2", + positionId: "x2", + positionName: "นักทรัพยากรบุคคล", + positionField: "จัดการงานทั่วไป", + positionType: "ทั่วไป", + positionLevel: "ชำนาญการ", + positionExecutive: "-", + positionExecutiveField: "-", + positionArea: "-", }, { - positionName: "test3", - positionField: "test3", - positionType: "test3", - positionLevel: "test3", - positionExecutive: "test3", - positionExecutiveField: "test3", - positionArea: "test3", + positionId: "x3", + positionName: "นักทรัพยากรบุคคล", + positionField: "จัดการงานทั่วไป", + positionType: "วิชาการ", + positionLevel: "ชำนาญการพิเศษ", + positionExecutive: "-", + positionExecutiveField: "-", + positionArea: "-", }, ]; rowsPositionSelect.value = dataList; @@ -257,6 +278,7 @@ async function searchInput() { * @param data ข้อมูลตำแหน่ง */ function copyDetiail(data: RowDetailPositions) { + formPositionSelect.positionId = data.positionId; formPositionSelect.positionName = data.positionName; formPositionSelect.positionField = data.positionField; formPositionSelect.positionType = data.positionType; @@ -304,7 +326,7 @@ watch(
-
+
- รายการตำแหน่ง + เลขที่ตำแหน่ง
@@ -429,8 +451,10 @@ watch(
+
-
+
+
-
+
- เลือกตำแหน่ง + เพิ่มข้อมูลตำแหน่ง
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- + diff --git a/src/modules/02_organizationalNew/components/tableTree.vue b/src/modules/02_organizationalNew/components/tableTree.vue index e0ca932cd..24d23e211 100644 --- a/src/modules/02_organizationalNew/components/tableTree.vue +++ b/src/modules/02_organizationalNew/components/tableTree.vue @@ -60,7 +60,7 @@ const columns = ref([ { name: "namePosition", align: "left", - label: "ชื่อตำแหน่ง", + label: "ตำแหน่งในสายงาน", field: "namePosition", headerStyle: "font-size: 14px", style: "font-size: 14px", @@ -95,10 +95,10 @@ const columns = ref([ ]); const rows = ref([ { - noPosition: "00011", - namePosition: "กองบริหารทั่วไป", + noPosition: "สกง.1", + namePosition: "นักทรัพยากรบุคคล", typePosition: "ทั่วไป", - levelPositoion: " ระดับกอง", + levelPositoion: "ชำนาญการ / ?", isStatus: "ไม่มี", }, ]); diff --git a/src/modules/02_organizationalNew/interface/index/Main.ts b/src/modules/02_organizationalNew/interface/index/Main.ts index 1235db9a1..f4b6d1b58 100644 --- a/src/modules/02_organizationalNew/interface/index/Main.ts +++ b/src/modules/02_organizationalNew/interface/index/Main.ts @@ -76,6 +76,7 @@ interface HistoryType { } interface FormPositionSelect { + positionId: string, positionName: string; positionField: string; positionType: string; @@ -86,6 +87,7 @@ interface FormPositionSelect { } interface RowDetailPositions { + positionId: string, positionName: string positionField: string positionType: string