diff --git a/src/assets/images/fileIcon/OFD.png b/src/assets/images/fileIcon/OFD.png
new file mode 100644
index 0000000..6ae0071
Binary files /dev/null and b/src/assets/images/fileIcon/OFD.png differ
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
       }
     },