From b9b8158e1ae42fa37db91f748f994c99c3bc7452 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Thu, 2 Nov 2023 17:08:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=BD=92=E6=A1=A3=E5=BA=93-=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E6=88=90=E4=BB=B6/=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prearchiveLibrary/prearchiveLibrary.js    |  20 +-
 src/api/system/category/category.js           |  10 +-
 src/views/components/category/PreviewForm.vue |  96 +++++++--
 src/views/prearchiveLibrary/index.vue         |  56 ++++--
 src/views/prearchiveLibrary/module/detail.vue | 188 ++++++++++++++++++
 .../prearchiveLibrary/module/moveFile.vue     |  10 +-
 .../system/notifyManage/module/selectObj.vue  |   6 +
 7 files changed, 337 insertions(+), 49 deletions(-)
 create mode 100644 src/views/prearchiveLibrary/module/detail.vue

diff --git a/src/api/prearchiveLibrary/prearchiveLibrary.js b/src/api/prearchiveLibrary/prearchiveLibrary.js
index 7b0d119..edd3204 100644
--- a/src/api/prearchiveLibrary/prearchiveLibrary.js
+++ b/src/api/prearchiveLibrary/prearchiveLibrary.js
@@ -65,4 +65,22 @@ export function FetchBatchToFile(data) {
   })
 }
 
-export default { add, prearchEdit, del, FetchInitPreDocument, FetchInitDocumentsViewTable, FetchDoeditDocument, FetchBatchToFile }
+// 合并成件
+export function FetchMergeToFile(data) {
+  return request({
+    url: 'api/re-document/mergeToFile',
+    method: 'post',
+    data
+  })
+}
+
+// 移动
+export function FetchMove(data) {
+  return request({
+    url: 'api/re-document/move',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, prearchEdit, del, FetchInitPreDocument, FetchInitDocumentsViewTable, FetchDoeditDocument, FetchBatchToFile, FetchMergeToFile, FetchMove }
diff --git a/src/api/system/category/category.js b/src/api/system/category/category.js
index 733254e..250438d 100644
--- a/src/api/system/category/category.js
+++ b/src/api/system/category/category.js
@@ -122,4 +122,12 @@ export function FetchInitCategoryFieldByPid(params) {
   })
 }
 
-export default { add, edit, del, FetchCategoryMenu, FetchInitCategoryField, FetchCategoryFieldManage, FetchUpardicSort, FetchInitCategoryFieldByPid }
+export function FetchInitCategoryInputFieldByPid(params) {
+  return request({
+    url: 'api/category/initCategoryInputFieldByPid',
+    method: 'get',
+    params
+  })
+}
+
+export default { add, edit, del, FetchCategoryMenu, FetchInitCategoryField, FetchCategoryFieldManage, FetchUpardicSort, FetchInitCategoryFieldByPid, FetchInitCategoryInputFieldByPid }
diff --git a/src/views/components/category/PreviewForm.vue b/src/views/components/category/PreviewForm.vue
index 3482891..2b2f907 100644
--- a/src/views/components/category/PreviewForm.vue
+++ b/src/views/components/category/PreviewForm.vue
@@ -45,7 +45,7 @@
           </el-col>
         </draggable>
       </el-row>
-      <el-row v-if="!isHasCode && isDesFormType !== 'prearchiveLibrary'" class="preview-form-bottom">
+      <el-row v-if="!isHasCode && isDesFormType !== 'prearchiveLibrary' && isDesFormType !== 'mergeFile'" class="preview-form-bottom">
         <el-col v-for="(item,index) in formPreviewData.slice(formPreviewData.length-1,formPreviewData.length)" :key="'barcode'+index">
           <el-form-item :label="item.fieldCnName" :prop="item.fieldName">
             <el-input v-model="addOrUpdateForm[item.fieldName]" type="text" style="width: 510px" :disabled="isDisabled" :validate-event="!isDisabled" @keyup.enter.native="isRepeatHandle(item)" @blur="isRepeatHandle(item)" />
@@ -75,25 +75,37 @@
       <span class="dialog-right-top" />
       <span class="dialog-left-bottom" />
       <div class="setting-dialog">
