From 0c04e932a9bbbacc2ad098dede0ce488819ec1fb Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Sun, 5 Nov 2023 13:19:25 +0800
Subject: [PATCH] up

---
 src/views/task/list/components/addPatrol.vue  |    6 +-
 src/views/task/list/components/addUnit.vue    |  169 ++-
 .../task/list/components/checkPatrol.vue      |    9 -
 src/views/task/list/components/checkUnit.vue  |  383 ++++++
 .../task/list/components/showPatrol copy.vue  | 1169 -----------------
 src/views/task/list/unit.vue                  |  165 ++-
 6 files changed, 621 insertions(+), 1280 deletions(-)
 delete mode 100644 src/views/task/list/components/checkPatrol.vue
 create mode 100644 src/views/task/list/components/checkUnit.vue
 delete mode 100644 src/views/task/list/components/showPatrol copy.vue

diff --git a/src/views/task/list/components/addPatrol.vue b/src/views/task/list/components/addPatrol.vue
index 6ecec7c..6ea979b 100644
--- a/src/views/task/list/components/addPatrol.vue
+++ b/src/views/task/list/components/addPatrol.vue
@@ -327,7 +327,8 @@
           this.id = ''
           this.pictureList = []
           this.mission_id = ''
-          this.mapform=[]
+          this.mapform=[]
+          
           this.$refs['dialog'].reset()
         }
       },
@@ -352,6 +353,9 @@
   // .xy-table-item-label {
   //   width: 160px;
   // }
+  ::v-deep .avue-input-map{
+    display: none;
+  }
   ::v-deep .site_id,::v-deep .address,::v-deep .lat,::v-deep .lon{
     display: none;
   }
diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue
index 540a6a0..9ddfd7e 100644
--- a/src/views/task/list/components/addUnit.vue
+++ b/src/views/task/list/components/addUnit.vue
@@ -49,6 +49,32 @@
           </div>
         </div>
       </template>
+      <template v-slot:is_audit>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>是否审批：
+          </div>
+          <div class="xy-table-item-content">
+            <el-radio-group v-model="form.is_audit" @change='changeAudit'>
+              <el-radio :label="0">否</el-radio>
+              <el-radio :label="1">是</el-radio>
+            </el-radio-group>
+          </div>
+        </div>
+      </template>
+      <template v-slot:audit_admin_id v-if="form.is_audit==1">
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>审批人：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.audit_admin_id" filterable clearable placeholder="请选择审批人" style="width: 400px;">
+              <el-option v-for="item in userdata" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
       <template v-slot:file_ids>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -70,7 +96,7 @@
           </div>
           <div class="xy-table-item-content">
             <el-input v-model="form.content" :rows='5' type='textarea' placeholder="请输入说明" clearable
-              style="width:310px"></el-input>
+              style="width:400px"></el-input>
           </div>
         </div>
       </template>
@@ -113,35 +139,36 @@
           </div>
         </div>
       </template>
-      <template v-slot:accept_department_ids v-if='form.name7==2&&form.type!=4'>
+      <template v-slot:accept_admin_ids v-if='form.name7==1'>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
           </div>
           <div class="xy-table-item-content" style='min-width:600px'>
-            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
-            </el-checkbox>
-            <div style="margin: 15px 0;"></div>
-            <el-checkbox-group v-model="form.accept_department_ids" @change="handleCheckedDeptChange">
-              <el-checkbox @change="handleCheckedDeptSingleChange" v-for="dept in deptOptions" :label="dept.id"
-                :key="dept.id">{{dept.name}}</el-checkbox>
-            </el-checkbox-group>
+            <el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}"
+              :filter-method="filterMethod" :format="{ noChecked: '${total}',hasChecked: '${checked}/${total}' }"
+              filter-placeholder="请选择参与人员" v-model="form.accept_admin_ids" :data="userdata">
+            </el-transfer>
           </div>
         </div>
       </template>
-      <template v-slot:accept_admin_ids v-if='form.name7==1'>
+      <template v-slot:accept_department_ids v-if='form.name7==2&&form.type!=4'>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
             <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
           </div>
           <div class="xy-table-item-content" style='min-width:600px'>
-            <el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}"
-              :filter-method="filterMethod" :format="{ noChecked: '${total}',hasChecked: '${checked}/${total}' }"
-              filter-placeholder="请选择参与人员" v-model="form.accept_admin_ids" :data="userdata">
-            </el-transfer>
+            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
+            </el-checkbox>
+            <div style="margin: 15px 0;"></div>
+            <el-checkbox-group v-model="form.accept_department_ids" @change="handleCheckedDeptChange">
+              <el-checkbox @change="handleCheckedDeptSingleChange" v-for="dept in deptOptions" :label="dept.id"
+                :key="dept.id">{{dept.name}}</el-checkbox>
+            </el-checkbox-group>
           </div>
         </div>
       </template>
+
       <template v-slot:mission_groups v-if='form.name7==3&&form.type!=4'>
         <div class="xy-table-item">
           <div class="xy-table-item-label">
@@ -150,7 +177,7 @@
           <div class="xy-table-item-content" style='min-width:600px'>
             <Button type='primary' @click="mission_groups_list.push({name:'',type:1,link_id:[]})">新增组别</Button>
             <div v-for="(item,index) in mission_groups_list" style='margin:10px;margin-left:0'>
-              <div>
+              <div>
                 <Button style="margin-right:10px" @click="mission_groups_list.splice(index,1)">删除</Button>
                 组别：{{item.name=mission_groups_name[index]}}
                 <el-radio-group v-model="item.type" @change='item.link_id=[]' style="margin:10px;margin-right:20px">
@@ -164,7 +191,7 @@
                 <el-select v-if='item.type==2' v-model="item.link_id" clearable filterable multiple placeholder="请选择部门">
                   <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
                   </el-option>
-                </el-select>
+                </el-select>
 
               </div>
 
@@ -251,6 +278,9 @@
           unit_type: '',
           start_date: '',
           end_date: '',
+          is_audit: 0,
+          audit_admin_id: '',
+          audit_status: 1,
           file_ids: '',
           content: '',
 
@@ -258,8 +288,8 @@
           end_content: '',
           type: '',
           name7: 1,
-          accept_department_ids: [],
           accept_admin_ids: [],
