diff --git a/src/views/task/list/components/addPatrol.vue b/src/views/task/list/components/addPatrol.vue
index 78cd82a..24d1103 100644
--- a/src/views/task/list/components/addPatrol.vue
+++ b/src/views/task/list/components/addPatrol.vue
@@ -15,6 +15,16 @@
           </div>
         </div>
       </template> -->
+      <template v-slot:title>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold;">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>检查名称：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.title" type="text" placeholder="请输入检查名称" style="width: 400px;"></el-input>
+          </div>
+        </div>
+      </template>
       <template v-slot:date>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold;">
@@ -211,7 +221,7 @@
         sitePlaceholder:'请选择站点',
         mapClickIndex:0,
         form: {
-
+          title: '',
           date: '',
 
           siteName: '',
@@ -239,6 +249,10 @@ mission_id: '',
           //   required: true,
           //   message: '请选择任务名称'
           // }],
+          title: [{
+            required: true,
+            message: '请输入检查名称'
+          }],
           date: [{
             required: true,
             message: '请选择发现时间'
@@ -441,6 +455,7 @@ mission_id: '',
         const res = await get(this.id)
         this.form = {
 
+          title: res?.title,
           date: res?.date,
           site_id: res?.site_id,
           siteName: res.site_id?[undefined,res.site_id]:res.address,
diff --git a/src/views/task/list/components/showPatrol.vue b/src/views/task/list/components/showPatrol.vue
index 436fe23..f35d3aa 100644
--- a/src/views/task/list/components/showPatrol.vue
+++ b/src/views/task/list/components/showPatrol.vue
@@ -1,6 +1,6 @@
-<template>
-  <div>
-    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="`查看`" :form="form" :rules="rules"
+<template>
+  <div>
+    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="`查看`" :form="form" :rules="rules"
       @submit="submit">
 <!-- ${type_name} -->
       <template v-slot:steps>
@@ -11,7 +11,7 @@
           <el-step title="整改反馈"></el-step>
           <!-- <el-step title="审核"></el-step> -->
         </el-steps>
-      </template>
+      </template>
       <!-- 填报信息 -->
       <template v-slot:contents>
       <div id='print'>
@@ -25,6 +25,12 @@
                 </template>
                 {{showform.mission_id===0?"日常巡查":(showform.mission?showform.mission.name:'')}}
               </el-descriptions-item>
+              <el-descriptions-item>
+                <template slot="label">
+                  检查名称
+                </template>
+                {{showform.title?showform.title:''}}
+              </el-descriptions-item>
               <el-descriptions-item>
                 <template slot="label">
                   状态
@@ -715,9 +721,9 @@
       -->
       </div>
     </template>
-
 
-
+
+
       <template v-slot:footerContent>
         <div  style="display:flex;justify-content: space-between;">
           <Button  type="primary" v-print="'#print'" style='margin-left:5px;margin-bottom:5px;'>打印</Button>
@@ -729,65 +735,65 @@
             <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
 
           </div>
-        </div>
-
-      </template>
-
-    </xy-dialog>
-
-    <el-dialog :visible.sync="showPic">
-      <img width="100%" :src="showPicUrl" alt="">
-    </el-dialog>
-
-  </div>
-</template>
-
-<script>
-  import {
-    Message
-  } from 'element-ui'
-  import {
-    getparameteritem
-  } from "@/api/system/dictionary.js";
-  import {
-    save,
-    get,
-    del
-  } from "@/api/task/patrol.js";
-  import {
-    listdept
-  } from "@/api/system/department.js"
-  import {
-    listCommonuser
-  } from "@/api/common.js"
-  import {
-    getToken
+        </div>
+
+      </template>
+
+    </xy-dialog>
+
+    <el-dialog :visible.sync="showPic">
+      <img width="100%" :src="showPicUrl" alt="">
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+  import {
+    Message
+  } from 'element-ui'
+  import {
+    getparameteritem
+  } from "@/api/system/dictionary.js";
+  import {
+    save,
+    get,
+    del
+  } from "@/api/task/patrol.js";
+  import {
+    listdept
+  } from "@/api/system/department.js"
+  import {
+    listCommonuser
+  } from "@/api/common.js"
+  import {
+    getToken
   } from '@/utils/auth'
   import {
     listunit
   } from "@/api/task/unit.js";
   import state from "@/store/modules/user.js"
-import elSelectTree from '@/components/selectTree'
-  export default {
+import elSelectTree from '@/components/selectTree'
+  export default {
     components: {
       elSelectTree
-    },
-    data() {
-      return {
-        isShow: false,
-        type: 'add',
-        typeNameList: {
-          show: '查看',
-          check: '审核',
-          leader: '领导意见',
-          accept: '接收',
-          reform: '提交整改',
-          confirm: '确认整改',
-          leaderconfirm: '领导意见整改'
+    },
+    data() {
+      return {
+        isShow: false,
+        type: 'add',
+        typeNameList: {
+          show: '查看',
+          check: '审核',
+          leader: '领导意见',
+          accept: '接收',
+          reform: '提交整改',
+          confirm: '确认整改',
+          leaderconfirm: '领导意见整改'
         },
         groupObj:{},
         showgroups:false,
-        unitList:[],
+        unitList:[],
         type_name: '',
         statusLabel:[
         //   {
@@ -821,108 +827,108 @@ import elSelectTree from '@/components/selectTree'
         },{
           id:9,
           value:'整改中'
-        }],
+        }],
         statusList: [
-        //   {
-        //   id: -1,
-        //   value: '已撤回'
+        //   {
+        //   id: -1,
+        //   value: '已撤回'
         // },
-        {
-          id: 0,
-          value: '待确认'
-        }, {
-          id: 1,
-          value: '待领导确认'
-        }, {
-          id: 2,
-          value: '已分发,待接收'
-        }, {
-          id: 3,
-          value: '已接收'
-        }, {
-          id: 4,
-          value: '提交整改'
-        }, {
-          id: 5,
-          value: '已整改'
-        }, {
-          id: 6,
-          value: '退回'
-        }, {
-          id: 7,
-          value: '整改不通过,重新整改'
-        }, {
-          id: 8,
-          value: '部门退回'
-        }, {
-          id: 9,
-          value: '待领导审核'
-        }],
-        id: '',
-        uploadOther: {
-          token: ""
-        },
-        action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`,
-        pictureList: [],
-        showPic: false,
-        showPicUrl: '',
-
-
-        showform: {},
-        showurl: [],
-        showfixurl: [],
+        {
+          id: 0,
+          value: '待确认'
+        }, {
+          id: 1,
+          value: '待领导确认'
+        }, {
+          id: 2,
+          value: '已分发,待接收'
+        }, {
+          id: 3,
+          value: '已接收'
+        }, {
+          id: 4,
+          value: '提交整改'
+        }, {
+          id: 5,
+          value: '已整改'
+        }, {
+          id: 6,
+          value: '退回'
+        }, {
+          id: 7,
+          value: '整改不通过,重新整改'
+        }, {
+          id: 8,
+          value: '部门退回'
+        }, {
+          id: 9,
+          value: '待领导审核'
+        }],
+        id: '',
+        uploadOther: {
+          token: ""
+        },
+        action: `${process.env.VUE_APP_BASE_API}/api/admin/upload-file`,
+        pictureList: [],
+        showPic: false,
+        showPicUrl: '',
+
+
+        showform: {},
+        showurl: [],
+        showfixurl: [],
         steps_active: 1,
         showReason:true,
         showTarget:true,
-        fixList:[],
-        form: {
+        fixList:[],
+        form: {
           steps: '',
           contents:'',
-
+
           status: '',
           is_hidden:null,
-          deal_id:'',
-          check_leader: '',
-          check_main: '',
-          leader_status: '',
-          main_status: '',
-          name7: 2,
-          accept_department_ids: [],
-          accept_admin_ids: [],
-          accept_status: '',
-          plan_end_date: '',
-          duty_admin_id: '',
-          reason: '',
-
-          accept_admin_name: "",
-          plan_end_date_name: '',
-          duty_admin_name: '',
-          fix_status: '',
-          fix_end_date: '',
-          fix_introduce: '',
-          fix_file_ids: [],
-          confirm_status: '',
-          re_check_leader: 0,
-          re_check_main: 0,
-          re_leader_status: '',
-          re_main_status: '',
-
-
-          mission_id: '',
-          date: '',
-          site_id: '',
-          ask_id: '',
-          ask_introduce: '',
-          tips: '',
-          file_ids: [],
-        },
-
-        // checkList: [{
-        //   id: 2,
-        //   name: '是'
-        // }, {
-        //   id: 6,
-        //   name: '否'
+          deal_id:'',
+          check_leader: '',
+          check_main: '',
+          leader_status: '',
+          main_status: '',
+          name7: 2,
+          accept_department_ids: [],
+          accept_admin_ids: [],
+          accept_status: '',
+          plan_end_date: '',
+          duty_admin_id: '',
+          reason: '',
+
+          accept_admin_name: "",
+          plan_end_date_name: '',
+          duty_admin_name: '',
+          fix_status: '',
+          fix_end_date: '',
+          fix_introduce: '',
+          fix_file_ids: [],
+          confirm_status: '',
+          re_check_leader: 0,
+          re_check_main: 0,
+          re_leader_status: '',
+          re_main_status: '',
+
+
+          mission_id: '',
+          date: '',
+          site_id: '',
+          ask_id: '',
+          ask_introduce: '',
+          tips: '',
+          file_ids: [],
+        },
+
+        // checkList: [{
+        //   id: 2,
+        //   name: '是'
+        // }, {
+        //   id: 6,
+        //   name: '否'
         // }],
         checkstatus:3,
         checkList: [{
@@ -932,20 +938,20 @@ import elSelectTree from '@/components/selectTree'
           id: 6,
           name: '否'
         }],
-        confirmStatus:1,
-        confirmList: [{
-          id: 1,
-          name: '通过'
-        }, {
-          id: 0,
-          name: '不通过'
-        }],
-        leaderCheckList: [{
-          id: 1,
-          name: '是'
-        }, {
-          id: 0,
-          name: '否'
+        confirmStatus:1,
+        confirmList: [{
+          id: 1,
+          name: '通过'
+        }, {
+          id: 0,
+          name: '不通过'
+        }],
+        leaderCheckList: [{
+          id: 1,
+          name: '是'
+        }, {
+          id: 0,
+          name: '否'
         }],
         leaderConfirmList: [{
           id: 1,
@@ -954,49 +960,49 @@ import elSelectTree from '@/components/selectTree'
           id: 0,
           name: '不通过'
         }],
-        acceptStatus:1,
-        acceptList: [{
-          id: 1,
-          name: '是'
-        }, {
-          id: 0,
-          name: '否'
-        }],
-        deptOptions: [],
-        checkAll: false,
-        isIndeterminate: true,
+        acceptStatus:1,
+        acceptList: [{
+          id: 1,
+          name: '是'
+        }, {
+          id: 0,
+          name: '否'
+        }],
+        deptOptions: [],
+        checkAll: false,
+        isIndeterminate: true,
         userdata: [],
         userdatabefore:[],
         valueMultiple:[],
-        valueArr:[],
-        filterMethod(query, item) {
-          return item.name.indexOf(query) > -1;
-        },
-
-        rules: {
-          // status: [{
-          //   required: true,
-          //   message: '请选择状态'
-          // }]
+        valueArr:[],
+        filterMethod(query, item) {
+          return item.name.indexOf(query) > -1;
+        },
+
+        rules: {
+          // status: [{
+          //   required: true,
+          //   message: '请选择状态'
+          // }]
         },
         login_id:'',
         department_id:'',
-        is_myself:false,
-        is_leader: false,
-        is_main_leader: false,
-        is_guiji: false,
+        is_myself:false,
+        is_leader: false,
+        is_main_leader: false,
+        is_guiji: false,
         is_chuzhang: false,
-        is_admin:false
-      }
-    },
-    created() {
+        is_admin:false
+      }
+    },
+    created() {
       this.uploadOther.token = getToken();
       this.getLeads()
       this.getUnit()
-      this.getFixList()
-      this.loadDeptOptions()
-      this.loadUser()
-    },
+      this.getFixList()
+      this.loadDeptOptions()
+      this.loadUser()
+    },
     methods: {
       async getLeads(){
         // await this.$store.dispatch("user/getLeads")
@@ -1037,10 +1043,10 @@ import elSelectTree from '@/components/selectTree'
       },
       print () {
         this.$Print('#print');
-      },
-      deleteList(id) {
-        var that = this;
-        if (id) {
+      },
+      deleteList(id) {
+        var that = this;
+        if (id) {
           del(id).then(response => {
             this.$Message.success('操作成功');
             this.isShow = false
@@ -1048,18 +1054,18 @@ import elSelectTree from '@/components/selectTree'
           }).catch(error => {
             console.log(error)
             reject(error)
-          })
-        }
-      },
-      //切换用户选择 人员还是部门 清空
-      changeName7(e) {
-        if (e) {
-          this.form.accept_department_ids = []
+          })
+        }
+      },
+      //切换用户选择 人员还是部门 清空
+      changeName7(e) {
+        if (e) {
+          this.form.accept_department_ids = []
           this.form.accept_admin_ids = []
           this.valueArr = []
           this.valueMultiple = []
-          this.$forceUpdate()
-        }
+          this.$forceUpdate()
+        }
       },
       changeCheck(e){
         if(e){
@@ -1074,8 +1080,8 @@ import elSelectTree from '@/components/selectTree'
             this.form.status=7
           }
         }
-      },
-      // 切换接收的状态 清空
+      },
+      // 切换接收的状态 清空
       changeAcceptStatus(e) {
         console.log(e)
         if(e){
@@ -1095,36 +1101,36 @@ import elSelectTree from '@/components/selectTree'
         }else{
           this.showReason = true
           this.showTarget = true
-        }
-
-      },
-      // 选择科室
-      loadDeptOptions() {
-        listdept().
-        then((res) => {
-          for (var m of res) {
-            m.checked = false;
-          }
-          this.deptOptions = res;
-        }).catch(error => {
-          console.log(error)
-          reject(error)
-        })
-      },
-      loadUser() {
-        listCommonuser({
-          page_size: 999,
-        }).
+        }
+
+      },
+      // 选择科室
+      loadDeptOptions() {
+        listdept().
+        then((res) => {
+          for (var m of res) {
+            m.checked = false;
+          }
+          this.deptOptions = res;
+        }).catch(error => {
+          console.log(error)
+          reject(error)
+        })
+      },
+      loadUser() {
+        listCommonuser({
+          page_size: 999,
+        }).
         then((res) => {
           // this.userdata = res.data ? res.data.reverse() : [];
           let data = res.data ? res.data.reverse() : [];
-          this.userdatabefore = res.data ? res.data : [];
+          this.userdatabefore = res.data ? res.data : [];
           let contactData = this.contactUser(data)
           this.userdata = this.sortDepartment(contactData,'department_id')
-          console.log("this.userdata",this.userdata)
-        }).catch(error => {
-          console.log(error)
-        })
+          console.log("this.userdata",this.userdata)
+        }).catch(error => {
+          console.log(error)
+        })
       },
       getSelectedValue (value) {
           console.log('选中的结果值', value)
@@ -1163,55 +1169,55 @@ import elSelectTree from '@/components/selectTree'
           var y = b[key]
           return ((x<y)?-1:(x>y)?1:0)
         })
-      },
-      handleCheckAllChange(val) {
-        let options = [];
-        for (var m of this.deptOptions) {
-          options.push(m.id);
-        }
-        this.form.accept_department_ids = val ? options : [];
-        this.isIndeterminate = false;
-      },
-      handleCheckedDeptSingleChange(v) {
-        //如果出现取消的操作 就要执行删除
-        console.log(v);
-        var that = this;
-        if (this.form.accept_department_ids)
-          that.delDeptItem();
-
-      },
-      //删除操作
-      delDeptItem() {
-        for (var m of this.deptOptions) {
-          if (this.form.accept_department_ids.indexOf(m.id) == -1) {
-            var d = this.form.accept_department_ids.filter(function(t) {
-              return t.department_id == m.id;
-            })
-
-            if (d.length != 0) {
-              delDep(d[0].id).then(response => {}).catch(error => {
-                console.log(error)
-              })
-            }
-
-          }
-        }
-      },
-      handleCheckedDeptChange(value) {
-        let checkedCount = value.length;
-        this.checkAll = checkedCount === this.deptOptions.length;
-        this.isIndeterminate = checkedCount > 0 && checkedCount < this.deptOptions.length;
-      },
-
-      handleRemove(file, fileList) {
-        this.pictureList = fileList
-      },
-      handlesuccess(response, file, fileList) {
-        this.pictureList = fileList
-      },
-      handlePictureCardPreview(file) {
-        this.showPicUrl = file.url;
-        this.showPic = true;
+      },
+      handleCheckAllChange(val) {
+        let options = [];
+        for (var m of this.deptOptions) {
+          options.push(m.id);
+        }
+        this.form.accept_department_ids = val ? options : [];
+        this.isIndeterminate = false;
+      },
+      handleCheckedDeptSingleChange(v) {
+        //如果出现取消的操作 就要执行删除
+        console.log(v);
+        var that = this;
+        if (this.form.accept_department_ids)
+          that.delDeptItem();
+
+      },
+      //删除操作
+      delDeptItem() {
+        for (var m of this.deptOptions) {
+          if (this.form.accept_department_ids.indexOf(m.id) == -1) {
+            var d = this.form.accept_department_ids.filter(function(t) {
+              return t.department_id == m.id;
+            })
+
+            if (d.length != 0) {
+              delDep(d[0].id).then(response => {}).catch(error => {
+                console.log(error)
+              })
+            }
+
+          }
+        }
+      },
+      handleCheckedDeptChange(value) {
+        let checkedCount = value.length;
+        this.checkAll = checkedCount === this.deptOptions.length;
+        this.isIndeterminate = checkedCount > 0 && checkedCount < this.deptOptions.length;
+      },
+
+      handleRemove(file, fileList) {
+        this.pictureList = fileList
+      },
+      handlesuccess(response, file, fileList) {
+        this.pictureList = fileList
+      },
+      handlePictureCardPreview(file) {
+        this.showPicUrl = file.url;
+        this.showPic = true;
       },
       async getFixList() {
         const res = await getparameteritem('fix_options')
@@ -1262,60 +1268,60 @@ import elSelectTree from '@/components/selectTree'
             }
           }
         })
-      },
-      async getDetail() {
-        const res = await get(this.id)
-
-        // 选择人或部门
-        let name7value = 2
-        // if (res.accept_department_ids) {
-        //   name7value = res.accept_department_ids.length > 0 ? 2 : 2
-        // } else if (res.accept_admin_ids) {
-        //   name7value =
-        // } else {
-        //   name7value = 2
+      },
+      async getDetail() {
+        const res = await get(this.id)
+
+        // 选择人或部门
+        let name7value = 2
+        // if (res.accept_department_ids) {
+        //   name7value = res.accept_department_ids.length > 0 ? 2 : 2
+        // } else if (res.accept_admin_ids) {
+        //   name7value =
+        // } else {
+        //   name7value = 2
         // }
-
-        // this.form.name7 = res.accept_department_ids.length > 0 ? 2 : (res.accept_admin_ids.length > 0 ? 1 : 2)
+
+        // this.form.name7 = res.accept_department_ids.length > 0 ? 2 : (res.accept_admin_ids.length > 0 ? 1 : 2)
         if(res.accept_department_ids && res.accept_admin_ids){
           name7value = res.accept_department_ids.length > 0 ? 2 : (res.accept_admin_ids.length > 0 ? 1 : 2)
         }else{
           name7value = 2
         }
-        this.form = {
+        this.form = {
           steps: '',
           contents:'',
-
-          // 审核
-          status: res?.status,
+
+          // 审核
+          status: res?.status,
           accept_status: '',
-          deal_id:res?.deal_id,
-          check_leader: res.check_leader == 1 ? 1 : 0,
+          deal_id:res?.deal_id,
+          check_leader: res.check_leader == 1 ? 1 : 0,
           check_main: res.check_main == 1 ? 1 : 0,
-          is_hidden:res?.is_hidden,
-          // leader_status: res.leader_status == 1 ? 1 : 0,
+          is_hidden:res?.is_hidden,
+          // leader_status: res.leader_status == 1 ? 1 : 0,
           // main_status: res.main_status == 1 ? 1 : 0,
           leader_status: res?.leader_status,
-          main_status: res?.main_status,
-          name7: name7value,
-          accept_department_ids: res.accept_department_ids?res.accept_department_ids:[],
-          accept_admin_ids: res.accept_admin_ids?res.accept_admin_ids:[],
-          accept_status: '',
-          plan_end_date: res?.plan_end_date,
-          duty_admin_id: res?.duty_admin_id,
-          reason: res?.reason,
-
-          accept_admin_name: "",
-          plan_end_date_name: '',
-          duty_admin_name: '',
-          fix_status: res?.fix_status,
-          fix_end_date: res?.fix_end_date,
-          fix_introduce: res?.fix_introduce,
-          fix_file_ids: res?.fix_file_ids,
-          confirm_status: '',
-          re_check_leader: res.re_check_leader == 1 ? 1 : 0,
-          re_check_main: res.re_check_main == 1 ? 1 : 0,
-          // re_leader_status: res.re_leader_status == 1 ? 1 : 0,
+          main_status: res?.main_status,
+          name7: name7value,
+          accept_department_ids: res.accept_department_ids?res.accept_department_ids:[],
+          accept_admin_ids: res.accept_admin_ids?res.accept_admin_ids:[],
+          accept_status: '',
+          plan_end_date: res?.plan_end_date,
+          duty_admin_id: res?.duty_admin_id,
+          reason: res?.reason,
+
+          accept_admin_name: "",
+          plan_end_date_name: '',
+          duty_admin_name: '',
+          fix_status: res?.fix_status,
+          fix_end_date: res?.fix_end_date,
+          fix_introduce: res?.fix_introduce,
+          fix_file_ids: res?.fix_file_ids,
+          confirm_status: '',
+          re_check_leader: res.re_check_leader == 1 ? 1 : 0,
+          re_check_main: res.re_check_main == 1 ? 1 : 0,
+          // re_leader_status: res.re_leader_status == 1 ? 1 : 0,
           // re_main_status: res.re_main_status == 1 ? 1 : 0,
           re_leader_status: res?.re_leader_status,
           re_main_status: res?.re_main_status,
@@ -1326,29 +1332,29 @@ import elSelectTree from '@/components/selectTree'
           re_remark:res?.re_remark,
           re_leader_remark:res?.re_leader_remark,
           re_main_remark:res?.re_main_remark,
-
-
-
-
-          mission_id: res?.mission_id,
-          date: res?.date,
-          site_id: res?.site_id,
-          ask_id: res?.ask_id,
-          ask_introduce: res?.ask_introduce,
-          tips: res?.tips,
-          file_ids: res?.file_ids,
+
+
+
+
+          mission_id: res?.mission_id,
+          date: res?.date,
+          site_id: res?.site_id,
+          ask_id: res?.ask_id,
+          ask_introduce: res?.ask_introduce,
+          tips: res?.tips,
+          file_ids: res?.file_ids,
         }
-
-        for (var f of res.files) {
-          this.showurl.push(f.url)
-        }
-        for (var f of res.fix_files) {
-          this.pictureList.push({
-            url: f.url,
-            id: f.id,
-            name: f.original_name
-          })
-          this.showfixurl.push(f.url)
+
+        for (var f of res.files) {
+          this.showurl.push(f.url)
+        }
+        for (var f of res.fix_files) {
+          this.pictureList.push({
+            url: f.url,
+            id: f.id,
+            name: f.original_name
+          })
+          this.showfixurl.push(f.url)
         }
 
         //  判断该问题下发给的人 是否为登陆人
@@ -1380,32 +1386,32 @@ import elSelectTree from '@/components/selectTree'
 
 
         console.log("this.is_myself",this.is_myself)
-        // 流程步骤
-        if (res.status == 4 || res.status == 3) {
-          this.steps_active = 3
-        } else if (res.status == 0 || res.status == 1) {
-          this.steps_active = 2
+        // 流程步骤
+        if (res.status == 4 || res.status == 3) {
+          this.steps_active = 3
+        } else if (res.status == 0 || res.status == 1) {
+          this.steps_active = 2
         }else{
           this.steps_active = 3
-        }
-        this.statusLabel.map(item => {
-          if (item.id == res.status) {
-            res.status_name = item.value
-          }
-        })
-        // type 根据status传值
+        }
+        this.statusLabel.map(item => {
+          if (item.id == res.status) {
+            res.status_name = item.value
+          }
+        })
+        // type 根据status传值
         if (res.status == 0) {
-          // 确认
-          this.type = 'check'
+          // 确认
+          this.type = 'check'
         } else if (res.status == 1) {
-          // 领导确认
-          this.type = 'leader'
+          // 领导确认
+          this.type = 'leader'
         } else if (res.status == 3 || res.status == 4) {
-          // 提交整改
-          this.type = 'reform'
-        } else {
-          this.type = 'show'
-        }
+          // 提交整改
+          this.type = 'reform'
+        } else {
+          this.type = 'show'
+        }
         this.type_name = this.typeNameList[this.type]
 
         if(res.status>1&&(res.status!=6)){
@@ -1417,47 +1423,47 @@ import elSelectTree from '@/components/selectTree'
             this.checkstatus = ""
           }
         }
-
+
         this.showform = res
-        res.mission_id?this.getGroups(res.mission_id,res.up_admin_id,res.department_id):''
-        this.$forceUpdate()
-      },
-      submit() {
-        let _files = []
-        if (this.pictureList.length > 0) {
-          for (var h of this.pictureList) {
-            if (h.response) {
-              _files.push(h.response.id)
-            } else {
-              _files.push(h.id)
-            }
-          }
-          this.form.fix_file_ids = _files
-        } else {
-          this.form.fix_file_ids = []
-        }
-        // return
+        res.mission_id?this.getGroups(res.mission_id,res.up_admin_id,res.department_id):''
+        this.$forceUpdate()
+      },
+      submit() {
+        let _files = []
+        if (this.pictureList.length > 0) {
+          for (var h of this.pictureList) {
+            if (h.response) {
+              _files.push(h.response.id)
+            } else {
+              _files.push(h.id)
+            }
+          }
+          this.form.fix_file_ids = _files
+        } else {
+          this.form.fix_file_ids = []
+        }
+        // return
         // 确认
-        console.log("this.form.status",this.form.status)
+        console.log("this.form.status",this.form.status)
+        if (this.type === 'check') {
+          this.form.status = this.checkstatus
+          if (this.form.accept_department_ids || this.form.accept_admin_ids) {
+            if (!(this.form.accept_department_ids.length > 0 || this.form.accept_admin_ids.length > 0)) {
+              Message({
+                type: 'warning',
+                message: `请选择分发的部门或人员`
+              })
+              return
+            }
+          }
+        }
+        // 需要领导确认 ，status=1
         if (this.type === 'check') {
-          this.form.status = this.checkstatus
-          if (this.form.accept_department_ids || this.form.accept_admin_ids) {
-            if (!(this.form.accept_department_ids.length > 0 || this.form.accept_admin_ids.length > 0)) {
-              Message({
-                type: 'warning',
-                message: `请选择分发的部门或人员`
-              })
-              return
-            }
-          }
-        }
-        // 需要领导确认 ，status=1
-        if (this.type === 'check') {
-          if (this.form.check_leader == 1 || this.form.check_main == 1) {
-            this.form.status = 1
-          }
-        }
-        // 领导确认
+          if (this.form.check_leader == 1 || this.form.check_main == 1) {
+            this.form.status = 1
+          }
+        }
+        // 领导确认
         if (this.type === 'leader') {
           if(this.is_leader&&this.showform.check_leader==1&&this.form.leader_status===null){
             Message({
@@ -1473,89 +1479,89 @@ import elSelectTree from '@/components/selectTree'
             })
             return
           }
-          // 领导确认
-          if (this.form.check_leader == 1 && this.form.check_main == 1) {
-            if (this.form.leader_status == 1 && this.form.main_status == 1) {
-              this.form.status = 3
-            } else if(this.form.leader_status === 0 || this.form.main_status === 0){
-              this.form.status = 6
+          // 领导确认
+          if (this.form.check_leader == 1 && this.form.check_main == 1) {
+            if (this.form.leader_status == 1 && this.form.main_status == 1) {
+              this.form.status = 3
+            } else if(this.form.leader_status === 0 || this.form.main_status === 0){
+              this.form.status = 6
             }else{
               this.form.status = 1
             }
-
-          } else {
+
+          } else {
             if (this.form.check_leader == 1) {
               if(this.form.leader_status==1){
                 this.form.status = 3
               }else if(this.form.leader_status===0){
                 this.form.status = 6
-              }
-
+              }
+
             } else if (this.form.check_main == 1) {
               if(this.form.main_status==1){
                 this.form.status = 3
               }else if(this.form.main_status===0){
                 this.form.status = 6
-              }
-            }
-          }
-        }
-        // 部门接收
-        // 提交整改
-        if (this.type === 'reform') {
-          this.form.status = 4
-          if (!this.form.fix_end_date) {
-            Message({
-              type: 'warning',
-              message: `请选择整改结束时间`
-            })
-            return
-          }
-          if (!this.form.fix_introduce) {
-            Message({
-              type: 'warning',
-              message: `请输入整改说明`
-            })
-            return
-          }
-        }
-
-
-        console.log("form",this.form)
-        if (!this.form.status) {
-          Message({
-            type: 'warning',
-            message: `请选择状态`
-          })
-          return
-        }
-        // return
-
-        save({
-          id: this.id,
-          ...this.form
-        }).then(res => {
-          Message({
-            type: 'success',
-            message: `更新成功`
-          })
-          this.isShow = false
-          this.$emit('refresh')
-        })
-      },
-    },
-    watch: {
-      isShow(newVal) {
-        if (newVal) {
-          this.getDetail()
-          // if (this.type === 'check') {
-
-          // }
-        } else {
-          this.id = ''
-          this.pictureList = []
-          this.showform = {}
-          this.showurl = []
+              }
+            }
+          }
+        }
+        // 部门接收
+        // 提交整改
+        if (this.type === 'reform') {
+          this.form.status = 4
+          if (!this.form.fix_end_date) {
+            Message({
+              type: 'warning',
+              message: `请选择整改结束时间`
+            })
+            return
+          }
+          if (!this.form.fix_introduce) {
+            Message({
+              type: 'warning',
+              message: `请输入整改说明`
+            })
+            return
+          }
+        }
+
+
+        console.log("form",this.form)
+        if (!this.form.status) {
+          Message({
+            type: 'warning',
+            message: `请选择状态`
+          })
+          return
+        }
+        // return
+
+        save({
+          id: this.id,
+          ...this.form
+        }).then(res => {
+          Message({
+            type: 'success',
+            message: `更新成功`
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+      },
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.getDetail()
+          // if (this.type === 'check') {
+
+          // }
+        } else {
+          this.id = ''
+          this.pictureList = []
+          this.showform = {}
+          this.showurl = []
           this.showfixurl = []
           this.is_leader=false
           this.is_main_leader=false
@@ -1565,41 +1571,41 @@ import elSelectTree from '@/components/selectTree'
           this.login_id=''
           this.is_myself = false
           this.groupObj = {}
-          this.showgroups = false
-          this.$refs['dialog'].reset()
-        }
-      }
-    }
-
-  }
-</script>
-<style scoped>
-  /deep/ .el-icon-circle-close {
-    color: #fff
-  }
-</style>
-<style scoped lang="scss">
-  ::v-deep .status,
-  ::v-deep .check_leader,
-  ::v-deep .check_main,
-  ::v-deep .accept_admin_ids,
-  ::v-deep .accept_department_ids,
-  ::v-deep .plan_end_date,
-  ::v-deep .duty_admin_id,
-  ::v-deep .fix_status,
-  ::v-deep .fix_end_date,
-  ::v-deep .fix_introduce,
-  ::v-deep .fix_file_ids,
-  ::v-deep .confirm_status,
-  ::v-deep .re_check_leader,
-  ::v-deep .re_check_main,
-  ::v-deep .re_leader_status,
-  ::v-deep .re_main_status,
-  ::v-deep .plan_end_date_name,
-  ::v-deep .duty_admin_name,
-  ::v-deep .accept_admin_name{
+          this.showgroups = false
+          this.$refs['dialog'].reset()
+        }
+      }
+    }
+
+  }
+</script>
+<style scoped>
+  /deep/ .el-icon-circle-close {
+    color: #fff
+  }
+</style>
+<style scoped lang="scss">
+  ::v-deep .status,
+  ::v-deep .check_leader,
+  ::v-deep .check_main,
+  ::v-deep .accept_admin_ids,
+  ::v-deep .accept_department_ids,
+  ::v-deep .plan_end_date,
+  ::v-deep .duty_admin_id,
+  ::v-deep .fix_status,
+  ::v-deep .fix_end_date,
+  ::v-deep .fix_introduce,
+  ::v-deep .fix_file_ids,
+  ::v-deep .confirm_status,
+  ::v-deep .re_check_leader,
+  ::v-deep .re_check_main,
+  ::v-deep .re_leader_status,
+  ::v-deep .re_main_status,
+  ::v-deep .plan_end_date_name,
+  ::v-deep .duty_admin_name,
+  ::v-deep .accept_admin_name{
     flex-basis: 80%;
-    display:none
+    display:none
   }
   ::v-deep .el-form{
     >div{
@@ -1628,119 +1634,119 @@ import elSelectTree from '@/components/selectTree'
   }
   ::v-deep .el-steps{
     position: fixed;
-  }
+  }
   ::v-deep .el-step{
     flex-basis: 17%!important;
-  }
-  ::v-deep .margin-top {
-    padding: 20px;
-    font-size: 16px;
-  }
-
-  ::v-deep .el-descriptions-item__label:not(.is-bordered-label) {
-    line-height: 40px;
+  }
+  ::v-deep .margin-top {
+    padding: 20px;
+    font-size: 16px;
+  }
+
+  ::v-deep .el-descriptions-item__label:not(.is-bordered-label) {
+    line-height: 40px;
     min-width: 120px;
-
+
   }
   ::v-deep .el-descriptions-item__label.is-bordered-label{
         width:16%;
-  }
-
-  ::v-deep .el-descriptions-item__container .el-descriptions-item__content {
+  }
+
+  ::v-deep .el-descriptions-item__container .el-descriptions-item__content {
     line-height: 40px;
-
-  }
+
+  }
   ::v-deep .el-descriptions :not(.is-bordered) .el-descriptions-item__cell{
         width:16%;
-  }
-  ::v-deep .steps {
-    padding: 0 20px;
-  }
-
-  ::v-deep .el-step__head.is-success {
-    color: #338de3;
-    border-color: #338de3;
-    line-height: 27px;
-  }
-
-  ::v-deep .el-step__title.is-success {
-    color: #338de3;
-  }
-
-  ::v-deep .el-step__head.is-process,
-  ::v-deep .el-step__head.is-wait {
-    line-height: 27px;
-  }
-
-  // .xy-table-item-label {
-  //   width: 160px;
-  // }
-
-  .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: 146px !important;
-    height: 146px !important;
-    line-height: 146px !important;
-    text-align: center;
-  }
-
-  ::v-deep .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 146px !important;
-    height: 146px !important;
-    line-height: 146px !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;
-  }
+  }
+  ::v-deep .steps {
+    padding: 0 20px;
+  }
+
+  ::v-deep .el-step__head.is-success {
+    color: #338de3;
+    border-color: #338de3;
+    line-height: 27px;
+  }
+
+  ::v-deep .el-step__title.is-success {
+    color: #338de3;
+  }
+
+  ::v-deep .el-step__head.is-process,
+  ::v-deep .el-step__head.is-wait {
+    line-height: 27px;
+  }
+
+  // .xy-table-item-label {
+  //   width: 160px;
+  // }
+
+  .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: 146px !important;
+    height: 146px !important;
+    line-height: 146px !important;
+    text-align: center;
+  }
+
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 146px !important;
+    height: 146px !important;
+    line-height: 146px !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;
+  }
   ::v-deep .el-divider__text{
     font-size: 20px;
-  }
-  .searchCompanys {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 16px;
-
-    .el-input {
-      width: 80%
-    }
-  }
+  }
+  .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 0c93883..806de29 100644
--- a/src/views/task/list/patrol.vue
+++ b/src/views/task/list/patrol.vue
@@ -6,6 +6,12 @@
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
             <DatePicker style='width:200px;margin-right: 10px;' placeholder="年份" placement="bottom" format='yyyy'
               type="year" @on-change="changeYear"></DatePicker>
+            <el-date-picker @change="changeDate" v-model="select.dateRange" type="daterange"
+              value-format="yyyy-MM-dd" range-separator="至"
+              start-placeholder="开始日期" end-placeholder="结束日期" 
+              style="width: 280px;margin-right: 10px;height:32px">
+            </el-date-picker>
+            <Input v-model="select.title" clearable style="width: 150px;margin-right: 10px;" placeholder="检查名称" />
             <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.status" placeholder="检查状态">
               <Option v-for="item in statusList" :value="item.id">{{item.value}}</Option>
             </Select>
@@ -70,25 +76,26 @@
           <template v-slot:btns>
             <el-table-column align='center' label="操作" fixed="right" width="80" header-align="center">
               <template slot-scope="scope">
-                <div v-if="(is_guiji||is_chuzhang||scope.row.is_myself)&&!(scope.row.status==5||scope.row.status==6)">
-                  <Button  type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">办理</Button>
-                </div>
-                <div v-else>
-                  <Button size="small" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(scope.row.id,'show')">查看</Button>
-
-                </div>
-                <!-- <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==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> -->
-                <div v-if='is_guiji||is_chuzhang||login_id==scope.row.admin_id'>
-                  <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' @click="editorPatrol(scope.row.id,'editor')">编辑</Button>
-                </div>
-                <div  v-if='is_guiji||is_chuzhang'>
-                  <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
-                    <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' ghost>删除</Button>
-                  </Poptip>
-                </div>
-
+                <template v-if="!scope.row.children || (scope.row.children && scope.row.children.length === 0)">
+                  <div v-if="(is_guiji||is_chuzhang||scope.row.is_myself)&&!(scope.row.status==5||scope.row.status==6)">
+                    <Button  type="primary" style='margin-right:5px;margin-bottom:5px;' size="small" @click="showPatrol(scope.row.id,'show')">办理</Button>
+                  </div>
+                  <div v-else>
+                    <Button size="small" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(scope.row.id,'show')">查看</Button>
+
+                  </div>
+                  <!-- <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==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> -->
+                  <div v-if='is_guiji||is_chuzhang||login_id==scope.row.admin_id'>
+                    <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' @click="editorPatrol(scope.row.id,'editor')">编辑</Button>
+                  </div>
+                  <div  v-if='is_guiji||is_chuzhang'>
+                    <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
+                      <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size='small' ghost>删除</Button>
+                    </Poptip>
+                  </div>
+                </template>
               </template>
             </el-table-column>
           </template>
@@ -157,7 +164,11 @@
           ask_id:'',
           sort_name:'date',
           sort_type:"DESC",
-          year:''
+          year:'',
+          dateRange:[],
+          start_date:'',
+          end_date:'',
+          title:''
           // pid:0
           // myself_update:0
         },
@@ -232,6 +243,10 @@
           label:"问题类型",
           prop:'ask_value',
           width:120,
+        },{
+          label:"检查名称",
+          prop:'title',
+          align:'left'
         },{
           label:"问题描述",
           prop:'ask_introduce',
@@ -304,8 +319,8 @@
         // is_my_inspection:false
         // 导出
         importtable:[{
-          label:"任务名称",
-          prop:'mission_name',
+          label:"检查名称",
+          prop:'title',
         },{
           label:"发现时间",
           prop:'date',
@@ -377,6 +392,16 @@
           // this.getList()
         }
       },
+      changeDate(e){
+        if(e){
+          this.select.start_date = e[0];
+          this.select.end_date = e[1];
+        }else{
+          this.select.start_date = "";
+          this.select.end_date = "";
+          this.select.dateRange = [];
+        }
+      },
       selectionChange(e){
         console.log(e)
         let arr = []
@@ -706,20 +731,20 @@
         this.$refs.showPatrol.department_id=this.department_id
         this.$refs.showPatrol.isShow = true
       },
-      async importTable(sheetName) {
-        const res = await listpatrol(Object.assign(this.select, {
-          page: 1,
-          page_size: 99999
-        }))
-        if (res.data) {
-          let headers = this.importtable.map(i => {
-            return {
-              key: i.prop,
-              title: i.label
-            }
+      async importTable(sheetName) {
+        const res = await listpatrol(Object.assign(this.select, {
+          page: 1,
+          page_size: 99999
+        }))
+        if (res.data) {
+          let headers = this.importtable.map(i => {
+            return {
+              key: i.prop,
+              title: i.label
+            }
           })
           for(var k of res.data){
-            k.mission_name = k.mission?k.mission.name:''
+            {/* k.mission_name = k.mission?k.mission.name:'' */}
             k.site_name = k.site?k.site.name:k.address
             k.ask_value = k.ask?k.ask.value:''
             k.up_admin_name  = k.up_admin?k.up_admin.name:''
@@ -753,21 +778,21 @@
               k.fix_status_name = k.fix_status==1?'已完成':'已列计划'
             }
 
-          }
+          }
           const data = res.data.map(row => headers.map(header => row[header.key]));
           data.unshift(headers.map(header => header.title));
-          const wb = XLSX.utils.book_new();
+          const wb = XLSX.utils.book_new();
           const ws = XLSX.utils.aoa_to_sheet(data);
           XLSX.utils.book_append_sheet(wb, ws, sheetName);
-          const wbout = XLSX.write(wb, {
-            bookType: 'xlsx',
-            bookSST: true,
-            type: 'array'
+          const wbout = XLSX.write(wb, {
+            bookType: 'xlsx',
+            bookSST: true,
+            type: 'array'
           });
-          saveAs(new Blob([wbout], {
-            type: 'application/octet-stream'
-          }), `检查问题${sheetName}.xlsx`);
-        }
+          saveAs(new Blob([wbout], {
+            type: 'application/octet-stream'
+          }), `检查问题${sheetName}.xlsx`);
+        }
       },
 
       deleteList(id){