From 8b395febb9ce893e5dcbb73ad1d6e59b58c09f3b Mon Sep 17 00:00:00 2001
From: CoderSYP <1253596951@qq.com>
Date: Tue, 3 Aug 2021 08:21:36 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90feat=E3=80=91=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E4=BB=BB=E6=84=8F=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Content/Papers.vue   | 15 ++++++++++-----
 src/views/Content/Students.vue | 17 +++++++++++------
 src/views/Content/Teachers.vue | 25 +++++++++++++++++--------
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/views/Content/Papers.vue b/src/views/Content/Papers.vue
index 5cf4bfe..6d385f9 100644
--- a/src/views/Content/Papers.vue
+++ b/src/views/Content/Papers.vue
@@ -10,7 +10,7 @@
     </el-breadcrumb>
     <!-- 搜索筛选 -->
     <el-form :inline="true" :model="formInline" class="user-search">
-      <el-form-item label="是否为特邀论文：">
+      <el-form-item label="是否为特邀论文:">
         <el-select size="small" v-model="selectIs_invited" placeholder="是否为特邀论文">
           <el-option
             v-for="item in selectIs_invitedOptions"
@@ -20,7 +20,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="请选择论文种类：">
+      <el-form-item label="请选择论文种类:">
         <el-select size="small" v-model="selectType"  placeholder="请选择论文种类">
           <el-option
             v-for="item in selectPapersOptions"
@@ -30,9 +30,13 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="搜索:">
+        <el-input size="small" v-model="searchPut" auto-complete="off"
+                  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-search" @click="search">筛选</el-button>
+        <el-button disabled size="small" type="primary" icon="el-icon-plus" @click="handleEdit()">添加</el-button>
       </el-form-item>
     </el-form>
     <!--列表-->
@@ -165,6 +169,7 @@ export default {
       ],
       selectIs_invited:'',
       selectType:'',
+      searchPut:'',
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '',
@@ -257,7 +262,7 @@ export default {
         page: parameter.page,
         page_size: parameter.limit,
       }
