From fd4537d6c6089a9ca678423895e68da51635c551 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Tue, 18 Jul 2023 17:09:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionLibrary/anjuan/content.vue      |  12 +-
 .../collectionLibrary/anjuan/index.vue        |   5 +-
 .../anjuan/{sorted.vue => tableList.vue}      |   8 +-
 .../collectionLibrary/anjuan/unsorted.vue     |  27 --
 .../collectionLibrary/index.vue               |   1 +
 .../collectionLibrary/juannei/index.vue       | 146 ++++++++-
 .../collectionLibrary/juannei/tableData.json  |  60 ++++
 .../juannei/tableFields.json                  | 285 ++++++++++++++++++
 .../module/collectHeader.vue                  | 105 +++++--
 9 files changed, 583 insertions(+), 66 deletions(-)
 rename src/views/collectReorganizi/collectionLibrary/anjuan/{sorted.vue => tableList.vue} (93%)
 delete mode 100644 src/views/collectReorganizi/collectionLibrary/anjuan/unsorted.vue
 create mode 100644 src/views/collectReorganizi/collectionLibrary/juannei/tableData.json
 create mode 100644 src/views/collectReorganizi/collectionLibrary/juannei/tableFields.json

diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
index 793e8b0..d15b9c4 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
@@ -6,21 +6,15 @@
       <!-- 最右侧装饰img -->
       <span class="tab-right-img" />
     </ul>
-    <!-- <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" /> -->
-    <!-- <component :is="comName" :is-title-type="isTitleType" :selected-category="selectedCategory" /> -->
-    <SortedModule :is-title-type="isTitleType" :selected-category="selectedCategory" :active-index="activeIndex" />
-    <!-- <el-button v-if="selectedCategory.isType === 2 || selectedCategory.isType === 3" type="text" @click="openJuannei">打开卷内的Drawer</el-button> -->
-    <!-- <el-button v-if="selectedCategory.isType === 5" type="text" @click="openJuannei">打开文件的Drawer</el-button> -->
+    <TableListMoudle ref="tableList" :is-title-type="isTitleType" :selected-category="selectedCategory" :active-index="activeIndex" />
   </div>
 </template>
 
 <script>
