diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue index dc2ce42d9..b8362ad85 100644 --- a/src/components/Dialogs/DialogOrgSelect.vue +++ b/src/components/Dialogs/DialogOrgSelect.vue @@ -40,6 +40,7 @@ const { hideLoader, date2Thai, dialogMessageNotify, + onSearchDataTable, } = mixin; /** props*/ @@ -57,6 +58,7 @@ const isAll = ref(false); const isBlank = ref(false); const posMasterMain = ref([]); const positionNo = ref([]); +const rowData = ref([]); const itemTaps = ref(); const filters = ref(""); const positionId = ref(""); @@ -293,6 +295,7 @@ async function getDataTable(id: string, level: number = 0) { })); positionNo.value = listPosNo; + rowData.value = listPosNo; // positionData.value = listPosNo; if (props.dataRows?.posmasterId) { @@ -510,6 +513,14 @@ function onSubmit() { } } +function onSearch() { + positionNo.value = onSearchDataTable( + filters.value, + rowData.value, + columns.value ? columns.value : [] + ); +} + onMounted(async () => { await fetchTree(); }); @@ -517,389 +528,383 @@ onMounted(async () => { + + + + + +
+ +
+ +
+ เลือกตำแหน่งเลขที่ +
+
+
+ +
+ + แสดงเฉพาะตำแหน่งว่าง + +
+ - - บันทึกข้อมูล - - +
+ + แสดงตำแหน่งทั้งหมดภายใต้หน่วยงาน/ส่วนราชการที่เลือก + +
+ + + +
+
+ +
+
+
+ + + + +
+
+
+ + +
+ +
+ เลือกตำแหน่ง +
+
+ + +
+ + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+ + + + + + บันทึกข้อมูล + diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue index 90015b3bc..c551475ce 100644 --- a/src/components/Dialogs/DialogOrgSelectEmployee.vue +++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue @@ -40,6 +40,7 @@ const { hideLoader, date2Thai, dialogMessageNotify, + onSearchDataTable } = mixin; const route = useRoute(); @@ -57,6 +58,7 @@ const isAll = ref(false); const isBlank = ref(false); const posMasterMain = ref([]); const positionNo = ref([]); +const rowsData = ref([]); const itemTaps = ref(); const filters = ref(""); const positionId = ref(""); @@ -278,6 +280,7 @@ async function getDataTable(id: string, level: number = 0) { })); positionNo.value = listPosNo; + rowsData.value = listPosNo; // positionData.value = listPosNo; if (props.dataRows?.posmasterId) { @@ -485,6 +488,15 @@ function onSubmit() { } } +function onSearch() { + positionNo.value = onSearchDataTable( + filters.value, + rowsData.value, + columns.value ? columns.value : [] + ); +} + + onMounted(() => { fetchTree(); }); @@ -492,7 +504,6 @@ onMounted(() => {