From 02a5b30a55b3690d223455c88032683442a2c3b7 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Tue, 8 Apr 2025 17:36:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96/=E6=96=87=E4=BB=B6=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/fileIcon/OFD.png            | Bin 0 -> 6064 bytes
 src/assets/styles/yxk-admin.scss              |   4 +
 .../AIAssistant/AIKeywords/index copy.vue     |   3 +
 .../module/uploadFile/index.vue               |   7 +-
 .../managementLibrary/file/index.vue          |   7 +-
 .../module/uploadFile/index.vue               |   7 +-
 .../batchConnection/module/form.vue           |  10 +-
 .../collectionLibrary/file/index.vue          |   7 +-
 .../module/collectHeader.vue                  |  11 +-
 .../module/uploadFile/index.vue               |   7 +-
 .../module/uploadOriginal/bigUpload.vue       | 164 +++++++++++++-----
 .../archivesDetail/uploadFile/index.vue       |   7 +-
 src/views/components/category/PreviewForm.vue |  89 ++++++----
 src/views/prearchiveLibrary/index.vue         |   2 +-
 .../prearchiveLibrary/module/batchFile.vue    |  25 ++-
 src/views/prearchiveLibrary/module/detail.vue |   7 +-
 src/views/preview/index.vue                   |   2 +-
 .../archiveScopeManage/module/tableList.vue   |  17 +-
 18 files changed, 271 insertions(+), 105 deletions(-)
 create mode 100644 src/assets/images/fileIcon/OFD.png

diff --git a/src/assets/images/fileIcon/OFD.png b/src/assets/images/fileIcon/OFD.png
new file mode 100644
index 0000000000000000000000000000000000000000..6ae00717b4b73c4949397a12545a1918e44f66ff
GIT binary patch
literal 6064
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

literal 0
HcmV?d00001

diff --git a/src/assets/styles/yxk-admin.scss b/src/assets/styles/yxk-admin.scss
index 7c8f943..e37e146 100644
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@@ -2061,6 +2061,10 @@ input[type ='number'] {
     background: url("~@/assets/images/fileIcon/txt.png") no-repeat;
     background-size: 100% 100%;
   }
