diff --git a/src/const/crud/archives/zxArchiveRecordinfo.js b/src/const/crud/archives/zxArchiveRecordinfo.js
index 410dd91..7b0bab2 100644
--- a/src/const/crud/archives/zxArchiveRecordinfo.js
+++ b/src/const/crud/archives/zxArchiveRecordinfo.js
@@ -43,6 +43,15 @@ export const zxTableOption = {
       viewDisplay:false,
       width: '150px'
     },
+    {
+      label: '档号',
+      prop: 'fileNum',
+      search: true,
+      editDisplay:false,
+      addDisplay:false,
+      display:false,
+      width:'150px'
+    },
     {
       label: '状态',
       prop: 'status',
@@ -138,15 +147,7 @@ export const zxTableOption = {
       label: '全宗号',
       prop: 'totalNum',
     },
-    {
-      label: '档号',
-      prop: 'fileNum',
-      search: true,
-      editDisplay:false,
-      addDisplay:false,
-      display:false,
-      width:'150px'
-    },
+
     {
       label: '档案类别',
       prop: 'archiveCategory',
diff --git a/src/views/archives/catalog/index.vue b/src/views/archives/catalog/index.vue
index e63574e..a07b156 100644
--- a/src/views/archives/catalog/index.vue
+++ b/src/views/archives/catalog/index.vue
@@ -5,13 +5,19 @@
       <div>
         <br>
         <br>
-        <avue-tree :option="option" :data="caOptions" @node-click="handleNodeClick" >
-           <span class="el-tree-node__label" slot-scope="{ node, data }"><span>
-      <i class="el-icon-folder"></i>
-      {{ (node || {}).label }}
-    </span>
-  </span>
-        </avue-tree>
+        <el-tree ref="tree"  :props="{children: 'children', label: 'label' }"
+                 :data="caOptions"
+                 default-expand-all
+                 @node-click="handleNodeClick"
+                 node-key="code"
+                 :expand-on-click-node="false" >
+                 <span slot-scope="{ node, data }">
+                   <span>
+                      <i class="el-icon-folder"></i>
+                      {{ node.label }}
+                   </span>
+                 </span>
+        </el-tree>
       </div>
     </div>
     <div style="float:left;width:83%">
@@ -545,25 +551,37 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-        if (data.code.indexOf("-")!=-1){
-          let  split= data.code.split("-");
-          this.code=split[0];
-          this.year=split[1]
+      //是否二级查询
+      let isSecond = data.code.indexOf("-")!=-1;
+      //节点单击选中的档案类目
+      let code = isSecond?data.code.split("-")[0]:data.code;
+      //如果选中的code不等于当前code则需要滞空查询条件;因为一定是选了其他类型的档案(二级查询不能滞空)
+      this.year=null;
+      if (code!=this.code){
+        this.archiveScopeValue=null;
+        this.storageTimeValue=null;
+        this.paramsSearch={};
+        this.$refs.crud.searchReset();
+      }
+      //如果二级查询
+      if (isSecond){
+        //如果是基建档案
+        if (code=='JJ'){
+          this.paramsSearch['fileNum']=data.label.split("-")[0];
         }else{
-          if (data.code!=this.code){
-            this.archiveScopeValue=null;
-            this.storageTimeValue=null;
-            this.paramsSearch={};
-            this.$refs.crud.searchReset();
-          }
-          this.code=data.code;
-          this.year=null
+          this.year=data.label;
         }
+      }else{
+        //一级查询如果是基建档案，则滞空fileNum;和右侧档号查询只取其一
+        if (code=='JJ'){
+          this.paramsSearch['fileNum']=null;
+        }
+      }
+      //选中的档案类目赋给当前code
+      this.code=code;
+      this.$set(this.form,'archiveCategory',this.code);
       this.page.currentPage=1
       this.getPage(this.page)
-      setTimeout(n=>{
-        this.form.archiveCategory=this.code;
-      },1000)
     },
     // 筛选节点
     filterNode(value, data) {
diff --git a/src/views/archives/commonComponent/storageTime.vue b/src/views/archives/commonComponent/storageTime.vue
index 8d9417e..e43275a 100644
--- a/src/views/archives/commonComponent/storageTime.vue
+++ b/src/views/archives/commonComponent/storageTime.vue
@@ -12,7 +12,7 @@
       </el-radio-group>
     </div>
     <div v-if="$props.archiveScopeValue=='JJ'||$props.archiveScopeValue=='SW'||$props.archiveScopeValue=='SX'||
-               $props.archiveScopeValue=='ZXXM'">
+               $props.archiveScopeValue=='ZXXM'||$props.archiveScopeValue=='ZX'">
     <br>
     <label for="archiveScope" class="el-form-item__label" style="width: 80px;">档案类目:</label>
     <div class="el-form-item__content" style="margin-left: 83px;">
diff --git a/src/views/archives/preFiling/index.vue b/src/views/archives/preFiling/index.vue
index a0dbefe..226ac71 100644
--- a/src/views/archives/preFiling/index.vue
+++ b/src/views/archives/preFiling/index.vue
@@ -5,14 +5,19 @@
       <div>
         <br>
         <br>
-        <avue-tree :option="option" :data="caOptions" @node-click="handleNodeClick" >
-           <span class="el-tree-node__label" slot-scope="{ node, data }">
-             <span>
-      <i class="el-icon-folder"></i>
-      {{ (node || {}).label }}
-            </span>
-          </span>
-        </avue-tree>
+        <el-tree ref="tree"  :props="{children: 'children', label: 'label' }"
+                 :data="caOptions"
+                 default-expand-all
+                 @node-click="handleNodeClick"
+                 node-key="code"
+                 :expand-on-click-node="false" >
+                 <span slot-scope="{ node, data }">
+                   <span>
+                      <i class="el-icon-folder"></i>
+                      {{ node.label }}
+                   </span>
+                 </span>
+        </el-tree>
       </div>
     </div>
     <div style="float:left;width:83%">
@@ -327,25 +332,57 @@ export default {
     },
     // 节点单击事件
     handleNodeClick(data) {
-      if (data.code.indexOf("-")!=-1){
-        let  split= data.code.split("-");
-        this.code=split[0];
-        this.year=split[1]
+
+      //是否二级查询
+      let isSecond = data.code.indexOf("-")!=-1;
+      //节点单击选中的档案类目
+      let code = isSecond?data.code.split("-")[0]:data.code;
+      //如果选中的code不等于当前code则需要滞空查询条件;因为一定是选了其他类型的档案(二级查询不能滞空)
+      this.year=null;
+      if (code!=this.code){
+        this.archiveScopeValue=null;
+        this.storageTimeValue=null;
+        this.paramsSearch={};
+        this.$refs.crud.searchReset();
+      }
+      //如果二级查询
+      if (isSecond){
+        //如果是基建档案
+        if (code=='JJ'){
+          this.paramsSearch['fileNum']=data.label.split("-")[0];
+        }else{
+          this.year=data.label;
+        }
       }else{
-        if (data.code!=this.code){
-          this.archiveScopeValue=null;
-          this.storageTimeValue=null;
-          this.paramsSearch={};
-          this.$refs.crud.searchReset();
+        //一级查询如果是基建档案，则滞空fileNum;和右侧档号查询只取其一
+        if (code=='JJ'){
+          this.paramsSearch['fileNum']=null;
         }
-        this.code=data.code;
-        this.year=null
       }
+      //选中的档案类目赋给当前code
+      this.code=code;
+      this.$set(this.form,'archiveCategory',this.code);
       this.page.currentPage=1
       this.getPage(this.page)
-      setTimeout(n=>{
-        this.form.archiveCategory=this.code;
-      },1000)
+      // if (data.code.indexOf("-")!=-1){
+      //   let  split= data.code.split("-");
+      //   this.code=split[0];
+      //   this.year=split[1]
+      // }else{
+      //   if (data.code!=this.code){
+      //     this.archiveScopeValue=null;
+      //     this.storageTimeValue=null;
+      //     this.paramsSearch={};
+      //     this.$refs.crud.searchReset();
+      //   }
+      //   this.code=data.code;
+      //   this.year=null
+      // }
+      // this.page.currentPage=1
+      // this.getPage(this.page)
+      // setTimeout(n=>{
+      //   this.form.archiveCategory=this.code;
+      // },1000)
 
     },
     // 筛选节点