From 095318aa6f911bf6ab08484c227976a2952eaead Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 17 Mar 2026 13:12:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E7=BA=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/list/components/addOutline.vue | 248 ++++++-----
 .../task/list/components/showOutline.vue      |  18 +-
 .../task/list/components/showPlanoutline.vue  | 384 +++++++++---------
 src/views/task/list/outline.vue               | 190 +++++----
 4 files changed, 449 insertions(+), 391 deletions(-)

diff --git a/src/views/task/list/components/addOutline.vue b/src/views/task/list/components/addOutline.vue
index 8a7234f..a4a67df 100644
--- a/src/views/task/list/components/addOutline.vue
+++ b/src/views/task/list/components/addOutline.vue
@@ -72,13 +72,35 @@
           </div>
         </div>
       </template>
+      <template v-slot:work_content>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>工作内容：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.work_content" type="textarea" :rows="8" placeholder="请输入工作内容" clearable
+              style="width: 400px;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:work_require>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label" style="font-weight: bold">
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>要求：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.work_require" type="textarea" :rows="8" placeholder="请输入要求" clearable
+              style="width: 400px;"></el-input>
+          </div>
+        </div>
+      </template>
       <template v-slot:content>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>主要内容：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>主要工作：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.content" type="textarea" :rows="8" placeholder="请输入主要内容" clearable
+            <el-input v-model="form.content" type="textarea" :rows="8" placeholder="请输入主要工作" clearable
               style="width: 400px;"></el-input>
           </div>
         </div>
@@ -86,10 +108,10 @@
       <template v-slot:require>
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
-            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>工作要求：
+            <span style="color: red;font-weight: bold;padding-right: 4px;"></span>工作步骤：
           </div>
           <div class="xy-table-item-content">
-            <el-input v-model="form.require" type="textarea" :rows="8" placeholder="请输入工作要求" clearable
+            <el-input v-model="form.require" type="textarea" :rows="8" placeholder="请输入工作步骤" clearable
               style="width: 400px;"></el-input>
           </div>
         </div>
@@ -151,14 +173,14 @@
           </div>
         </div>
       </template>
-       <template v-slot:footerContent>
-         <Button type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">确认</Button>
-         <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
-
-         <Poptip v-if="type=='editor'" transfer confirm title="确认要删除吗？" @on-ok="deleteList">
-
-           <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;'>删除</Button>
-         </Poptip>
+       <template v-slot:footerContent>
+         <Button type="primary" style='margin-left:5px;margin-bottom:5px;' @click="submit">确认</Button>
+         <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
+
+         <Poptip v-if="type=='editor'" transfer confirm title="确认要删除吗？" @on-ok="deleteList">
+
+           <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;'>删除</Button>
+         </Poptip>
 
       </template>
 
@@ -173,14 +195,14 @@
   } from 'element-ui'
   import {
     show,
-    save,
+    save,
     destroy
   } from '@/api/task/newplan.js'
   import {
     listdept
   } from "@/api/system/department.js"
