Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/api/export.js

@@ -178,6 +178,15 @@ export function pMTrainingRecordList_Export(data) {
     data
   })
 }
+// 导出系统培训记录
+export function getSysDocumentConfirmList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getSysDocumentConfirmList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 // 导出影像指控
 export function qCVisitList_Export(data) {
   return requestDownload({

src/views/trials/trials-panel/attachments/attachment-management/index.vue

@@ -41,7 +41,8 @@
         <!-- 签署人 -->
         <el-form-item :label="$t('trials:signRecords:table:user')" v-if="!isDoc">
           <el-select v-model="searchData.UserId" clearable filterable style="width: 140px">
-            <el-option v-for="item of userOptions" :key="item.ConfirmUserId" :label="item.FullName" :value="item.ConfirmUserId">
+            <el-option v-for="item of userOptions" :key="item.ConfirmUserId" :label="item.FullName"
+              :value="item.ConfirmUserId">
               <span style="float: left">{{ item.RealName || item.FullName }}</span>
               <span style="
                   float: right;
@@ -227,7 +228,7 @@ import {
   getSysDocumentConfirmList,
   getSysDocSignUserList
 } from '@/api/trials'
-import { pMTrainingRecordList_Export } from '@/api/export'
+import { pMTrainingRecordList_Export, getSysDocumentConfirmList_Export } from '@/api/export'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import PreviewFile from '@/components/PreviewFile/index'
@@ -324,6 +325,15 @@ export default {
     },
     handleExport() {
       this.exportLoading = true
+      if (this.isSystem) {
+        return getSysDocumentConfirmList_Export(this.searchData)
+          .then(() => {
+            this.exportLoading = false
+          })
+          .catch((err) => {
+            this.exportLoading = false
+          })
+      }
       pMTrainingRecordList_Export(this.searchData)
         .then(() => {
           this.exportLoading = false

src/views/trials/trials-workbench/components/auditDocument/index.vue

@@ -381,19 +381,21 @@ export default {
         async downLoad(list, row = {}) {
             if (!this.isManage) return false
             try {
-                if (row.Id) {
+                if (row.Id && row.AuditDocumentTypeEnum) {
+                    let name = row.Name.split('.')[1] ? row.Name : `${row.Name}.${row.FileFormat}`
                     return await downLoadFile(
                         this.OSSclientConfig.basePath + row.FilePath,
-                        row.Name
+                        name
                     )
                 }
                 let arr = this.filterExternalIds(this.tableData, list)
                 if (arr && arr.length === 1) {
                     let data = this.getData(this.tableData, arr[0])
                     if (data.AuditDocumentTypeEnum) {
+                        let name = data.Name.split('.')[1] ? data.Name : `${data.Name}.${data.FileFormat}`
                         return await downLoadFile(
                             this.OSSclientConfig.basePath + data.FilePath,
-                            data.Name
+                            name
                         )
                     } else {
                         let dataArray = this.getDataPath([data])