diff --git a/src/api/oafile/index.js b/src/api/oafile/index.js
index 5550d6e..c3f358e 100644
--- a/src/api/oafile/index.js
+++ b/src/api/oafile/index.js
@@ -14,4 +14,12 @@ export function changeFiles(params) {
     method: 'get',
     params:params
   })
-}
\ No newline at end of file
+}
+
+export function delFiles(params) {
+  return request({
+    url: '/api/admin/other/accept_file_delete',
+    method: 'get',
+    params:params
+  })
+}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 541332c..e549f4c 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -468,7 +468,7 @@ export default {
   created() {
     // this.initLoad();
     this.getLeads()
-    this.updateMissionPlan()
+    // this.updateMissionPlan()
     this.getUserId()
     this.getUnitTypeList()
     // this.getQuestion()
diff --git a/src/views/lawsfile/index/article.vue b/src/views/lawsfile/index/article.vue
index ff32727..020f7bc 100644
--- a/src/views/lawsfile/index/article.vue
+++ b/src/views/lawsfile/index/article.vue
@@ -156,7 +156,8 @@
         },
         uploadOther: {
           token: ""
-        },
+        },
+        menu_children:[],
         dialogViewVisible: false,
         dialogFormVisible: false,
         formLabelWidth: "120px",
@@ -206,9 +207,33 @@
     },
     methods: {
       menuClick(data) {
-        let that = this;
-        that.searchFields.menu_id = data.id;
+        let that = this;
+        this.menu_children = []
+        this.menu_children.push(data)
+        if(data.children.length>0){
+          this.hasChildren(data)
+        }
+        let menuids = ''
+        if(this.menu_children.length>0){
+          this.menu_children.map(item=>{
+            menuids+=item.id+','
+          })
+          menuids = menuids.slice(0,-1)
+        }
+        that.searchFields.menu_id = menuids;
         that.load();
+      },
+      hasChildren(arr){
+        if(arr.children.length>0){
+          arr.children.map(item=>{
+            this.menu_children.push(item)
+            if(item.children.length>0){
+              this.hasChildren(item)
+            }
+          })
+        }else{
+          this.menu_children.push(arr)
+        }
       },
       filterNode(value, data) {
         if (!value) return true;
@@ -229,8 +254,17 @@
       },
       loadregulation() {
         var that = this;
-        // let type = parseInt(this.$route.path.split("_")[1]);
-                let type  =  '2,1,3,12'
+        let type = parseInt(this.$route.path.split("_")[1]);
+        let type1 = parseInt(this.$route.path.split("_")[2]);
+        if(type1){
+          type = type1
+        }else{
+          // if(type==10){
+          //   type = 10
+          // }else{
+            type  =  '2,1,3,12'
+          // }
+        }
         listregulation(1, type).then(response => {
           that.options = response;
         }).catch(error => {
@@ -240,9 +274,18 @@
       },
       load() {
         var that = this;
-        // let type = parseInt(this.$route.path.split("_")[1]);
-        // let type=""
-                let type  =  ''
+        let type = parseInt(this.$route.path.split("_")[1]);
+        let type1 = parseInt(this.$route.path.split("_")[2]);
+        if(type1){
+          type = type1
+        }else{
+          // if(type==10){
+          //   type = 10
+          // }else{
+            type  =  '2,1,3,12'
+          // }
+        }
+
         listarticle(that.pagination.page, that.searchFields.menu_id, that.searchFields.KeyWord, that.pagination
           .page_size, type).then(response => {
           that.tableData = response.data;
diff --git a/src/views/lawsfile/index/articleview.vue b/src/views/lawsfile/index/articleview.vue
index e9c0211..8b95a99 100644
--- a/src/views/lawsfile/index/articleview.vue
+++ b/src/views/lawsfile/index/articleview.vue
@@ -113,7 +113,8 @@
         fileUrl: "",
         uploadOther: {
           token: ""
-        },
+        },
+        menu_children:[],
         dialogViewVisible: false,
         dialogFormVisible: false,
         formLabelWidth: "120px",
@@ -164,9 +165,33 @@
 
       menuClick(data) {
 
-        let that = this;
-        that.searchFields.menu_id = data.id;
+        let that = this;
+        this.menu_children = []
+        this.menu_children.push(data)
+        if(data.children.length>0){
+          this.hasChildren(data)
+        }
+        let menuids = ''
+        if(this.menu_children.length>0){
+          this.menu_children.map(item=>{
+            menuids+=item.id+','
+          })
+          menuids = menuids.slice(0,-1)
+        }
+        that.searchFields.menu_id = menuids;
         that.load();
+      },
+      hasChildren(arr){
+        if(arr.children.length>0){
+          arr.children.map(item=>{
+            this.menu_children.push(item)
+            if(item.children.length>0){
+              this.hasChildren(item)
+            }
+          })
+        }else{
+          this.menu_children.push(arr)
+        }
       },
       filterNode(value, data) {
         if (!value) return true;
@@ -187,7 +212,19 @@
       },
       loadregulation() {
         var that = this;
-        let type = parseInt(this.$route.path.split("_")[1]);
+        // let type = parseInt(this.$route.path.split("_")[1]);
+         // let type  =  '2,1,3,12'
+         let type = parseInt(this.$route.path.split("_")[1]);
+        let type1 = parseInt(this.$route.path.split("_")[2]);
+        if(type1){
+          type = type1
+        }else{
+          // if(type==10){
+          //   type = 10
+          // }else{
+            type  =  '2,1,3,12'
+          // }
+        }
         listregulation(1, type).then(response => {
           that.options = response;
         }).catch(error => {
@@ -195,9 +232,19 @@
           //reject(error)
         })
       },
-      load() {
+      load(istrue) {
         let type = parseInt(this.$route.path.split("_")[1]);
-        var that = this;
+        var that = this;
+        let type1 = parseInt(this.$route.path.split("_")[2]);
+        if(type1){
+          type = type1
+        }else{
+          // if(type==10){
+          //   type = 10
+          // }else{
+            type  =  '2,1,3,12'
+          // }
+        }
         listarticle(that.pagination.page, that.searchFields.menu_id, that.searchFields.KeyWord, that.pagination
           .page_size, type).then(response => {
           that.tableData = response.data;
@@ -210,7 +257,7 @@
       show(obj) {
         this.$refs.viewInfo.dialogViewVisible = true;
         this.$refs.viewInfo.getinfo(obj.id);
-        
+
       },
       info(obj) {
         var that = this;
diff --git a/src/views/lawsfile/index/regulation.vue b/src/views/lawsfile/index/regulation.vue
index 7449558..7e03d2d 100644
--- a/src/views/lawsfile/index/regulation.vue
+++ b/src/views/lawsfile/index/regulation.vue
@@ -118,8 +118,20 @@
       },
       load() {
         // let type = parseInt(this.$route.path.split("_")[1]);
-        let type  =  '2,1,3,12'
-        var that = this;
+        // let type  =  '2,1,3,12'
+        var that = this;
+        let type = parseInt(this.$route.path.split("_")[1]);
+        let type1 = parseInt(this.$route.path.split("_")[2]);
+        if(type1){
+          type = type1
+        }else{
+          // if(type==10){
+          //   type = 10
+          // }else{
+            type  =  '2,1,3,12'
+          // }
+        }
+
         listregulation(1, type).then(response => {
           that.tableData = response;
         }).catch(error => {
diff --git a/src/views/oafile/index.vue b/src/views/oafile/index.vue
index dfe6eb2..71cf6d4 100644
--- a/src/views/oafile/index.vue
+++ b/src/views/oafile/index.vue
@@ -20,13 +20,15 @@
       :table-item="table">
         <template v-slot:btns>
           <div></div>
-         <el-table-column align='center' label="操作" width="120" header-align="center">
+         <el-table-column align='center' label="操作" width="100" header-align="center">
             <template slot-scope="scope">
               <!-- <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small">新增计划</Button> -->
 
               <Button type="primary" style='margin-right:5px;margin-bottom:5px;' @click="editorUnit(scope.row.id,scope.row.status,scope.row.upload_link)" size="small">新增任务</Button>
               <Button type="primary" style='margin-right:5px;margin-bottom:5px;' @click="editorAchieve(scope.row.id,scope.row.status,scope.row.upload_link)" size="small">归档</Button>
-
+              <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
+                 <Button type="primary" style="margin-left:5px;margin-bottom:5px;" size="small" ghost>删除</Button>
+              </Poptip>
               <!-- <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small">新增任务</Button> -->
               <!-- <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPlan(scope.row.id)">查看</Button> -->
               <!-- <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="editorPlan(scope.row.id,'editor')">编辑</Button> -->
@@ -43,7 +45,8 @@
 <script>
   import {
     getFiles,
-    changeFiles
+    changeFiles,
+    delFiles
   } from '@/api/oafile/index.js'
 
   import state from '@/store/modules/user.js'
@@ -137,7 +140,19 @@
           this.other_file_id = ''
           this.other_file_status = ''
         }
-      }
+      },
+      deleteList(id) {
+        var that = this;
+        if (id) {
+          delFiles({id:id}).then(response => {
+            this.$Message.success('操作成功');
+            that.getList();
+          }).catch(error => {
+            console.log(error)
+            reject(error)
+          })
+        }
+      },
 
     },
     watch:{}
diff --git a/src/views/oafile/objectIndex.vue b/src/views/oafile/objectIndex.vue
index 57934ea..93590ca 100644
--- a/src/views/oafile/objectIndex.vue
+++ b/src/views/oafile/objectIndex.vue
@@ -184,7 +184,10 @@
 
           }
           this.permission_routes.map((item, index) => {
-            // this.g_loading = false
+            // this.g_loading = false
+            // if(index==7){
+            //   return
+            // }
             this.$refs["graphRef" + index].setJsonData({
               'rootId': item.rootId,
               'nodes': item.nodes,
diff --git a/src/views/task/list/plan.vue b/src/views/task/list/plan.vue
index 4158a2d..dfd1469 100644
--- a/src/views/task/list/plan.vue
+++ b/src/views/task/list/plan.vue
@@ -32,7 +32,8 @@
     @selection-change='selectionChange'
     @pageSizeChange="e => {select.page_size = e,getList()}"
     @pageIndexChange="e => {select.page = e,getList()}"
-    :table-item="table">
+    :table-item="table"
+    :defaultExpandAll="false">
       <template v-slot:btns>
         <el-table-column align='center' label="操作" width="100" header-align="center">
           <template slot-scope="scope">
@@ -100,9 +101,35 @@
           id:3,
           value:'已完成',
           type:'success'
+        }],
+        auditStatusList:[{
+          id:0,
+          value:'待审核',
+          type:'warning'
+        },{
+          id:4,
+          value:'待开展',
+          type:'info'
+        },{
+          id:1,
+          value:'开展中',
+          type:''
+        },{
+          id:2,
+          value:'未完成',
+          type:'danger'
+        },{
+          id:3,
+          value:'已完成',
+          type:'success'
+        },{
+          id:5,
+          value:'审核不通过',
+          type:'warning'
         }],
         table: [{
           type:'selection',
+          width:50,
           selectable:(row,index)=>{
             if(this.stateObj.login_id==row.admin_id||this.stateObj.is_guiji||this.stateObj.is_chuzhang){
               return true
@@ -110,16 +137,48 @@
               return false
             }
           }
-        }, {
-          label: "年份",
-          prop: 'year',
-          width: 120,
+        },{
+          type:'expand',
+          width:50,
+          expandFn:(row)=>{
+
+            return(<div style={{"border-bottom": "1px solid #EBEEF5"}}>
+            {
+              row.row.mission.length>0?
+              row.row.mission.map((item,index)=>{
+                return(<div class='expandrow'>
+                  <p>{index+1}、<span>任务名称:</span><span>{item.name}</span></p>
+                  <p><span>状态:</span><span>{
+                    this.auditStatusList.map(status=>{
+                      if(item.audit_status===status.id){
+                        return status.value
+                      }
+                    })
+
+
+                  }</span></p>
+                  <p><span>开始日期:</span><span>{item.start_date}</span></p>
+                  <p><span>结束日期:</span><span>{item.end_date}</span></p>
+                  <p><span>任务类型:</span><span>{item.unit_type_detail?item.unit_type_detail.value:''}</span></p>
+                  <p><span>创建人:</span><span>{item.admin?item.admin.name:''}</span></p>
+                  <p><span>创建科室:</span><span>{item.department?item.department.name:''}</span></p>
+                  <p><span>创建时间:</span><span>{item.created_at.substring(0,11)}</span></p>
+                </div>)
+              })
+
+              :<div class='expandrow'>暂无任务</div>
+            }</div>)
+          }
+        },{
+          label: "年份",
+          prop: 'year',
+          width: 120,
         },{
           label: "月份",
           prop: 'start_date',
-          width: 120,
+          width: 180,
           customFn:(row)=>{
-            return(<div style={{"display": "flex","flex-wrap": "wrap"}}>
+            return(<div style={{"display": "flex","flex-wrap": "wrap","justify-content": "center"}}>
             {
               row.start_date.map((item,index)=>{
                 return(<span>{
@@ -139,9 +198,9 @@
         }, {
           label: "类型",
           prop: 'type_detail.value',
-          width: 120,
+          width: 180,
           customFn:(row)=>{
-            return(<div style={{"display": "flex","flex-wrap": "wrap"}}>
+            return(<div style={{"display": "flex","flex-wrap": "wrap","justify-content": "center"}}>
             {
               row.type_detail.map((item,index)=>{
                 return(<span>{
@@ -406,8 +465,21 @@
 <style scoped>
   /deep/ .el-icon-circle-close {
     color: #fff
+  }
+  .expandrow{
+    display: flex;
+    font-size: 16px;
+    padding-left:50px;
+    padding-bottom: 9px;
+    flex-wrap: wrap;
+  }
+  .expandrow p{
+    margin-right:20px;
+  }
+  .expandrow p span:first-child{
+   font-weight: 300;
+
   }
-
   /*  /deep/ .el-table__body tr.el-table__row--striped td {
     background-color: #C0C4CC!important;
   } */
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index 708e0bd..d09ad46 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -349,7 +349,7 @@
         watch: {},
         methods: {
           async getLeads(){
-            await this.$store.dispatch("user/getLeads")
+            // await this.$store.dispatch("user/getLeads")
           },
           async getUnitTypeList(){
             const res = await getparameteritem('unitTypeList')
@@ -496,22 +496,22 @@
               // 组别
               if(r.groups&&r.groups.length>0){
                 let ab = contactGroup(r.groups)
-                ab.map(item=>{
-                  item.admin_details.map(a=>{
-                    r.grounp_admin_detail.map(g=>{
-                      if(a.name===g.admin.name){
-                        a.hasDetail = g.detail?true:false
-                      }
-                    })
-                  })
-                  item.dep_details.map(a=>{
-                    r.grounp_department_detail.map(g=>{
-                      if(a.name===g.department.name){
-                        a.hasDetail = g.detail?true:false
-                      }
-                    })
-                  })
-                })
+                // ab.map(item=>{
+                //   item.admin_details.map(a=>{
+                //     r.grounp_admin_detail.map(g=>{
+                //       if(a.name===g.admin.name){
+                //         a.hasDetail = g.detail?true:false
+                //       }
+                //     })
+                //   })
+                //   item.dep_details.map(a=>{
+                //     r.grounp_department_detail.map(g=>{
+                //       if(a.name===g.department.name){
+                //         a.hasDetail = g.detail?true:false
+                //       }
+                //     })
+                //   })
+                // })
                 r._names = ab
 
                 //   for(var g of r.groups){