From 9d76ae0abb987d150a697c22580db4d9b08db7d3 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Mon, 24 Jun 2024 13:57:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=A7=E7=BA=B2=E5=8F=82?=
 =?UTF-8?q?=E4=B8=8E=E5=AF=B9=E8=B1=A1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                              |    4 +-
 src/views/task/list/components/addUnit.vue   |  190 +--
 src/views/task/list/components/checkUnit.vue | 1186 +++++++++---------
 src/views/task/list/plan.vue                 |   17 +-
 src/views/task/list/unit.vue                 |  112 +-
 5 files changed, 752 insertions(+), 757 deletions(-)

diff --git a/.env.production b/.env.production
index 2939194..39c9fdb 100644
--- a/.env.production
+++ b/.env.production
@@ -2,6 +2,6 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = http://192.168.60.99:9001/
+#VUE_APP_BASE_API = http://192.168.60.99:9001/
 
-#VUE_APP_BASE_API = 'http://safety.115.langye.net/'
+VUE_APP_BASE_API = 'http://safety.115.langye.net/'
diff --git a/src/views/task/list/components/addUnit.vue b/src/views/task/list/components/addUnit.vue
index 4314f29..f6ed7c2 100644
--- a/src/views/task/list/components/addUnit.vue
+++ b/src/views/task/list/components/addUnit.vue
@@ -142,96 +142,99 @@
         </div>
       </template>
 
-      <template v-slot:name7>
-        <div v-if="type!='send'">
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              <span style="color: red;font-weight: 600;padding-right: 4px;"></span>{{type=='pid'?'分解任务给':'参与对象'}}：
-            </div>
-            <div class="xy-table-item-content" style="width:400px">
-              <el-radio-group v-model="form.name7" @change='changeName7'>
-                <!-- <el-radio :label="1">人员</el-radio>
-                <el-radio :label="2" v-if='form.type!=4'>部门</el-radio>
-                <el-radio :label="3" v-if='!(form.type==4||form.type==2)'>小组</el-radio> -->
-                <el-radio v-if="type!='send'" :label="3">小组</el-radio>
-                <el-radio :label="1" v-if="type!='send'">人员</el-radio>
-                <el-radio v-if="type!='send'" :label="2">部门</el-radio>
-              </el-radio-group>
-            </div>
-          </div>
-        </div>
-        <div v-if='form.name7==2'>
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
-            </div>
-            <div class="xy-table-item-content" style='min-width:400px'>
-              <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>
-        </div>
-        <div 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>{{type!='send'?'':'承办人员：'}}
-            </div>
-            <div class="xy-table-item-content" style='min-width:400px'>
-              <!-- <el-select style="width:400px" v-model="form.accept_admin_ids" 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 :datas='userdata' :valueArr='valueArr' :valueMultiple="valueMultiple"
-                @getValue="getSelectedValue"></el-select-tree>
-            </div>
-          </div>
+      <template v-slot:name7>
+        <div  v-if="!plan_unit">
+          <div v-if="type!='send'">
+            <div class="xy-table-item">
+              <div class="xy-table-item-label">
+                <span style="color: red;font-weight: 600;padding-right: 4px;"></span>{{type=='pid'?'分解任务给':'参与对象'}}：
+              </div>
+              <div class="xy-table-item-content" style="width:400px">
+                <el-radio-group v-model="form.name7" @change='changeName7'>
+                  <!-- <el-radio :label="1">人员</el-radio>
+                  <el-radio :label="2" v-if='form.type!=4'>部门</el-radio>
+                  <el-radio :label="3" v-if='!(form.type==4||form.type==2)'>小组</el-radio> -->
+                  <el-radio v-if="type!='send'" :label="3">小组</el-radio>
+                  <el-radio :label="1" v-if="type!='send'">人员</el-radio>
+                  <el-radio v-if="type!='send'" :label="2">部门</el-radio>
+                </el-radio-group>
+              </div>
+            </div>
+          </div>
+          <div v-if='form.name7==2'>
+            <div class="xy-table-item">
+              <div class="xy-table-item-label">
+                <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
+              </div>
+              <div class="xy-table-item-content" style='min-width:400px'>
+                <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>
+          </div>
+          <div 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>{{type!='send'?'':'承办人员：'}}
+              </div>
+              <div class="xy-table-item-content" style='min-width:400px'>
+                <!-- <el-select style="width:400px" v-model="form.accept_admin_ids" 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 :datas='userdata' :valueArr='valueArr' :valueMultiple="valueMultiple"
+                  @getValue="getSelectedValue"></el-select-tree>
+              </div>
+            </div>
+          </div>
+
+
+          <div v-if='form.name7==3'>
+            <div class="xy-table-item">
+              <div class="xy-table-item-label">
+                <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
+              </div>
+              <div class="xy-table-item-content" style='min-width:100px'>
+                <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'>
+                  <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">
+                      </el-option>
+                    </el-select>
+
+                  </div>
+
+                </div>
+
+
+              </div>
+            </div>
+          </div>
         </div>
 
 
-        <div v-if='form.name7==3'>
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              <span style="color: red;font-weight: 600;padding-right: 4px;"></span>
-            </div>
-            <div class="xy-table-item-content" style='min-width:100px'>
-              <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'>
-                <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">
-                    </el-option>
-                  </el-select>
-
-                </div>
-
-              </div>
-
-
-            </div>
-          </div>
-        </div>
-
         <div v-if="type=='add'||type=='editor'">
           <div class="xy-table-item">
             <div class="xy-table-item-label">
