From 4e15588dcc6a19eb197b53fb69ca5331e0d0d9ff Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 8 Jul 2024 10:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue                 | 171 ++++++++++++-----
 src/views/task/list/components/addUnit.vue    |  96 ++++++----
 src/views/task/list/components/checkUnit.vue  |   6 +-
 src/views/task/list/components/showPlan.vue   |   6 +-
 .../task/list/components/showPlanoutline.vue  |   4 +-
 src/views/task/list/patrol.vue                | 101 +++++-----
 src/views/task/list/planunit.vue              |   8 +-
 src/views/task/list/unit.vue                  | 175 +++++++++++++-----
 8 files changed, 368 insertions(+), 199 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index d266c64..569c7be 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -43,7 +43,7 @@
               <el-tabs v-model="activeName">
                 <el-tab-pane name="first">
                   <span slot="label">
-                    我的任务
+                    我的待办任务
                     <el-badge :value="myselfTotal" class="item"></el-badge>
                   </span>
                   <div style="height:350px">
@@ -60,18 +60,43 @@
                               ">
                               <el-tooltip placement="left" effect="light"  v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)">
                                 <div slot="content">
-                                  <div style="margin-bottom:5px;">
-                                    <Button type="primary" size="small"
-                                      @click="editorUnit(scope.row.id,'send')">任务转办</Button>
-                                  </div>
-                                  <div style="margin-bottom:5px;">
-                                    <Button type="primary" size="small"
-                                      @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                                  </div>
-                                  <div v-for="item in unitTypeList">
-                                    <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                                      @click="openMyMission(item.value,scope.row)">任务执行</Button>
-                                  </div>
+
+                                  <el-popover
+
+                                     placement="right"
+                                     title=""
+                                     width="200"
+                                     trigger="hover"
+                                     content="您可以按照任务要求完成任务">
+                                     <template v-for="item in unitTypeList">
+                                       <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                                         @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                                     </template>
+                                   </el-popover>
+
+                                   <el-popover
+                                      placement="right"
+                                      title=""
+                                      width="200"
+                                      trigger="hover"
+                                      content="您可以按照任务要求分解给到其他科室或人员">
+                                      <div style="margin-bottom:5px;" slot="reference" >
+                                        <Button type="primary" size="small"
+                                          @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
+                                      </div>
+                                    </el-popover>
+                                    <el-popover
+                                       placement="right"
+                                       title=""
+                                       width="200"
+                                       trigger="hover"
+                                       content="您可以按照任务要求转办给其他人员">
+                                       <div style="margin-bottom:5px;" slot="reference" >
+                                         <Button type="primary" size="small"
+                                           @click="editorUnit(scope.row.id,'send')">任务转办</Button>
+                                       </div>
+                                     </el-popover>
+
                                 </div>
                                 <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
                                     执行任务
@@ -85,18 +110,43 @@
                               <!-- 组长权限 -->
                               <el-tooltip placement="left" effect="light" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
                                 <div slot="content">
-                                  <div style="margin-bottom:5px;">
-                                    <Button type="primary" size="small"
-                                      @click="editorUnit(scope.row.id,'send')">任务转办</Button>
-                                  </div>
-                                  <div style="margin-bottom:5px;">
-                                    <Button type="primary" size="small"
-                                      @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                                  </div>
-                                  <div v-for="item in unitTypeList">
-                                    <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                                      @click="openMyMission(item.value,scope.row)">任务执行</Button>
-                                  </div>
+                                  <el-popover
+
+                                     placement="right"
+                                     title=""
+                                     width="200"
+                                     trigger="hover"
+                                     content="您可以按照任务要求完成任务">
+                                     <template v-for="item in unitTypeList">
+                                       <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                                         @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                                     </template>
+                                   </el-popover>
+
+                                   <el-popover
+                                      placement="right"
+                                      title=""
+                                      width="200"
+                                      trigger="hover"
+                                      content="您可以按照任务要求分解给到其他科室或人员">
+                                      <div style="margin-bottom:5px;" slot="reference" >
+                                        <Button type="primary" size="small"
+                                          @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
+                                      </div>
+                                    </el-popover>
+                                    <el-popover
+                                       placement="right"
+                                       title=""
+                                       width="200"
+                                       trigger="hover"
+                                       content="您可以按照任务要求转办给其他人员">
+                                       <div style="margin-bottom:5px;" slot="reference" >
+                                         <Button type="primary" size="small"
+                                           @click="editorUnit(scope.row.id,'send')">任务转办</Button>
+                                       </div>
+                                     </el-popover>
+
+
                                 </div>
                                 <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
                                     执行任务
