Merge branch 'feature-purchase' into developer
This commit is contained in:
@@ -81,9 +81,14 @@ const fileTypeList: FileTypeItem[] = [
|
||||
{ value: '120', label: '采购需求表', desc: '采购需求明细表' },
|
||||
];
|
||||
|
||||
// 根据已上传文件类型过滤显示列表
|
||||
// 根据已上传文件类型过滤显示列表(排除履约验收110和采购文件130)
|
||||
const displayedFileTypes = computed(() => {
|
||||
return fileTypeList.filter((item) => uploadedFileTypes.value.includes(item.value));
|
||||
return fileTypeList.filter(
|
||||
(item) =>
|
||||
uploadedFileTypes.value.includes(item.value) &&
|
||||
item.value !== '110' &&
|
||||
item.value !== '130'
|
||||
);
|
||||
});
|
||||
|
||||
const open = async (id: string, no?: string) => {
|
||||
@@ -112,7 +117,7 @@ const open = async (id: string, no?: string) => {
|
||||
}
|
||||
fileMap[file.fileType].push({
|
||||
id: file.id,
|
||||
name: file.fileName,
|
||||
name: file.fileTitle || '附件',
|
||||
url: file.fileUrl,
|
||||
});
|
||||
}
|
||||
@@ -136,9 +141,11 @@ const handleSubmit = async () => {
|
||||
return;
|
||||
}
|
||||
|
||||
// 收集所有当前显示的文件ID
|
||||
// 收集所有当前显示的文件ID(排除履约验收110和采购文件130)
|
||||
const allFileIds: string[] = [];
|
||||
uploadedFileTypes.value.forEach((fileType) => {
|
||||
uploadedFileTypes.value
|
||||
.filter((ft) => ft !== '110' && ft !== '130')
|
||||
.forEach((fileType) => {
|
||||
const files = fileMap[fileType] || [];
|
||||
files.forEach((file) => {
|
||||
if (file.id) {
|
||||
|
||||
Reference in New Issue
Block a user