From 4b5162557f98528cf772dd6a157593439d424673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Tue, 30 Aug 2022 16:57:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=97=B6=E9=97=B4=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/studentInfo/index.vue | 63 +++++++++++++++++---------
 1 file changed, 41 insertions(+), 22 deletions(-)

diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue
index 8c0c3e6..3b161ec 100644
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@@ -43,10 +43,13 @@
       <el-form-item label="出生日期" prop="birthDate">
         <el-date-picker
           clearable
-          v-model="queryParams.birthDate"
-          type="date"
+          v-model="Data"
           value-format="yyyy-MM-dd"
-          placeholder="请选择出生日期"
+          type="daterange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          unlink-panels
         >
         </el-date-picker>
       </el-form-item>
@@ -82,6 +85,7 @@
           @click="handleQuery"
           >搜索</el-button
         >
+
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
           >重置</el-button
         >
@@ -215,14 +219,8 @@
     />
 
     <!-- 添加或修改学生信息对话框 -->
-    <el-dialog
-      :title="title"
-      :visible.sync="open"
-      width="500px"
-      append-to-body
-      :before-close="cancel"
-    >
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="85px">
         <el-form-item label="所属班级" prop="classId">
           <el-button
             type=""
@@ -329,7 +327,6 @@
         :visible.sync="innerVisible2"
         append-to-body
         :before-close="prentclickok"
-     
       >
         <el-form
           :model="parentInfoList2"
@@ -338,7 +335,6 @@
           :inline="true"
           v-show="showSearch"
           label-width="70px"
-          style="margin-bottom:-30px;"
         >
           <el-form-item label="家长姓名" prop="parentName">
             <el-input
@@ -427,6 +423,14 @@
           </el-table-column>
         </el-table>
 
+        <el-button
+          type="success"
+          plain
+          size="mini"
+          @click="prentclickok"
+          style="margin-top: 30px; margin-left: 20px"
+          >选择完成</el-button
+        >
 
         <pagination
           v-show="total3 > 0"
@@ -434,16 +438,7 @@
           :page.sync="parentInfoList2.pageNum"
           :limit.sync="parentInfoList2.pageSize"
           @pagination="getList"
-          style="margin-top:40px"
         />
-        
-        <el-button
-          type="primary"
-          size="mini"
-          @click="prentclickok"
-          style="margin-top: 30px; margin-left: 85%;width: 100px; height: 50px;font-size:15px"
-          >选择完成</el-button
-        >
       </el-dialog>
 
       <!-- //班级信息表格数据 -->
@@ -721,6 +716,8 @@ export default {
           return time.getTime() > Date.now();
         },
       },
+      Data: "",
+
       //查看家长
       parentStudentInfoList: [],
       //民族
@@ -729,6 +726,7 @@ export default {
       male: "MALE",
       female: "FEMALE",
       // 遮罩层
+      kindergartenshow: false,
       loading: true,
       innerVisible: false,
       innerVisible2: false,
@@ -811,6 +809,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
+
       queryParams: {
         pageNum: 1,
         pageSize: 10,
@@ -1319,6 +1318,10 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log(this.Data);
+      this.queryParams.startTime = this.Data[0];
+      this.queryParams.endTime = this.Data[1];
+
       this.queryParams.pageNum = 1;
       listStudentInfo(this.queryParams).then((res) => {
         this.studentInfoList = res.rows;
@@ -1333,7 +1336,23 @@ export default {
     /** 重置按钮操作 */
     resetQuery1() {
       this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        classId: null,
+        nationDictId: null,
+        studentName: null,
+        studentSex: null,
+        studentNumber: null,
+        birthDate: null,
+        cardNumber: null,
+        onceName: null,
+        homeAddress: null,
+      };
+      this.Data = [];
+
       this.handleQuery();
+      // this.reload();
     },
     /** 重置按钮操作 */
     resetQuery3() {