@@ -409,6 +412,7 @@
         isShow: false,
         type: 'add',
         typeName:'新增任务',
+        plan_unit:'', // 年度计划发布任务不用选参与对象
         subtitle:'',
         is_what_unitType: '',
         id: '',
@@ -594,6 +598,9 @@
       setoutLineId(id) {
         this.form.out_line_id = id ? id : ''
       },
+      setPlanUnit(type){
+        this.plan_unit = type?type:''
+      },
       setMissionPlanId(id){
         this.form.mission_plan_id = id?id:''
       },
@@ -989,8 +996,10 @@
         //   }
         // }
         // console.log("this.form",this.form)
-        // return
-        if (this.form.name7 == 3) {
+        // return
+
+        // 如果在年度计划大纲发起任务 不用验证参与人员
+        if (this.form.name7 == 3 && !this.plan_unit) {
           if (this.mission_groups_list.length == 0) {
             Message({
               type: 'warning',
@@ -1199,7 +1208,8 @@
             link_id: []
           }]
           this.department_id = ''
-          this.plan_id = ''
+          this.plan_id = ''
+          this.plan_unit = ''
           this.is_what_unitType = ''
           this.hasPlanId = false
           this.upload_link = ''
diff --git a/src/views/task/list/components/checkUnit.vue b/src/views/task/list/components/checkUnit.vue
index f37edd2..eb09b78 100644
--- a/src/views/task/list/components/checkUnit.vue
+++ b/src/views/task/list/components/checkUnit.vue
@@ -670,7 +670,7 @@
                       ''
                   } </div>)
                 }
