From eedbd2699c160441ca071015cb0ac0d1decb490f Mon Sep 17 00:00:00 2001 From: Net Date: Fri, 20 Sep 2024 09:22:18 +0700 Subject: [PATCH] refactor: edit get file to menu --- src/pages/03_customer-management/MainPage.vue | 79 ++++++++----------- 1 file changed, 33 insertions(+), 46 deletions(-) diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue index b6a3f5a1..a7392dbd 100644 --- a/src/pages/03_customer-management/MainPage.vue +++ b/src/pages/03_customer-management/MainPage.vue @@ -2536,7 +2536,6 @@ const emptyCreateDialog = ref(false); v-model:current-id="currentFromDataEmployee.id" v-model="currentFromDataEmployee.file" hide-action - v-model:current-selected-menu="currentSelectedMenu" :group-list="uploadFileListEmployee" :menu="uploadFileListEmployee" :columns="columnsAttachment" @@ -2607,34 +2606,26 @@ const emptyCreateDialog = ref(false); :get-file-list=" async (group: 'passport' | 'visa') => { if (!!currentFromDataEmployee.id) { - const res = await employeeStore.listFile({ - parentId: currentFromDataEmployee.id, - group, - }); const resMeta = await employeeStore.getMetaList({ parentId: currentFromDataEmployee.id, group, }); - if (Array.isArray(res)) { - const tempValue = res.map(async (item, index) => { - return { - _meta: { ...resMeta[index] }, - name: item || '', - group: group, - url: await employeeStore.getFile({ - parentId: currentFromDataEmployee.id || '', - group, - fileId: resMeta[index].id, - }), - file: undefined, - }; - }); + const tempValue = resMeta.map(async (i: any) => { + return { + _meta: { ...i }, + name: i.id || '', + group: group, + url: await employeeStore.getFile({ + parentId: currentFromDataEmployee.id || '', + group, + fileId: i.id, + }), + file: undefined, + }; + }); - return await waitAll(tempValue); - } - - return []; + return await waitAll(tempValue); } return []; } @@ -3771,7 +3762,11 @@ const emptyCreateDialog = ref(false); _meta: any, file: File | undefined, ) => { - if (file !== undefined && currentFromDataEmployee.id) { + if ( + file !== undefined && + currentFromDataEmployee.id && + !_meta.hasOwnProperty('id') + ) { const res = await employeeStore.postMeta({ parentId: currentFromDataEmployee.id || '', group, @@ -3808,34 +3803,26 @@ const emptyCreateDialog = ref(false); :get-file-list=" async (group: 'passport' | 'visa') => { if (!!currentFromDataEmployee.id) { - const res = await employeeStore.listFile({ - parentId: currentFromDataEmployee.id, - group, - }); const resMeta = await employeeStore.getMetaList({ parentId: currentFromDataEmployee.id, group, }); - if (Array.isArray(res)) { - const tempValue = res.map(async (item, index) => { - return { - _meta: { ...resMeta[index] }, - name: item || '', - group: group, - url: await employeeStore.getFile({ - parentId: currentFromDataEmployee.id || '', - group, - fileId: resMeta[index].id, - }), - file: undefined, - }; - }); + const tempValue = resMeta.map(async (i: any) => { + return { + _meta: { ...i }, + name: i.id || '', + group: group, + url: await employeeStore.getFile({ + parentId: currentFromDataEmployee.id || '', + group, + fileId: i.id, + }), + file: undefined, + }; + }); - return await waitAll(tempValue); - } - - return []; + return await waitAll(tempValue); } return []; }