修改bug

This commit is contained in:
曹辉 2022-08-22 17:44:09 +08:00
parent 41fe30c3d9
commit c50fdb27b6
7 changed files with 238 additions and 161 deletions

View File

@ -214,7 +214,7 @@
<el-input
v-model.number="form.phone"
placeholder="请输入联系电话"
maxlength="11"
maxlength="13"
/>
</el-form-item>
</el-form>
@ -362,12 +362,19 @@ export default {
//
const regMobile =
/^(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 (regMobile.test(value)) {
return cb();
if (value.length == 11) {
if (regMobile.test(value)) {
return cb();
}
} else if (11 < value.length <= 13) {
if (isTel) {
return cb();
}
}
cb(new Error("请输入合法的手机号"));
cb(new Error("请输入正确的联系电话"));
};
return {
@ -431,7 +438,7 @@ export default {
required: true,
validator: checkMobile,
trigger: "blur",
message: "请输入正确的手机号",
message: "",
},
],
},

View File

@ -193,7 +193,7 @@
<el-form-item label="联系人电话" prop="phone">
<el-input
v-model="form.phone"
maxlength="11"
maxlength="13"
placeholder="请输入联系人电话"
/>
</el-form-item>
@ -221,10 +221,19 @@ export default {
//
const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
if (regMobile.test(value)) {
return cb();
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();
}
} else if (11 < value.length <= 13) {
if (isTel) {
return cb();
}
}
cb(new Error("请输入合法的手机号"));
cb(new Error("请输入正确的联系电话"));
};
return {
//
@ -276,7 +285,7 @@ export default {
required: true,
validator: checkMobile,
trigger: "blur",
message: "请输入正确的手机号",
message: "",
},
],
code: [
@ -448,28 +457,23 @@ export default {
if (this.List.length == 0) {
this.form.parentId = 0;
}
if (this.form.phone == "" || this.form.phone.toString().length == 11) {
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
edit(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
add(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
this.$refs["form"].validate((valid) => {
if (valid) {
if (this.form.id != null) {
edit(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
add(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
});
} else {
this.$message.error("请输入正确的手机号码");
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {

View File

@ -8,14 +8,6 @@
v-show="showSearch"
label-width="68px"
>
<!-- <el-form-item label="父级id" prop="parentId">
<el-input
v-model="queryParams.parentId"
placeholder="请输入父级id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item label="分类名称" prop="categoryName">
<el-input
clearable
@ -36,14 +28,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item label="分类排序" prop="sorting">
<el-input
v-model="queryParams.sorting"
placeholder="请输入分类排序"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item> -->
<el-form-item>
<el-button
type="primary"
@ -202,7 +186,7 @@
<!-- 添加或修改测试项目分类对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="110px">
<el-form-item label="所属上级分类" prop="parentId" v-if="form.id != 2">
<el-form-item label="所属上级分类" prop="parentId" v-if="itemCategoryList.length != 0 && form.parentId != 0">
<treeselect
:normalizer="normalizer"
:options="itemCategoryList"
@ -298,20 +282,22 @@ export default {
components: { Treeselect },
data() {
let testItemLevelList = (rule, value, callback) => {
let min = value.map((e) => {
return e.levelMinScore;
}).toString();
let max = value.map((e) => {
return e.levelMaxScore;
}).toString();
let min = value
.map((e) => {
return e.levelMinScore;
})
.toString();
let max = value
.map((e) => {
return e.levelMaxScore;
})
.toString();
console.log(min, max);
if (Number(max) < Number(min)) {
console.log(min,max);
if (Number(max) < Number(min)) {
console.log(min, max);
callback(new Error("最高分必须大于最低分,请重新填写!"));
}
}
if (
value.map((e) => {
return e.levelName;

View File

@ -253,7 +253,7 @@
<el-form-item label="联系电话" prop="phone">
<el-input
v-model="form.phone"
maxlength="11"
maxlength="13"
placeholder="请输入联系电话"
/>
</el-form-item>
@ -288,12 +288,19 @@ export default {
//
const regMobile =
/^(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 (regMobile.test(value)) {
return cb();
if (value.length == 11) {
if (regMobile.test(value)) {
return cb();
}
} else if (11 < value.length <= 13) {
if (isTel) {
return cb();
}
}
cb(new Error("请输入合法的手机号"));
cb(new Error("请输入正确的联系电话"));
};
return {
//
@ -363,7 +370,7 @@ export default {
required: true,
validator: checkMobile,
trigger: "blur",
message: "请输入正确的手机号",
message: "",
},
],
principalId: [

View File

@ -82,7 +82,7 @@
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
>重置</el-button
>
</el-form-item>
@ -284,7 +284,7 @@
<el-input v-model="form.studentName" placeholder="请输入学生姓名" />
</el-form-item>
<el-form-item label="学生编号" prop="studentNumber">
<el-input v-model="form.studentNumber" placeholder="请输入学生编号" />
<el-input v-model="form.studentNumber" placeholder="请输入学生编号" maxlength="20" />
</el-form-item>
<el-form-item label="学生性别" prop="studentSex">
<el-radio-group v-model="form.studentSex">
@ -360,7 +360,7 @@
@click="handleQuery3"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery3"
>重置</el-button
>
<el-button
@ -496,7 +496,7 @@
@click="handleQuery2"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
>重置</el-button
>
</el-form-item>
@ -597,7 +597,7 @@
<el-form-item label="联系电话" prop="phone">
<el-input
maxlength="11"
maxlength="13"
v-model="addparentlist.phone"
placeholder="请输入联系电话"
/>
@ -679,12 +679,19 @@ export default {
//
const regMobile =
/^(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 (regMobile.test(value)) {
return cb();
if (value.length == 11) {
if (regMobile.test(value)) {
return cb();
}
} else if (11 < value.length <= 13) {
if (isTel) {
return cb();
}
}
cb(new Error("请输入合法的手机号"));
cb(new Error("请输入正确的联系电话"));
};
//
var isCardId = (rule, value, callback) => {
@ -815,12 +822,15 @@ export default {
form2: {},
//
rules: {
studentNumber: [
{ required: true, message: "请输入学生编号", trigger: "blur" },
],
phone: [
{
required: true,
validator: checkMobile,
trigger: "blur",
message: "请输入正确的手机号",
message: "",
},
],
birthDate: [
@ -952,7 +962,6 @@ export default {
handleQuery3() {
listParentInfo(this.parentInfoList2).then((response) => {
this.parentInfoList = response.rows;
console.log(this.parentInfoList);
this.total3 = response.total;
});
},
@ -965,6 +974,17 @@ export default {
// console.log(this.classinfoList);
});
},
/** 重置按钮操作 */
resetQuery2() {
this.classinfoList2 = {
pageNum: 1,
pageSize: 10,
kindergartenId: null,
className: null,
classType: null,
};
this.handleQuery2();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
@ -1166,7 +1186,7 @@ export default {
console.log(this.form);
console.log(this.form2);
console.log(this.parentlist);
console.log(this.parent1, this.parent2);
// console.log(this.parent1, this.parent2);
console.log(this.tags);
},
handleSelectionChange(selection) {
@ -1291,17 +1311,32 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
listStudentInfo(this.queryParams).then((res) => {
this.studentInfoList = res.rows;
this.total = res.total;
this.loading = false;
});
},
cancel3() {
this.resetQuery();
this.resetQuery2();
this.innerVisible = false;
},
/** 重置按钮操作 */
resetQuery() {
resetQuery1() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 重置按钮操作 */
resetQuery3() {
this.parentInfoList2 = {
pageNum: 1,
pageSize: 10,
parentName: null,
parentSex: null,
phone: null,
};
this.handleQuery3();
},
/** 查询学生信息列表 */
getList() {
@ -1313,7 +1348,7 @@ export default {
});
tKindergartenInfo(this.nationType).then((res) => {
this.nactionlist = res.data;
console.log(this.nactionlist);
// console.log(this.nactionlist);
});
tKindergartenInfo(this.ClassType).then((res) => {
// console.log(res.data);
@ -1329,18 +1364,12 @@ export default {
});
listParentInfo(this.parentInfoList2).then((response) => {
this.parentInfoList = response.rows;
console.log(this.parentInfoList);
// console.log(this.parentInfoList);
this.total3 = response.total;
this.loading = false;
});
listStudentInfo(this.queryParams).then((res) => {
// res.rows.forEach((el) => {
// el.className = this.classinfoList.filter(
// (e) => e.id == el.classId
// )[0].className;
// });
this.studentInfoList = res.rows;
// console.log(this.studentInfoList);
this.total = res.total;
this.loading = false;
});
@ -1370,6 +1399,10 @@ export default {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
this.parent1 = "";
this.parent2 = "";
this.parentlist = [];
this.tags = [];
});
}
}

View File

@ -56,7 +56,7 @@
@click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
>重置</el-button
>
</el-form-item>
@ -126,7 +126,7 @@
align="center"
prop="kindergartenName"
/>
<el-table-column label="所属班级" align="center" prop="teacherClassId">
<el-table-column label="所属班级" align="center" prop="classInfoList">
<template slot-scope="scope">
<el-button size="mini" type="text" @click="teacherInfo(scope.row)"
>查看</el-button
@ -200,7 +200,7 @@
</el-form-item>
<el-form-item
label="所属班级"
prop="teacherClassId"
prop="classInfoList"
class="is-required"
>
<el-button
@ -244,7 +244,11 @@
</el-radio-group>
</el-form-item>
<el-form-item label="联系电话" prop="teacherPhone">
<el-input v-model="form.teacherPhone" placeholder="请输入联系电话" />
<el-input
v-model="form.teacherPhone"
placeholder="请输入联系电话"
maxlength="13"
/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@ -292,7 +296,7 @@
@click="handleQuery3"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery2"
>重置</el-button
>
</el-form-item>
@ -421,7 +425,7 @@
@click="handleQuery2"
>搜索</el-button
>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery3"
>重置</el-button
>
</el-form-item>
@ -587,13 +591,22 @@ export default {
} else {
const regMobile =
/^(0|86|17951)?(13[0-9]|15[012356789]|17[678]|18[0-9]|14[57])[0-9]{8}$/;
if (regMobile.test(value)) {
return cb();
}
const reg = /^(0[0-9]{2,3}\-)([2-9][0-9]{6,7})+(\-[0-9]{1,4})?$/;
const isTel = reg.test(value);
cb(new Error("请输入合法的手机号"));
if (value.length == 11) {
if (regMobile.test(value)) {
return cb();
}
} else if (11 < value.length <= 13) {
if (isTel) {
return cb();
}
}
cb(new Error("请输入正确的联系电话"));
}
};
//
var isCardId = (rule, value, callback) => {
if (!value) {
@ -723,19 +736,12 @@ export default {
{ required: true, message: "请输入证件号", trigger: "blur" },
{ validator: isCardId, trigger: "blur" },
],
teacherClassId: [
classInfoList: [
{ required: true, message: "所属班级不能为空", trigger: "blur" },
],
kindergartenId: [
{ required: true, message: "所属幼儿园不能为空", trigger: "blur" },
],
teacherClassId: [
// {
// required: true,
// message: "id",
// trigger: "blur",
// },
],
},
};
},
@ -811,6 +817,8 @@ export default {
this.teacherrclassinfo = res.data;
});
},
kindergartenNameclick(row) {
this.form.kindergartenId = row.id;
this.kindergartenid = row.id;
@ -820,6 +828,16 @@ export default {
// this.getclassinfo();
},
resetQuery3() {
this.classinfoList2 = {
pageNum: 1,
pageSize: 10,
kindergartenId: null,
className: null,
classType: null,
};
this.handleQuery2();
},
//banjisousuo
handleQuery2() {
listClassinfo(this.classinfoList2).then((response) => {
@ -827,34 +845,12 @@ export default {
this.total2 = response.total;
});
},
/** 查询教师信息管理列表 */
getList() {
this.loading = true;
listKindergartenInfo(this.queryParams2).then((response) => {
this.kindergartenInfoList = response.rows;
this.total3 = response.total;
});
listTeacherInfo(this.queryParams).then((response) => {
this.teacherInfoList = response.rows;
this.total = response.total;
this.loading = false;
});
tKindergartenInfo(this.ClassType).then((res) => {
this.options[0].classType = res.data[0].dictValue;
this.options[1].classType = res.data[1].dictValue;
this.options[2].classType = res.data[2].dictValue;
this.options[3].classType = res.data[3].dictValue;
this.dictValue1 = res.data[0].dictValue;
this.dictValue2 = res.data[1].dictValue;
this.dictValue3 = res.data[2].dictValue;
this.dictValue4 = res.data[3].dictValue;
});
},
//
cancel() {
this.open = false;
this.reset();
this.resetQuery();
// this.resetQuery();
this.kindergartenid = "";
this.kindergartenName = "请选择所在幼儿园";
this.classinfoName = [];
@ -873,7 +869,7 @@ export default {
className: null,
classType: null,
};
this.getList();
this.handleQuery3();
this.innerVisible = false;
this.innerVisible2 = false;
},
@ -917,7 +913,25 @@ export default {
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
listTeacherInfo(this.queryParams).then((response) => {
this.teacherInfoList = response.rows;
this.total = response.total;
});
},
resetQuery1() {
this.resetForm("queryForm");
this.handleQuery();
},
resetQuery2() {
this.queryParams2 = {
pageNum: 1,
pageSize: 10,
kindergartenId: null,
className: null,
classType: null,
};
this.handleQuery3();
},
/** 搜索按钮操作 */
handleQuery3() {
@ -928,26 +942,39 @@ export default {
});
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.queryParams2 = {
pageNum: 1,
pageSize: 10,
kindergartenId: null,
className: null,
classType: null,
};
this.classinfoList2 = {
pageNum: 1,
pageSize: 10,
kindergartenId: null,
className: null,
classType: null,
};
listClassinfo(this.classinfoList2).then((response) => {
this.classinfoList = response.rows;
this.total2 = response.total;
});
// resetQuery() {
// this.resetForm("queryForm");
// this.queryParams2 = {
// pageNum: 1,
// pageSize: 10,
// kindergartenId: null,
// className: null,
// classType: null,
// };
// this.classinfoList2 = {
// pageNum: 1,
// pageSize: 10,
// kindergartenId: null,
// className: null,
// classType: null,
// };
// listClassinfo(this.classinfoList2).then((response) => {
// this.classinfoList = response.rows;
// this.total2 = response.total;
// });
// listKindergartenInfo(this.queryParams2).then((response) => {
// this.kindergartenInfoList = response.rows;
// this.total3 = response.total;
// });
// listTeacherInfo(this.queryParams).then((response) => {
// this.teacherInfoList = response.rows;
// this.total = response.total;
// this.loading = false;
// });
// },
/** 查询教师信息管理列表 */
getList() {
this.loading = true;
listKindergartenInfo(this.queryParams2).then((response) => {
this.kindergartenInfoList = response.rows;
this.total3 = response.total;
@ -957,6 +984,16 @@ export default {
this.total = response.total;
this.loading = false;
});
tKindergartenInfo(this.ClassType).then((res) => {
this.options[0].classType = res.data[0].dictValue;
this.options[1].classType = res.data[1].dictValue;
this.options[2].classType = res.data[2].dictValue;
this.options[3].classType = res.data[3].dictValue;
this.dictValue1 = res.data[0].dictValue;
this.dictValue2 = res.data[1].dictValue;
this.dictValue3 = res.data[2].dictValue;
this.dictValue4 = res.data[3].dictValue;
});
},
//
handleSelectionChange(selection) {
@ -970,7 +1007,6 @@ export default {
this.open = true;
this.title = "添加教师信息管理";
},
innerVisibletrue2() {
if (this.form.kindergartenId == "") {
this.$message.error("请先选择幼儿园");
@ -1016,17 +1052,19 @@ export default {
updateTeacherInfo(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
this.reset();
this.resetQuery();
this.kindergartenid = "";
this.kindergartenName = "请选择所在幼儿园";
this.classinfoName = [];
this.resetQuery1();
});
} else {
addTeacherInfo(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
this.reset();
this.resetQuery();
this.resetQuery1();
this.kindergartenid = "";
this.kindergartenName = "请选择所在幼儿园";
this.classinfoName = [];
});
}
}

View File

@ -729,7 +729,7 @@ export default {
getTreeselect() {
treeselect().then((response) => {
this.deptOptions = response.data;
console.log(this.deptOptions);
// console.log(this.deptOptions);
});
},
//
@ -838,6 +838,8 @@ export default {
this.open = true;
this.title = "修改用户";
this.form.password = "";
console.log(this.form)
console.log(this.areaList)
});
},
/** 重置密码按钮操作 */