-              }],
+            }],
             trainForm: {
               train_score: '',
               train_feedback: ''
@@ -690,27 +690,27 @@
             align: 'center',
             width: 120
           },{
-                label: "提交人",
-                prop: 'admin.name',
-                align: 'center',
-                width: 120
-              },
-              {
-                label: "培训评价",
-                prop: 'train_score',
-                align: 'center',
-                width: 120,
-                formatter: (cell, data, value, index) => {
-                  let score = parseFloat(value).toFixed(1)
-                  if (score == 5) {
-                    return '优秀'
-                  } else if (score == 4 || score == 4.5) {
-                    return '良好'
-                  } else {
-                    return '一般'
-                  }
+              label: "提交人",
+              prop: 'admin.name',
+              align: 'center',
+              width: 120
+            },
+            {
+              label: "培训评价",
+              prop: 'train_score',
+              align: 'center',
+              width: 120,
+              formatter: (cell, data, value, index) => {
+                let score = parseFloat(value).toFixed(1)
+                if (score == 5) {
+                  return '优秀'
+                } else if (score == 4 || score == 4.5) {
+                  return '良好'
+                } else {
+                  return '一般'
                 }
-              }, {
+              }
+            }, {
                 label: "培训反馈",
                 prop: 'train_feedback',
                 align: 'left',
@@ -728,607 +728,607 @@
             align: 'center',
             width: 120
           },{
-                label: "小组",
-                prop: '_names',
-                width: 240,
-                customFn: (row) => {
+            label: "小组",
+            prop: '_names',
+            width: 240,
+            customFn: (row) => {
+                return ( <div style = {
+                    {
+                      "display": "flex",
+                      "flex-wrap": "wrap"
+                    }
+                  } > {
+                    row._names ?
+                    row._names.map(item => {
+                        return ( <div> {
+                            item.group_name ?
+                            // 小组
+                            <div style = {
+                              {
+                                "display": "flex"
+                              }
+                            } > <div> {
+                              item.group_name
+                            }： </div> <
+                            div style = {
+                              {
+                                "display": "flex",
+                                "flex-wrap": "wrap"
+                              }
+                            } > {
+                              item.details.map(detail => {
+                                return ( <el-tag style = {
+                                    {
+                                      'margin': '0 5px 5px 0'
+                                    }
+                                  }
+                                  type = {
+                                    detail.hasDetail ? '' : 'info'
+                                  } > {
+                                    detail.name
+                                  } </el-tag>
+                                )
+                              })
+                            } </div> <
+                            /div> :
+                              '无'
+                            // 其他
+                            // <el-tag style={{'margin':'0 5px 5px 0'}} type={item.hasDetail?'':'info'}>{item.name}</el-tag>
+                          } </div>)
+                        }): '无'
+                    } </div>)
+                  }
+                }, {
+                  label: "检查日期",
+                  prop: 'date',
+                  width: 110,
+                }, {
+                  label: "检查站点/地点",
+                  prop: 'site.name',
+                  align: 'left',
+                  width: 120,
+                  formatter: (cell, data, value, index) => {
+                    if (cell.site) {
+                      return cell.site.name
+                    } else {
+                      return cell.address
+                    }
+                  }
+                }, {
+                  label: "问题描述",
+                  prop: 'ask_introduce',
+                  align: 'left',
+                  width: 180
+                }, {
+                  label: "问题类型",
+                  prop: 'ask.value',
+                  width: 80,
+                }, {
+                  label: "问题图片",
+                  prop: 'files',
+                  width: 80,
+                  customFn: (row) => {
+                    let arr = []
                     return ( <div style = {
                         {
-                          "display": "flex",
-                          "flex-wrap": "wrap"
+                          whiteSpace: 'normal'
                         }
                       } > {
-                        row._names ?
-                        row._names.map(item => {
-                            return ( <div> {
-                                item.group_name ?
-                                // 小组
-                                <div style = {
-                                  {
-                                    "display": "flex"
-                                  }
-                                } > <div> {
-                                  item.group_name
-                                }： </div> <
-                                div style = {
-                                  {
-                                    "display": "flex",
-                                    "flex-wrap": "wrap"
-                                  }
-                                } > {
-                                  item.details.map(detail => {
-                                    return ( <el-tag style = {
-                                        {
-                                          'margin': '0 5px 5px 0'
-                                        }
-                                      }
-                                      type = {
-                                        detail.hasDetail ? '' : 'info'
-                                      } > {
-                                        detail.name
-                                      } </el-tag>
-                                    )
-                                  })
-                                } </div> <
-                                /div> :
-                                  '无'
-                                // 其他
-                                // <el-tag style={{'margin':'0 5px 5px 0'}} type={item.hasDetail?'':'info'}>{item.name}</el-tag>
-                              } </div>)
-                            }): '无'
-                        } </div>)
-                      }
-                    }, {
-                      label: "检查日期",
-                      prop: 'date',
-                      width: 110,
-                    }, {
-                      label: "检查站点/地点",
-                      prop: 'site.name',
-                      align: 'left',
-                      width: 120,
-                      formatter: (cell, data, value, index) => {
-                        if (cell.site) {
-                          return cell.site.name
-                        } else {
-                          return cell.address
+                        row.files.length > 0 ?
+                        row.files.map(item => {
+                          arr.push(item.url)
+                        }) : ''
+                      } {
+                        arr.length > 0 ?
+                          <el-image
+                        style = {
+                          {
+                            width: '60px',
+                            height: '60px'
+                          }
                         }
+                        src = {
+                          arr[0]
+                        }
+                        preview-src-list = {
+                            arr
+                          }>
+                          </el-image>:''
                       }
-                    }, {
-                      label: "问题描述",
-                      prop: 'ask_introduce',
-                      align: 'left',
-                      width: 180
-                    }, {
-                      label: "问题类型",
-                      prop: 'ask.value',
-                      width: 80,
-                    }, {
-                      label: "问题图片",
-                      prop: 'files',
-                      width: 80,
-                      customFn: (row) => {
-                        let arr = []
-                        return ( <div style = {
-                            {
-                              whiteSpace: 'normal'
-                            }
-                          } > {
-                            row.files.length > 0 ?
-                            row.files.map(item => {
-                              arr.push(item.url)
-                            }) : ''
-                          } {
-                            arr.length > 0 ?
-                              <el-image
-                            style = {
-                              {
-                                width: '60px',
-                                height: '60px'
-                              }
-                            }
-                            src = {
-                              arr[0]
-                            }
-                            preview-src-list = {
-                                arr
-                              }>
-                              </el-image>:''
-                          }
 
-                          </div>)
-                        }
-                      },
-                      {
-                        label: "责任科室",
-                        prop: 'ask_department',
-                        width: 300,
-                        customFn: (row) => {
+                      </div>)
+                    }
+                  },
+                  {
+                    label: "责任科室",
+                    prop: 'ask_department',
+                    width: 300,
+                    customFn: (row) => {
 
-                          return ( <div style = {
-                            {
-                              'display': 'flex',
-                              'flex-wrap': 'wrap',
-                              // 'width':'400px'
-                            }
-                          } > {
-                            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 ?
+                      return ( <div style = {
+                        {
+                          'display': 'flex',
+                          'flex-wrap': 'wrap',
+                          // 'width':'400px'
+                        }
+                      } > {
+                        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>)
-                            }
-                          }]
+                            row.accept_admin_ids_details.map(item => {
+                              return ( <el-tag style = {
+                                  {
+                                    'margin': '3px'
+                                  }
+                                } > {
+                                  item.name
+                                } </el-tag>)
+                              }): row.ask_department)
+                          } </div>)
                         }
