hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fixing bug placement, registry remove employee temp & remove api get tree form json file

Browse source
This commit is contained in:
Warunee Tamkoo 2024-06-05 11:21:58 +07:00
parent 955c2d402f
commit fde7bd6f11
7 changed files with 186 additions and 191 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/modules/04_registryNew/store.ts
View file

@ -17,7 +17,7 @@ export const useRegistryNewDataStore = defineStore("registryNew", () => {
const employeeClassOps = ref<DataOption[]>([ const employeeClassOps = ref<DataOption[]>([
{ id: "officer", name: "ข้าราชการ กทม.สามัญ" }, { id: "officer", name: "ข้าราชการ กทม.สามัญ" },
{ id: "perm", name: "ลูกจ้างประจำ" }, { id: "perm", name: "ลูกจ้างประจำ" },
{ id: "temp", name: "ลูกจ้างชั่วคราว" }, // { id: "temp", name: "ลูกจ้างชั่วคราว" },
]); ]);
const posTypeOps = ref<DataOption[]>([]); const posTypeOps = ref<DataOption[]>([]);
const posTypeMain = ref<DataType[]>([]); const posTypeMain = ref<DataType[]>([]);

72
src/modules/05_placement/components/AppointEmployee/Modal.vue
View file

@ -48,43 +48,43 @@ let dataForm = reactive({
}); });
onMounted(async () => { onMounted(async () => {
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); // await loadTreeData();
await fetchplacementPosition(); await fetchplacementPosition();
}); });
const fetchPublishFile = async () => { // const fetchPublishFile = async () => {
await http // await http
.get(config.API.getPublishFileHistory) // .get(config.API.getPublishFileHistory)
.then((res) => { // .then((res) => {
let data = res.data.result; // let data = res.data.result;
selectedFile.value = data[0].fileName; // selectedFile.value = data[0].fileName;
}) // })
.catch((e) => { // .catch((e) => {
messageError($q, e); // messageError($q, e);
}) // })
.finally(async () => { // .finally(async () => {
hideLoader(); // hideLoader();
}); // });
}; // };
// โหลดข้อมูลโครงสร้างจาก json // โหลดข้อมูลโครงสร้างจาก json
const loadTreeData = async () => { // const loadTreeData = async () => {
expanded.value = []; // expanded.value = [];
await http // await http
.get(`${config.s3ClusterUrl}${selectedFile.value}`) // .get(`${config.s3ClusterUrl}${selectedFile.value}`)
.then((res: any) => { // .then((res: any) => {
treeData.value = res.data; // treeData.value = res.data;
dataRespone.value = res.data; // dataRespone.value = res.data;
// Filter objects with "name" null // // Filter objects with "name" null
const filteredData = res.data.filter(filterByPersonIdNull); // const filteredData = res.data.filter(filterByPersonIdNull);
treeData.value = filteredData; // treeData.value = filteredData;
}) // })
.catch((e: any) => { // .catch((e: any) => {
messageError($q, e); // messageError($q, e);
}) // })
.finally(() => { // .finally(() => {
hideLoader(); // hideLoader();
}); // });
}; // };
function filterByPersonIdNull(obj: any) { function filterByPersonIdNull(obj: any) {
if (obj.name === null && obj.isCondition != true) { if (obj.name === null && obj.isCondition != true) {
return true; return true;
@ -171,8 +171,8 @@ const saveAppoint = async () => {
}) })
.finally(async () => { .finally(async () => {
await closeAndClear(); await closeAndClear();
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); // await loadTreeData();
await fetchplacementPosition(); await fetchplacementPosition();
hideLoader(); hideLoader();
}); });

73
src/modules/05_placement/components/AppointMent/AppointmentModal.vue
View file