+  &.icon-ofd{
+    background: url("~@/assets/images/fileIcon/OFD.png") no-repeat;
+    background-size: 100% 100%;
+  }
   &.icon-other{
     background: url("~@/assets/images/fileIcon/attachment.png") no-repeat;
     background-size: 100% 100%;
diff --git a/src/views/AIAssistant/AIKeywords/index copy.vue b/src/views/AIAssistant/AIKeywords/index copy.vue
index d67690f..b6a2706 100644
--- a/src/views/AIAssistant/AIKeywords/index copy.vue	
+++ b/src/views/AIAssistant/AIKeywords/index copy.vue	
@@ -74,6 +74,9 @@
                     <div v-else-if="scope.row.file_type === 'txt'">
                       <i class="fileIcon icon-txt" />
                     </div>
+                    <div v-else-if="scope.row.file_type === 'ofd'">
+                      <i class="fileIcon icon-ofd" />
+                    </div>
                     <div v-else>
                       <i class="fileIcon icon-other" />
                     </div>
diff --git a/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue b/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue
index 5135fe9..0fb0d64 100644
--- a/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue
+++ b/src/views/archiveKeeping/inStorage/pendingInArchive/module/uploadFile/index.vue
@@ -23,7 +23,7 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" />
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
-      <el-table-column prop="file_size" label="大小" min-width="85" align="center">
+      <el-table-column prop="file_size" label="大小" min-width="85" align="right">
         <template slot-scope="scope">
           {{ getFileSize(scope.row.file_size) }}
         </template>
@@ -57,6 +57,9 @@
           <div v-else-if="scope.row.file_type === 'txt'">
             <i class="fileIcon icon-txt" />
           </div>
+          <div v-else-if="scope.row.file_type === 'ofd'">
+            <i class="fileIcon icon-ofd" />
+          </div>
           <div v-else>
             <i class="fileIcon icon-other" />
           </div>
@@ -162,7 +165,7 @@ export default {
   },
   methods: {
     getFileSize(fileSize) {
-      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + ' KB'
       const fileSizeInB = fileSize + 'B'
       return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
     },
diff --git a/src/views/archivesManage/managementLibrary/file/index.vue b/src/views/archivesManage/managementLibrary/file/index.vue
index 6476f8e..aa3ae9f 100644
--- a/src/views/archivesManage/managementLibrary/file/index.vue
+++ b/src/views/archivesManage/managementLibrary/file/index.vue
@@ -38,7 +38,7 @@
           <!-- <el-table-column type="index" label="序号" width="55" align="center" /> -->
           <el-table-column prop="file_name" label="原文名称" show-overflow-tooltip min-width="140" />
           <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
-          <el-table-column prop="file_size" label="大小" min-width="85" align="center">
+          <el-table-column prop="file_size" label="大小" min-width="85" align="right">
             <template slot-scope="scope">
               {{ getFileSize(scope.row.file_size) }}
             </template>
@@ -72,6 +72,9 @@
               <div v-else-if="scope.row.file_type === 'txt'">
                 <i class="fileIcon icon-txt" />
               </div>
+              <div v-else-if="scope.row.file_type === 'ofd'">
+                <i class="fileIcon icon-ofd" />
+              </div>
               <div v-else>
                 <i class="fileIcon icon-other" />
               </div>
@@ -155,7 +158,7 @@ export default {
   },
   methods: {
     getFileSize(fileSize) {
-      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + ' KB'
       const fileSizeInB = fileSize + 'B'
       return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
     },
diff --git a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
index af402c7..2bd488d 100644
--- a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
@@ -17,7 +17,7 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" />
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
-      <el-table-column prop="file_size" label="大小" min-width="85" align="center">
+      <el-table-column prop="file_size" label="大小" min-width="85" align="right">
         <template slot-scope="scope">
           {{ getFileSize(scope.row.file_size) }}
         </template>
@@ -45,6 +45,9 @@
           <div v-else-if="scope.row.file_type === 'txt'">
             <i class="fileIcon icon-txt" />
           </div>
+          <div v-else-if="scope.row.file_type === 'ofd'">
+            <i class="fileIcon icon-ofd" />
+          </div>
           <div v-else>
             <i class="fileIcon icon-other" />
           </div>
@@ -131,7 +134,7 @@ export default {
       localStorage.setItem('fileCurrent', JSON.stringify(row))
     },
     getFileSize(fileSize) {
-      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + ' KB'
       const fileSizeInB = fileSize + 'B'
       return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
     },
diff --git a/src/views/collectReorganizi/batchConnection/module/form.vue b/src/views/collectReorganizi/batchConnection/module/form.vue
index 84924d1..626d512 100644
--- a/src/views/collectReorganizi/batchConnection/module/form.vue
+++ b/src/views/collectReorganizi/batchConnection/module/form.vue
@@ -127,9 +127,9 @@ export default {
       hitchRemarkArray: [],
       connectionType: 0,
       form: {
-        checkRepeatType: null,
+        checkRepeatType: 1,
         hitchFiled: null,
-        matchingMode: 1,
+        matchingMode: 2,
         fields: null,
         file: null,
         protocol: null,
@@ -328,6 +328,12 @@ export default {
           json.value = item.fieldName
           return json
         })
+        // 查找档号（archive_no）选项并设置为默认值
+        const archiveNoOption = this.fieldOptions.find(item => item.value === 'archive_no')
+        if (archiveNoOption) {
+          this.form.hitchFiled = archiveNoOption.value
+          this.selectFiled(archiveNoOption.value)
+        }
       })
     },
     selectFiled(val) {
diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue
index 40a7446..a000ee4 100644
--- a/src/views/collectReorganizi/collectionLibrary/file/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue
@@ -37,7 +37,7 @@
           <!-- <el-table-column type="index" label="序号" width="55" align="center" /> -->
           <el-table-column prop="file_name" label="原文名称" show-overflow-tooltip min-width="140" />
           <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
-          <el-table-column prop="file_size" label="大小" min-width="85" align="center">
+          <el-table-column prop="file_size" label="大小" min-width="85" align="right">
             <template slot-scope="scope">
               {{ getFileSize(scope.row.file_size) }}
             </template>
@@ -72,6 +72,9 @@
               <div v-else-if="scope.row.file_type === 'txt'">
                 <i class="fileIcon icon-txt" />
               </div>
+              <div v-else-if="scope.row.file_type === 'ofd'">
+                <i class="fileIcon icon-ofd" />
+              </div>
               <div v-else>
                 <i class="fileIcon icon-other" />
               </div>
@@ -164,7 +167,7 @@ export default {
   },
   methods: {
     getFileSize(fileSize) {
-      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + ' KB'
       const fileSizeInB = fileSize + 'B'
       return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
     },
diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
index 23f9091..6e659de 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
@@ -72,8 +72,8 @@
             </el-menu-item-group>
             <el-menu-item-group v-if="(isTitleType === 3 && selectedCategory.arrangeType === 1) || isTitleType === 4 || isTitleType === 6 || (isTitleType === 3 && activeIndex === 1)" class="collect-submenu-group submenu-tree">
               <template slot="title">原文上传</template>
-              <el-menu-item index="1-5" @click="fileUpload(0)">普通上传</el-menu-item>
-              <el-menu-item index="1-6" @click="fileUpload(1)">大文件上传</el-menu-item>
+              <!-- <el-menu-item index="1-5" @click="fileUpload(0)">普通上传</el-menu-item> -->
+              <el-menu-item index="1-6" @click="fileUpload(1)">文件上传</el-menu-item>
             </el-menu-item-group>
           </el-submenu>
           <el-submenu v-if="isTitleType !== 6" index="2">
@@ -290,8 +290,8 @@
       <!--档案号重复得list-->
       <el-dialog title="档号重复" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="repeatVisible" :before-close="handleRepeatClose">
         <div class="setting-dialog">
-          <div v-if="repeatResponseData.delcount === 0" class="double-click-btn" style="position: static;  margin: -10px 0 10px 0;"><i class="iconfont icon-zhuyi-lan" /><span>建议修改当前输入的档号！</span></div>
-          <div v-else class="double-click-btn" style="position: static;  margin: -10px 0 10px 0;"><i class="iconfont icon-zhuyi-lan" /><span>建议删除回收站相关数据 或者 修改当前输入的档号！</span></div>
+          <div v-if="repeatResponseData.delcount === 0" class="double-click-btn" style="position: static;  margin: -10px 0 10px 0;"><i style="color: #ff4949;" class="iconfont icon-zhuyi-lan" /><span style="color: #ff4949; font-weight: bold;">因档号重复，当前操作无法保存！</span><span>（建议修改当前输入的档号）</span></div>
+          <div v-else class="double-click-btn" style="position: static;  margin: -10px 0 10px 0;"><i style="color: #ff4949;" class="iconfont icon-zhuyi-lan" /><span style="color: #ff4949; font-weight: bold;">因档号重复，当前操作无法保存！</span><span>（建议删除回收站相关数据 或者 修改当前输入的档号！）</span></div>
 
           <el-table
             ref="table"
@@ -692,7 +692,7 @@ export default {
             this.$nextTick(() => {
               this.$refs.previewForm.archivesType = 'edit'
               this.$refs.previewForm.addOrUpdateForm = data.echo
-              this.$refs.previewForm.FetchNoFormatField(this.selectedCategory.id)
+              // this.$refs.previewForm.FetchNoFormatField(this.selectedCategory.id)
             })
           })
         })
