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

src/api/system/testItemScore.js

@@ -45,10 +45,12 @@ export function testScoreBatch(query) {
 }
 
 // 查询个人成绩录入管理详细
-export function getTestItemScore(id) {
+export function getTestItemScore(query) {
     return request({
-        url: '/system/testItemScore/' + id,
+        url: '/system/testItemScore/getInfo',
-        method: 'get'
+        method: 'get',
+        params: query
+
     })
 }
 
@@ -71,10 +73,10 @@ export function updateTestItemScore(data) {
 }
 
 // 删除个人成绩录入管理
-export function delTestItemScore(id) {
+export function delTestItemScore(studentId, batchCode) {
     return request({
-        url: '/system/testItemScore/' + id,
+        url: '/system/testItemScore/deleteItemScore?studentId=' + studentId + '&batchCode=' + batchCode,
-        method: 'delete'
+        method: 'post',
     })
 }
 // 反显

src/views/system/classinfo/index.vue

@@ -238,7 +238,7 @@
           <el-input
             v-model="form.phone"
             placeholder="请输入联系电话"
-            maxlength="13"
+            maxlength="11"
           />
         </el-form-item>
       </el-form>
@@ -388,7 +388,7 @@ export default {
       console.log(str);
       // 验证手机号的正则表达式
       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}$/;
       const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
       const isTel = reg.test(str);
 

src/views/system/teacherInfo/index.vue

@@ -247,7 +247,7 @@
           <el-input
             v-model="form.teacherPhone"
             placeholder="请输入联系电话"
-            maxlength="13"
+            maxlength="11"
           />
         </el-form-item>
       </el-form>
@@ -581,6 +581,7 @@ import {
 export default {
   name: "TeacherInfo",
   data() {
+      // const checkMobile =/^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
     // 验证手机号的规则
     var checkMobile = (rule, value, cb) => {
       // 验证手机号的正则表达式
@@ -590,7 +591,7 @@ export default {
         cb();
       } else {
         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}$/;
         const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
         const isTel = reg.test(value);