+          accept_department_ids: [],
           mission_groups: []
         },
         mission_groups_list: [{
@@ -302,10 +332,20 @@
         if (e) {
           this.form.accept_department_ids = []
           this.form.accept_admin_ids = []
-          this.form.mission_groups = []
+          this.form.mission_groups = []
           this.form.mission_groups_list = []
         }
       },
+      changeAudit(e) {
+        console.log("e",e)
+        if (e == 1) {
+          this.form.audit_status = 0
+          this.form.audit_admin_id = ''
+        } else {
+          this.form.audit_status = 1
+          this.form.audit_admin_id = 0
+        }
+      },
       // 选择科室
       loadDeptOptions() {
         listdept().
@@ -324,7 +364,7 @@
           page_size: 999
         }).
         then((res) => {
-          this.userdata = res.data?res.data.reverse():[];
+          this.userdata = res.data ? res.data.reverse() : [];
         }).catch(error => {
           console.log(error)
         })
@@ -376,23 +416,26 @@
           unit_type: res?.unit_type,
           start_date: res?.start_date,
           end_date: res?.end_date,
+          is_audit: res.audit_admin_id ? 1 : 0,
+          audit_admin_id: res.audit_admin_id ? res.audit_admin_id : '',
+          audit_status: res.audit_status?res.audit_status:1,
           file_ids: res?.file_ids,
           content: res?.content,
           end_type: res?.end_type,
           end_content: res?.end_content,
           name7: res.accept_department_ids.length > 0 ? 2 : (res.accept_admin_ids.length > 0 ? 1 : (res
             .groups.length > 0 ? 3 : 1)),
-          accept_department_ids: res?.accept_department_ids,
           accept_admin_ids: res?.accept_admin_ids,
+          accept_department_ids: res?.accept_department_ids,
           mission_groups: res?.groups
-        }
-        this.mission_groups_list = []
-        for(var g of res.groups){
-          this.mission_groups_list.push({
-            name:g.name,
-            type:g.type,
-            link_id:g.link_id
-          })
+        }
+        this.mission_groups_list = []
+        for (var g of res.groups) {
+          this.mission_groups_list.push({
+            name: g.name,
+            type: g.type,
+            link_id: g.link_id
+          })
         }
         // this.mission_groups_list = res?.mission_groups
         for (var f of res.files) {
@@ -418,25 +461,40 @@
         } else {
           this.form.file_ids = []
         }
-        if(this.form.name7==3 ){
-          if(this.mission_groups_list.length==0){
-            Message({
-              type: 'warning',
-              message: `请新增组别`
-            })
-            return
-          }
-          for(let k of this.mission_groups_list){
-            if(k.link_id.length==0){
-              Message({
-                type: 'warning',
-                message: `请选择小组成员`
-              })
-              return
-            }
-          }
-
+        if(this.form.is_audit==0){
+          this.form.audit_admin_id = 0
+          this.audit_status = 1
+        }else{
+           this.audit_status = 0
+           if(!this.form.audit_admin_id){
+             Message({
+               type: 'warning',
+               message: `请选择审批人`
+             })
+             return
+           }
         }
+        // console.log("this.form",this.form)
+        // return
+        if (this.form.name7 == 3) {
+          if (this.mission_groups_list.length == 0) {
+            Message({
+              type: 'warning',
+              message: `请新增组别`
+            })
+            return
+          }
+          for (let k of this.mission_groups_list) {
+            if (k.link_id.length == 0) {
+              Message({
+                type: 'warning',
+                message: `请选择小组成员`
+              })
+              return
+            }
+          }
+
+        }
         this.form.mission_groups = this.mission_groups_list
         // return
         if (this.type === 'add') {
@@ -481,12 +539,12 @@
           }
         } else {
           this.id = ''
-          this.pictureList = []
+          this.pictureList = []
           this.mission_groups_list = [{
-          name: '',
-          type: 1,
-          link_id: []
-        }]
+            name: '',
+            type: 1,
+            link_id: []
+          }]
           this.$refs['dialog'].reset()
         }
       }
@@ -495,10 +553,13 @@
   }
 </script>
 
-<style scoped lang="scss">
-  ::v-deep .name7{
-    flex-basis: 100%;
+<style scoped lang="scss">
+  ::v-deep .name7,::v-deep .content,
+  ::v-deep .end_type,
+  ::v-deep .file_ids{
+    flex-basis: 100%;
   }
+
   ::v-deep .type {
     display: none;
   }
diff --git a/src/views/task/list/components/checkPatrol.vue b/src/views/task/list/components/checkPatrol.vue
deleted file mode 100644
index b219ab8..0000000
--- a/src/views/task/list/components/checkPatrol.vue
+++ /dev/null
@@ -1,9 +0,0 @@
-<template>
-
-</template>
-
-<script>
-</script>
-
-<style>
-</style>
diff --git a/src/views/task/list/components/checkUnit.vue b/src/views/task/list/components/checkUnit.vue
new file mode 100644
index 0000000..a45eb03
--- /dev/null
+++ b/src/views/task/list/components/checkUnit.vue
@@ -0,0 +1,383 @@
+<template>
+  <div>
+    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="'审核'" :form="form"
+       @submit="submit">
+      <template v-slot:mission_name>
+        <el-divider>任务信息</el-divider>
+        <div>
+          <el-descriptions class="margin-top" :column="2" border>
+            <el-descriptions-item>
+              <template slot="label">
+                任务名称
+              </template>
+              {{showform.name?showform.name:''}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                任务类型
+              </template>
+              <div v-for="item in unitTypeList">
+                <span v-if="showform.unit_type==item.id">
+                  {{item.value}}
+                </span>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                开始日期
+              </template>
+              {{showform.start_date?showform.start_date:''}}
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label">
+                结束日期
+              </template>
+              {{showform.end_date?showform.end_date:''}}
+            </el-descriptions-item>
+            <el-descriptions-item :span="showform.audit_admin_id>0?'1':'2'">
+              <template slot="label">
+                是否审批
+              </template>
+              {{showform.audit_admin_id>0?"是":'否'}}
+            </el-descriptions-item>
+            <el-descriptions-item v-if="showform.audit_admin_id">
+              <template slot="label">
+                审批人
+              </template>
+              {{showform.audit_admin_id?showform.audit_admin_id:''}}
+            </el-descriptions-item>
+            <el-descriptions-item span='2'>
+              <template slot="label">
+                附件
+              </template>
+              <div v-for="item in pictureList">
+                <a :href="item.url">{{item.name}}</a>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item>
+              <template slot="label" span='2'>
+                说明
+              </template>
+              {{showform.content?showform.content:''}}
+            </el-descriptions-item>
+            <el-descriptions-item span='2'>
+              <template slot="label">
+                任务完成要求
+              </template>
+              <div v-for="item in endTypeList">
+                <span v-if="showform.end_type==item.id">
+                  {{item.name}}
+                </span>
+              </div>
+            </el-descriptions-item>
+            <el-descriptions-item span='2'>
+              <template slot="label">
+                任务完成详情
+              </template>
+              {{showform.end_content?showform.end_content:''}}
+            </el-descriptions-item>
+            <el-descriptions-item span='2'>
+              <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>
+             <div v-if="showform.groups&&showform.groups.length>0">
+               <div v-for="group in showform.groups">
+                 {{group.name}}:
+                     <el-tag v-for="detail in group.details"
+                       style="margin-right: 5px;margin-bottom: 2px;">{{detail.name}}</el-tag>
+               </div>
+             </div>
+            </el-descriptions-item>
+          </el-descriptions>
+        </div>
+      </template>
+      <template v-slot:audit_status v-if="type=='check'">
+        <el-divider>审核</el-divider>
+        <div>
+          <el-select v-model="form.unit_type" filterable clearable placeholder="请选择状态" style="width: 400px;">
+            <el-option v-for="item in auditStatusList" :key="item.id" :label="item.value" :value="item.id">
+            </el-option>
+          </el-select>
+        </div>
+      </template>
+      
+      <template v-slot:footerContent>
+          <Button v-if="type=='check'" type="primary"
+            style='margin-left:5px;margin-bottom:5px;' @click="submit">审核</Button>
+        <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 {
+    save,
+    get
+  } from "@/api/task/unit.js";
+  export default {
+    components: {
+
+    },
+    data() {
+      return {
+        isShow: false,
+        type: 'add',
+        id: '',
+        pictureList: [],
+        unitTypeList: [{
+          id: 1,
+          value: '专项检查'
+        }, {
+          id: 2,
+          value: '资料收集'
+        }, {
+          id: 3,
+          value: '网络安全'
+        }],
+        endTypeList: [{
+          id: 1,
+          name: '提交文字'
+        }, {
+          id: 2,
+          name: '提交附件'
+        }, {
+          id: 3,
+          name: '提交文字与附件'
+        }],
+        auditStatusList:[{
+          id:0,
+          value:'待审核'
+        },{
+          id:1,
+          value:'通过'
+        },{
+          id:2,
+          value:'不通过'
+        }],
+        showform:{},
+        form: {
+          mission_name:'',
+          type: '',
+          name: '',
+          unit_type: '',
+          start_date: '',
+          end_date: '',
+          is_audit: 0,
+          audit_admin_id: '',
+          audit_status: 1,
+          file_ids: '',
+          content: '',
+
+          end_type: '',
+          end_content: '',
+          type: '',
+          accept_admin_ids: [],
+          accept_department_ids: [],
+          mission_groups: []
+        },
+        mission_groups_list: [{
+          name: '',
+          type: 1,
+          link_id: []
+        }],
+      }
+    },
+    created() {
+      if (this.$route.path) {
+        let path = this.$route.path.split("_")
+        this.form.type = path[1]
+      }
+    },
+    methods: {
+
+      async getDetail() {
+        let res = await get(this.id)
+        console.log(res)
+        this.form = {
+          mission_name:'',
+          type: res?.type,
+          name: res?.name,
+          unit_type: res?.unit_type,
+          start_date: res?.start_date,
+          end_date: res?.end_date,
+          is_audit: res.audit_admin_id ? 1 : 0,
+          audit_admin_id: res.audit_admin_id ? res.audit_admin_id : '',
+          audit_status: res.audit_status?res.audit_status:1,
+          file_ids: res?.file_ids,
+          content: res?.content,
+          end_type: res?.end_type,
+          end_content: res?.end_content,
+          accept_admin_ids: res?.accept_admin_ids,
+          accept_department_ids: res?.accept_department_ids,
+          mission_groups: res?.groups
+        }
+        this.mission_groups_list = []
+        for (var g of res.groups) {
+          this.mission_groups_list.push({
+            name: g.name,
+            type: g.type,
+            link_id: g.link_id
+          })
+        }
+        // this.mission_groups_list = res?.mission_groups
+        for (var f of res.files) {
+          this.pictureList.push({
+            id: f.id,
+            url: f.url,
+            name: f.original_name
+          })
+        }
+        this.showform = res
+        // res.guide_upload ? this.guidePictureList.push(res.guide_upload) : ''
+      },
+      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.file_ids = _files
+        } else {
+          this.form.file_ids = []
+        }
+
+
+        this.form.mission_groups = this.mission_groups_list
+        // return
+        save({
+          id: this.id,
+          ...this.form
+        }).then(res => {
+          Message({
+            type: 'success',
+            message: '审核成功'
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+      },
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          console.log("newval",newVal)
+          this.getDetail()
+        } else {
+          this.id = ''
+          this.pictureList = []
+          this.mission_groups_list = [{
+            name: '',
+            type: 1,
+            link_id: []
+          }]
+          this.$refs['dialog'].reset()
+        }
+      }
+    }
+
+  }
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .name7,::v-deep .content,
+  ::v-deep .end_type,
+  ::v-deep .file_ids,
+  ::v-deep .mission_name{
+    flex-basis: 100%;
+  }
+
+  ::v-deep .type {
+    display: none;
+  }
+
+  .xy-table-item-label {
+    width: 140px;
+  }
+
+  .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/components/showPatrol copy.vue b/src/views/task/list/components/showPatrol copy.vue
deleted file mode 100644
index aac9637..0000000
--- a/src/views/task/list/components/showPatrol copy.vue	
+++ /dev/null
@@ -1,1169 +0,0 @@
-<template>
-  <div>
-    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" :title="`${typeNameList[type]}${type}`" :form="form"
-      :rules="rules" @submit="submit">
-      <!-- 审核 领导审核 -->
-
-      <template v-slot:steps v-if="showform.status>-1 && showform.status!=6">
-        <el-steps :active="steps_active" finish-status="success">
-          <el-step title="待审核" align-center></el-step>
-          <el-step title="审核中" align-center></el-step>
-          <el-step title="整改中" align-center></el-step>
-          <el-step title="已结束" align-center></el-step>
-        </el-steps>
-      </template>
-
-      <!-- 退回理由 -->
-      <template v-slot:backreason v-if="(type=='check'||type=='leader')&&showform.status ==8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>退回原因：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.reason}}
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:status v-if="type=='check'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>审核结果：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.status" filterable clearable placeholder="请选择审核结果" style="width: 300px;">
-              <el-option v-for="item in checkList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:check_leader v-if="type=='check'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导确认：
-          </div>
-          <div class="xy-table-item-content">
-            <el-radio-group v-model="form.check_leader">
-              <el-radio :label="0">否</el-radio>
-              <el-radio :label="1">是</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-      </template>
-      <template v-slot:check_main v-if="type=='check'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>主要领导确认：
-          </div>
-          <div class="xy-table-item-content">
-            <el-radio-group v-model="form.check_main">
-              <el-radio :label="0">否</el-radio>
-              <el-radio :label="1">是</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-      </template>
-      <!-- 领导审核状态 -->
-      <template v-slot:leader_status v-if="type=='leader'&&showform.check_leader==1">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导确认：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.leader_status" filterable placeholder="请选择审核结果" style="width: 300px;">
-              <el-option v-for="item in leaderConfirmList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:main_status v-if="type=='leader'&&showform.check_main==1">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>重要领导确认：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.main_status" filterable placeholder="请选择审核结果" style="width: 300px;">
-              <el-option v-for="item in leaderConfirmList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-
-
-
-      <template v-slot:name7 v-if="type=='check'||type=='leader'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>用户类型选择：
-          </div>
-          <div class="xy-table-item-content">
-            <el-radio-group v-model="form.name7" @change='changeName7'>
-              <el-radio :label="1">人员</el-radio>
-              <el-radio :label="2">部门</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-      </template>
-      <template v-slot:accept_department_ids v-if="form.name7==2&&(type=='check'||type=='leader')">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
-          </div>
-          <div class="xy-table-item-content" style='min-width:600px'>
-            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选
-            </el-checkbox>
-            <div style="margin: 15px 0;"></div>
-            <el-checkbox-group v-model="form.accept_department_ids" @change="handleCheckedDeptChange">
-              <el-checkbox @change="handleCheckedDeptSingleChange" v-for="dept in deptOptions" :label="dept.id"
-                :key="dept.id">{{dept.name}}</el-checkbox>
-            </el-checkbox-group>
-          </div>
-        </div>
-      </template>
-      <template v-slot:accept_admin_ids v-if="form.name7==1&&(type=='check'||type=='leader')">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
-          </div>
-          <div class="xy-table-item-content" style='min-width:600px'>
-            <el-transfer filterable :titles="['待选择', '已选择']" :props="{key: 'id',label: 'name'}"
-              :filter-method="filterMethod" :format="{ noChecked: '${total}',hasChecked: '${checked}/${total}' }"
-              filter-placeholder="请选择参与人员" v-model="form.accept_admin_ids" :data="userdata">
-            </el-transfer>
-          </div>
-        </div>
-      </template>
-
-      <!-- 接收 -->
-      <template v-slot:accept_status v-if="type=='accept'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>接收结果：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select @change='changeAcceptStatus' v-model="form.status" filterable clearable placeholder="请选择接收结果"
-              style="width: 300px;">
-              <el-option v-for="item in acceptList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:plan_end_date v-if="type=='accept'&&form.status==3">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>计划日期：
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker style="width: 300px;" v-model="form.plan_end_date" value-format="yyyy-MM-dd" type="date"
-              placeholder="选择完成日期">
-            </el-date-picker>
-          </div>
-        </div>
-      </template>
-      <template v-slot:duty_admin_id v-if="type=='accept'&&form.status==3">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>责任人：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.duty_admin_id" filterable clearable placeholder="请选择责任人" style="width: 300px;">
-              <el-option v-for="item in userdata" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:reason v-if="(type=='accept'||type=='leader'||type=='check')&&form.status==8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>不接收原因：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-if="type=='accept'" v-model="form.reason" :rows='5' type='textarea' placeholder="请输入原因"
-              clearable style="width: 400px;"></el-input>
-            <div v-if="showform.status==8">{{showform.reason}}</div>
-          </div>
-        </div>
-      </template>
-
-
-      <!-- 提交整改 -->
-      <template v-slot:accept_admin_name
-        v-if="type=='reform'||type=='confirm'||type=='leaderconfirm'||type=='show' && showform.status>2 &&showform.status!=6 && showform.status!=8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>接收方：
-          </div>
-          <div class="xy-table-item-content">
-            <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'>
-                {{item.name}}
-              </el-tag>
-            </div>
-            <div v-if="showform.accept_department_ids_details&&showform.accept_department_ids_details.length>0">
-              <el-tag v-for='item in showform.accept_department_ids_details'>
-                {{item.name}}
-              </el-tag>
-            </div>
-          </div>
-        </div>
-      </template>
-      <template v-slot:plan_end_date_name
-        v-if="type=='reform'||type=='confirm'||type=='leaderconfirm'||type=='show' && showform.status>2 &&showform.status!=6 && showform.status!=8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>计划时间：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.plan_end_date?showform.plan_end_date:''}}
-          </div>
-        </div>
-      </template>
-      <template v-slot:duty_admin_name
-        v-if="type=='reform'||type=='confirm'||type=='leaderconfirm'||type=='show' && showform.status>2 &&showform.status!=6 && showform.status!=8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>责任人：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.duty_admin?showform.duty_admin.name:''}}
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:fix_status
-        v-if="type=='reform'||type=='confirm'||type=='leaderconfirm'||type=='show' && showform.status>2 &&showform.status!=6 && showform.status!=8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>完成情况：
-          </div>
-          <div class="xy-table-item-content">
-            <el-radio-group v-model="form.fix_status" v-if="type=='reform'">
-              <el-radio :label="1">已完成</el-radio>
-              <el-radio :label="0">未完成</el-radio>
-            </el-radio-group>
-            <div v-else>
-              {{form.fix_status==1?'已完成':'未完成'}}
-            </div>
-          </div>
-        </div>
-      </template>
-      <template v-slot:fix_end_date
-        v-if="type=='reform'||type=='confirm'||type=='leaderconfirm'||type=='show' && showform.status>2 &&showform.status!=6 && showform.status!=8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>完成时间：
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker v-if="type=='reform'" style="width: 300px;" v-model="form.fix_end_date"
-              value-format="yyyy-MM-dd" type="date" placeholder="选择结束日期">
-            </el-date-picker>
-            <div v-else>
-              {{form.fix_end_date}}
-            </div>
-          </div>
-        </div>
-      </template>
-      <template v-slot:fix_introduce
-        v-if="type=='reform'||type=='confirm'||type=='leaderconfirm'||type=='show' && showform.status>2 &&showform.status!=6 && showform.status!=8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>整改说明：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-if="type=='reform'" v-model="form.fix_introduce" :rows='5' type='textarea' placeholder="请输入问题描述"
-              clearable style="width: 300px;"></el-input>
-            <div v-else>
-              {{form.fix_introduce}}
-            </div>
-          </div>
-        </div>
-      </template>
-      <template v-slot:fix_file_ids
-        v-if="type=='reform'||type=='confirm'||type=='leaderconfirm'||type=='show' && showform.status>2 &&showform.status!=6 && showform.status!=8">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>整改附件：
-          </div>
-          <div class="xy-table-item-content">
-            <el-upload v-if="type=='reform'" :action="action" class='upload-demo' list-type="picture-card"
-              :file-list="pictureList" ref="pictureUpload" style="width:600px" :auto-upload="true" :data="uploadOther"
-              :on-preview="handlePictureCardPreview" :on-success="handlesuccess" :on-remove="handleRemove">
-              <i class="el-icon-plus"></i>
-            </el-upload>
-            <div v-else>
-              <el-image v-for="url in showfixurl"
-                style="width: 146px; height: 146px;display:inline-block;margin-right:5px;margin-bottom:5px" :src="url"
-                :preview-src-list="showurl">
-              </el-image>
-            </div>
-          </div>
-        </div>
-      </template>
-      <!-- 整改确认 -->
-      <template v-slot:confirm_status v-if="type=='confirm'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>审核结果：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.status" filterable placeholder="请选择审核结果" style="width: 300px;">
-              <el-option v-for="item in confirmList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:re_check_leader v-if="type=='confirm'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导确认：
-          </div>
-          <div class="xy-table-item-content">
-            <el-radio-group v-model="form.re_check_leader">
-              <el-radio :label="0">否</el-radio>
-              <el-radio :label="1">是</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-      </template>
-      <template v-slot:re_check_main v-if="type=='confirm'">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>主要领导确认：
-          </div>
-          <div class="xy-table-item-content">
-            <el-radio-group v-model="form.re_check_main">
-              <el-radio :label="0">否</el-radio>
-              <el-radio :label="1">是</el-radio>
-            </el-radio-group>
-          </div>
-        </div>
-      </template>
-      <!-- 领导确认整改 -->
-      <template v-slot:re_leader_status v-if="type=='leaderconfirm'&&showform.re_check_leader==1">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>分管领导确认：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.re_leader_status" filterable placeholder="请选择审核结果" style="width: 300px;">
-              <el-option v-for="item in leaderConfirmList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:re_main_status v-if="type=='leaderconfirm'&&showform.re_check_main==1">
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>重要领导确认：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select v-model="form.re_main_status" filterable placeholder="请选择审核结果" style="width: 300px;">
-              <el-option v-for="item in leaderConfirmList" :key="item.id" :label="item.name" :value="item.id">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-
-      <!-- 填报信息 -->
-      <template v-slot:patrol_name>
-        <el-divider>检查问题信息</el-divider>
-        <div>
-          <el-descriptions class="margin-top" :column="3" border>
-            <el-descriptions-item>
-              <template slot="label">
-                任务专题
-              </template>
-              {{showform.mission?showform.mission.name:''}}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">
-                上报人
-              </template>
-              {{showform.admin?showform.admin.name:''}}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">
-                状态
-              </template>
-              {{showform.status_name?showform.status_name:''}}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">
-                检查日期
-              </template>
-              {{showform.date}}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">
-                巡查地点
-              </template>
-              {{showform.site?showform.site.name:(showform.address?showform.address:'')}}
-            </el-descriptions-item>
-            <el-descriptions-item>
-              <template slot="label">
-                问题类型
-              </template>
-              {{showform.ask?showform.ask.value:''}}
-            </el-descriptions-item>
-            <el-descriptions-item span='4'>
-              <template slot="label">
-                问题描述
-              </template>
-              {{showform.ask_introduce?showform.ask_introduce:''}}
-            </el-descriptions-item>
-            <el-descriptions-item span='4'>
-              <template slot="label">
-                整改建议
-              </template>
-              {{showform.tips?showform.tips:''}}
-            </el-descriptions-item>
-            <el-descriptions-item span='4'>
-              <template slot="label">
-                附件
-              </template>
-              <el-image v-for="url in showurl"
-                style="width: 146px; height: 146px;display:inline-block;margin-right:5px;margin-bottom:5px" :src="url"
-                :preview-src-list="showurl">
-              </el-image>
-            </el-descriptions-item>
-
-          </el-descriptions>
-        </div>
-      </template>
-      <!-- <template v-slot:mission_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>任务专题：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.mission?showform.mission.name:''}}
-          </div>
-        </div>
-      </template>
-      <template v-slot:date>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>巡查日期：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.date}}
-          </div>
-        </div>
-      </template>
-      <template v-slot:site_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>巡查地点：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.site?showform.site.name:''}}
-          </div>
-        </div>
-      </template>
-      <template v-slot:ask_id>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>问题类型：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.ask?showform.ask.value:''}}
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:ask_introduce>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>问题描述：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.ask_introduce}}
-          </div>
-        </div>
-      </template>
-      <template v-slot:tips>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>整改建议：
-          </div>
-          <div class="xy-table-item-content">
-            {{showform.tips}}
-          </div>
-        </div>
-      </template>
-      <template v-slot:file_ids>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            <span style="color: red;font-weight: 600;padding-right: 4px;"></span>附件：
-          </div>
-          <div class="xy-table-item-content">
-            <div style="width:600px">
-              <el-image v-for="url in showurl"
-                style="width: 146px; height: 146px;display:inline-block;margin-right:5px;margin-bottom:5px" :src="url"
-                :preview-src-list="showurl">
-              </el-image>
-            </div>
-          </div>
-        </div>
-      </template> -->
-      <!-- <template v-slot:footerContent>
-        <Button ghost type="primary" style='margin-right:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
-        <Button v-if="showform.status==0||showform.status==8" type="primary" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(showform.id,'check')">审核</Button>
-        <Button v-if="showform.status==1" type="primary" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(showform.id,'leader')">领导确认</Button>
-        <Button v-if="showform.status==2" type="primary" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(showform.id,'accept')">接收</Button>
-        <Button v-if="showform.status==3||showform.status==7" type="primary" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(showform.id,'reform')">提交整改</Button>
-        <Button v-if="showform.status==4" type="primary" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(showform.id,'confirm')">确认整改</Button>
-        <Button v-if="showform.status==9" type="primary" style='margin-right:5px;margin-bottom:5px;' @click="showPatrol(showform.id,'leaderconfirm')">领导确认整改</Button>
-      </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
-  } from "@/api/task/patrol.js";
-  import {
-    listdept
-  } from "@/api/system/department.js"
-  import {
-    listCommonuser
-  } from "@/api/common.js"
-  import {
-    getToken
-  } from '@/utils/auth'
-  export default {
-    components: {},
-    data() {
-      return {
-        isShow: false,
-        type: 'add',
-        typeNameList: {
-          show: '查看',
-          check: '审核',
-          leader: '领导确认',
-          accept: '接收',
-          reform: '提交整改',
-          confirm: '确认整改',
-          leaderconfirm: '领导确认整改'
-        },
-        statusList: [{
-          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: [],
-        steps_active: 1,
-        form: {
-          steps: '',
-          backreason: '',
-          status: '',
-          check_leader: '',
-          check_main: '',
-          leader_status: 1,
-          main_status: 1,
-          name7: 1,
-          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: 1,
-          fix_end_date: '',
-          fix_introduce: '',
-          fix_file_ids: [],
-          confirm_status: '',
-          re_check_leader: 0,
-          re_check_main: 0,
-          re_leader_status: 1,
-          re_main_status: 1,
-
-          patrol_name: '',
-          mission_id: '',
-          date: '',
-          site_id: '',
-          ask_id: '',
-          ask_introduce: '',
-          tips: '',
-          file_ids: [],
-        },
-
-        checkList: [{
-          id: 2,
-          name: '通过'
-        }, {
-          id: 6,
-          name: '不通过'
-        }],
-        confirmList: [{
-          id: 5,
-          name: '通过'
-        }, {
-          id: 7,
-          name: '不通过'
-        }],
-        leaderConfirmList: [{
-          id: 1,
-          name: '通过'
-        }, {
-          id: 0,
-          name: '不通过'
-        }],
-        acceptList: [{
-          id: 3,
-          name: '接收'
-        }, {
-          id: 8,
-          name: '退回'
-        }],
-        deptOptions: [],
-        checkAll: false,
-        isIndeterminate: true,
-        userdata: [],
-        filterMethod(query, item) {
-          return item.name.indexOf(query) > -1;
-        },
-
-        rules: {
-          // status: [{
-          //   required: true,
-          //   message: '请选择状态'
-          // }]
-        }
-      }
-    },
-    created() {
-      this.uploadOther.token = getToken();
-      this.loadDeptOptions()
-      this.loadUser()
-    },
-    methods: {
-      showPatrol(id, type) {
-
-      },
-      //切换用户选择 人员还是部门 清空
-      changeName7(e) {
-        if (e) {
-          this.form.accept_department_ids = []
-          this.form.accept_admin_ids = []
-        }
-      },
-      // 切换接收的状态 清空
-      changeAcceptStatus(e) {
-        if (e) {
-          this.form.duty_admin_id = ''
-          this.form.reason = ''
-          this.form.plan_end_date = ''
-        }
-      },
-      // 选择科室
-      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;
-        }).catch(error => {
-          console.log(error)
-        })
-      },
-      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 getDetail() {
-        const res = await get(this.id)
-
-        // 选择人或部门
-        let name7value = 1
-        if (res.accept_department_ids) {
-          name7value = res.accept_department_ids.length > 0 ? 2 : 1
-        } else if (res.accept_admin_ids) {
-          name7value = res.accept_admin_ids.length > 0 ? 1 : 1
-        } else {
-          name7value = 1
-        }
-
-        this.form = {
-          steps: '',
-          backreason: '',
-          // 审核
-          status: '',
-          accept_status: '',
-          check_leader: res.check_leader == 1 ? 1 : 0,
-          check_main: res.check_main == 1 ? 1 : 0,
-          leader_status: res.leader_status == 1 ? 1 : 0,
-          main_status: res.main_status == 1 ? 1 : 0,
-          name7: name7value,
-          accept_department_ids: res?.accept_department_ids,
-          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 == 1 ? 1 : 0,
-          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,
-
-          patrol_name: '',
-          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,
-        }
-        console.log("this.form", this.form)
-        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)
-        }
-        if (res.status == 5) {
-          this.steps_active = 4
-        } else if (res.status == 0 || res.status == 8) {
-          this.steps_active = 1
-        } else if (res.status == 1 || res.status == 2) {
-          this.steps_active = 2
-        } else {
-          this.steps_active = 3
-        }
-        this.statusList.map(item => {
-          if (item.id == res.status) {
-            res.status_name = item.value
-          }
-        })
-        this.showform = res
-        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
-        // 审核或领导确认
-        if (this.type === 'check') {
-          if (this.form.accept_department_ids || this.formaccept_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.type === 'leader') {
-          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 = 2
-            } else {
-              this.form.status = 6
-            }
-          } else {
-            if (this.form.check_leader == 1) {
-              this.form.status = this.form.leader_status == 1 ? 2 : 6
-            } else if (this.form.check_main == 1) {
-              this.form.status = this.form.main_status == 1 ? 2 : 6
-            }
-          }
-        }
-        // 部门接收
-        if (this.type === 'accept') {
-          if (this.form.status == 3) {
-            if (!this.form.plan_end_date) {
-              Message({
-                type: 'warning',
-                message: `请选择计划完成时间`
-              })
-              return
-            }
-            if (!this.form.duty_admin_id) {
-              Message({
-                type: 'warning',
-                message: `请选择责任人`
-              })
-              return
-            }
-          } else if (this.form.status == 8) {
-            console.log("this.form.reason", this.form.reason)
-            if (!this.form.reason) {
-              Message({
-                type: 'warning',
-                message: `请输入退回理由`
-              })
-              return
-            }
-          }
-
-        }
-        // 提交整改
-        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
-          }
-        }
-
-
-        // 是否需要领导确认整改 status=9
-        if (this.type === 'confirm') {
-          if (this.form.re_check_leader == 1 || this.form.re_check_main == 1) {
-            this.form.status = 9
-          }
-        }
-        // 领导确认整改审核
-        if (this.type === 'leaderconfirm') {
-          if (this.form.re_check_leader == 1 && this.form.re_check_main == 1) {
-            if (this.form.re_leader_status == 1 && this.form.re_main_status == 1) {
-              this.form.status = 5
-            } else {
-              this.form.status = 7
-            }
-          } else {
-            if (this.form.re_check_leader == 1) {
-              this.form.status = this.form.re_leader_status == 1 ? 2 : 6
-            } else if (this.form.re_check_main == 1) {
-              this.form.status = this.form.re_main_status == 1 ? 2 : 6
-            }
-          }
-        }
-
-        if (!this.form.status) {
-          Message({
-            type: 'warning',
-            message: `请选择状态`
-          })
-          return
-        }
-        // return
-
-        save({
-          id: this.id,
-          ...this.form
-        }).then(res => {
-          Message({
-            type: 'success',
-            message: `${this.typeNameList[this.type]}成功`
-          })
-          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.$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,
-  ::v-deep .patrol_name,
-  ::v-deep .steps {
-    flex-basis: 100%;
-  }
-
-  ::v-deep .margin-top {
-    padding: 20px;
-    font-size: 16px;
-  }
-
-  ::v-deep .steps {
-    padding: 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: 80px !important;
-    height: 80px !important;
-    line-height: 80px !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;
-  }
-
-  .searchCompanys {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 16px;
-
-    .el-input {
-      width: 80%
-    }
-  }
-</style>
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index 3c120a2..2c149e7 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -5,16 +5,15 @@
         <slot>
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
             <Input v-model="select.keyword" style="width: 200px;margin-right: 10px;" placeholder="关键字搜索" />
-            <!-- <Select multiple filterable clearable style='width:200px;margin-right: 10px;' v-model="select.unit_type" placeholder="任务类型">
-              <Option v-for="item in unitTypeList" :value="item.id">{{item.value}}</Option>
-            </Select> -->
+            <Select filterable clearable style='width:200px;margin-right: 10px;' v-model="select.audit_status" placeholder="任务状态">
+              <Option v-for="item in auditStatusList" :value="item.id">{{item.value}}</Option>
+            </Select>
             <Button type="primary" @click="getList" style="margin-right: 10px;">查询</Button>
             <Button v-if="path_type!=5" icon="ios-add" type="primary" style="margin-right: 10px;"
               @click="$refs['addUnit'].isShow=true,$refs['addUnit'].type='add'">添加</Button>
           </div>
         </slot>
       </lx-header>
-
     </div>
 
     <el-table :data="list" style="width: 100%" class='v-table' border :height='tableHeight'>
@@ -63,19 +62,42 @@
           </span>
           <div v-else-if='item.customFn'>
             <div style="white-space: normal;text-align: left;">
-              <div v-if="scope.row.accept_department.length>0">
-                <el-tag v-for="department in scope.row.accept_department"
-                  style="margin-right: 5px;margin-bottom: 2px;">{{department.name}}</el-tag>
+              <div v-if="scope.row.accept_department_detail.length>0">
+                <span v-for="department in scope.row.accept_department_detail">
+                  <el-tag v-if="department.detail"
+                    style="margin-right: 5px;margin-bottom: 2px;">{{department.department.name}}</el-tag>
+                    <el-tag v-else type='info'
+                      style="margin-right: 5px;margin-bottom: 2px;">{{department.department.name}}</el-tag>
+                </span>
+
               </div>
-              <div v-if="scope.row.accept_admin.length>0">
-                <el-tag v-for="admin in scope.row.accept_admin"
-                  style="margin-right: 5px;margin-bottom: 2px;">{{admin.name}}</el-tag>
+              <div v-if="scope.row.accept_admin_detail.length>0">
+                <span v-for="admin in scope.row.accept_admin_detail">
+                  <el-tag v-if="admin.detail"
+                    style="margin-right: 5px;margin-bottom: 2px;">{{admin.admin.name}}</el-tag>
+                  <el-tag v-else type='info'
+                    style="margin-right: 5px;margin-bottom: 2px;">{{admin.admin.name}}</el-tag>
+                </span>
+
               </div>
               <div v-if="scope.row.groups.length>0">
                 <div v-for="group in scope.row.groups">
                   {{group.name}}:
-                  <el-tag v-for="detail in group.details"
-                    style="margin-right: 5px;margin-bottom: 2px;">{{detail.name}}</el-tag>
+                  <span v-if="group.type==1">
+                    <span v-for="detail in scope.row.grounp_admin_detail">
+                      <el-tag v-if="detail.istrue"
+                        style="margin-right: 5px;margin-bottom: 2px;">{{detail.admin.name}}</el-tag>
+                    </span>
+                  </span>
+                  <span v-if="group.type==2">
+                    <span v-for="detail in scope.row.grounp_department_detail">
+                      <el-tag v-if="detail.istrue"
+                        style="margin-right: 5px;margin-bottom: 2px;">{{detail.department.name}}</el-tag>
+                      <el-tag v-else type='info'
+                          style="margin-right: 5px;margin-bottom: 2px;">{{detail.department.name}}</el-tag>
+                    </span>
+                  </span>
+
                 </div>
               </div>
             </div>
@@ -90,13 +112,14 @@
       <el-table-column fixed="right" align='center' label="操作" width="180" header-align="center">
         <template slot-scope="scope">
           <div v-if="path_type==1">
-            <Button type="primary" size="small" @click="editorUnit(scope.row.id,'editor')">编辑</Button>
+            <Button type="primary" size="small" style="margin-right:5px;margin-bottom:5px;" @click="editorUnit(scope.row.id,'editor')">编辑</Button>
+            <Button v-if="scope.row.audit_admin_id==login_id" style="margin-right:5px;margin-bottom:5px;" type="primary" size="small" @click="checkUnits(scope.row.id,'check')">审核</Button>
             <Poptip transfer confirm title="确认要删除吗？" @on-ok="deleteList(scope.row.id)">
-              <Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
+              <Button type="primary" style="margin-right:5px;margin-bottom:5px;" size="small" ghost>删除</Button>
             </Poptip>
           </div>
           <div v-else>
-            <Button type="primary" size="small" style="margin-right:5px;margin-bottom:5px;" @click="editorUnit(scope.row.id,'editor')">查看</Button>
+            <Button type="primary" size="small" style="margin-right:5px;margin-bottom:5px;" @click="checkUnits(scope.row.id,'show')">查看</Button>
             <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>
           </div>
 
@@ -107,49 +130,30 @@
 
     <Page :total="total" show-elevator show-sizer show-total :page-size='select.page_size' size='small'
       @on-change='changePage' @on-page-size-change='changePageSize' />
-    <!-- <xy-table
-      :list="list"
-      :total="total"
-      @pageSizeChange="e => {select.page_size = e,getList()}"
-      @pageIndexChange="e => {select.page = e,getList()}"
-      :table-item="table">
-      <template v-slot:btns>
-        <el-table-column fixed="right" label="操作" width="260" header-align="center">
-          <template slot-scope="scope">
-            <Button type="primary" size="small" @click="editorUnit(scope.row.id,'editor')">编辑</Button>
-            <Poptip
-              transfer
-              confirm
-              title="确认要删除吗？"
-              @on-ok="deleteList(scope.row.id)">
-              <Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
-            </Poptip>
-          </template>
-        </el-table-column>
-      </template>
-
-      </xy-table> -->
     <addUnit ref='addUnit' @refresh='getList'></addUnit>
 
     <showPatrol ref='showPatrol'></showPatrol>
     <addPatrol ref='addPatrol' @refresh='getList'></addPatrol>
-
+    <checkUnit ref='checkUnit' @refresh='getList'></checkUnit>
   </div>
 </template>
 
 <script>
   import addUnit from '../list/components/addUnit.vue'
   import showPatrol from '../list/components/showPatrol.vue'
-  import addPatrol from '../list/components/addPatrol.vue'
+  import addPatrol from '../list/components/addPatrol.vue'
+  import checkUnit from '../list/components/checkUnit.vue'
   import {
     listunit,
     del
-  } from '@/api/task/unit.js'
+  } from '@/api/task/unit.js'
+  import {getUser} from "@/utils/auth";
   export default {
     components: {
       addUnit,
       showPatrol,
-      addPatrol
+      addPatrol,
+      checkUnit
     },
     data() {
       return {
@@ -178,9 +182,20 @@
           myself: 0,
           myself_department: 0,
           type: '',
-          unit_type: ''
+          unit_type: '',
+          audit_status:''
         },
-        total: 0,
+        total: 0,
+        auditStatusList:[{
+          id:0,
+          value:'待审核'
+        },{
+          id:1,
+          value:'通过'
+        },{
+          id:2,
+          value:'不通过'
+        }],
         unitTypeList: [{
           id: 1,
           value: '专项检查'
@@ -198,6 +213,13 @@
             // 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,
@@ -291,7 +313,10 @@
             value: '待领导确认整改'
           }],
           list: [],
-          path_type:1
+          path_type:1,
+          login_id:'',
+          department_id:'',
+
         }
       },
       created() {
@@ -313,7 +338,8 @@
               this.path_type = path[1]
             }
           }
