diff --git a/src/api/oafile/index.js b/src/api/oafile/index.js
new file mode 100644
index 0000000..bc8865b
--- /dev/null
+++ b/src/api/oafile/index.js
@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getFiles(params) {
+  return request({
+    url: '/api/admin/other/accept_file_list',
+    method: 'get',
+    params:params
+  })
+}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 59ed7a7..d9202d3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -238,10 +238,10 @@
                           </span>
                         </template>
                       </el-table-column>
-                      <el-table-column fixed="right" align='center' label="操作" width="180" header-align="center">
+                      <el-table-column align='center' label="操作" width="120" header-align="center">
                         <template slot-scope="scope">
                           <Button type="primary" size="small" style="margin-right:5px;margin-bottom:5px;"
-                            @click="$refs['addPatrol'].mission_id=scope.row.id,$refs['addPatrol'].isShow=true,$refs['addPatrol'].type='add'">提交检查</Button>
+                            @click="$refs['addPatrol'].mission_id=scope.row.id,$refs['addPatrol'].isShow=true,$refs['addPatrol'].type='add'">开展任务</Button>
                         </template>
                       </el-table-column>
 
@@ -338,44 +338,44 @@
 
                   </div>
                 </el-descriptions-item>
-
                 <el-descriptions-item span="2">
                   <template slot='label'>
-                    <img :src="icon4" alt="">
-                    安全检查 <span>（月/年）</span>
+                    <img :src="icon7" alt="">
+                    专项任务开展<span></span>
                   </template>
                   <div>
-                    10 / 100<span>次</span>
+                    0<span>项</span>
                   </div>
+                </el-descriptions-item>
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon5" alt="">
+                    安全培训<span>（月/年）</span>
+                  </template>
+                  <div>
+                    0 / 0<span>次</span>
+                  </div>
+                </el-descriptions-item>
+
+                <el-descriptions-item span="2">
+                  <template slot='label'>
+                    <img :src="icon6" alt="">
+                    应急演练<span>（年）</span>
+                  </template>
+                  <div>
+                    0<span>次</span>
+                  </div>
                 </el-descriptions-item>
                 <el-descriptions-item span="2">
                   <template slot='label'>
-                    <img :src="icon5" alt="">
-                    安全培训<span>（月/年）</span>
+                    <img :src="icon4" alt="">
+                    安全检查 <span>（月/年）</span>
                   </template>
                   <div>
                     0 / 0<span>次</span>
                   </div>
                 </el-descriptions-item>
 
-                <el-descriptions-item span="2">
-                  <template slot='label'>
-                    <img :src="icon6" alt="">
-                    应急演练<span>（年）</span>
-                  </template>
-                  <div>
-                    5<span>次</span>
-                  </div>
-                </el-descriptions-item>
-                <el-descriptions-item span="2">
-                  <template slot='label'>
-                    <img :src="icon7" alt="">
-                    专项任务开展<span></span>
-                  </template>
-                  <div>
-                    5<span>项</span>
-                  </div>
-                </el-descriptions-item>
 
                 <el-descriptions-item span="2">
                   <template slot='label'>
@@ -383,7 +383,7 @@
                     安全隐患数量
                   </template>
                   <div>
-                    6<span>处</span>
+                    0<span>处</span>
                   </div>
                 </el-descriptions-item>
                 <el-descriptions-item span="2">
@@ -392,7 +392,7 @@
                     安全事件
                   </template>
                   <div>
-                    2<span>起</span>
+                    0<span>起</span>
                   </div>
                 </el-descriptions-item>
               </el-descriptions>
@@ -567,7 +567,7 @@
         typeList:[{id:1,value:'责任科室'},
                   {id:1,value:'问题类型'},
                   {id:1,value:'检查类型'},
-                  {id:1,value:'月份'},
+                  // {id:1,value:'月份'},
                   {id:1,value:'年份'}
 
         ],
@@ -628,58 +628,79 @@
           end_date: "",
           department_list: [],
           daterange: null