@@ -113,29 +163,48 @@
                             </div>
                             <!-- doadmins 转办的人员 任务分解，任务执行 -->
                             <div v-else-if="scope.row.do_admin_ids && scope.row.do_admin_ids.length>0">
-							  <el-tooltip placement="left" effect="light" v-if="scope.row.do_admin_ids.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
-								<div slot="content">
-								  <div style="margin-bottom:5px;">
-									<Button type="primary" size="small"
-									  @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-								  </div>
-								  <div v-for="item in unitTypeList">
-									<Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-									  @click="openMyMission(item.value,scope.row)">任务执行</Button>
-								  </div>
-								</div>
-								<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
-									执行任务
-								</Button>
-							  </el-tooltip>
+                              <el-tooltip placement="left" effect="light" v-if="scope.row.do_admin_ids.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
+                              <div slot="content">
+                                <el-popover
+
+                                   placement="right"
+                                   title=""
+                                   width="200"
+                                   trigger="hover"
+                                   content="您可以按照任务要求完成任务">
+                                   <template v-for="item in unitTypeList">
+                                     <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                                       @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                                   </template>
+                                 </el-popover>
+
+                                 <el-popover
+                                    placement="right"
+                                    title=""
+                                    width="200"
+                                    trigger="hover"
+                                    content="您可以按照任务要求分解给到其他科室或人员">
+                                    <div style="margin-bottom:5px;" slot="reference" >
+                                      <Button type="primary" size="small"
+                                        @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
+                                    </div>
+                                  </el-popover>
+                                </div>
+                                </el-tooltip>
                             </div>
                             <!-- 直接 执行任务 -->
                             <div v-else>
-                              <div v-for="item in unitTypeList">
-                                <Button v-if="scope.row.unit_type==item.id &&scope.row.audit_status==1" type="primary" size="small"
-                                  style="margin-right:5px;margin-bottom:5px;"
-                                  @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                              </div>
+                              <el-popover
+                                 placement="right"
+                                 title=""
+                                 width="200"
+                                 trigger="hover"
+                                 content="您可以按照任务要求完成任务">
+                                 <template v-for="item in unitTypeList">
+                                   <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                                     @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                                 </template>
+                               </el-popover>
                             </div>
                             <div>
                               <Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
