fix bug
This commit is contained in:
parent
e55d3ca1bf
commit
546003492d
3 changed files with 15 additions and 7 deletions
|
|
@ -53,7 +53,7 @@ async function getStat() {
|
||||||
disclaim: statCard.disclaim,
|
disclaim: statCard.disclaim,
|
||||||
report: statCard.report,
|
report: statCard.report,
|
||||||
};
|
};
|
||||||
DataStore.checkLoad(1);
|
// DataStore.checkLoad(1);
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
messageError($q, e);
|
messageError($q, e);
|
||||||
|
|
|
||||||
|
|
@ -378,8 +378,10 @@ async function getTable() {
|
||||||
|
|
||||||
// รายชื่อทั้งหมด
|
// รายชื่อทั้งหมด
|
||||||
await filterpositionCandidate(rowData);
|
await filterpositionCandidate(rowData);
|
||||||
rows.value = rowData;
|
// rows.value = rowData;
|
||||||
rowsAwait.value = rowData;
|
rowsAwait.value = rowData;
|
||||||
|
await onUpdateNewRows(typeEmployee.value,positionCandidate.value)
|
||||||
|
|
||||||
|
|
||||||
// รายชื่อไปยังหน่วยงาน
|
// รายชื่อไปยังหน่วยงาน
|
||||||
rowsFilter.value = await rows.value.filter(
|
rowsFilter.value = await rows.value.filter(
|
||||||
|
|
@ -394,7 +396,7 @@ async function getTable() {
|
||||||
e.nodeName !== null &&
|
e.nodeName !== null &&
|
||||||
e.reportingDate !== null
|
e.reportingDate !== null
|
||||||
);
|
);
|
||||||
await DataStore.checkLoad(1);
|
// await DataStore.checkLoad(1);
|
||||||
// insertAvatar(rows.value);
|
// insertAvatar(rows.value);
|
||||||
})
|
})
|
||||||
.catch((e) => {
|
.catch((e) => {
|
||||||
|
|
@ -419,8 +421,6 @@ async function filterpositionCandidate(data: any) {
|
||||||
arr.findIndex((e: any) => e.id === item.id) === index
|
arr.findIndex((e: any) => e.id === item.id) === index
|
||||||
);
|
);
|
||||||
positionCandidateData.value.push(...uniqueData);
|
positionCandidateData.value.push(...uniqueData);
|
||||||
|
|
||||||
console.log(positionCandidateData.value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ยืนยันการผ่อนผัน*/
|
/** ยืนยันการผ่อนผัน*/
|
||||||
|
|
@ -756,7 +756,12 @@ function openModalOrder(val: boolean) {
|
||||||
modalOrder.value = val;
|
modalOrder.value = val;
|
||||||
}
|
}
|
||||||
|
|
||||||
function onUpdateNewRows(type: string, pos: string) {
|
const typeEmployee = ref<string>("");
|
||||||
|
const positionCandidate = ref<string>("");
|
||||||
|
|
||||||
|
async function onUpdateNewRows(type: string, pos: string) {
|
||||||
|
typeEmployee.value = type;
|
||||||
|
positionCandidate.value = pos;
|
||||||
const data = onSearchDataTable(
|
const data = onSearchDataTable(
|
||||||
filter.value,
|
filter.value,
|
||||||
rowsAwait.value,
|
rowsAwait.value,
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,6 @@ const bmaOfficerOption = ref<optionData[]>([
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const positionCandidate = ref<string>("");
|
const positionCandidate = ref<string>("");
|
||||||
const positionCandidateOptions = ref<optionData[]>([]);
|
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
inputfilter: String,
|
inputfilter: String,
|
||||||
|
|
@ -120,6 +119,10 @@ const props = defineProps({
|
||||||
roleAdmin: Boolean,
|
roleAdmin: Boolean,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const positionCandidateOptions = ref<optionData[]>(
|
||||||
|
props?.positionCandidateData || []
|
||||||
|
);
|
||||||
|
|
||||||
const pagination = ref({
|
const pagination = ref({
|
||||||
sortBy: "examNumber",
|
sortBy: "examNumber",
|
||||||
descending: false,
|
descending: false,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue