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/studentInfo/index.vue
This commit is contained in:
曹辉 2022-08-31 13:14:45 +08:00
commit ac76e3e2a3
12 changed files with 54 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,10 +142,10 @@
/>
</el-form-item>
<el-form-item label="区域名称" prop="name">
<el-input v-model="form.name" placeholder="请输入区域名称" />
<el-input v-model="form.name" placeholder="请输入区域名称" maxlength="50" />
</el-form-item>
<el-form-item label="区域编码" prop="code">
<el-input v-model.number="form.code" placeholder="请输入区域编码" />
<el-input v-model.number="form.code" placeholder="请输入区域编码" maxlength="50"/>
</el-form-item>
<el-form-item label="排序" prop="sort">
<el-input v-model.number="form.sort" placeholder="请输入排序" />

5
src/views/system/classinfo/index.vue
View File

@ -205,7 +205,7 @@
>
</el-form-item>
<el-form-item label="班级名称" prop="className">
<el-input v-model="form.className" placeholder="请输入班级名称" />
<el-input v-model="form.className" placeholder="请输入班级名称" maxlength="40"/>
</el-form-item>
<el-form-item label="班级类型" prop="classType">
@ -221,6 +221,7 @@
<el-input
v-model="form.classTeacher"
placeholder="请输入班主任姓名"
maxlength="10"
/>
</el-form-item>
@ -389,7 +390,7 @@ export default {
console.log(str);
// 验证手机号的正则表达式
const regMobile =
/^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/;
/^1(3[0-9]|4[01456879]|5[0-35-9]|6[2567]|7[0-8]|8[0-9]|9[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})?$/;

5
src/views/system/info/index.vue
View File

@ -179,16 +179,17 @@
</el-form-item>
<el-form-item label="组织名称" prop="organizeName">
<el-input v-model="form.organizeName" placeholder="请输入组织名称" />
<el-input v-model="form.organizeName" placeholder="请输入组织名称" maxlength="50"/>
</el-form-item>
<el-form-item label="组织地址" prop="organizeAddress">
<el-input
v-model="form.organizeAddress"
placeholder="请输入组织地址"
maxlength="100"
/>
</el-form-item>
<el-form-item label="联系人" prop="contacts">
<el-input v-model="form.contacts" placeholder="请输入联系人姓名" />
<el-input v-model="form.contacts" placeholder="请输入联系人姓名" maxlength="10" />
</el-form-item>
<el-form-item label="联系人电话" prop="phone">
<el-input

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

@ -200,12 +200,13 @@
<el-input v-model="form.parentId" placeholder="请输入父级id" />
</el-form-item> -->
<el-form-item label="分类名称" prop="categoryName">
<el-input v-model="form.categoryName" placeholder="请输入分类名称" />
<el-input v-model="form.categoryName" placeholder="请输入分类名称" maxlength="80" />
</el-form-item>
<el-form-item label="分类名称简写" prop="categoryNameAbbreviate">
<el-input
v-model="form.categoryNameAbbreviate"
placeholder="请输入分类名称简写"
maxlength="80"
/>
</el-form-item>
@ -256,7 +257,7 @@
/>
</el-form-item>
<el-form-item label="备注信息" prop="remark">
<el-input v-model="form.remark" placeholder="请输入备注信息" />
<el-input v-model="form.remark" placeholder="请输入备注信息" maxlength="200"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">

3
src/views/system/kindergartenInfo/index.vue
View File

@ -217,12 +217,14 @@
<el-input
v-model="form.kindergartenName"
placeholder="请输入幼儿园名称"
maxlength="40"
/>
</el-form-item>
<el-form-item label="幼儿园地址" prop="kindergartenAddress">
<el-input
v-model="form.kindergartenAddress"
placeholder="请输入幼儿园地址"
maxlength="40"
/>
</el-form-item>
<el-form-item label="幼儿园类型" prop="kindergartenType">
@ -290,7 +292,6 @@ export default {
/^(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);
if (value.length == 11) {
if (regMobile.test(value)) {
return cb();

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

@ -157,10 +157,10 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="处方名称" prop="motionName">
<el-input v-model="form.motionName" placeholder="请输入处方名称" />
<el-input v-model="form.motionName" placeholder="请输入处方名称" maxlength="50" />
</el-form-item>
<el-form-item label="处方内容">
<editor v-model="form.motionContent" :min-height="192" />
<editor v-model="form.motionContent" :min-height="192" maxlength="200"/>
</el-form-item>
<el-form-item
label="适用人群等级"

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

@ -147,7 +147,7 @@
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="家长姓名" prop="parentName">
<el-input v-model="form.parentName" placeholder="请输入家长姓名" />
<el-input v-model="form.parentName" placeholder="请输入家长姓名" maxlength="10"/>
</el-form-item>
<el-form-item label="家长性别" prop="parentSex">

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

@ -177,6 +177,23 @@
<el-table-column label="身份证号" align="center" prop="cardNumber" width="180" />
<el-table-column label="曾用名" align="center" prop="onceName" width="100" />
<el-table-column label="家庭住址" align="center" prop="homeAddress" />
<el-table-column label="身份证号" align="center" prop="cardNumber" />
<el-table-column label="曾用名" align="center" prop="onceName" />
<el-table-column label="家庭住址" align="center" prop="homeAddress">
<template slot-scope="scope">
<span
:title="scope.row.homeAddress"
style="
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
overflow: hidden;"
>
{{ scope.row.homeAddress | ellipsis}}</span
>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
@ -287,7 +304,7 @@
/>
</el-form-item>
<el-form-item label="学生姓名" prop="studentName">
<el-input v-model="form.studentName" placeholder="请输入学生姓名" />
<el-input v-model="form.studentName" placeholder="请输入学生姓名" maxlength="10"/>
</el-form-item>
<el-form-item label="学生编号" prop="studentNumber">
<el-input
@ -317,10 +334,10 @@
<el-input v-model="form.cardNumber" placeholder="请输入身份证号" />
</el-form-item>
<el-form-item label="曾用名" prop="onceName">
<el-input v-model="form.onceName" placeholder="请输入曾用名" />
<el-input v-model="form.onceName" placeholder="请输入曾用名" maxlength="40" />
</el-form-item>
<el-form-item label="家庭住址" prop="homeAddress">
<el-input v-model="form.homeAddress" placeholder="请输入家庭住址" />
<el-input v-model="form.homeAddress" placeholder="请输入家庭住址" maxlength="100"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -890,6 +907,17 @@ export default {
this.getList();
},
methods: {
filters: {
// 版本号显示12位，超过12位显示...
ellipsis: function(homeAddress) {
if (!homeAddress) return "";
if (homeAddress.length > 15) {
return homeAddress.slice(0, 15) + "...";
}
return homeAddress;
}
},
cancel2() {
this.innerVisible3 = false;
this.addparentlist = {

2
src/views/system/teacherInfo/index.vue
View File

@ -232,7 +232,7 @@
>
</el-form-item>
<el-form-item label="教师名称" prop="teacherName">
<el-input v-model="form.teacherName" placeholder="请输入教师名称" />
<el-input v-model="form.teacherName" placeholder="请输入教师名称" maxlength="10"/>
</el-form-item>
<el-form-item label="身份证号" prop="cardNo">
<el-input v-model="form.cardNo" placeholder="请输入身份证号" />

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

@ -356,7 +356,7 @@
align="center"
>
<template slot-scope="scope">
<el-input v-model="scope.row.syntheticalAssess"></el-input>
<el-input v-model="scope.row.syntheticalAssess" maxlength="200"></el-input>
</template>
</el-table-column>
</el-table>

3
src/views/system/testItems/index.vue
View File

@ -224,6 +224,7 @@
style="width: 300px"
v-model="form.itemName"
placeholder="请输入项目名称"
maxlength="40"
/>
</el-form-item>
<el-form-item label="项目编号" prop="itemCode">
@ -367,6 +368,7 @@
v-model="form.remark"
placeholder="请输入项目概述"
style="width: 300px"
maxlength="200"
/>
</el-form-item>
<el-form-item label="项目成绩级别" prop="itemLevelList">
@ -428,6 +430,7 @@
v-model="form.itemContent"
:min-height="190"
style="margin-left: 80px"
maxlength="200"
/>
</el-form-item>
</el-form>

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

@ -160,7 +160,7 @@
style="width: 250px"
v-model="form.batchName"
placeholder="请输入批次名称"
maxlength="30"
maxlength="40"
/>
</el-form-item>
<el-form-item label="备注信息" prop="remark">
@ -168,6 +168,7 @@
v-model="form.remark"
placeholder="请输入备注信息"
style="width: 250px"
maxlength="200"
/>
</el-form-item>