档案管理 bug/icon添加/智能分类

3 years ago · 9e13e384f1
17 changed files with 179 additions and 110 deletions
--- a/src/assets/icons/svg/bindbiaoqian.svg
+++ b/src/assets/icons/svg/bindbiaoqian.svg
@ -3,7 +3,6 @@
 <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#FFFFFF;}
 </style>
 <g id="绑定" transform="translate(-2.788 -2.787)">
 	<path id="矩形_300" class="st0" d="M862.94,38.86L990.67,166.6c48.1,48.1,48.1,126.09,0,174.19L793.26,538.19
--- a/src/assets/icons/svg/chehui.svg
+++ b/src/assets/icons/svg/chehui.svg
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 861.3" style="enable-background:new 0 0 1024 861.3;" xml:space="preserve">
+<style type="text/css">
+</style>
+<path class="st0" d="M939.7,474.4c-47.1-68.9-110.7-124.9-184.9-163c-73.2-38.2-152.6-63.5-234.5-74.7V72.1
+	c0.2-25.8-13.6-49.7-36-62.5c-22.3-12.8-49.8-12.8-72.1,0l-1.6,0.8c-1.1,0.5-2.3,1.2-3.3,2.1L32.7,358.9C12.3,372.4,0.2,395,0,419.4
+	c0,24.3,12.2,47,32.4,60.5l373.3,348.9c1,0.9,2,1.7,3.3,2.1l1.6,1.3c11,6.2,23.3,9.5,36,9.5c12.6,0,25-3.3,36-9.5
+	c22.7-12.6,36.6-36.6,36.5-62.5l1-231c122.2,0.2,240.4,43.5,333.9,122.2c43,36.3,79.2,79.9,107.1,128.7l30.7,62.1
+	c3,5.7,8.9,9.3,15.3,9.2c1.1,0,2.5,0,3.6,0c7.9-1.7,13.5-8.7,13.3-16.8v-69.1C1026.6,668.5,997.4,563.8,939.7,474.4z M897.5,611.4
+	c-49.1-42.2-105.1-75.6-165.5-98.9c-72.1-27.2-148.8-40.8-225.8-40.3h-2.6h-32.4c-9.2,0-16.8,7.6-16.8,16.8l-1.6,280.6
+	c0.2,2.2-1,4.3-3,5.4c-1.3,0.6-2.6,0.9-4.1,0.8l-372-347.6c-0.8-0.8-1.8-1.5-3-2.1l-1.6-0.8c-2.1-1.2-3.3-3.4-3.3-5.8
+	c0-2.3,1.3-4.3,3.3-5.4l1.6-0.8c0.8-0.8,2.1-1.3,3-2.5L447,66l0.7-0.6c1.1,0,2.1,0.4,3.1,1c2.1,1,3.3,3.1,3.3,5.4v211.1
+	c0,9.3,7.6,16.8,16.8,16.8h22.8c80.5,8.9,158.6,32.7,230.4,70c114.3,56.8,196.1,163,221.9,288.1
+	C930.7,641.3,914.6,625.9,897.5,611.4z"/>
+</svg>
--- a/src/assets/icons/svg/huanyuan-fanbai.svg
+++ b/src/assets/icons/svg/huanyuan-fanbai.svg
@ -3,7 +3,6 @@
 <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#FFFFFF;}
 </style>
 <g id="还原" transform="translate(-448 -180.064)">
 	<path id="减去_3" class="st0" d="M832.5,1192.4h-99.2c-76.1-0.1-137.7-61.7-137.8-137.8V391.1H483.2
--- a/src/assets/icons/svg/jieyue.svg
+++ b/src/assets/icons/svg/jieyue.svg
@ -3,7 +3,6 @@
 <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#FFFFFF;}
 </style>
 <path id="借阅" class="st0" d="M794.2,870.5c0,34.1-27.7,61.8-61.8,61.8H287.3c-34.1-0.1-61.7-27.7-61.8-61.8V214.7h568.8V870.5z
 	 M349.1,103.9c-0.1-6.9,5.4-12.6,12.4-12.7c0.1,0,0.2,0,0.3,0h296.7c6.9-0.1,12.6,5.4,12.7,12.4c0,0.1,0,0.2,0,0.3v36.5H349