@@ -1017,6 +1017,7 @@ export default {
         this.$refs.uploadOriginalRef.uploadVisible = true
       } else if (uploadType === 1) {
         this.$refs.uploadBigRef.uploadBigVisible = true
+        this.$refs.uploadBigRef.fileList = []
       } else if (uploadType === 2) {
         this.$refs.uploadOriginalRef.uploadTitle = '原文目录上传'
         this.$refs.uploadOriginalRef.uploadVisible = true
diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
index 25b6044..b71debf 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
@@ -23,7 +23,7 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" />
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
-      <el-table-column prop="file_size" label="大小" min-width="85" align="center">
+      <el-table-column prop="file_size" label="大小" min-width="85" align="right">
         <template slot-scope="scope">
           {{ getFileSize(scope.row.file_size) }}
         </template>
@@ -57,6 +57,9 @@
           <div v-else-if="scope.row.file_type === 'txt'">
             <i class="fileIcon icon-txt" />
           </div>
+          <div v-else-if="scope.row.file_type === 'ofd'">
+            <i class="fileIcon icon-ofd" />
+          </div>
           <div v-else>
             <i class="fileIcon icon-other" />
           </div>
@@ -185,7 +188,7 @@ export default {
   },
   methods: {
     getFileSize(fileSize) {
-      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + ' KB'
       const fileSizeInB = fileSize + 'B'
       return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
     },
diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/bigUpload.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/bigUpload.vue
index 9d1b5d0..ec21f62 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/bigUpload.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/uploadOriginal/bigUpload.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <!--上传组件-->
-    <el-dialog class="big-file" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="uploadBigVisible">
+    <el-dialog class="big-file" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="uploadBigVisible" :before-close="handleCloseDialog">
       <template #title>
         {{ uploadTitle }}
         <span style="color: red;font-size: 12px; ">单个文件不可超过10GB</span>
@@ -21,31 +21,29 @@
             <uploader-unsupport />
             <uploader-drop>
               <p>将文件拖到此处，或点击上传</p>
-              <uploader-btn single>
+              <uploader-btn>
                 <slot>
                   <i class="iconfont icon-tianjiawenjian upload-icon" />
                 </slot>
               </uploader-btn>
               <div class="el-upload__tip">上传限制文件大小：最大10GB/个</div>
-            <!-- <uploader-btn :attrs="attrs">选择图片</uploader-btn>
-              <uploader-btn :directory="true">选择文件夹</uploader-btn> -->
             </uploader-drop>
-            <uploader-files />
-          <!-- <ul class="file-list">
-            <li
-              v-for="file in fileList"
-              :key="file.id"
-              class="file-item"
-              :class="`file-${file.id}`"
-            >
-              <uploader-file
-                ref="files"
-                :class="'file_' + file.id"
-                :file="file"
-                :list="true"
-              />
-            </li>
-          </ul> -->
+            <!-- <uploader-files /> -->
+            <uploader-list>
+              <!--通过slot-scope绑定文件实例-->
+              <div slot-scope="props" class="set-file">
+                <div v-for="(file,i) in props.fileList" :key="i">
+                  <uploader-file
+                    :list="true"
+                    :file="file"
+                    :class=" file.fileType.substring(0, file.fileType.indexOf('/')) === 'image' ? 'icon-image' : `icon-`+file.name.substring(
+                      file.name.lastIndexOf('.') + 1,
+                      file.name.length
+                    )"
+                  />
+                </div>
+              </div>
+            </uploader-list>
           </uploader>
         </div>
         <div slot="footer" class="dialog-footer">
@@ -98,7 +96,7 @@ export default {
   },
   data() {
     return {
-      uploadTitle: '大文件上传',
+      uploadTitle: '文件上传',
       btnLoading: false,
       uploadBigVisible: false,
       skip: false,
@@ -106,7 +104,7 @@ export default {
         target: null,
         // 开启服务端分片校验功能
         testChunks: true, // 是否分片
-        singleFile: true, // 单文件上传
+        singleFile: false, // 多文件上传
         uploadMethod: 'post', // 真正上传的时候使用的 HTTP 方法,默认 POST
         allowDuplicateUploads: false, // 上传过得文件不可以再上传
         parseTimeRemaining: function(timeRemaining, parsedTimeRemaining) {
@@ -190,12 +188,12 @@ export default {
       }
     },
     filesRemove(file, index) {
-      this.fileList = []
       const uploaderInstance = this.$refs.uploader.uploader
       const temp = uploaderInstance.fileList.findIndex(e => e.uniqueIdentifier === file.uniqueIdentifier)
       if (temp > -1) {
         uploaderInstance.fileList[temp].cancel() // 这句代码是删除所选上传文件的关键
       }
+      this.fileList = this.fileList.filter(f => f.uniqueIdentifier !== file.uniqueIdentifier)
     },
     handleUploadConfirm() {
       if (this.$refs.uploader.fileList.length === 0) {
@@ -203,21 +201,25 @@ export default {
         return false
       }
       this.nowDate = getCurrentTime()
-      this.$refs.uploader.fileList.map(async(item, index) => {
+      const jsonArrayToSend = []
+
+      // 使用 Promise.all 确保所有异步操作完成
+      Promise.all(this.$refs.uploader.fileList.map(async(item) => {
         const json = {}
         const jsonArray = []
         const jsonString = {}
+
         if (item.file.type.substring(0, item.file.type.indexOf('/')) === 'image') {
-          const fileBase64 = await this.getBase64(item)
+          const fileBase64 = await this.getBase64(item.file)
           const imgRes = await this.getImgPx(fileBase64)
           item.file.px = imgRes.width + 'px*' + imgRes.height + 'px'
         } else {
           item.file.px = ''
         }
+
         jsonString.file_name = item.file.name
         jsonString.file_size = item.file.size
         jsonString.file_type = item.file.name.substring(item.name.lastIndexOf('.') + 1, item.file.name.length)
-        // jsonString.file_path = res.data.data
         json.last_modified = item.file.lastModified
         jsonString.file_path = ''
         jsonString.sequence = null
@@ -232,23 +234,26 @@ export default {
         json.archivesId = this.arcId
         json.identifier = item.uniqueIdentifier
         json.filename = item.name
-        //  chunk.offset
         json.totalChunks = item.chunks.length - 1
         json.totalSize = item.size
         json.fileJsonString = JSON.stringify(jsonArray)
 
-        if (item.completed && this.submitted) {
+        jsonArrayToSend.push(json)
+      })).then(() => {
+        console.log('jsonArrayToSend', jsonArrayToSend)
+        if (this.$refs.uploader.fileList.every(item => item.completed) && this.submitted) {
           this.btnLoading = true
           this.submitted = false
-
-          axios.post(this.baseApi + '/api/collect/merge', json, { headers: {
-            'Authorization': getToken()
-          }}).then((res) => {
+          axios.post(this.baseApi + '/api/collect/merge', jsonArrayToSend, {
+            headers: {
+              'Authorization': getToken()
+            }
+          }).then((res) => {
             console.log(res)
             if (res.data.code === 200 && res.data.data !== '') {
-              this.$message({ message: '上传成功', type: 'success', offset: 8 })
+              this.$message({ message: '所有文件上传成功', type: 'success', offset: 8 })
             } else {
-              this.$message({ message: '上传失败', type: 'error', offset: 8 })
+              this.$message({ message: '部分或全部文件上传失败', type: 'error', offset: 8 })
             }
             this.$emit('close-dialog')
             this.uploadBigVisible = false
@@ -266,19 +271,19 @@ export default {
       })
     },
     onFileError(rootFile, file, message, chunk) {
-      this.$message({ message: '上传出错：' + message, type: 'error', offset: 8 })
+      this.$message({ message: `上传出错：${file.name} - ${message}`, type: 'error', offset: 8 })
     },
     handleRepeatFileCancel() {
       this.repeatFileVisible = false
       this.repeatFileData = []
       this.originFileData = []
       const uploaderInstance = this.$refs.uploader.uploader
-      uploaderInstance.fileList[0].cancel()
+      uploaderInstance.fileList.forEach(file => file.cancel())
     },
     handleRepeatFile(type) {
       if (type === 0) {
         // 直接上传
-        this.computeMD5(this.fileList[0])
+        this.fileList.forEach(file => this.computeMD5(file))
       } else {
         // 去重后上传
         const nonRepeatFileData = this.fileList.filter(file => !this.repeatFileData.some(repeatFile => repeatFile.name === file.name))
@@ -287,13 +292,17 @@ export default {
           this.handleRepeatFileCancel()
           this.handleCloseDialog()
         } else {
-          this.computeMD5(this.fileList)
+          // 更新上传组件的文件列表
+          // this.$refs.uploader.fileList
+          const uploaderInstance = this.$refs.uploader
+          uploaderInstance.fileList = uploaderInstance.fileList.filter(file => nonRepeatFileData.some(nonRepeatFile => nonRepeatFile.uniqueIdentifier === file.uniqueIdentifier))
+          this.$refs.uploader.files = this.$refs.uploader.files.filter(file => nonRepeatFileData.some(nonRepeatFile => nonRepeatFile.uniqueIdentifier === file.uniqueIdentifier))
+          nonRepeatFileData.forEach(file => this.computeMD5(file))
         }
       }
       this.repeatFileVisible = false
     },
     async filesAdded(file, fileList, event) {
-      this.fileList = []
       // 先获取原文件列表
       await this.getFileList()
 
@@ -395,9 +404,14 @@ export default {
     },
     handleCloseDialog(done) {
       this.uploadBigVisible = false
-      this.fileList = []
       const uploaderInstance = this.$refs.uploader.uploader
-      uploaderInstance.fileList[0].cancel()
+      console.log('uploaderInstance.fileList', uploaderInstance.fileList)
+      uploaderInstance.fileList.forEach(file => file.cancel())
+      uploaderInstance.fileList = []
+      uploaderInstance.files = []
+      this.fileList = []
+      this.$refs.uploader.files = []
+      this.$refs.uploader.fileList = []
     }
   }
 }
@@ -452,4 +466,72 @@ export default {
 .uploader-file[status="success"] .uploader-file-remove {
   display:block
 }
+::v-deep .uploader-list{
+  max-height: 344px;
+  overflow-y: scroll;
+  .uploader-file-size{
+    text-align: right !important;
+  }
+  .uploader-file-icon:before{
+    content: "";
+  }
+  .uploader-file-name{
+    text-align: left !important;
+  }
+  .uploader-file{
+    .uploader-file-icon:before{
+      background: url("~@/assets/images/fileIcon/attachment.png") no-repeat;
+      background-size: 100% 100%;
+    }
+    &.icon-image{
+      .uploader-file-icon:before{
+        background: url("~@/assets/images/fileIcon/image.png") no-repeat;
+        background-size: 100% 100%;
+      }
+    }
+    &.icon-excel,&.icon-xlsx,&.icon-xls{
+      .uploader-file-icon:before{
+      background: url("~@/assets/images/fileIcon/excel.png") no-repeat;
+      background-size: 100% 100%;
+    }
+    }
+    &.icon-pdf{
+      .uploader-file-icon:before{
+      background: url("~@/assets/images/fileIcon/pdf.png") no-repeat;
+      background-size: 100% 100%;
+    }
+    }
+    &.icon-ppt, &.icon-pptx{
+      .uploader-file-icon:before{
+      background: url("~@/assets/images/fileIcon/ppt.png") no-repeat;
+      background-size: 100% 100%;
+    }
+    }
+    &.icon-word,&.icon-docx,&.icon-doc{
+      .uploader-file-icon:before{
+        background: url("~@/assets/images/fileIcon/word.png") no-repeat;
+        background-size: 100% 100%;
+      }
+    }
+    &.icon-zip,&.icon-rar{
+      .uploader-file-icon:before{
+        background: url("~@/assets/images/fileIcon/zip.png") no-repeat;
+        background-size: 100% 100%;
+      }
+    }
+    &.icon-txt{
+      .uploader-file-icon:before{
+        background: url("~@/assets/images/fileIcon/txt.png") no-repeat;
+        background-size: 100% 100%;
+      }
+    }
+    &.icon-ofd{
+      .uploader-file-icon:before{
+        background: url("~@/assets/images/fileIcon/OFD.png") no-repeat;
+        background-size: 100% 100%;
+      }
+    }
+  }
+}
+
 </style>
diff --git a/src/views/components/archivesDetail/uploadFile/index.vue b/src/views/components/archivesDetail/uploadFile/index.vue
index e1f9eb5..59e3459 100644
--- a/src/views/components/archivesDetail/uploadFile/index.vue
+++ b/src/views/components/archivesDetail/uploadFile/index.vue
@@ -23,7 +23,7 @@
       <el-table-column type="index" label="序号" width="55" align="center" />
       <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" />
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
-      <el-table-column prop="file_size" label="大小" min-width="85" align="center">
+      <el-table-column prop="file_size" label="大小" min-width="85" align="right">
         <template slot-scope="scope">
           {{ getFileSize(scope.row.file_size) }}
         </template>
@@ -57,6 +57,9 @@
           <div v-else-if="scope.row.file_type === 'txt'">
             <i class="fileIcon icon-txt" />
           </div>
+          <div v-else-if="scope.row.file_type === 'ofd'">
+            <i class="fileIcon icon-ofd" />
+          </div>
           <div v-else>
             <i class="fileIcon icon-other" />
           </div>
@@ -226,7 +229,7 @@ export default {
       localStorage.setItem('fileCurrent', JSON.stringify(row))
     },
     getFileSize(fileSize) {
-      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + ' KB'
       const fileSizeInB = fileSize + 'B'
       return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
     },
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index 6eeeef1..b6184f1 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -76,17 +76,14 @@
       <el-row v-if="isDesFormType === 'prearchiveLibrary'" class="preview-form-bottom prearch-bottom">
         <el-col>
           <el-form-item label="电子原件" prop="fileOriginal" class="prearch-upload">
-            <!-- <el-input
-              v-model="addOrUpdateForm['fileOriginal']"
-              type="text"
-              style="width: 446px"
-            /> -->
-            <p :class="['input-style', fileOriginal === null ? 'error-box' :'']">{{ fileOriginal }}</p>
-            <span v-if="fileOriginal === null" class="error-tip">请上传原文</span>
-            <div class="upload-btn">
+            <!-- <p :class="['input-style', fileOriginal === null ? 'error-box' :'']">{{ fileOriginal }}</p> -->
+            <p class="input-style">{{ fileOriginal }}</p>
+            <!-- <span v-if="fileOriginal === null" class="error-tip">请上传原文</span> -->
+            <!-- <div class="upload-btn">
               <input id="upFile" type="file" name="upFile" @change="changeFile($event)">
               <el-button size="small" type="primary"><i class="iconfont icon-shangchuan" />上传</el-button>
-            </div>
+            </div> -->
+            <PreUpload :selected-document="selectedDocument" />
           </el-form-item>
         </el-col>
       </el-row>
@@ -157,11 +154,12 @@ import { FetchInitSearchFonds } from '@/api/archiveUtilize/archiveUtilize'
 import { FetchArchivesClassTree, FetchSonArchivesClass } from '@/api/system/archivesClass'
 import { parseTime, getCurrentTime } from '@/utils/index'
 import { reDocumentUpload } from '@/utils/upload'
+import PreUpload from './preUpload'
 import { mapGetters } from 'vuex'
 
 export default {
   name: 'PreviewForm',
-  components: { draggable, Treeselect },
+  components: { draggable, Treeselect, PreUpload },
   mixins: [crud()],
   inject: ['parentsData'],
   props: {
@@ -373,6 +371,7 @@ export default {
     },
     // 自动生成
     handleAuto() {
+      console.log('handleAuto')
       let string = ''
       const getAutoFiledVal = []
       this.autoMatic.forEach(async val => {
@@ -502,15 +501,18 @@ export default {
     },
     // 获取档号组成项
     FetchNoFormatField(categoryId) {
-      let categoryLevel
-      if (this.isDesFormType === 'mergeFile') {
-        categoryLevel = 3
-      } else {
-        categoryLevel = this.collectLevel
-      }
-      getNoFormatField({ categoryId: categoryId, categoryLevel: categoryLevel }).then(res => {
-        this.autoMatic = res
-        this.handleAuto()
+      return new Promise((resolve) => {
+        let categoryLevel
+        if (this.isDesFormType === 'mergeFile') {
+          categoryLevel = 3
+        } else {
+          categoryLevel = this.collectLevel
+        }
+        getNoFormatField({ categoryId: categoryId, categoryLevel: categoryLevel }).then(res => {
+          this.autoMatic = res
+          this.handleAuto()
+          resolve()
+        })
       })
     },
     // 获取对应字典子集数据
@@ -644,11 +646,21 @@ export default {
       }
       // && this.isDesFormType !== 'mergeFile'
       if (this.isDesFormType !== 'prearchiveLibrary') {
-        if (!item.isAutomatic) {
-          const index = this.autoMatic.findIndex(i => item.fieldName === i.fieldName)
-          if (index !== -1) {
-            this.handleAuto()
-          }
+        console.log('333')
+        console.log('item', item)
+        console.log('item.isAutomatic)', item.fieldName)
+        console.log('item.isAutomatic)', item.isAutomatic)
+
+        if (item.fieldName !== 'archive_no') {
+          // 修改这里，使用 async/await
+          this.FetchNoFormatField(this.selectedCategory.id).then(() => {
+            const index = this.autoMatic.findIndex(i => item.fieldName === i.fieldName)
+            console.log('index', index)
+            console.log(!item.isAutomatic && index !== -1)
+            if (!item.isAutomatic && index !== -1) {
+              this.handleAuto()
+            }
+          })
         }
       }
     },
@@ -689,6 +701,12 @@ export default {
       }
       // && this.isDesFormType !== 'mergeFile'
       if (this.isDesFormType !== 'prearchiveLibrary') {
+        console.log('111')
+        console.log('this.autoMatic', this.autoMatic)
+        console.log('this.treeCurrentFiled.fieldNam', this.treeCurrentFiled.fieldName)
+        if (this.archivesType === 'edit') {
+          this.FetchNoFormatField(this.selectedCategory.id)
+        }
         if (this.autoMatic) {
           const index = this.autoMatic.findIndex(i => this.treeCurrentFiled.fieldName === i.fieldName)
           if (index !== -1) {
@@ -724,6 +742,10 @@ export default {
 
       // && this.isDesFormType !== 'mergeFile'
       if (this.isDesFormType !== 'prearchiveLibrary') {
+        console.log('222')
+        if (this.archivesType === 'edit') {
+          this.FetchNoFormatField(this.selectedCategory.id)
+        }
         if (this.autoMatic) {
           const index = this.autoMatic.findIndex(i => this.currentFieldName === i.fieldName)
           if (index !== -1) {
@@ -1000,13 +1022,18 @@ export default {
       if (this.archivesType === 'add') {
         this.addOrUpdateForm.fonds_affiliation = this.selectedCategory.fondsId
       }
-      delete this.addOrUpdateForm.id
+
+      console.log('this.addOrUpdateForm', this.addOrUpdateForm)
+      console.log('this.addOrUpdateForm.archive_no', this.addOrUpdateForm.archive_no)
+
       this.$refs[formName].validate((valid, fields) => {
         if (valid) {
+          delete this.addOrUpdateForm.id
           this.$emit('formLoadingShow', true)
           // 预归档库
           if (this.isDesFormType === 'prearchiveLibrary') {
             if (this.fileOriginal === null) {
+              this.$emit('formLoadingShow', false)
               return false
             }
             // delete this.addOrUpdateForm.fileOriginal
@@ -1127,7 +1154,7 @@ export default {
               collectEdit(params).then(res => {
                 console.log('res-collectEdit', res)
                 if (res.code !== 500) {
-                  this.$message({ message: res.message, type: 'success', offset: 8 })
+                  this.$message({ message: res, type: 'success', offset: 8 })
                   this.$emit('close-dialog', parentsId)
                 } else {
                   this.$message({ message: res.message, type: 'error', offset: 8 })
@@ -1347,10 +1374,10 @@ export default {
 
 }
 .prearch-bottom{
-  position: fixed;
-  bottom: 72px;
-  left: 0;
-  background: #fff;
+  // position: fixed;
+  // bottom: 72px;
+  // left: 0;
+  // background: #fff;
   width: 100%;
   padding: 20px 0 0 20px;
 }
@@ -1375,7 +1402,7 @@ export default {
     display: flex;
     justify-content: space-between;
     .input-style{
-      width: 500px;
+      width: 539px;
       height: 34px;
       line-height: 34px;
       padding: 0 20px;
diff --git a/src/views/prearchiveLibrary/index.vue b/src/views/prearchiveLibrary/index.vue
index ca58535..9d61603 100644
--- a/src/views/prearchiveLibrary/index.vue
+++ b/src/views/prearchiveLibrary/index.vue
@@ -442,6 +442,6 @@ export default {
 
 <style lang='scss' scoped>
 .preview-dialog .el-dialog .preview-content {
-  height: calc(100vh - 290px) !important;
+  // height: calc(100vh - 290px) !important;
 }
 </style>
diff --git a/src/views/prearchiveLibrary/module/batchFile.vue b/src/views/prearchiveLibrary/module/batchFile.vue
index 6e49d9c..3546df4 100644
--- a/src/views/prearchiveLibrary/module/batchFile.vue
+++ b/src/views/prearchiveLibrary/module/batchFile.vue
@@ -293,7 +293,7 @@ export default {
           const indexRetention = res.findIndex(item => item.fieldName === 'retention')
           console.log('indexRetention', indexRetention)
           if (indexClass !== -1 && this.scopeSelection[0].archivesClass !== null) {
-            this.selectStatus.splice(indexClass, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].archivesClass.name, field: this.allCorrField[indexClass], isInput: this.allCorrField[indexClass].isInput })
+            this.selectStatus.splice(indexClass, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].archivesClass.code, field: this.allCorrField[indexClass], isInput: this.allCorrField[indexClass].isInput })
           }
           if (indexRetention !== -1 && this.scopeSelection[0].retention !== '') {
             this.selectStatus.splice(indexRetention, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].retention, field: this.allCorrField[indexRetention], isInput: this.allCorrField[indexRetention].isInput })
@@ -324,7 +324,7 @@ export default {
           const indexRetention = res.findIndex(item => item.categoryFieldId.fieldName === 'retention')
           console.log('indexRetention', indexRetention)
           if (indexClass !== -1 && this.scopeSelection[0].archivesClass !== null) {
-            this.selectStatus.splice(indexClass, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].archivesClass.name, field: this.allFieldData[indexClass].documentFieldId, isInput: this.allFieldData[indexClass].documentFieldId.isInput })
+            this.selectStatus.splice(indexClass, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].archivesClass.code, field: this.allFieldData[indexClass].documentFieldId, isInput: this.allFieldData[indexClass].documentFieldId.isInput })
           }
           if (indexRetention !== -1 && this.scopeSelection[0].retention !== '') {
             this.selectStatus.splice(indexRetention, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].retention, field: this.allFieldData[indexRetention].documentFieldId, isInput: this.allFieldData[indexRetention].documentFieldId.isInput })
@@ -387,6 +387,7 @@ export default {
     hanleScopeSelect(val, category) {
       if (val.length !== 0) {
         this.scopeSelection = val
+        console.log('val222', val)
         this.form.scope = '【' + val[0].scopeCode + '】' + val[0].scopeName
         if (category.arrangeType) {
           this.form.categoryId = category.id
@@ -436,7 +437,7 @@ export default {
             this.selectStatus.splice(index, 1, { mode: false, fiedType: this.selectStatus[index].fiedType, value: this.selectStatus[index].fiedType === 1 ? this.selectStatus[index].value : this.allCorrField[index].isDefaultValue, field: this.selectStatus[index].field, isInput: this.selectStatus[index].field.isInput })
             if (this.form.scope) {
               if (this.allCorrField[index].fieldName === 'archive_ctg_no' && this.scopeSelection[0].archivesClass !== null) {
-                this.selectStatus.splice(index, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].archivesClass.name, field: this.allCorrField[index], isInput: this.allCorrField[index].isInput })
+                this.selectStatus.splice(index, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].archivesClass.code, field: this.allCorrField[index], isInput: this.allCorrField[index].isInput })
               }
               if (this.allCorrField[index].fieldName === 'retention' && this.scopeSelection[0].retention !== null) {
                 this.selectStatus.splice(index, 1, { mode: false, fiedType: 2, value: this.scopeSelection[0].retention, field: this.allCorrField[index], isInput: this.allCorrField[index].isInput })
@@ -495,6 +496,7 @@ export default {
       this.allCorrField = []
       this.isTest = false
       this.batchCategory = {}
+      this.archivesBtnLoading = false
       // done()
     },
     handleComfirmBatchToFile() {
@@ -525,7 +527,7 @@ export default {
           if (filteredFields[index].fiedType === 2) {
             if (item.fieldName === 'archive_ctg_no' && this.scopeSelection[0].archivesClass !== null) {
               console.log('111')
-              documentValue = this.scopeSelection[0].archivesClass.name
+              documentValue = this.scopeSelection[0].archivesClass.code
             } else if (item.fieldName === 'retention' && this.scopeSelection[0].retention !== null) {
               console.log('222')
               documentValue = this.scopeSelection[0].retention
@@ -551,10 +553,21 @@ export default {
             console.log('this.selectStatus[index].field.fieldName', this.selectStatus[index].field.fieldName)
           }
 
+          let documentValue = ''
+          if (this.selectStatus[index].fiedType === 2) {
+            if (this.selectStatus[index].value !== '') {
+              documentValue = this.selectStatus[index].value
+            } else {
+              documentValue = item.categoryFieldId.isDefaultValue
+            }
+          } else {
+            documentValue = this.selectStatus[index].field.fieldName
+          }
+
           return {
             'categoryValue': item.categoryFieldId.fieldName,
-            // 'documentValue': this.selectStatus[index].fiedType === 2 ? item.categoryFieldId.isDefaultValue : this.selectStatus[index].field.fieldName,
-            'documentValue': this.selectStatus[index].fiedType === 2 && this.selectStatus[index].value !== '' ? this.selectStatus[index].value : item.categoryFieldId.isDefaultValue,
+            'documentValue': documentValue,
+            // 'documentValue': this.selectStatus[index].fiedType === 2 && this.selectStatus[index].value !== '' ? this.selectStatus[index].value : item.categoryFieldId.isDefaultValue,
             'getType': this.selectStatus[index].fiedType,
             'isRequired': item.categoryFieldId.isRequired
           }
diff --git a/src/views/prearchiveLibrary/module/detail.vue b/src/views/prearchiveLibrary/module/detail.vue
index 84004ee..7dd3557 100644
--- a/src/views/prearchiveLibrary/module/detail.vue
+++ b/src/views/prearchiveLibrary/module/detail.vue
@@ -31,7 +31,7 @@
           >
             <el-table-column prop="file_name" label="文件名称" show-overflow-tooltip min-width="140" align="center" />
             <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
-            <el-table-column prop="file_size" label="大小" min-width="85" align="center">
+            <el-table-column prop="file_size" label="大小" min-width="85" align="right">
               <template slot-scope="scope">
                 {{ getFileSize(scope.row.file_size) }}
               </template>
@@ -65,6 +65,9 @@
                 <div v-else-if="scope.row.file_type === 'txt'">
                   <i class="fileIcon icon-txt" />
                 </div>
+                <div v-else-if="scope.row.file_type === 'ofd'">
+                  <i class="fileIcon icon-ofd" />
+                </div>
                 <div v-else>
                   <i class="fileIcon icon-other" />
                 </div>
@@ -158,7 +161,7 @@ export default {
       localStorage.setItem('fileCurrent', JSON.stringify(row))
     },
     getFileSize(fileSize) {
-      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + ' KB'
       const fileSizeInB = fileSize + 'B'
       return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
     },
diff --git a/src/views/preview/index.vue b/src/views/preview/index.vue
index ee7825f..d651bbe 100644
--- a/src/views/preview/index.vue
+++ b/src/views/preview/index.vue
@@ -486,7 +486,7 @@ export default {
   }
   .content-right{
     position: relative;
-    flex: 1;
+    width: calc(100% - 300px);
     border: 1px solid #edeff3;
     border-top: none;
     border-bottom: none;
diff --git a/src/views/system/archiveScopeManage/module/tableList.vue b/src/views/system/archiveScopeManage/module/tableList.vue
index ad1d8c7..a1d4124 100644
--- a/src/views/system/archiveScopeManage/module/tableList.vue
+++ b/src/views/system/archiveScopeManage/module/tableList.vue
@@ -52,7 +52,16 @@
               :options="classifyOptions"
               :normalizer="classifyNormalizer"
               placeholder="选择门类之后再选择档案分类"
-            />
+            >
+              <p
+                slot="option-label"
+                slot-scope="{node}"
+                style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis; width: 100%; padding-left: 10px;"
+                :title="node.label"
+              >
+                <template> {{ node.label }} </template>
+              </p>
+            </treeselect>
           </el-form-item>
           <el-form-item label="编码" prop="scopeCode">
             <el-input v-model="form.scopeCode" />
@@ -503,12 +512,12 @@ export default {
       }
     },
     classifyNormalizer(node) {
-      if (node.childArchivesClass && !node.childArchivesClass.length) {
+      if (node.childArchivesClass === null) {
         delete node.childArchivesClass
       }
       return {
-        id: node.id,
-        label: node.name,
+        id: node.code,
+        label: `${node.name} - ${node.code}`,
         children: node.childArchivesClass
       }
     },