Merge branch '20220802-评标室预约情况' into 'release_electronic_bid_evaluation_room'

9.1 评标室预约情况

See merge request eshop/fe_service_ebtp_frontend!273

src/utils/DownloadUtils.ts

@@ -6,6 +6,7 @@
  */
 
 import { getDownloadSecretKey, getFilelist, getFilelistBySecond } from "@/services/download_";
+import { message } from "antd";
 import { isEmpty, isNotEmpty } from "./CommonUtils";
 
 /**
@@ -117,6 +118,8 @@ export const downloadFileObjectId = (objectId: string) => {
          getFilelist([objectId]).then(res => {
             if (res?.success && res?.data?.length > 0) {
                downloadFile({ uid: res?.data[res?.data?.length - 1].fileId });
+            } else {
+               message.info("文档中心错误或文件不存在");
             }
          })
       } else {
@@ -159,12 +162,12 @@ export async function getFileListByBid(objectId: string) {
    if (checkObjectId(objectId)) {//判断3.0 objectId
       return getFilelist([objectId]).then(res => {
          if (res?.success && res?.data?.length > 0) {
-            res?.data?.forEach(({ fileId, originalName }: any) => {
+            res?.data?.forEach(({ fileId, originalName, filePath }: any) => {
                result.push({
                   uid: fileId,
                   name: originalName,
                   status: 'done',
-                  url: 'javascript:void(0);',
+                  url: originalName.endsWith(".png") || originalName.endsWith(".jpg") || originalName.endsWith(".jpeg") ? pictureDisplayPath + '?filePath=' + filePath : 'javascript:void(0);',
                })
             });
             return result;

src/utils/ExtendUpload/index.tsx

@@ -137,6 +137,7 @@ const ExtendUpload: React.FC<ExtendUploadProps> = (props) => {
     <>
       <Spin spinning={spin}>
         <Upload
+          onPreview={downloadFile}
           {...uploadProps}
           key={"file" + returnValue}
           action={uploadAttachmentPath}
@@ -155,7 +156,6 @@ const ExtendUpload: React.FC<ExtendUploadProps> = (props) => {
           showUploadList={{
             removeIcon: <CloseSquareOutlined />,
           }}
-          onPreview={downloadFile}
           fileList={fileList}
         >
           {!uploadProps?.disabled ?