-                      },
-                      created() {
-                        this.stateObj = state.state
-                        this.uploadOther.token = getToken();
-                        this.login_id = state.state.login_id
-                        this.department_id = state.state.department_id
-                        this.getUnitTypeList()
-                      },
-                      methods: {
-                        checkUnits(id, type) {
-                          console.log("123")
-                          this.id = id
-                          this.type = type
-                          this.url_type = this.url_type
-                          this.isShow = true
-                        },
-                        print() {
-                          this.$Print('#printunit');
-                        },
-                        openLogs(){
-                          this.$refs.showLogs.typeName = this.showform.name
-                          this.$refs.showLogs.id = this.showform.id
-                          this.$refs.showLogs.isShow = true
-                        },
-                        // 我的任务中的操作
-                        openMyMission(remark, e) {
-                          switch (remark) {
-                            case '检查':
-                              this.addPatrol(e)
-                              break;
-                            case '学习':
-                              this.type = 'study'
-                              break;
-                            case '答题':
-                              this.openAnswers(e)
-                              break;
-                            case '培训':
-                              this.type = 'train'
-                              break;
-                            case '资料收集':
-                            case '方案':
-                              this.type = 'uploads'
-                              break;
-                            // case '方案':
-                            //   this.openCases(e)
-                            //   break;
+                      }]
+              }
+            },
+            created() {
+              this.stateObj = state.state
+              this.uploadOther.token = getToken();
+              this.login_id = state.state.login_id
+              this.department_id = state.state.department_id
+              this.getUnitTypeList()
+            },
+            methods: {
+              checkUnits(id, type) {
+                console.log("123")
+                this.id = id
+                this.type = type
+                this.url_type = this.url_type
+                this.isShow = true
+              },
+              print() {
+                this.$Print('#printunit');
+              },
+              openLogs(){
+                this.$refs.showLogs.typeName = this.showform.name
+                this.$refs.showLogs.id = this.showform.id
+                this.$refs.showLogs.isShow = true
+              },
+              // 我的任务中的操作
+              openMyMission(remark, e) {
+                switch (remark) {
+                  case '检查':
+                    this.addPatrol(e)
+                    break;
+                  case '学习':
+                    this.type = 'study'
+                    break;
+                  case '答题':
+                    this.openAnswers(e)
+                    break;
+                  case '培训':
+                    this.type = 'train'
+                    break;
+                  case '资料收集':
+                  case '方案':
+                    this.type = 'uploads'
+                    break;
+                  // case '方案':
+                  //   this.openCases(e)
+                  //   break;
 
-                          }
-                        },
-                        addPatrol(scope) {
-                          this.$refs['addPatrol'].login_id = this.stateObj.login_id
-                          this.$refs['addPatrol'].department_id = this.stateObj.department_id
-                          this.$refs['addPatrol'].mission_id = scope.id
-                          this.$refs['addPatrol'].isShow = true
-                          this.$refs['addPatrol'].type = 'add'
-                        },
-                        openAnswers(scope) {
-                          this.$refs['answerQuestion'].mission_id = scope.id
-                          this.$refs['answerQuestion'].askList = scope.ask
-                          this.$refs['answerQuestion'].isShow = true
-                        },
-                        changeRate(e) {
-                          console.log("e", e)
-                          if (e == 5) {
-                            this.rateValue = '优秀'
-                          } else if (e == 4 || e == 4.5) {
-                            this.rateValue = '良好'
-                          } else if (e == 0.5 || e == 1) {
-                            this.rateValue = '差'
-                          } else if (e == 1.5 || e == 2) {
-                            this.rateValue = '较差'
-                          } else if (e == 2.5 || e == 3.5) {
-                            this.rateValue = '一般'
-                          }
-                        },
-                        async getDetail() {
-                          let res = await get(this.id)
-                          console.log(res)
-                          this.form = {
-                            mission_name: '',
-                            audit_status: res.audit_status ? res.audit_status : 1,
-                            showlist: '',
-                            trainlist: '',
-                            uploadslist: '',
-                            studylist: '',
-                            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 : '',
-                            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,
+                }
+              },
+              addPatrol(scope) {
+                this.$refs['addPatrol'].login_id = this.stateObj.login_id
+                this.$refs['addPatrol'].department_id = this.stateObj.department_id
+                this.$refs['addPatrol'].mission_id = scope.id
+                this.$refs['addPatrol'].isShow = true
+                this.$refs['addPatrol'].type = 'add'
+              },
+              openAnswers(scope) {
+                this.$refs['answerQuestion'].mission_id = scope.id
+                this.$refs['answerQuestion'].askList = scope.ask
+                this.$refs['answerQuestion'].isShow = true
+              },
+              changeRate(e) {
+                console.log("e", e)
+                if (e == 5) {
+                  this.rateValue = '优秀'
+                } else if (e == 4 || e == 4.5) {
+                  this.rateValue = '良好'
+                } else if (e == 0.5 || e == 1) {
+                  this.rateValue = '差'
+                } else if (e == 1.5 || e == 2) {
+                  this.rateValue = '较差'
+                } else if (e == 2.5 || e == 3.5) {
+                  this.rateValue = '一般'
+                }
+              },
+              async getDetail() {
+                let res = await get(this.id)
+                console.log(res)
+                this.form = {
+                  mission_name: '',
+                  audit_status: res.audit_status ? res.audit_status : 1,
+                  showlist: '',
+                  trainlist: '',
+                  uploadslist: '',
+                  studylist: '',
+                  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 : '',
+                  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 = []
-                          let group_details = []
-                          if (res.groups.length > 0) {
-                            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 = []
+                let group_details = []
+                if (res.groups.length > 0) {
+                  for (var g of res.groups) {
+                    this.mission_groups_list.push({
+                      name: g.name,
+                      type: g.type,
+                      link_id: g.link_id
+                    })
+                  }
 
-                            this.showform.group_details = contactGroup(res.groups)
-                          }
-                          console.log(this.showform.group_details, this.mission_groups_list)
-                          // 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
-                          this.is_what_unitType = res.unit_type_detail ? res.unit_type_detail.value : ''
-                          if (this.type == 'show') {
-                            switch (this.is_what_unitType) {
-                              case '检查':
-                                this.getInspection()
-                                break;
-                              case '学习':
-                                this.getStudy()
-                                break;
-                              case '答题':
-                                this.getAskLog()
-                                break;
-                              case '培训':
-                                this.getTrain()
-                                break;
-                              case '资料收集':
-                              case '方案':
-                                this.getUploads()
-                                break;
-                            }
-                          }
+                  this.showform.group_details = contactGroup(res.groups)
+                }
+                console.log(this.showform.group_details, this.mission_groups_list)
+                // 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
+                this.is_what_unitType = res.unit_type_detail ? res.unit_type_detail.value : ''
+                if (this.type == 'show') {
+                  switch (this.is_what_unitType) {
+                    case '检查':
+                      this.getInspection()
+                      break;
+                    case '学习':
+                      this.getStudy()
+                      break;
+                    case '答题':
+                      this.getAskLog()
+                      break;
+                    case '培训':
+                      this.getTrain()
+                      break;
+                    case '资料收集':
+                    case '方案':
+                      this.getUploads()
+                      break;
+                  }
+                }
 
-                        },
-                        async getAskLog() {
-                          const res = await listasklog({
-                            mission_id: this.id,
-                            page: 1,
-                            page_size: 999
+              },
+              async getAskLog() {
+                const res = await listasklog({
+                  mission_id: this.id,
+                  page: 1,
+                  page_size: 999
+                })
+                this.ask_log = res.data
+              },
+              openAnswer(arr, correct, range) {
+                this.$refs.answerQuestion.askList = arr
+                this.$refs.answerQuestion.isSubmit = true
+                this.$refs.answerQuestion.correct = correct
+                this.$refs.answerQuestion.range = range
+                this.$refs.answerQuestion.isShow = true
+              },
+              async getInspection() {
+                const res = await listpatrol({
+                  mission_id: this.id,
+                  page: 1,
+                  page_size: 999
+                })
+                for (var k of res.data) {
+                  var _names = []
+                  // 小组
+                  if (this.showform.groups && this.showform.groups.length > 0) {
+                    for (var g of this.showform.groups) {
+                      if (g.type == 1) {
+
+                        if (g.link_id.indexOf(k.up_admin.id) > -1) {
+                          _names.push({
+                            group_name: g.name,
+                            details: g.details
                           })
-                          this.ask_log = res.data
-                        },
-                        openAnswer(arr, correct, range) {
-                          this.$refs.answerQuestion.askList = arr
-                          this.$refs.answerQuestion.isSubmit = true
-                          this.$refs.answerQuestion.correct = correct
-                          this.$refs.answerQuestion.range = range
-                          this.$refs.answerQuestion.isShow = true
-                        },
-                        async getInspection() {
-                          const res = await listpatrol({
-                            mission_id: this.id,
-                            page: 1,
-                            page_size: 999
+                        }
+                      }
+                      if (g.type == 2) {
+                        if (g.link_id.indexOf(k.up_admin.department_id) > -1) {
+                          _names.push({
+                            group_name: g.name,
+                            details: g.details
                           })
-                          for (var k of res.data) {
-                            var _names = []
-                            // 小组
-                            if (this.showform.groups && this.showform.groups.length > 0) {
-                              for (var g of this.showform.groups) {
-                                if (g.type == 1) {
-
-                                  if (g.link_id.indexOf(k.up_admin.id) > -1) {
-                                    _names.push({
-                                      group_name: g.name,
-                                      details: g.details
-                                    })
-                                  }
-                                }
-                                if (g.type == 2) {
-                                  if (g.link_id.indexOf(k.up_admin.department_id) > -1) {
-                                    _names.push({
-                                      group_name: g.name,
-                                      details: g.details
-                                    })
-                                  }
-                                }
-                              }
-                              k._names = _names
-                            }
+                        }
+                      }
+                    }
+                    k._names = _names
+                  }
 
-                            console.log(k._names)
+                  console.log(k._names)
 
-                          }
+                }
 
 
 
-                          this.inspection_log = res.data
+                this.inspection_log = res.data
 
-                        },
-                        async getUnitTypeList() {
-                          const res = await getparameteritem('unitTypeList')
-                          this.unitTypeList = res.detail
-                        },
-                        async getTrain() {
-                          const res = await listtrain({
-                            mission_id: this.id,
-                            page: 1,
-                            page_size: 999
-                          })
-                          this.train_log = res.data
-                        },
-                        async getUploads() {
-                         let ids = ''
-                          if(this.showform.pid_details&&this.showform.pid_details.length>0){
-                         							   this.showform.pid_details.map((item)=>{
-                         								   ids = item.id +','
-                         							   })
-                          }
+              },
+              async getUnitTypeList() {
+                const res = await getparameteritem('unitTypeList')
+                this.unitTypeList = res.detail
+              },
+              async getTrain() {
+                const res = await listtrain({
+                  mission_id: this.id,
+                  page: 1,
+                  page_size: 999
+                })
+                this.train_log = res.data
+              },
+              async getUploads() {
+               let ids = ''
+                if(this.showform.pid_details&&this.showform.pid_details.length>0){
+                               this.showform.pid_details.map((item)=>{
+                                 ids = item.id +','
+                               })
+                }
 
-                         console.log("ids",ids)
-                         const res = await listuploads({
-                           mission_id: ids+this.id,
-                            page: 1,
-                            page_size: 999,
-                            sort_name: 'created_at',
-                            sort_type: 'DESC'
-                          })
-                          this.uploads_log = res.data
-                        },
-                        async getStudy() {
-                          const res = await liststudy({
-                            mission_id: this.id,
-                            page: 1,
-                            page_size: 999
-                          })
-                          this.study_log = res.data
-                        },
-                        openStudy(url, name) {
-                          this.studyurl = url
-                          this.studytitle = name
-                          this.studytime
-                          this.$refs.viewFile.studytype = 'study'
-                          this.$refs.viewFile.needStudyTime = this.showform.study_time
-                          this.$refs.viewFile.diaShow = true
-                        },
-                        editorUnit(id, type, formtype) {
-                          console.log(id,type)
-                          if (id) {
-                            this.$refs.addUnit.id = id
-                          }
-                          this.$refs.addUnit.type = type
-                          this.$refs.addUnit.department_id = this.stateObj.department_id
-                          this.$refs.addUnit.isShow = true
-                        },
-                        studytime(e) {
-                          console.log("e", e)
-                          if (!this.studyForm.my_study_time) {
-                            this.studyForm.my_study_time = 0
-                          }
-                          this.studyForm.my_study_time = parseInt(this.studyForm.my_study_time) + e
-                        },
-                        handleRemove(file, fileList) {
-                          this.my_uploads_list = fileList
-                        },
-                        handlesuccess(response, file, fileList) {
-                          this.my_uploads_list = fileList
-                        },
-                        submitFeedback() {
-                          if (this.type == 'train') {
-                            if (!this.trainForm.train_score) {
-                              Message({
-                                type: 'warning',
-                                message: '请提交培训评价'
-                              })
-                              return
-                            }
-                            savetrain({
-                              mission_id: this.id,
-                              ...this.trainForm
-                            }).then(res => {
-                              Message({
-                                type: 'success',
-                                message: '提交成功'
-                              })
-                              updatemission({
-                                id: this.id
-                              }).then(r => {
-                                this.isShow = false
-                                this.$emit('refresh')
-                              })
-                              saveLog({
-                                table_name:"missions_logs",
-                                mission_id:this.id,
-                                mission_name:this.showform.name,
-                                op_name:'执行培训任务',
-                                remark:''
-                              }).then(res=>{
-                              })
-                            })
-                          } else if (this.type == 'study') {
-                            console.log(this.trainForm)
-                            if (!this.studyForm.my_study_time || this.studyForm.my_study_time === 0) {
-                              Message({
-                                type: 'warning',
-                                message: '请先学习'
-                              })
-                              return
-                            } else {
-                              if (this.studyForm.my_study_time < this.showform.study_time) {
-                                Message({
-                                  type: 'warning',
-                                  message: '当前学习时长不足，请继续学习'
-                                })
-                                return
-                              }
-                            }
-                            savestudy({
-                              mission_id: this.id,
-                              ...this.studyForm
-                            }).then(res => {
-                              Message({
-                                type: 'success',
-                                message: '提交成功'
-                              })
-                              updatemission({
-                                id: this.id
-                              }).then(r => {
-                                this.isShow = false
-                                this.$emit('refresh')
-                              })
-                              saveLog({
-                                table_name:"missions_logs",
-                                mission_id:this.id,
-                                mission_name:this.showform.name,
-                                op_name:'执行学习任务',
-                                remark:''
-                              }).then(res=>{
-                              })
-                            })
-                          } else if (this.type == 'uploads') {
-                            let _files = []
-                            if (this.my_uploads_list.length > 0) {
-                              for (var h of this.my_uploads_list) {
-                                if (h.response) {
-                                  _files.push(h.response.id)
-                                } else {
-                                  _files.push(h.id)
-                                }
-                              }
-                              this.uploadsForm.my_uploads = _files
-                            } else {
-                              this.uploadsForm.my_uploads = []
-                              Message({
-                                type: 'warning',
-                                message: '请上传资料'
-                              })
-                              return
-                            }
-                            saveuploads({
-                              mission_id: this.id,
-                              ...this.uploadsForm
-                            }).then(res => {
-                              Message({
-                                type: 'success',
-                                message: '提交成功'
-                              })
-                              updatemission({
-                                id: this.id
-                              }).then(r => {
-                                this.isShow = false
-                                this.$emit('refresh')
-                              })
-                              saveLog({
-                                table_name:"missions_logs",
-                                mission_id:this.id,
-                                mission_name:this.showform.name,
-                                op_name:`执行${this.is_what_unitType}任务`,
-                                remark:''
-                              }).then(res=>{
-                              })
-
+               console.log("ids",ids)
+               const res = await listuploads({
+                 mission_id: ids+this.id,
+                  page: 1,
+                  page_size: 999,
+                  sort_name: 'created_at',
+                  sort_type: 'DESC'
+                })
+                this.uploads_log = res.data
+              },
+              async getStudy() {
+                const res = await liststudy({
+                  mission_id: this.id,
+                  page: 1,
+                  page_size: 999
+                })
+                this.study_log = res.data
+              },
+              openStudy(url, name) {
+                this.studyurl = url
+                this.studytitle = name
+                this.studytime
+                this.$refs.viewFile.studytype = 'study'
+                this.$refs.viewFile.needStudyTime = this.showform.study_time
+                this.$refs.viewFile.diaShow = true
+              },
+              editorUnit(id, type, formtype) {
+                console.log(id,type)
+                if (id) {
+                  this.$refs.addUnit.id = id
+                }
+                this.$refs.addUnit.type = type
+                this.$refs.addUnit.department_id = this.stateObj.department_id
+                this.$refs.addUnit.isShow = true
+              },
+              studytime(e) {
+                console.log("e", e)
+                if (!this.studyForm.my_study_time) {
+                  this.studyForm.my_study_time = 0
+                }
+                this.studyForm.my_study_time = parseInt(this.studyForm.my_study_time) + e
+              },
+              handleRemove(file, fileList) {
+                this.my_uploads_list = fileList
+              },
+              handlesuccess(response, file, fileList) {
+                this.my_uploads_list = fileList
+              },
+              submitFeedback() {
+                if (this.type == 'train') {
+                  if (!this.trainForm.train_score) {
+                    Message({
+                      type: 'warning',
+                      message: '请提交培训评价'
+                    })
+                    return
+                  }
+                  savetrain({
+                    mission_id: this.id,
+                    ...this.trainForm
+                  }).then(res => {
+                    Message({
+                      type: 'success',
+                      message: '提交成功'
+                    })
+                    updatemission({
+                      id: this.id
+                    }).then(r => {
+                      this.isShow = false
+                      this.$emit('refresh')
+                    })
+                    saveLog({
+                      table_name:"missions_logs",
+                      mission_id:this.id,
+                      mission_name:this.showform.name,
+                      op_name:'执行培训任务',
+                      remark:''
+                    }).then(res=>{
+                    })
+                  })
+                } else if (this.type == 'study') {
+                  console.log(this.trainForm)
+                  if (!this.studyForm.my_study_time || this.studyForm.my_study_time === 0) {
+                    Message({
+                      type: 'warning',
+                      message: '请先学习'
+                    })
+                    return
+                  } else {
+                    if (this.studyForm.my_study_time < this.showform.study_time) {
+                      Message({
+                        type: 'warning',
+                        message: '当前学习时长不足，请继续学习'
+                      })
+                      return
+                    }
+                  }
+                  savestudy({
+                    mission_id: this.id,
+                    ...this.studyForm
+                  }).then(res => {
+                    Message({
+                      type: 'success',
+                      message: '提交成功'
+                    })
+                    updatemission({
+                      id: this.id
+                    }).then(r => {
+                      this.isShow = false
+                      this.$emit('refresh')
+                    })
+                    saveLog({
+                      table_name:"missions_logs",
+                      mission_id:this.id,
+                      mission_name:this.showform.name,
+                      op_name:'执行学习任务',
+                      remark:''
+                    }).then(res=>{
+                    })
+                  })
+                } else if (this.type == 'uploads') {
+                  let _files = []
+                  if (this.my_uploads_list.length > 0) {
+                    for (var h of this.my_uploads_list) {
+                      if (h.response) {
+                        _files.push(h.response.id)
+                      } else {
+                        _files.push(h.id)
+                      }
+                    }
+                    this.uploadsForm.my_uploads = _files
+                  } else {
+                    this.uploadsForm.my_uploads = []
+                    Message({
+                      type: 'warning',
+                      message: '请上传资料'
+                    })
+                    return
+                  }
+                  saveuploads({
+                    mission_id: this.id,
+                    ...this.uploadsForm
+                  }).then(res => {
+                    Message({
+                      type: 'success',
+                      message: '提交成功'
+                    })
+                    updatemission({
+                      id: this.id
+                    }).then(r => {
+                      this.isShow = false
+                      this.$emit('refresh')
+                    })
+                    saveLog({
+                      table_name:"missions_logs",
+                      mission_id:this.id,
+                      mission_name:this.showform.name,
+                      op_name:`执行${this.is_what_unitType}任务`,
+                      remark:''
+                    }).then(res=>{
+                    })
 
-                            })
 
-                          }
+                  })
 
-                        },
-                        submitCheck() {
-                          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: '审核成功'
-                            })
-                            updatemission({
-                              id: this.id
-                            })
-                            this.isShow = false
-                            this.$emit('refresh')
-                          })
-                        },
-                      },
-                      watch: {
-                        isShow(newVal) {
-                          if (newVal) {
-                            console.log("type", this.type)
-                            console.log("url_type",this.url_type)
-                            this.getDetail()
-                          } else {
-                            this.id = ''
-                            this.type = ''
-                            this.pictureList = []
-                            this.my_uploads_list = []
-                            this.uploadsForm = {}
-                            this.trainForm = {}
-                            this.studyForm = {}
-                            this.studytitle = '',
-                              this.studyurl = '',
-                              this.is_what_unitType = ''
-                              this.url_type = ''
-                            this.mission_groups_list = [{
-                              name: '',
-                              type: 1,
-                              link_id: []
-                            }]
-                            this.$refs['dialog'].reset()
-                          }
-                        }
-                      }
+                }
 
+              },
+              submitCheck() {
+                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: '审核成功'
+                  })
+                  updatemission({
+                    id: this.id
+                  })
+                  this.isShow = false
+                  this.$emit('refresh')
+                })
+              },
+            },
+            watch: {
+              isShow(newVal) {
+                if (newVal) {
+                  console.log("type", this.type)
+                  console.log("url_type",this.url_type)
+                  this.getDetail()
+                } else {
+                  this.id = ''
+                  this.type = ''
+                  this.pictureList = []
+                  this.my_uploads_list = []
+                  this.uploadsForm = {}
+                  this.trainForm = {}
+                  this.studyForm = {}
+                  this.studytitle = '',
+                    this.studyurl = '',
+                    this.is_what_unitType = ''
+                    this.url_type = ''
+                  this.mission_groups_list = [{
+                    name: '',
+                    type: 1,
+                    link_id: []
+                  }]
+                  this.$refs['dialog'].reset()
+                }
+              }
+            }
+
+          }
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/task/list/plan.vue b/src/views/task/list/plan.vue
index b3e634c..92e67b2 100644
--- a/src/views/task/list/plan.vue
+++ b/src/views/task/list/plan.vue
@@ -4,12 +4,12 @@
       <lx-header icon="md-apps" :text="textName" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
         <slot>
           <div style="display: flex;justify-content: flex-start;flex-wrap: wrap;">