@ -47,42 +47,41 @@ let dataForm = reactive({
positionTypeId: "", positionTypeId: "",
}); });
const fetchPublishFile = async () => { // const fetchPublishFile = async () => {
await http // await http
.get(config.API.getPublishFileHistory) // .get(config.API.getPublishFileHistory)
.then((res) => { // .then((res) => {
let data = res.data.result; // let data = res.data.result;
selectedFile.value = data[0].fileName; // selectedFile.value = data[0].fileName;
}) // })
.catch((e) => { // .catch((e) => {
messageError($q, e); // messageError($q, e);
}) // })
.finally(async () => { // .finally(async () => {
hideLoader(); // hideLoader();
}); // });
}; // };
// โหลดข้อมูลโครงสร้างจาก json // โหลดข้อมูลโครงสร้างจาก json
// const loadTreeData = async () => {
// expanded.value = [];
// await http
// .get(`${config.s3ClusterUrl}${selectedFile.value}`)
// .then((res: any) => {
// treeData.value = res.data;
// dataRespone.value = res.data;
const loadTreeData = async () => { // // Filter objects with "name" null
expanded.value = []; // const filteredData = res.data.filter(filterByPersonIdNull);
await http // treeData.value = filteredData;
.get(`${config.s3ClusterUrl}${selectedFile.value}`) // })
.then((res: any) => { // .catch((e: any) => {
treeData.value = res.data; // messageError($q, e);
dataRespone.value = res.data; // })
// .finally(() => {
// Filter objects with "name" null // hideLoader();
const filteredData = res.data.filter(filterByPersonIdNull); // });
treeData.value = filteredData; // };
})
.catch((e: any) => {
messageError($q, e);
})
.finally(() => {
hideLoader();
});
};
function filterByPersonIdNull(obj: any) { function filterByPersonIdNull(obj: any) {
if (obj.name === null && obj.isCondition != true) { if (obj.name === null && obj.isCondition != true) {
@ -177,8 +176,8 @@ const saveAppoint = async () => {
}) })
.finally(async () => { .finally(async () => {
await closeAndClear(); await closeAndClear();
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); // await loadTreeData();
await fetchplacementPosition(); await fetchplacementPosition();
hideLoader(); hideLoader();
}); });
@ -393,8 +392,8 @@ function findByPerson(element: any): any {
} }
onMounted(async () => { onMounted(async () => {
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); // await loadTreeData();
// await fetchplacementPosition(); // await fetchplacementPosition();
}); });
</script> </script>

72
src/modules/05_placement/components/PersonalList/OrgTree.vue
View file

