diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index d2f7915..d266c64 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -52,85 +52,57 @@
                       <template v-slot:btns>
                         <el-table-column align='center' label="操作" width="100" header-align="center">
                           <template slot-scope="scope">
-                            <!-- <div v-for="item in unitTypeList">
-                              <Button v-if="scope.row.unit_type==item.id" type="primary" size="small"
-                                style="margin-right:5px;margin-bottom:5px;"
-                                @click="openMyMission(item.value,scope.row)">{{item.remark}}</Button>
-                            </div> -->
-                            <!-- <div>
-                              <Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
-                                @click="checkUnits(scope.row.id,'show',5)">查看任务</Button>
-                            </div> -->
-
                             <!-- 任务是发给部门的，只有指定部门科长能看见，需要再次分发人员 -->
                             <!-- 任务发给部门的科长，责任人，都能进行任务分解，任务转办，执行任务的操作 -->
-
                             <div
                               v-if="(scope.row.accept_department_ids && scope.row.accept_department_ids.length>0 && stateObj.is_manger
                               ) || scope.row.main_admin_id==stateObj.login_id
                               ">
-                              <Dropdown trigger="click" v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)">
-                                  <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
-                                      执行任务
-                                      <!-- <Icon type="ios-arrow-down"></Icon> -->
-                                  </Button>
-                                  <template #list>
-                                      <DropdownMenu>
-                                          <DropdownItem>
-                                            <Button type="primary" size="small"
-                                              @click="editorUnit(scope.row.id,'send')">任务转办</Button>
-                                          </DropdownItem>
-                                          <DropdownItem>
-                                            <Button type="primary" size="small"
-                                              @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                                          </DropdownItem>
-                                          <DropdownItem>
-                                            <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>
-                                          </DropdownItem>
-                                      </DropdownMenu>
-                                  </template>
-                              </Dropdown>
-
-
-
+                              <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>
+                                </div>
+                                <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
+                                    执行任务
+                                </Button>
+                              </el-tooltip>
 
                             </div>
-                             <!-- 小组的带头人 和小组组长 -->
+                             <!-- 小组的带头人 -->
                             <div v-else-if="(scope.row.groups && scope.row.groups.length>0 )
                             || scope.row.main_admin_id==stateObj.login_id">
                               <!-- 组长权限 -->
-                              <Dropdown trigger="click" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
-                                  <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
-                                      执行任务
-                                      <!-- <Icon type="ios-arrow-down"></Icon> -->
-                                  </Button>
-                                  <template #list>
-                                      <DropdownMenu>
-                                          <DropdownItem>
-                                            <Button type="primary" size="small"
-                                              @click="editorUnit(scope.row.id,'send')">任务转办</Button>
-                                          </DropdownItem>
-                                          <DropdownItem>
-                                            <Button type="primary" size="small"
-                                              @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                                          </DropdownItem>
-                                          <DropdownItem>
-                                            <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>
-                                          </DropdownItem>
-                                      </DropdownMenu>
-                                  </template>
-                              </Dropdown>
-
-
-                              <!-- 组里面所有人都能执行任务 -->
+                              <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>
+                                </div>
+                                <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
+                                    执行任务
+                                </Button>
+                              </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"
@@ -138,8 +110,24 @@
                                     @click="openMyMission(item.value,scope.row)">执行任务</Button>
                                 </div>
                               </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>
+								</div>
+								<Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
+									执行任务
+								</Button>
+							  </el-tooltip>
                             </div>
                             <!-- 直接 执行任务 -->
                             <div v-else>
@@ -149,17 +137,10 @@
                                   @click="openMyMission(item.value,scope.row)">执行任务</Button>
                               </div>
                             </div>
-
                             <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"
-                                  style="margin-right:5px;margin-bottom:5px;"
-                                  @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                              </div> -->
                               <Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
                                 @click="checkUnits(scope.row.id,'show')">查看任务</Button>
                             </div>
-
                           </template>
                         </el-table-column>
                       </template>
@@ -493,7 +474,11 @@ export default {
             width: 120,
             align: 'center',
             customFn: (row) => {
-              return ( <div> {
+              return (  <div> {
+				  // 有转办人，转办人不显示 已转办 任务为结束。
+				  row.do_admin_ids.length>0 && !row.do_admin_ids.includes(this.stateObj.login_id) && !(row.audit_status==3||row.audit_status==5)?
+					<el-tag type ='info'>已转办</el-tag>
+				  :
                   this.auditStatusList.map(item => {
                       if (item.id == row.audit_status) {
                         return ( <el-tag type = {