From 38785d3eb1b74d2b1c0dadfeb2727a2262f0c990 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 18 Jan 2024 20:11:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BA=93/bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/archivesManage/library.js             |  37 +++--
 src/api/system/fonds.js                       |  11 +-
 src/assets/styles/archives-manage.scss        |   2 +-
 .../caseManage/caseList/index.vue             | 109 +++++++++++++--
 .../caseManage/caseList/module/form.vue       |  26 +++-
 .../caseList/module/openCaseDlg.vue           |   2 +-
 .../caseManage/module/caseLog.vue             |  51 ++++++-
 .../managementLibrary/anjuan/tableList.vue    |   4 +-
 .../managementLibrary/file/index.vue          |  11 +-
 .../managementLibrary/juannei/index.vue       |   4 +-
 .../managementLibrary/mixins/index.js         |   4 +-
 .../module/archivesInfo/index.vue             |  15 ++-
 .../module/collectHeader.vue                  |  34 ++++-
 .../managementLibrary/module/handOverForm.vue | 126 +++++++++++++++---
 .../module/offLineHandover/index.vue          |  15 ++-
 .../module/onlineHandover/index.vue           |  57 ++++++--
 .../module/packingBox/index.vue               |   8 +-
 .../managementLibrary/module/print/index.vue  |   2 +-
 .../module/uploadFile/index.vue               |   9 +-
 .../managementLibrary/project/index.vue       |   2 +-
 .../collectionLibrary/file/index.vue          |   9 +-
 .../module/archivesFilling/index.vue          |   3 +-
 .../module/archivesInfo/index.vue             |  15 ++-
 .../module/uploadFile/index.vue               |   9 +-
 .../components/archivesDetail/juannei.vue     |  14 +-
 .../archivesDetail/uploadFile/index.vue       |   9 +-
 src/views/components/category/PreviewForm.vue |  36 +++--
 src/views/prearchiveLibrary/index.vue         |  10 +-
 .../prearchiveLibrary/module/batchFile.vue    |   7 +
 src/views/prearchiveLibrary/module/detail.vue |   9 +-
 30 files changed, 533 insertions(+), 117 deletions(-)

diff --git a/src/api/archivesManage/library.js b/src/api/archivesManage/library.js
index 396e1c6..328e42a 100644
--- a/src/api/archivesManage/library.js
+++ b/src/api/archivesManage/library.js
@@ -1,23 +1,42 @@
 import request from '@/utils/request'
 import qs from 'qs'
 
-// 根据门类父id获取卷内列表列
-export function FetchInitCategoryViewTable(params) {
+export function FetchInitContorlView(params) {
   return request({
-    url: 'api/collect/initCategoryViewTable',
-    method: 'get',
-    params
+    url: 'api/control/initCategoryView' + '?' + qs.stringify(params, { indices: false }),
+    method: 'get'
   })
 }
 
-export function FetchInitContorlView(params) {
+// 获取打印数据
+export function FetchPrintData(params) {
   return request({
-    url: 'api/control/initCategoryView' + '?' + qs.stringify(params, { indices: false }),
+    url: 'api/control/getPrintData' + '?' + qs.stringify(params, { indices: false }),
     method: 'get'
   })
 }
 
+// 进入流程
+export function FetchIntoFlowBusiness(data) {
+  return request({
+    url: 'api/control/intoFlowBusiness',
+    method: 'post',
+    data: data
+  })
+}
+
+// 档案退回流程确定
+export function FetchArchivesReturnConfirm(data) {
+  return request({
+    url: 'api/control/archivesReturnConfirm',
+    method: 'post',
+    data: data
+  })
+}
+
 export default {
-  FetchInitCategoryViewTable,
-  FetchInitContorlView
+  FetchInitContorlView,
+  FetchPrintData,
+  FetchIntoFlowBusiness,
+  FetchArchivesReturnConfirm
 }
diff --git a/src/api/system/fonds.js b/src/api/system/fonds.js
index 6a14374..c7119e2 100644
--- a/src/api/system/fonds.js
+++ b/src/api/system/fonds.js
@@ -71,4 +71,13 @@ export function FetchFondsDetail(params) {
   })
 }
 
