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

src/layout/components/Sidebar/Logo.vue

@@ -35,7 +35,7 @@ export default {
   },
   data() {
     return {
-      title: '幼儿园体质检测管理系统',
+      title: '智慧幼儿体质评估与促进系统',
       logo: logoImg
     }
   }
@@ -66,10 +66,11 @@ export default {
     width: 100%;
 
     & .sidebar-logo {
-      width: 32px;
+      width: 18px;
       height: 32px;
       vertical-align: middle;
-      margin-right: 12px;
+
+
     }
 
     & .sidebar-title {
@@ -81,6 +82,7 @@ export default {
       font-size: 14px;
       font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
       vertical-align: middle;
+
     }
   }
 

src/views/system/classinfo/index.vue

@@ -33,6 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+
       <el-form-item label="联系电话" prop="phone">
         <el-input
           v-model="queryParams.phone"
@@ -130,6 +131,18 @@
         </template>
       </el-table-column>
       <el-table-column label="班主任姓名" align="center" prop="classTeacher" />
+
+      <el-table-column
+        label="入学日期"
+        clearable
+        align="center"
+        prop="entranceYear"
+        width="180"
+      >
+        <template slot-scope="scope">
+          <span>{{ scope.row.entranceYear }}年</span>
+        </template>
+      </el-table-column>
       <el-table-column label="联系电话" align="center" prop="phone" />
       <el-table-column
         label="操作"
@@ -210,6 +223,17 @@
             placeholder="请输入班主任姓名"
           />
         </el-form-item>
+
+        <el-form-item label="入学日期" prop="entranceDate">
+          <el-date-picker
+            clearable
+            type="month"
+            v-model="form.entranceDate"
+            value-format="yyyy-MM"
+            placeholder="请选择入学日期"
+          >
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="联系电话" prop="phone">
           <el-input
             v-model="form.phone"
@@ -360,18 +384,19 @@ export default {
     // 验证手机号的规则
     var checkMobile = (rule, value, cb) => {
       console.log(value);
-      console.log(value.length);
+      var str = String(value);
+      console.log(str);
       // 验证手机号的正则表达式
       const regMobile =
         /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
       const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
-      const isTel = reg.test(value);
+      const isTel = reg.test(str);
 
-      if (value.length == 11) {
+      if (str.length == 11) {
-        if (regMobile.test(value)) {
+        if (regMobile.test(str)) {
           return cb();
         }
-      } else if (11 < value.length <= 13) {
+      } else if (11 < str.length <= 13) {
         if (isTel) {
           return cb();
         }
@@ -415,6 +440,7 @@ export default {
         kindergartenId: null,
         className: null,
         classType: null,
+        entranceDate: null,
       },
       queryParams2: {
         pageNum: 1,
@@ -427,14 +453,6 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        kindergartenId: [{ required: true, message: "请选择所属幼儿园" }],
-        className: [
-          { required: true, message: "请输入班级名称", trigger: "blur" },
-        ],
-        classType: [{ required: true, message: "请选择幼儿园类型" }],
-        classTeacher: [
-          { required: true, message: "请输入班主任姓名", trigger: "blur" },
-        ],
         phone: [
           {
             required: true,
@@ -443,6 +461,18 @@ export default {
             message: "",
           },
         ],
+        kindergartenId: [{ required: true, message: "请选择所属幼儿园" }],
+        className: [
+          { required: true, message: "请输入班级名称", trigger: "blur" },
+        ],
+        classType: [{ required: true, message: "请选择幼儿园类型" }],
+
+        classTeacher: [
+          { required: true, message: "请输入班主任姓名", trigger: "blur" },
+        ],
+        entranceDate: [
+          { required: true, message: "请选择日期", trigger: "change" },
+        ],
       },
     };
   },
@@ -477,6 +507,7 @@ export default {
         this.total2 = response.total;
       });
       listClassinfo(this.queryParams).then((response) => {
+        console.log(response);
         this.classinfoList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -502,6 +533,7 @@ export default {
         className: null,
         classType: null,
         classTeacher: null,
+        entranceDate: null,
         phone: undefined,
         kindergartenName: null,
       };