-        <el-table v-if="isTableType === 1" ref="popoverTable" :data="popoverTableData" highlight-current-row row-key="id" :tree-props="{children: 'childMenus', hasChildren: 'hasChildren'}" height="600" style="width: 100%; he" @selection-change="handleSelectionChange" @row-click="clickRowHandler">
+        <el-table ref="popoverTable" :data="popoverTableData" highlight-current-row row-key="dictionaryId" :tree-props="{children: 'childMenus', hasChildren: 'hasChildren'}" height="600" style="width: 100%;" @selection-change="handleSelectionChange" @row-click="clickRowHandler">
+          <el-table-column type="selection" width="55" />
+          <el-table-column prop="dictionaryName" label="字典名称" />
+          <el-table-column prop="dictionaryCode" label="字典代码" />
+          <el-table-column prop="dictionaryRemarks" label="内容说明" />
+        </el-table>
+      </div>
+    </el-dialog>
+    <el-dialog class="edit-form-dialog" :append-to-body="true" :visible="popoverFondsVisible" :before-close="handleClose" :close-on-click-modal="false" :title="tableTitle">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <el-table ref="popoverTable" :data="popoverTableDataFonds" highlight-current-row row-key="id" :tree-props="{children: 'childMenus', hasChildren: 'hasChildren'}" height="600" style="width: 100%; he" @selection-change="handleSelectionChange" @row-click="clickRowHandler">
           <el-table-column type="selection" width="55" />
           <el-table-column prop="fondsNo" label="全宗号" />
           <el-table-column prop="fondsName" label="全宗名称" />
           <el-table-column prop="fondsOrders" label="排序" width="60" />
         </el-table>
-        <el-table v-if="isTableType === 2" ref="popoverTable" :data="popoverTableData" highlight-current-row row-key="id" :tree-props="{children: 'childArchivesClass', hasChildren: 'hasChildren'}" height="600" style="width: 100%;" @selection-change="handleSelectionChange" @row-click="clickRowHandler">
+      </div>
+    </el-dialog>
+    <el-dialog class="edit-form-dialog" :append-to-body="true" :visible="popoverClassifyVisible" :before-close="handleClose" :close-on-click-modal="false" :title="tableTitle">
+      <span class="dialog-right-top" />
+      <span class="dialog-left-bottom" />
+      <div class="setting-dialog">
+        <el-table ref="popoverTable" :data="popoverTableDataClassify" highlight-current-row row-key="id" :tree-props="{children: 'childArchivesClass', hasChildren: 'hasChildren'}" height="600" style="width: 100%;" @selection-change="handleSelectionChange" @row-click="clickRowHandler">
           <el-table-column type="selection" width="55" />
           <el-table-column label="分类名称" prop="name" width="130" />
           <el-table-column label="分类编号" prop="code" />
           <el-table-column label="排序" prop="classSeq" />
           <el-table-column label="所属门类" prop="categoryName" />
         </el-table>
-        <el-table v-if="isTableType === 3" ref="popoverTable" :data="popoverTableData" highlight-current-row row-key="dictionaryId" :tree-props="{children: 'childMenus', hasChildren: 'hasChildren'}" height="600" style="width: 100%;" @selection-change="handleSelectionChange" @row-click="clickRowHandler">
-          <el-table-column type="selection" width="55" />
-          <el-table-column prop="dictionaryName" label="字典名称" />
-          <el-table-column prop="dictionaryCode" label="字典代码" />
-          <el-table-column prop="dictionaryRemarks" label="内容说明" />
-        </el-table>
       </div>
     </el-dialog>
   </div>
@@ -102,7 +114,7 @@
 <script>
 import { crud } from '@crud/crud'
 import { edit, FetchDoeditIsRepeat } from '@/api/archivesManage/archivesList'
-import { prearchEdit, FetchReDoeditIsRepeat } from '@/api/prearchiveLibrary/prearchiveLibrary'
+import { prearchEdit, FetchMergeToFile, FetchReDoeditIsRepeat } from '@/api/prearchiveLibrary/prearchiveLibrary'
 import { getNoFormatField } from '@/api/system/category/fileNoFormat'
 import draggable from 'vuedraggable'
 import Treeselect from '@riophae/vue-treeselect'
