Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	src/views/system/studentInfo/index.vue

src/views/system/studentInfo/index.vue

@@ -43,10 +43,13 @@
       <el-form-item label="出生日期" prop="birthDate">
         <el-date-picker
           clearable
-          v-model="queryParams.birthDate"
+          v-model="Data"
-          type="date"
           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
         >
@@ -329,7 +333,7 @@
         :visible.sync="innerVisible2"
         append-to-body
         :before-close="prentclickok"
-     
+
       >
         <el-form
           :model="parentInfoList2"
@@ -389,7 +393,7 @@
               <el-button
                 type="primary"
                 style="width: 20px; height: 20px;padding:0px;"
-                
+
                 v-if="parent1 == scope.row.id || parent2 == scope.row.id"
                 @click="handleSelectionChange3(scope.row)"
               ></el-button>
@@ -437,7 +441,7 @@
           @pagination="getList"
           style="margin-top:40px"
         />
-        
+
         <el-button
           type="primary"
           size="mini"
@@ -722,6 +726,8 @@ export default {
           return time.getTime() > Date.now();
         },
       },
+      Data: "",
+
       //查看家长
       parentStudentInfoList: [],
       //民族
@@ -730,6 +736,7 @@ export default {
       male: "MALE",
       female: "FEMALE",
       // 遮罩层
+      kindergartenshow: false,
       loading: true,
       innerVisible: false,
       innerVisible2: false,
@@ -1320,6 +1327,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;
@@ -1334,8 +1345,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();
-      form.studentNumber=null;
+      this.form.studentNumber=null;
     },
     /** 重置按钮操作 */
     resetQuery3() {
@@ -1446,7 +1472,3 @@ export default {
   },
 };
 </script>
-
-<style lang="scss" scoped>
-
-</style>