-export default { add, edit, del, FetchInitFondsList, FetchUpdateFondsStatus, FetchDownload, FetchFondsCategory, FetchFondsDetail }
+// 根据门类和档案id获取显示全宗
+export function FetchInitFondsByCategoryIdAndArchivesId(params) {
+  return request({
+    url: 'api/fonds/initFondsByCategoryIdAndArchivesId',
+    method: 'get',
+    params
+  })
+}
+
+export default { add, edit, del, FetchInitFondsList, FetchUpdateFondsStatus, FetchDownload, FetchFondsCategory, FetchFondsDetail, FetchInitFondsByCategoryIdAndArchivesId }
diff --git a/src/assets/styles/archives-manage.scss b/src/assets/styles/archives-manage.scss
index 3746efc..dfa8049 100644
--- a/src/assets/styles/archives-manage.scss
+++ b/src/assets/styles/archives-manage.scss
@@ -104,7 +104,7 @@
 .base-info{
   td.el-table__cell .row-state{
     display: block;
-    width: 48px;
+    width: 60px;
     height: 26px;
     line-height: 24px;
     margin: 0 auto;
diff --git a/src/views/archiveKeeping/caseManage/caseList/index.vue b/src/views/archiveKeeping/caseManage/caseList/index.vue
index 47ef176..ec2c5f8 100644
--- a/src/views/archiveKeeping/caseManage/caseList/index.vue
+++ b/src/views/archiveKeeping/caseManage/caseList/index.vue
@@ -16,7 +16,7 @@
           />
         </el-select>
         <el-input
-          v-model="crud.query[inputSelect]"
+          v-model="typeValue"
           size="small"
           clearable
           placeholder="请输入搜索关键字"
@@ -24,8 +24,9 @@
           class="input-prepend filter-item"
           @clear="crud.toQuery"
           @keyup.enter.native="crud.toQuery"
+          @input="typeInput"
         >
-          <el-select slot="prepend" v-model="inputSelect" style="width: 92px">
+          <el-select slot="prepend" v-model="inputSelect" style="width: 92px" @change="clearInputValue">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -63,6 +64,7 @@
     </div>
     <el-table
       ref="table"
+      v-loading="crud.loading"
       :data="crud.data"
       style="width: 100%;"
       height="calc(100vh - 346px)"
@@ -171,22 +173,22 @@ export default {
       selectStatus: null,
       stateOptions: [
         {
-          value: 1,
+          value: 0,
           label: '空盒'
         },
         {
-          value: 2,
+          value: 1,
           label: '未入库'
         },
         {
-          value: 3,
+          value: 2,
           label: '待入库'
         },
         {
-          value: 4,
+          value: 3,
           label: '已入库'
         }, {
-          value: 5,
+          value: 4,
           label: '待出库'
         }
       ],
@@ -196,7 +198,9 @@ export default {
         { value: 'tid', label: '电子标签' },
         { value: 'barcode', label: '条码' }
       ],
-      inputSelect: 'caseCode'
+      inputSelect: '',
+      typeValue: '',
+      typeInputkey: '' // 避免向后端传递多余参数,切换和重置时，若有typeInputkey则去掉form中对应参数
     }
   },
   computed: {
@@ -208,9 +212,44 @@ export default {
     activeIndex: function(newValue, oldValue) {
     }
   },
+  created() {
+    // 初始化带select的输入框的 - 搜索
+    this.inputSelect = this.options[0].value
+  },
   mounted() {
   },
   methods: {
+    typeInput(e) {
+      this.typeInputkey = this.getDescByValue(
+        this.inputSelect,
+        this.options,
+        'value',
+        'value'
+      )
+      this.crud.query[this.typeInputkey] = e
+    },
+    clearInputValue(val) {
+      this.inputSelect = val
+      this.typeValue = ''
+      // 避免向后端传递多余参数,切换和重置时，若有typeInputkey则去掉form中对应参数
+      if (this.typeInputkey) {
+        delete this.crud.query[this.typeInputkey]
+      }
+    },
+    getDescByValue(inputValue, data, inputKey = 'value', outputKey = 'value') {
+      let outputValue = ''
+      if (data && data.length > 0) {
+        for (let i = 0; i < data.length; i++) {
+          const item = data[i]
+          const itemValue = item[inputKey]
+          if (inputValue + '' === itemValue + '') {
+            outputValue = item[outputKey]
+            break
+          }
+        }
+      }
+      return outputValue
+    },
     getClassByStorageType(row) {
       if (row.storageType === 0) { // 未入
         return 'row-state cancel-state'
@@ -255,6 +294,48 @@ export default {
     },
     handleCloseDialog(done) {
     },
+    handleDel(data) {
+      const boolDeposit = data.every(item => item.depositNum === 0)
+      const boolStorage = data.every(item => item.storageType === 0)
+
+      if (boolStorage) {
+        if (boolDeposit) {
+          this.$confirm('此操作将删除所选数据' + '<span>你是否还要继续？</span>', '提示', {
+            confirmButtonText: '继续',
+            cancelButtonText: '取消',
+            type: 'warning',
+            dangerouslyUseHTMLString: true
+          }).then(() => {
+            const params = data.map(item => {
+              return item.id
+            })
+            caseCurd.del(params).then((res) => {
+              if (res.code !== 500) {
+                if (res.doDel.length === 0) {
+                  this.$message.error('删除失败')
+                } else {
+                  if (res.doDel.length === data.length) {
+                    this.$message.success('全部删除成功')
+                  } else {
+                    this.$message.success('部分删除成功')
+                  }
+                }
+                this.crud.refresh()
+              } else {
+                this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.ERROR)
+              }
+            }).catch(err => {
+              console.log(err)
+            })
+          }).catch(() => {
+          })
+        } else {
+          this.$message.error('请清空档案盒后再删除!')
+        }
+      } else {
+        this.$message.error('请操作出库并清空档案盒后才可删除盒!')
+      }
+    },
     // 打印
     getPrintData() {
       const params = {
@@ -325,8 +406,16 @@ export default {
             type: 'warning'
           })
         } else {
-          this.$refs.openCase.openCaseVisible = true
-          this.$refs.openCase.caseData = data
+          this.$confirm('此操作将导出所选数据' + '<span>提示：1.确定拆盒后，当前盒号下绑定的所有档案数据将一并清除；？</span><span>2.若案卷存在多个盒，选择其中一个分盒则自动拆掉该案卷的全部档案盒</span>', '提示', {
+            confirmButtonText: '继续',
+            cancelButtonText: '取消',
+            type: 'warning',
+            dangerouslyUseHTMLString: true
+          }).then(() => {
+            this.$refs.openCase.openCaseVisible = true
+            this.$refs.openCase.caseData = data
+          }).catch(() => {
+          })
         }
       } else {
         this.msgVisible = true
diff --git a/src/views/archiveKeeping/caseManage/caseList/module/form.vue b/src/views/archiveKeeping/caseManage/caseList/module/form.vue
index a0de84f..2427547 100644
--- a/src/views/archiveKeeping/caseManage/caseList/module/form.vue
+++ b/src/views/archiveKeeping/caseManage/caseList/module/form.vue
@@ -4,10 +4,14 @@
     <span class="dialog-left-bottom" />
     <div class="setting-dialog">
       <el-form ref="form" :model="form" inline :rules="rules" size="small" label-width="105px">
-        <el-row>
+        <el-row class="form-top">
           <el-form-item label="盒号" prop="caseCode">
             <el-input v-model="form.caseCode" placeholder="请输入" disabled />
           </el-form-item>
+          <div v-if="crud.status.edit === 1" class="form-fixed-status">
+            <span class="row-state end-state">已装</span>
+            <span class="row-state end-state">已入</span>
+          </div>
         </el-row>
         <el-form-item label="盒名称" prop="caseName">
           <el-input v-model="form.caseName" placeholder="请输入" />
@@ -81,6 +85,8 @@
             v-model="form.packDate"
             type="date"
             placeholder="选择日期"
+            align="right"
+            format="yyyy-MM-dd"
             style="width: 225px;"
           />
         </el-form-item>
@@ -92,6 +98,8 @@
             v-model="form.checkDate"
             type="date"
             placeholder="选择日期"
+            align="right"
+            format="yyyy-MM-dd"
             style="width: 225px;"
           />
         </el-form-item>
@@ -112,7 +120,7 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button class="auto-gx-btn"><i class="iconfont icon-zidonggengxin" />自动更新</el-button>
+        <el-button v-if="crud.status.edit === 1" class="auto-gx-btn"><i class="iconfont icon-zidonggengxin" />自动更新</el-button>
         <el-button type="text" @click="crud.cancelCU">取消</el-button>
         <el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">
           保存
@@ -245,4 +253,18 @@ export default {
 ::v-deep .dialog-footer{
   margin-top: 30px 22px 20px 0 !important;
 }
+.form-top{
+  position: relative;
+  .form-fixed-status{
+    position: absolute;
+    right: 26px;
+    top: 2px;
+    span{
+      font-size: 14px;
+      padding: 0 16px !important;
+      height: 28px;
+      line-height: 26px !important;
+    }
+  }
+}
 </style>
diff --git a/src/views/archiveKeeping/caseManage/caseList/module/openCaseDlg.vue b/src/views/archiveKeeping/caseManage/caseList/module/openCaseDlg.vue
index 04b6cc8..afcef55 100644
--- a/src/views/archiveKeeping/caseManage/caseList/module/openCaseDlg.vue
+++ b/src/views/archiveKeeping/caseManage/caseList/module/openCaseDlg.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :close-on-click-modal="false" title="拆盒" :visible.sync="openCaseVisible">
+  <el-dialog append-to-body :close-on-click-modal="false" :modal-append-to-body="false" title="拆盒" :visible.sync="openCaseVisible">
     <span class="dialog-right-top" />
     <span class="dialog-left-bottom" />
     <div class="setting-dialog">
diff --git a/src/views/archiveKeeping/caseManage/module/caseLog.vue b/src/views/archiveKeeping/caseManage/module/caseLog.vue
index 0fe7cbf..101ae56 100644
--- a/src/views/archiveKeeping/caseManage/module/caseLog.vue
+++ b/src/views/archiveKeeping/caseManage/module/caseLog.vue
@@ -16,7 +16,7 @@
           />
         </el-select>
         <el-input
-          v-model="crud.query[inputSelect]"
+          v-model="typeValue"
           size="small"
           clearable
           placeholder="请输入搜索关键字"
@@ -24,8 +24,9 @@
           class="input-prepend filter-item"
           @clear="crud.toQuery"
           @keyup.enter.native="crud.toQuery"
+          @input="typeInput"
         >
-          <el-select slot="prepend" v-model="inputSelect" style="width: 92px">
+          <el-select slot="prepend" v-model="inputSelect" style="width: 92px" @change="clearInputValue">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -45,6 +46,7 @@
     </div>
     <el-table
       ref="table"
+      v-loading="crud.loading"
       :data="crud.data"
       style="width: 100%;"
       height="calc(100vh - 346px)"
@@ -120,10 +122,10 @@ export default {
   },
   data() {
     return {
-      selectStatus: 0,
+      selectStatus: null,
       stateOptions: [
         {
-          value: 0,
+          value: null,
           label: '全部'
         },
         {
@@ -141,7 +143,9 @@ export default {
         { value: 'tid', label: '电子标签' },
         { value: 'barcode', label: '条码' }
       ],
-      inputSelect: 'caseCode'
+      inputSelect: '',
+      typeValue: '',
+      typeInputkey: '' // 避免向后端传递多余参数,切换和重置时，若有typeInputkey则去掉form中对应参数
     }
   },
   computed: {
@@ -153,11 +157,46 @@ export default {
     activeIndex: function(newValue, oldValue) {
     }
   },
+  created() {
+    // 初始化带select的输入框的 - 搜索
+    this.inputSelect = this.options[0].value
+  },
   mounted() {
   },
   methods: {
+    typeInput(e) {
+      this.typeInputkey = this.getDescByValue(
+        this.inputSelect,
+        this.options,
+        'value',
+        'value'
+      )
+      this.crud.query[this.typeInputkey] = e
+    },
+    clearInputValue(val) {
+      this.inputSelect = val
+      this.typeValue = ''
+      // 避免向后端传递多余参数,切换和重置时，若有typeInputkey则去掉form中对应参数
+      if (this.typeInputkey) {
+        delete this.crud.query[this.typeInputkey]
+      }
+    },
+    getDescByValue(inputValue, data, inputKey = 'value', outputKey = 'value') {
+      let outputValue = ''
+      if (data && data.length > 0) {
+        for (let i = 0; i < data.length; i++) {
+          const item = data[i]
+          const itemValue = item[inputKey]
+          if (inputValue + '' === itemValue + '') {
+            outputValue = item[outputKey]
+            break
+          }
+        }
+      }
+      return outputValue
+    },
     [CRUD.HOOK.beforeRefresh]() {
-      this.crud.query.storageType = this.selectStatus
+      this.crud.query.operationType = this.selectStatus
     },
     resetQuery() {
     }
diff --git a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue
index 4c3e4cf..25d1e8d 100644
--- a/src/views/archivesManage/managementLibrary/anjuan/tableList.vue
+++ b/src/views/archivesManage/managementLibrary/anjuan/tableList.vue
@@ -9,7 +9,7 @@
         :data="anjuanData"
         highlight-current-row
         style="width: 100%;"
-        height="calc(100vh - 352px)"
+        height="calc(100vh - 364px)"
         :row-class-name="tableRowClassName"
         :row-key="rowKey"
         @select-all="selectAll"
@@ -81,7 +81,7 @@
         </el-table-column>
         <el-table-column v-if="!isRecycle" label="审批锁定" width="88" align="center" :fixed="parentsData.fixedStatusBar ? false : 'right' ">
           <template slot-scope="scope">
-            <span :class="['row-state', 'row-warehousing', scope.row.process_status === 1 ? 'state-active' : '' ]">{{ processedStatusText(scope.row.process_status) }}</span>
+            <span :class="['row-state', 'row-warehousing', scope.row.process_status !== 0 ? 'state-active' : '' ]">{{ processedStatusText(scope.row.process_status) }}</span>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/archivesManage/managementLibrary/file/index.vue b/src/views/archivesManage/managementLibrary/file/index.vue
index 98f142d..11733f6 100644
--- a/src/views/archivesManage/managementLibrary/file/index.vue
+++ b/src/views/archivesManage/managementLibrary/file/index.vue
@@ -20,7 +20,7 @@
           :data="fileData"
           highlight-current-row
           style="width: 100%;"
-          height="calc(100vh - 352px)"
+          height="calc(100vh - 364px)"
           :row-class-name="tableRowClassName"
           :row-key="rowKey"
           @select-all="selectAll"
@@ -35,12 +35,12 @@
           <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
           <el-table-column prop="file_size" label="大小" min-width="85" align="center">
             <template slot-scope="scope">
-              {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+              {{ getFileSize(scope.row.file_size) }}
             </template>
           </el-table-column>
           <el-table-column prop="file_dpi" label="尺寸" min-width="85" align="center">
             <template slot-scope="scope">
-              <div v-if="!scope.row.file_dpi"> - </div>
+              <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
               <div v-else> {{ scope.row.file_dpi }} </div>
             </template>
           </el-table-column>
@@ -157,6 +157,11 @@ export default {
   mounted() {
   },
   methods: {
+    getFileSize(fileSize) {
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInB = fileSize + 'B'
+      return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
+    },
     getCommonData(categoryLevel, parentId, type) {
       this.getViewTable(categoryLevel, parentId, type)
     },
diff --git a/src/views/archivesManage/managementLibrary/juannei/index.vue b/src/views/archivesManage/managementLibrary/juannei/index.vue
index ebdc1a4..959a3cc 100644
--- a/src/views/archivesManage/managementLibrary/juannei/index.vue
+++ b/src/views/archivesManage/managementLibrary/juannei/index.vue
@@ -18,7 +18,7 @@
         :data="junneiData"
         highlight-current-row
         style="width: 100%;"
-        height="calc(100vh - 352px)"
+        height="calc(100vh - 364px)"
         :row-class-name="tableRowClassName"
         :row-key="rowKey"
         @select-all="selectAll"
@@ -91,7 +91,7 @@
         </el-table-column>
         <el-table-column v-if="!isRecycle" label="审批锁定" width="88" align="center" :fixed="parentsData.fixedStatusBar ? false : 'right' ">
           <template slot-scope="scope">
-            <span :class="['row-state', 'row-warehousing', scope.row.process_status === 1 ? 'state-active' : '' ]">{{ processedStatusText(scope.row.process_status) }}</span>
+            <span :class="['row-state', 'row-warehousing', scope.row.process_status !== 0 ? 'state-active' : '' ]">{{ processedStatusText(scope.row.process_status) }}</span>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/archivesManage/managementLibrary/mixins/index.js b/src/views/archivesManage/managementLibrary/mixins/index.js
index 598363e..380fb0f 100644
--- a/src/views/archivesManage/managementLibrary/mixins/index.js
+++ b/src/views/archivesManage/managementLibrary/mixins/index.js
@@ -1,4 +1,6 @@
-import { FetchInitCategoryViewTable, FetchInitContorlView } from '@/api/archivesManage/library'
+
+import { FetchInitCategoryViewTable } from '@/api/collect/collect'
+import { FetchInitContorlView } from '@/api/archivesManage/library'
 import { crud } from '@crud/crud'
 export const manageLibraryCrud = {
   mixins: [crud()],
diff --git a/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue b/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue
index 78e4afc..3737104 100644
--- a/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/archivesInfo/index.vue
@@ -17,11 +17,17 @@
         <!-- 基本信息 -->
         <div v-if="archivesTabIndex==0" class="base-info item-content">
           <el-row>
-            <el-col v-for="(item,index) in archivesDetailsData" :key="index" :span="item.isLine ? 24 : 12" class="base-info-item">
+            <el-col v-for="(item,index) in filteredArray" :key="index" :span="item.isLine ? 24 : 12" class="base-info-item">
               <span>{{ item.fieldCnName }}：</span>
               <p :style="{ width: ( item.editLength ? item.editLength+'px' : '' ), flex: ( !item.editLength ? 1 : '' )}">{{ item.context }}</p>
             </el-col>
           </el-row>
+          <el-row v-for="(item,index) in archivesDetailsData" :key="index">
+            <el-col v-if="item.fieldName === 'is_entity'" :span="24" class="base-info-item">
+              <span>有无实体：</span>
+              <p style="flex:1">{{ item.context === 1 ? '有' : '无' }}</p>
+            </el-col>
+          </el-row>
         </div>
         <!-- 附件 -->
         <UploadFile v-if="archivesTabIndex==1" ref="uploadFile" class="item-content" :is-upload-detail="false" :selected-category="selectedCategory" :arc-id="arcId" />
@@ -88,6 +94,13 @@ export default {
       xml_show: null
     }
   },
+  computed: {
+    filteredArray() {
+      const lastIndex = this.archivesDetailsData.length - 1
+      return this.archivesDetailsData
+        .filter((item, index) => index !== lastIndex || item.fieldName !== 'is_entity')
+    }
+  },
   created() {
   },
   mounted() {
diff --git a/src/views/archivesManage/managementLibrary/module/collectHeader.vue b/src/views/archivesManage/managementLibrary/module/collectHeader.vue
index 561e7e1..e600908 100644
--- a/src/views/archivesManage/managementLibrary/module/collectHeader.vue
+++ b/src/views/archivesManage/managementLibrary/module/collectHeader.vue
@@ -145,13 +145,13 @@
       <!-- 装盒 / 分卷装盒 -->
       <PackingBox ref="packingBox" :selected-category="selectedCategory" :selections="selections" :total-sum-all="totalSumAll" @close-dialog="closeDialog" />
       <!-- 在线移交 -->
-      <OnlineHandover ref="onlineHandover" :selected-category="selectedCategory" :selections="selections" @close-dialog="closeDialog" />
+      <OnlineHandover ref="onlineHandover" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" :total-sum-all="totalSumAll" @close-dialog="closeDialog" />
       <!-- 离线移交 -->
-      <OffLineHandover ref="offLineHandover" :selected-category="selectedCategory" :selections="selections" @close-dialog="closeDialog" />
+      <OffLineHandover ref="offLineHandover" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" :total-sum-all="totalSumAll" @close-dialog="closeDialog" />
       <!-- 导出zip -->
       <ExportZip ref="exportZip" :selected-category="selectedCategory" :selections="selections" @close-dialog="closeDialog" />
       <!-- 开放审核 / 销毁鉴定 -->
-      <HandOverForm ref="formModule" :selected-category="selectedCategory" :selections="selections" @close-dialog="closeDialog" />
+      <HandOverForm ref="formModule" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" @close-dialog="closeDialog" />
       <!-- 打印 -->
       <Print ref="printRef" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" @close-dialog="closeDialog" />
 
@@ -575,7 +575,6 @@ export default {
     handlerArchivesSubmit() {
       this.$refs.previewForm.submitForm('addOrUpdateForm', this.selectedCategory.id,)
     },
-    // 删除 - 关闭
     handleClose(done) {
       this.formVisible = false
       done()
@@ -629,7 +628,7 @@ export default {
           'categoryLevel': this.collectLevel,
           'archivesIds': archivesIds
         }
-        exportFile(this.baseApi + '/api/collect/exportDate?' + qs.stringify(params, { indices: false }))
+        exportFile(this.baseApi + '/api/control/exportDate?' + qs.stringify(params, { indices: false }))
       }).catch(() => {
       })
     },
@@ -637,6 +636,17 @@ export default {
     handlePrint() {
       if (this.selections.length === 0) {
         this.$refs.printRef.form.printRange = '当页条目'
+        let currentTableData = []
+        if (this.collectLevel === 2) {
+          currentTableData = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList.anjuanData
+        } else if (this.collectLevel === 3) {
+          if (this.isTitleType === 3) {
+            currentTableData = this.parentsData.$refs.anjuanEle.$refs.ajContent.$refs.tableList.anjuanData
+          } else {
+            currentTableData = this.parentsData.$refs.juanneiEle.junneiData
+          }
+        }
+        this.$refs.printRef.currentTable = JSON.parse(JSON.stringify(currentTableData))
       } else {
         this.$refs.printRef.form.printRange = '勾选条目'
       }
@@ -776,7 +786,9 @@ export default {
         this.$message('您还未勾选需要操作的条目，请先确认！')
         return false
       }
+      this.$refs.onlineHandover.handOverFileCategory = this.parentsData.listCategory
       this.$refs.onlineHandover.onlineHandoverVisible = true
+      this.getTotalSumAll()
     },
     // 离线移交
     handleOffLineHandover() {
@@ -784,7 +796,9 @@ export default {
         this.$message('您还未勾选需要操作的条目，请先确认！')
         return false
       }
+
       this.$refs.offLineHandover.offLineHandoverVisible = true
+      this.getTotalSumAll()
     },
     // 导出zip包
     handleExportZip() {
@@ -806,15 +820,23 @@ export default {
         type: 'warning',
         dangerouslyUseHTMLString: true
       }).then(() => {
-        console.log('subimit')
+        this.$refs.formModule.overType = 2
+        this.$refs.formModule.overDetialTitle = '退回审核-流程'
+        this.$refs.formModule.overDetialVisible = true
       }).catch(() => {
       })
     },
     // 开放审核 / 销毁鉴定
     handleJD(type) {
+      if (this.selections.length === 0) {
+        this.$message('您还未勾选需要操作的条目，请先确认！')
+        return false
+      }
       if (type === 0) {
+        this.$refs.formModule.overType = 3
         this.$refs.formModule.overDetialTitle = '开放审核-流程'
       } else {
+        this.$refs.formModule.overType = 4
         this.$refs.formModule.overDetialTitle = '销毁鉴定-流程'
       }
       this.$refs.formModule.overDetialVisible = true
diff --git a/src/views/archivesManage/managementLibrary/module/handOverForm.vue b/src/views/archivesManage/managementLibrary/module/handOverForm.vue
index a879c92..80f2ca2 100644
--- a/src/views/archivesManage/managementLibrary/module/handOverForm.vue
+++ b/src/views/archivesManage/managementLibrary/module/handOverForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-dialog class="detail-dialog" :title="overDetialTitle" :visible.sync="overDetialVisible" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :before-close="handleClose">
+  <el-dialog class="detail-dialog" :title="overDetialTitle" :visible.sync="overDetialVisible" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :before-close="handleClose" @opened="opened">
     <div class="setting-dialog">
       <div class="detail-tab tab-content">
         <ul class="tab-nav" style="padding: 0;">
@@ -20,23 +20,11 @@
             <el-form-item label="申请人部门" prop="dept">
               <el-input v-model="form.dept" style="width: 280px;" disabled />
             </el-form-item>
-            <el-form-item label="申请理由" prop="remark">
-              <el-input v-model="form.remark" type="textarea" style="width: 660px;" :rows="4" />
+            <el-form-item label="申请理由" prop="remarks">
+              <el-input v-model="form.remarks" type="textarea" style="width: 660px;" :rows="4" />
             </el-form-item>
           </el-form>
-          <el-table
-            ref="table"
-            :data="tableData"
-            style="min-width: 100%"
-            height="300"
-          >
-            <el-table-column type="index" label="序号" width="50" align="center" />
-            <el-table-column prop="fonds" label="所属全宗" min-width="80" align="center" />
-            <el-table-column prop="fondsName" label="门类名称" min-width="120" align="center" />
-            <el-table-column prop="fondsAddr" label="整理方式" min-width="100" align="center" />
-            <el-table-column prop="fondsAddr" label="项目号/档号" min-width="160" align="center" />
-            <el-table-column prop="fondsAddr" label="题名" min-width="160" align="center" />
-          </el-table>
+          <ArchivesListModule v-if="activeIndex == 0" ref="archivesListModule" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" />
         </div>
         <div v-if="activeIndex == 1" class="tab-img">
           <img :src="'data:image/jpeg;base64,'+ srcImg" alt="" :onerror="defaultImg">
@@ -50,20 +38,41 @@
 </template>
 
 <script>
-const data = [{}, {}]
+import { FetchFondsDetail } from '@/api/system/fonds'
+import { FetchBusinessFlowTitle } from '@/api/collect/collect'
+import { FetchIntoFlowBusiness } from '@/api/archivesManage/library'
+import { mapGetters } from 'vuex'
+import ArchivesListModule from '@/views/components/archivesListModule/index'
+import { getCurrentTime } from '@/utils/index'
 export default {
   name: 'HandOverForm',
-  components: { },
+  components: { ArchivesListModule },
   props: {
     selectedCategory: {
       type: Object,
       default: function() {
         return {}
       }
+    },
+    collectLevel: {
+      type: Number,
+      default: function() {
+        return null
+      }
+    },
+    selections: {
+      type: Array,
+      default: () => []
+    },
+    isHandOver: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
     return {
+      overType: 3,
+      targetFondsNo: null,
       overDetialTitle: '',
       activeIndex: 0,
       overDetialVisible: false,
@@ -72,7 +81,8 @@ export default {
         date: null,
         applicant: null,
         dept: null,
-        remark: null
+        remarks: null,
+        fondsNo: null
       },
       rules: {
         title: [
@@ -83,10 +93,34 @@ export default {
       srcImg: null
     }
   },
+  computed: {
+    ...mapGetters([
+      'user',
+      'baseApi'
+    ])
+  },
   created() {
-    this.tableData = data
   },
   methods: {
+    opened() {
+      if (this.activeIndex === 0) {
+        this.form.applicant = this.user.username
+        this.form.dept = this.user.dept.deptsName
+        this.form.date = getCurrentTime().split(' ')[0]
+        this.getFondsDetail()
+        this.$refs.archivesListModule.getViewTable()
+      }
+    },
+    getFondsDetail() {
+      FetchFondsDetail({ id: this.user.fonds.id }).then((res) => {
+        this.form.fondsNo = res.fondsNo
+        if (res.fondsNo) {
+          this.getBusinessFlowTitle()
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     changeActiveTab(data) {
       this.activeIndex = data
       if (this.activeIndex === 0) {
@@ -95,10 +129,59 @@ export default {
         console.log('流程图')
       }
     },
+    getBusinessFlowTitle() {
+      const params = {
+        'username': this.user.username,
+        'fondsNo': this.form.fondsNo,
+        'businessType': this.isHandOver ? 6 : this.overType
+      }
+      FetchBusinessFlowTitle(params).then((res) => {
+        if (res.code !== 500) {
+          console.log(res)
+          this.form.title = res
+        } else {
+          this.$message.error('失败')
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
     submitHandOverForm() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          alert('submit!')
+          const archivesIds = []
+          this.selections.forEach(val => {
+            archivesIds.push(val.id)
+          })
+          const params = {
+            'title': this.form.title, // 流程名称
+            'applicant': this.user.username, // 申请人
+            'archivesIds': archivesIds,
+            'businessType': this.isHandOver ? 6 : this.overType,
+            'categoryId': this.selectedCategory.id,
+            'categoryLevel': this.collectLevel,
+            'remarks': this.form.remarks,
+            'fondsNo': this.form.fondsNo, // 原始全宗
+            'targetFondsNo': this.targetFondsNo ? this.targetFondsNo.fondsId : null// 目标全宗号
+            // 'targetPosition': 'string', // 目的位置
+            // 'startPosition': 'string', // 开始位置
+            // 'giveStartTime': null, // 赋权开始时间
+            // 'giveEndTime': null // 赋权结束时间
+          }
+          console.log(params)
+          FetchIntoFlowBusiness(params).then((res) => {
+            if (res.code !== 5001) {
+              this.$message.success('操作提交成功')
+              this.$emit('close-dialog')
+            } else {
+              // const message = JSON.parse(res.message)
+              // this.$message.error(message.fail.join(',') + '操作提交失败')
+              this.$message.error(res.message)
+            }
+            this.overDetialVisible = false
+          }).catch(err => {
+            console.log(err)
+          })
         } else {
           console.log('error submit!!')
           return false
@@ -107,6 +190,7 @@ export default {
     },
     // dialog - close
     handleClose(done) {
+      this.form.title = ''
       this.overDetialVisible = false
       this.$refs['form'].resetFields()
       done()
diff --git a/src/views/archivesManage/managementLibrary/module/offLineHandover/index.vue b/src/views/archivesManage/managementLibrary/module/offLineHandover/index.vue
index 8fc073e..7be6903 100644
--- a/src/views/archivesManage/managementLibrary/module/offLineHandover/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/offLineHandover/index.vue
@@ -5,7 +5,7 @@
         <div class="selct-data-head">
           <p v-if="selectedCategory.arrangeType === 1">数据来源：文件<span>{{ selections.length }}</span>条数据</p>
           <!-- totalSumAll -->
-          <p v-else>数据来源：案卷<span>{{ selections.length }}</span>条数据 卷内<span>{{ 111 }}</span>条数据</p>
+          <p v-else>数据来源：案卷<span>{{ selections.length }}</span>条数据 卷内<span>{{ totalSumAll }}</span>条数据</p>
         </div>
         <el-form ref="offLineForm" :model="offLineForm" :rules="rules" label-width="126px">
           <el-form-item label="导出移交包名称" prop="name">
@@ -18,7 +18,7 @@
         <el-button type="primary" @click="submitOffLine">确认</el-button>
       </div>
     </el-dialog>
-    <HandOverForm ref="handoverForm" :selected-category="selectedCategory" />
+    <HandOverForm ref="handoverForm" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" />
   </div>
 </template>
 
@@ -36,9 +36,19 @@ export default {
         return {}
       }
     },
+    collectLevel: {
+      type: Number,
+      default: function() {
+        return null
+      }
+    },
     selections: {
       type: Array,
       default: () => []
+    },
+    totalSumAll: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -62,6 +72,7 @@ export default {
       this.$refs['offLineForm'].validate((valid) => {
         if (valid) {
           this.offLineHandoverVisible = false
+          this.$refs.handoverForm.overType = 7
           this.$refs.handoverForm.overDetialVisible = true
           this.$refs.handoverForm.overDetialTitle = '离线移交-流程'
         } else {
diff --git a/src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue b/src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue
index 7671a31..4512c7d 100644
--- a/src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/onlineHandover/index.vue
@@ -1,33 +1,32 @@
 <template>
   <div>
-    <el-dialog title="在线移交" :visible.sync="onlineHandoverVisible" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :before-close="handleClose">
+    <el-dialog title="在线移交" :visible.sync="onlineHandoverVisible" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :before-close="handleClose" @opened="opened">
       <div class="setting-dialog">
         <div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px;">
           <div class="head-search" style="margin-bottom: 0;">
             <!-- 搜索 -->
-            <el-input v-model="query.search" clearable size="small" placeholder="请输入全宗号或全宗名称检索" style="width:260px;margin-right: 10px;" class="filter-item" @keyup.enter.native="getListOver" @clear="getListOver" />
+            <el-input v-model="search" clearable size="small" placeholder="请输入全宗号或全宗名称检索" style="width:260px;margin-right: 10px;" class="filter-item" @keyup.enter.native="getListOver" @clear="getListOver" />
             <el-button class="filter-item filter-search" size="mini" type="success" icon="el-icon-search" @click="getListOver">搜索</el-button>
           </div>
           <div class="selct-data-head">
             <p v-if="selectedCategory.arrangeType === 1">数据来源：文件<span>{{ selections.length }}</span>条数据</p>
             <!-- totalSumAll -->
-            <p v-else>数据来源：案卷<span>{{ selections.length }}</span>条数据 卷内<span>{{ 111 }}</span>条数据</p>
+            <p v-else>数据来源：案卷<span>{{ selections.length }}</span>条数据 卷内<span>{{ totalSumAll }}</span>条数据</p>
           </div>
         </div>
         <el-table
           ref="table"
           :data="tableData"
           style="min-width: 100%"
-          height="calc(100vh - 500px)"
         >
           <el-table-column prop="create_date" label="操作" width="90" align="center">
             <template slot-scope="scope">
               <el-button class="handOver-btn" @click="handleHandOver(scope.row)"><i class="iconfont icon-yijiao" />移交</el-button>
             </template>
           </el-table-column>
-          <el-table-column prop="fonds" label="全宗号" min-width="80" align="center" />
+          <el-table-column prop="fondsNo" label="全宗号" min-width="80" align="center" />
           <el-table-column prop="fondsName" label="全宗名称" min-width="100" align="center" />
-          <el-table-column prop="fondsAddr" label="全宗简称" min-width="100" align="center" />
+          <el-table-column prop="fondsNameAbbr" label="全宗简称" min-width="100" align="center" />
         </el-table>
         <!--分页组件-->
         <el-pagination
@@ -42,12 +41,12 @@
         />
       </div>
     </el-dialog>
-    <HandOverForm ref="handoverForm" :selected-category="selectedCategory" />
+    <HandOverForm ref="handoverForm" :selected-category="selectedCategory" :collect-level="collectLevel" :selections="selections" :is-hand-over="true" />
   </div>
 </template>
 
 <script>
-const data = [{}, {}]
+import { FetchInitFondsByCategoryIdAndArchivesId } from '@/api/system/fonds'
 import HandOverForm from '../handOverForm'
 export default {
   name: 'OnlineHandover',
@@ -60,34 +59,62 @@ export default {
         return {}
       }
     },
+    collectLevel: {
+      type: Number,
+      default: function() {
+        return null
+      }
+    },
     selections: {
       type: Array,
       default: () => []
+    },
+    totalSumAll: {
+      type: Number,
+      default: 0
     }
   },
   data() {
     return {
-      query: {
-        search: ''
-      },
+      search: '',
       onlineHandoverVisible: false,
       tableData: [],
+      handOverFileCategory: null,
       page: {
-        page: 1,
+        page: 0,
         size: 10,
         total: 0
       }
     }
   },
   created() {
-    this.tableData = data
   },
   methods: {
+    opened() {
+      this.getListOver()
+    },
     getListOver() {
-
+      this.tableData = []
+      const params = {
+        'categoryId': this.selectedCategory.id, // 具体档案的门类id (如案卷 则填写案卷门类id  文件填写文件门类id)
+        'archivesId': this.selections[0].id, // 档案id
+        'search': this.search // 检索条件
+      }
+      FetchInitFondsByCategoryIdAndArchivesId(params).then((res) => {
+        if (res.code !== 500) {
+          console.log(res)
+          this.tableData = res.content
+          this.page.total = res.totalElements
+        } else {
+          this.$message.error('获取数据失败')
+        }
+      }).catch(err => {
+        console.log(err)
+      })
     },
     handleHandOver(row) {
       this.onlineHandoverVisible = false
+      this.$refs.handoverForm.targetFondsNo = row
       this.$refs.handoverForm.overDetialVisible = true
       this.$refs.handoverForm.overDetialTitle = '在线移交-流程'
     },
@@ -102,6 +129,8 @@ export default {
     },
     // dialog - close
     handleClose(done) {
+      this.search = ''
+      this.tableData = []
       this.onlineHandoverVisible = false
       done()
     }
diff --git a/src/views/archivesManage/managementLibrary/module/packingBox/index.vue b/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
index e82dcfe..d09238e 100644
--- a/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/packingBox/index.vue
@@ -38,6 +38,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="caseCode" label="盒号" min-width="120" align="center" />
+        <el-table-column prop="caseName" label="盒名称" min-width="120" align="center" />
         <el-table-column prop="depositNum" label="已装" min-width="60" align="center" />
         <el-table-column prop="tid" label="TID" min-width="120" align="center" />
         <el-table-column prop="barcode" label="条形码" min-width="120" align="center" />
@@ -63,7 +64,8 @@
                 <el-button class="packing-handle-btn iconfont" @click="handlePartParking(scope.row,scope.$index)"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="caseCode" label="盒号" min-width="60" align="center" />
+            <el-table-column prop="caseCode" label="盒号" min-width="120" align="center" />
+            <el-table-column prop="caseName" label="盒名称" min-width="120" align="center" />
             <el-table-column prop="depositNum" label="已装" min-width="100" align="center" />
             <el-table-column prop="tid" label="TID" min-width="120" align="center" />
             <el-table-column prop="barcode" label="条形码" min-width="120" align="center" />
@@ -80,7 +82,6 @@
             ref="selectBox"
             class="custom-table"
             :data="selectTableData"
-            style="width: 100%"
             height="calc(100vh/2 - 200px)"
           >
             <el-table-column prop="create_date" label="操作" align="center">
@@ -88,7 +89,8 @@
                 <el-button class="packing-recall-btn iconfont" @click="cancelParking(scope.row,scope.$index)"><svg-icon icon-class="chehui" class="svg-arc-style" />撤销</el-button>
               </template>
             </el-table-column>
-            <el-table-column prop="caseCode" label="盒号" min-width="60" align="center" />
+            <el-table-column prop="caseCode" label="盒号" min-width="120" align="center" />
+            <el-table-column prop="caseName" label="盒名称" min-width="120" align="center" />
             <el-table-column prop="depositNum" label="已装" min-width="100" align="center" />
             <el-table-column prop="tid" label="TID" min-width="120" align="center" />
             <el-table-column prop="barcode" label="条形码" min-width="120" align="center" />
diff --git a/src/views/archivesManage/managementLibrary/module/print/index.vue b/src/views/archivesManage/managementLibrary/module/print/index.vue
index 221929f..6d912ab 100644
--- a/src/views/archivesManage/managementLibrary/module/print/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/print/index.vue
@@ -46,7 +46,7 @@
 
 <script>
 
-import { FetchPrintData } from '@/api/collect/collect'
+import { FetchPrintData } from '@/api/archivesManage/library'
 import html2canvas from 'html2canvas'
 import printJS from 'print-js'
 export default {
diff --git a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
index 9c88747..ae59af1 100644
--- a/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
+++ b/src/views/archivesManage/managementLibrary/module/uploadFile/index.vue
@@ -25,12 +25,12 @@
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
       <el-table-column prop="file_size" label="大小" min-width="85" align="center">
         <template slot-scope="scope">
-          {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+          {{ getFileSize(scope.row.file_size) }}
         </template>
       </el-table-column>
       <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
         <template slot-scope="scope">
-          <div v-if="!scope.row.file_dpi"> - </div>
+          <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
           <div v-else> {{ scope.row.file_dpi }} </div>
         </template>
       </el-table-column>
@@ -175,6 +175,11 @@ export default {
     }
   },
   methods: {
+    getFileSize(fileSize) {
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInB = fileSize + 'B'
+      return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
+    },
     // 选择附件
     async changeFile(e) {
       this.file = e.target.files[0]
diff --git a/src/views/archivesManage/managementLibrary/project/index.vue b/src/views/archivesManage/managementLibrary/project/index.vue
index 2dedabe..751101f 100644
--- a/src/views/archivesManage/managementLibrary/project/index.vue
+++ b/src/views/archivesManage/managementLibrary/project/index.vue
@@ -10,7 +10,7 @@
         :data="projectData"
         highlight-current-row
         style="width: 100%;"
-        height="calc(100vh - 352px)"
+        height="calc(100vh - 364px)"
         :row-key="rowKey"
         :row-class-name="tableRowClassName"
         @select-all="selectAll"
diff --git a/src/views/collectReorganizi/collectionLibrary/file/index.vue b/src/views/collectReorganizi/collectionLibrary/file/index.vue
index cae7856..8b31cb6 100644
--- a/src/views/collectReorganizi/collectionLibrary/file/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/file/index.vue
@@ -34,12 +34,12 @@
           <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
           <el-table-column prop="file_size" label="大小" min-width="85" align="center">
             <template slot-scope="scope">
-              {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+              {{ getFileSize(scope.row.file_size) }}
             </template>
           </el-table-column>
           <el-table-column prop="file_dpi" label="尺寸" min-width="85" align="center">
             <template slot-scope="scope">
-              <div v-if="!scope.row.file_dpi"> - </div>
+              <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
               <div v-else> {{ scope.row.file_dpi }} </div>
             </template>
           </el-table-column>
@@ -157,6 +157,11 @@ export default {
   mounted() {
   },
   methods: {
+    getFileSize(fileSize) {
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInB = fileSize + 'B'
+      return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
+    },
     getCommonData(categoryLevel, parentId, type) {
       this.getViewTable(categoryLevel, parentId, type)
     },
diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesFilling/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesFilling/index.vue
index 43a97bb..3f90b68 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/archivesFilling/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/archivesFilling/index.vue
@@ -116,7 +116,8 @@ export default {
     getBusinessFlowTitle() {
       const params = {
         'username': this.user.username,
-        'fondsNo': this.form.fondsNo
+        'fondsNo': this.form.fondsNo,
+        'businessType': 1
       }
       FetchBusinessFlowTitle(params).then((res) => {
         if (res.code !== 500) {
diff --git a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
index 850ab3e..cffff40 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/archivesInfo/index.vue
@@ -17,11 +17,17 @@
         <!-- 基本信息 -->
         <div v-if="archivesTabIndex==0" class="base-info item-content">
           <el-row>
-            <el-col v-for="(item,index) in archivesDetailsData" :key="index" :span="item.isLine ? 24 : 12" class="base-info-item">
+            <el-col v-for="(item,index) in filteredArray" :key="index" :span="item.isLine ? 24 : 12" class="base-info-item">
               <span>{{ item.fieldCnName }}：</span>
               <p :style="{ width: ( item.editLength ? item.editLength+'px' : '' ), flex: ( !item.editLength ? 1 : '' )}">{{ item.context }}</p>
             </el-col>
           </el-row>
+          <el-row v-for="(item,index) in archivesDetailsData" :key="index">
+            <el-col v-if="item.fieldName === 'is_entity'" :span="24" class="base-info-item">
+              <span>有无实体：</span>
+              <p style="flex:1">{{ item.context === 1 ? '有' : '无' }}</p>
+            </el-col>
+          </el-row>
         </div>
         <!-- 附件 -->
         <UploadFile v-if="archivesTabIndex==1" ref="uploadFile" class="item-content" :is-upload-detail="false" :selected-category="selectedCategory" :arc-id="arcId" />
@@ -88,6 +94,13 @@ export default {
       xml_show: null
     }
   },
+  computed: {
+    filteredArray() {
+      const lastIndex = this.archivesDetailsData.length - 1
+      return this.archivesDetailsData
+        .filter((item, index) => index !== lastIndex || item.fieldName !== 'is_entity')
+    }
+  },
   created() {
   },
   mounted() {
diff --git a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
index c785ee7..d12e5e5 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/uploadFile/index.vue
@@ -25,12 +25,12 @@
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
       <el-table-column prop="file_size" label="大小" min-width="85" align="center">
         <template slot-scope="scope">
-          {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+          {{ getFileSize(scope.row.file_size) }}
         </template>
       </el-table-column>
       <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
         <template slot-scope="scope">
-          <div v-if="!scope.row.file_dpi"> - </div>
+          <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
           <div v-else> {{ scope.row.file_dpi }} </div>
         </template>
       </el-table-column>
@@ -176,6 +176,11 @@ export default {
     }
   },
   methods: {
+    getFileSize(fileSize) {
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInB = fileSize + 'B'
+      return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
+    },
     // 选择附件
     async changeFile(e) {
       this.file = e.target.files[0]
diff --git a/src/views/components/archivesDetail/juannei.vue b/src/views/components/archivesDetail/juannei.vue
index 94c30a1..78352ec 100644
--- a/src/views/components/archivesDetail/juannei.vue
+++ b/src/views/components/archivesDetail/juannei.vue
@@ -58,10 +58,15 @@
             <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
             <el-table-column prop="file_size" label="大小" min-width="85" align="center">
               <template slot-scope="scope">
-                {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+                {{ getFileSize(scope.row.file_size) }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center">
+              <template slot-scope="scope">
+                <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
+                <div v-else> {{ scope.row.file_dpi }} </div>
               </template>
             </el-table-column>
-            <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center" />
             <el-table-column prop="file_thumbnail" label="缩览图" min-width="60" align="center">
               <template slot-scope="scope">
                 <div v-if="scope.row.file_type === 'jpg' || scope.row.file_type === 'jpeg' || scope.row.file_type === 'png' || scope.row.file_type === 'bmp'|| scope.row.file_type === 'gif'">
@@ -166,6 +171,11 @@ export default {
   mounted() {
   },
   methods: {
+    getFileSize(fileSize) {
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInB = fileSize + 'B'
+      return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
+    },
     getDetial(rowId) {
       const params = {
         // categoryId: this.categoryId,
diff --git a/src/views/components/archivesDetail/uploadFile/index.vue b/src/views/components/archivesDetail/uploadFile/index.vue
index c785ee7..d12e5e5 100644
--- a/src/views/components/archivesDetail/uploadFile/index.vue
+++ b/src/views/components/archivesDetail/uploadFile/index.vue
@@ -25,12 +25,12 @@
       <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
       <el-table-column prop="file_size" label="大小" min-width="85" align="center">
         <template slot-scope="scope">
-          {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+          {{ getFileSize(scope.row.file_size) }}
         </template>
       </el-table-column>
       <el-table-column prop="file_dpi" label="分辨率" min-width="120" align="center">
         <template slot-scope="scope">
-          <div v-if="!scope.row.file_dpi"> - </div>
+          <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
           <div v-else> {{ scope.row.file_dpi }} </div>
         </template>
       </el-table-column>
@@ -176,6 +176,11 @@ export default {
     }
   },
   methods: {
+    getFileSize(fileSize) {
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInB = fileSize + 'B'
+      return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
+    },
     // 选择附件
     async changeFile(e) {
       this.file = e.target.files[0]
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index b459b64..1ee7c29 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -53,11 +53,11 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row v-if="isDesFormType === 'prearchiveLibrary'" class="preview-form-bottom">
+      <el-row v-if="isDesFormType === 'prearchiveLibrary'" class="preview-form-bottom prearch-bottom">
         <el-col>
-          <el-form-item label="电子原件" prop="fileOriginal" class="prearch-upload">
+          <el-form-item label="电子原件" prop="fileOriginal" class="prearch-upload" :rules="[{ required: true, message: '请上传原文',trigger: 'blur' }]">
             <el-input
-              v-model="fileOriginal"
+              v-model="addOrUpdateForm['fileOriginal']"
               type="text"
               style="width: 446px"
               readonly
@@ -71,7 +71,7 @@
       </el-row>
       <el-row v-if="isDesFormType !== 'prearchiveLibrary' && isDesFormType !== 'mergeFile'" class="preview-form-bottom">
         <el-col v-for="(item,index) in formPreviewData" :key="index">
-          <el-form-item v-if="item.fieldName === 'is_entity'" label="是否有无实体" :prop="item.fieldName" :rules="[{ required: true, message: '请选择',trigger: 'change' }]" class="pbysical-style">
+          <el-form-item v-if="item.fieldName === 'is_entity'" label="有无实体" :prop="item.fieldName" :rules="[{ required: true, message: '请选择',trigger: 'change' }]" class="pbysical-style">
             <el-radio-group v-model="addOrUpdateForm[item.fieldName]">
               <el-radio :label="1">有</el-radio>
               <el-radio :label="0">无</el-radio>
@@ -226,7 +226,8 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'baseApi'
+      'baseApi',
+      'user'
     ])
   },
   watch: {
@@ -731,18 +732,16 @@ export default {
           }
         }
       })
+      if (this.archivesType === 'add') {
+        this.addOrUpdateForm.fonds_affiliation = this.user.fonds.id
+      }
+      console.log(this.addOrUpdateForm)
       delete this.addOrUpdateForm.id
       this.$refs[formName].validate((valid) => {
         if (valid) {
           // 预归档库
           if (this.isDesFormType === 'prearchiveLibrary') {
-            if (this.fileOriginal === null) {
-              this.$message({
-                message: '请上传电子文件',
-                type: 'error'
-              })
-              return false
-            }
+            delete this.addOrUpdateForm.fileOriginal
             const params = {
               'id': this.arcId,
               'ids': null,
@@ -751,6 +750,7 @@ export default {
               'jsonString': JSON.stringify(this.addOrUpdateForm),
               'fileJsonString': this.fileJsonString
             }
+            console.log(params)
             prearchEdit(params).then(res => {
               if (res) {
                 this.$message.success(res)
@@ -903,7 +903,8 @@ export default {
       }
       const arrayUpload = []
       arrayUpload.push(json)
-      this.fileOriginal = this.fileNames
+      // this.addOrUpdateForm.fileOriginal = this.fileNames
+      this.$set(this.addOrUpdateForm, 'fileOriginal', this.fileNames)
       this.fileJsonString = JSON.stringify(arrayUpload)
     },
     // 将上传的图片转为base64
@@ -1037,6 +1038,15 @@ export default {
   padding: 20px 20px 0 20px;
   border-top: 1px solid;
   @include preview-border-color;
+
+}
+.prearch-bottom{
+  position: fixed;
+  bottom: 72px;
+  left: 0;
+  background: #fff;
+  width: 100%;
+  padding: 20px 0 0 20px;
 }
 
 .prearch-upload{
diff --git a/src/views/prearchiveLibrary/index.vue b/src/views/prearchiveLibrary/index.vue
index d34bc89..3e32fce 100644
--- a/src/views/prearchiveLibrary/index.vue
+++ b/src/views/prearchiveLibrary/index.vue
@@ -107,7 +107,7 @@
           <span class="dialog-left-bottom" />
           <div class="setting-dialog">
             <PreviewForm ref="previewForm" :form-preview-data.sync="formPreviewData" :selected-category="selectedCategory" :parents-id="parentsId" :arc-id="arcId" :is-des-form-type="isDesFormType" :is-disabled="isDisabled" :selected-document="selectedDocument" :is-has-code="isHasCode" @close-dialog="closeDialog" />
-            <div slot="footer" class="dialog-footer">
+            <div slot="footer" class="dialog-footer" style="margin-top: 85px !important;">
               <el-button type="text" @click="closeDialog">取消</el-button>
               <el-button type="primary" @click="handlerArchivesSubmit">确定</el-button>
             </div>
@@ -258,14 +258,17 @@ export default {
           this.formPreviewData = showFiledAll
           this.formVisible = true
           this.$nextTick(() => {
-            this.$refs.previewForm.fileOriginal = null
+            this.$refs.previewForm.addOrUpdateForm.fileOriginal = null
             this.$refs.previewForm.fileJsonString = null
             if (type === 'edit') {
+              this.$refs.previewForm.archivesType = 'edit'
               this.$refs.previewForm.addOrUpdateForm = data.echo
               const fileecho = []
               fileecho.push(data.fileecho)
-              this.$refs.previewForm.fileOriginal = fileecho[0].file_name
+              this.$refs.previewForm.addOrUpdateForm.fileOriginal = fileecho[0].file_name
               this.$refs.previewForm.fileJsonString = JSON.stringify(fileecho)
+            } else {
+              this.$refs.previewForm.archivesType = 'add'
             }
           })
         })
@@ -289,6 +292,7 @@ export default {
           this.mergeVisible = false
           this.isDesFormType = 'mergeFile'
           this.$nextTick(() => {
+            this.$refs.previewForm.archivesType = 'add'
             this.$refs.previewForm.mergeFileArcIds = this.crud.selections.map(item => item.id)
             this.$refs.previewForm.mergeFileCategory = this.selectedCategoryMerge.id
           })
diff --git a/src/views/prearchiveLibrary/module/batchFile.vue b/src/views/prearchiveLibrary/module/batchFile.vue
index 06abb1f..1d5c9b0 100644
--- a/src/views/prearchiveLibrary/module/batchFile.vue
+++ b/src/views/prearchiveLibrary/module/batchFile.vue
@@ -121,6 +121,7 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 // import { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import ScopeModule from './scope'
+import { mapGetters } from 'vuex'
 export default {
   name: 'BatchFile',
   components: { Treeselect, ScopeModule },
@@ -175,6 +176,11 @@ export default {
       isTest: false
     }
   },
+  computed: {
+    ...mapGetters([
+      'user'
+    ])
+  },
   watch: {
     selectedDocument: function(newValue, oldValue) {
       this.form.documentName = newValue.cnName
@@ -519,6 +525,7 @@ export default {
         return item.id
       })
       const params = {
+        'fondsAffiliation': this.user.fonds.id.toString(),
         'archivesIds': archivesIds,
         'documentId': this.selectedDocument.id,
         'categoryId': this.form.categoryId,
diff --git a/src/views/prearchiveLibrary/module/detail.vue b/src/views/prearchiveLibrary/module/detail.vue
index 6574082..581ff58 100644
--- a/src/views/prearchiveLibrary/module/detail.vue
+++ b/src/views/prearchiveLibrary/module/detail.vue
@@ -33,12 +33,12 @@
             <el-table-column prop="file_type" label="格式" min-width="60" align="center" />
             <el-table-column prop="file_size" label="大小" min-width="85" align="center">
               <template slot-scope="scope">
-                {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+                {{ getFileSize(scope.row.file_size) }}
               </template>
             </el-table-column>
             <el-table-column prop="file_dpi" label="分辨率" min-width="85" align="center">
               <template slot-scope="scope">
-                <div v-if="!scope.row.file_dpi"> - </div>
+                <div v-if="!scope.row.file_dpi || scope.row.file_dpi === 'null'"> - </div>
                 <div v-else> {{ scope.row.file_dpi }} </div>
               </template>
             </el-table-column>
@@ -135,6 +135,11 @@ export default {
   mounted() {
   },
   methods: {
+    getFileSize(fileSize) {
+      const fileSizeInKB = (fileSize / 1024).toFixed(2) + 'kB'
+      const fileSizeInB = fileSize + 'B'
+      return (fileSize / 1024) <= 0.01 ? fileSizeInB : fileSizeInKB
+    },
     getDetial(rowId) {
       const params = {
         documentId: this.selectedDocument.id,