From 467b5916665eb02ca8975e9e0bbee7a24f3abf24 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Mon, 17 Jul 2023 17:32:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=9B=86=E5=BA=93=20-=20=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E9=83=A8=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/svg/s-sjzb.svg               |   1 +
 src/router/index.js                           |   2 +-
 src/router/routers.js                         |  14 -
 .../collectionLibrary/anjuan/content.vue      |  33 +-
 .../collectionLibrary/anjuan/sorted.vue       | 170 ++++++++++-
 .../collectionLibrary/anjuan/tableData.json   |  45 +++
 .../collectionLibrary/anjuan/tableFields.json | 285 ++++++++++++++++++
 .../module/collectHeader.vue                  |  73 +++--
 8 files changed, 562 insertions(+), 61 deletions(-)
 create mode 100644 src/assets/icons/svg/s-sjzb.svg
 create mode 100644 src/views/collectReorganizi/collectionLibrary/anjuan/tableData.json
 create mode 100644 src/views/collectReorganizi/collectionLibrary/anjuan/tableFields.json

diff --git a/src/assets/icons/svg/s-sjzb.svg b/src/assets/icons/svg/s-sjzb.svg
new file mode 100644
index 0000000..2814773
--- /dev/null
+++ b/src/assets/icons/svg/s-sjzb.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1689576981628" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4323" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M947.2 486.4c-70.4-38.4-108.8-115.2-108.8-192V96c0-19.2-12.8-32-32-32H211.2c-19.2 0-32 12.8-32 32v198.4c0 76.8-38.4 153.6-108.8 192-25.6 12.8-38.4 38.4-38.4 70.4V960c0 32 25.6 64 64 64h832c32 0 64-25.6 64-64V556.8c0-44.8-19.2-51.2-44.8-70.4z m-780.8 6.4c44.8-51.2 76.8-121.6 76.8-192V140.8c0-6.4 6.4-12.8 12.8-12.8h505.6c6.4 0 12.8 6.4 12.8 12.8v153.6c0 70.4 25.6 140.8 76.8 192 6.4 6.4 0 25.6-12.8 25.6h-102.4c-12.8 0-19.2 6.4-25.6 19.2l-25.6 76.8c-6.4 12.8-12.8 19.2-25.6 19.2H371.2c-12.8 0-19.2-6.4-25.6-19.2L320 531.2C313.6 512 294.4 512 281.6 512H179.2c-12.8 0-19.2-12.8-12.8-19.2z m768 441.6s0 32-38.4 32H121.6c-19.2 0-32-12.8-32-32V601.6c0-19.2 12.8-32 32-32H256s6.4 0 6.4 6.4l25.6 70.4c6.4 25.6 32 38.4 57.6 38.4h332.8c25.6 0 51.2-19.2 57.6-38.4 0 0 25.6-64 25.6-70.4s6.4-6.4 6.4-6.4h134.4c19.2 0 32 12.8 32 32v332.8z" fill="#FFFFFF" p-id="4324"></path><path d="M659.2 249.6H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32s-12.8 32-32 32zM659.2 371.2H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32 0 12.8-12.8 32-32 32zM659.2 486.4H358.4c-19.2 0-32-12.8-32-32s12.8-32 32-32h300.8c19.2 0 32 12.8 32 32s-12.8 32-32 32z" fill="#FFFFFF" p-id="4325"></path></svg>
\ No newline at end of file
diff --git a/src/router/index.js b/src/router/index.js
index f56d97d..47be649 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -9,7 +9,7 @@ import { filterAsyncRouter } from '@/store/modules/permission'
 
 NProgress.configure({ showSpinner: false })// NProgress Configuration
 