-        },
-        missionTable: [{
-          label: "标题",
-          prop: 'name',
-          align: 'left',
-          fixed: 'left',
-          width: 240
-        }, {
-          label: "状态",
-          prop: 'audit_status',
-          width: 180,
-          formatter: (cell, data, value, index) => {
-            return value == 1 ? '开展中' : (value == 2 ? '不通过' : (value == 0 ? '待审核' : ''))
-          }
-        }, {
-          label: "开始日期",
-          prop: 'start_date',
-          width: 180,
-        }, {
-          label: "结束日期",
-          prop: 'end_date',
-          width: 180,
-        }, {
-          label: "任务类型",
-          prop: 'type',
-          width: 180,
-          formatter: (cell, data, value, index) => {
-            return value == 1 ? '专项任务' : (value == 2 ? '文件学习培训' : (value == 3 ? '事件隐患任务' : (value == 4 ? '科室任务' :
-              '')))
-          }
-        }, {
-          label: "任务类别",
-          prop: 'unit_type',
-          width: 180,
-          formatter: (cell, data, value, index) => {
-            return value == 1 ? '专项检查' : (value == 2 ? '资料收集' : (value == 3 ? '网络安全' : ''))
-          }
-        }, {
-          label: "完成要求",
-          prop: 'end_type',
-          width: 180,
-          formatter: (cell, data, value, index) => {
-            return value == 1 ? '提交文字' : (value == 2 ? '提交附件' : (value == 3 ? '提交文字与附件' : ''))
-          }
-        }, {
-          label: "参与人员",
-          prop: '_names',
-          width: 360,
-          algn: 'left',
-          customFn: (row) => {}
-
+        },
+        unitTypeList:[],
+        auditStatusList:[{
+          id:0,
+          value:'审核中'
+        },{
+          id:1,
+          value:'开展中'
+        },{
+          id:2,
+          value:'未完成'
+        },{
+          id:3,
+          value:'已完成'
         }],
+        missionTable: [{
+            label: "标题",
+            prop: 'name',
+            // fixed:'left',
+            // width: 200
+          }, {
+            label: "状态",
+            prop: 'audit_status',
+            width: 120,
+            align:'center',
+            formatter: (cell, data, value, index) => {
+              for(var item of this.auditStatusList){
+                if(item.id==value){
+                  return item.value
+                }
+              }
+            }
+          },{
+            label: "开始日期",
+            prop: 'start_date',
+            width: 120,
+            align:'center'
+          }, {
+            label: "结束日期",
+            prop: 'end_date',
+            width: 120,
+            align:'center'
+          },
+          // {
+          //   label: "任务类型",
+          //   prop: 'type',
+          //   width: 120,
+          //   align:'center',
+          //   formatter: (cell, data, value, index) => {
+          //     return value == 1 ? '专项任务' : (value == 2 ? '文件学习培训' : (value == 3 ? '事件隐患任务' : (value == 4 ? '科室任务' : '')))
+          //   }
+          // },
+          {
+            label: "任务类型",
+            prop: 'unit_type',
+            width: 120,
+            align:'center',
+            formatter: (cell, data, value, index) => {
+              this.unitTypeList.map(item=>{
+                if(value==item.id){
+                  return item.value
+                }
+              })
+              // return value == 1 ? '专项检查' : (value == 2 ? '资料收集' : (value == 3 ? '网络安全' : ''))
+            }
+          }, {
+            label: "参与人员",
+            prop: '_names',
+            width: 360,
+            align: 'left',
+            customFn: (row) => {
+            }
+          }],
         statusList: [{
           id: -1,
           value: '已撤回'
@@ -876,7 +897,8 @@
               },
               created() {
                 this.uploadOther.token = getToken();
-                // this.initLoad();
+                // this.initLoad();
+                this.getUnitTypeList()
                 this.getQuestion()
                 this.loadDeptOptions()
                 this.getInspectionData()
@@ -884,7 +906,11 @@
                 this.load();
 
               },
-              methods: {
+              methods: {
+                async getUnitTypeList(){
+                  const res = await getparameteritem('unitTypeList')
+                  this.unitTypeList = res.detail
+                },
                 changeYear(e) {},
                 changeMonth(e) {},
                 async getQuestion() {
diff --git a/src/views/oafile/index.vue b/src/views/oafile/index.vue
new file mode 100644
index 0000000..dd96201
--- /dev/null
+++ b/src/views/oafile/index.vue
@@ -0,0 +1,98 @@
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header icon="md-apps" text="文件管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <slot>
+          <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
+            <Input v-model="select.keyword" clearable style="width: 200px;margin-right: 10px;" placeholder="关键字搜索" />
+            <Button type="primary" @click="getList">查询</Button>
+          </div>
+        </slot>
+      </lx-header>
+    </div>
+      <!-- @cell-click="cellClicks" -->
+    <xy-table
+      :list="list"
+      :total="total"
+      stripe
+      @pageSizeChange="e => {select.page_size = e,getList()}"
+      @pageIndexChange="e => {select.page = e,getList()}"
+      :table-item="table">
+        <template v-slot:btns>
+          <div></div>
+         <el-table-column fixed="right" align='left' label="操作" width="180" 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;' 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> -->
+            </template>
+          </el-table-column>
+        </template>
+      </xy-table>
+  </div>
+</template>
+
+<script>
+  import {
+    getFiles
+  } from '@/api/oafile/index.js'
+
+  export default{
+    components:{
+    },
+    data(){
+      return{
+        select:{
+          keyword:'',
+          page:1,
+          page_size:10,
+        },
+        total:0,
+        table:[{
+          label:"文件名称",
+          prop:'name',
+          align:'left',
+          customFn:(row)=>{
+            return(<a href={row.url} target="_blank">{row.name}</a>)
+          }
+          // width:200
+        },{
+          label:"来源",
+          prop:'from',
+          width:120,
+        },{
+          label:"创建日期",
+          prop:'created_at',
+          width:120,
+          formatter:(cell,data,value,index)=>{
+            return value?value.substring(0,11):''
+          }
+        }],
+        list:[],
+      }
+    },
+    created(){
+      this.getList()
+    },
+    methods: {
+      async getList(){
+         const res = await getFiles({...this.select})
+         this.list = res.data
+         this.total = res.total
+      }
+    },
+    watch:{}
+  }
+</script>
+
+<style scoped>
+  /deep/ .el-icon-circle-close{
+      color:#fff
+  }
+/*  /deep/ .el-table__body tr.el-table__row--striped td {
+    background-color: #C0C4CC!important;
+  } */
+</style>
diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue
index 95cc7b4..e871717 100644
--- a/src/views/task/list/components/addUnit.vue
+++ b/src/views/task/list/components/addUnit.vue
@@ -154,7 +154,7 @@
         <div  v-if="isNeedAnswer=='答题'">
           <div class="xy-table-item">
             <div class="xy-table-item-label">
-              <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
+              <span style="font-weight: 600;padding-right: 4px;">答题：</span>
             </div>
             <div class="xy-table-item-content">
               <el-button type="primary"  size="small"
@@ -184,9 +184,12 @@
             </div>
             <div class="xy-table-item-content" style="width:400px">
               <el-radio-group v-model="form.name7" @change='changeName7'>
-                <el-radio :label="1">人员</el-radio>
+               <!-- <el-radio :label="1">人员</el-radio>
                 <el-radio :label="2" v-if='form.type!=4'>部门</el-radio>
-                <el-radio :label="3" v-if='!(form.type==4||form.type==2)'>组别</el-radio>
+                <el-radio :label="3" v-if='!(form.type==4||form.type==2)'>组别</el-radio> -->
+                <el-radio :label="1">人员</el-radio>
+                <el-radio :label="2">部门</el-radio>
+                <el-radio :label="3">组别</el-radio>
               </el-radio-group>
             </div>
           </div>
@@ -206,7 +209,7 @@
           </div>
         </div>
 
-        <div  v-if='form.name7==2&&form.type!=4'>
+        <div  v-if='form.name7==2'>
           <div class="xy-table-item">
             <div class="xy-table-item-label">
               <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
@@ -222,7 +225,7 @@
             </div>
           </div>
         </div>
-        <div v-if='form.name7==3&&!(form.type==4||form.type==2)'>
+        <div v-if='form.name7==3'>
           <div class="xy-table-item">
             <div class="xy-table-item-label">
               <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
@@ -446,7 +449,10 @@
           if(e==item.id){
             console.log(item.remark)
             this.isNeedAnswer = item.remark
-            this.form.type=2
+            if(item.remark=='答题'){
+              this.form.type=2
+            }
+            //
           }
         })
       },
diff --git a/src/views/task/list/components/checkUnit.vue b/src/views/task/list/components/checkUnit.vue
index be566ff..c9bc1ec 100644
--- a/src/views/task/list/components/checkUnit.vue
+++ b/src/views/task/list/components/checkUnit.vue
@@ -5,14 +5,14 @@
       <template v-slot:mission_name>
         <el-divider>任务信息</el-divider>
         <div>
-          <el-descriptions class="margin-top" :column="2" border>
-            <el-descriptions-item>
+          <el-descriptions class="margin-top" :column="4" border>
+            <el-descriptions-item span='2'>
               <template slot="label">
                 任务名称
               </template>
               {{showform.name?showform.name:''}}
             </el-descriptions-item>
-            <el-descriptions-item>
+            <el-descriptions-item  span='2'>
               <template slot="label">
                 任务类型
               </template>
@@ -22,31 +22,31 @@
                 </span>
               </div>
             </el-descriptions-item>
-            <el-descriptions-item>
+            <el-descriptions-item  span='2'>
               <template slot="label">
                 开始日期
               </template>
               {{showform.start_date?showform.start_date:''}}
             </el-descriptions-item>
-            <el-descriptions-item>
+            <el-descriptions-item  span='2'>
               <template slot="label">
                 结束日期
               </template>
               {{showform.end_date?showform.end_date:''}}
             </el-descriptions-item>
-            <el-descriptions-item :span="showform.audit_admin_id>0?'1':'2'">
+            <el-descriptions-item :span="showform.audit_admin_id>0?'2':'4'">
               <template slot="label">
                 是否审批
               </template>
               {{showform.audit_admin_id>0?"是":'否'}}
             </el-descriptions-item>
-            <el-descriptions-item v-if="showform.audit_admin_id">
+            <el-descriptions-item v-if="showform.audit_admin_id" :span="showform.audit_admin_id>0?'2':'4'">
               <template slot="label">
                 审批人
               </template>
               {{showform.audit_admin?showform.audit_admin.name:''}}
             </el-descriptions-item>
-            <el-descriptions-item span='2'>
+            <el-descriptions-item span='4'>
               <template slot="label">
                 附件
               </template>
@@ -54,8 +54,8 @@
                 <a :href="item.url">{{item.name}}</a>
               </div>
             </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label" span='2'>
+            <el-descriptions-item  span='4'>
+              <template slot="label">
                 说明
               </template>
               {{showform.content?showform.content:''}}
@@ -70,13 +70,13 @@
                 </span>
               </div>
             </el-descriptions-item> -->
-            <el-descriptions-item span='2'>
+            <el-descriptions-item span='4'>
               <template slot="label">
                 任务完成详情
               </template>
               {{showform.end_content?showform.end_content:''}}
             </el-descriptions-item>
-            <el-descriptions-item span='2'>
+            <el-descriptions-item span='4'>
               <template slot="label">
                 参与人员
               </template>
diff --git a/src/views/task/list/components/showPatrol.vue b/src/views/task/list/components/showPatrol.vue
index 0aeeb3c..7f331d5 100644
--- a/src/views/task/list/components/showPatrol.vue
+++ b/src/views/task/list/components/showPatrol.vue
@@ -197,7 +197,7 @@
                   <!-- 选择 -->
                 </template>
                 <div  style="display: flex;width:100%;margin-left:11px;padding-bottom: 12px;">
-                  <div style="margin-right:10px;min-width: 120px;text-align: right;">责任对象选择：
+                  <div style="margin-right:10px;min-width: 120px;text-align: right;">参与人员选择：
                   </div>
                   <div>
                     <el-radio-group v-model="form.name7" @change='changeName7'>
@@ -277,7 +277,7 @@
               </el-descriptions-item>
               <el-descriptions-item span='2'>
                 <template slot="label">
-                  责任对象
+                  参与人员
                 </template>
                 <div v-if="showform.accept_admin_ids_details&&showform.accept_admin_ids_details.length>0">
                   <el-tag style='margin-right:10px' v-for='item in showform.accept_admin_ids_details'>
diff --git a/src/views/task/list/components/showPlan.vue b/src/views/task/list/components/showPlan.vue
new file mode 100644
index 0000000..9282746
--- /dev/null
+++ b/src/views/task/list/components/showPlan.vue
@@ -0,0 +1,276 @@
+<template>
+<div>
+    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" title="查看" :form="form"
+      >
+      <template v-slot:contents>
+         <el-descriptions class="margin-top" :column="4" border>
+           <el-descriptions-item span="2">
+             <template slot="label">
+               计划名称：
+             </template>
+             {{showform.name?showform.name:''}}
+           </el-descriptions-item>
+           <el-descriptions-item span="2">
+             <template slot="label">
+               计划年份：
+             </template>
+             {{showform.year?showform.year:''}}
+           </el-descriptions-item>
+           <el-descriptions-item span="2">
+             <template slot="label">
+               计划类型：
+             </template>
+             {{showform.type_detail?showform.type_detail.value:''}}
+           </el-descriptions-item>
+
+           <el-descriptions-item span="2">
+             <template slot="label">
+               开始日期：
+             </template>
+             {{showform.start_date}}
+           </el-descriptions-item>
+           <el-descriptions-item span="2">
+             <template slot="label">
+               计划状态：
+             </template>
+             <div v-for="item in statusList">
+               <span v-if="showform.status==item.id">
+                 {{item.value}}
+               </span>
+             </div>
+           </el-descriptions-item>
+           <el-descriptions-item span="2">
+             <template slot="label">
+               结束日期：
+             </template>
+             {{showform.end_date?showform.end_date:''}}
+           </el-descriptions-item>
+           <el-descriptions-item span='4'>
+             <template slot="label">
+               附件：
+             </template>
+             <div v-for="item in pictureList">
+               <a target="_blank" :href="item.url">{{item.name}}</a>
+             </div>
+           </el-descriptions-item>
+           <el-descriptions-item span='4'>
+             <template slot="label">
+               参与人员：
+             </template>
+             <div v-if="showform.accept_admin&&showform.accept_admin.length>0">
+               <el-tag style='margin-right:10px' v-for='item in showform.accept_admin'>
+                 {{item.name}}
+               </el-tag>
+             </div>
+             <div v-if="showform.accept_department&&showform.accept_department.length>0">
+               <el-tag style='margin-right:10px' v-for='item in showform.accept_department'>
+                 {{item.name}}
+               </el-tag>
+             </div>
+           </el-descriptions-item>
+           <el-descriptions-item span='4'>
+             <template slot="label">
+               说明
+             </template>
+             {{showform.content?showform.content:''}}
+           </el-descriptions-item>
+
+         </el-descriptions>
+      </template>
+      <template  v-slot:footerContent>
+        <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
+      </template>
+
+    </xy-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    Message
+  } from 'element-ui'
+  import {
+    getparameteritem
+  } from "@/api/system/dictionary.js";
+  import {
+    get
+  } from "@/api/task/plan.js";
+
+  export default {
+    components: {
+    },
+    data() {
+      return {
+        isShow: false,
+        id:'',
+        pictureList:[],
+        statusList:[{
+          id:0,
+          value:'未完成'
+        },{
+          id:1,
+          value:'未开展'
+        },{
+          id:2,
+          value:'开展中'
+        },{
+          id:3,
+          value:'已完成'
+        }],
+        showform:{},
+        form: {
+          contents:'',
+          plan_type:'',
+          name: '',
+          year:'',
+          type: '',
+          start_date: '',
+          status:1,
+          end_date: '',
+          // count:'',
+          lefts:'',
+          name7: 1,
+          file_ids: '',
+          content: '',
+          accept_admin_ids: [],
+          accept_department_ids: [],
+        },
+      }
+    },
+    created() {
+
+    },
+    methods: {
+
+      async getDetail() {
+        const res = await get(this.id)
+        this.showform = res
+        this.form = {
+          contents:'',
+          plan_type:res?.plan_type,
+          name: res?.name,
+          year:res.year?res.year:new Date().getFullYear(),
+          type: res?.type,
+          start_date: res?.start_date,
+          status:res.status?res.status:1,
+          end_date: res?.end_date,
+          name7: res.accept_department.length > 0 ? 2 : 1,
+          file_ids: res?.file_ids,
+          content: res?.content,
+          accept_admin_ids: res?.accept_admin,
+          accept_department_ids: res?.accept_department,
+        }
+        for (var f of res.files) {
+          this.pictureList.push({
+            id: f.id,
+            url: f.url,
+            name: f.original_name
+          })
+        }
+      },
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+            this.getDetail()
+
+        } else {
+          this.id = ''
+          this.pictureList = []
+          this.showform = {}
+          this.$refs['dialog'].reset()
+        }
+      }
+    }
+
+  }
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .contents,
+  ::v-deep .end_type,
+  ::v-deep .file_ids,
+  ::v-deep .is_need_answer{
+    flex-basis: 100%;
+  }
+
+  ::v-deep .plan_type {
+    display: none;
+  }
+  ::v-deep .el-form>div{
+        align-items: flex-start!important;
+  }
+  .xy-table-item{
+    padding-right:0
+  }
+  ::v-deep .xy-table-item-label {
+    padding-right:0
+  }
+
+  .img__delete {
+    transform: scale(0.8, 0.8);
+
+    position: absolute;
+    top: 4px;
+    right: 4px;
+  }
+
+  ::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+  ::v-deep .el-upload--picture-card {
+    font-size: 28px;
+    color: #8c939d;
+    width: 80px !important;
+    height: 80px !important;
+    line-height: 80px !important;
+    text-align: center;
+  }
+
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 80px !important;
+    height: 80px !important;
+    line-height: 80px !important;
+    text-align: center;
+  }
+
+  ::v-deep .avatar {
+    width: 80px !important;
+    display: block;
+    border-radius: 6px;
+  }
+
+  // ::v-deep .xy-table-item-label {
+  //   width: 160px !important;
+  // }
+
+  ::v-deep .el-date-editor .el-range-separator {
+    width: auto !important;
+  }
+
+  ::v-deep .el-input-number .el-input__inner {
+    text-align: left !important;
+  }
+
+  .searchCompanys {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 16px;
+
+    .el-input {
+      width: 80%
+    }
+  }
+</style>
diff --git a/src/views/task/list/patrol.vue b/src/views/task/list/patrol.vue
index 319f474..91c704b 100644
--- a/src/views/task/list/patrol.vue
+++ b/src/views/task/list/patrol.vue
@@ -32,10 +32,10 @@
       @pageIndexChange="e => {select.page = e,getList()}"
       :table-item="table">
       <template v-slot:btns>
