This commit is contained in:
Warunee Tamkoo 2023-10-11 22:27:43 +07:00
parent 1afb941c4c
commit 9a268f9d7a
2 changed files with 11 additions and 15 deletions

View file

@ -77,7 +77,7 @@ const currentAddress = reactive<AddressData>({
}); });
onMounted(async () => { onMounted(async () => {
// await getNewData(); await getNewData();
emit("update:statusEdit", false); emit("update:statusEdit", false);
}); });
@ -126,13 +126,13 @@ const filterSelector = (val: any, update: Function, refData: string) => {
const refreshData = async () => { const refreshData = async () => {
myform.value.reset(); myform.value.reset();
await props.fetch(); // await props.fetch();
await fetchProvince(); await fetchProvince();
// await getNewData(); await getNewData();
}; };
const getNewData = async () => { const getNewData = async () => {
await props.fetch(); // await props.fetch();
await fetchProvince(); await fetchProvince();
}; };
@ -181,9 +181,9 @@ const editData = async () => {
.finally(async () => { .finally(async () => {
edit.value = false; edit.value = false;
emit("update:statusEdit", false); emit("update:statusEdit", false);
// await getNewData(); await getNewData();
await props.fetch(); // await props.fetch();
await fetchProvince(); // await fetchProvince();
}); });
}; };

View file

@ -143,19 +143,15 @@ const closeModal = () => {
// //
const openModalOrder = () => { const openModalOrder = () => {
console.log(filters.value);
openModal(); openModal();
console.log("filters===>",filters.value)
const row = filters.value.filter( const row = filters.value.filter(
(r: ResponseData) => (r: ResponseData) =>
(r.status == "WAITTING" || (r.status == "APPROVE") &&
r.status == "PENDING" ||
r.status == "APPROVE") &&
r.createdAt &&
r.organizationPositionOld && r.organizationPositionOld &&
r.positionTypeOld && r.positionTypeOld &&
r.positionLevel && r.positionLevelOld &&
r.posNo && r.positionNumberOld &&
r.salary !== null && r.salary !== null &&
r.organization && r.organization &&
r.date r.date