-const whiteList = ['/login', '/collectionLibrary']// no redirect whitelist
+const whiteList = ['/login']// no redirect whitelist
 
 router.beforeEach((to, from, next) => {
   if (to.meta.title) {
diff --git a/src/router/routers.js b/src/router/routers.js
index 38ffa5b..850bb84 100644
--- a/src/router/routers.js
+++ b/src/router/routers.js
@@ -62,20 +62,6 @@ export const constantRouterMap = [
     path: '/environmentalScreen',
     component: (resolve) => require(['@/views/environmentalScreen/index'], resolve),
     hidden: true
-  },
-  {
-    path: '/collectReorganizi',
-    component: Layout,
-    hidden: true,
-    redirect: 'noredirect',
-    children: [
-      {
-        path: '/collectionLibrary',
-        component: (resolve) => require(['@/views/collectReorganizi/collectionLibrary/index'], resolve),
-        name: '收集库',
-        meta: { title: '收集库' }
-      }
-    ]
   }
 ]
 
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
index b8abc98..793e8b0 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/content.vue
@@ -6,20 +6,21 @@
       <!-- 最右侧装饰img -->
       <span class="tab-right-img" />
     </ul>
-    <CollectHeader :is-title-type="isTitleType" :selected-category="selectedCategory" />
-    <component :is="comName" />
-    <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>
+    <!-- <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> -->
   </div>
 </template>
 
 <script>
 import SortedModule from './sorted.vue'
-import UnSortedModule from './unsorted.vue'
-import CollectHeader from '../module/collectHeader.vue'
+// import UnSortedModule from './unsorted.vue'
+// import CollectHeader from '../module/collectHeader.vue'
 export default {
   name: 'AnjuanContent',
-  components: { SortedModule, UnSortedModule, CollectHeader },
+  components: { SortedModule },
   props: {
     data: {
       type: String,
@@ -38,29 +39,11 @@ export default {
       activeIndex: 0
     }
   },
-  computed: {
-    comName: function() {
-      if (this.activeIndex === 0) {
-        return 'SortedModule'
-      } else if (this.activeIndex === 1) {
-        return 'UnSortedModule'
-      }
-      return 'SortedModule'
-    }
-  },
   created() {
   },
   mounted() {
   },
   methods: {
-    openJuannei() {
-      // this.$emit('openJuannei', '这是来自案卷的通知')
-      if (this.selectedCategory.isType === 2) {
-        this.$parent.$parent.$emit('openJuannei')
-      } else {
-        this.$parent.$emit('openJuannei')
-      }
-    },
     changeActiveTab(data) {
       this.activeIndex = data
     }
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/sorted.vue b/src/views/collectReorganizi/collectionLibrary/anjuan/sorted.vue
index 9fd98fc..63609eb 100644
--- a/src/views/collectReorganizi/collectionLibrary/anjuan/sorted.vue
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/sorted.vue
@@ -1,24 +1,190 @@
 <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"
+      class="archives-table"
+      :data="anjuanData"
+      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" :reserve-selection="true" width="55" align="center" />
+      <el-table-column type="index" label="序号" width="55" align="center" />
+      <el-table-column :label=" selectedCategory.isType === 5 ? '文件':'卷内'" 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" />
   </div>
 </template>
 
 <script>
+import { header, form } from '@crud/crud'
+import ArchivesInfo from '../module/archivesInfo/index'
+import CollectHeader from '../module/collectHeader.vue'
+import tableFields from './tableFields.json'
+import tableData from './tableData.json'
 export default {
   name: 'Sorted',
-  components: { },
+  components: { ArchivesInfo, CollectHeader },
+  mixins: [
+    header(),
+    form({})
+  ],
   props: {
+    isTitleType: {
+      type: Number,
+      default: 3
+    },
+    selectedCategory: {
+      type: Object,
+      default: function() {
+        return {}
+      }
+    },
+    activeIndex: {
+      type: Number,
+      default: 0
+    }
   },
   data() {
     return {
+      anjuanData: [],
+      tableDisplayFields: [], // table-list-title字段
+      getTableDisplayFieldsLoading: false, // table-loading
+      selections: [],
+      categoryId: 'F0F59CC713C83AE4BAB99B',
+      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.anjuanData = tableData.data.list.content
   },
   mounted() {
   },
   methods: {
+    openJuannei() {
+      // this.$emit('openJuannei', '这是来自案卷的通知')
+      if (this.selectedCategory.isType === 2) {
+        this.$parent.$parent.$parent.$emit('openJuannei')
+      } else {
+        this.$parent.$parent.$emit('openJuannei')
+      }
+    },
+    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)
+      if (this.selectedCategory.isType === 3) {
+        this.$refs.archivesInfo.detailTitle = '案卷详情'
+      } else {
+        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.openJuannei()
+      }, 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()
+      })
+    }
   }
 }
 </script>
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/tableData.json b/src/views/collectReorganizi/collectionLibrary/anjuan/tableData.json
new file mode 100644
index 0000000..3d505f4
--- /dev/null
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/tableData.json
@@ -0,0 +1,45 @@
+{
+  "code": 200,
+  "message": "操作成功",
+  "data": {
+      "list": {
+          "content": [
+              {
+                  "case_no": "746DF968E7E629CAEFF889",
+                  "begin_date": "2023-07-02",
+                  "piece_qty": "3",
+                  "children_num": 3,
+                  "tid": "",
+                  "maintitle": "测试案卷001",
+                  "security_class": "秘密",
+                  "archive_year": 2023,
+                  "archive_no": "AA001-Y-WS.W-2023-001",
+                  "id": "256E752BC0280618840600",
+                  "is_storage": 2,
+                  "keyword": "测试主题词001",
+                  "is_borrow": 3
+              },
+              {
+                  "case_no": "EFF2101F6A116FFC93B35A",
+                  "begin_date": "",
+                  "piece_qty": "2",
+                  "children_num": 2,
+                  "tid": "",
+                  "maintitle": "测试案卷002",
+                  "security_class": "机密",
+                  "archive_year": 2023,
+                  "archive_no": "AA001-Y-WS.W-2023-002",
+                  "id": "F33725454340EA10A2C8B9",
+                  "is_storage": 1,
+                  "keyword": "",
+                  "is_borrow": ""
+              }
+          ],
+          "totalElements": 2
+      },
+      "yearGroup": [
+          2023
+      ]
+  },
+  "timestamp": 1689579707329
+}
\ No newline at end of file
diff --git a/src/views/collectReorganizi/collectionLibrary/anjuan/tableFields.json b/src/views/collectReorganizi/collectionLibrary/anjuan/tableFields.json
new file mode 100644
index 0000000..1fbaf3f
--- /dev/null
+++ b/src/views/collectReorganizi/collectionLibrary/anjuan/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": 1689579706946
+}
\ 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 fed14dd..222ce5f 100644
--- a/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
+++ b/src/views/collectReorganizi/collectionLibrary/module/collectHeader.vue
@@ -9,7 +9,7 @@
     </div>
     <div class="collect-menu">
       <el-menu
-        :default-active="activeIndex"
+        :default-active="activeMenuIndex"
         mode="horizontal"
         @select="handleSelect"
       >
@@ -21,9 +21,9 @@
           <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">删除</el-menu-item>
+            <el-menu-item index="1-3" @click="toDelete">删除</el-menu-item>
           </el-menu-item-group>
-          <el-menu-item-group v-if="(isTitleType === 3 && selectedCategory.isType === 5) || isTitleType === 4 || isTitleType === 6" class="collect-submenu-group submenu-tree">
+          <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>
@@ -37,20 +37,25 @@
           <el-menu-item-group class="collect-submenu-group">
             <el-menu-item v-if="isTitleType !== 2" index="2-1">批量导入</el-menu-item>
             <!-- 项目 / 案卷 / 卷内 / 文件-->
-            <el-menu-item index="2-2">批量修改</el-menu-item>
-            <el-menu-item v-if="isTitleType !== 2" index="2-3">档案调整</el-menu-item>
-            <el-menu-item v-if="isTitleType !== 2" index="2-4">档号更新</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 === 3 && selectedCategory.isType === 3" index="2-5">卷内档号更新</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 && selectedCategory.isType === 3" index="2-6">拆卷</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 && selectedCategory.isType === 3" index="2-7">合卷</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 && selectedCategory.isType === 5" index="2-9">退回预归档库</el-menu-item>
             <!-- 案卷 / 卷内 / 文件 -->
             <el-menu-item v-if="isTitleType !== 2" index="2-10">移动</el-menu-item>
             <!-- 案卷 -->
-            <el-menu-item v-if="isTitleType === 3" index="2-11">归档</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 && selectedCategory.isType === 5) || (isTitleType === 3 && activeIndex === 1)" index="2-9">退回预归档库</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">
+            <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-group>
         </el-submenu>
         <el-submenu index="3">
