Merge branch 'master' into test-dev

src/views/manager/archivetree.vue

@@ -1349,9 +1349,9 @@ export default {
     },
     async major_data_type () {//内业资料类型
       const { data: res } = await dictionary({ code: 'major_data_type' })
-      console.log(res);
+ ;
       if (res.code == 200) {
-        this.majorDataTypeList = res.data
+        this.majorDataTypeList =  res.data.filter(item => item.dictKey !== '0');
       }
     },
     async display_hierarchy () {//显示层级

src/views/manager/projectinfo/archivetreeRule.vue

@@ -1133,7 +1133,7 @@ export default {
       const { data: res } = await dictionary({ code: 'major_data_type' })
       console.log(res);
       if (res.code == 200) {
-        this.majorDataTypeList = res.data
+        this.majorDataTypeList =  res.data.filter(item => item.dictKey !== '0');
       }
     },
     async display_hierarchy () {//显示层级