-      get(`/paper/?type=`+this.selectType+'&is_invited='+this.selectIs_invited, params).then(value => {
+      get(`/paper/?type=`+this.selectType+'&is_invited='+this.selectIs_invited+'&search='+this.searchPut, params).then(value => {
         this.listData = value.results
         that.pageparm.currentPage = that.formInline.page
         that.pageparm.pageSize = that.formInline.pageSize
diff --git a/src/views/Content/Students.vue b/src/views/Content/Students.vue
index 3929082..4ec50b8 100644
--- a/src/views/Content/Students.vue
+++ b/src/views/Content/Students.vue
@@ -10,7 +10,7 @@
     </el-breadcrumb>
     <!-- 搜索筛选 -->
     <el-form :inline="true" :model="formInline" class="user-search">
-      <el-form-item label="请选择是否毕业：">
+      <el-form-item label="是否毕业:">
         <el-select size="small" v-model="selectIs_graduated" placeholder="是否毕业">
           <el-option
             v-for="item in selectIs_graduatedOptions"
@@ -20,11 +20,11 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="请输入学生入学年份">
+      <el-form-item label="入学年份:">
         <el-input size="small" v-model="selectJoin_year" auto-complete="off"
                         placeholder="请输入学生入学年份"></el-input>
       </el-form-item>
-      <el-form-item label="请选择学历身份：">
+      <el-form-item label="学历:">
         <el-select size="small" v-model="selectIdentity" placeholder="请选择学历身份">
           <el-option
             v-for="item in selectGradeOptions"
@@ -34,9 +34,13 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="搜索:">
+        <el-input size="small" v-model="searchPut" auto-complete="off"
+                  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-search" @click="search">筛选</el-button>
+        <el-button disabled size="small" type="primary" icon="el-icon-plus" @click="handleEdit()">添加</el-button>
       </el-form-item>
     </el-form>
     <!--列表-->
@@ -197,6 +201,7 @@ export default {
       selectIs_graduated:'',
       selectIdentity:'',
       selectJoin_year: '',
+      searchPut:'',
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '',
@@ -307,7 +312,7 @@ export default {
         page: parameter.page,
         page_size: parameter.limit,
       }
-      get(`/student/?is_graduated=`+this.selectIs_graduated+'&identity='+this.selectIdentity+'&join_year='+this.selectJoin_year, params).then(value => {
+      get(`/student/?is_graduated=`+this.selectIs_graduated+'&identity='+this.selectIdentity+'&join_year='+this.selectJoin_year+'&search='+this.searchPut, params).then(value => {
         this.listData = value.results
         that.pageparm.currentPage = that.formInline.page
         that.pageparm.pageSize = that.formInline.pageSize
diff --git a/src/views/Content/Teachers.vue b/src/views/Content/Teachers.vue
index 60f9339..68e8e67 100644
--- a/src/views/Content/Teachers.vue
+++ b/src/views/Content/Teachers.vue
@@ -1,3 +1,6 @@
+/**
+* 教师管理
+*/
 <template>
   <div>
     <!-- 面包屑导航 -->
@@ -7,7 +10,7 @@
     </el-breadcrumb>
     <!-- 搜索筛选 -->
     <el-form :inline="true" :model="formInline" class="user-search">
-      <el-form-item label="性别：">
+      <el-form-item label="性别:">
         <el-select size="small" v-model="selectGender" placeholder="请输入教师性别">
           <el-option
             v-for="item in selectGenderOptions"
@@ -17,7 +20,7 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="身份：">
+      <el-form-item label="身份:">
         <el-select size="small" v-model="selectIdentity"  placeholder="请选择教师身份">
           <el-option
             v-for="item in selectIdentityOptions"
@@ -27,9 +30,13 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="搜索:">
+        <el-input size="small" v-model="searchPut" auto-complete="off"
+                  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-search" @click="search">筛选</el-button>
+        <el-button disabled size="small" type="primary" icon="el-icon-plus" @click="handleEdit()">添加</el-button>
       </el-form-item>
     </el-form>
     <!--列表-->
@@ -119,7 +126,7 @@
 <script>
 // import { deptList, deptSave, deptDelete } from '../../api/userMG'
 import Pagination from '../../components/Pagination'
-import {get} from "../../utils/http";
+import {Delete, get, put} from "../../utils/http";
 
 export default {
   data () {
@@ -198,6 +205,7 @@ export default {
       ],
       selectIdentity: '',
       selectGender: '',
+      searchPut:'',
       loading: false, //是显示加载
       editFormVisible: false, //控制编辑页面显示与隐藏
       title: '添加',
@@ -214,6 +222,7 @@ export default {
         identity: '',
         avatar: '',
       },
+      editId: 0,
       // rules表单验证
       rules: {    // TODO
         name: [{ required: true, message: '请输入教师姓名', trigger: 'blur' }]
@@ -309,7 +318,7 @@ export default {
         page: parameter.page,
         page_size: parameter.limit,
       }
-      get(`/teacher/?gender=`+this.selectGender+'&identity='+this.selectIdentity, params).then(value => {
+      get(`/teacher/?gender=`+this.selectGender+'&identity='+this.selectIdentity+'&search='+this.searchPut, params).then(value => {
         this.listData = value.results
         that.pageparm.currentPage = that.formInline.page
         that.pageparm.pageSize = that.formInline.pageSize
@@ -375,7 +384,7 @@ export default {
     },
     // 删除公司
     deleteUser (index, row) {
-      this.$confirm('确定要删除该文章?', '信息', {
+      this.$confirm('确定要删除该教师?', '信息', {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
         type: 'warning',
@@ -391,7 +400,7 @@ export default {
       })
     },
     // 关闭编辑、增加弹出框
-    closeDialog () {
+    closeDialog (formName) {
       this.editFormVisible = false
       this.$refs[formName].resetFields()
     },
-- 
Gitee