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-22 11:26:47 +08:00
parent 280d66f677 fcacd6fc1c
commit dc081f7cea
2 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -259,23 +259,28 @@ export default defineComponent({
};
const onConfirm = async () => {
const hasUploading = uploadData.value.some((item) => item.uploadStatus === EnumUploadStatus.uploading);
if (hasUploading) {
modalRef.value = Modal.warning({
title: '上传未完成',
content: <p>当前原料正在上传中，关闭弹窗将导致上传失败，请等待上传完成后再点击“确定”</p>,
okText: '我知道了',
centered: true,
});
return;
}
try {
submitLoading.value = true;
const hasUploading = uploadData.value.some((item) => item.uploadStatus === EnumUploadStatus.uploading);
if (hasUploading) {
modalRef.value = Modal.warning({
title: '上传未完成',
content: <p>当前原料正在上传中，关闭弹窗将导致上传失败，请等待上传完成后再点击“确定”</p>,
okText: '我知道了',
centered: true,
});
return;
}
const raw_materials = uploadData.value.filter((item) => item.uploadStatus !== EnumUploadStatus.error);
const { code } = await postBatchRawMaterial({ raw_materials });
if (code === 200) {
message.success('上传成功');
emit('update');
onClose();
const raw_materials = uploadData.value.filter((item) => item.uploadStatus !== EnumUploadStatus.error);
const { code } = await postBatchRawMaterial({ raw_materials });
if (code === 200) {
message.success('上传成功');
emit('update');
onClose();
}
} finally {
submitLoading.value = false;
}
};
const openDeleteModal = (file) => {

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

@ -6,7 +6,7 @@
</div>
<template #footer>
<Button size="medium" @click="onClose">取消</Button>
<Button type="primary" class="ml-16px" danger size="medium" @click="onDelete">确认删除</Button>
<Button :loading="loading" class="ml-16px" danger size="medium" type="primary" @click="onDelete">确认删除</Button>
</template>
</Modal>
</template>
@ -24,12 +24,14 @@ const emits = defineEmits(['update', 'batchUpdate']);
const visible = ref(false);
const fileId = ref(null);
const fileName = ref('');
const loading = ref(false);
const isBatch = computed(() => Array.isArray(fileId.value));
function onClose() {
visible.value = false;
fileId.value = null;
loading.value = false;
fileName.value = '';
}
@ -42,14 +44,19 @@ const open = (record) => {
};
async function onDelete() {
const _fn = isBatch.value ? batchDeleteRawMaterials : deleteRawMaterial;
const _params = isBatch.value ? { ids: fileId.value } : fileId.value;
const { code } = await _fn(_params);
if (code === 200) {
message.success('删除成功');
isBatch.value ? emits('batchUpdate') : emits('update');
try {
loading.value = true;
const _fn = isBatch.value ? batchDeleteRawMaterials : deleteRawMaterial;
const _params = isBatch.value ? { ids: fileId.value } : fileId.value;
const { code } = await _fn(_params);
if (code === 200) {
message.success('删除成功');
isBatch.value ? emits('batchUpdate') : emits('update');
onClose();
onClose();
}
} finally {
loading.value = false;
}
}