-  import {
-    listregulation
+  import {
+    listregulation
   } from "@/api/lawsfile/regulation.js";
   export default {
     components: {
@@ -190,9 +212,9 @@
       return {
         isShow: false,
         type: 'add',
-        id: '',
+        id: '',
         menuSort:0,
-        form: {
+        form: {
           mission_plan_id:'',
           name: '',
           year: '',
@@ -201,6 +223,8 @@
           period: '',
           end_time: '',
           end_time_explain: '',
+          work_content: '',
+          work_require: '',
           content: '',
           require: '',
 
@@ -209,9 +233,9 @@
           join_dep_id: '',
           join_dep_explain: '',
           flow: '',
-          resource: '',
-          sort:0,
-          menu_id:'',
+          resource: '',
+          sort:0,
+          menu_id:'',
           level_id:''
 
         },
@@ -221,81 +245,81 @@
         menuList: [],
         levelList: [],
         rules: {
-          name: [{
-            required: true,
-            message: '请输入大纲条目名称'
-          }],
-          year: [{
-            required: true,
-            message: '请输入大纲条目年份'
-          }],
-          menu: [{
-            required: true,
-            message: '请选择工作项目'
-          }],
-          level: [{
-            required: true,
-            message: '请选择性质级别'
-          }],
-          period: [{
-            required: true,
-            message: '请输入工作周期'
-          }],
-          end_time: [{
-            required: true,
-            message: '请输入完成时间'
+          name: [{
+            required: true,
+            message: '请输入大纲条目名称'
+          }],
+          year: [{
+            required: true,
+            message: '请输入大纲条目年份'
+          }],
+          menu: [{
+            required: true,
+            message: '请选择工作项目'
+          }],
+          level: [{
+            required: true,
+            message: '请选择性质级别'
+          }],
+          period: [{
+            required: true,
+            message: '请输入工作周期'
+          }],
+          end_time: [{
+            required: true,
+            message: '请输入完成时间'
           }],
         }
       }
     },
     created() {
-      this.loadDeptOptions()
+      this.loadDeptOptions()
       this.getMenus()
     },
-    methods: {
-      setMissionId(e){
-        if(e){
-          this.form.mission_plan_id = e
-        }
-      },
-      setName(e){
-        if(e){
-          this.form.name = e
-        }
-      },
-      async getMenus(){
-        var that = this;
-        await listregulation(1, 20).then(res => {
-          this.menuList = res
-        }).catch(error => {
-          console.log(error)
-        })
+    methods: {
+      setMissionId(e){
+        if(e){
+          this.form.mission_plan_id = e
+        }
+      },
+      setName(e){
+        if(e){
+          this.form.name = e
+        }
+      },
+      async getMenus(){
+        var that = this;
+        await listregulation(1, 20).then(res => {
+          this.menuList = res
+        }).catch(error => {
+          console.log(error)
+        })
       },
       changeMenu(e) {
-        if (e) {
-          this.form.level = ''
+        if (e) {
+          this.form.level = ''
           this.form.level_id = ''
           this.menuList.map(item => {
-            if (e === item.name) {
+            if (e === item.name) {
               this.form.menu_id = item.id
-              this.levelList = item.children ? item.children: [],
+              this.levelList = item.children ? item.children: [],
               this.menuSort = item.sort
             }
           })
         }
-      },
-      changeLevel(e){
-        let sort = 0
-        if(e){
-          this.levelList.map((item,index)=>{
-            if(e===item.name){
-              sort = item.sort
-              this.form.level_id = item.id
-            }
-          })
-          this.form.sort = this.menuSort +'' +sort
-          console.log(this.form.sort)
-        }
+      },
+      changeLevel(e){
+        let sort = 0
+        if(e){
+          this.levelList.map((item,index)=>{
+            if(e===item.name){
+              sort = item.sort
+              this.form.level_id = item.id
+            }
+          })
+          this.form.sort = this.menuSort +'' +sort
+          console.log(this.form.sort)
+        }
       },
       // 选择科室
       loadDeptOptions() {
@@ -354,12 +378,12 @@
       submit() {
         if (this.id) {
           this.form.id = this.id
-        }
-         console.log(this.form)
-        if(this.type=='add'){
-          this.form.id = ''
-          console.log(this.form)
-          // return
+        }
+         console.log(this.form)
+        if(this.type=='add'){
+          this.form.id = ''
+          console.log(this.form)
+          // return
         }
         save({
           table_name: 'new_plans',
@@ -372,27 +396,27 @@
           this.isShow = false
           this.$emit('refresh')
         })
-      },
-      deleteList() {
-        var that = this;
-          destroy({
-            id: this.id,
-            table_name: 'new_plans'
-          }).then(response => {
-            this.$Message.success('操作成功');
-            this.isShow = false
-            this.$emit('refresh')
-          }).catch(error => {
-            console.log(error)
-            reject(error)
-          })
+      },
+      deleteList() {
+        var that = this;
+          destroy({
+            id: this.id,
+            table_name: 'new_plans'
+          }).then(response => {
+            this.$Message.success('操作成功');
+            this.isShow = false
+            this.$emit('refresh')
+          }).catch(error => {
+            console.log(error)
+            reject(error)
+          })
       },
       getDetail() {
         show({
           id: this.id,
           table_name: 'new_plans',
         }).then(res => {
-          this.form = {
+          this.form = {
             mission_plan_id:res?.mission_plan_id,
             name: res?.name,
             year: res ? res.year + '' : '',
@@ -401,6 +425,8 @@
             period: res?.period,
             end_time: res?.end_time,
             end_time_explain: res?.end_time_explain,
+            work_content: res?.work_content,
+            work_require: res?.work_require,
             content: res?.content,
             require: res?.require,
 
@@ -409,15 +435,15 @@
             join_dep_id: res ? res.join_dep_id : [],
             join_dep_explain: res?.join_dep_explain,
             flow: res?.flow,
-            resource: res?.resource,
-            sort:res.sort?res.sort:0,
-            menu_id:res?.menu_id,
+            resource: res?.resource,
+            sort:res.sort?res.sort:0,
+            menu_id:res?.menu_id,
             level_id:res?.level_id
-          }
-          this.menuList.map(item=>{
-            if(this.form.menu==item.name){
-              this.levelList = item.children
-            }
+          }
+          this.menuList.map(item=>{
+            if(this.form.menu==item.name){
+              this.levelList = item.children
+            }
           })
         })
       }
@@ -443,8 +469,8 @@
 </script>
 
 <style scoped lang="scss">
-  ::v-deep .end_time_explain,
-    ::v-deep .join_dep_explain,
+  ::v-deep .end_time_explain,
+    ::v-deep .join_dep_explain,
         ::v-deep .mission_plan_id{
     display: none;
   }
@@ -460,4 +486,4 @@
   ::v-deep .xy-table-item-label {
     padding-right: 0
   }
-</style>
+</style>
diff --git a/src/views/task/list/components/showOutline.vue b/src/views/task/list/components/showOutline.vue
index 75ed660..09099a1 100644
--- a/src/views/task/list/components/showOutline.vue
+++ b/src/views/task/list/components/showOutline.vue
@@ -30,14 +30,26 @@
           </el-descriptions-item>
           <el-descriptions-item span="2">
             <template slot="label">
-              主要内容：
+              工作内容：
+            </template>
+            {{showform.work_content?showform.work_content:''}}
+          </el-descriptions-item>
+          <el-descriptions-item span="2">
+            <template slot="label">
+              要求：
+            </template>
+            {{showform.work_require?showform.work_require:''}}
+          </el-descriptions-item>
+          <el-descriptions-item span="2">
+            <template slot="label">
+              主要工作：
             </template>
             {{showform.content?showform.content:''}}
           </el-descriptions-item>
 
           <el-descriptions-item span="2">
             <template slot="label">
-              工作要求：
+              工作步骤：
             </template>
             {{showform.require?showform.require:''}}
           </el-descriptions-item>
@@ -164,4 +176,4 @@
   ::v-deep .xy-table-item-label {
     padding-right: 0
   }
-</style>
+</style>
diff --git a/src/views/task/list/components/showPlanoutline.vue b/src/views/task/list/components/showPlanoutline.vue
index a9b0b15..29a625f 100644
--- a/src/views/task/list/components/showPlanoutline.vue
+++ b/src/views/task/list/components/showPlanoutline.vue
@@ -1,7 +1,7 @@
 <template>
-<div>
-    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" title="查看" :form="form"
-      >
+<div>
+    <xy-dialog ref="dialog" :is-show.sync="isShow" type="form" title="查看" :form="form"
+      >
       <template v-slot:contents>
         <el-divider>计划信息</el-divider>
          <el-descriptions class="margin-top" :column="4" border>
@@ -140,8 +140,8 @@
         @click="changeLock">锁定</Button>
         <Button type="primary" ghost style='margin-left:5px;margin-bottom:5px;' @click="isShow=false">取消</Button>
       </template>
-
-    </xy-dialog>
+
+    </xy-dialog>
     <addUnit ref='addUnit' @refresh='getMission'></addUnit>
     <checkUnit ref='checkUnit' @refresh='getMission'></checkUnit>
     <addOutline ref="addOutline"  @refresh='getMission'></addOutline>
@@ -157,23 +157,23 @@
       </span>
     </el-dialog>
 
-
-  </div>
-</template>
-
-<script>
-  import {
-    Message
-  } from 'element-ui'
-  import {
-    getparameteritem
-  } from "@/api/system/dictionary.js";
-  import {
+
+  </div>
+</template>
+
+<script>
+  import {
+    Message
+  } from 'element-ui'
+  import {
+    getparameteritem
+  } from "@/api/system/dictionary.js";
+  import {
     get,
-    save
+    save
   } from "@/api/task/plan.js";
-  import {
-    listunit
+  import {
+    listunit
   } from '@/api/task/unit.js'
   import addUnit from '../../list/components/addUnit.vue'
   import checkUnit from '../../list/components/checkUnit.vue'
@@ -187,18 +187,18 @@
   } from '@/api/task/newplan.js'
   import {
     getMergeCells,groupBy
-  } from '@/utils/contactTable.js'
-  export default {
+  } from '@/utils/contactTable.js'
+  export default {
     components: {
       addUnit,
       checkUnit,
-      addOutline
-    },
-    data() {
-      return {
+      addOutline
+    },
+    data() {
+      return {
         isShow: false,
         dialogVisible:false,
-        messageInfo:'',
+        messageInfo:'',
         id:'',
         select: {
           keyword: '',
@@ -225,25 +225,25 @@
           value:'已完成'
         }],
         hasLocked:false,
-        showform:{},
+        showform:{},
         form: {
           contents:'',
           missionlist:'',
-          plan_type:'',
+          plan_type:'',
           name: '',
           year:'',
           type: '',
           start_date: '',
-          status:1,
+          status:1,
           end_date: '',
           // count:'',
           lefts:'',
-          name7: 1,
-          file_ids: '',
-          content: '',
-          accept_admin_ids: [],
+          name7: 1,
+          file_ids: '',
+          content: '',
+          accept_admin_ids: [],
           accept_department_ids: [],
-          is_lock:null
+          is_lock:null
         },
         auditStatusList:[{
           id:0,
@@ -297,43 +297,53 @@
             }
           }],
         mission_log:[],
-        missionLogTable:[{
-            label: "工作项目",
+        missionLogTable:[{
+            label: "工作项目",
             prop: 'menu',
             align:'center',
-            fixed:'left',
-            width: 120
-          }, {
-            label: "性质级别",
-            prop: 'level',
+            fixed:'left',
+            width: 120
+          }, {
+            label: "性质级别",
+            prop: 'level',
             width: 120,
             align:'center',
-            fixed:'left'
-          }, {
-            label: "主要内容",
-            prop: 'content',
+            fixed:'left'
+          },{
+            label: "工作内容",
+            prop: 'work_content',
+            align: 'left',
+            width:240
+          }, {
+            label: "要求",
+            prop: 'work_require',
+            align: 'left',
+            width:240
+          }, {
+            label: "主要工作",
+            prop: 'content',
             align: 'left',
-            width:240
-          }, {
-            label: "工作周期",
-            prop: 'period',
-            width: 120
-          }, {
-            label: "工作要求",
+            width:240
+          }, {
+            label: "工作周期",
+            prop: 'period',
+            width: 120
+          }, {
+            label: "工作步骤",
             prop: 'require',
-            width:240
-          }, {
-            label: "完成时间",
-            prop: 'end_time',
+            width:240
+          }, {
+            label: "完成时间",
+            prop: 'end_time',
             width: 120,
-            align:'center'
-          }, {
-            label: "责任科室",
-            prop: 'duty_dep_id',
-            width: 120
-          }, {
-            label: "参与科室",
-            prop: 'join_dep_id',
+            align:'center'
+          }, {
+            label: "责任科室",
+            prop: 'duty_dep_id',
+            width: 120
+          }, {
+            label: "参与科室",
+            prop: 'join_dep_id',
             width: 120,
           },{
             label: "具体流程概述",
@@ -343,8 +353,8 @@
             label: "所需资源概述",
             prop: 'resource',
                         width:240
-          }],
-      }
+          }],
+      }
     },
     computed: {
       // 获取所有单元格合并数据
@@ -354,11 +364,11 @@
         const data = groupBy(this.mission_log, 'menu')
         return getMergeCells(data, this.missionLogTable, mergeCols)
       }
-    },
+    },
     created() {
       this.stateObj = state.state
-      this.getMenuList()
-    },
+      this.getMenuList()
+    },
     methods: {
       backPlan(row){
         this.messageInfo = `${row.menu}-${row.level}`
@@ -458,41 +468,41 @@
             message: this.hasLocked?'锁定成功':'解锁成功'
           })
         })
-      },
-      async getDetail() {
+      },
+      async getDetail() {
         const res = await get(this.id)
         this.showform = res
-        // this.showform.is_lock = 1
+        // this.showform.is_lock = 1
         this.form = {
           contents:'',
           missionlist:'',
-          plan_type:res?.plan_type,
+          plan_type:res?.plan_type,
           name: res?.name,
           year:res.year?res.year:new Date().getFullYear(),
-          type: res?.type,
+          type: res?.type,
           start_date: res?.start_date,
-          status:res.status?res.status:1,
+          status:res.status?res.status:1,
           end_date: res?.end_date,
-          name7: res.accept_department.length > 0 ? 2 : 1,
-          file_ids: res?.file_ids,
-          content: res?.content,
-          accept_admin_ids: res?.accept_admin_ids,
+          name7: res.accept_department.length > 0 ? 2 : 1,
+          file_ids: res?.file_ids,
+          content: res?.content,
+          accept_admin_ids: res?.accept_admin_ids,
           accept_department_ids: res?.accept_department_ids,
-          is_lock:res?.is_lock
-        }
-        for (var f of res.files) {
-          this.pictureList.push({
-            id: f.id,
-            url: f.url,
-            name: f.original_name
-          })
+          is_lock:res?.is_lock
+        }
+        for (var f of res.files) {
+          this.pictureList.push({
+            id: f.id,
+            url: f.url,
+            name: f.original_name
+          })
         }
         let group_details = []
         if(res.groups.length>0){
           this.showform.group_details = this.contactGroup(res.groups)
         }
         console.log(this.showform.group_details)
-        this.getMission()
+        this.getMission()
       },
       contactGroup(arr) {
         let tempArr = [],
@@ -531,33 +541,33 @@
           }
         }
         return newArr
-      },
-    },
-    watch: {
-      isShow(newVal) {
-        if (newVal) {
-            this.getDetail()
-
-        } else {
-          this.id = ''
+      },
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+            this.getDetail()
+
+        } else {
+          this.id = ''
           this.pictureList = []
           this.showform = {}
-          this.mission_log = []
-          this.$refs['dialog'].reset()
-        }
-      }
-    }
-
-  }
-</script>
-
-<style scoped lang="scss">
-  ::v-deep .contents,
-  ::v-deep .end_type,
+          this.mission_log = []
+          this.$refs['dialog'].reset()
+        }
+      }
+    }
+
+  }
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .contents,
+  ::v-deep .end_type,
   ::v-deep .file_ids,
   ::v-deep .is_need_answer,
