แก้โค้ดตาม issue

This commit is contained in:
STW_TTTY\stwtt 2024-07-09 10:39:49 +07:00
parent 3968d2b1a0
commit bb6afbb98e
12 changed files with 323 additions and 252 deletions

View file

@ -299,6 +299,8 @@ function deleteProductivitys(item: number) {
}
}
/** get ข้อมูล */
async function getUser() {
await http
@ -980,17 +982,18 @@ watch(knowledge.value, () => {
* @param update fn
*/
function filterFnCaretaker(val: string, update: any) {
const dataFilter = filtermantor(OPcaretaker.value, [caretaker2.value]).filter(
(i: any) => i.id !== chairman.value.id
);
if (val == "") {
update(() => {
optionCaretaker.value = filtermantor(OPcaretaker.value, [
caretaker2.value,
]);
optionCaretaker.value = dataFilter;
});
} else {
update(() => {
optionCaretaker.value = filtermantor(OPcaretaker.value, [
caretaker2.value,
]).filter((e: any) => e.name.search(val) !== -1);
optionCaretaker.value = dataFilter.filter(
(e: any) => e.name.search(val) !== -1
);
});
}
}
@ -1002,17 +1005,18 @@ function filterFnCaretaker(val: string, update: any) {
*/
function filterFnCaretaker2(val: string, update: any) {
const dataFilter = filtermantor(OPcaretaker.value, [caretaker1.value]).filter(
(i: any) => i.id !== chairman.value.id
);
if (val == "") {
update(() => {
optionCaretaker2.value = filtermantor(OPcaretaker.value, [
caretaker1.value,
]);
optionCaretaker2.value = dataFilter;
});
} else {
update(() => {
optionCaretaker2.value = filtermantor(OPcaretaker.value, [
caretaker1.value,
]).filter((e: any) => e.name.search(val) !== -1);
optionCaretaker2.value = dataFilter.filter(
(e: any) => e.name.search(val) !== -1
);
});
}
}
@ -1024,13 +1028,16 @@ function filterFnCaretaker2(val: string, update: any) {
*/
function filterFnCommander(val: string, update: any) {
const dataFilter = OPcommander.value.filter(
(i: any) => i.id !== chairman.value.id
);
if (val == "") {
update(() => {
OPcommanderFn.value = OPcommander.value;
OPcommanderFn.value = dataFilter;
});
} else {
update(() => {
OPcommanderFn.value = OPcommander.value.filter(
OPcommanderFn.value = dataFilter.filter(
(e: any) => e.name.search(val) !== -1
);
});
@ -1044,13 +1051,19 @@ function filterFnCommander(val: string, update: any) {
*/
function filterFnChairman(val: string, update: any) {
const dataFilter = OPchairman.value.filter(
(i: any) =>
i.id !== caretaker1.value.id &&
i.id !== caretaker2.value.id &&
i.id !== commander.value.id
);
if (val == "") {
update(() => {
OPchairmanFn.value = OPchairman.value;
OPchairmanFn.value = dataFilter;
});
} else {
update(() => {
OPchairmanFn.value = OPchairman.value.filter(
OPchairmanFn.value = dataFilter.filter(
(e: any) => e.name.search(val) !== -1
);
});