@@ -426,11 +495,11 @@ export default {
       stateObj:{},
       auditStatusList: [{
           id:4,
-          value:'待开展',
+          value:'待办',
           type:'info'
         },{
           id:1,
-          value:'未完成',
+          value:'办理中',
           type:''
         },{
           id:5,
@@ -438,7 +507,7 @@ export default {
           type:'success'
         },{
           id:3,
-          value:'待归档',
+          value:'已完成',
           type:'danger'
         }],
         treeProps:{children: 'mychildren', hasChildren: 'hasChildren'},
@@ -501,9 +570,9 @@ export default {
       depYear:'',
       depList:[],
       auditTable:{
-        1:'未完成',
-        3:'待归档',
-        4:'待开展',
+        1:'办理中',
+        3:'已完成',
+        4:'待办',
         5:'已归档'
       },
       depTable:[{
diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue
index f6ed7c2..640ba1d 100644
--- a/src/views/task/list/components/addUnit.vue
+++ b/src/views/task/list/components/addUnit.vue
@@ -143,6 +143,24 @@
       </template>
 
       <template v-slot:name7>
+        <div v-if="type=='add'||type=='editor'">
+          <div class="xy-table-item">
+            <div class="xy-table-item-label">
+              <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>责任人(科室)：
+            </div>
+            <div class="xy-table-item-content" style="width:400px">
+              <el-select style="width:48%;margin-right:2%" v-model="form.main_department_id" @change="changeDeptOptions"
+                placeholder="请选择部门">
+                <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+              <el-select style="width:48%;" v-model="form.main_admin_id" placeholder="请选择部门人员">
+                <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
         <div  v-if="!plan_unit">
           <div v-if="type!='send'">
             <div class="xy-table-item">
@@ -196,28 +214,55 @@
 
           <div v-if='form.name7==3'>
             <div class="xy-table-item">
-              <div class="xy-table-item-label">
+              <div class="xy-table-item-label" style="width:0;min-width:0;">
                 <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
               </div>
-              <div class="xy-table-item-content" style='min-width:100px'>
+              <div class="xy-table-item-content" style='min-width:100px;width:100%'>
                 <Button type='primary'
                   @click="mission_groups_list.push({name:'',type:1,link_id:[],link_id_dep:[]})">新增小组</Button>
-                <div v-for="(item,index) in mission_groups_list" style='margin:10px;margin-left:0'>
+                  <el-table :data="mission_groups_list" style="width: 100%">
+                        <el-table-column prop="name" label="组别" width="100">
+                          <template slot-scope="scope">
+                            <div>小组：{{scope.row.name=mission_groups_name[scope.$index]}}</div>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="leader" label="组长" width="180">
+                          <template slot-scope="scope">
+                            <el-select-tree :datas='userdata'
+                              style="width: 100%;min-width: 100%;"
+                              :valueArr='scope.row.valueArr' :valueMultiple="scope.row.valueMultiple"
+                              @getValue="(e)=>{return getSelectedgroupValue(e,scope.row)}"></el-select-tree>
+                          </template>
+                        </el-table-column>
+                        <el-table-column prop="team" label="组员" width="210">
+                          <template slot-scope="scope">
+                            <el-select v-model="scope.row.link_id_dep" clearable collapse-tags filterable multiple
+                              placeholder="请选择部门">
+                              <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
+                              </el-option>
+                            </el-select>
+                          </template>
+                        </el-table-column>
+                        <el-table-column
+                          prop="del"
+                          label="操作"
+                          width="80">
+                          <template slot-scope="scope">
+                            <Button style="margin-right:10px" @click="mission_groups_list.splice(scope.$index,1)">删除</Button>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+
+
+
+
+                <!-- <div v-for="(item,index) in mission_groups_list" style='margin:10px;margin-left:0'>
                   <div>
                     <Button style="margin-right:10px" @click="mission_groups_list.splice(index,1)">删除</Button>
                     <div>小组：{{item.name=mission_groups_name[index]}}</div>
-                    <!-- <el-radio-group v-model="item.type" @change='item.link_id=[]' style="margin:10px;margin-right:20px">
-                      <el-radio :label="1">人员</el-radio>
-                      <el-radio :label="2">部门</el-radio>
-                    </el-radio-group> -->
-                    <!-- <el-select v-if='item.type==1' v-model="item.link_id" clearable filterable multiple placeholder="请选择人员">
-                      <el-option v-for="item in userdata" :key="item.id" :label="item.name" :value="item.id">
-                      </el-option>
-                    </el-select> -->
                     <el-select-tree style="width:48%;min-width:48%;margin-right:2%" :datas='userdata'
                       :valueArr='item.valueArr' :valueMultiple="item.valueMultiple"
                       @getValue="(e)=>{return getSelectedgroupValue(e,item)}"></el-select-tree>
-
                     <el-select style="width:48%;" v-model="item.link_id_dep" clearable collapse-tags filterable multiple
                       placeholder="请选择部门">
                       <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
@@ -226,7 +271,7 @@
 
                   </div>
 
-                </div>
+                </div> -->
 
 
               </div>
@@ -235,24 +280,7 @@
         </div>
 
 
-        <div v-if="type=='add'||type=='editor'">
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>责任人(科室)：
-            </div>
-            <div class="xy-table-item-content" style="width:400px">
-              <el-select style="width:48%;margin-right:2%" v-model="form.main_department_id" @change="changeDeptOptions"
-                placeholder="请选择部门">
-                <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-              <el-select style="width:48%;" v-model="form.main_admin_id" placeholder="请选择部门人员">
-                <el-option v-for="item in userOptions" :key="item.id" :label="item.name" :value="item.id">
-                </el-option>
-              </el-select>
-            </div>
-          </div>
-        </div>
+
 
       </template>
       <template v-slot:unitTypeList>
@@ -444,13 +472,13 @@
           // },
           {
             id: 4,
-            value: '待开展'
+            value: '待办'
           }, {
             id: 1,
             value: '开展中'
           }, {
             id: 2,
-            value: '未完成'
+            value: '办理中'
           }, {
             id: 3,
             value: '已完成'
@@ -1044,7 +1072,7 @@
           this.betweenSe(this.form.start_date, this.form.end_date)
         }
         if (this.type === 'add' || this.type=== 'pid') {
-
+          this.form.do_admin_ids = []
           save({
             ...this.form
           }).then(res => {
diff --git a/src/views/task/list/components/checkUnit.vue b/src/views/task/list/components/checkUnit.vue
index e201494..5ec012d 100644
--- a/src/views/task/list/components/checkUnit.vue
+++ b/src/views/task/list/components/checkUnit.vue
@@ -472,11 +472,11 @@
         inspection_log: [],
         unitStatusList: [{
           id: 4,
-          value: '待开展',
+          value: '待办',
           type: 'info'
         }, {
           id: 1,
-          value: '未完成',
+          value: '办理中',
           type: ''
         }, {
           id: 5,
@@ -484,7 +484,7 @@
           type: 'success'
         }, {
           id: 3,
-          value: '待归档',
+          value: '已完成',
           type: 'danger'
         }],
         pidTable:[
diff --git a/src/views/task/list/components/showPlan.vue b/src/views/task/list/components/showPlan.vue
index 49cd2c7..66dd69d 100644
--- a/src/views/task/list/components/showPlan.vue
+++ b/src/views/task/list/components/showPlan.vue
@@ -152,11 +152,11 @@
         },
         auditStatusList:[{
           id: 4,
-          value: '待开展',
+          value: '待办',
           type: 'info'
         }, {
           id: 1,
-          value: '未完成',
+          value: '办理中',
           type: ''
         }, {
           id: 5,
@@ -164,7 +164,7 @@
           type: 'success'
         }, {
           id: 3,
-          value: '待归档',
+          value: '已完成',
           type: 'danger'
         }],
         table:[{
diff --git a/src/views/task/list/components/showPlanoutline.vue b/src/views/task/list/components/showPlanoutline.vue
index dd34fc1..a9b0b15 100644
--- a/src/views/task/list/components/showPlanoutline.vue
+++ b/src/views/task/list/components/showPlanoutline.vue
@@ -251,7 +251,7 @@
           type:'warning'
         },{
           id:4,
-          value:'待开展',
+          value:'待办',
           type:'info'
         },{
           id:1,
@@ -259,7 +259,7 @@
           type:''
         },{
           id:2,
-          value:'未完成',
+          value:'办理中',
           type:'danger'
         },{
           id:3,
diff --git a/src/views/task/list/patrol.vue b/src/views/task/list/patrol.vue
index d94a715..3bc98ce 100644
--- a/src/views/task/list/patrol.vue
+++ b/src/views/task/list/patrol.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="padding: 0 20px">
     <div ref="lxHeader">
-      <lx-header icon="md-apps" text="检查整改" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+      <lx-header icon="md-apps" text="问题管理" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <slot>
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
             <DatePicker style='width:200px;margin-right: 10px;' placeholder="年份" placement="bottom" format='yyyy'
@@ -9,9 +9,9 @@
             <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>
-           <!-- <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.mission_id" placeholder="任务名称">
+           <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.mission_id" placeholder="问题来源">
               <Option v-for="item in missionList" :value="item.id">{{item.name}}</Option>
-            </Select> -->
+            </Select>
             <Select filterable clearable style='width:150px;margin-right: 10px;' v-model="select.ask_id" placeholder="问题类型">
               <Option v-for="item in askList" :value="item.id">{{item.value}}</Option>
             </Select>
@@ -37,12 +37,9 @@
     </div>
       <!-- @cell-click="cellClicks" -->
     <div class="tablewrap">
-      <div class="tablemonth">
+      <!-- <div class="tablemonth">
         <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
           <div style="margin: 15px 0;"></div>
-        <!-- <el-checkbox-group v-model="selectMission" @change="changeMonth">
-            <el-checkbox v-for="item in missionList" :label="item.id">{{item.name}}</el-checkbox>
-        </el-checkbox-group> -->
         <el-tree
           ref="missiontree"
           :props="{
@@ -55,7 +52,7 @@
           :default-checked-keys="selectMission"
           @check-change="changeMonth">
         </el-tree>
-      </div>
+      </div> -->
 
       <div class="tablecontent">
         <xy-table
@@ -230,10 +227,52 @@
         checkAll:false,
         selectMission:[],
         table:[{
-          label:"任务名称",
+          label:"问题描述",
+          prop:'ask_introduce',
+          align:'left',
+          width:180
+        },{
+          label:"问题类型",
+          prop:'ask.value',
+          width:80,
+        },{
+          label:"问题来源",
           prop:'missionName',
           // width:180,
           align:'left'
+        },{
+          label:"发现日期",
+          prop:'date',
+          width:110,
+        },{
+          label:"责任科室",
+          prop:'ask_department',
+          width:200,
+          align:'center',
+          customFn: (row) => {
+
+            return(<div style={
+              {
+                'display':'flex',
+                'flex-wrap':'wrap',
+                "justify-content": "center"
+              }
+            }>
+              {
+                row.accept_department_ids_details&&row.accept_department_ids_details.length>0?
+                row.accept_department_ids_details.map(item=>{
+                      return(<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
+                  })
+                :(row.accept_admin_ids_details&&row.accept_admin_ids_details.length>0?
+
+                row.accept_admin_ids_details.map(item=>{
+                      return (<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
+                })
+                :row.ask_department)
+              }
+
+            </div>)
+          }
         },{
           label:"状态",
           prop:'status',
@@ -249,10 +288,6 @@
             }
             </div>)
           }
-        },{
-          label:"检查日期",
-          prop:'date',
-          width:110,
         },{
           label:"检查站点/地点",
           prop:'site.name',
@@ -265,15 +300,6 @@
               return cell.address
             }
           }
-        },{
-          label:"问题描述",
-          prop:'ask_introduce',
-          align:'left',
-          width:180
-        },{
-          label:"问题类型",
-          prop:'ask.value',
-          width:80,
         },{
           label:"问题图片",
           prop:'_files',
@@ -310,35 +336,6 @@
 
              </div>)
           }
-        },{
-          label:"责任对象",
-          prop:'ask_department',
-          width:200,
-          align:'center',
-          customFn: (row) => {
-
-            return(<div style={
-              {
-                'display':'flex',
-                'flex-wrap':'wrap',
-                "justify-content": "center"
-              }
-            }>
-              {
-                row.accept_department_ids_details&&row.accept_department_ids_details.length>0?
-                row.accept_department_ids_details.map(item=>{
-                      return(<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
-                  })
-                :(row.accept_admin_ids_details&&row.accept_admin_ids_details.length>0?
-
-                row.accept_admin_ids_details.map(item=>{
-                      return (<el-tag style={{'margin':'3px'}}>{item.name}</el-tag>)
-                })
-                :row.ask_department)
-              }
-
-            </div>)
-          }
         },{
           label:"整改图片",
           prop:'fix_files',
@@ -864,7 +861,7 @@
     margin-right:1%;
   }
   .tablecontent{
-    width:84%
+    width:100%
   }
   /deep/ .el-tree-node{
     white-space: normal;
diff --git a/src/views/task/list/planunit.vue b/src/views/task/list/planunit.vue
index 91ad37e..ce6c2a7 100644
--- a/src/views/task/list/planunit.vue
+++ b/src/views/task/list/planunit.vue
@@ -159,7 +159,7 @@
           name: '专项专题任务'
         }, {
           type: 5,
-          name: '我的任务'
+          name: '我的待办任务'
         }],
         select: {
           keyword: '',
@@ -208,7 +208,7 @@
         },
         selectAuditStatusList:[{
           id:4,
-          value:'待开展',
+          value:'待办',
           type:'info'
         },{
           id:1,
@@ -216,7 +216,7 @@
           type:''
         },{
           id:2,
-          value:'未完成',
+          value:'办理中',
           type:'danger'
         },{
           id:3,
@@ -225,7 +225,7 @@
         }],
         auditStatusList:[{
           id:4,
-          value:'待开展',
+          value:'待办',
           type:'info'
         },{
           id:1,
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index 302a7a1..5604c06 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -109,18 +109,42 @@
                     ">
                     <el-tooltip placement="left" effect="light"  v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)">
                       <div slot="content">
-                        <div style="margin-bottom:5px;">
-                          <Button type="primary" size="small"
-                            @click="editorUnit(scope.row.id,'send')">任务转办</Button>
-                        </div>
-                        <div style="margin-bottom:5px;">
-                          <Button type="primary" size="small"
-                            @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                        </div>
-                        <div v-for="item in unitTypeList">
-                          <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                            @click="openMyMission(item.value,scope.row)">任务执行</Button>
-                        </div>
+                        <el-popover
+
+                           placement="right"
+                           title=""
+                           width="200"
+                           trigger="hover"
+                           content="您可以按照任务要求完成任务">
+                           <template v-for="item in unitTypeList">
+                             <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                               @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                           </template>
+                         </el-popover>
+
+                         <el-popover
+                            placement="right"
+                            title=""
+                            width="200"
+                            trigger="hover"
+                            content="您可以按照任务要求分解给到其他科室或人员">
+                            <div style="margin-bottom:5px;" slot="reference" >
+                              <Button type="primary" size="small"
+                                @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
+                            </div>
+                          </el-popover>
+                          <el-popover
+                             placement="right"
+                             title=""
+                             width="200"
+                             trigger="hover"
+                             content="您可以按照任务要求转办给其他人员">
+                             <div style="margin-bottom:5px;" slot="reference" >
+                               <Button type="primary" size="small"
+                                 @click="editorUnit(scope.row.id,'send')">任务转办</Button>
+                             </div>
+                           </el-popover>
+
                       </div>
                       <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
                           执行任务
@@ -134,18 +158,41 @@
                     <!-- 组长权限 -->
                     <el-tooltip placement="left" effect="light" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
                       <div slot="content">
-                        <div style="margin-bottom:5px;">
-                          <Button type="primary" size="small"
-                            @click="editorUnit(scope.row.id,'send')">任务转办</Button>
-                        </div>
-                        <div style="margin-bottom:5px;">
-                          <Button type="primary" size="small"
-                            @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                        </div>
-                        <div v-for="item in unitTypeList">
-                          <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                            @click="openMyMission(item.value,scope.row)">任务执行</Button>
-                        </div>
+                         <el-popover
+
+                            placement="right"
+                            title=""
+                            width="200"
+                            trigger="hover"
+                            content="您可以按照任务要求完成任务">
+                            <template v-for="item in unitTypeList">
+                              <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                                @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                            </template>
+                          </el-popover>
+
+                          <el-popover
+                             placement="right"
+                             title=""
+                             width="200"
+                             trigger="hover"
+                             content="您可以按照任务要求分解给到其他科室或人员">
+                             <div style="margin-bottom:5px;" slot="reference" >
+                               <Button type="primary" size="small"
+                                 @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
+                             </div>
+                           </el-popover>
+                           <el-popover
+                              placement="right"
+                              title=""
+                              width="200"
+                              trigger="hover"
+                              content="您可以按照任务要求转办给其他人员">
+                              <div style="margin-bottom:5px;" slot="reference" >
+                                <Button type="primary" size="small"
+                                  @click="editorUnit(scope.row.id,'send')">任务转办</Button>
+                              </div>
+                            </el-popover>
                       </div>
                       <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
                           执行任务
@@ -153,25 +200,47 @@
                     </el-tooltip>
                     <!-- 除组长外 组里面所有人都能执行任务 -->
                     <div v-else>
-                      <div v-for="item in unitTypeList">
-                        <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                          style="margin-right:5px;margin-bottom:5px;"
-                          @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                      </div>
+                      <el-popover
+                         placement="right"
+                         title=""
+                         width="200"
+                         trigger="hover"
+                         content="您可以按照任务要求完成任务">
+                         <template v-for="item in unitTypeList">
+                           <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                             @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                         </template>
+                       </el-popover>
                     </div>
                   </div>
                   <!-- doadmins 转办的人员 任务分解，任务执行 -->
                   <div v-else-if="scope.row.do_admin_ids && scope.row.do_admin_ids.length>0">
                     <el-tooltip placement="left" effect="light" v-if="scope.row.do_admin_ids.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
                       <div slot="content">
-                        <div style="margin-bottom:5px;">
-                          <Button type="primary" size="small"
-                            @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                        </div>
-                        <div v-for="item in unitTypeList">
-                          <Button v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                            @click="openMyMission(item.value,scope.row)">任务执行</Button>
-                        </div>
+                        <el-popover
+
+                           placement="right"
+                           title=""
+                           width="200"
+                           trigger="hover"
+                           content="您可以按照任务要求完成任务">
+                           <template v-for="item in unitTypeList">
+                             <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                               @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                           </template>
+                         </el-popover>
+
+                         <el-popover
+                            placement="right"
+                            title=""
+                            width="200"
+                            trigger="hover"
+                            content="您可以按照任务要求分解给到其他科室或人员">
+                            <div style="margin-bottom:5px;" slot="reference" >
+                              <Button type="primary" size="small"
+                                @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
+                            </div>
+                          </el-popover>
                       </div>
                       <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
                           执行任务
@@ -180,11 +249,17 @@
                   </div>
                   <!-- 直接 执行任务 -->
                   <div v-else>
-                    <div v-for="item in unitTypeList">
-                      <Button v-if="scope.row.unit_type==item.id &&scope.row.audit_status==1" type="primary" size="small"
-                        style="margin-right:5px;margin-bottom:5px;"
-                        @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                    </div>
+                    <el-popover
+                       placement="right"
+                       title=""
+                       width="200"
+                       trigger="hover"
+                       content="您可以按照任务要求完成任务">
+                       <template v-for="item in unitTypeList">
+                         <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
+                           @click="openMyMission(item.value,scope.row)">任务执行</Button>
+                       </template>
+                     </el-popover>
                   </div>
                   <div>
                     <Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
@@ -262,7 +337,7 @@
           name: '专项专题任务'
         }, {
           type: 5,
-          name: '我的任务'
+          name: '我的待办任务'
         }],
         myMonth:'',
         isMyPage:true,
@@ -315,11 +390,11 @@
         },
         selectAuditStatusList: [{
           id: 4,
-          value: '待开展',
+          value: '待办',
           type: 'info'
         }, {
           id: 1,
-          value: '未完成',
+          value: '办理中',
           type: ''
         }, {
           id: 5,
@@ -327,16 +402,16 @@
           type: 'success'
         }, {
           id: 3,
-          value: '待归档',
+          value: '已完成',
           type: 'danger'
         }],
         auditStatusList: [{
           id: 4,
-          value: '待开展',
+          value: '待办',
           type: 'info'
         }, {
           id: 1,
-          value: '未完成',
+          value: '办理中',
           type: ''
         }, {
           id: 5,
@@ -344,7 +419,7 @@
           type: 'success'
         }, {
           id: 3,
-          value: '待归档',
+          value: '已完成',
           type: 'danger'
         }],
         unitTypeList: [],
@@ -487,7 +562,7 @@
               this.select.pid = ''
               // this.treeProps = {children: 'mychildren', hasChildren: 'hasChildren' }
               // }
-              this.type_name = '我的任务'
+              this.type_name = '我的待办任务'
               this.path_type = path[1]
               this.select.month = ''
               this.table.splice(this.table.length-1,1)