diff --git a/src/components/leftnav.vue b/src/components/leftnav.vue
index 2f08e268a4dc0e529e7c57ca7beb573c03e61e5b..65000570782519639bbbce29ca73668e6ca7a35b 100644
--- a/src/components/leftnav.vue
+++ b/src/components/leftnav.vue
@@ -82,7 +82,7 @@ export default {
             {
               menuid: 36,
               icon: 'icon-order-manage',
-              menuname: '荣誉管理',
+              menuname: '成就管理',
               hasThird: 'N',
               url: 'content/achievement',
               menus: null,
diff --git a/src/views/Content/Achievements.vue b/src/views/Content/Achievements.vue
index 3c6787accdc4d626acc2e93d5c25eff4b781f6f5..432bd143ad84d066372fc3ea0c2504d21635edbd 100644
--- a/src/views/Content/Achievements.vue
+++ b/src/views/Content/Achievements.vue
@@ -1,51 +1,46 @@
 /**
-* 荣誉管理
+* 成就管理
 */
 <template>
   <div>
     <!-- 面包屑导航 -->
     <el-breadcrumb separator-class="el-icon-arrow-right">
       <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
-      <el-breadcrumb-item>荣誉管理</el-breadcrumb-item>
+      <el-breadcrumb-item>成就管理</el-breadcrumb-item>
     </el-breadcrumb>
     <!-- 搜索筛选 -->
     <el-form :inline="true" :model="formInline" class="user-search">
-      <el-form-item label="搜索：">
-        <el-input size="small" v-model="formInline.machineNo" placeholder="输入终端编号"></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-input size="small" v-model="formInline.orderNo" placeholder="输入订单号"></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-input size="small" v-model="formInline.transId" placeholder="输入交易单号"></el-input>
-      </el-form-item>
-      <el-form-item>
-        <el-select size="small" v-model="formInline.payType" placeholder="请选择">
-          <el-option v-for="type in payType" :label="type.key" :value="type.value" :key="type.value"></el-option>
+      <el-form-item label="请选择是否获奖：">
+        <el-select size="small" v-model="formInline.is_honored"  placeholder="请选择是否获奖">
+          <el-option
+            v-for="item in formInline.select_Options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-select size="small" v-model="formInline.orderStatus" placeholder="请选择">
-          <el-option v-for="type in payway" :label="type.key" :value="type.value" :key="type.value"></el-option>
-        </el-select>
+        <el-input size="small" v-model="formInline.honor" placeholder="成果名称"></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-form-item>
     </el-form>
     <!--列表-->
     <el-table size="small" :data="listData" highlight-current-row v-loading="loading" border
               element-loading-text="拼命加载中" style="width: 100%;">
       <el-table-column align="center" type="selection" width="60"/>
-      <el-table-column sortable prop="title" label="成果名称" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="is_have_brief" label="是否有成果简介" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="brief_title" label="成果简介标题" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="is_honored " label="是否获奖" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="honor" label="所获奖励" width="120" show-overflow-tooltip/>
-      <el-table-column sortable prop="brief_content" label="成果简介标题" width="120" show-overflow-tooltip/>
+      <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="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="150">
+      <el-table-column align="center" label="操作" min-width="120">
         <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>
@@ -58,28 +53,50 @@
     <el-dialog :title="title" :visible.sync="editFormVisible" width="50%" @click="closeDialog('editForm')">
       <el-form label-width="120px" :model="editForm" :rules="rules" ref="editForm">
         <el-form-item label="成果名称" prop="title">
-          <el-input size="small" v-model="editForm.title" auto-complete="off" placeholder="请输入新闻标题"></el-input>
+          <el-input size="small" v-model="editForm.title" auto-complete="off" placeholder="请输入成果名称"></el-input>
         </el-form-item>
-        <el-form-item label="是否有成果简介" prop="is_have_brief">
-          <el-input size="small" v-model="editForm.is_have_brief" auto-complete="off" placeholder="请输入新闻正文内容"></el-input>
+        <el-form-item label="是否有成果简介" prop="is_have_brief" >
+          <el-select size="small" v-model="editForm.is_have_brief"  placeholder="是否有成果简介">
+            <el-option
+              v-for="item in achievementOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="成果简介标题" prop="brief_title">
-          <el-input size="small" v-model="editForm.brief_title" auto-complete="off" placeholder="请输入新闻附件路径"></el-input>
+        <el-form-item v-if="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-input size="small" v-model="editForm.brief_content" auto-complete="off" placeholder="请输入成果简介内容"></el-input>
         </el-form-item>
         <el-form-item label="是否获奖" prop="is_honored">
-          <el-input size="small" v-model="editForm.is_honored" auto-complete="off" placeholder="请选择新闻种类"></el-input>
+          <el-select size="small" v-model="editForm.is_honored"  placeholder="是否获奖">
+            <el-option
+              v-for="item in achievementOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="所获奖励" prop="honor">
-          <el-input size="small" v-model="editForm.honor" auto-complete="off" placeholder="请输入新闻标题"></el-input>
+        <el-form-item v-if="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 label="成果简介" prop="brief_content">
-          <el-input size="small" v-model="editForm.brief_content" auto-complete="off" placeholder="请输入新闻正文内容"></el-input>
+        <el-form-item v-if="editForm.is_honored" label="成果获奖日期" prop="grand_auth_time">
+          <el-date-picker
+            v-model="editForm.honored_date"
+            type="date"
+            placeholder="请选择成果获奖日期">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="成果发表日期" prop="pub_time">
-          <el-input size="small" v-model="editForm.pub_time" auto-complete="off" placeholder="请输入新闻附件路径"></el-input>
-        </el-form-item>
-        <el-form-item label="成果获奖日期" prop="honored_date">
-          <el-input size="small" v-model="editForm.honored_date" auto-complete="off" placeholder="请选择新闻种类"></el-input>
+          <el-date-picker
+            v-model="editForm.pub_time"
+            type="date"
+            placeholder="请选择成果发表日期">
+          </el-date-picker>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -93,64 +110,76 @@
 
 <script>
 import Pagination from '../../components/Pagination'
+import { Delete, get, put } from '../../utils/http'
 
 export default {
   data () {
     return {
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
-      title: '编辑',
+      achievementOptions: [
+        {
+          value: false,
+          label: '否',
+        },
+        {
+          value: true,
+          label: '是',
+        },
+      ],
+      editid:'0',
       editForm: {
         title: '',
-        content: '',
-        file: '',
-        type: '',
+        is_have_brief: '',
+        brief_title:'',
+        is_honored:'',
+        honor:'',
+        brief_content:'',
+        pub_time:'',
+        honored_date: '',
         token: localStorage.getItem('logintoken'),
       },
       rules: {
-        name: [{ required: true, message: '请输入学生姓名', trigger: 'blur' }],
-        join_year: [{ required: true, message: '请输入学生入学年份', trigger: 'blur' }],
-        is_graduated: [{ required: true, message: '请输入学生是否毕业', trigger: 'blur' }],
-        is_school: [{ required: true, message: '请输入学生是否在校', trigger: 'blur' }],
+        title: [{ required: true, message: '请输入成果名称', trigger: 'blur' }],
+        is_have_brief: [{ required: true, message: '请选择是否有成果简介', trigger: 'blur' }],
+        is_honored: [{ required: true, message: '请选择是否获奖', trigger: 'blur' }],
+        pub_time: [{ required: true, message: '请选择成果发表日期', trigger: 'blur' }],
       },
       formInline: {
         page: 1,
         limit: 10,
-        machineNo: '',
-        orderNo: '',
-        transId: '',
-        payType: 0,
-        orderStatus: 0,
+        pageSize:10,
+        is_honored:'',
+        honor: '',
+        is_search:false,
+        select_Options:[
+          {
+            value: false,
+            label: '否',
+          },
+          {
+            value: true,
+            label: '是',
+          },
+          {
+            value:'',
+            label: "默认（全部）"
+          }
+        ],
         token: localStorage.getItem('logintoken'),
       },
-      // 删除部门
-      seletedata: {
-        ids: '',
-        token: localStorage.getItem('logintoken'),
-      },
-      userparm: [], //搜索权限
       listData: [
         {
-          title: '猪肉涨价的理论成果',
-          is_have_brief: '是',
-          brief_title: '猪肉又涨价了',
-          is_honored: '是',
-          honor: '猪肉尔奖',
-          brief_content: '吴亦凡说猪肉又涨价了',
-          pub_time: '2021-4-7',
-          honored_date: '2021-6-4',
-        },
-        {
-          title: '牛肉涨价的理论成果',
-          is_have_brief: '是',
-          brief_title: '牛肉又涨价了',
-          is_honored: '是',
-          honor: '牛肉尔奖',
-          brief_content: '吴亦凡说牛肉又涨价了',
-          pub_time: '2021-4-4',
-          honored_date: '2021-6-2',
+          title: '',
+          is_have_brief: '',
+          brief_title: '',
+          is_honored: '',
+          honor: '',
+          brief_content: '',
+          pub_time: '',
+          honored_date: '',
         },
-      ], //用户数据
+      ],
       // 分页参数
       pageparm: {
         currentPage: 1,
@@ -179,9 +208,45 @@ export default {
    */
   methods: {
     // 获取公司列表
+    achievementMapping(row){
+      if(row.is_have_brief){
+        return "是";
+      }
+      else if(row.is_honored){
+        return "是";
+      }
+      else {
+        return "否";
+      }
+    },
     getdata (parameter) {
-      this.loading = true
-      this.loading = false
+      this.loading = true;
+      let that = this;
+      let params = {
+        page: parameter.page,
+        page_size: parameter.limit,
+      }
+      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;
+        }
+      }
+      get(`/achievement/`, params).then(value => {
+        this.listData = value.results;
+        that.pageparm.currentPage = that.formInline.page;
+        that.pageparm.pageSize = that.formInline.pageSize;
+        that.pageparm.total = value.count;
+        this.loading = false;
+      }).catch(err => {
+        this.$message.error('加载失败')
+      });
       /***
        * 调用接口，注释上面模拟数据 取消下面注释
        */
@@ -214,21 +279,23 @@ export default {
     },
     // 搜索事件
     search () {
+      this.formInline.is_search=true;
       this.getdata(this.formInline)
     },
     //显示编辑界面
     handleEdit: function (index, row) {
       this.editFormVisible = true
       if (row !== undefined && row !== 'undefined') {
-        this.title = '修改'
-        this.editForm.title = row.title
-        this.editForm.is_have_brief = row.is_have_brief
-        this.editForm.brief_title = row.brief_title
-        this.editForm.is_honored = row.is_honored
-        this.editForm.honor = row.honor
-        this.editForm.brief_content = row.brief_content
-        this.editForm.pub_time = row.pub_time
-        this.editForm.honored_date = row.honored_date
+        this.title = '修改';
+        this.editid = row.id;
+        this.editForm.title = row.title;
+        this.editForm.is_have_brief = row.is_have_brief;
+        this.editForm.brief_title = row.brief_title;
+        this.editForm.brief_content = row.brief_content;
+        this.editForm.is_honored = row.is_honored;
+        this.editForm.honor = row.honor;
+        this.editForm.honored_date = row.honored_date;
+        this.editForm.pub_time = row.pub_time;
       } else {
         this.title = '添加'
         this.editForm.title = ''
@@ -243,71 +310,33 @@ export default {
     },
     // 编辑、增加页面保存方法
     submitForm (editData) {
-      this.$message({
-        type: 'success',
-        message: '添加/修改操作成功',
+      this.$refs[editData].validate(valid => {
+        if (!valid || this.title === undefined || this.title !== '修改') {
+          return false
+        }
+        put(`/achievement/${this.editid}/`, { ...this.editForm }).then(() => {
+          this.editFormVisible = false
+          this.$message.success('修改成功')
+          this.getdata(this.formInline)
+        }).catch(error => this.$message.error('修改失败'))
       })
-      // this.$refs[editData].validate(valid => {
-      //   if (valid) {
-      //     ConfigSave(this.editForm).then(res => {
-      //       this.editFormVisible = false
-      //       this.loading = false
-      //       if (res.success) {
-      //         this.getdata(this.formInline)
-      //         this.$message({
-      //           type: 'success',
-      //           message: '公司保存成功！',
-      //         })
-      //       } else {
-      //         this.$message({
-      //           type: 'info',
-      //           message: res.msg,
-      //         })
-      //       }
-      //     }).catch(err => {
-      //       this.editFormVisible = false
-      //       this.loading = false
-      //       this.$message.error('支付配置信息保存失败，请稍后再试！')
-      //     })
-      //   } else {
-      //     return false
-      //   }
-      // })
     },
     // 删除公司
     deleteUser (index, row) {
-      this.$message({
-        type: 'success',
-        message: '删除操作成功',
+      this.$confirm('确定要删除该成就?', '删除', {
+        cancelButtonText: '取消',
+        confirmButtonText: '确定',
+        type: 'warning',
+      }).then(() => {
+        if (row.id) {
+          Delete(`/achievement/${row.id}/`).then(() => {
+            this.$message.success('删除成功')
+            this.getdata(this.formInline)
+          }).catch(err => this.$message.error('删除失败'))
+        } else {
+          this.$message.error('删除失败')
+        }
       })
-      // this.$confirm('确定要删除吗?', '信息', {
-      //   confirmButtonText: '确定',
-      //   cancelButtonText: '取消',
-      //   type: 'warning',
-      // }).then(() => {
-      //   ConfigDelete(row.deptId).then(res => {
-      //     if (res.success) {
-      //       this.$message({
-      //         type: 'success',
-      //         message: '公司已删除!',
-      //       })
-      //       this.getdata(this.formInline)
-      //     } else {
-      //       this.$message({
-      //         type: 'info',
-      //         message: res.msg,
-      //       })
-      //     }
-      //   }).catch(err => {
-      //     this.loading = false
-      //     this.$message.error('支付配置信息删除失败，请稍后再试！')
-      //   })
-      // }).catch(() => {
-      //   this.$message({
-      //     type: 'info',
-      //     message: '已取消删除',
-      //   })
-      // })
     },
     // 关闭编辑、增加弹出框
     closeDialog (formName) {