@@ -164,6 +176,10 @@ export default {
       tableTitle: '字典列表',
       popoverTableData: [], // popover - popoverTableData
       popoverVisible: false, // popover - visible
+      popoverTableDataClassify: [],
+      popoverClassifyVisible: false,
+      popoverTableDataFonds: [],
+      popoverFondsVisible: false,
       currentFieldName: null, // popover 当前fieldName
       treeCurrentFiled: null,
       categoryId: null,
@@ -180,7 +196,9 @@ export default {
       filePath: '', // 附件 - path
       px: '', // 附件 - 分辨率
       nowDate: '', // 当前时间
-      fileJsonString: null
+      fileJsonString: null,
+      mergeFileArcIds: null,
+      mergeFileCategory: null
     }
   },
   watch: {
@@ -354,6 +372,7 @@ export default {
               this.$set(item, 'options', res)
             } else if (item.isInputClass === 'popover') {
               this.popoverTableData = res
+              this.popoverVisible = true
             }
           })
         }
@@ -369,7 +388,8 @@ export default {
         if (item.isInputClass === 'select') {
           this.$set(item, 'options', res)
         } else if (item.isInputClass === 'popover') {
-          this.popoverTableData = res
+          this.popoverTableDataFonds = res
+          this.popoverFondsVisible = true
         }
       })
     },