@ -61,41 +61,41 @@ let dataForm = reactive({
}); });
/** ฟังชั่น get file*/ /** ฟังชั่น get file*/
async function fetchPublishFile() { // async function fetchPublishFile() {
await http // await http
.get(config.API.getPublishFileHistory) // .get(config.API.getPublishFileHistory)
.then((res) => { // .then((res) => {
let data = res.data.result; // let data = res.data.result;
selectedFile.value = data[0].fileName; // selectedFile.value = data[0].fileName;
}) // })
.catch((e) => { // .catch((e) => {
messageError($q, e); // messageError($q, e);
}) // })
.finally(async () => { // .finally(async () => {
hideLoader(); // hideLoader();
}); // });
} // }
/** โหลดข้อมูลโครงสร้างจาก json */ /** โหลดข้อมูลโครงสร้างจาก json */
const loadTreeData = async () => { // const loadTreeData = async () => {
expanded.value = []; // expanded.value = [];
await http // await http
.get(`${config.s3ClusterUrl}${selectedFile.value}`) // .get(`${config.s3ClusterUrl}${selectedFile.value}`)
.then((res: any) => { // .then((res: any) => {
treeData.value = res.data; // treeData.value = res.data;
dataRespone.value = res.data; // dataRespone.value = res.data;
// Filter objects with "name" null // // Filter objects with "name" null
const filteredData = res.data.filter(filterByPersonIdNull); // const filteredData = res.data.filter(filterByPersonIdNull);
treeData.value = filteredData; // treeData.value = filteredData;
}) // })
.catch((e: any) => { // .catch((e: any) => {
messageError($q, e); // messageError($q, e);
}) // })
.finally(() => { // .finally(() => {
hideLoader(); // hideLoader();
}); // });
}; // };
/** /**
* ฟังก์ชันกรองข้อมูลที่ personId เป็น null * ฟังก์ชันกรองข้อมูลที่ personId เป็น null
@ -202,8 +202,8 @@ async function saveAppoint() {
}) })
.finally(async () => { .finally(async () => {
await closeAndClear(); await closeAndClear();
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); // await loadTreeData();
await fetchplacementPosition(); await fetchplacementPosition();
hideLoader(); hideLoader();
}); });
@ -419,8 +419,8 @@ watch(props, () => {
}); });
onMounted(async () => { onMounted(async () => {
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); // await loadTreeData();
await fetchplacementPosition(); await fetchplacementPosition();
}); });
</script> </script>

54
src/modules/05_placement/components/PersonalList/Table.vue
View file

@ -239,9 +239,9 @@ function convertContainStatus(val: string, type: string = "") {
case "UN-CONTAIN": case "UN-CONTAIN":
return "ยังไม่บรรจุ"; return "ยังไม่บรรจุ";
case "PREPARE-CONTAIN": case "PREPARE-CONTAIN":
return "เตรียม" + (type != "" ? type : "บรรจุ"); return "เตรียม" + (!type ? type : "บรรจุ");
case "CONTAIN": case "CONTAIN":
return (type != "" ? type : "บรรจุ") + "แล้ว"; return (!type ? type : "บรรจุ") + "แล้ว";
case "DISCLAIM": case "DISCLAIM":
return "สละสิทธิ์"; return "สละสิทธิ์";
default: default:
@ -358,16 +358,15 @@ async function getTable() {
}); });
// รายชื่อทั้งหมด // รายชื่อทั้งหมด
rows.value = roleAdmin.value rows.value = await (roleAdmin.value
? rowsAll.value ? rowsAll.value
: rowsAll.value.filter((x: any) => x.statusId !== "CONTAIN"); : rowsAll.value.filter((x: any) => x.statusId !== "CONTAIN"));
// รายชื่อไปยังหน่วยงาน // รายชื่อไปยังหน่วยงาน
rowsFilter.value = rows.value.filter( rowsFilter.value = await rows.value.filter(
(e: any) => e.draft == "รอส่งตัว" && e.statusNameCheck == "เตรียมบรรจุ" (e: any) => e.draft == "รอส่งตัว"
); );
console.log(rows.value);
insertAvatar(rowsAll.value); insertAvatar(rows.value);
}) })
.catch((e) => { .catch((e) => {
messageError($q, e); messageError($q, e);
@ -389,13 +388,13 @@ function insertAvatar(items: any) {
) )
) )
.then((img) => { .then((img) => {
rowsAll.value[index] = { rows.value[index] = {
...x, ...x,
avatar: img.data.downloadUrl, avatar: img.data.downloadUrl,
}; };
}) })
.catch(() => { .catch(() => {
rowsAll.value[index] = { rows.value[index] = {
...x, ...x,
avatar: avatar, avatar: avatar,
}; };
@ -829,7 +828,7 @@ onMounted(async () => {
</q-td> </q-td>
<q-td auto-width> <q-td auto-width>
<q-btn <q-btn
v-if="roleAdmin && props.row.statusId !== 'CONTAIN'" v-if="props.row.statusId !== 'CONTAIN'"
icon="mdi-dots-vertical" icon="mdi-dots-vertical"
size="12px" size="12px"
color="grey-7" color="grey-7"
@ -841,9 +840,9 @@ onMounted(async () => {
<q-list dense style="min-width: 100px"> <q-list dense style="min-width: 100px">
<q-item <q-item
v-if=" v-if="
(roleAdmin && props.row.statusId === 'UN-CONTAIN') || roleAdmin &&
(props.row.draft === 'รอส่งตัว' && props.row.draft !== 'ส่งตัวแล้ว' &&
props.row.statusId !== 'DISCLAIM') props.row.statusId !== 'DISCLAIM'
" "
clickable clickable
v-close-popup v-close-popup
@ -872,11 +871,10 @@ onMounted(async () => {
</q-item> </q-item>
<q-item <q-item
v-if=" v-if="
(props.row.bmaOfficer !== 'บุคคลภายนอก' && props.row.bmaOfficer !== 'บุคคลภายนอก' &&
roleAdmin && roleAdmin &&
props.row.statusId === 'UN-CONTAIN') || props.row.draft !== 'ส่งตัวแล้ว' &&
(props.row.draft === 'รอส่งตัว' && props.row.statusId !== 'DISCLAIM'
props.row.statusId !== 'DISCLAIM')
" "
clickable clickable
v-close-popup v-close-popup
@ -904,11 +902,10 @@ onMounted(async () => {
<q-item <q-item
v-if=" v-if="
(props.row.bmaOfficer !== 'บุคคลภายนอก' && props.row.bmaOfficer !== 'บุคคลภายนอก' &&
roleAdmin && roleAdmin &&
props.row.statusId === 'UN-CONTAIN') || props.row.draft !== 'ส่งตัวแล้ว' &&
(props.row.draft === 'รอส่งตัว' && props.row.statusId !== 'DISCLAIM'
props.row.statusId !== 'DISCLAIM')
" "
clickable clickable
v-close-popup v-close-popup
@ -932,11 +929,10 @@ onMounted(async () => {
<q-item <q-item
v-if=" v-if="
(props.row.bmaOfficer !== 'บุคคลภายนอก' && props.row.bmaOfficer !== 'บุคคลภายนอก' &&
roleAdmin && roleAdmin &&
props.row.statusId === 'UN-CONTAIN') || props.row.draft !== 'ส่งตัวแล้ว' &&
(props.row.draft === 'รอส่งตัว' && props.row.statusId !== 'DISCLAIM'
props.row.statusId !== 'DISCLAIM')
" "
clickable clickable
v-close-popup v-close-popup

72
src/modules/05_placement/components/Receive/receiveModal.vue
View file

@ -118,40 +118,40 @@ let dataForm = reactive({
positionTypeId: "", positionTypeId: "",
}); });
const fetchPublishFile = async () => { // const fetchPublishFile = async () => {
await http // await http
.get(config.API.getPublishFileHistory) // .get(config.API.getPublishFileHistory)
.then((res) => { // .then((res) => {
let data = res.data.result; // let data = res.data.result;
selectedFile.value = data[0].fileName; // selectedFile.value = data[0].fileName;
}) // })
.catch((e) => { // .catch((e) => {
messageError($q, e); // messageError($q, e);
}) // })
.finally(async () => { // .finally(async () => {
hideLoader(); // hideLoader();
}); // });
}; // };
// โหลดข้อมูลโครงสร้างจาก json // โหลดข้อมูลโครงสร้างจาก json
const loadTreeData = async () => { // const loadTreeData = async () => {
expanded.value = []; // expanded.value = [];
await http // await http
.get(`${config.s3ClusterUrl}${selectedFile.value}`) // .get(`${config.s3ClusterUrl}${selectedFile.value}`)
.then((res: any) => { // .then((res: any) => {
treeData.value = res.data; // treeData.value = res.data;
dataRespone.value = res.data; // dataRespone.value = res.data;
// Filter objects with "name" null // // Filter objects with "name" null
const filteredData = res.data.filter(filterByPersonIdNull); // const filteredData = res.data.filter(filterByPersonIdNull);
treeData.value = filteredData; // treeData.value = filteredData;
}) // })
.catch((e: any) => { // .catch((e: any) => {
messageError($q, e); // messageError($q, e);
}) // })
.finally(() => { // .finally(() => {
hideLoader(); // hideLoader();
}); // });
}; // };
function filterByPersonIdNull(obj: any) { function filterByPersonIdNull(obj: any) {
if (obj.name === null && obj.isCondition != true) { if (obj.name === null && obj.isCondition != true) {
@ -234,8 +234,8 @@ const saveAppoint = async () => {
}) })
.finally(async () => { .finally(async () => {
await closeAndClear(); await closeAndClear();
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); // await loadTreeData();
// await fetchplacementPosition(); // await fetchplacementPosition();
hideLoader(); hideLoader();
}); });
@ -634,8 +634,8 @@ watch(
); );
onMounted(async () => { onMounted(async () => {
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); // await loadTreeData();
// await fetchplacementPosition(); // await fetchplacementPosition();
}); });
</script> </script>

32
src/modules/05_placement/components/Relocation/RelocationModal.vue
View file

@ -43,24 +43,24 @@ let dataForm = reactive({
}); });
onMounted(async () => { onMounted(async () => {
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); await loadTreeData();
await fetchplacementPosition(); await fetchplacementPosition();
}); });
const fetchPublishFile = async () => { // const fetchPublishFile = async () => {
await http // await http
.get(config.API.getPublishFileHistory) // .get(config.API.getPublishFileHistory)
.then((res) => { // .then((res) => {
let data = res.data.result; // let data = res.data.result;
selectedFile.value = data[0].fileName; // selectedFile.value = data[0].fileName;
}) // })
.catch((e) => { // .catch((e) => {
messageError($q, e); // messageError($q, e);
}) // })
.finally(async () => { // .finally(async () => {
hideLoader(); // hideLoader();
}); // });
}; // };
// โหลดข้อมูลโครงสร้างจาก json // โหลดข้อมูลโครงสร้างจาก json
const treeData = ref<Array<any>>([]); const treeData = ref<Array<any>>([]);
@ -192,7 +192,7 @@ const saveAppoint = async () => {
.finally(async () => { .finally(async () => {
await closeAndClear(); await closeAndClear();
// await resetFilter(); // await resetFilter();
await fetchPublishFile(); // await fetchPublishFile();
await loadTreeData(); await loadTreeData();
await fetchplacementPosition(); await fetchplacementPosition();
hideLoader(); hideLoader();