renxiaodong/lingji-work-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature/0915_素材中心新增手动上传' into test

Browse Source
This commit is contained in:
rd
2025-09-19 10:35:40 +08:00
parent 32d83fe8a5 51edc75c65
commit 892234762d
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/material-center/components/raw-material/components/add-raw-material-drawer/index.vue
View File

@ -269,7 +269,9 @@ export default defineComponent({
}); });
return; return;
} }
const { code, data } = await postBatchRawMaterial({ raw_materials: uploadData.value });
const raw_materials = uploadData.value.filter((item) => item.uploadStatus !== EnumUploadStatus.error);
const { code } = await postBatchRawMaterial({ raw_materials });
if (code === 200) { if (code === 200) {
message.success('上传成功'); message.success('上传成功');
emit('update'); emit('update');
@ -493,7 +495,6 @@ export default defineComponent({
multiple multiple
customRequest={handleUpload} customRequest={handleUpload}
class="w-full mb-16px" class="w-full mb-16px"
accept={[...imageExtensions, ...videoExtensions, ...documentExtensions].join(',')}
showUploadList={false} showUploadList={false}
> >
<div <div

4
src/views/material-center/components/raw-material/components/table/delete-file-modal.vue
View File

@ -17,7 +17,9 @@ import { Button, Modal, message } from 'ant-design-vue';
import { deleteRawMaterial, batchDeleteRawMaterials } from '@/api/all/generationWorkshop'; import { deleteRawMaterial, batchDeleteRawMaterials } from '@/api/all/generationWorkshop';
import icon1 from '@/assets/img/media-account/icon-warn-1.png'; import icon1 from '@/assets/img/media-account/icon-warn-1.png';
const update = inject('update'); // const update = inject('update');
const emits = defineEmits(['update', 'batchUpdate']);
const visible = ref(false); const visible = ref(false);
const fileId = ref(null); const fileId = ref(null);

2
src/views/material-center/components/raw-material/components/table/index.vue
View File

@ -94,7 +94,7 @@ import { ref, computed } from 'vue';
import { Button, Tooltip, Table, Tag } from 'ant-design-vue'; import { Button, Tooltip, Table, Tag } from 'ant-design-vue';
const { Column } = Table; const { Column } = Table;
import { formatTableField, exactFormatTime, formatFileSize, downloadByUrl } from '@/utils/tools'; import { formatTableField, exactFormatTime, formatFileSize, downloadByUrl } from '@/utils/tools';
import { slsWithCatch } from '@/utils/stroage.ts'; // import { slsWithCatch } from '@/utils/stroage.ts';
import { TABS_LIST, ORIGIN_LIST, RawMaterialType } from '../../constants'; import { TABS_LIST, ORIGIN_LIST, RawMaterialType } from '../../constants';
import TextOverTips from '@/components/text-over-tips'; import TextOverTips from '@/components/text-over-tips';