-  ::v-deep .missionlist{
-    flex-basis: 100%;
+  ::v-deep .missionlist{
+    flex-basis: 100%;
   }
     ::v-deep .missionlist{
       width:100%;
@@ -565,89 +575,89 @@
     }
     ::v-deep .el-table .cell.el-tooltip{
       white-space: normal!important;
-    }
+    }
   ::v-deep .el-divider__text{
     font-size: 20px;
   }
   ::v-deep .el-descriptions :not(.is-bordered) .el-descriptions-item__cell{
     width:16%
-  }
-  ::v-deep .plan_type {
-    display: none;
+  }
+  ::v-deep .plan_type {
+    display: none;
   }
   ::v-deep .el-form>div{
         align-items: flex-start!important;
-  }
+  }
   .xy-table-item{
     padding-right:0
-  }
-  ::v-deep .xy-table-item-label {
-    padding-right:0
-  }
-
-  .img__delete {
-    transform: scale(0.8, 0.8);
-
-    position: absolute;
-    top: 4px;
-    right: 4px;
-  }
-
-  ::v-deep .avatar-uploader .el-upload {
-    border: 1px dashed #d9d9d9;
-    border-radius: 6px;
-    cursor: pointer;
-    position: relative;
-    overflow: hidden;
-  }
-
-  ::v-deep .avatar-uploader .el-upload:hover {
-    border-color: #409EFF;
-  }
-
-  ::v-deep .el-upload--picture-card {
-    font-size: 28px;
-    color: #8c939d;
-    width: 80px !important;
-    height: 80px !important;
-    line-height: 80px !important;
-    text-align: center;
-  }
-
-  ::v-deep .avatar-uploader-icon {
-    font-size: 28px;
-    color: #8c939d;
-    width: 80px !important;
-    height: 80px !important;
-    line-height: 80px !important;
-    text-align: center;
-  }
-
-  ::v-deep .avatar {
-    width: 80px !important;
-    display: block;
-    border-radius: 6px;
-  }
-
-  // ::v-deep .xy-table-item-label {
-  //   width: 160px !important;
-  // }
-
-  ::v-deep .el-date-editor .el-range-separator {
-    width: auto !important;
-  }
-
-  ::v-deep .el-input-number .el-input__inner {
-    text-align: left !important;
-  }
-
-  .searchCompanys {
-    display: flex;
-    justify-content: space-between;
-    margin-bottom: 16px;
-
-    .el-input {
-      width: 80%
-    }
-  }
+  }
+  ::v-deep .xy-table-item-label {
+    padding-right:0
+  }
+
+  .img__delete {
+    transform: scale(0.8, 0.8);
+
+    position: absolute;
+    top: 4px;
+    right: 4px;
+  }
+
+  ::v-deep .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  ::v-deep .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+
+  ::v-deep .el-upload--picture-card {
+    font-size: 28px;
+    color: #8c939d;
+    width: 80px !important;
+    height: 80px !important;
+    line-height: 80px !important;
+    text-align: center;
+  }
+
+  ::v-deep .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 80px !important;
+    height: 80px !important;
+    line-height: 80px !important;
+    text-align: center;
+  }
+
+  ::v-deep .avatar {
+    width: 80px !important;
+    display: block;
+    border-radius: 6px;
+  }
+
+  // ::v-deep .xy-table-item-label {
+  //   width: 160px !important;
+  // }
+
+  ::v-deep .el-date-editor .el-range-separator {
+    width: auto !important;
+  }
+
+  ::v-deep .el-input-number .el-input__inner {
+    text-align: left !important;
+  }
+
+  .searchCompanys {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 16px;
+
+    .el-input {
+      width: 80%
+    }
+  }
 </style>