@@ -60,11 +65,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 || isTitleType === 4" index="3-2">打印</el-menu-item>
-            <el-menu-item v-if="isTitleType === 3 || 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 && 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-group>
-          <el-menu-item-group v-if="isTitleType === 3 || isTitleType === 4" class="collect-submenu-group submenu-tree">
+          <el-menu-item-group v-if="(isTitleType === 3 && !(selectedCategory.isType === 3 && activeIndex === 1)) || isTitleType === 4 " 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>
@@ -85,6 +90,21 @@
         </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="deleteVisible">
+      <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="deleteVisible = false">取消</el-button>
+          <el-button type="primary" @click.native="handleDelConfirm">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -116,6 +136,10 @@ export default {
       default: function() {
         return []
       }
+    },
+    activeIndex: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -123,10 +147,11 @@ export default {
       query: {
         blurry: ''
       },
-      activeIndex: '1',
+      activeMenuIndex: '1',
       formVisible: false,
       formTitle: '项目',
-      formPreviewData: [] // 预览界面data
+      formPreviewData: [], // 预览界面data
+      deleteVisible: false
     }
   },
   computed: {
@@ -180,7 +205,7 @@ export default {
       if (type === 'add') {
         this.formVisible = true
         this.formTitle = '新增' + this.collectTitle
-        this.arcId = null
+        // this.arcId = null
       } else if (type === 'edit') {
         console.log(this.selections)
         // this.arcId = this.selections[0].id
@@ -214,6 +239,16 @@ export default {
     handleClose(done) {
       this.formVisible = false
       done()
+    },
+    toDelete() {
+      if (this.selections.length === 0) {
+        this.$message('您还未勾选需要操作的条目，请先确认！')
+        return false
+      }
+      this.deleteVisible = true
+    },
+    handleDelConfirm() {
+      this.deleteVisible = false
     }
   }
 }