-            <!-- <Select filterable clearable style='width:200px;margin-right: 10px;' v-model="select.status"
-              placeholder="计划状态">
-              <Option v-for="item in statusList" :value="item.id">{{item.value}}</Option>
-            </Select> -->
             <DatePicker v-model="select.year" style='width:200px;margin-right: 10px;' placeholder="年份"
               placement="bottom" format='yyyy' type="year" @on-change="changeYear"></DatePicker>
+            <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>
             <Input v-model="select.keyword" clearable style="width: 200px;margin-right: 10px;" placeholder="关键字搜索" />
             <Button type="primary" @click="getList">查询</Button>
           </div>
@@ -39,7 +39,7 @@
                 </div>
                 <div  v-if="scope.row.audit_status==1">
                   <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
-                    @click="editUnit(scope.row,1)">发布任务</Button>
+                    @click="editUnit(scope.row,1,'plan_unit')">发布任务</Button>
                 </div>
                 <div v-if="scope.row.audit_status!=0">
                   <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
@@ -79,7 +79,8 @@
         select: {
           keyword: '',
           page: 1,
-          page_size: 10,
+          page_size: 10,
+          audit_status:'',
           // is_myself_audit:0,
           year: '',
           plan_type: '',
@@ -181,11 +182,13 @@
         console.log(e)
         this.select.year = e
       },
