diff --git a/src/components/FilesUpload/FilesUpload.vue b/src/components/FilesUpload/FilesUpload.vue index 540b774..f1b96cb 100644 --- a/src/components/FilesUpload/FilesUpload.vue +++ b/src/components/FilesUpload/FilesUpload.vue @@ -30,14 +30,20 @@

- + + + 温馨提示:将文件添加到上传队列, 然后点击“开始上传”按钮。

- + + + 文件大小错误: 文件大小不超过 {{ calculateFileSize(maxTotalFileSize!) }}

- + + +
@@ -55,9 +61,16 @@ @@ -73,9 +86,15 @@

{{ calculateFileSize(file.size) }}

- - - + + + + + + + + + @@ -84,7 +103,12 @@
{{ !fileList.length ? "未选择" : calculateFileSize(totalFileSize) }} -
+
@@ -305,11 +329,18 @@ const selectFile = (e: Event) => { * @description 删除指定文件对象 * @param row 文件对象 */ -const remove = (row: UploadFile) => { +const remove = (row: UploadFile, type?: number) => { if (isUploading.value) return ElMessage.warning("上传中, 请不要执行任何操作"); const i = fileList.value.indexOf(row); + if (type == 1) { + const findIndex = successList.value.findIndex(item => item.id === row.id); + if (findIndex > -1) { + successList.value.splice(findIndex, 1); + } + } + if (i >= 0) { fileList.value.splice(i, 1); @@ -367,7 +398,11 @@ const handlerUpload = () => { controllerList.value.push(controller); - upload(data, { signal: controller.signal, onUploadProgress, headers: { noLoading: true } }) + upload(data, { + signal: controller.signal, + onUploadProgress, + headers: { noLoading: true } + }) .then(res => { if (res.code == "200") { file.response = res.result; diff --git a/src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue b/src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue index c92c357..c6a49a4 100644 --- a/src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue +++ b/src/views/goverment/huizhou/assessmentManagement/unitScore/components/scoreTableNew.vue @@ -95,10 +95,10 @@
- - + +
diff --git a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/annex.vue b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/annex.vue index ffe3780..8fec5b3 100644 --- a/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/annex.vue +++ b/src/views/goverment/huizhou/projectList/components/ProjectSupervisionDiv/annex.vue @@ -70,32 +70,52 @@ const handlechange = e => { const handleSubmit = (isTemporary?: any) => { const fileList: AnnexFile[] = []; - + console.log(annexFiles.value, 888999); annexFiles.value.forEach(item => { const files = item.files; - files.forEach(file => { - const curr: AnnexFile = {}; + files.forEach((file: any) => { + if (file.response.fileId) { + const curr: AnnexFile = {}; - curr.createTime = file.response?.createTime; - curr.extendName = file.response?.ext; + curr.createTime = file.response?.createTime; + curr.extendName = file.response?.extendName; - // TODO: 上传文件后, 后端返回两个 name 字段, 一个后端存储的 filename, 一个文件本身的 originalFilename - curr.fileName = file.response?.originalFilename; - // curr.fileName = file.response?.filename; + // TODO: 上传文件后, 后端返回两个 name 字段, 一个后端存储的 filename, 一个文件本身的 originalFilename + curr.fileName = file.response?.fileName; + // curr.fileName = file.response?.filename; - // curr.fileId = file.response && +file.response.id; - curr.fileSize = `${file.response?.size || ""}`; - curr.fileUrl = file.response?.url; + // curr.fileId = file.response && +file.response.id; + curr.fileSize = `${file.response?.fileSize || ""}`; + curr.fileUrl = file.response?.fileUrl; - curr.label = file.label; + curr.label = file.response?.label; - fileList.push(curr); + fileList.push(curr); + } else { + const curr: AnnexFile = {}; + + curr.createTime = file.response?.createTime; + curr.extendName = file.response?.ext; + + // TODO: 上传文件后, 后端返回两个 name 字段, 一个后端存储的 filename, 一个文件本身的 originalFilename + curr.fileName = file.response?.originalFilename; + // curr.fileName = file.response?.filename; + + // curr.fileId = file.response && +file.response.id; + curr.fileSize = `${file.response?.size || ""}`; + curr.fileUrl = file.response?.url; + + curr.label = file.label; + + fileList.push(curr); + } }); item.files = files; }); - + console.log(fileList, 888999); + // return; emit("next", { annexFiles: fileList }, isTemporary); };