diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue index 933eb49..a184492 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview.vue @@ -244,15 +244,10 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any, isSave: const curr: any = {}; 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.extendName = file.response?.ext || file.response.extendName; + curr.fileName = file.response?.originalFilename || file.response.fileName; + curr.fileSize = `${file.response?.size || file.response?.fileSize}`; + curr.fileUrl = file.response?.url || file.response?.fileUrl; curr.label = item.dictValue; curr.fileType = 11; @@ -311,6 +306,7 @@ onMounted(async () => { response: { ...curr, contentType: "image/png" } }); }); + console.info(files, "files", currFiles); item.files = files; }); diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue index 02cab1f..b9a87f7 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview2.vue @@ -224,15 +224,10 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any, isSave: const curr: any = {}; 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.extendName = file.response?.ext || file.response.extendName; + curr.fileName = file.response?.originalFilename || file.response.fileName; + curr.fileSize = `${file.response?.size || file.response?.fileSize}`; + curr.fileUrl = file.response?.url || file.response?.fileUrl; curr.label = item.dictValue; curr.fileType = 12; diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue index 100e05f..1e1990d 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview3.vue @@ -264,15 +264,10 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any, isSave: const curr: any = {}; 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.extendName = file.response?.ext || file.response.extendName; + curr.fileName = file.response?.originalFilename || file.response.fileName; + curr.fileSize = `${file.response?.size || file.response?.fileSize}`; + curr.fileUrl = file.response?.url || file.response?.fileUrl; curr.label = item.dictValue; curr.fileType = 13; diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue index b233d4e..0b5802e 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview4.vue @@ -185,15 +185,10 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any, isSave: const curr: any = {}; 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.extendName = file.response?.ext || file.response.extendName; + curr.fileName = file.response?.originalFilename || file.response.fileName; + curr.fileSize = `${file.response?.size || file.response?.fileSize}`; + curr.fileUrl = file.response?.url || file.response?.fileUrl; curr.label = item.dictValue; curr.fileType = 14; diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue index bfe3e0e..84a7a0a 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview5.vue @@ -213,15 +213,10 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any, isSave: const curr: any = {}; 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.extendName = file.response?.ext || file.response.extendName; + curr.fileName = file.response?.originalFilename || file.response.fileName; + curr.fileSize = `${file.response?.size || file.response?.fileSize}`; + curr.fileUrl = file.response?.url || file.response?.fileUrl; curr.label = item.dictValue; curr.fileType = 15; diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue index 8466741..d541864 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview6.vue @@ -210,15 +210,10 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any, isSave: const curr: any = {}; 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.extendName = file.response?.ext || file.response.extendName; + curr.fileName = file.response?.originalFilename || file.response.fileName; + curr.fileSize = `${file.response?.size || file.response?.fileSize}`; + curr.fileUrl = file.response?.url || file.response?.fileUrl; curr.label = item.dictValue; curr.fileType = 16; diff --git a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue index f46891a..02d3afa 100644 --- a/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue +++ b/src/views/goverment/huizhou/preProjectManagement/components/ProjectSupervisionDiv/overview7.vue @@ -194,15 +194,10 @@ const next = async (formEl: FormInstance | undefined, isTemporary?: any, isSave: const curr: any = {}; 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.extendName = file.response?.ext || file.response.extendName; + curr.fileName = file.response?.originalFilename || file.response.fileName; + curr.fileSize = `${file.response?.size || file.response?.fileSize}`; + curr.fileUrl = file.response?.url || file.response?.fileUrl; curr.label = item.dictValue; curr.fileType = 17;