-        <el-table-column align='left' label="操作" min-width="180" header-align="center">
+        <el-table-column align='left' label="操作" min-width="120" header-align="center">
           <template slot-scope="scope">
             <Button v-if="is_guiji||is_chuzhang||login_id==scope.row.admin_id" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">办理</Button>
-            <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">查看</Button>
+            <!-- <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">查看</Button> -->
             <Button v-if='scope.row.status==0&&(is_guiji||is_chuzhang||login_id==scope.row.admin_id)' type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="editorPatrol(scope.row.id,'editor')">编辑</Button>
             <!-- <Button v-if="scope.row.status==1&&((scope.row.check_leader==1&&is_leader&&scope.row.leader_status===null)||(scope.row.check_main==1&&is_main_leader&&scope.row.main_status===null))" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'leader')">确认</Button> -->
             <!-- <Button v-if="scope.row.status==9&&((scope.row.re_check_leader==1&&is_leader&&scope.row.re_leader_status===null)||(scope.row.re_check_main==1&&is_main_leader&&scope.row.re_main_status===null))" type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'leaderconfirm')">审核</Button> -->
@@ -86,13 +86,13 @@ import {getInfo} from "@/api/user.js";
           value:'已撤回'
         },{
           id:0,
-          value:'待确认'
+          value:'整改中'
         },{
           id:1,
-          value:'待领导确认'
+          value:'整改中'
         },{
           id:2,
-          value:'已分发,待接收'
+          value:'待接收'
         },{
           id:3,
           value:'整改中'
@@ -104,13 +104,13 @@ import {getInfo} from "@/api/user.js";
           value:'已整改'
         },{
           id:6,
-          value:'不通过'
+          value:'退回'
         },{
           id:7,
           value:'整改中'
         },{
           id:8,
-          value:'部门退回'
+          value:'整改中'
         },{
           id:9,
           value:'整改中'
@@ -226,9 +226,48 @@ import {getInfo} from "@/api/user.js";
              </div>)
           }
         },{
-          label:"建议整改科室",
+          label:"责任科室",
           prop:'ask_department',
-          width:120,
+          width:240,
+          customFn: (row) => {
+
+            return(<div style={
+              {
+                'display':'flex',
+                'flex-wrap':'wrap'
+              }
+            }>
+              {
+                row.accept_department_ids_details&&row.accept_department_ids_details.length>0?
+                row.accept_department_ids_details.map(item=>{
+                      return(<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
+                  })
+                :(row.accept_admin_ids_details&&row.accept_admin_ids_details.length>0?
+
+                row.accept_admin_ids_details.map(item=>{
+                      return (<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
+                })
+                :row.ask_department)
+
+
+              }
+
+            </div>)
+          }
+          // formatter:(cell,data,value,index)=>{
+          //   if(cell.accept_department_ids_details&&cell.accept_department_ids_details.length>0){
+          //     cell.accept_department_ids_details.map(item=>{
+          //       return `<el-tag>${item}</el-tag>`
+          //     })
+          //   }else if(cell.accept_admin_ids_details&&cell.accept_department_ids_details.length>0){
+          //     console.log("123")
+          //     cell.accept_admin_ids_details.map(item=>{
+          //       return `<el-tag>${item}</el-tag>`
+          //     })
+          //   }else{
+          //     return value
+          //   }
+          // }
         },{
           label:"计划整改日期",
           prop:'plan_end_date',
@@ -239,7 +278,7 @@ import {getInfo} from "@/api/user.js";
           width:240,
           customFn: (row) => {
             let arr = []
-            return ( <div style = {
+            return (<div style = {
               {
                 whiteSpace:'normal'
               }
diff --git a/src/views/task/list/plan.vue b/src/views/task/list/plan.vue
index 0d324d1..69c0ec5 100644
--- a/src/views/task/list/plan.vue
+++ b/src/views/task/list/plan.vue
@@ -31,8 +31,8 @@
         <template v-slot:btns>
           <el-table-column fixed="right" align='left' label="操作" width="180" header-align="center">
             <template slot-scope="scope">
-              <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="editorPlan(scope.row.id,'editor')">查看</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>
            <!-- <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
              <Button type="primary" style="margin-right:5px;margin-bottom:5px;" size="small" ghost>删除</Button>
@@ -42,18 +42,22 @@
         </template>
       </xy-table>
       <addPlan ref='addPlan' @refresh='getList'></addPlan>
+      <showPlan ref='showPlan'></showPlan>
   </div>
 </template>
 
 <script>
   import addPlan from '../list/components/addPlan.vue'
+  import showPlan from '../list/components/showPlan.vue'
+
   import {
     listplan,del
   } from '@/api/task/plan.js'
 
   export default{
     components:{
-      addPlan
+      addPlan,
+      showPlan
     },
     data(){
       return{
@@ -149,6 +153,10 @@
         this.$refs.addPlan.type= type
         this.$refs.addPlan.isShow = true
       },
+      showPlan(id){
+        this.$refs.showPlan.id= id
+        this.$refs.showPlan.isShow = true
+      },
       deleteList(id){
         var that = this;
         if (id) {
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index e06a9f4..e26651d 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -271,7 +271,9 @@
           audit_status:'',
           dueDate:[],
           start_date:'',
-          end_date:''
+          end_date:'',
+          sort_name:'start_date',
+          sort_type:'DESC'
         },
         total: 0,
         auditStatusList:[{
@@ -357,9 +359,10 @@
             align:'center',
             formatter: (cell, data, value, index) => {
               this.unitTypeList.map(item=>{
+                console.log(value,item.id,value==item.id)
                 if(value==item.id){
                   return item.value
-                }
+                }else{}
               })
               // return value == 1 ? '专项检查' : (value == 2 ? '资料收集' : (value == 3 ? '网络安全' : ''))
             }
@@ -439,6 +442,9 @@
           if (this.$route.path) {
             let path = this.$route.path.split("_")
             this.select.type = path[1]
+            if(path[1]==1){
+              this.select.type = '1,2'
+            }
             this.path_type = path[1]
             this.typeName.map(item => {
               if (item.type == this.select.type) {
@@ -460,12 +466,21 @@
               this.type_name = '科室任务'
               this.path_type = path[1]
               this.path_type_2 = path[2]
+            }
+            if(path[2]&&path[2]==6){
+              this.select.type = ''
+              // this.select.myself = 1
+              this.select.myself_department = 1
+              this.select.audit_status = 3
+              this.type_name = '历史任务'
+              this.path_type = path[1]
+              this.path_type_2 = path[2]
             }
           }
           console.log("this.path_type ",this.path_type)
           this.getUnitTypeList()
           this.getUserId()
-          this.getList()
+
 
         },
         watch: {},
@@ -473,6 +488,7 @@
           async getUnitTypeList(){
             const res = await getparameteritem('unitTypeList')
             this.unitTypeList = res.detail
+            this.getList()
           },
           initHeight() {
             var that = this;