-          console.log("this.path_type ",this.path_type)
+          console.log("this.path_type ",this.path_type)
+          this.getUserId()
           this.getList()
         },
         watch: {},
@@ -326,6 +352,11 @@
             var topHeight = 50; //页面 头部
             let tableHeight = clientHeight - lxHeader_height - topHeight - paginationHeight - 20;
             that.tableHeight = tableHeight;
+          },
+          async getUserId(){
+             let res = await getUser()
+             this.login_id = JSON.parse(res).id
+             this.department_id = JSON.parse(res).department_id
           },
           showPatrol(id, type) {
             this.$refs.showPatrol.id = id
@@ -334,9 +365,44 @@
             this.$refs.showPatrol.isShow = true
           },
           async getList() {
-            const res = await listunit({
+            let res = await listunit({
               ...this.select
-            })
+            })
+            //  判断小组中是否有人提交了检查
+            for(var r of res.data){
+              if(r.groups.length>0){
+                for(var g of r.groups){
+                  if(g.type==1){
+                    let is_index = 0
+                    for(var a of r.grounp_admin_detail){
+                      if(a.detail){
+                        is_index++
+                      }
+                    }
+                    if(is_index>0){
+                      for(var a1 of r.grounp_admin_detail){
+                        a1.istrue = true
+                      }
+                    }
+                  }
+                  if(g.type==2){
+                    let is_index = 0
+                    for(var d of r.grounp_department_detail){
+                      if(d.detail){
+                        is_index++
+                      }
+                    }
+                    if(is_index>0){
+                      for(var d1 of r.grounp_department_detail){
+                        d1.istrue = true
+                      }
+                    }
+                  }
+
+                }
+              }
+            }
+
             this.list = res.data
             this.total = res.total
 
@@ -353,6 +419,11 @@
             this.$refs.addUnit.id = id
             this.$refs.addUnit.type = type
             this.$refs.addUnit.isShow = true
+          },
+          checkUnits(id,type){
+            this.$refs.checkUnit.id = id
+            this.$refs.checkUnit.type = type
+            this.$refs.checkUnit.isShow = true
           },
           deleteList(id) {
             var that = this;