diff --git a/src/views/task/list/outline.vue b/src/views/task/list/outline.vue
index 2a36941..56d4ab0 100644
--- a/src/views/task/list/outline.vue
+++ b/src/views/task/list/outline.vue
@@ -7,16 +7,16 @@
             <DatePicker style='width:200px;margin-right: 10px;' placeholder="年份" placement="bottom" format='yyyy'
               type="year" @on-change="changeYear"></DatePicker>
             <Input v-model="select.keyword" clearable style="width: 200px;margin-right: 10px;" placeholder="关键字搜索" />
-            <!-- has_mission_plans -->
-            <Select clearable style='width:200px;margin-right: 10px;' v-model="select.has_mission_plans"
-              placeholder="是否已发布计划">
-              <Option v-for="item in hasMissionList" :value="item.id">{{item.value}}</Option>
-            </Select>
-            <Select clearable style='width:200px;margin-right: 10px;' v-model="select.has_missions"
-              placeholder="是否已发布任务">
-              <Option v-for="item in hasMissionList" :value="item.id">{{item.value}}</Option>
-            </Select>
-
+            <!-- has_mission_plans -->
+            <Select clearable style='width:200px;margin-right: 10px;' v-model="select.has_mission_plans"
+              placeholder="是否已发布计划">
+              <Option v-for="item in hasMissionList" :value="item.id">{{item.value}}</Option>
+            </Select>
+            <Select clearable style='width:200px;margin-right: 10px;' v-model="select.has_missions"
+              placeholder="是否已发布任务">
+              <Option v-for="item in hasMissionList" :value="item.id">{{item.value}}</Option>
+            </Select>
+
             <Button type="primary" @click="getList">查询</Button>
             <Button type="primary" style="margin-left: 10px;" @click="editorOutline('','add')">添加</Button>
           </div>