@@ -377,7 +397,13 @@ export default {
       console.log('666', this.selectedCategory)
       this.isTableType = 2
       this.tableTitle = '分类列表'
-      FetchArchivesClassTree({ 'categoryId': this.selectedCategory.pid }).then(res => {
+      let categoryId
+      if (this.isDesFormType !== 'mergeFile') {
+        categoryId = this.selectedCategory.pid
+      } else {
+        categoryId = this.selectedCategory.id
+      }
+      FetchArchivesClassTree({ 'categoryId': categoryId }).then(res => {
         if (item.isInputClass === 'select') {
           const classifyOptions = res.map(function(obj) {
             if (obj.childArchivesClass !== null) {
@@ -392,7 +418,8 @@ export default {
           })
           this.$set(item, 'options', classifyOptions)
         } else if (item.isInputClass === 'popover') {
-          this.popoverTableData = res
+          this.popoverTableDataClassify = res
+          this.popoverClassifyVisible = true
         }
       })
     },
@@ -433,7 +460,7 @@ export default {
       // 自动重复字段 - 是否重复
       if (item.isRepeat) {
         let params
-        if (this.isDesFormType !== 'prearchiveLibrary') {
+        if (this.isDesFormType !== 'prearchiveLibrary' && this.isDesFormType !== 'mergeFile') {
           params = {
             'categoryId': this.selectedCategory.id,
             'archivesId': this.arcId,
@@ -451,7 +478,7 @@ export default {
         this.handlerIsRepeat(params, item)
       }
 
-      if (this.isDesFormType !== 'prearchiveLibrary') {
+      if (this.isDesFormType !== 'prearchiveLibrary' && this.isDesFormType !== 'mergeFile') {
         if (!item.isAutomatic) {
           const index = this.autoMatic.findIndex(i => item.fieldName === i.fieldName)
           if (index !== -1) {
@@ -476,7 +503,7 @@ export default {
       // 自动重复字段 - 是否重复 - treeSelect方式
       if (this.treeCurrentFiled.isRepeat) {
         let params
-        if (this.isDesFormType !== 'prearchiveLibrary') {
+        if (this.isDesFormType !== 'prearchiveLibrary' && this.isDesFormType !== 'mergeFile') {
           params = {
             'categoryId': this.selectedCategory.id,
             'archivesId': this.arcId,
@@ -493,7 +520,7 @@ export default {
         }
         this.handlerIsRepeat(params, this.treeCurrentFiled)
       }
-      if (this.isDesFormType !== 'prearchiveLibrary') {
+      if (this.isDesFormType !== 'prearchiveLibrary' && this.isDesFormType !== 'mergeFile') {
         const index = this.autoMatic.findIndex(i => this.treeCurrentFiled.fieldName === i.fieldName)
         if (index !== -1) {
           this.handleAuto()
@@ -507,6 +534,7 @@ export default {
     },
     // popover - table 选中得项
     handleSelectionChange(val) {
+      console.log(val)
       if (val.length > 0) {
         if (this.isTableType === 1) {
           this.addOrUpdateForm[this.currentFieldName] = val[0].fondsName
@@ -518,8 +546,13 @@ export default {
       }
       this.$refs.popoverTable.clearSelection()
       this.popoverVisible = false
+      this.popoverClassifyVisible = false
+      this.popoverFondsVisible = false
+      // this.popoverTableData = []
+      // this.popoverTableDataClassify = []
+      // this.popoverTableDataFonds = []
 
-      if (this.isDesFormType !== 'prearchiveLibrary') {
+      if (this.isDesFormType !== 'prearchiveLibrary' && this.isDesFormType !== 'mergeFile') {
         const index = this.autoMatic.findIndex(i => this.currentFieldName === i.fieldName)
         if (index !== -1) {
           this.handleAuto()
@@ -528,7 +561,6 @@ export default {
     },
     // popover - 当前选中得
     handleCurrentFieldName(item) {
-      this.popoverVisible = true
       this.currentFieldName = item.fieldName
       this.getAllSubset(item)
     },
@@ -630,6 +662,22 @@ export default {
                 this.crud.refresh()
               }
             })
+          } else if (this.isDesFormType === 'mergeFile') {
+            const params = {
+              'archivesId': null,
+              'archivesIds': this.mergeFileArcIds,
+              'documentId': categoryId,
+              'categoryId': this.mergeFileCategory,
+              'jsonString': JSON.stringify(this.addOrUpdateForm)
+            }
+            console.log('params', params)
+            FetchMergeToFile(params).then(res => {
+              if (res) {
+                this.$message.success(res)
+                this.$emit('close-dialog')
+                this.crud.refresh()
+              }
+            })
           } else {
             const params = {
               'id': this.arcId,
@@ -656,6 +704,11 @@ export default {
     },
     handleClose(done) {
       this.popoverVisible = false
+      this.popoverClassifyVisible = false
+      this.popoverFondsVisible = false
+      this.popoverTableData = []
+      this.popoverTableDataClassify = []
+      this.popoverTableDataFonds = []
       done()
     },
     // 选择附件
@@ -697,7 +750,8 @@ export default {
         'file_dpi': this.px,
         'file_thumbnail': '',
         'create_time': this.nowDate,
-        'id': null
+        'id': null,
+        'is_quote': null
       }
       const arrayUpload = []
       arrayUpload.push(json)
diff --git a/src/views/prearchiveLibrary/index.vue b/src/views/prearchiveLibrary/index.vue
index d7120ea..02d8540 100644
--- a/src/views/prearchiveLibrary/index.vue
+++ b/src/views/prearchiveLibrary/index.vue
@@ -16,9 +16,9 @@
           <crudOperation :permission="permission">
             <template v-slot:left>
               <!-- 新增 -->
-              <el-button size="mini" @click="handleForm('add',false)"><i class="iconfont icon-xinzeng" />新增</el-button>
+              <el-button size="mini" @click="handleForm('add')"><i class="iconfont icon-xinzeng" />新增</el-button>
               <!-- 修改 -->
-              <el-button size="mini" :disabled="crud.selections.length !== 1" @click="handleForm('edit',false)"><i class="iconfont icon-bianji" />编辑</el-button>
+              <el-button size="mini" :disabled="crud.selections.length !== 1" @click="handleForm('edit')"><i class="iconfont icon-bianji" />编辑</el-button>
               <!-- 删除btn 多选 -->
               <el-button size="mini" :loading="crud.delAllLoading" :disabled="crud.selections.length === 0" @click="toDelete(crud.selections)"><i class="iconfont icon-shanchu" />删除</el-button>
               <el-button :loading="crud.downloadLoading" size="mini" :disabled="crud.selections.length === 0" @click="doExport(crud.selections)">
@@ -46,6 +46,7 @@
             @select="crud.selectChange"
             @select-all="crud.selectAllChange"
             @selection-change="crud.selectionChangeHandler"
+            @cell-dblclick="tableDoubleClick"
           >
             <el-table-column type="selection" align="center" width="55" />
             <el-table-column v-for="field in tableDisplayFields" :key="field.id" :label="field.fieldCnName" :align="field.displayformatType" :width="field.displayLength" show-overflow-tooltip>
@@ -67,6 +68,7 @@
           <!--分页组件-->
           <pagination v-if="crud.data.length !== 0" />
         </div>
+        <detail ref="archivesInfo" />
         <!-- 批量成件 -->
         <batchFile ref="batchForm" :selected-document="selectedDocument" @refresh="crud.refresh" />
         <!-- 移动 -->
@@ -91,8 +93,8 @@
               </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
-              <el-button type="text" @click="mergeVisible = false">取消</el-button>
-              <el-button type="primary" @click="handleForm('add',true)">确定</el-button>
+              <el-button type="text" @click="closeDialog">取消</el-button>
+              <el-button type="primary" @click="handleFormMerge()">确定</el-button>
             </div>
           </div>
         </el-dialog>
@@ -104,7 +106,7 @@
           <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" :is-has-code="isHasCode" @close-dialog="closeDialog" />
             <div slot="footer" class="dialog-footer">
-              <el-button type="text" @click="formVisible = false">取消</el-button>
+              <el-button type="text" @click="closeDialog">取消</el-button>
               <el-button type="primary" @click="handlerArchivesSubmit">确定</el-button>
             </div>
           </div>
@@ -117,7 +119,7 @@
 <script>
 import CRUD, { presenter, header } from '@crud/crud'
 import { preLibraryCrud } from './mixins/index'
-import { FetchCategoryMenu } from '@/api/system/category/category'
+import { FetchCategoryMenu, FetchInitCategoryInputFieldByPid } from '@/api/system/category/category'
 import PrearchiveCrud from '@/api/prearchiveLibrary/prearchiveLibrary'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -128,13 +130,14 @@ import TreeList from './treeList'
 import PreviewForm from '@/views/components/category/PreviewForm'
 import batchFile from './module/batchFile'
 import moveFile from './module/moveFile'
+import detail from './module/detail'
 import { exportFile } from '@/utils/index'
 import qs from 'qs'
 import { mapGetters } from 'vuex'
 
 export default {
   name: 'PrearchiveLibrary',
-  components: { TreeList, PreviewForm, batchFile, moveFile, Treeselect, rrOperation, crudOperation, pagination },
+  components: { TreeList, PreviewForm, batchFile, moveFile, detail, Treeselect, rrOperation, crudOperation, pagination },
   cruds() {
     return [
       CRUD({
@@ -220,22 +223,16 @@ export default {
       })
     },
     // 著录界面-form/详情-api
-    handleForm(type, isMerge) {
+    handleForm(type) {
       this.mergeVisible = false
       this.selectedCategory = this.selectedDocument
+      this.isDesFormType = 'prearchiveLibrary'
       let params
       if (type === 'add') {
         this.formTitle = '新增文件'
-        if (isMerge) {
-          params = {
-            documentId: this.selectedDocument.id,
-            archivesId: null
-          }
-        } else {
-          params = {
-            documentId: this.selectedDocument.id,
-            archivesId: null
-          }
+        params = {
+          documentId: this.selectedDocument.id,
+          archivesId: null
         }
       } else if (type === 'edit') {
         this.formTitle = '编辑文件'
@@ -267,9 +264,31 @@ export default {
         })
       })
     },
+    handleFormMerge() {
+      this.selectedCategory = this.selectedCategoryMerge
+      FetchInitCategoryInputFieldByPid({ categoryId: this.selectedCategoryMerge.id, isType: 2 }).then((data) => {
+        const showFiledAll = data.filter(item => item.isSequence).sort((a, b) => a.isSequence - b.isSequence)
+        this.$nextTick(() => {
+          this.formPreviewData = showFiledAll
+          this.formVisible = true
+          this.mergeVisible = false
+          this.isDesFormType = 'mergeFile'
+          this.$nextTick(() => {
+            this.$refs.previewForm.mergeFileArcIds = this.crud.selections.map(item => item.id)
+            this.$refs.previewForm.mergeFileCategory = this.selectedCategoryMerge.id
+          })
+        })
+      })
+    },
     handlerArchivesSubmit() {
       this.$refs.previewForm.submitForm('addOrUpdateForm', this.selectedDocument.id)
     },
+    tableDoubleClick(row) {
+      console.log('tableDoubleClick', row)
+      this.$refs.archivesInfo.archivesInfoVisible = true
+      this.$refs.archivesInfo.archivesTabIndex = 0
+      // this.$refs.archivesInfo.getDetial(row.id)
+    },
     // 删除
     toDelete(datas) {
       this.$confirm('此操作将删除当前所选预归档数据' + '<span>你是否还要继续？</span>', '提示', {
@@ -354,6 +373,7 @@ export default {
     },
     closeDialog() {
       this.formVisible = false
+      this.mergeVisible = false
     },
     handleMove() {
       this.$refs.moveForm.moveVisible = true
diff --git a/src/views/prearchiveLibrary/module/detail.vue b/src/views/prearchiveLibrary/module/detail.vue
new file mode 100644
index 0000000..bd97f3c
--- /dev/null
+++ b/src/views/prearchiveLibrary/module/detail.vue
@@ -0,0 +1,188 @@
+<template>
+  <el-dialog class="detail-dialog" title="详情" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="archivesInfoVisible" :before-close="handleClose">
+    <!-- <span class="dialog-right-top" />
+    <span class="dialog-left-bottom" /> -->
+    <div class="setting-dialog">
+      <div class="detail-tab tab-content">
+        <!-- tab -->
+        <ul class="tab-nav">
+          <li :class="{'active-tab-nav': archivesTabIndex == 0}" @click="changeActiveTab(0)">基本信息</li>
+          <li :class="{'active-tab-nav': archivesTabIndex == 1}" @click="changeActiveTab(1)">电子原件</li>
+        </ul>
+        <!-- 基本信息 -->
+        <div v-if="archivesTabIndex===0" class="base-info item-content">
+          <el-row>
+            <el-col v-for="(item,index) in archivesDetailsData" v-show="index<archivesDetailsData.length-5" :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-if="isDetailsInfo">
+            <el-col v-for="(item,index) in archivesDetailsData.slice(archivesDetailsData.length-5,archivesDetailsData.length)" :key="'last'+index" :span=" 12" class="base-info-item">
+              <span>{{ item.fieldCnName }}：</span>
+              <div v-if="item.fieldName === 'folder_location' && item.context" :style="{ width: item.editLength+'px', marginTop:'-6px'}">
+                <div v-if="item.context.indexOf(',')">
+                  <el-tag
+                    v-for="(val,key) in item.context.split(',')"
+                    :key="key"
+                    :type="val"
+                    effect="dark"
+                  >
+                    {{ val }}
+                  </el-tag>
+                </div>
+                <div v-else-if="!item.context.indexOf(',')">
+                  <el-tag effect="dark">{{ item.context }}</el-tag>
+                </div>
+              </div>
+              <div v-else :style="{ width: item.editLength+'px'}" :class="[ (item.fieldName === 'borrow_type') ? 'row-state row-lending' : '' ]">
+                {{ item.context }}
+              </div>
+            </el-col>
+          </el-row>
+        </div>
+        <!-- 电子原件 -->
+        <div v-if="archivesTabIndex===1" class="item-content">
+          <el-table
+            ref="table"
+            :data="tableData"
+            style="min-width: 100%"
+            height="calc(100vh - 382px)"
+            @row-click="clickRowHandler"
+            @selection-change="selectionChangeHandler"
+          >
+            <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">
+              <template slot-scope="scope">
+                {{ (scope.row.file_size / 1024).toFixed(2) + 'kB' }}
+              </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'">
+                  <img width="60px" height="32px" class="screenshot" :src="baseApi+ '/downloadFile' +scope.row.file_path" :onerror="defaultImg" @click="showCoverPreview(scope.row)">
+                </div>
+                <div v-else>
+                  <svg-icon icon-class="fujian" class-name="svg-style" />
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import { form } from '@crud/crud'
+import { FetchArchivesDetails, FetchArchivesMetadata } from '@/api/archivesManage/archivesList'
+// import detailData from './data.json'
+// import metaData from './metadata.json'
+export default {
+  name: 'PrearchiveLibraryDetail',
+  components: { },
+  mixins: [
+    form({})
+  ],
+  props: {
+    categoryId: {
+      type: String,
+      default: function() {
+        return ''
+      }
+    },
+    arcId: {
+      type: String,
+      default: function() {
+        return ''
+      }
+    }
+  },
+  data() {
+    return {
+      archivesInfoVisible: false,
+      archivesTabIndex: 0,
+      archivesDetailsData: [],
+      archivesDetailsMetadata: []
+    }
+  },
+  created() {
+    this.archivesDetailsData = []
+    this.archivesDetailsMetadata = []
+  },
+  mounted() {
+  },
+  methods: {
+    getDetial(rowId) {
+      const params = {
+        categoryId: this.categoryId,
+        archivesId: rowId
+      }
+      FetchArchivesDetails(params).then(data => {
+        this.archivesDetailsData = data
+        // 案卷 / 文件的借阅状态
+        this.archivesDetailsData.forEach(item => {
+          if (item.fieldName === 'borrow_type') {
+            if (item.context === 1) {
+              item.context = '待登记'
+            } else if (item.context === 2) {
+              item.context = '待借阅'
+            } else if (item.context === 3) {
+              item.context = '待归还'
+            } else if (item.context === 4 || item.context === '' || item.context === null) {
+              item.context = '-'
+            } else if (item.context === -1) {
+              item.context = '在库'
+            }
+          }
+        })
+        // 如果是卷内 - 不显示‘tid’/'借阅状态'
+        if (!this.isTidOrBorrow) {
+          const indexBorrow = this.archivesDetailsData.findIndex(item => item.fieldName === 'borrow_type')
+          const indexTid = this.archivesDetailsData.findIndex(item => item.fieldName === 'tid')
+          this.archivesDetailsData.splice(indexBorrow, 1)
+          this.archivesDetailsData.splice(indexTid, 1)
+        }
+      })
+      FetchArchivesMetadata(params).then(data => {
+        this.archivesDetailsMetadata = data
+      })
+    },
+    changeActiveTab(index) {
+      this.archivesTabIndex = index
+    },
+    // 删除 - 关闭
+    handleClose(done) {
+      this.archivesInfoVisible = false
+      done()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.base-info,
+.metadata-cont{
+  background-color: #F6F8FC;
+}
+// 档案详情
+.base-info{
+  padding: 20px 0;
+  .base-info-item{
+    display: flex;
+    flex-direction: row;
+    margin-bottom: 20px;
+    color: #545B65;
+    span{
+      display: block;
+      width: 120px;
+      margin-right: 5px;
+      text-align: right;
+      color: #0C0E1E;
+    }
+  }
+}
+</style>
diff --git a/src/views/prearchiveLibrary/module/moveFile.vue b/src/views/prearchiveLibrary/module/moveFile.vue
index cb7a98d..fff5dc7 100644
--- a/src/views/prearchiveLibrary/module/moveFile.vue
+++ b/src/views/prearchiveLibrary/module/moveFile.vue
@@ -11,6 +11,7 @@
             v-loading="crud.loading"
             :data="crud.data"
             node-key="id"
+            default-expand-all
             :props="defaultProps"
             :expand-on-click-node="false"
             @node-click="handleMoveNodeClick"
@@ -18,14 +19,6 @@
         </div>
         <div class="move-right">
           <div style="padding: 10px;">
-            <el-select v-model="query.status" placeholder="选择状态" style="width: 100px;" :disabled="selectedCategoryMove && selectedCategoryMove.arrangeType === 1">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
             <el-input v-model="query.keyWord" placeholder="输入题名或档号搜索" style="width: 200px;" />
             <el-button class="filter-item filter-search" size="mini" type="success" icon="el-icon-search">搜索</el-button>
           </div>
@@ -70,6 +63,7 @@
 <script>
 import { preLibraryCrud } from '../mixins/index'
 import CRUD, { presenter, header, crud } from '@crud/crud'
+// import { FetchMove } from '@/api/prearchiveLibrary/prearchiveLibrary'
 import Vue from 'vue'
 export default {
   name: 'MoveFile',
diff --git a/src/views/system/notifyManage/module/selectObj.vue b/src/views/system/notifyManage/module/selectObj.vue
index 0f8da15..1100741 100644
--- a/src/views/system/notifyManage/module/selectObj.vue
+++ b/src/views/system/notifyManage/module/selectObj.vue
@@ -31,6 +31,7 @@
           <div v-if="userListWithCheck.length !== 0">
             <el-checkbox
               v-model="checkAll"
+              class="checkbox-all"
               :indeterminate="indeterminate"
               @change="checkedAll"
             >用户</el-checkbox>
@@ -353,4 +354,9 @@ export default {
     }
   }
 }
+.checkbox-all{
+  font-weight: bold;
+  background-color: #f5f9fc;
+  color: #0c0e1e;
+}
 </style>