diff --git a/src/api/bulletin-mgmt.ts b/src/api/bulletin-mgmt.ts index aa054b9..580121c 100644 --- a/src/api/bulletin-mgmt.ts +++ b/src/api/bulletin-mgmt.ts @@ -26,7 +26,6 @@ export interface BulletinRecord extends BulletinCreateRecord { publishUserId: number; publishTime: string; closeUserId: number; - closeTime: string; attachments?: AttachmentRecord[]; } diff --git a/src/views/notification/bulletin/components/bulletin-edit.vue b/src/views/notification/bulletin/components/bulletin-edit.vue index 12fff9e..256c99f 100644 --- a/src/views/notification/bulletin/components/bulletin-edit.vue +++ b/src/views/notification/bulletin/components/bulletin-edit.vue @@ -64,7 +64,7 @@ > import useVisible from '@/hooks/visible'; import { computed, defineEmits, ref, shallowRef,onBeforeUnmount } from 'vue'; -import { BulletinRecord } from '@/api/bulletin-mgmt'; +import { BulletinRecord } from '@/api/bulletin-mgmt'; import { FormInstance } from '@arco-design/web-vue/es/form'; import { Message } from '@arco-design/web-vue'; import { useBulletinStore } from '@/store'; @@ -130,6 +130,7 @@ const formData = ref({ id: -1, title: '', top: false, + attachmentIds: [], content: '', remark: '', createTime: '', @@ -140,7 +141,6 @@ const formData = ref({ publishUserId: 0, publishTime: '', closeUserId: 0, - closeTime: '', attachments: [], }); @@ -188,6 +188,9 @@ const handleClick = () => { if(!props.isCreate){ bulletinStore.queryBulletinDetail(props.id).then((res: any) => { formData.value = res.data; + formData.value.attachmentIds = res.data.attachments?.map((item: any) => { + return item.id; + }); }) } }; @@ -243,7 +246,9 @@ const customRequest = async (option: any) => { const res = await bulletinStore.addAttachments(formDataFile); if (res.status === 200) { onSuccess(res.data); - formData.value.attachments?.push(res.data); + formData.value.attachmentIds?.push(res.data.id); + console.log(res.data.id); + console.log(formData.value); } else { onError(res.data); } @@ -251,7 +256,11 @@ const customRequest = async (option: any) => { // 删除附件 const beforeRemove = async (file: any) => { - const res = await bulletinStore.deleteAttachment(file.response.id); + if(!file.uid){ + const res = await bulletinStore.deleteAttachment(file.response.id); + return res.status === 200; + } + const res = await bulletinStore.deleteAttachment(file.uid); return res.status === 200; }