--- a/src/assets/icons/svg/partzhuanghe.svg
+++ b/src/assets/icons/svg/partzhuanghe.svg
@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
+<style type="text/css">
+</style>
+<path id="分卷装盒" class="st0" d="M809.7,8.6c48.5,0,90.1,34.9,98.6,82.6v1.4l93.2,578v0.8c7.3,16,11.1,33.5,11.1,51.1v169.5
+	c0,68-55.1,123.3-123.1,123.3H134.3c-67.9-0.2-122.9-55.3-122.9-123.3V722.6c0-9.1,1-18.1,2.9-26.9c-0.4-3.1-0.4-6.2,0-9.2v-0.8
+	l87.6-591.6c7.2-48.6,48.5-84.8,97.6-85.5H809.7z M298.3,666.1H134.7c-30.8,0-56,24.7-56.5,55.5v170.5c0,31.2,25.3,56.5,56.5,56.5
+	h755.2c31.2,0,56.5-25.3,56.5-56.5V722.6c0-31.2-25.3-56.5-56.5-56.5H724.6l-4,3.8C574.5,806,429.8,808.4,300.3,668.4L298.3,666.1
+	L298.3,666.1z M809.7,75.7H201c-16.2,0.1-30.1,11.7-32.9,27.7v0.8L93.6,606.7c13.2-4.7,27.1-7.1,41.1-7h178.7
+	c9.7,0.1,18.8,4.3,25.2,11.6c110.3,127.9,220,125.9,349.1-1.9c6.3-6.2,14.7-9.6,23.5-9.6h178.3c11.4,0,22.6,1.6,33.6,4.7
+	l-80.6-500.7c-2.6-15.8-16.1-27.6-32.1-28H809.7z M706.7,387.7c18.5-0.2,33.7,14.6,33.9,33.2c0.2,18.5-14.6,33.7-33.2,33.9H306.7
+	c-18.5,0.2-33.7-14.6-33.9-33.2c-0.2-18.5,14.6-33.7,33.2-33.9C305.9,387.7,706.7,387.7,706.7,387.7z M706.7,215.6
+	c18.5-0.2,33.7,14.6,33.9,33.2c0.2,18.5-14.6,33.7-33.2,33.9l0,0H306.7c-18.5,0.2-33.7-14.6-33.9-33.2
+	c-0.2-18.5,14.6-33.7,33.2-33.9C305.9,215.6,706.7,215.6,706.7,215.6z"/>
+</svg>
--- a/src/assets/icons/svg/zhuanghe.svg
+++ b/src/assets/icons/svg/zhuanghe.svg
@ -3,7 +3,6 @@
 <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 1024 1024" style="enable-background:new 0 0 1024 1024;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#FFFFFF;}
 </style>
 <g id="装盒" transform="translate(-4 -3)">
 	<path id="矩形_301" class="st0" d="M84.3,242.3h862.6c33.2-0.8,60.8,25.6,61.6,58.8v659.3c-0.8,33.2-28.3,59.6-61.6,58.8H84.3