-      editUnit(row,type){
+      editUnit(row,type,plan_unit){
         this.$refs.addUnit.type="add"
         this.$refs.addUnit.setoutLineId(row.out_line_id)
         this.$refs.addUnit.setMissionPlanId(row.id)
         this.$refs.addUnit.setType(type)
+        this.$refs.addUnit.setPlanUnit(plan_unit)
+
         this.$refs.addUnit.setNameContent(row.name,row.content)
         this.$refs.addUnit.setMenuLevel(row.menu,row.level,row.menu_id,row.level_id)
         this.$refs.addUnit.setMainId(row.main_department_id,row.main_admin_id)
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index 4e99be6..8319cea 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -49,13 +49,13 @@
     </div>
 
     <div class="tablewrap">
-      <div class="tablemonth" v-if="showSelectMonth">
+      <!-- <div class="tablemonth" v-if="showSelectMonth">
         <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
         <div style="margin: 15px 0;"></div>
         <el-checkbox-group v-model="selectMonth" @change="changeMonth">
           <el-checkbox v-for="item in allMonths" :label="item.id">{{item.value}}</el-checkbox>
         </el-checkbox-group>
-      </div>
+      </div> -->
 
       <div class="tablecontent" :style="{'width':showSelectMonth?'89%':'100%'}">
         <div>
@@ -99,66 +99,50 @@
                     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>
@@ -168,8 +152,6 @@
                           @click="openMyMission(item.value,scope.row)">执行任务</Button>
                       </div>
                     </div>
-
-
                   </div>
                   <!-- 直接 执行任务 -->
                   <div v-else>
@@ -464,8 +446,8 @@
           let currentMonth = (new Date()).getMonth() + 1 < 10 ? "0" + ((new Date()).getMonth() + 1) : (new Date())
             .getMonth() + 1
           // this.selectMonth.push(currentMonth)
-          this.selectMonth.push(currentMonth)
-          this.select.month = currentMonth
+          // this.selectMonth.push(currentMonth)
+          // this.select.month = currentMonth
           if (this.$route.path) {
             let path = this.$route.path.split("_")
             this.select.type = path[1]
@@ -489,10 +471,10 @@
             }
             if (path[1] == 4) {
               this.selectMonth = []
-              this.allMonths.map(item=>{
-                this.selectMonth.push(item.id)
-              })
-              this.select.month = this.selectMonth.join(',')
+              // this.allMonths.map(item=>{
+              //   this.selectMonth.push(item.id)
+              // })
+              // this.select.month = this.selectMonth.join(',')
               this.select.type = 4
               this.type_name = '专项专题任务'
               this.path_type = path[1]
@@ -505,7 +487,7 @@
               })
             }
             if (path[1] == 1) {
-              this.showSelectMonth = true
+              this.showSelectMonth = false
               this.select.type = 1
               // this.select.pid = ''
               // this.treeProps = {children: 'nochildren', hasChildren: 'hasChildren' }