diff --git a/src/views/Content/Achievements.vue b/src/views/Content/Achievements.vue
index 65cc3b4dbdab798118ae5212e9012bcaf1c9af31..3ee55734d0ecd4d2461784da16f6dff1fa1f0c97 100644
--- a/src/views/Content/Achievements.vue
+++ b/src/views/Content/Achievements.vue
@@ -21,26 +21,26 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-input size="small" v-model="formInline.honor" placeholder="成果名称"></el-input>
+        <el-input size="small" v-model="formInline.keyword" placeholder="请输入关键词" @keyup.enter.native="search($event)"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-button size="small" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        <el-button size="small" type="primary" icon="el-icon-plus" @click="handleEdit()">添加</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" @click="search($event)">搜索</el-button>
+        <el-button size="small" type="primary" icon="el-icon-plus" @click="handleEdit()" disabled>添加</el-button>
       </el-form-item>
     </el-form>
     <!--列表-->
-    <el-table size="small" :data="listData" highlight-current-row v-loading="loading" border
+    <el-table size="small" :data="res.listData" highlight-current-row v-loading="loading" border
               element-loading-text="拼命加载中" style="width: 100%;">
       <el-table-column align="center" type="index" width="60"/>
       <el-table-column sortable prop="title" label="成果名称" width="150" show-overflow-tooltip/>
       <el-table-column sortable prop="is_have_brief" label="是否有成果简介" align="center" width="60" :formatter="achievementMapping" show-overflow-tooltip/>
-      <el-table-column sortable prop="brief_title" label="成果简介标题" width="150" show-overflow-tooltip/>
+      <el-table-column sortable prop="brief_title" label="成果简介标题" width="180" show-overflow-tooltip/>
+      <el-table-column sortable prop="brief_content" label="成果简介内容" width="180" show-overflow-tooltip/>
       <el-table-column sortable prop="is_honored " label="是否获奖" align="center" width="60" :formatter="achievementMapping" show-overflow-tooltip/>
-      <el-table-column sortable prop="honor" label="所获奖励" width="150" show-overflow-tooltip/>
-      <el-table-column sortable prop="brief_content" label="成果简介标题" width="150" show-overflow-tooltip/>
-      <el-table-column sortable prop="pub_time" label="成果发表日期" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="honored_date" label="成果获奖日期" width="120" show-overflow-tooltip/>
-      <el-table-column align="center" label="操作" min-width="120">
+      <el-table-column sortable prop="honor" label="所获奖励" width="180" show-overflow-tooltip/>
+      <el-table-column sortable prop="honored_date" label="成果获奖日期" width="110" align="center" show-overflow-tooltip/>
+      <el-table-column sortable prop="pub_time" label="成果发表日期" width="110" align="center" show-overflow-tooltip/>
+      <el-table-column align="center" label="操作" min-width="100">
         <template slot-scope="scope">
           <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
           <el-button size="mini" type="danger" @click="deleteUser(scope.$index, scope.row)">删除</el-button>
@@ -65,10 +65,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-if="editForm.is_have_brief" label="成果简介标题" prop="brief_title">
+        <el-form-item v-if="editForm.is_have_brief || editForm.is_have_brief === '是'" label="成果简介标题" prop="brief_title">
           <el-input size="small" v-model="editForm.brief_title" auto-complete="off" placeholder="请输入成果简介标题"></el-input>
         </el-form-item>
-        <el-form-item v-if="editForm.is_have_brief" label="成果简介内容" prop="brief_content">
+        <el-form-item v-if="editForm.is_have_brief || editForm.is_have_brief === '是'" label="成果简介内容" prop="brief_content">
           <el-input size="small" v-model="editForm.brief_content" auto-complete="off" placeholder="请输入成果简介内容"></el-input>
         </el-form-item>
         <el-form-item label="是否获奖" prop="is_honored">
@@ -81,10 +81,10 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-if="editForm.is_honored" label="所获奖励" prop="honor">
+        <el-form-item v-if="editForm.is_honored || editForm.is_honored === '是'" label="所获奖励" prop="honor">
           <el-input size="small" v-model="editForm.honor" auto-complete="off" placeholder="请输入所获奖励"></el-input>
         </el-form-item>
-        <el-form-item v-if="editForm.is_honored" label="成果获奖日期" prop="grand_auth_time">
+        <el-form-item v-if="editForm.is_honored || editForm.is_honored === '是'" label="成果获奖日期" prop="grand_auth_time">
           <el-date-picker
             v-model="editForm.honored_date"
             type="date"
@@ -149,8 +149,8 @@ export default {
         page: 1,
         limit: 10,
         pageSize:10,
-        is_honored:'',
-        honor: '',
+        is_honored: '',
+        keyword: '',
         is_search:false,
         select_Options:[
           {
@@ -168,18 +168,21 @@ export default {
         ],
         token: localStorage.getItem('logintoken'),
       },
-      listData: [
-        {
-          title: '',
-          is_have_brief: '',
-          brief_title: '',
-          is_honored: '',
-          honor: '',
-          brief_content: '',
-          pub_time: '',
-          honored_date: '',
-        },
-      ],
+      res:{
+        listData: [
+          {
+            title: '',
+            is_have_brief: '',
+            brief_title: '',
+            is_honored: '',
+            honor: '',
+            brief_content: '',
+            pub_time: '',
+            honored_date: '',
+          },
+        ],
+      },
+
       // 分页参数
       pageparm: {
         currentPage: 1,
@@ -228,22 +231,24 @@ export default {
       }
       let is_search = parameter.is_search;
       if(is_search){
-        if(parameter.honor.length > 5){
-          params["honor"]=parameter.honor;
-        }
         if(parameter.is_honored === false){
           params["is_honored"] = false;
         }
         if(parameter.is_honored === true){
           params["is_honored"] = true;
         }
+        if(parameter.keyword.replace(/\s+/g,"").length >= 1){
+          params.search = parameter.keyword.replace(/\s+/g,"");
+        }
       }
       get(`/achievement/`, params).then(value => {
-        this.listData = value.results;
+        // this.listData = value.results;
+        this.$set(this.res,"listData",value.results);
         that.pageparm.currentPage = that.formInline.page;
         that.pageparm.pageSize = that.formInline.pageSize;
         that.pageparm.total = value.count;
         this.loading = false;
+        // this.$forceUpdate();
       }).catch(err => {
         this.$message.error('加载失败')
       });
@@ -278,9 +283,15 @@ export default {
       this.getdata(this.formInline)
     },
     // 搜索事件
-    search () {
-      this.formInline.is_search=true;
-      this.getdata(this.formInline)
+    search (e) {
+      let keyCode = window.event? e.keyCode:e.which;
+      if(keyCode === 13){
+        this.formInline.is_search=true;
+        this.getdata(this.formInline)
+      }else{
+        this.formInline.is_search=true;
+        this.getdata(this.formInline)
+      }
     },
     //显示编辑界面
     handleEdit: function (index, row) {