diff --git a/.env.development b/.env.development
index dd5ac82..2a72dbc 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,7 @@ VUE_APP_TITLE = 幼儿园体质检测管理系统
ENV = 'development'
# 若依管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.16.81:8080'
+VUE_APP_BASE_API = 'http://192.168.16.81:8081'
#'/dev-api'
# 路由懒加载
diff --git a/src/api/system/parentInfo.js b/src/api/system/parentInfo.js
index 88bca51..5571c7e 100644
--- a/src/api/system/parentInfo.js
+++ b/src/api/system/parentInfo.js
@@ -16,7 +16,14 @@ export function getParentInfo(id) {
method: 'get'
})
}
-
+//添加家长信息
+export function addParentInfo(data) {
+ return request({
+ url: '/system/parentInfo/add',
+ method: 'post',
+ data: data
+ })
+}
// 修改家长信息
export function updateParentInfo(data) {
diff --git a/src/views/system/itemCategory/index.vue b/src/views/system/itemCategory/index.vue
index 5ab9e6d..d4158dc 100644
--- a/src/views/system/itemCategory/index.vue
+++ b/src/views/system/itemCategory/index.vue
@@ -124,12 +124,13 @@
align="center"
prop="categoryNameAbbreviate"
/>
-
-
+
-
-
+
+
+
-
+
{{ scope.row.applyCrowd == 0 ? "普通" : "" }}
@@ -117,8 +117,8 @@
-
-
+
-
+
+
+ 新增
+
-
-
+
{
// 验证手机号的正则表达式
const regMobile =
- /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
+ /^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57]|19[0-9])[0-9]{8}$/;
if (regMobile.test(value)) {
return cb();
@@ -276,8 +288,8 @@ export default {
this.total = response.total;
this.loading = false;
});
- this.queryParams.parentName = null;
- this.queryParams.phone = null;
+ // this.queryParams.parentName = null;
+ // this.queryParams.phone = null;
},
/** 重置按钮操作 */
resetQuery() {
@@ -316,6 +328,12 @@ export default {
this.open = false;
this.getList();
});
+ }else {
+ addParentInfo(this.form).then((response) => {
+ this.$modal.msgSuccess("新增成功");
+ this.open = false;
+ this.getList();
+ });
}
}
});
diff --git a/src/views/system/studentInfo/index.vue b/src/views/system/studentInfo/index.vue
index 454e80b..3b161ec 100644
--- a/src/views/system/studentInfo/index.vue
+++ b/src/views/system/studentInfo/index.vue
@@ -43,10 +43,13 @@
@@ -82,6 +85,7 @@
@click="handleQuery"
>搜索
+
重置
@@ -215,14 +219,8 @@
/>
-
-
+
+
Date.now();
},
},
+ Data: "",
+
//查看家长
parentStudentInfoList: [],
//民族
@@ -726,6 +726,7 @@ export default {
male: "MALE",
female: "FEMALE",
// 遮罩层
+ kindergartenshow: false,
loading: true,
innerVisible: false,
innerVisible2: false,
@@ -808,6 +809,7 @@ export default {
// 是否显示弹出层
open: false,
// 查询参数
+
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -983,9 +985,9 @@ export default {
this.classinfoList2 = {
pageNum: 1,
pageSize: 10,
- kindergartenId: null,
- className: null,
- classType: null,
+ // kindergartenId: null,
+ // className: null,
+ // classType: null,
};
this.handleQuery2();
},
@@ -1316,6 +1318,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;
@@ -1330,7 +1336,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();
+ // this.reload();
},
/** 重置按钮操作 */
resetQuery3() {
diff --git a/src/views/system/testItemScore/index.vue b/src/views/system/testItemScore/index.vue
index a56a68c..958f495 100644
--- a/src/views/system/testItemScore/index.vue
+++ b/src/views/system/testItemScore/index.vue
@@ -140,20 +140,25 @@
v-loading="loading"
:data="testItemScoreList"
@selection-change="handleSelectionChange"
+ @row-dblclick="handledbClick"
+ ref="table"
>
-
-
-
-
+
+
+
+
+
diff --git a/src/views/system/testScoreBatch/index.vue b/src/views/system/testScoreBatch/index.vue
index ebe7a84..02d3832 100644
--- a/src/views/system/testScoreBatch/index.vue
+++ b/src/views/system/testScoreBatch/index.vue
@@ -102,8 +102,8 @@
-
-
+