@@ -26,30 +26,30 @@
 
     <!-- @cell-click="cellClicks" -->
     <xy-table :list="mission_log" :table-item="missionLogTable" :showIndex='false' :isPage='false'
-      :span-method="spanMethod">
-      has_mission
-      <template v-slot:has_mission>
-        <el-table-column align='center' label="是否创建计划或专项任务" fixed="right" width="120" header-align="center">
-          <template slot-scope="scope">
-            <div v-if="scope.row.mission_plans.length>0">
-              已创建计划
-            </div>
-            <div v-if="scope.row.missions.length>0">
-              已创建专项任务
-            </div>
-          </template>
-        </el-table-column>
+      :span-method="spanMethod">
+      has_mission
+      <template v-slot:has_mission>
+        <el-table-column align='center' label="是否创建计划或专项任务" fixed="right" width="120" header-align="center">
+          <template slot-scope="scope">
+            <div v-if="scope.row.mission_plans.length>0">
+              已创建计划
+            </div>
+            <div v-if="scope.row.missions.length>0">
+              已创建专项任务
+            </div>
+          </template>
+        </el-table-column>
       </template>
       <template v-slot:btns>
         <el-table-column align='center' label="操作" fixed="right" width="120" header-align="center">
-          <template slot-scope="scope">
-            <div>
-              <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
-                @click="editPlan(scope.row,'add')">年度计划</Button>
-            </div>
-            <div>
-              <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
-                @click="editUnit(scope.row,4)">专题任务</Button>
+          <template slot-scope="scope">
+            <div>
+              <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
+                @click="editPlan(scope.row,'add')">年度计划</Button>
+            </div>
+            <div>
+              <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
+                @click="editUnit(scope.row,4)">专题任务</Button>
             </div>
             <div>
               <Button type="primary" style='margin-right:5px;margin-bottom:5px;' size="small"