-import SortedModule from './sorted.vue'
-// import UnSortedModule from './unsorted.vue'
-// import CollectHeader from '../module/collectHeader.vue'
+import TableListMoudle from './tableList.vue'
 export default {
   name: 'AnjuanContent',
-  components: { SortedModule },
+  components: { TableListMoudle },
   props: {
     data: {
       type: String,
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue
index e5af572..f46a1d5 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/index.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
-    <AnjuanContent v-if="selectedCategory.isType === 3 || selectedCategory.isType === 5" :selected-category="selectedCategory" />
-    <!-- :title="selectedCategory.isType === 5 ? '我是文件':'我是案卷'" -->
+    <AnjuanContent v-if="selectedCategory.isType === 3 || selectedCategory.isType === 5" ref="ajContent" :selected-category="selectedCategory" />
     <el-drawer
       v-else
       class="anjuan-drawer"
@@ -13,7 +12,7 @@
       direction="rtl"
       size="90%"
     >
-      <AnjuanContent :selected-category="selectedCategory" />
+      <AnjuanContent ref="ajContent" :selected-category="selectedCategory" />
       <span class="closed-btn" @click="closeDrawer" />
     </el-drawer>
   </div>
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/sorted.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
similarity index 93%
rename from src/views/collectReorganizi/collectionLibrary/anjuan/sorted.vue
rename to src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
index 63609eb..a50f5bd 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/sorted.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/tableList.vue
@@ -1,7 +1,6 @@
 <template>
   <div>
     <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :arc-id="arcId" :selections="selections" :active-index="activeIndex" />
-    <p>{{ activeIndex===0 ? '已整理' : '未整理' }}</p>
     <el-table
       ref="table"
       v-loading="crud.loading || getTableDisplayFieldsLoading"
@@ -147,6 +146,13 @@ export default {
       console.log('tableDoubleClick', row)
       this.arcId = row.id
       console.log(this.selectedCategory.isType)
+
+      if (this.selectedCategory.isType !== 5) {
+        this.$refs.archivesInfo.isHasFile = false
+      } else {
+        this.$refs.archivesInfo.isHasFile = true
+      }
+
       if (this.selectedCategory.isType === 3) {
         this.$refs.archivesInfo.detailTitle = '案卷详情'
       } else {
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/unsorted.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/unsorted.vue
deleted file mode 100644
index fd57f74..0000000
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/unsorted.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<template>
-  <div>
-    未整理列表
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'Sorted',
-  components: { },
-  props: {
-  },
-  data() {
-    return {
-    }
-  },
-  created() {
-  },
-  mounted() {
-  },
-  methods: {
-  }
-}
-</script>
-
-<style lang='scss' scoped>
-</style>
diff --git a/src/views/collectReorganizi/collectionLibrary/index.vue b/src/views/collectReorganizi/collectionLibrary/index.vue
index c665909..9fc0de9 100644
--- a/src/views/collectReorganizi/collectionLibrary/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/index.vue
@@ -184,6 +184,7 @@ export default {
       localStorage.setItem('currentArchivesKey', JSON.stringify(val))
       if (this.$refs.anjuanEle) {
         this.$refs.anjuanEle.anjuanDrawer = false
+        this.$refs.anjuanEle.$refs.ajContent.activeIndex = 0
       }
       if (this.$refs.juanneiEle) {
         this.$refs.juanneiEle.juanneiDrawer = false
diff --git a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
index d8d2231..5447735 100644
--- a/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
+++ b/src/views/collectReorganizi/collectionLibrary/juannei/index.vue
@@ -8,17 +8,70 @@
     direction="rtl"
     :size="selectedCategory.isType === 3 ? '90%' :'80%'"
   >
-    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" />
-    <el-button type="text" @click="openFile">打开文件的Drawer</el-button>
+    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" :selections="selections" />
+    <el-table
+      ref="table"
+      v-loading="crud.loading || getTableDisplayFieldsLoading"
+      class="archives-table"
+      :data="junneiData"
+      highlight-current-row
+      style="width: 100%;"
+      :row-class-name="tableRowClassName"
+      :row-key="rowKey"
+      @select-all="selectAll"
+      @selection-change="crud.selectionChangeHandler"
+      @row-click="clickRowHandler"
+      @cell-dblclick="tableDoubleClick"
+      @select="handleCurrentChange"
+    >
+      <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column label="文件" prop="children_num" width="55" align="center" />
+      <el-table-column v-for="field in tableDisplayFields" :key="field.id" :label="field.fieldCnName" :align="field.displayformatType" :width="field.displayLength" show-overflow-tooltip>
+        <template slot="header">
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="field.fieldCnName"
+            placement="top-start"
+          >
+            <span>{{ field.fieldCnName }}</span>
+          </el-tooltip>
+        </template>
+        <template slot-scope="scope">
+          {{ scope.row[field.fieldName] }}
+        </template>
+      </el-table-column>
+    </el-table>
+    <!--分页组件-->
+    <el-pagination
+      :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"
+    />
+    <!-- 档案详情 -->
+    <ArchivesInfo ref="archivesInfo" :category-id="categoryId" :arc-id="arcId" />
     <span class="closed-btn" @click="closeDrawer" />
   </el-drawer>
 </template>
 
 <script>
+import { header, form } from '@crud/crud'
 import CollectHeader from '../module/collectHeader.vue'
+import ArchivesInfo from '../module/archivesInfo/index'
+import tableFields from './tableFields.json'
+import tableData from './tableData.json'
 export default {
   name: 'Juannei',
-  components: { CollectHeader },
+  components: { CollectHeader, ArchivesInfo },
+  mixins: [
+    header(),
+    form({})
+  ],
   props: {
     selectedCategory: {
       type: Object,
@@ -30,10 +83,31 @@ export default {
   data() {
     return {
       isTitleType: 4,
-      juanneiDrawer: false
+      juanneiDrawer: false,
+      junneiData: [],
+      tableDisplayFields: [], // table-list-title字段
+      getTableDisplayFieldsLoading: false, // table-loading
+      selections: [],
+      categoryId: 'CD135F6A77018CE04D4FDB',
+      arcId: '256E752BC0280618840600',
+      page: {
+        page: 1,
+        size: 10,
+        total: 0
+      },
+      timer: null
+    }
+  },
+  watch: {
+    selectedCategory: function(newValue, oldValue) {
+    },
+    tableDisplayFields(val) {
+      this.doLayout()
     }
   },
   created() {
+    this.tableDisplayFields = tableFields.data
+    this.junneiData = tableData.data.list.content
   },
   mounted() {
 
@@ -45,6 +119,70 @@ export default {
     },
     closeDrawer() {
       this.juanneiDrawer = false
+    },
+    handleSelect(key, keyPath) {
+      console.log(key, keyPath)
+    },
+    rowKey(row) {
+      return row.id
+    },
+    // table选中加上选中状态
+    tableRowClassName({ row, rowIndex }) {
+      // console.log('添加类名', row, rowIndex)
+      let color = ''
+      this.selections.forEach(item => {
+        if (item.id === row.id) {
+          color = 'rowStyle'
+        }
+      })
+      return color
+    },
+    // table - 全选
+    selectAll(val) {
+      this.selections = val
+    },
+    // table - 双击查看详情
+    tableDoubleClick(row) {
+      if (this.timer) {
+        clearTimeout(this.timer)
+      }
+      console.log('tableDoubleClick', row)
+      this.arcId = row.id
+      console.log(this.selectedCategory.isType)
+      this.$refs.archivesInfo.isHasFile = true
+      this.$refs.archivesInfo.detailTitle = '卷内详情'
+      this.$refs.archivesInfo.archivesInfoVisible = true
+      this.$refs.archivesInfo.archivesTabIndex = 0
+      // this.$refs.archivesInfo.getDetial(row.id)
+    },
+    // table - 当前选中得row
+    clickRowHandler(row) {
+      console.log('clickRowHandler', row)
+      if (this.timer) {
+        clearTimeout(this.timer)
+      }
+      this.timer = setTimeout(() => {
+        this.openFile()
+      }, 300)
+      this.selections = this.crud.selections
+    },
+    // 触发单选
+    handleCurrentChange(selection, row) {
+      console.log('触发单选', row)
+      this.selections = selection
+    },
+    handleSizeChange(size) {
+      this.page.size = size
+      this.page.page = 1
+    },
+    handleCurrentPage(val) {
+      this.page.page = val
+    },
+    /* 重新渲染table组件 防止table-fixed 错位 配合watch-table数据 */
+    doLayout() {
+      // this.$nextTick(() => {
+      //   this.$refs.table.doLayout()
+      // })
     }
   }
 }
diff --git a/src/views/collectReorganizi/collectionLibrary/juannei/tableData.json b/src/views/collectReorganizi/collectionLibrary/juannei/tableData.json
new file mode 100644
index 0000000..33c25cc
--- /dev/null
+++ b/src/views/collectReorganizi/collectionLibrary/juannei/tableData.json
@@ -0,0 +1,60 @@
+{
+  "code": 200,
+  "message": "操作成功",
+  "data": {
+      "list": {
+          "content": [
+              {
+                  "case_no": "746DF968E7E629CAEFF889",
+                  "responsibleby": "发文机关003",
+                  "children_num": 0,
+                  "tid": "",
+                  "medium_qty": "1",
+                  "maintitle": "发文标题003",
+                  "security_class": "秘密",
+                  "archive_year": 2023,
+                  "archive_no": "AA001-Y-WS.W-2023-001-001",
+                  "created_date": "2023-07-02",
+                  "id": "17D5B3A9B0A0092CA96DAE",
+                  "is_storage": 2,
+                  "is_borrow": 3
+              },
+              {
+                  "case_no": "746DF968E7E629CAEFF889",
+                  "responsibleby": "",
+                  "children_num": 0,
+                  "tid": "",
+                  "medium_qty": "0",
+                  "maintitle": "卷册01002",
+                  "security_class": "秘密",
+                  "archive_year": 2023,
+                  "archive_no": "AA001-Y-WS.W-2023-001-002",
+                  "created_date": "",
+                  "id": "8B7D6D926100324DFCCDA5",
+                  "is_storage": 2,
+                  "is_borrow": 3
+              },
+              {
+                  "case_no": "746DF968E7E629CAEFF889",
+                  "responsibleby": "",
+                  "children_num": 0,
+                  "tid": "",
+                  "medium_qty": "0",
+                  "maintitle": "",
+                  "security_class": "秘密",
+                  "archive_year": 2023,
+                  "archive_no": "AA001-Y-WS.W-2023-001-003",
+                  "created_date": "",
+                  "id": "90EC69CA21CD3417E1ACE6",
+                  "is_storage": 2,
+                  "is_borrow": ""
+              }
+          ],
+          "totalElements": 3
+      },
+      "yearGroup": [
+          2023
+      ]
+  },
+  "timestamp": 1689662267142
+}
\ No newline at end of file
diff --git a/src/views/collectReorganizi/collectionLibrary/juannei/tableFields.json b/src/views/collectReorganizi/collectionLibrary/juannei/tableFields.json
new file mode 100644
index 0000000..abacbf4
--- /dev/null
+++ b/src/views/collectReorganizi/collectionLibrary/juannei/tableFields.json
@@ -0,0 +1,285 @@
+{
+  "code": 200,
+  "message": "操作成功",
+  "data": [
+      {
+          "id": "5385EE4261D5D5D69C86D1",
+          "categoryId": "F0F59CC713C83AE4BAB99B",
+          "dictionaryConfigId": null,
+          "fieldName": "archive_year",
+          "fieldCnName": "年度",
+          "isDefaultValue": "",
+          "isInputClass": "number",
+          "isDataType": 2,
+          "isDataTypeDetails": "int",
+          "isColumnLength": 4,
+          "isColumnType": 2,
+          "isSequence": 4,
+          "isType": 2,
+          "isSystem": true,
+          "isLine": null,
+          "isInput": true,
+          "isRequired": null,
+          "isAutomatic": null,
+          "isAdd": null,
+          "isSearch": null,
+          "isInherit": null,
+          "isFilling": null,
+          "fillingDigit": null,
+          "isRepeat": null,
+          "isDisplay": true,
+          "displayOrder": 1,
+          "displayOrderBy": null,
+          "isDisplayformat": true,
+          "displayformatType": "center",
+          "editLength": 196,
+          "displayLength": 100,
+          "queue": null,
+          "create_by": "admin",
+          "update_by": "admin",
+          "create_time": 1687319105000,
+          "update_time": 1688020466000
+      },
+      {
+          "id": "2604E1A40EB3B355A3C370",
+          "categoryId": "F0F59CC713C83AE4BAB99B",
+          "dictionaryConfigId": null,
+          "fieldName": "archive_no",
+          "fieldCnName": "档号",
+          "isDefaultValue": "",
+          "isInputClass": "text",
+          "isDataType": 1,
+          "isDataTypeDetails": "varchar",
+          "isColumnLength": 200,
+          "isColumnType": 2,
+          "isSequence": 6,
+          "isType": 2,
+          "isSystem": true,
+          "isLine": true,
+          "isInput": true,
+          "isRequired": false,
+          "isAutomatic": true,
+          "isAdd": null,
+          "isSearch": null,
+          "isInherit": null,
+          "isFilling": false,
+          "fillingDigit": null,
+          "isRepeat": null,
+          "isDisplay": true,
+          "displayOrder": 2,
+          "displayOrderBy": "asc",
+          "isDisplayformat": null,
+          "displayformatType": "left",
+          "editLength": 510,
+          "displayLength": 250,
+          "queue": 1,
+          "create_by": "admin",
+          "update_by": "admin",
+          "create_time": 1687319105000,
+          "update_time": 1688020466000
+      },
+      {
+          "id": "E8AAD60B450EF88BA7415D",
+          "categoryId": "F0F59CC713C83AE4BAB99B",
+          "dictionaryConfigId": null,
+          "fieldName": "maintitle",
+          "fieldCnName": "题名",
+          "isDefaultValue": "",
+          "isInputClass": "text",
+          "isDataType": 1,
+          "isDataTypeDetails": "varchar",
+          "isColumnLength": 1000,
+          "isColumnType": 2,
+          "isSequence": 7,
+          "isType": 2,
+          "isSystem": true,
+          "isLine": true,
+          "isInput": true,
+          "isRequired": false,
+          "isAutomatic": false,
+          "isAdd": null,
+          "isSearch": null,
+          "isInherit": null,
+          "isFilling": false,
+          "fillingDigit": null,
+          "isRepeat": null,
+          "isDisplay": true,
+          "displayOrder": 3,
+          "displayOrderBy": null,
+          "isDisplayformat": null,
+          "displayformatType": "left",
+          "editLength": 510,
+          "displayLength": 450,
+          "queue": null,
+          "create_by": "admin",
+          "update_by": "admin",
+          "create_time": 1687319105000,
+          "update_time": 1688020466000
+      },
+      {
+          "id": "3DCF574299CB2061F07E06",
+          "categoryId": "F0F59CC713C83AE4BAB99B",
+          "dictionaryConfigId": null,
+          "fieldName": "keyword",
+          "fieldCnName": "主题词",
+          "isDefaultValue": "",
+          "isInputClass": "text",
+          "isDataType": 1,
+          "isDataTypeDetails": "varchar",
+          "isColumnLength": 1000,
+          "isColumnType": 2,
+          "isSequence": 8,
+          "isType": 2,
+          "isSystem": true,
+          "isLine": true,
+          "isInput": true,
+          "isRequired": false,
+          "isAutomatic": false,
+          "isAdd": null,
+          "isSearch": null,
+          "isInherit": null,
+          "isFilling": false,
+          "fillingDigit": null,
+          "isRepeat": null,
+          "isDisplay": true,
+          "displayOrder": 4,
+          "displayOrderBy": null,
+          "isDisplayformat": null,
+          "displayformatType": "center",
+          "editLength": 510,
+          "displayLength": 100,
+          "queue": null,
+          "create_by": "admin",
+          "update_by": "admin",
+          "create_time": 1687319105000,
+          "update_time": 1688020466000
+      },
+      {
+          "id": "DD1AC11CFC48B42B152DD1",
+          "categoryId": "F0F59CC713C83AE4BAB99B",
+          "dictionaryConfigId": {
+              "id": "8984F55841E2D541C23318",
+              "dicName": "密级",
+              "dicCode": "Search_MJ",
+              "dicExplain": null,
+              "dicSequence": 2,
+              "dicType": true,
+              "dicPid": null,
+              "create_by": "admin",
+              "update_by": "admin",
+              "create_time": 1656921207000,
+              "update_time": 1656991705000
+          },
+          "fieldName": "security_class",
+          "fieldCnName": "密级",
+          "isDefaultValue": "",
+          "isInputClass": "select",
+          "isDataType": 1,
+          "isDataTypeDetails": "varchar",
+          "isColumnLength": 10,
+          "isColumnType": 2,
+          "isSequence": 9,
+          "isType": 2,
+          "isSystem": true,
+          "isLine": false,
+          "isInput": true,
+          "isRequired": false,
+          "isAutomatic": false,
+          "isAdd": null,
+          "isSearch": null,
+          "isInherit": null,
+          "isFilling": false,
+          "fillingDigit": null,
+          "isRepeat": null,
+          "isDisplay": true,
+          "displayOrder": 5,
+          "displayOrderBy": null,
+          "isDisplayformat": null,
+          "displayformatType": "center",
+          "editLength": 196,
+          "displayLength": 150,
+          "queue": null,
+          "create_by": "admin",
+          "update_by": "admin",
+          "create_time": 1687319105000,
+          "update_time": 1688020466000
+      },
+      {
+          "id": "AB02D37F2F2F86A255DE91",
+          "categoryId": "F0F59CC713C83AE4BAB99B",
+          "dictionaryConfigId": null,
+          "fieldName": "begin_date",
+          "fieldCnName": "开始时间",
+          "isDefaultValue": "",
+          "isInputClass": "text",
+          "isDataType": 1,
+          "isDataTypeDetails": "varchar",
+          "isColumnLength": 20,
+          "isColumnType": 2,
+          "isSequence": 13,
+          "isType": 2,
+          "isSystem": true,
+          "isLine": null,
+          "isInput": true,
+          "isRequired": null,
+          "isAutomatic": null,
+          "isAdd": null,
+          "isSearch": null,
+          "isInherit": null,
+          "isFilling": null,
+          "fillingDigit": null,
+          "isRepeat": null,
+          "isDisplay": true,
+          "displayOrder": 6,
+          "displayOrderBy": null,
+          "isDisplayformat": null,
+          "displayformatType": "center",
+          "editLength": 196,
+          "displayLength": 100,
+          "queue": null,
+          "create_by": "admin",
+          "update_by": "admin",
+          "create_time": 1687319105000,
+          "update_time": 1688020466000
+      },
+      {
+          "id": "A9F24C3CDC805513389502",
+          "categoryId": "F0F59CC713C83AE4BAB99B",
+          "dictionaryConfigId": null,
+          "fieldName": "piece_qty",
+          "fieldCnName": "文件件数",
+          "isDefaultValue": "",
+          "isInputClass": "text",
+          "isDataType": 1,
+          "isDataTypeDetails": "varchar",
+          "isColumnLength": 20,
+          "isColumnType": 2,
+          "isSequence": 12,
+          "isType": 2,
+          "isSystem": true,
+          "isLine": null,
+          "isInput": true,
+          "isRequired": null,
+          "isAutomatic": null,
+          "isAdd": null,
+          "isSearch": null,
+          "isInherit": null,
+          "isFilling": null,
+          "fillingDigit": null,
+          "isRepeat": null,
+          "isDisplay": true,
+          "displayOrder": 7,
+          "displayOrderBy": null,
+          "isDisplayformat": null,
+          "displayformatType": "right",
+          "editLength": 196,
+          "displayLength": 150,
+          "queue": null,
+          "create_by": "admin",
+          "update_by": "admin",
+          "create_time": 1687319105000,
+          "update_time": 1688020466000
+      }
+  ],
+  "timestamp": 1689662262334
+}
\ No newline at end of file
diff --git a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
index 222ce5f..2581be8 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
@@ -21,12 +21,13 @@
           <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 index="1-3" @click="toDelete">删除</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>
           <el-menu-item-group v-if="(isTitleType === 3 && selectedCategory.isType === 5) || isTitleType === 4 || isTitleType === 6 || (isTitleType === 3 && activeIndex === 1)" class="collect-submenu-group submenu-tree">
             <template slot="title">原文上传</template>
-            <el-menu-item index="1-4">普通上传</el-menu-item>
-            <el-menu-item index="1-5">大文件上传</el-menu-item>
+            <el-menu-item index="1-5" @click="normalUpload">普通上传</el-menu-item>
+            <el-menu-item index="1-6" @click="largeFileUpload">大文件上传</el-menu-item>
           </el-menu-item-group>
         </el-submenu>
         <el-submenu v-if="isTitleType !== 6" index="2">
@@ -38,24 +39,24 @@
             <el-menu-item v-if="isTitleType !== 2" index="2-1">批量导入</el-menu-item>
             <!-- 项目 / 案卷 / 卷内 / 文件-->
             <el-menu-item v-if="activeIndex !== 1 || (isTitleType === 3 && selectedCategory.isType === 5 && activeIndex === 1)" index="2-2">批量修改</el-menu-item>
-            <el-menu-item v-if="isTitleType !== 2 && !(selectedCategory.isType === 3 && activeIndex === 1)" index="2-3">档案调整</el-menu-item>
-            <el-menu-item v-if="isTitleType !== 2 && !(selectedCategory.isType === 3 && activeIndex === 1)" index="2-4">档号更新</el-menu-item>
+            <el-menu-item v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1)" index="2-3">档案调整</el-menu-item>
+            <el-menu-item v-if="isTitleType !== 2 && !(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1)" index="2-4">档号更新</el-menu-item>
             <!-- 案卷 -->
-            <el-menu-item v-if="isTitleType === 3 && selectedCategory.isType === 3 && activeIndex === 0" index="2-5">卷内档号更新</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 && selectedCategory.isType === 3 && activeIndex === 0" index="2-6">拆卷</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 && selectedCategory.isType === 3 && activeIndex === 0" index="2-7">合卷</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 && selectedCategory.isType === 3" index="2-8">插件</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.isType !== 5 " index="2-5">卷内档号更新</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.isType !== 5" index="2-6">拆卷</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0 && selectedCategory.isType !== 5" index="2-7">合卷</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && selectedCategory.isType !== 5" index="2-8">插件</el-menu-item>
             <!-- 案卷 / 卷内 / 文件 -->
-            <el-menu-item v-if="isTitleType !== 2" index="2-10">移动</el-menu-item>
+            <el-menu-item v-if="isTitleType !== 2" index="2-9">移动</el-menu-item>
             <!-- 案卷 -->
-            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0" index="2-11">归档</el-menu-item>
+            <el-menu-item v-if="isTitleType === 3 && activeIndex === 0" index="2-10">归档</el-menu-item>
             <!-- 文件 -->
-            <el-menu-item v-if="(isTitleType === 3 && selectedCategory.isType === 5) || (isTitleType === 3 && activeIndex === 1)" index="2-9">退回预归档库</el-menu-item>
+            <el-menu-item v-if="(isTitleType === 3 && selectedCategory.isType === 5) || (isTitleType === 3 && activeIndex === 1)" index="2-11">退回预归档库</el-menu-item>
           </el-menu-item-group>
-          <el-menu-item-group v-if="isTitleType === 3 && selectedCategory.isType === 3 && activeIndex === 1" class="collect-submenu-group submenu-tree">
+          <el-menu-item-group v-if="isTitleType === 3 && activeIndex === 1 && selectedCategory.isType !== 5" class="collect-submenu-group submenu-tree">
             <template slot="title">组卷</template>
-            <el-menu-item index="1-4">快速组卷</el-menu-item>
-            <el-menu-item index="1-5">手工组卷</el-menu-item>
+            <el-menu-item index="2-12">快速组卷</el-menu-item>
+            <el-menu-item index="2-13">手工组卷</el-menu-item>
           </el-menu-item-group>
         </el-submenu>
         <el-submenu index="3">
@@ -65,11 +66,11 @@
           </template>
           <el-menu-item-group class="collect-submenu-group">
             <el-menu-item v-if="isTitleType !== 6" index="3-1">导出</el-menu-item>
-            <el-menu-item v-if="(isTitleType === 3 && !(selectedCategory.isType === 3 && activeIndex === 1)) || isTitleType === 4 " index="3-2">打印</el-menu-item>
-            <el-menu-item v-if="(isTitleType === 3 && !(selectedCategory.isType === 3 && activeIndex === 1)) || isTitleType === 4 " index="3-3">四性检测</el-menu-item>
-            <el-menu-item v-if="isTitleType === 6 " index="3-4">下载</el-menu-item>
+            <el-menu-item v-if="!(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" index="3-2">打印</el-menu-item>
+            <el-menu-item v-if="!(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" index="3-3">四性检测</el-menu-item>
+            <el-menu-item v-if="isTitleType === 6" index="3-4">下载</el-menu-item>
           </el-menu-item-group>
-          <el-menu-item-group v-if="(isTitleType === 3 && !(selectedCategory.isType === 3 && activeIndex === 1)) || isTitleType === 4 " class="collect-submenu-group submenu-tree">
+          <el-menu-item-group v-if="!(isTitleType === 3 && (selectedCategory.isType === 3 || selectedCategory.isType === 2) && activeIndex === 1) && (isTitleType !== 2 && isTitleType !== 6)" class="collect-submenu-group submenu-tree">
             <template slot="title">电子文件目录</template>
             <el-menu-item index="3-5">目录下载</el-menu-item>
             <el-menu-item index="3-6">目录上传</el-menu-item>
@@ -105,6 +106,34 @@
       </div>
     </el-dialog>
 
+    <!--卷内移出 组件-->
+    <el-dialog class="tip-dialog" title="提示" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="moveVisible">
+      <div class="setting-dialog">
+        <div class="tip-content">
+          <p class="tipMsg">此移出将把会所选条目返还到未整理列表</p>
+          <span>你是否还要继续?</span>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="moveVisible = false">取消</el-button>
+          <el-button type="primary" @click.native="handleMoveConfirm">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 普通上传 -->
+    <el-dialog class="tip-dialog" title="提示" :close-on-click-modal="false" :modal-append-to-body="false" append-to-body :visible.sync="moveVisible">
+      <div class="setting-dialog">
+        <div class="tip-content">
+          <p class="tipMsg">此移出将把会所选条目返还到未整理列表</p>
+          <span>你是否还要继续?</span>
+        </div>
+        <div slot="footer" class="dialog-footer">
+          <el-button type="text" @click="moveVisible = false">取消</el-button>
+          <el-button type="primary" @click.native="handleMoveConfirm">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -151,7 +180,8 @@ export default {
       formVisible: false,
       formTitle: '项目',
       formPreviewData: [], // 预览界面data
-      deleteVisible: false
+      deleteVisible: false,
+      moveVisible: false
     }
   },
   computed: {
@@ -162,7 +192,11 @@ export default {
         if (this.selectedCategory.isType === 5) {
           return '文件'
         } else {
-          return '案卷'
+          if (this.activeIndex === 1) {
+            return '文件'
+          } else {
+            return '案卷'
+          }
         }
       } else if (this.isTitleType === 4) {
         return '卷内'
@@ -219,7 +253,6 @@ export default {
         this.formVisible = true
         this.formTitle = '编辑' + this.collectTitle
       }
-
       // this.form.dictionaryConfigId = {}
       // this.formPreviewData = []
       // 档案预编辑获取字段
@@ -240,6 +273,7 @@ export default {
       this.formVisible = false
       done()
     },
+    // 删除
     toDelete() {
       if (this.selections.length === 0) {
         this.$message('您还未勾选需要操作的条目，请先确认！')
@@ -247,8 +281,35 @@ export default {
       }
       this.deleteVisible = true
     },
+    // 卷内 - 移除
+    toMove() {
+      if (this.selections.length === 0) {
+        this.$message('您还未勾选需要操作的条目，请先确认！')
+        return false
+      }
+      this.moveVisible = true
+    },
+    // 删除 - 确认
     handleDelConfirm() {
       this.deleteVisible = false
+    },
+    // 卷内 - 移除 确认
+    handleMoveConfirm() {
+      this.moveVisible = false
+    },
+    // 普通上传
+    normalUpload() {
+      if (this.selections.length === 0) {
+        this.$message('您还未勾选需要操作的条目，请先确认！')
+        return false
+      }
+    },
+    // 大文件上传
+    largeFileUpload() {
+      if (this.selections.length === 0) {
+        this.$message('您还未勾选需要操作的条目，请先确认！')
+        return false
+      }
     }
   }
 }