From 36e7f020be580d645528f265e11688ba4cc2c898 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Mon, 22 Jan 2024 17:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=BA=93-=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1/=E6=A1=A3=E6=A1=88=E7=9B=92/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

---
 .../caseManage/caseList/index.vue             |   6 +-
 .../caseList/module/detailDialog.vue          |  68 +++-----
 src/views/archivesManage/exportTask/index.vue | 158 ++++++++++--------
 .../exportTask/module/detail.vue              |  76 +++++++--
 .../managementLibrary/anjuan/content.vue      |   4 +-
 .../managementLibrary/index.vue               |  39 +++--
 .../managementLibrary/mixins/index.js         |   1 +
 .../module/collectHeader.vue                  |   7 +-
 .../archivesManage/openInventory/index.vue    |  84 +++++-----
 .../collectionLibrary/index.vue               |  30 ++--
 .../module/collectHeader.vue                  |  32 +++-
 11 files changed, 289 insertions(+), 216 deletions(-)

diff --git a/src/views/archiveKeeping/caseManage/caseList/index.vue b/src/views/archiveKeeping/caseManage/caseList/index.vue
index a6e6923..51c77dc 100644
--- a/src/views/archiveKeeping/caseManage/caseList/index.vue
+++ b/src/views/archiveKeeping/caseManage/caseList/index.vue
@@ -316,8 +316,10 @@ export default {
       this.crud.crudMethod.findInCase(params).then(res => {
         console.log(res)
         if (res) {
-          this.$refs.detailDom.tableData = res.archives
-          this.$refs.detailDom.collectLevel = parseInt(res.archives[0].categoryLevel)
+          this.$refs.detailDom.tableData = res.archives_o
+          this.$refs.detailDom.queryFields = res.field_o
+          this.$refs.detailDom.queryCnFields = res.cnField_o
+          this.$refs.detailDom.collectLevel = parseInt(res.archives_o[0].categoryLevel)
         } else {
           this.$refs.detailDom.tableData = []
         }
diff --git a/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue b/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue
index 8955967..82e73fd 100644
--- a/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue
+++ b/src/views/archiveKeeping/caseManage/caseList/module/detailDialog.vue
@@ -98,26 +98,25 @@
             :selections="tableData"
             :is-case="true"
           /> -->
-          <el-table v-show="caseTabIndex===1" style="width: 100%;" :data="tableData" height="342px">
-            <el-table-column prop="categoryName" label="所属门类" align="center" min-width="80" :show-overflow-tooltip="true">
-              <template>
-                {{ selectedItem && selectedItem.cnName }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="categoryLevel" label="门类级别" align="center" width="80">
-              <template slot-scope="scope">
-                <span v-if="scope.row.categoryLevel === '3'" style="width:56px">文件</span>
-                <span v-if="scope.row.categoryLevel === '2'" style="width:56px">卷内</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="fondsNo" label="全宗号" align="center" width="180" />
-            <el-table-column prop="archiveYear" label="年度" align="center" />
-            <el-table-column prop="archiveNo" label="档号" align="center" width="220" :show-overflow-tooltip="true" />
-            <el-table-column prop="maintitle" label="题名" align="center" width="180" :show-overflow-tooltip="true" />
-            <el-table-column prop="docNo" label="发文字号" align="center" />
-            <el-table-column prop="securityClass" label="密级" align="center" />
-            <el-table-column prop="secrecyPeriod" label="保密期限" align="center" />
-            <el-table-column prop="retention" label="保管期限" align="center" />
+          <el-table
+            v-show="caseTabIndex===1"
+            ref="table"
+            :data="tableData"
+            style="width: 100%;"
+            row-key="id"
+            height="342px"
+          >
+            <el-table-column type="index" label="序号" width="55" align="center" />
+            <template v-for="(field, index) in queryFields">
+              <el-table-column
+                v-if="field !== 'id'"
+                :key="index"
+                :prop="field"
+                :label="queryCnFields[index]"
+                :show-overflow-tooltip="true"
+                :width="field === 'archive_no' ? '260px' : '120px'"
+              />
+            </template>
           </el-table>
         </div>
       </div>
@@ -126,7 +125,6 @@
 </template>
 
 <script>
-import { FetchCategoryMenu } from '@/api/system/category/category'
 export default {
   data() {
     return {
@@ -135,14 +133,15 @@ export default {
       rowData: {},
       tableData: [],
       collectLevel: null,
-      selectedItem: null
+      selectedItem: null,
+      queryCnFields: null,
+      queryFields: null
     }
   },
   methods: {
     changeActiveTab(data) {
       this.caseTabIndex = data
       if (this.caseTabIndex === 1) {
-        this.getCategoryDataTree()
         // if (this.tableData.length !== 0) {
         //   this.$refs.archivesListModuleRef.caseCategoryId = this.tableData[0].categoryPid
         //   this.$refs.archivesListModuleRef.getViewTable()
@@ -151,29 +150,6 @@ export default {
         //   this.$refs.archivesListModuleRef.tableData = []
         // }
       }
-    },
-    getCategoryDataTree() {
-      FetchCategoryMenu().then(res => {
-        console.log(res)
-        this.selectedItem = this.findItemById(this.tableData[0].categoryPid, res)
-        console.log(this.selectedItem.cnName)
-        // this.categoryOptions = this.filterData(res)
-        // this.classifyOptions = this.filterArchivesClasses(res)
-      })
-    },
-    findItemById(id, data) {
-      for (const item of data) {
-        if (item.id === id) {
-          return item
-        }
-        if (item.children && item.children.length > 0) {
-          const foundChildItem = this.findItemById(id, item.children)
-          if (foundChildItem) {
-            return foundChildItem
-          }
-        }
-      }
-      return null
     }
   }
 }
diff --git a/src/views/archivesManage/exportTask/index.vue b/src/views/archivesManage/exportTask/index.vue
index cedd68a..2de1125 100644
--- a/src/views/archivesManage/exportTask/index.vue
+++ b/src/views/archivesManage/exportTask/index.vue
@@ -4,7 +4,7 @@
     <div class="connection-header collect-header" style="margin-bottom: 20px;">
       <div class="head-search" style="margin-bottom: 0;">
         <el-select
-          v-model="selectStatus"
+          v-model="status"
           style="margin-right: 10px; width: 100px;"
           placeholder="请选择"
         >
@@ -15,8 +15,8 @@
             :value="item.value"
           />
         </el-select>
-        <el-input v-model="query.search" clearable size="small" placeholder="输入关键字可模糊搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="handleSearch()" @clear="handleSearch()" />
-        <el-button class="filter-item filter-search" size="mini" type="success" icon="el-icon-search" @click="handleSearch()">搜索</el-button>
+        <el-input v-model="search" clearable size="small" placeholder="输入关键字可模糊搜索" prefix-icon="el-icon-search" style="width: 200px;" class="filter-item" @keyup.enter.native="getBusinessFlowHistory()" @clear="getBusinessFlowHistory()" />
+        <el-button class="filter-item filter-search" size="mini" type="success" icon="el-icon-search" @click="getBusinessFlowHistory()">搜索</el-button>
         <el-button class="filter-item filter-refresh" size="mini" type="warning" icon="el-icon-refresh-left" @click="resetQuery">重置</el-button>
       </div>
       <el-button size="mini" :disabled="selections.length === 0" @click="doExport(selections)">
@@ -24,64 +24,60 @@
         导出
       </el-button>
     </div>
-    <el-table ref="table" :data="tableData" style="width: 100%;" height="calc(100vh - 330px)" @select="handleCurrentChange" @selection-change="selectionChangeHandler" @row-dblclick="handleDetail">
-      <el-table-column type="selection" align="center" width="55" />
-      <el-table-column prop="title" label="导出类型" />
-      <el-table-column prop="title" label="包名" />
-      <el-table-column prop="reason" label="任务条数" />
-      <el-table-column prop="reason" label="操作人" />
-      <el-table-column prop="dept" label="任务状态">
-        <template>
-          <span class="row-state ing-state">导出中</span>
-          <span class="row-state end-state">导出成功</span>
-          <span class="row-state cancel-state">导出失败</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="create_time" label="操作时间">
-        <template slot-scope="scope">
-          <div>{{ scope.row.create_time | parseTime }}</div>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <el-pagination
-      v-if="tableData.length !== 0"
-      :current-page="page.page"
-      :total="page.total"
-      :page-size="page.size"
-      :pager-count="5"
-      layout="total, prev, pager, next, sizes"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentPage"
-    />
+    <div style="height: calc(100vh - 232px);">
+      <el-table ref="table" :data="tableData" style="width: 100%;" height="calc(100vh - 330px)" @select="handleCurrentChange" @selection-change="selectionChangeHandler" @row-dblclick="handleDetail">
+        <el-table-column type="selection" align="center" width="55" />
+        <el-table-column prop="business_type" label="类型">
+          <template>
+            <div>离线移交</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="title" label="包名" min-width="180" />
+        <el-table-column prop="number" label="任务条数">
+          <template>
+            <!-- 目前只有1条默认 -->
+            <span>1</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="applicant" label="操作人" />
+        <el-table-column prop="dept" label="任务状态">
+          <template>
+            <!-- 目前只有导出成功，后续看需求再更改 -->
+            <!-- <span class="row-state ing-state">导出中</span> -->
+            <span class="row-state end-state">导出成功</span>
+          <!-- <span class="row-state cancel-state">导出失败</span> -->
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="操作时间">
+          <template slot-scope="scope">
+            <div>{{ scope.row.createTime | parseTime }}</div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-pagination
+        v-if="tableData.length !== 0"
+        :current-page="page.page"
+        :total="page.total"
+        :page-size="page.size"
+        :pager-count="5"
+        layout="total, prev, pager, next, sizes"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentPage"
+      />
+    </div>
     <Detail ref="mDetail" />
   </div>
 
 </template>
 
 <script>
+import { FetchBusinessFlowHistory } from '@/api/archivesManage/library'
 import Detail from './module/detail'
+import qs from 'qs'
+import { exportFile } from '@/utils/index'
 import { mapGetters } from 'vuex'
 
-const data = [
-  {
-    'id': '005E76FEC5A2AAB368CA1F',
-    'code': '230c4a438fa84b2c9a0405c99e7f5cb1',
-    'status': 1,
-    'remark': null,
-    'create_by': 'admin',
-    'create_time': 1687330805000
-  },
-  {
-    'id': '005E76FEC5A2AAB368CA1F',
-    'code': '230c4a438fa84b2c9a0405c99e7f5cb2',
-    'status': 0,
-    'remark': '请检查zip包格式是否正确',
-    'create_by': 'admin',
-    'create_time': 1687330805000
-  }
-]
-
 export default {
   name: 'ExportTask',
   components: { Detail },
@@ -90,32 +86,31 @@ export default {
       statusOptions: [
         {
           label: '全部',
-          value: '全部'
+          value: 0
         },
         {
           label: '导出中',
-          value: '导出中'
+          value: 1
         },
         {
           label: '导出成功',
-          value: '导出成功'
+          value: 2
         },
         {
           label: '导出失败',
-          value: '导出失败'
+          value: 3
         }
       ],
-      selectStatus: '全部',
-      query: {
-        search: ''
-      },
+      status: '',
       tableData: [],
       selections: [],
       page: {
-        page: 1,
+        page: 0,
         size: 10,
         total: 0
-      }
+      },
+      businessType: 7,
+      search: ''
     }
   },
   computed: {
@@ -124,23 +119,41 @@ export default {
     ])
   },
   created() {
-    this.tableData = data
   },
   mounted() {
+    this.getBusinessFlowHistory()
   },
   methods: {
     resetQuery() {
-      this.query = {}
+      this.search = ''
+      this.status = null
+      this.getBusinessFlowHistory()
     },
-    handleSearch() {
-
+    getBusinessFlowHistory() {
+      const params = {
+        'status': this.status,
+        'search': this.search,
+        'businessType': this.businessType,
+        'page': this.page.page,
+        'size': this.page.size
+      }
+      FetchBusinessFlowHistory(params).then((res) => {
+        if (res.code !== 500) {
+          this.tableData = res.content
+          this.page.total = res.totalElements
+        } else {
+          this.$message.error('获取数据失败')
+        }
+      }).catch(err => {
+        console.log(err)
+      })
     },
-    handleDetail() {
+    handleDetail(row) {
+      this.$refs.mDetail.rowCurrent = row
       this.$refs.mDetail.detialVisible = true
     },
     // 触发单选
     handleCurrentChange(selection, row) {
-      console.log('触发单选', row)
       this.selections = selection
     },
     handleSizeChange(size) {
@@ -164,10 +177,11 @@ export default {
         data.forEach(val => {
           ids.push(val.id)
         })
-        // const params = {
-        //   'roleIds': ids
-        // }
-        // exportFile(this.baseApi + '/api/role/exportRole?' + qs.stringify(params, { indices: false }))
+        const params = {
+          'businessIds': ids,
+          'businessType': this.businessType
+        }
+        exportFile(this.baseApi + '/api/control/exportBusinessFlow?' + qs.stringify(params, { indices: false }))
       }).catch(() => {
       })
     }
diff --git a/src/views/archivesManage/exportTask/module/detail.vue b/src/views/archivesManage/exportTask/module/detail.vue
index dcc58a3..8be3e84 100644
--- a/src/views/archivesManage/exportTask/module/detail.vue
+++ b/src/views/archivesManage/exportTask/module/detail.vue
@@ -1,28 +1,37 @@
 <template>
   <!-- 详情 -->
-  <el-dialog title="导出任务详情" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="detialVisible">
+  <el-dialog title="导出任务详情" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="detialVisible" @opened="opened">
     <div class="setting-dialog">
       <ul class="hitch-info">
-        <li><span>包名：</span>离线移交包001</li>
-        <li><span>操作时间：</span>2016-09-21 08:50:08</li>
-        <li><span>操作人：</span>admin</li>
+        <li><span>包名：</span>{{ rowCurrent && rowCurrent.title }}</li>
+        <li><span>操作时间：</span>{{ rowCurrent && rowCurrent.createTime }}</li>
+        <li><span>操作人：</span>{{ rowCurrent && rowCurrent.applicant }}</li>
         <li><span>导出方式：</span>离线移交</li>
-        <li><span>任务状态：</span><i class="row-state end-state">导出成功</i></li>
+        <!-- <li><span>任务状态：</span><i class="row-state end-state">导出成功</i></li> -->
+        <li><span>完成时间：</span>{{ rowCurrent && rowCurrent.completeTime }}</li>
+        <li><span>审批意见：</span>{{ rowCurrent && rowCurrent.opinion }}</li>
+        <li class="state-list">
+          <span class="row-state end-state">导出成功</span>
+        </li>
       </ul>
       <div style="display: flex; justify-content: flex-end; margin-bottom: 12px;">
-        <el-button class="task-btn"><i class="iconfont icon-xiazai" />下载文件</el-button>
+        <el-button class="task-btn" @click="downloadFile"><i class="iconfont icon-xiazai" />下载文件</el-button>
       </div>
       <el-table ref="table" :data="tableData" style="width: 100%;">
         <el-table-column type="index" align="center" width="55" label="序号" />
-        <el-table-column prop="name" label="所属全宗" />
-        <el-table-column prop="reason2" label="门类名称" />
-        <el-table-column prop="reason2" label="整理方式" />
-        <el-table-column prop="reason2" label="项目号/档号" />
-        <el-table-column prop="reason2" label="题名" />
+        <el-table-column prop="fondsName" label="所属全宗" />
+        <el-table-column prop="categoryName" label="门类名称" />
+        <el-table-column prop="categoryLevel" label="整理方式">
+          <template slot-scope="scope">
+            <span>{{ scope.row.categoryLevel === 2 ? '案卷整理' : '按件整理' }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="archiveNo" label="项目号/档号" />
+        <el-table-column prop="maintitle" label="题名" />
         <el-table-column prop="reason" label="状态" align="center">
           <template>
             <span class="row-state end-state">成功</span>
-            <span class="row-state cancel-state">失败</span>
+            <!-- <span class="row-state cancel-state">失败</span> -->
           </template>
         </el-table-column>
       </el-table>
@@ -31,22 +40,61 @@
 </template>
 
 <script>
-const data = [{}, {}]
+import { FetchBusinessFlowDetails } from '@/api/archivesManage/library'
+import { downloadFile } from '@/utils/index'
+import { mapGetters } from 'vuex'
 export default {
   name: 'Detail',
   components: { },
   data() {
     return {
+      rowCurrent: null,
       detialVisible: false,
+      baseInfo: null,
       tableData: []
     }
   },
+  computed: {
+    ...mapGetters([
+      'baseApi'
+    ])
+  },
   created() {
   },
   mounted() {
-    this.tableData = data
   },
   methods: {
+    opened() {
+      this.getBusinessFlowDetails()
+    },
+    getBusinessFlowDetails() {
+      const params = {
+        'businessId': this.rowCurrent.id
+      }
+      FetchBusinessFlowDetails(params).then((res) => {
+        if (res.code !== 500) {
+          console.log(res)
+          this.baseInfo = res.businessFlow
+          this.tableData = res.details
+        } else {
+          this.$message.error('获取数据失败')
+        }
+      }).catch(err => {
+        console.log(err)
+      })
+    },
+    downloadFile() {
+      if (this.rowCurrent.zip_path) {
+        const url = this.baseApi + '/downloadFile' + this.rowCurrent.zip_path
+        fetch(url).then(res => res.blob()).then(blob => {
+          downloadFile(blob, this.rowCurrent.title, 'zip')
+        }).catch(() => {
+          this.$message.error('下载文件失败!')
+        })
+      } else {
+        this.$message.error('下载文件路径获取失败!')
+      }
+    }
   }
 }
 </script>
diff --git a/src/views/archivesManage/managementLibrary/anjuan/content.vue b/src/views/archivesManage/managementLibrary/anjuan/content.vue
index 148c1a7..9ea78bd 100644
--- a/src/views/archivesManage/managementLibrary/anjuan/content.vue
+++ b/src/views/archivesManage/managementLibrary/anjuan/content.vue
@@ -1,9 +1,9 @@
 <template>
-  <TableListMoudle ref="tableList" :is-title-type="isTitleType" :selected-category="selectedCategory" :test="test" :is-recycle="isRecycle" />
+  <TableListMoudle ref="tableList" :is-title-type="isTitleType" :selected-category="selectedCategory" :test="test" :smart-query="smartQuery" :is-recycle="isRecycle" />
 </template>
 
 <script>
-import TableListMoudle from './tableList.vue'
+import TableListMoudle from './tableList'
 export default {
   name: 'AnjuanContent',
   components: { TableListMoudle },
diff --git a/src/views/archivesManage/managementLibrary/index.vue b/src/views/archivesManage/managementLibrary/index.vue
index 06de6e6..8738d2c 100644
--- a/src/views/archivesManage/managementLibrary/index.vue
+++ b/src/views/archivesManage/managementLibrary/index.vue
@@ -10,15 +10,21 @@
             <div class="tree-scroll">
               <el-tree ref="categroyTree" v-loading="crud.loading" class="arc-tree arc-tree-01" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick">
                 <span slot-scope="{ node, data }" class="custom-tree-node">
-                  <span v-if="data.isType === 1 " class="iconFolder">
-                    {{ data.cnName }}
-                  </span>
-                  <span v-if="data.isType === 2" class="iconArch">
-                    {{ data.cnName }}
-                  </span>
-                  <span v-if="data.isType === 3" class="iconFile">
-                    {{ data.cnName }}
-                  </span>
+                  <el-tooltip :content="node.label" placement="left" effect="dark">
+                    <span v-if="data.isType === 1 " class="iconFolder">
+                      {{ data.cnName }}
+                    </span>
+                  </el-tooltip>
+                  <el-tooltip :content="node.label" placement="left" effect="dark">
+                    <span v-if="data.isType === 2" class="iconArch">
+                      {{ data.cnName }}
+                    </span>
+                  </el-tooltip>
+                  <el-tooltip :content="node.label" placement="left" effect="dark">
+                    <span v-if="data.isType === 3" class="iconFile">
+                      {{ data.cnName }}
+                    </span>
+                  </el-tooltip>
                 </span>
               </el-tree>
             </div>
@@ -244,14 +250,6 @@ export default {
         'archive_year': null, // 年度
         'fonds_no': null // 全宗
       }
-      console.log('测试fixedStatusBar', this.fixedStatusBar)
-
-      // if (localStorage.getItem('statusBarFixedType') !== 'undefined') {
-      //   this.fixedStatusBar = JSON.parse(localStorage.getItem('statusBarFixedType')) === true
-      // }
-
-      console.log(this)
-
       this.parentsProjectId = null
       this.parentsAnjuanId = null
       this.parentsJuanneiId = null
@@ -323,7 +321,11 @@ export default {
         if (res.fonds.length <= 1) {
           fonds = []
         } else {
-          fonds = res.fonds
+          const parent = {}
+          parent.id = 0
+          parent.fondsName = '全宗'
+          parent.childDictionarys = res.fonds
+          fonds = parent
         }
         this.classifyTree = res.dictionarys.concat(fonds)
         this.classifyLoading = false
@@ -350,6 +352,7 @@ export default {
             this.treeCurrentNode.classList.add('is-current')
             if (Object.keys(selectedKey).includes('fondsId')) {
               this.smartQuery.fonds_no = selectedKey.fondsNo
+              console.log(this.smartQuery.fonds_no)
             } else {
               const selectedParentVal = this.$refs.classifyTree.getNode(selectedKey).parent.data.dictionaryCode
               switch (selectedParentVal) {
diff --git a/src/views/archivesManage/managementLibrary/mixins/index.js b/src/views/archivesManage/managementLibrary/mixins/index.js
index 380fb0f..a595ea3 100644
--- a/src/views/archivesManage/managementLibrary/mixins/index.js
+++ b/src/views/archivesManage/managementLibrary/mixins/index.js
@@ -109,6 +109,7 @@ export const manageLibraryCrud = {
       })
     },
     getViewTableList(categoryLevel, parentsId, type) {
+      console.log(this.smartQuery.fonds_no)
       const params = {
         'parentId': parentsId,
         'categoryId': this.selectedCategory.id,
diff --git a/src/views/archivesManage/managementLibrary/module/collectHeader.vue b/src/views/archivesManage/managementLibrary/module/collectHeader.vue
index 796d451..58c6e4a 100644
--- a/src/views/archivesManage/managementLibrary/module/collectHeader.vue
+++ b/src/views/archivesManage/managementLibrary/module/collectHeader.vue
@@ -805,9 +805,10 @@ export default {
         this.$message('您还未勾选需要操作的条目，请先确认！')
         return false
       }
-
-      this.$refs.offLineHandover.offLineHandoverVisible = true
-      this.getTotalSumAll()
+      // this.$refs.offLineHandover.offLineHandoverVisible = true
+      this.$refs.formModule.overType = 7
+      this.$refs.formModule.overDetialVisible = true
+      this.$refs.formModule.overDetialTitle = '离线移交-流程'
     },
     // 导出zip包
     handleExportZip() {
diff --git a/src/views/archivesManage/openInventory/index.vue b/src/views/archivesManage/openInventory/index.vue
index 9ce432c..77881e2 100644
--- a/src/views/archivesManage/openInventory/index.vue
+++ b/src/views/archivesManage/openInventory/index.vue
@@ -25,47 +25,49 @@
         导出
       </el-button>
     </div>
-    <el-table ref="table" :data="tableData" style="width: 100%;" height="calc(100vh - 330px)" @select="handleCurrentChange" @selection-change="selectionChangeHandler" @row-dblclick="handleDetail">
-      <el-table-column type="selection" align="center" width="55" />
-      <el-table-column v-if="inventType===6" prop="business_type" label="类型">
-        <template>
-          <div>内部移交</div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="title" label="标题" min-width="180" />
-      <el-table-column prop="reason" label="申请理由" />
-      <el-table-column prop="applicant" label="申请人" />
-      <el-table-column prop="deptsName" label="申请部门" />
-      <el-table-column prop="createTime" label="申请时间">
-        <template slot-scope="scope">
-          <div>{{ scope.row.createTime }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="completeTime" label="完成时间">
-        <template slot-scope="scope">
-          <div>{{ scope.row.completeTime }}</div>
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="状态" width="80">
-        <template slot-scope="scope">
-          <span v-if="scope.row.status === 1" class="row-state ing-state">进行中</span>
-          <span v-if="scope.row.status === 2" class="row-state case-cancel">已取消</span>
-          <span v-if="scope.row.status === 3" class="row-state end-state">已完成</span>
-          <span v-if="scope.row.status === 4" class="row-state cancel-state">不通过</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <el-pagination
-      v-if="tableData.length !== 0"
-      :current-page="page.page"
-      :total="page.total"
-      :page-size="page.size"
-      :pager-count="5"
-      layout="total, prev, pager, next, sizes"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentPage"
-    />
+    <div style="height: calc(100vh - 232px);">
+      <el-table ref="table" :data="tableData" style="width: 100%;" height="calc(100vh - 330px)" @select="handleCurrentChange" @selection-change="selectionChangeHandler" @row-dblclick="handleDetail">
+        <el-table-column type="selection" align="center" width="55" />
+        <el-table-column v-if="inventType===6" prop="business_type" label="类型">
+          <template>
+            <div>内部移交</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="title" label="标题" min-width="180" />
+        <el-table-column prop="reason" label="申请理由" />
+        <el-table-column prop="applicant" label="申请人" />
+        <el-table-column prop="deptsName" label="申请部门" />
+        <el-table-column prop="createTime" label="申请时间">
+          <template slot-scope="scope">
+            <div>{{ scope.row.createTime }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="completeTime" label="完成时间">
+          <template slot-scope="scope">
+            <div>{{ scope.row.completeTime }}</div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="createTime" label="状态" width="80">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status === 1" class="row-state ing-state">进行中</span>
+            <span v-if="scope.row.status === 2" class="row-state case-cancel">已取消</span>
+            <span v-if="scope.row.status === 3" class="row-state end-state">已完成</span>
+            <span v-if="scope.row.status === 4" class="row-state cancel-state">不通过</span>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!--分页组件-->
+      <el-pagination
+        v-if="tableData.length !== 0"
+        :current-page="page.page"
+        :total="page.total"
+        :page-size="page.size"
+        :pager-count="5"
+        layout="total, prev, pager, next, sizes"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentPage"
+      />
+    </div>
     <Detail ref="mDetail" :invent-type="inventType" />
   </div>
 
diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue
index 486811c..800fb1b 100644
--- a/src/views/collectReorganizi/collectionLibrary/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/index.vue
@@ -10,15 +10,21 @@
             <div class="tree-scroll">
               <el-tree ref="categroyTree" v-loading="crud.loading" class="arc-tree arc-tree-01" :data="crud.data" :props="defaultProps" node-key="id" :expand-on-click-node="false" highlight-current @node-click="handleNodeClick">
                 <span slot-scope="{ node, data }" class="custom-tree-node">
-                  <span v-if="data.isType === 1 " class="iconFolder">
-                    {{ data.cnName }}
-                  </span>
-                  <span v-if="data.isType === 2" class="iconArch">
-                    {{ data.cnName }}
-                  </span>
-                  <span v-if="data.isType === 3" class="iconFile">
-                    {{ data.cnName }}
-                  </span>
+                  <el-tooltip :content="node.label" placement="left" effect="dark">
+                    <span v-if="data.isType === 1 " class="iconFolder">
+                      {{ data.cnName }}
+                    </span>
+                  </el-tooltip>
+                  <el-tooltip :content="node.label" placement="left" effect="dark">
+                    <span v-if="data.isType === 2" class="iconArch">
+                      {{ data.cnName }}
+                    </span>
+                  </el-tooltip>
+                  <el-tooltip :content="node.label" placement="left" effect="dark">
+                    <span v-if="data.isType === 3" class="iconFile">
+                      {{ data.cnName }}
+                    </span>
+                  </el-tooltip>
                 </span>
               </el-tree>
             </div>
@@ -318,7 +324,11 @@ export default {
         if (res.fonds.length <= 1) {
           fonds = []
         } else {
-          fonds = res.fonds
+          const parent = {}
+          parent.id = 0
+          parent.fondsName = '全宗'
+          parent.childDictionarys = res.fonds
+          fonds = parent
         }
         this.classifyTree = res.dictionarys.concat(fonds)
         this.classifyLoading = false
diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
index bb5a9de..f08cb01 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
@@ -46,8 +46,8 @@
               <span>常规</span>
             </template>
             <el-menu-item-group class="collect-submenu-group">
-              <el-menu-item v-if="isTitleType !== 6" index="1-1" @click="handleForm('add')">新增</el-menu-item>
-              <el-menu-item v-if="isTitleType !== 6" index="1-2" @click="handleForm('edit')">编辑</el-menu-item>
+              <el-menu-item v-if="isTitleType !== 6" index="1-1" @click="handleForm('add',0)">新增</el-menu-item>
+              <el-menu-item v-if="isTitleType !== 6" index="1-2" @click="handleForm('edit',0)">编辑</el-menu-item>
               <el-menu-item v-if="isTitleType !== 4" index="1-3" @click="toDelete">删除</el-menu-item>
               <el-menu-item v-if="isTitleType === 4" index="1-4" @click="toMove">移出</el-menu-item>
             </el-menu-item-group>
@@ -302,7 +302,11 @@ export default {
           return '文件'
         } else {
           if (this.activeIndex === 1) {
-            return '文件'
+            if (this.quickPaper) {
+              return '案卷'
+            } else {
+              return '文件'
+            }
           } else {
             return '案卷'
           }
@@ -322,7 +326,11 @@ export default {
           return 3
         } else {
           if (this.activeIndex === 1) {
-            return 3
+            if (this.quickPaper) {
+              return 2
+            } else {
+              return 3
+            }
           } else {
             return 2
           }
@@ -477,15 +485,22 @@ export default {
       console.log(key, keyPath)
     },
     // 著录界面-form/详情-api
-    handleForm(type) {
+    handleForm(type, isPaper) {
       if (type === 'add') {
         if (this.parentsData.parentsAnjuanRow && this.parentsData.parentsAnjuanRow.collect_formal === 2) {
           this.$message('当前档案处于归档流程中，不可操作新增，请先确认！')
           return false
         }
-        this.formTitle = '新增' + this.collectTitle
         this.arcId = null
+        if (isPaper) {
+          this.quickPaper = true
+          this.formTitle = '新增案卷'
+        } else {
+          this.formTitle = '新增' + this.collectTitle
+          this.quickPaper = false
+        }
       } else if (type === 'edit') {
+        this.quickPaper = false
         if (this.selections.length === 0) {
           this.$message('您还未勾选需要操作的条目，请先确认！')
           return false
@@ -1062,9 +1077,10 @@ export default {
         this.$message('您还未勾选需要操作的条目，请先确认！')
         return false
       }
-      this.quickPaper = true
+
       this.quickPaperArcId = this.selections.map(item => item.id)
-      this.handleForm('add')
+
+      this.handleForm('add', 1)
     },
     // 原文内的附件下载
     handleOriginalDownload() {