diff --git a/src/views/Content/News.vue b/src/views/Content/News.vue
index 731b8e9220f063302d5219f56369f429dcfd1408..12a204781bdb6a0b83a36afde83747c55e328721 100644
--- a/src/views/Content/News.vue
+++ b/src/views/Content/News.vue
@@ -11,18 +11,28 @@
     <!-- 搜索筛选 -->
     <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-input v-model="formInline.search" auto-complete="off" placeholder="请输入搜索内容"/>
       </el-form-item>
       <el-form-item>
-        <el-button size="small" type="primary" icon="el-icon-search" @click="search" disabled>搜索</el-button>
-        <el-button size="small" type="primary" icon="el-icon-plus" @click="handleEdit()" disabled>添加</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </el-form-item>
+      <el-form-item label="新闻种类：">
+        <el-select size="small" v-model="formInline.type" placeholder="请选择新闻种类">
+          <el-option
+            v-for="item in filterNewsOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item class="publish-news-item-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
               element-loading-text="拼命加载中" style="width: 100%;">
       <el-table-column align="center" type="index" width="60"/>
-      <!--      <el-table-column sortable prop="id" label="ID" width="60" show-overflow-tooltip/>-->
       <el-table-column sortable prop="title" label="标题" width="180" show-overflow-tooltip/>
       <el-table-column sortable prop="content" label="新闻正文" min-width="350" show-overflow-tooltip/>
       <el-table-column sortable prop="file" label="新闻附件路径" width="250" show-overflow-tooltip/>
@@ -30,7 +40,7 @@
                        show-overflow-tooltip/>
       <el-table-column align="center" label="操作" width="200">
         <template slot-scope="scope">
-          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)">修改</el-button>
+          <el-button size="mini" @click="handleEdit(scope.$index, scope.row)" disabled>修改</el-button>
           <el-button size="mini" type="danger" @click="deleteUser(scope.$index, scope.row)">删除</el-button>
         </template>
       </el-table-column>
@@ -42,7 +52,7 @@
                :before-close="closeDialog">
       <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-form-item>
         <el-form-item label="新闻正文" prop="content">
           <el-input disabled size="small" v-model="editForm.content" auto-complete="off"
@@ -98,6 +108,28 @@ export default {
           label: '交流合作',
         },
       ],
