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

src/views/system/classinfo/index.vue

@@ -224,12 +224,12 @@
           />
         </el-form-item>
 
-        <el-form-item label="入学日期" prop="entranceDate">
+        <el-form-item label="入学日期" prop="entranceDateStr">
           <el-date-picker
             clearable
-            type="month"
+            type="date"
-            v-model="form.entranceDate"
+            v-model="form.entranceDateStr"
-            value-format="yyyy-MM"
+            value-format="yyyy-MM-dd"
             placeholder="请选择入学日期"
           >
           </el-date-picker>
@@ -440,7 +440,7 @@ export default {
         kindergartenId: null,
         className: null,
         classType: null,
-        entranceDate: null,
+        entranceDateStr: null,
       },
       queryParams2: {
         pageNum: 1,
@@ -449,6 +449,7 @@ export default {
         className: null,
         classType: null,
       },
+      time: "",
       // 表单参数
       form: {},
       // 表单校验
@@ -470,7 +471,7 @@ export default {
         classTeacher: [
           { required: true, message: "请输入班主任姓名", trigger: "blur" },
         ],
-        entranceDate: [
+        entranceDateStr: [
           { required: true, message: "请选择日期", trigger: "change" },
         ],
       },
@@ -533,7 +534,7 @@ export default {
         className: null,
         classType: null,
         classTeacher: null,
-        entranceDate: null,
+        entranceDateStr: "",
         phone: undefined,
         kindergartenName: null,
       };
@@ -595,6 +596,7 @@ export default {
       getClassinfo(id).then((response) => {
         response.data.phone = Number(response.data.phone);
         this.form = response.data;
+        console.log(this.form);
         this.kindergartenName = this.form.kindergartenName;
         this.open = true;
         this.title = "修改班级信息";

src/views/system/constitution/index.vue

@@ -616,8 +616,8 @@ export default {
         if (!res.data || res.data == "") {
           this.itemshow2 = true;
           this.itemshow = false;
-          this.batchCodeName = "请选择批次";
+          // this.batchCodeName = "请选择批次";
-          this.batchCodeId = "";
+          // this.batchCodeId = "";
         } else {
           this.analysislist = res.data;
           this.$nextTick(() => {

src/views/system/info/index.vue

@@ -220,7 +220,8 @@ export default {
     var checkMobile = (rule, value, cb) => {
       // 验证手机号的正则表达式
       const regMobile =
-        /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+      /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
+        // /^(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);
 

src/views/system/testItemScore/index.vue

@@ -183,7 +183,7 @@
             @click="yryinnerVisible = true"
             v-if="kindergartenName == '请选择幼儿园'"
             style="
-              width: 200px;
+              width: 240px;
               text-align: left;
               height: 36px;
               color: #c0c4cc;
@@ -197,7 +197,7 @@
             @click="yryinnerVisible = true"
             v-else
             style="
-              width: 200px;
+              width: 240px;
               text-align: left;
               height: 36px;
               padding-left: -10px;