--- a/src/assets/styles/archives-manage.scss
+++ b/src/assets/styles/archives-manage.scss
@ -104,7 +104,7 @@ $arcCyan: #0FBED9;

 .archives-handler-btn{
  .el-button{
-    padding: 0 13px;
+    padding: 0 13px 0 3px;
    ::v-deep span{
      margin-left: 10px;
    }
@ -275,7 +275,8 @@ $arcCyan: #0FBED9;
  object-fit: cover;
 }
 .file-down,
-.packing-handle-btn{
+.packing-handle-btn,
+.packing-recall-btn{
  display: block;
  width: 66px;
  height: 28px;
@ -296,6 +297,10 @@ $arcCyan: #0FBED9;
  background-color: $arcPurple;
  border-color:  $arcPurple;
 }
+.packing-recall-btn{
+  background-color: $arcRed;
+  border-color:  $arcRed;
+}

 .drag-tip {
  display: block;
--- a/src/assets/styles/yxk-admin.scss
+++ b/src/assets/styles/yxk-admin.scss
@ -982,4 +982,7 @@ input[type='number'] {

 .svg-style{
  margin-right: 5px;
+}
+.svg-arc-style{
+  margin-right: 10px;
 }
--- a/src/views/archivesManage/archivesList/index.vue
+++ b/src/views/archivesManage/archivesList/index.vue
@ -3,7 +3,7 @@
    <!-- 门类列表 -->
    <el-row class="container-main">
      <el-col class="curd-in-out" :xs="10" :sm="8" :md="5" :lg="6" :xl="5">
-        <div class="container-left left-tree-item">
+        <div :class="['container-left', !isRecycle?'left-tree-item':'']">
          <span class="right-top-line" />
          <span class="left-bottom-line" />
          <div class="tree-title">档案门类</div>
@ -29,8 +29,6 @@
        <archivesProject
          v-if="selectedCategory.isType === 2"
          ref="project"
-          :isdel="isdel"
-          :is-recycle="isRecycle"
          :selected-category="selectedCategory"
          :smart-query="smartQuery"
          @getAjInProjectBtnState="getAjInProjectBtnState"
@ -40,8 +38,6 @@
        <archivesAnjuan
          v-if="selectedCategory.isType === 2 || selectedCategory.isType === 3|| selectedCategory.isType === 5"
          ref="anjuan"
-          :isdel="isdel"
-          :is-recycle="isRecycle"
          :selected-category="selectedCategory"
          :is-project="isProject"
          :project-selection="projectSelection"
@ -50,14 +46,11 @@
          :smart-query="smartQuery"
          @getJnInAjBtnState="getJnInAjBtnState"
          @getSelections="getSelections"
-          v-on="$listeners"
        />
        <!-- 卷内 -->
        <archivesJuannei
          v-if="selectedCategory.isType === 2 || selectedCategory.isType === 3 || selectedCategory.isType === 4"
          ref="file"
-          :isdel="isdel"
-          :is-recycle="isRecycle"
          :is-anjuan="isAnjuan"
          :anjuan-selection="anjuanSelection"
          :selected-category="selectedCategory"
@ -88,6 +81,11 @@ export default {
      })
    ]
  },
+  provide() {
+    return {
+      recycleMain: this
+    }
+  },
  mixins: [presenter()],
  props: {
    isdel: {
@ -124,7 +122,8 @@ export default {
        'retention': null,
        'securityClass': null,
        'organizationMatter': null
-      }
+      },
+      treeCurrentNode: null
    }
  },
  watch: {
@ -197,6 +196,13 @@ export default {
      getDicts().then(data => {
        if (data) {
          this.intellClassifyTree = data
+          // this.intellClassifyTree.filter(item => {
+          //   if (item.childMenus !== null) {
+          //     item.childMenus.map(val => {
+          //       val.ifChild = true
+          //     })
+          //   }
+          // })
        }
      })
    },
@ -205,6 +211,7 @@ export default {
      if (val) {
        // 初始化智能分类的操作
        if (this.$refs.smartTree) {
+          this.treeCurrentNode = null
          const smartTreeList = this.intellClassifyTree
          this.smartQuery = {
            'archiveYear': null,
@ -307,6 +314,7 @@ export default {
              json.id = index
              json.dicName = item
              json.childMenus = []
+              json.ifChild = true
              return json
            })
            this.intellClassifyTree.unshift({ id: -1, dicName: '年度', childMenus: newYearArr })
@ -316,46 +324,77 @@ export default {
      }
    },
    // 智能分类
-    handleIntellNodeClick(val) {
-      if (val) {
+    handleIntellNodeClick(data, node, ele) {
+      if (data) {
        const selectedKey = this.$refs.smartTree.getCurrentNode()
        const selectedParentVal = this.$refs.smartTree.getNode(selectedKey).parent.label
-        switch (selectedParentVal) {
-          case '年度':
-            if (selectedKey.dicName !== '年度') {
-              this.smartQuery.archiveYear = selectedKey.dicName
-            }
-            break
-          case '部门名称':
-            if (selectedKey.dicName !== '部门名称') {
-              this.smartQuery.department = selectedKey.dicName
-            }
-            break
-          case '保管期限':
-            if (selectedKey.dicName !== '保管期限') {
-              this.smartQuery.retention = selectedKey.dicName
-            }
-            break
-          case '密级':
-            if (selectedKey.dicName !== '密级') {
-              this.smartQuery.securityClass = selectedKey.dicName
-            }
-            break
-          case ' 机构（问题）':
-            if (selectedKey.dicName !== '机构（问题）') {
-              this.smartQuery.organizationMatter = selectedKey.dicName
-            }
-            break
-          // default:
-          //   this.smartQuery = {
-          //     'archiveYear': null,
-          //     'department': null,
-          //     'retention': null,
-          //     'securityClass': null,
-          //     'organizationMatter': null
-          //   }
+        this.treeCurrentNode = ele.$el
+
+        // if (data.ifChild) {
+        //   this.treeCurrentNode = ele.$el
+        //   const eles = document.querySelectorAll('.el-tree-node__children .el-tree-node.is-focusable')
+        //   for (let i = 0; i < eles.length; i++) {
+        //     eles[i].classList.remove('is-current')
+        //   }
+        //   this.treeCurrentNode.classList.add('is-current')
+        // } else {
+        //   ele.$el.classList.remove('is-current')
+        //   console.log(this.treeCurrentNode)
+        //   if (this.treeCurrentNode) {
+        //     this.treeCurrentNode.classList.add('is-current')
+        //   }
+        // }
+
+        if (ele.$el.classList.contains('is-current')) {
+          this.treeCurrentNode.classList.remove('is-current')
+          this.smartQuery = {
+            'archiveYear': null,
+            'department': null,
+            'retention': null,
+            'securityClass': null,
+            'organizationMatter': null
+          }
+          this.handleTableList()
+        } else {
+          this.treeCurrentNode.classList.add('is-current')
+          switch (selectedParentVal) {
+            case '年度':
+              this.treeCurrentNode.classList.remove('is-current')
+              if (selectedKey.dicName !== '年度') {
+                this.smartQuery.archiveYear = selectedKey.dicName
+              }
+              break
+            case '部门名称':
+              if (selectedKey.dicName !== '部门名称') {
+                this.smartQuery.department = selectedKey.dicName
+              }
+              break
+            case '保管期限':
+              if (selectedKey.dicName !== '保管期限') {
+                this.smartQuery.retention = selectedKey.dicName
+              }
+              break
+            case '密级':
+              if (selectedKey.dicName !== '密级') {
+                this.smartQuery.securityClass = selectedKey.dicName
+              }
+              break
+            case ' 机构（问题）':
+              if (selectedKey.dicName !== '机构（问题）') {
+                this.smartQuery.organizationMatter = selectedKey.dicName
+              }
+              break
+            default:
+              this.smartQuery = {
+                'archiveYear': null,
+                'department': null,
+                'retention': null,
+                'securityClass': null,
+                'organizationMatter': null
+              }
+          }
+          this.handleTableList()
        }
-        this.handleTableList()
      }
    },
    handleTableList() {
@ -368,7 +407,9 @@ export default {
            this.$refs.file.getTableDisplayFields()
          }
          this.$refs.project.getTableList()
-          this.getYear('project')
+          if (!this.treeCurrentNode) {
+            this.getYear('project')
+          }
        })
      } else if (this.selectedCategory.isType === 3) {
        this.$nextTick(() => {
@ -379,21 +420,27 @@ export default {
            this.$refs.file.getTableDisplayFields()
          }
          this.$refs.anjuan.getTableList()
-          this.getYear('anjuan')
+          if (!this.treeCurrentNode) {
+            this.getYear('anjuan')
+          }
        })
      } else if (this.selectedCategory.isType === 4) {
        this.$nextTick(() => {
          this.$refs.file.junneiData = []
          this.$refs.file.getTableDisplayFields()
          this.$refs.file.getTableList()
-          this.getYear('file')
+          if (!this.treeCurrentNode) {
+            this.getYear('file')
+          }
        })
      } else if (this.selectedCategory.isType === 5) {
        this.$nextTick(() => {
          this.$refs.anjuan.anjuanData = []
          this.$refs.anjuan.getTableDisplayFields()
          this.$refs.anjuan.getTableList()
-          this.getYear('anjuan')
+          if (!this.treeCurrentNode) {
+            this.getYear('anjuan')
+          }
        })
      }
    }
--- a/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesAnjuan/index.vue
@ -2,7 +2,7 @@
  <div class="archives-warp">
    <!--工具栏-->
    <div class="head-container head-archives clearfix">
-      <div v-if="!isRecycle" class="archives-crud">
+      <div v-if="!recycleMain.isRecycle" class="archives-crud">
        <!-- 新增 -->
        <el-button size="mini" :disabled="isProject && selectedCategory.isType === 2" icon="el-icon-plus" @click="handleForm('add')">新增</el-button>
        <!-- 修改 -->
@ -24,7 +24,7 @@
      <div class="head-search">
        <!-- 搜索 -->
        <!-- @change="crud.toQuery" -->
-        <el-select v-model="anjuanQuery.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px">
+        <el-select v-if="!recycleMain.isRecycle" v-model="anjuanQuery.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 100px">
          <i slot="prefix" class="iconfont icon-zhuangtai-fanbai" />
          <el-option v-for="item in stateOptions" :key="item.key" :label="item.label" :value="item.key" />
        </el-select>
@ -40,17 +40,17 @@
        </el-input>
        <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="getTableList()">搜索</el-button>
      </div>
-      <div v-if="!isRecycle" class="archives-handler-btn">
+      <div v-if="!recycleMain.isRecycle" class="archives-handler-btn">
        <!-- 装盒btn 多选  -->
        <!-- <svg-icon icon-class="zhuanghe" /> -->
-        <el-button class="packing-btn iconfont icon-sr-dn-pz" type="primary" :disabled="selections.length === 0" @click="handlePacking(selections)">装盒</el-button>
+        <el-button class="packing-btn iconfont icon-sr-dn-pz" type="primary" :disabled="selections.length === 0" @click="handlePacking(selections)"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
        <!-- 分卷装盒btn 针对案卷-单选 -->
-        <el-button v-if="selectedCategory.isType === 3 || selectedCategory.isType === 2" class="part-btn iconfont icon-weibiaoti-2" type="primary" :disabled="selections.length !== 1" @click="handlePartPacking(selections)">分卷装盒</el-button>
-        <!-- <el-button class="warehousing-btn iconfont icon-weibiaoti-2" type="primary">入库</el-button> -->
+        <el-button v-if="selectedCategory.isType === 3 || selectedCategory.isType === 2" class="part-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="handlePartPacking(selections)"><svg-icon icon-class="partzhuanghe" class="svg-arc-style" />分卷装盒</el-button>
+        <!-- <el-button class="warehousing-btn iconfont" type="primary">入库</el-button> -->
        <!-- 借阅btn 多选 -->
-        <el-button class="lending-btn iconfont icon-weibiaoti-2" :disabled="selections.length === 0" type="primary" @click="lengingVisible=true">借阅</el-button>
+        <el-button class="lending-btn iconfont" :disabled="selections.length === 0" type="primary" @click="lengingVisible=true"><svg-icon icon-class="jieyue" class="svg-arc-style" />借阅</el-button>
        <!-- 绑定标签btn 单选 -->
-        <el-button class="binding-btn iconfont icon-weibiaoti-2" type="primary" :disabled="selections.length !== 1" @click="handleBinding(selections)">绑定标签</el-button>
+        <el-button class="binding-btn iconfont" type="primary" :disabled="selections.length !== 1" @click="handleBinding(selections)"><svg-icon icon-class="bindbiaoqian" class="svg-arc-style" />绑定标签</el-button>
      </div>
    </div>

@ -121,26 +121,26 @@
            {{ scope.row[field.fieldName] }}
          </template>
        </el-table-column>
-        <el-table-column v-if="!isRecycle" label="装盒" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
+        <el-table-column v-if="!recycleMain.isRecycle" label="装盒" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
          <!-- state-active 已装/已入/已借/已绑 -->
          <template slot-scope="scope">
            <!-- 未装 / 已装 -->
            <span class="row-state row-packing state-active">{{ scope.row.case_no ? '已装': '未装' }}</span>
          </template>
        </el-table-column>
-        <el-table-column v-if="!isRecycle" label="入库" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
+        <el-table-column v-if="!recycleMain.isRecycle" label="入库" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
          <template slot-scope="">
            <!-- 未入 / 已入 -->
            <span class="row-state row-warehousing">未入</span>
          </template>
        </el-table-column>
-        <el-table-column v-if="!isRecycle" label="借阅" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
+        <el-table-column v-if="!recycleMain.isRecycle" label="借阅" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
          <template slot-scope="">
            <!-- 待借 / 不可借-用“—” 表示 / 已借 -->
            <span class="row-state row-lending">—</span>
          </template>
        </el-table-column>
-        <el-table-column v-if="!isRecycle" label="标签" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
+        <el-table-column v-if="!recycleMain.isRecycle" label="标签" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
          <template slot-scope="scope">
            <!-- 未绑 / 已绑 -->
            <span class="row-state row-binding">{{ scope.row.tid ? '已绑': '未绑' }}</span>
@ -226,6 +226,7 @@ export default {
    header(),
    form({})
  ],
+  inject: ['recycleMain'],
  props: {
    selectedCategory: {
      type: Object,
@ -252,14 +253,6 @@ export default {
      default: function() {
        return {}
      }
-    },
-    isdel: {
-      type: Boolean,
-      default: false
-    },
-    isRecycle: {
-      type: Boolean,
-      default: false
    }
  },
  data() {
@ -351,7 +344,6 @@ export default {
  mounted() {
  },
  methods: {
-
    doExport(fileName = '未知文件') {
      this.crud.downloadLoading = true
      if (this.selectedCategory.pid !== '0') {
@ -415,7 +407,7 @@ export default {
      const params = {
        'categoryId': this.categoryId,
        'parentsId': this.parentsId,
-        'isdel': this.isdel,
+        'isdel': this.recycleMain.isdel,
        'page': this.page.page,
        'size': this.page.size,
        'sort': this.arrySort,
@ -551,7 +543,7 @@ export default {
        'categoryId': this.categoryId
      }
      // 删除fetch
-      if (!this.isRecycle) {
+      if (!this.recycleMain.isRecycle) {
        del(params).then(res => {
          this.crud.delAllLoading = false
          this.$notify({
--- a/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesInfo/index.vue
@ -50,6 +50,7 @@ export default {
  mixins: [
    form({})
  ],
+  inject: ['recycleMain'],
  props: {
    archivesDetailsData: {
      type: Array,
--- a/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesJuannei/index.vue
@ -2,7 +2,7 @@
  <div class="archives-warp">
    <!--工具栏-->
    <div class="head-container head-archives clearfix">
-      <div v-if="!isRecycle" class="archives-crud">
+      <div v-if="!recycleMain.isRecycle" class="archives-crud">
        <!-- 新增 -->
        <el-button v-if="selectedCategory.isType !== 4" size="mini" :disabled="isAnjuan" icon="el-icon-plus" @click="handleForm('add')">新增</el-button>
        <!-- 修改 -->
@ -20,7 +20,7 @@
          <svg-icon icon-class="huanyuan-fanbai" class-name="svg-style" />还原
        </el-button>
      </div>
-      <div v-if="!isRecycle" class="head-search">
+      <div class="head-search">
        <!-- @keyup.enter.native="crud.toQuery" -->
        <el-input v-model="juanneiQuery[juanneiInputSelect]" clearable size="small" placeholder="请输入关键词" style="width: 200px;" class="input-prepend filter-item" @clear="getTableList()">
          <el-select slot="prepend" v-model="juanneiInputSelect" style="width: 80px" @change="querySelect">
@ -101,14 +101,14 @@
            {{ scope.row[field.fieldName] }}
          </template>
        </el-table-column>
-        <el-table-column v-if="!isRecycle" label="装盒" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
+        <el-table-column v-if="!recycleMain.isRecycle" label="装盒" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
          <!-- state-active 已装/已入/已借/已绑 -->
          <template slot-scope="scope">
            <!-- 未装 / 已装 -->
            <span class="row-state row-packing state-active">{{ scope.row.case_no ? '已装': '未装' }}</span>
          </template>
        </el-table-column>
-        <el-table-column v-if="!isRecycle" label="入库" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
+        <el-table-column v-if="!recycleMain.isRecycle" label="入库" width="100" align="center" :fixed="fixedStatusBar?false:'right'">
          <template slot-scope="">
            <!-- 未入 / 已入 -->
            <span class="row-state row-warehousing">未入</span>
@ -172,6 +172,7 @@ export default {
    header(),
    form({})
  ],
+  inject: ['recycleMain'],
  props: {
    selectedCategory: {
      type: Object,
@ -198,14 +199,6 @@ export default {
      default: function() {
        return {}
      }
-    },
-    isdel: {
-      type: Boolean,
-      default: false
-    },
-    isRecycle: {
-      type: Boolean,
-      default: false
    }
  },
  data() {
@ -224,7 +217,6 @@ export default {
      junneiData: [],
      formVisible: false,
      formTitle: '新建档案',
-      isAddOrEditBtn: null,
      tableDisplayFields: [], // table-list-title字段
      getTableDisplayFieldsLoading: false, // table-loading
      formPreviewData: [], // 预览界面data
@ -367,7 +359,7 @@ export default {
      const params = {
        'categoryId': this.categoryId,
        'parentsId': this.parentsId,
-        'isdel': this.isdel,
+        'isdel': this.recycleMain.isdel,
        'page': this.page.page,
        'size': this.page.size,
        'sort': this.arrySort,
@ -483,7 +475,7 @@ export default {
        'categoryId': this.categoryId
      }
      // 删除fetch
-      if (!this.isRecycle) {
+      if (!this.recycleMain.isRecycle) {
        del(params).then(res => {
          this.crud.delAllLoading = false
          this.$notify({
--- a/src/views/archivesManage/archivesList/module/archivesProject/index.vue
+++ b/src/views/archivesManage/archivesList/module/archivesProject/index.vue
@ -2,7 +2,7 @@
  <div class="archives-warp">
    <!--工具栏-->
    <div class="head-container head-archives clearfix">
-      <div v-if="!isRecycle" class="archives-crud">
+      <div v-if="!recycleMain.isRecycle" class="archives-crud">
        <!-- 新增 -->
        <el-button size="mini" icon="el-icon-plus" @click="handleForm('add')">新增</el-button>
        <!-- 修改 -->
@ -143,6 +143,7 @@ export default {
    header(),
    form({})
  ],
+  inject: ['recycleMain'],
  props: {
    selectedCategory: {
      type: Object,
@ -155,14 +156,6 @@ export default {
      default: function() {
        return {}
      }
-    },
-    isdel: {
-      type: Boolean,
-      default: false
-    },
-    isRecycle: {
-      type: Boolean,
-      default: false
    }
  },
  data() {
@ -276,7 +269,7 @@ export default {
      const params = {
        'categoryId': this.selectedCategory.id,
        'parentsId': this.parentsId,
-        'isdel': this.isdel,
+        'isdel': this.recycleMain.isdel,
        'page': this.page.page,
        'size': this.page.size,
        'sort': this.arrySort,
@ -399,7 +392,7 @@ export default {
        'categoryId': this.selectedCategory.id
      }
      // 删除fetch
-      if (!this.isRecycle) {
+      if (!this.recycleMain.isRecycle) {
        del(params).then(res => {
          this.crud.delAllLoading = false
          this.$notify({
--- a/src/views/archivesManage/archivesList/module/packing/index.vue
+++ b/src/views/archivesManage/archivesList/module/packing/index.vue
@ -39,7 +39,7 @@
          <el-table-column prop="fileDpi" label="条形码" min-width="120" align="center" />
          <el-table-column prop="create_date" label="操作" min-width="100" align="center">
            <template>
-              <el-button class="packing-handle-btn iconfont icon-weibiaoti-2" @click="open">装盒</el-button>
+              <el-button class="packing-handle-btn iconfont" @click="open"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
            </template>
          </el-table-column>
        </el-table>
--- a/src/views/archivesManage/archivesList/module/partPacking/index.vue
+++ b/src/views/archivesManage/archivesList/module/partPacking/index.vue
@ -36,7 +36,7 @@
              <el-table-column prop="fileDpi" label="条形码" show-overflow-tooltip align="center" />
              <el-table-column prop="create_date" label="操作" align="center">
                <template>
-                  <el-button class="packing-handle-btn iconfont icon-weibiaoti-2">装盒</el-button>
+                  <el-button class="packing-handle-btn iconfont"><svg-icon icon-class="zhuanghe" class="svg-arc-style" />装盒</el-button>
                </template>
              </el-table-column>
            </el-table>
@ -56,7 +56,7 @@
              <el-table-column prop="fileDpi" label="条形码" show-overflow-tooltip align="center" />
              <el-table-column prop="create_date" label="操作" align="center">
                <template>
-                  <el-button class="packing-handle-btn iconfont icon-weibiaoti-2">撤销</el-button>
+                  <el-button class="packing-recall-btn iconfont"><svg-icon icon-class="chehui" class="svg-arc-style" />撤销</el-button>
                </template>
              </el-table-column>
            </el-table>
--- a/src/views/archivesManage/archivesList/module/uploadFile/index.vue
+++ b/src/views/archivesManage/archivesList/module/uploadFile/index.vue
@ -40,7 +40,7 @@
        </template>
      </el-table-column>
      <el-table-column prop="create_time" label="创建时间" min-width="100" align="center" />
-      <el-table-column v-if="!isUploadDetail" label="操作" min-width="100" align="center">
+      <el-table-column v-if="!isUploadDetail && !recycleMain.isRecycle" label="操作" min-width="100" align="center">
        <template slot-scope="scope">
          <el-button class="file-down iconfont icon-weibiaoti-2" @click="downloadFile(scope.row)">下载</el-button>
        </template>
@ -101,6 +101,7 @@ export default {
  mixins: [
    form({})
  ],
+  inject: ['recycleMain'],
  props: {
    isUploadDetail: {
      type: Boolean,
--- a/src/views/archivesManage/recycleBin/index.vue
+++ b/src/views/archivesManage/recycleBin/index.vue
@ -1,6 +1,6 @@
 <template>
  <div>
-    <archivesList :isdel="true" :is-recycle="true" />
+    <archivesList :isdel="isdel" :is-recycle="isRecycle" />
  </div>
 </template>

@ -12,6 +12,8 @@ export default {
  components: { archivesList },
  data() {
    return {
+      isdel: true,
+      isRecycle: true
    }
  },
  created() {
@ -22,4 +24,7 @@ export default {
 </script>

 <style rel="stylesheet/scss" lang="scss" scoped>
+::v-deep .container-left{
+  min-height: calc(100vh - 190px);
+}
 </style>