+      filterNewsOptions: [
+        {
+          value: 4,
+          label: '全部',
+        },
+        {
+          value: 0,
+          label: '未知',
+        },
+        {
+          value: 1,
+          label: '通知公告',
+        },
+        {
+          value: 2,
+          label: '实验室动态',
+        },
+        {
+          value: 3,
+          label: '交流合作',
+        },
+      ],
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '',
@@ -105,7 +137,7 @@ export default {
         title: '',
         content: '',
         file: '',
-        type: '',
+        type: 4,
       },
       editId: 0,
       rules: {
@@ -115,6 +147,8 @@ export default {
       formInline: {
         page: 1,
         limit: 10,
+        search: '',
+        type: '',
       },
       listData: [
         {
@@ -123,8 +157,7 @@ export default {
           file: '',
           type: '',
         },
-      ], //用户数据
-      // 分页参数
+      ],
       pageparm: {
         currentPage: 1,
         pageSize: 10,
@@ -132,13 +165,16 @@ export default {
       },
     }
   },
-  // 注册组件
+
+  watch: {
+    'formInline.type': function (newVal, oldVal) {
+      this.getdata(this.formInline)
+    },
+  },
+
   components: {
     Pagination,
   },
-  /**
-   * 数据发生改变
-   */
 
   /**
    * 创建完毕
@@ -166,7 +202,7 @@ export default {
           return ''
       }
     },
-    // 获取公司列表
+
     getdata (parameter) {
       this.loading = true
       let that = this
@@ -174,6 +210,12 @@ export default {
         page: parameter.page,
         page_size: parameter.limit,
       }
+      if (parameter.type >= 0 && parameter.type <= 3) {
+        params.type = parameter.type
+      }
+      if (parameter.search !== '') {
+        params.search = parameter.search
+      }
       get(`/news/`, params).then(value => {
         this.listData = value.results
         that.pageparm.currentPage = that.formInline.page
@@ -184,17 +226,17 @@ export default {
         this.$message.error('加载失败')
       })
     },
-    // 分页插件事件
+
     callFather (parm) {
       this.formInline.page = parm.currentPage
       this.formInline.limit = parm.pageSize
       this.getdata(this.formInline)
     },
-    // 搜索事件
+
     search () {
       this.getdata(this.formInline)
     },
-    //显示编辑界面
+
     handleEdit: function (index, row) {
       this.editFormVisible = true
       if (row !== undefined && row !== 'undefined') {
@@ -212,20 +254,20 @@ export default {
         this.editForm.type = ''
       }
     },
-    // 编辑、增加页面保存方法
+
     submitForm (editData) {
       this.$refs[editData].validate(valid => {
         if (!valid || this.title === undefined || this.title !== '修改') {
           return false
         }
-        put(`/news/${this.editId}/`, { ...this.editForm }).then(() => {
+        put(`/news/${this.editForm.editId}/`, { ...this.editForm }).then(() => {
           this.editFormVisible = false
           this.$message.success('修改成功')
           this.getdata(this.formInline)
         }).catch(error => this.$message.error('修改失败'))
       })
     },
-    // 删除公司
+
     deleteUser (index, row) {
       this.$confirm('确定要删除该新闻?', '删除', {
         cancelButtonText: '取消',
@@ -242,7 +284,7 @@ export default {
         }
       })
     },
-    // 关闭编辑、增加弹出框
+
     closeDialog (formName) {
       this.editFormVisible = false
       this.$refs['editForm'].resetFields()
@@ -256,8 +298,9 @@ export default {
   margin-top: 20px;
 }
 
-.userRole {
-  width: 100%;
+.publish-news-item-button {
+  position: relative;
+  left: 35%;
 }
 </style>
 
diff --git a/src/views/Content/Patents.vue b/src/views/Content/Patents.vue
index c47037570c5546121f122cf2940aad9ec8bf0cdc..7d873a6fe5f17604782313097b1f5a0c709c271d 100644
--- a/src/views/Content/Patents.vue
+++ b/src/views/Content/Patents.vue
@@ -11,11 +11,23 @@
     <!-- 搜索筛选 -->
     <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-input size="small" v-model="formInline.search" placeholder="请输入搜索内容"/>
       </el-form-item>
       <el-form-item>
-        <el-button size="small" type="primary" icon="el-icon-search" @click="search" disabled>搜索</el-button>
-        <el-button size="small" type="primary" icon="el-icon-plus" @click="handleEdit()" disabled>添加</el-button>
+        <el-button size="small" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
+      </el-form-item>
+      <el-form-item label="发布地区：">
+        <el-select size="small" v-model="formInline.area" placeholder="请选择新闻种类">
+          <el-option
+            v-for="item in filterAreaOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button size="small" type="primary" icon="el-icon-plus" @click="handleEdit()">添加专利</el-button>
       </el-form-item>
     </el-form>
     <!--列表-->
@@ -65,7 +77,9 @@
           <el-date-picker
             v-model="editForm.grand_auth_time"
             type="date"
-            placeholder="请选择专利授权日期">
+            placeholder="请选择专利授权日期"
+            :picker-options='pickerOptions'
+            value-format="yyyy-MM-dd">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -80,7 +94,7 @@
 
 <script>
 import Pagination from '../../components/Pagination'
-import { Delete, get, put } from '../../utils/http'
+import { Delete, get, post, put } from '../../utils/http'
 
 export default {
   data () {
@@ -99,6 +113,24 @@ export default {
           label: '国外',
         },
       ],
+      filterAreaOptions: [
+        {
+          value: 3,
+          label: '全部',
+        },
+        {
+          value: 0,
+          label: '未知',
+        },
+        {
+          value: 1,
+          label: '中国',
+        },
+        {
+          value: 2,
+          label: '国外',
+        },
+      ],
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '编辑',
@@ -109,6 +141,7 @@ export default {
         area: '',
         grand_auth_time: '',
       },
+      editId: '',
       rules: {
         patent_id: [{ required: true, message: '请输入专利号', trigger: 'blur' }],
         title: [{ required: true, message: '请输入专利题目', trigger: 'blur' }],
@@ -119,13 +152,9 @@ export default {
       formInline: {
         page: 1,
         limit: 10,
-        machineNo: '',
-        orderNo: '',
-        transId: '',
-        payType: 0,
-        orderStatus: 0,
+        search: '',
+        area: 3,
       },
-      userparm: [], //搜索权限
       listData: [
         {
           patent_id: '',
@@ -134,33 +163,37 @@ export default {
           area: '',
           grand_auth_time: '',
         },
-      ], //用户数据
-      // 分页参数
+      ],
       pageparm: {
         currentPage: 1,
         pageSize: 10,
         total: 10,
       },
+      pickerOptions: {
+        disabledDate (time) {
+          return time.getTime() > Date.now()
+        },
+      },
     }
   },
-  // 注册组件
+
   components: {
     Pagination,
   },
+
   /**
    * 数据发生改变
    */
+  watch: {
+    'formInline.area': function () {
+      this.getdata(this.formInline)
+    },
+  },
 
-  /**
-   * 创建完毕
-   */
   created () {
     this.getdata(this.formInline)
   },
 
-  /**
-   * 里面的方法只有被调用才会执行
-   */
   methods: {
     patentAreaMapping (row) {
       let n = parseInt(row.area)
@@ -183,32 +216,38 @@ export default {
         page: parameter.page,
         page_size: parameter.limit,
       }
+      if (parameter.area >= 0 && parameter.area <= 2) {
+        params.area = parameter.area
+      }
+      if (parameter.search !== '') {
+        params.search = parameter.search
+      }
       get(`/patent/`, 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 => {
+      }).catch(() => {
         this.$message.error('加载失败')
       })
     },
-    // 分页插件事件
+
     callFather (parm) {
       this.formInline.page = parm.currentPage
       this.formInline.limit = parm.pageSize
       this.getdata(this.formInline)
     },
-    // 搜索事件
+
     search () {
       this.getdata(this.formInline)
     },
-    //显示编辑界面
+
     handleEdit: function (index, row) {
       this.editFormVisible = true
       if (row !== undefined && row !== 'undefined') {
         this.title = '修改'
-        this.editForm.editId = row.id
+        this.editId = row.id
         this.editForm.patent_id = row.patent_id
         this.editForm.title = row.title
         this.editForm.inventors = row.inventors
@@ -223,22 +262,30 @@ export default {
         this.editForm.grand_auth_time = ''
       }
     },
-    // 编辑、增加页面保存方法
+
     submitForm (editData) {
       this.$refs[editData].validate(valid => {
-        if (!valid || this.title === undefined || this.title !== '修改') {
+        if (!valid || this.title === undefined) {
           return false
         }
-        put(`/patent/${this.editId}/`, { ...this.editForm }).then(() => {
-          this.editFormVisible = false
-          this.$message.success('修改成功')
-          this.getdata(this.formInline)
-        }).catch(error => this.$message.error('修改失败'))
+        if (this.title === '修改') {
+          put(`/patent/${this.editId}/`, { ...this.editForm }).then(() => {
+            this.editFormVisible = false
+            this.$message.success('修改成功')
+            this.getdata(this.formInline)
+          }).catch(error => this.$message.error('修改失败'))
+        } else if (this.title === '添加') {
+          post(`/patent/`, { ...this.editForm }).then(() => {
+            this.editFormVisible = false
+            this.$message.success('添加成功')
+            this.getdata(this.formInline)
+          }).catch(() => this.$message.error('添加失败'))
+        }
       })
     },
-    // 删除公司
+
     deleteUser (index, row) {
-      this.$confirm('确定要删除该专利?', '删除', {
+      this.$confirm('确定要删除该专利?', '删除专利', {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',
@@ -253,8 +300,8 @@ export default {
         }
       })
     },
-    // 关闭编辑、增加弹出框
-    closeDialog (formName) {
+
+    closeDialog () {
       this.editFormVisible = false
       this.$refs['editForm'].resetFields()
     },
diff --git a/src/views/user/UsersManage.vue b/src/views/user/UsersManage.vue
index 63764fa857fd10d97fd50009b4ad5d5ce9097331..14a4d21c2121f6b286a0f1be5b4b31fe74e12250 100644
--- a/src/views/user/UsersManage.vue
+++ b/src/views/user/UsersManage.vue
@@ -6,15 +6,8 @@
       <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.deptName" placeholder="输入用户名"></el-input>
-      </el-form-item>
-      <el-form-item label="">
-        <el-input size="small" v-model="formInline.deptNo" 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-button size="small" type="primary" icon="el-icon-plus" @click="handleEdit()">添加用户</el-button>
       </el-form-item>
     </el-form>
     <!--列表-->
@@ -22,18 +15,10 @@
               element-loading-text="拼命加载中" style="width: 100%;">
       <el-table-column align="center" type="index" width="60"/>
       <el-table-column sortable prop="username" label="用户名" width="150"/>
-      <el-table-column sortable prop="password" label="密码" width="150"/>
+      <el-table-column sortable prop="password" label="密码" min-width="150"/>
       <el-table-column sortable prop="email" label="邮箱" width="150"/>
-      <el-table-column sortable prop="last_login" label="上一次登录时间" width="150"/>
-      <el-table-column sortable prop="is_superuser" label="超管" width="150"/>
-      <el-table-column sortable prop="first_name" label="名" width="150"/>
-      <el-table-column sortable prop="last_name" label="姓" width="150"/>
-      <el-table-column sortable prop="is_staff" label="是否可登录管理站点" width="150"/>
-      <el-table-column sortable prop="is_active" label="是否活跃" width="150"/>
-      <el-table-column sortable prop="date_joined" label="date_joined" width="150"/>
-      <el-table-column sortable prop="groups" label="用户权限组" width="150"/>
-      <el-table-column sortable prop="user_permissions" label="用户的特定权限" width="150"/>
-      <el-table-column align="center" label="操作" min-width="200">
+      <el-table-column sortable prop="date_joined" label="用户创建时间" width="180"/>
+      <el-table-column align="center" label="操作" width="200">
         <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>
@@ -43,48 +28,22 @@
     <!-- 分页组件 -->
     <Pagination v-bind:child-msg="pageparm" @callFather="callFather"></Pagination>
     <!-- 编辑界面 -->
-    <el-dialog :title="title" :visible.sync="editFormVisible" width="30%" @click="closeDialog">
+    <el-dialog :title="title" :visible.sync="editFormVisible" width="40%" :before-close="closeDialog"
+               :close-on-click-modal="false">
       <el-form label-width="120px" :model="editForm" :rules="rules" ref="editForm">
         <el-form-item label="用户名" prop="username">
-          <el-input size="small" v-model="editForm.username" auto-complete="off" placeholder="请输入学生姓名"></el-input>
+          <el-input size="small" v-model="editForm.username" auto-complete="off" placeholder="请输入用户名"></el-input>
         </el-form-item>
         <el-form-item label="密码" prop="password">
-          <el-input size="small" v-model="editForm.password" auto-complete="off" placeholder="请输入学生入学年份"></el-input>
+          <el-input size="small" v-model="editForm.password" auto-complete="off" placeholder="请输入密码" show-password></el-input>
         </el-form-item>
         <el-form-item label="邮箱" prop="email">
-          <el-input size="small" v-model="editForm.email" auto-complete="off" placeholder="请输入学生学历"></el-input>
-        </el-form-item>
-        <el-form-item label="上一次登录时间" prop="last_login">
-          <el-input size="small" v-model="editForm.last_login" auto-complete="off" placeholder="请输入学生是否在校"></el-input>
-        </el-form-item>
-        <el-form-item label="超管" prop="is_superuser">
-          <el-input size="small" v-model="editForm.is_superuser" auto-complete="off" placeholder="请输入学生是否毕业"></el-input>
-        </el-form-item>
-        <el-form-item label="名" prop="first_name">
-          <el-input size="small" v-model="editForm.first_name" auto-complete="off" placeholder="请输入学生毕业去处"></el-input>
-        </el-form-item>
-        <el-form-item label="姓" prop="last_name">
-          <el-input size="small" v-model="editForm.last_name" auto-complete="off" placeholder="请输入学生姓名"></el-input>
-        </el-form-item>
-        <el-form-item label="是否可登录管理站点" prop="is_staff">
-          <el-input size="small" v-model="editForm.is_staff" auto-complete="off" placeholder="请输入学生入学年份"></el-input>
-        </el-form-item>
-        <el-form-item label="是否活跃" prop="is_active">
-          <el-input size="small" v-model="editForm.is_active" auto-complete="off" placeholder="请输入学生学历"></el-input>
-        </el-form-item>
-        <el-form-item label="date_joined" prop="date_joined">
-          <el-input size="small" v-model="editForm.date_joined" auto-complete="off" placeholder="请输入学生是否在校"></el-input>
-        </el-form-item>
-        <el-form-item label="用户权限组" prop="groups">
-          <el-input size="small" v-model="editForm.groups" auto-complete="off" placeholder="请输入学生是否毕业"></el-input>
-        </el-form-item>
-        <el-form-item label="用户的特定权限" prop="user_permissions">
-          <el-input size="small" v-model="editForm.user_permissions" auto-complete="off" placeholder="请输入学生毕业去处"></el-input>
+          <el-input size="small" v-model="editForm.email" auto-complete="off" placeholder="请输入邮箱"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="closeDialog">取消</el-button>
-        <el-button size="small" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">保存
+        <el-button size="small" type="primary" :loading="loading" class="title" @click="submitForm('editForm')">提交
         </el-button>
       </div>
     </el-dialog>
@@ -92,79 +51,38 @@
 </template>
 
 <script>
-// import { deptList, deptSave, deptDelete } from '../../api/userMG'
 import Pagination from '../../components/Pagination'
+import { Delete, get, post, put } from '../../utils/http'
 
 export default {
   data () {
     return {
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
-      title: '添加',
+      title: '',
       editForm: {
-        username : '',
-        password : '',
-        last_login: '',
-        is_superuser: '',
-        first_name: '',
-        last_name: '',
-        email : '',
-        is_staff: '',
-        is_active: '',
-        date_joined: '',
-        groups: '',
-        user_permissions: '',
-        token: localStorage.getItem('logintoken'),
+        username: '',
+        password: '',
+        email: '',
       },
-      // rules表单验证
+      editId: '',
       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' }],
+        username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
+        password: [{ required: true, message: '请输入密码', trigger: 'blur' }],
+        email: [{ required: false, message: '请输入邮箱', trigger: 'blur' }],
       },
       formInline: {
         page: 1,
         limit: 10,
-        varLable: '',
-        varName: '',
-        token: localStorage.getItem('logintoken'),
-      },
-      // 删除部门
-      seletedata: {
-        ids: '',
-        token: localStorage.getItem('logintoken'),
       },
       listData: [
         {
-          username : 'GDGCC',
-          password : '11111',
-          last_login: '2021.7.15',
-          is_superuser: '是',
-          first_name: 'CAAAA',
-          last_name: 'CCHHH',
-          email : 's11nn@111.com',
-          is_staff: '是',
-          is_active: '是',
-          date_joined: '-',
-          groups: 'high',
-          user_permissions: 'yes',
+          username: '',
+          password: '',
+          email: '',
+          date_joined: '',
         },
-        {
-          username : 'JAAVVA',
-          password : '3321321',
-          last_login: '2021.7.12',
-          is_superuser: '是',
-          first_name: 'JA',
-          last_name: 'SUN',
-          email : 'sunnnn@111.com',
-          is_staff: '是',
-          is_active: '是',
-          date_joined: '-',
-          groups: 'low',
-          user_permissions: 'no',
-        },
-      ], 
+      ],
       pageparm: {
         currentPage: 1,
         pageSize: 10,
@@ -173,170 +91,101 @@ export default {
     }
   },
 
-  /**
-   * 数据发生改变
-   */
-  // 注册组件
   components: {
     Pagination,
   },
 
-  /**
-   * 创建完毕
-   */
   created () {
     this.getdata(this.formInline)
   },
 
-  /**
-   * 里面的方法只有被调用才会执行
-   */
   methods: {
-    // 获取学生列表
     getdata (parameter) {
       this.loading = true
-      this.loading = false
-      /***
-       * 调用接口，注释上面模拟数据 取消下面注释
-       */
-      // deptList(parameter)
-      //   .then(res => {
-      //     this.loading = false
-      //     if (res.success == false) {
-      //       this.$message({
-      //         type: 'info',
-      //         message: res.msg
-      //       })
-      //     } else {
-      //       this.listData = res.data
-      //       // 分页赋值
-      //       this.pageparm.currentPage = this.formInline.page
-      //       this.pageparm.pageSize = this.formInline.limit
-      //       this.pageparm.total = res.count
-      //     }
-      //   })
-      //   .catch(err => {
-      //     this.loading = false
-      //     this.$message.error('菜单加载失败，请稍后再试！')
-      //   })
+      let that = this
+      let params = {
+        page: parameter.page,
+        page_size: parameter.limit,
+      }
+      get(`/user/`, params).then(resp => {
+        let value = resp.data
+        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(() => {
+        this.$message.error('加载失败')
+      })
     },
-    // 分页插件事件
+
     callFather (parm) {
       this.formInline.page = parm.currentPage
       this.formInline.limit = parm.pageSize
       this.getdata(this.formInline)
     },
-    // 搜索事件
+
     search () {
       this.getdata(this.formInline)
     },
-    //显示编辑界面
+
     handleEdit: function (index, row) {
       this.editFormVisible = true
       if (row !== undefined && row !== 'undefined') {
-        console.log('哈哈哈哈哈哈哈哈')
         this.title = '修改'
+        this.editId = row.id
         this.editForm.username = row.username
         this.editForm.password = row.password
-        this.editForm.last_login = row.last_login
-        this.editForm.is_superuser = row.is_superuser
-        this.editForm.first_name = row.first_name
-        this.editForm.last_name = row.last_name
         this.editForm.email = row.email
-        this.editForm.is_staff = row.is_staff
-        this.editForm.is_active = row.is_active
-        this.editForm.date_joined = row.date_joined
-        this.editForm.groups = row.groups
-        this.editForm.user_permissions = row.user_permissions
       } else {
         this.title = '添加'
         this.editForm.username = ''
         this.editForm.password = ''
-        this.editForm.last_login = ''
-        this.editForm.is_superuser = ''
-        this.editForm.first_name = ''
-        this.editForm.last_name = ''
         this.editForm.email = ''
-        this.editForm.is_staff = ''
-        this.editForm.is_active = ''
-        this.editForm.date_joined = ''
-        this.editForm.groups = ''
-        this.editForm.user_permissions = ''
       }
     },
-    // 编辑、增加页面保存方法
+
     submitForm (editData) {
-      this.$message({
-        type: 'success',
-        message: '添加/修改操作成功',
+      this.$refs[editData].validate(valid => {
+        if (!valid || this.title === undefined) {
+          return false
+        }
+        if (this.title === '修改') {
+          put(`/user/${this.editId}/`, { ...this.editForm }).then(() => {
+            this.editFormVisible = false
+            this.$message.success('修改成功')
+            this.getdata(this.formInline)
+          }).catch(error => this.$message.error('修改失败'))
+        } else if (this.title === '添加') {
+          post(`/user/`, { ...this.editForm }).then(() => {
+            this.editFormVisible = false
+            this.$message.success('添加成功')
+            this.getdata(this.formInline)
+          }).catch(() => this.$message.error('添加失败'))
+        }
       })
-      // this.$refs[editData].validate(valid => {
-      //     if (valid) {
-      //       deptSave(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(`/user/${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(() => {
-      //   deptDelete(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 () {
       this.editFormVisible = false
+      this.$refs['editForm'].resetFields()
     }
     ,
   },
@@ -351,4 +200,4 @@ export default {
 .userRole {
   width: 100%;
 }
-</style>
\ No newline at end of file
+</style>