@@ -59,8 +59,8 @@
         </el-table-column>
       </template>
     </xy-table>
-    <addOutline ref="addOutline" @refresh="getList"></addOutline>
-    <addPlan ref="addPlan"  @refresh="getList"></addPlan>
+    <addOutline ref="addOutline" @refresh="getList"></addOutline>
+    <addPlan ref="addPlan"  @refresh="getList"></addPlan>
     <addUnit ref="addUnit" @toUnit="getList"  @refresh="getList"></addUnit>
   </div>
 </template>
@@ -77,15 +77,15 @@
     getMergeCells,
     groupBy
   } from '@/utils/contactTable.js'
-  import addOutline from '../list/components/addOutline.vue'
-  import addPlan from '../list/components/addPlan.vue'
-  import addUnit from '../list/components/addUnit.vue'
+  import addOutline from '../list/components/addOutline.vue'
+  import addPlan from '../list/components/addPlan.vue'
+  import addUnit from '../list/components/addUnit.vue'
     import state from '@/store/modules/user.js'
   export default {
     components: {
-      addOutline,
-      addPlan,
-      addUnit,
+      addOutline,
+      addPlan,
+      addUnit,
     },
     data() {
       return {
@@ -96,16 +96,16 @@
           page_size: 99999,
           year: new Date().getFullYear(),
           sort_name: 'created_at',
-          sort_type: 'ASC',
-          has_mission_plans:'',
+          sort_type: 'ASC',
+          has_mission_plans:'',
           has_missions:''
-        },
-        hasMissionList:[{
-          id:0,
-          value:'否',
-        },{
-          id:1,
-          value:'是',
+        },
+        hasMissionList:[{
+          id:0,
+          value:'否',
+        },{
+          id:1,
+          value:'是',
         }],
         menuList: [],
         mission_log: [],
@@ -122,7 +122,17 @@
           align: 'center',
           fixed: 'left'
         }, {
-          label: "主要内容",
+          label: "工作内容",
+          prop: 'work_content',
+          align: 'left',
+          width: 240
+        },{
+          label: "要求",
+          prop: 'work_require',
+          align: 'left',
+          width: 240
+        },{
+          label: "主要工作",
           prop: 'content',
           align: 'left',
           width: 240
@@ -131,7 +141,7 @@
           prop: 'period',
           width: 120
         }, {
-          label: "工作要求",
+          label: "工作步骤",
           prop: 'require',
           width: 240
         }, {
@@ -175,7 +185,7 @@
       }
     },
     created() {
-      // this.getMenuList()
+      // this.getMenuList()
        this.stateObj = state.state
       this.getList()
     },
@@ -187,11 +197,11 @@
       async getList() {
         const res = await index({
 
-          ...this.select,
-          has_mission_plans:this.select.has_mission_plans?this.select.has_mission_plans:(this.select.has_mission_plans===0?0:''),
-          has_missions:this.select.has_missions?this.select.has_missions:(this.select.has_missions===0?0:''),
-
-          'with_relations[0]':"missionPlans",
+          ...this.select,
+          has_mission_plans:this.select.has_mission_plans?this.select.has_mission_plans:(this.select.has_mission_plans===0?0:''),
+          has_missions:this.select.has_missions?this.select.has_missions:(this.select.has_missions===0?0:''),
+
+          'with_relations[0]':"missionPlans",
           'with_relations[1]':"missions",
           filter: [{
             key: 'year',
@@ -208,8 +218,8 @@
       changeYear(e) {
         if (e) {
           this.select.year = e
-        }else{
-          this.select.year = new Date().getFullYear()
+        }else{
+          this.select.year = new Date().getFullYear()
         }
       },
       spanMethod({
@@ -221,37 +231,37 @@
 
         return this.spanArr[rowIndex][columnIndex]
       },
-
-      editorOutline(id, type) {
-        if (id) {
-          this.$refs.addOutline.id = id
-        }
-        this.$refs.addOutline.setMissionId(this.id)
-        this.$refs.addOutline.setName(`${this.select.year}任务大纲`)
-        this.$refs.addOutline.type = type
-        // this.$refs.addOutline.menuList = this.menuList
-        this.$refs.addOutline.isShow = true
-      },
-      editUnit(row,type){
-        this.$refs.addUnit.type="add"
-        this.$refs.addUnit.setoutLineId(row.id)
-        this.$refs.addUnit.setType(type)
-        this.$refs.addUnit.setNameContent(row.content,row.flow)
-        this.$refs.addUnit.setMenuLevel(row.menu,row.level,row.menu_id,row.level_id)
-        this.$refs.addUnit.setMainId(this.stateObj.department_id,this.stateObj.login_id)
-        this.$refs.addUnit.isShow = true
-      },
-      editPlan(row,type){
-        this.$refs.addPlan.type="add"
-        this.$refs.addPlan.setMenuLevel(row)
-        this.$refs.addPlan.setMainId(this.stateObj.department_id,this.stateObj.login_id)
-        this.$refs.addPlan.isShow = true
-      },
-      toUrlPlan(){
-        this.$router.push('/task/list/plan_1')
-      },
-      toUrlUnit(e){
-        this.$router.push('/task/list/unit_4')
+
+      editorOutline(id, type) {
+        if (id) {
+          this.$refs.addOutline.id = id
+        }
+        this.$refs.addOutline.setMissionId(this.id)
+        this.$refs.addOutline.setName(`${this.select.year}任务大纲`)
+        this.$refs.addOutline.type = type
+        // this.$refs.addOutline.menuList = this.menuList
+        this.$refs.addOutline.isShow = true
+      },
+      editUnit(row,type){
+        this.$refs.addUnit.type="add"
+        this.$refs.addUnit.setoutLineId(row.id)
+        this.$refs.addUnit.setType(type)
+        this.$refs.addUnit.setNameContent(row.content,row.flow)
+        this.$refs.addUnit.setMenuLevel(row.menu,row.level,row.menu_id,row.level_id)
+        this.$refs.addUnit.setMainId(this.stateObj.department_id,this.stateObj.login_id)
+        this.$refs.addUnit.isShow = true
+      },
+      editPlan(row,type){
+        this.$refs.addPlan.type="add"
+        this.$refs.addPlan.setMenuLevel(row)
+        this.$refs.addPlan.setMainId(this.stateObj.department_id,this.stateObj.login_id)
+        this.$refs.addPlan.isShow = true
+      },
+      toUrlPlan(){
+        this.$router.push('/task/list/plan_1')
+      },
+      toUrlUnit(e){
+        this.$router.push('/task/list/unit_4')
       },
 
     },
@@ -263,4 +273,4 @@
   ::v-deep .el-table .cell.el-tooltip {
     white-space: normal !important;
   }
-</style>
+</style>