xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/views/system/testItemScore/index.vue
This commit is contained in:
曹辉 2022-08-30 17:50:38 +08:00
commit 499f74f581
8 changed files with 89 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -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'
# 路由懒加载

9
src/api/system/parentInfo.js
View File

@ -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) {

9
src/views/system/itemCategory/index.vue
View File

@ -124,12 +124,13 @@
align="center"
prop="categoryNameAbbreviate"
/>
<el-table-column label="分类排序" align="center" prop="sorting" />
<el-table-column label="备注信息" align="center" prop="remark" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" />
<el-table-column label="分类排序" align="center" prop="sorting" />
<el-table-column label="备注信息" align="center" prop="remark" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" /> -->
<el-table-column
label="操作"
align="center"

6
src/views/system/motionInfo/index.vue
View File

@ -108,7 +108,7 @@
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="处方名称" align="center" prop="motionName" />
<el-table-column label="处方内容" align="center" prop="motionContent" />
<el-table-column label="处方内容" align="center" prop="motionContent" :show-overflow-tooltip="true"/>
<el-table-column label="适用人群" align="center" prop="applyCrowd">
<template slot-scope="scope">
{{ scope.row.applyCrowd == 0 ? "普通" : "" }}
@ -117,8 +117,8 @@
</el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" /> -->
<el-table-column
label="操作"
align="center"

30
src/views/system/parentInfo/index.vue
View File

@ -38,8 +38,19 @@
>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['system:parentInfo:add']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
@ -95,8 +106,8 @@
<el-table-column label="联系电话" align="center" prop="phone" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" /> -->
<el-table-column
label="操作"
@ -168,6 +179,7 @@ import {
getParentInfo,
delParentInfo,
updateParentInfo,
addParentInfo,
} from "@/api/system/parentInfo";
export default {
@ -177,7 +189,7 @@ 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}$/;
/^(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();
});
}
}
});

50
src/views/system/studentInfo/index.vue
View File

@ -43,10 +43,13 @@
<el-form-item label="出生日期" prop="birthDate">
<el-date-picker
clearable
v-model="queryParams.birthDate"
type="date"
v-model="Data"
value-format="yyyy-MM-dd"
placeholder="请选择出生日期"
type="daterange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
unlink-panels
>
</el-date-picker>
</el-form-item>
@ -82,6 +85,7 @@
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
>重置</el-button
>
@ -215,14 +219,8 @@
/>
<!-- 添加或修改学生信息对话框 -->
<el-dialog
:title="title"
:visible.sync="open"
width="500px"
append-to-body
:before-close="cancel"
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="85px">
<el-form-item label="所属班级" prop="classId">
<el-button
type=""
@ -718,6 +716,8 @@ export default {
return time.getTime() > 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() {

15
src/views/system/testItemScore/index.vue
View File

@ -140,20 +140,25 @@
v-loading="loading"
:data="testItemScoreList"
@selection-change="handleSelectionChange"
@row-dblclick="handledbClick"
ref="table"
>
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="班级名称" align="center" prop="className" />
<el-table-column label="学生姓名" align="center" prop="studentName" />
<el-table-column
<el-table-column
width="150"
label="所属批次编号"
align="center"
prop="batchCode"
/>
<el-table-column label="批次名称" align="center" prop="batchName" />
<el-table-column label="班级名称" align="center" prop="className" />
<el-table-column label="学生姓名" align="center" prop="studentName" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" /> -->
<el-table-column
label="操作"
align="center"
@ -200,7 +205,7 @@
ref="form"
:model="form"
:rules="rules"
label-width="100px"
label-width="110px"
:inline="true"
>
<el-form-item label="学生姓名" prop="studentId" v-if="form.id == null">

4
src/views/system/testScoreBatch/index.vue
View File

@ -102,8 +102,8 @@
<el-table-column label="备注信息" align="center" prop="remark" />
<el-table-column label="创建人" align="center" prop="createBy" />
<el-table-column label="创建时间" align="center" prop="createTime" />
<el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" />
<!-- <el-table-column label="修改人" align="center" prop="updateBy" />
<el-table-column label="修改时间" align="center" prop="updateTime" /> -->
<el-table-column
label="操作"
align="center"