diff --git a/src/api/system/testItemScore.js b/src/api/system/testItemScore.js
index 9a899ff..d932d80 100644
--- a/src/api/system/testItemScore.js
+++ b/src/api/system/testItemScore.js
@@ -56,6 +56,14 @@ export function getTestItemScore(query) {
})
}
+// 查询个人成绩
+// export function getAllTestItemScoreInfo(id) {
+// return request({
+// url: 'system/testItemScore/getAllTestItemScoreInfo' + id,
+// method: 'get'
+// })
+// }
+
// 新增个人成绩录入管理
export function addTestItemScore(data) {
return request({
@@ -86,6 +94,6 @@ export function getAllTestItemScoreInfo(query) {
return request({
url: '/system/testItemScore/getAllTestItemScoreInfo',
method: 'get',
- params: query
+ params: query,
})
}
\ No newline at end of file
diff --git a/src/views/system/classinfo/index.vue b/src/views/system/classinfo/index.vue
index 60e5ee2..fd38ee3 100644
--- a/src/views/system/classinfo/index.vue
+++ b/src/views/system/classinfo/index.vue
@@ -389,9 +389,11 @@ export default {
console.log(str);
// 验证手机号的正则表达式
const regMobile =
- /^(?:(?:\+|00)86)?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[189]))\d{8}$/;
+ /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+ // /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
+ // /^(?:(?:\+|0086))?1(?:(?:3[\d])|(?:4[5-79])|(?:5[0-35-9])|(?:6[5-7])|(?:7[0-8])|(?:8[\d])|(?:9[0-9]))\d{8}$/;
const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
- const isTel = reg.test(str);
+ const isTel = reg.test(value);
if (str.length == 11) {
if (regMobile.test(str)) {
diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue
index 3b161ec..06b1872 100644
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@@ -49,7 +49,9 @@
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
+ :picker-options="expireTimeOPtion"
unlink-panels
+ style="width: 240px"
>
@@ -219,8 +221,14 @@
/>
-
-
+
+
-
+
+
+
@@ -423,22 +437,28 @@
- 选择完成
-
+
+ 选择完成
@@ -504,7 +524,12 @@
-
+
Date.now();
},
},
+ expireTimeOPtion: {
+ disabledDate(time) {
+ return time.getTime() > Date.now();
+ },
+ },
+
Data: "",
//查看家长
@@ -809,7 +840,6 @@ export default {
// 是否显示弹出层
open: false,
// 查询参数
-
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -1352,7 +1382,7 @@ export default {
this.Data = [];
this.handleQuery();
- // this.reload();
+ this.form.studentNumber = null;
},
/** 重置按钮操作 */
resetQuery3() {
diff --git a/src/views/system/teacherInfo/index.vue b/src/views/system/teacherInfo/index.vue
index a4e1cea..7edbe7f 100644
--- a/src/views/system/teacherInfo/index.vue
+++ b/src/views/system/teacherInfo/index.vue
@@ -302,8 +302,8 @@
-
-
+
+
-
+
@@ -494,21 +494,20 @@
>
- 选择完成
-
+ 选择完成
+
-
-
+
-
+
+
@@ -924,6 +932,101 @@
@pagination="getList"
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -974,6 +1077,7 @@ export default {
testItemss: [],
testScoreBatchs: [],
innerVisible4: false,
+ innerVisible5: false,
itemNumbername: "请选择批次编号",
//幼儿园查询参数
kqueryParams: {
@@ -1011,6 +1115,8 @@ export default {
classInfos: [],
// 个人成绩录入管理表格数据
testItemScoreList: [],
+ //个人成绩查看
+ getAllTestItemScore: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -1081,6 +1187,16 @@ export default {
},
methods: {
+ // 查看个人信息
+ seepraent(row) {
+ this.reset();
+ // const row = row.id || this.ids;
+ getAllTestItemScoreInfo(row).then((res) => {
+ this.getAllTestItemScore = res.data;
+ // console.log(this.getAllTestItemScore);
+ this.innerVisible5 = true;
+ });
+ },
testclick() {
this.innerVisible4 = true;
},
@@ -1164,8 +1280,6 @@ export default {
getList() {
//查询班级信息
this.loading = true;
- console.log(this.queryParams);
-
//获取幼儿园list
listKindergartenInfo(this.kqueryParams).then((response) => {
this.kindergartenList = response.rows;
@@ -1214,6 +1328,7 @@ export default {
studentId: null,
batchCode: null,
itemScoreList: [],
+ batchId:null,
};
this.resetForm("form");
},