|
|
@@ -19,7 +19,7 @@
|
|
|
clearable
|
|
|
placeholder="学生姓名或电话"
|
|
|
@keydown.enter.native="
|
|
|
- (e) => {
|
|
|
+ e => {
|
|
|
e.target.blur();
|
|
|
$refs.saveForm.save();
|
|
|
onSearch();
|
|
|
@@ -47,7 +47,7 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
|
|
|
- <el-form-item>
|
|
|
+ <el-form-item>
|
|
|
<remote-search
|
|
|
:commit="'setTeachers'"
|
|
|
v-model="searchForm.teacherId"
|
|
|
@@ -202,10 +202,7 @@
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
<el-table-column type="expand">
|
|
|
<template slot-scope="props">
|
|
|
- <el-form
|
|
|
- label-position="left"
|
|
|
- class="demo-table-expand"
|
|
|
- >
|
|
|
+ <el-form label-position="left" class="demo-table-expand">
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="所属学校">
|
|
|
@@ -260,28 +257,44 @@
|
|
|
<el-row>
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="VIP老师" v-if="tenantId == 1">
|
|
|
- <Tooltip :content='props.row.vipTeacherName ? props.row.vipTeacherName : "--" ' />
|
|
|
-
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ <Tooltip
|
|
|
+ :content="
|
|
|
+ props.row.vipTeacherName
|
|
|
+ ? props.row.vipTeacherName
|
|
|
+ : '--'
|
|
|
+ "
|
|
|
+ /> </el-form-item
|
|
|
+ ></el-col>
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="网管课老师">
|
|
|
- <Tooltip :content='props.row.practiceTeacherName ? props.row.practiceTeacherName : "--"' />
|
|
|
-
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ <Tooltip
|
|
|
+ :content="
|
|
|
+ props.row.practiceTeacherName
|
|
|
+ ? props.row.practiceTeacherName
|
|
|
+ : '--'
|
|
|
+ "
|
|
|
+ /> </el-form-item
|
|
|
+ ></el-col>
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="声部课老师">
|
|
|
- <Tooltip :content='props.row.normalTeacherName ? props.row.normalTeacherName : "--"' />
|
|
|
-
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ <Tooltip
|
|
|
+ :content="
|
|
|
+ props.row.normalTeacherName
|
|
|
+ ? props.row.normalTeacherName
|
|
|
+ : '--'
|
|
|
+ "
|
|
|
+ /> </el-form-item
|
|
|
+ ></el-col>
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="合奏课老师">
|
|
|
- <Tooltip :content='props.row.mixTeacherName ? props.row.mixTeacherName : "--"' />
|
|
|
-
|
|
|
- </el-form-item></el-col
|
|
|
- >
|
|
|
+ <Tooltip
|
|
|
+ :content="
|
|
|
+ props.row.mixTeacherName
|
|
|
+ ? props.row.mixTeacherName
|
|
|
+ : '--'
|
|
|
+ "
|
|
|
+ /> </el-form-item
|
|
|
+ ></el-col>
|
|
|
<el-col :span="4">
|
|
|
<el-form-item label="是否运营" v-if="tenantId == 1">
|
|
|
<span>{{ props.row.operatingTag ? "是" : "否" }}</span>
|
|
|
@@ -289,7 +302,6 @@
|
|
|
>
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
-
|
|
|
<el-col :span="6">
|
|
|
<el-form-item label="账户余额(元)">
|
|
|
<span>{{ props.row.balance | moneyFormat }}</span>
|
|
|
@@ -324,7 +336,12 @@
|
|
|
</el-form>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="organName" label="所属分部">
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ prop="organName"
|
|
|
+ label="所属分部"
|
|
|
+ v-if="tenantId != 28"
|
|
|
+ >
|
|
|
<template slot-scope="scope">
|
|
|
<copy-text>{{ scope.row.organName }}</copy-text>
|
|
|
</template>
|
|
|
@@ -552,11 +569,11 @@
|
|
|
<el-table-column align="center" width="180px" label="操作">
|
|
|
<template slot-scope="scope">
|
|
|
<router-link
|
|
|
- v-if="$helpers.permission('/studentDetail')"
|
|
|
+ v-if="$helpers.permission('/studentDetail')"
|
|
|
class="el-button--text"
|
|
|
:to="{
|
|
|
path: `/business/studentDetail`,
|
|
|
- query: { ...scope.row },
|
|
|
+ query: { ...scope.row }
|
|
|
}"
|
|
|
>查看</router-link
|
|
|
>
|
|
|
@@ -586,7 +603,7 @@
|
|
|
<el-button
|
|
|
v-if="
|
|
|
scope.row.isSignedContract &&
|
|
|
- $helpers.permission('sysUserContracts/getLatest')
|
|
|
+ $helpers.permission('sysUserContracts/getLatest')
|
|
|
"
|
|
|
type="text"
|
|
|
@click="lookContracts(scope.row)"
|
|
|
@@ -629,12 +646,15 @@
|
|
|
:closable="false"
|
|
|
style="margin-bottom: 15px"
|
|
|
></el-alert>
|
|
|
- <el-form-item label="学生姓名" prop="name" >
|
|
|
- <el-input v-model.trim="studentForm.name" stlye="width:202px"></el-input>
|
|
|
+ <el-form-item label="学生姓名" prop="name">
|
|
|
+ <el-input
|
|
|
+ v-model.trim="studentForm.name"
|
|
|
+ stlye="width:202px"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="学生性别" prop="sex" >
|
|
|
+ <el-form-item label="学生性别" prop="sex">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
class="multiple"
|
|
|
filterable
|
|
|
v-model.trim="studentForm.sex"
|
|
|
@@ -652,14 +672,14 @@
|
|
|
value-format="yyyy-MM-dd"
|
|
|
type="date"
|
|
|
:picker-options="{
|
|
|
- firstDayOfWeek: 1,
|
|
|
+ firstDayOfWeek: 1
|
|
|
}"
|
|
|
placeholder="选择日期"
|
|
|
></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="学生声部" prop="subjectIdList">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
v-model.trim="studentForm.subjectIdList"
|
|
|
filterable
|
|
|
clearable
|
|
|
@@ -682,7 +702,7 @@
|
|
|
|
|
|
<el-form-item label="家长姓名" prop="parseName">
|
|
|
<el-input
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
v-model.trim="studentForm.parseName"
|
|
|
:disabled="!isNew"
|
|
|
></el-input>
|
|
|
@@ -695,16 +715,20 @@
|
|
|
{
|
|
|
pattern: /^1\d{10}$/,
|
|
|
message: '请输入正确的手机号',
|
|
|
- trigger: 'blur',
|
|
|
- },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
]"
|
|
|
>
|
|
|
<!-- @blur="checkPhone(studentForm.phone)" -->
|
|
|
- <el-input style="width: 202px!important" :maxlength="11" v-model.trim="studentForm.phone"></el-input>
|
|
|
+ <el-input
|
|
|
+ style="width: 202px!important"
|
|
|
+ :maxlength="11"
|
|
|
+ v-model.trim="studentForm.phone"
|
|
|
+ ></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="所属分部" prop="organId">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
class="multiple"
|
|
|
v-model.trim="studentForm.organId"
|
|
|
filterable
|
|
|
@@ -722,7 +746,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="school" label="所属学校">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
v-model.trim="studentForm.school"
|
|
|
filterable
|
|
|
clearable
|
|
|
@@ -756,12 +780,11 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="学员班级" prop="currentClass">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
placeholder="班级"
|
|
|
filterable
|
|
|
clearable
|
|
|
v-model.trim="studentForm.currentClass"
|
|
|
-
|
|
|
>
|
|
|
<el-option label="1班" value="1班"></el-option>
|
|
|
<el-option label="2班" value="2班"></el-option>
|
|
|
@@ -809,7 +832,7 @@
|
|
|
placeholder="班级"
|
|
|
></el-input> -->
|
|
|
</el-form-item>
|
|
|
-<!--
|
|
|
+ <!--
|
|
|
<el-form-item label="指导老师" prop="teacherId">
|
|
|
<el-select
|
|
|
class="multiple"
|
|
|
@@ -835,7 +858,7 @@
|
|
|
></el-alert>
|
|
|
<el-form-item label="是否运营" prop="operatingTag" v-if="tenantId == 1">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
class="multiple"
|
|
|
v-model.trim="studentForm.operatingTag"
|
|
|
clearable
|
|
|
@@ -846,7 +869,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="是否服务" prop="serviceTag" v-if="tenantId == 1">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
class="multiple"
|
|
|
v-model.trim="studentForm.serviceTag"
|
|
|
clearable
|
|
|
@@ -869,7 +892,7 @@
|
|
|
</p>
|
|
|
</template>
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
class="multiple"
|
|
|
v-model.trim="studentForm.isNewUser"
|
|
|
clearable
|
|
|
@@ -880,7 +903,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="关心包" prop="carePackage">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
class="multiple"
|
|
|
v-model.trim="studentForm.carePackage"
|
|
|
clearable
|
|
|
@@ -894,7 +917,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item label="加油包" prop="comeOnPackage">
|
|
|
<el-select
|
|
|
- style="width: 202px!important"
|
|
|
+ style="width: 202px!important"
|
|
|
class="multiple"
|
|
|
v-model.trim="studentForm.comeOnPackage"
|
|
|
clearable
|
|
|
@@ -907,14 +930,13 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="courseTeacher" label="排课老师">
|
|
|
- <remote-search
|
|
|
+ <remote-search
|
|
|
:width="202"
|
|
|
- :commit="'setTeachers'"
|
|
|
- v-model="studentForm.courseTeacher"
|
|
|
- :isForzenWithQueryCondition="true"
|
|
|
- />
|
|
|
- </el-form-item>
|
|
|
-
|
|
|
+ :commit="'setTeachers'"
|
|
|
+ v-model="studentForm.courseTeacher"
|
|
|
+ :isForzenWithQueryCondition="true"
|
|
|
+ />
|
|
|
+ </el-form-item>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button @click="studentVisible = false">取 消</el-button>
|
|
|
@@ -945,8 +967,8 @@
|
|
|
{
|
|
|
pattern: /^1\d{10}$/,
|
|
|
message: '请输入正确的手机号',
|
|
|
- trigger: 'blur',
|
|
|
- },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
]"
|
|
|
>
|
|
|
<copy-text>{{ passwrodForm.phone }}</copy-text>
|
|
|
@@ -960,8 +982,8 @@
|
|
|
{
|
|
|
pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/,
|
|
|
message: '密码为6-20位数字和字母组合',
|
|
|
- trigger: 'blur',
|
|
|
- },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
]"
|
|
|
>
|
|
|
<el-input v-model.trim="passwrodForm.password"></el-input>
|
|
|
@@ -975,8 +997,8 @@
|
|
|
{
|
|
|
pattern: /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$/,
|
|
|
message: '密码为6-20位数字和字母组合',
|
|
|
- trigger: 'blur',
|
|
|
- },
|
|
|
+ trigger: 'blur'
|
|
|
+ }
|
|
|
]"
|
|
|
>
|
|
|
<el-input v-model.trim="passwrodForm.password2"></el-input>
|
|
|
@@ -1033,7 +1055,7 @@ import {
|
|
|
getStudentInfoByPhone,
|
|
|
registerStudent,
|
|
|
updateStudent,
|
|
|
- getLatest,
|
|
|
+ getLatest
|
|
|
} from "@/api/studentManager";
|
|
|
import { queryByOrganId } from "@/api/systemManage";
|
|
|
import { getGradeList } from "@/views/2021memeberActionManager/api";
|
|
|
@@ -1042,7 +1064,7 @@ import { vaildStudentUrl } from "@/utils/validate";
|
|
|
import { resetPassword2, getTeacher, getAgreement } from "@/api/buildTeam";
|
|
|
import {
|
|
|
organizationCloudTeacherFeeQueryPage,
|
|
|
- subjectListTree,
|
|
|
+ subjectListTree
|
|
|
} from "@/api/specialSetting";
|
|
|
import axios from "axios";
|
|
|
import qs from "qs";
|
|
|
@@ -1050,10 +1072,17 @@ import { getToken, getTenantId } from "@/utils/auth";
|
|
|
import load from "@/utils/loading";
|
|
|
import createMember from "./modals/createMember";
|
|
|
import studentExt from "./modals/studentExt";
|
|
|
-import Tooltip from '@/components/Tooltip'
|
|
|
+import Tooltip from "@/components/Tooltip";
|
|
|
export default {
|
|
|
name: "studentManagerList",
|
|
|
- components: { pagination, qrCode, createMember, protocolModel, studentExt,Tooltip },
|
|
|
+ components: {
|
|
|
+ pagination,
|
|
|
+ qrCode,
|
|
|
+ createMember,
|
|
|
+ protocolModel,
|
|
|
+ studentExt,
|
|
|
+ Tooltip
|
|
|
+ },
|
|
|
data() {
|
|
|
return {
|
|
|
extVisible: false,
|
|
|
@@ -1075,7 +1104,7 @@ export default {
|
|
|
isNewUser: null,
|
|
|
hasTeacher: null,
|
|
|
isRecord: null,
|
|
|
- hasMember:null
|
|
|
+ hasMember: null
|
|
|
},
|
|
|
memberVisible: false,
|
|
|
multipleSelection: [],
|
|
|
@@ -1090,7 +1119,7 @@ export default {
|
|
|
limit: 10, // 限制显示条数
|
|
|
page: 1, // 当前页
|
|
|
total: 0, // 总条数
|
|
|
- page_size: [10, 20, 40, 50], // 选择限制显示条数
|
|
|
+ page_size: [10, 20, 40, 50] // 选择限制显示条数
|
|
|
},
|
|
|
studentForm: {
|
|
|
phone: "",
|
|
|
@@ -1108,11 +1137,11 @@ export default {
|
|
|
comeOnPackage: 0,
|
|
|
school: null,
|
|
|
currentClass: "",
|
|
|
- currentGradeNum: "",
|
|
|
+ currentGradeNum: ""
|
|
|
},
|
|
|
studentUpdatePackage: {
|
|
|
carePackage: 0,
|
|
|
- comeOnPackage: 0,
|
|
|
+ comeOnPackage: 0
|
|
|
},
|
|
|
studentRules: {
|
|
|
name: [{ required: true, message: "请输入学生姓名" }],
|
|
|
@@ -1123,7 +1152,7 @@ export default {
|
|
|
serviceTag: [{ required: true, message: "请选择是否参与服务" }],
|
|
|
isNewUser: [{ required: true, message: "请选择是否是新用户" }],
|
|
|
operatingTag: [{ required: true, message: "请选择是否参与运营" }],
|
|
|
- teacherId: [{ required: true, message: "请选择指导老师" }],
|
|
|
+ teacherId: [{ required: true, message: "请选择指导老师" }]
|
|
|
},
|
|
|
isNew: false,
|
|
|
active: null,
|
|
|
@@ -1135,14 +1164,14 @@ export default {
|
|
|
passwrodForm: {
|
|
|
phone: "",
|
|
|
password: "",
|
|
|
- password2: "",
|
|
|
+ password2: ""
|
|
|
},
|
|
|
activatedRow: null,
|
|
|
protocolVisible: false,
|
|
|
protocolVersions: [],
|
|
|
cooperationList: [],
|
|
|
tenantId: null,
|
|
|
- studentGradeList: [],
|
|
|
+ studentGradeList: []
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -1186,7 +1215,7 @@ export default {
|
|
|
addStudentMember() {
|
|
|
if (this.multipleSelection.length > 0) {
|
|
|
let organIds = [];
|
|
|
- this.multipleSelection.forEach((m) => {
|
|
|
+ this.multipleSelection.forEach(m => {
|
|
|
if (!organIds.includes(m.organId)) {
|
|
|
organIds.push(m.organId);
|
|
|
}
|
|
|
@@ -1216,7 +1245,7 @@ export default {
|
|
|
params.rows = this.pageInfo.limit;
|
|
|
params.page = this.pageInfo.page;
|
|
|
params.organId = this.searchForm.organId.join(",");
|
|
|
- queryStudentList(params).then((res) => {
|
|
|
+ queryStudentList(params).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.tableList = res.data.rows;
|
|
|
this.pageInfo.total = res.data.total;
|
|
|
@@ -1234,7 +1263,7 @@ export default {
|
|
|
hasPracticeCourse: null,
|
|
|
operatingTag: null,
|
|
|
serviceTag: null,
|
|
|
- teacherId: null,
|
|
|
+ teacherId: null
|
|
|
};
|
|
|
this.getList();
|
|
|
},
|
|
|
@@ -1262,35 +1291,35 @@ export default {
|
|
|
isNewUser: searchForm.isNewUser + "" ? searchForm.isNewUser : null,
|
|
|
hasTeacher: searchForm.hasTeacher + "" ? searchForm.hasTeacher : null,
|
|
|
isRecord: searchForm.isRecord + "" ? searchForm.isRecord : null,
|
|
|
- hasMember:searchForm.hasMember+""?searchForm.hasMember:null
|
|
|
+ hasMember: searchForm.hasMember + "" ? searchForm.hasMember : null
|
|
|
};
|
|
|
const options = {
|
|
|
method: "POST",
|
|
|
headers: {
|
|
|
Authorization: getToken(),
|
|
|
- tenantId: getTenantId(),
|
|
|
+ tenantId: getTenantId()
|
|
|
},
|
|
|
url,
|
|
|
data: qs.stringify(data),
|
|
|
- responseType: "blob",
|
|
|
+ responseType: "blob"
|
|
|
};
|
|
|
|
|
|
this.$confirm("确定导出学员名单?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
- type: "warning",
|
|
|
+ type: "warning"
|
|
|
})
|
|
|
.then(() => {
|
|
|
load.startLoading();
|
|
|
axios(options)
|
|
|
- .then((res) => {
|
|
|
+ .then(res => {
|
|
|
let blob = new Blob([res.data], {
|
|
|
// type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8',
|
|
|
- type: "application/vnd.ms-excel;charset=utf-8",
|
|
|
+ type: "application/vnd.ms-excel;charset=utf-8"
|
|
|
// word文档为application/msword,pdf文档为application/pdf,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
|
|
|
});
|
|
|
let text = new Response(blob).text();
|
|
|
- text.then((res) => {
|
|
|
+ text.then(res => {
|
|
|
// 判断是否报错
|
|
|
if (res.indexOf("code") != -1) {
|
|
|
let json = JSON.parse(res);
|
|
|
@@ -1322,7 +1351,7 @@ export default {
|
|
|
|
|
|
load.endLoading();
|
|
|
})
|
|
|
- .catch((error) => {
|
|
|
+ .catch(error => {
|
|
|
this.$message.error("导出数据失败，请联系管理员");
|
|
|
load.endLoading();
|
|
|
});
|
|
|
@@ -1333,28 +1362,26 @@ export default {
|
|
|
var regu = /^1\d{10}$/;
|
|
|
var re = new RegExp(regu);
|
|
|
if (re.test(val)) {
|
|
|
- getStudentInfoByPhone({ mobile: this.studentForm.phone }).then(
|
|
|
- (res) => {
|
|
|
- if (res.code == 200) {
|
|
|
- if (res.data) {
|
|
|
- this.studentForm = {
|
|
|
- name: res.data.name,
|
|
|
- sex: res.data.gender,
|
|
|
- parseName: res.data.parentsName,
|
|
|
- // sound: parseInt(res.data.subjectIdList),
|
|
|
- phone: val,
|
|
|
- date: res.data.birthdate,
|
|
|
- };
|
|
|
- }
|
|
|
+ getStudentInfoByPhone({ mobile: this.studentForm.phone }).then(res => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ if (res.data) {
|
|
|
+ this.studentForm = {
|
|
|
+ name: res.data.name,
|
|
|
+ sex: res.data.gender,
|
|
|
+ parseName: res.data.parentsName,
|
|
|
+ // sound: parseInt(res.data.subjectIdList),
|
|
|
+ phone: val,
|
|
|
+ date: res.data.birthdate
|
|
|
+ };
|
|
|
}
|
|
|
}
|
|
|
- );
|
|
|
+ });
|
|
|
}
|
|
|
},
|
|
|
submitAddStudent() {
|
|
|
const studentForm = this.studentForm;
|
|
|
// 效验 然后组数据提交
|
|
|
- this.$refs["studentForm"].validate((item) => {
|
|
|
+ this.$refs["studentForm"].validate(item => {
|
|
|
if (item) {
|
|
|
let obj = {
|
|
|
phone: studentForm.phone,
|
|
|
@@ -1373,9 +1400,9 @@ export default {
|
|
|
cooperationOrganId: studentForm.school,
|
|
|
currentClass: studentForm.currentClass,
|
|
|
currentGradeNum: studentForm.currentGradeNum,
|
|
|
- courseTeacher:studentForm.courseTeacher
|
|
|
+ courseTeacher: studentForm.courseTeacher
|
|
|
};
|
|
|
- registerStudent(obj).then((res) => {
|
|
|
+ registerStudent(obj).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.$message.success("添加成功");
|
|
|
this.studentVisible = false;
|
|
|
@@ -1388,7 +1415,7 @@ export default {
|
|
|
// 修改学生信息
|
|
|
resetStudentSubmie() {
|
|
|
const studentForm = this.studentForm;
|
|
|
- this.$refs["studentForm"].validate((item) => {
|
|
|
+ this.$refs["studentForm"].validate(item => {
|
|
|
if (item) {
|
|
|
let obj = {
|
|
|
phone: studentForm.phone,
|
|
|
@@ -1408,9 +1435,9 @@ export default {
|
|
|
cooperationOrganId: studentForm.school,
|
|
|
currentClass: studentForm.currentClass,
|
|
|
currentGradeNum: studentForm.currentGradeNum,
|
|
|
- courseTeacher:studentForm.courseTeacher
|
|
|
+ courseTeacher: studentForm.courseTeacher
|
|
|
};
|
|
|
- updateStudent(obj).then((res) => {
|
|
|
+ updateStudent(obj).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.$message.success("修改成功");
|
|
|
this.studentVisible = false;
|
|
|
@@ -1424,35 +1451,35 @@ export default {
|
|
|
try {
|
|
|
await subjectListTree({
|
|
|
delFlag: "NO",
|
|
|
- rows: 9999,
|
|
|
- }).then((res) => {
|
|
|
+ rows: 9999
|
|
|
+ }).then(res => {
|
|
|
let result = res.data;
|
|
|
if (res.code == 200) {
|
|
|
let tempArray = [];
|
|
|
- console.log(result.rows,'result')
|
|
|
+ console.log(result.rows, "result");
|
|
|
result.rows.forEach((item, index) => {
|
|
|
let subject = [];
|
|
|
- let nowSubject = item.subjects || []
|
|
|
- nowSubject.forEach((s) => {
|
|
|
+ let nowSubject = item.subjects || [];
|
|
|
+ nowSubject.forEach(s => {
|
|
|
subject.push({
|
|
|
value: s.id,
|
|
|
- label: s.name,
|
|
|
+ label: s.name
|
|
|
});
|
|
|
});
|
|
|
|
|
|
tempArray[index] = {
|
|
|
label: item.name,
|
|
|
value: item.id,
|
|
|
- options: subject,
|
|
|
+ options: subject
|
|
|
};
|
|
|
});
|
|
|
- this.subjectList = tempArray;
|
|
|
+ this.subjectList = tempArray;
|
|
|
}
|
|
|
});
|
|
|
|
|
|
// 获取 学生年级
|
|
|
} catch (e) {
|
|
|
- console.log(e)
|
|
|
+ console.log(e);
|
|
|
}
|
|
|
},
|
|
|
|
|
|
@@ -1498,11 +1525,11 @@ export default {
|
|
|
extSubjectIds: row.extSubjectIds || null,
|
|
|
currentClass: row.currentClass || null,
|
|
|
currentGradeNum: row.currentGradeNum || null,
|
|
|
- courseTeacher:row.courseTeacher || null
|
|
|
+ courseTeacher: row.courseTeacher || null
|
|
|
};
|
|
|
this.studentUpdatePackage = {
|
|
|
carePackage: row.carePackage,
|
|
|
- comeOnPackage: row.comeOnPackage,
|
|
|
+ comeOnPackage: row.comeOnPackage
|
|
|
};
|
|
|
});
|
|
|
},
|
|
|
@@ -1525,7 +1552,7 @@ export default {
|
|
|
carePackage: row.carePackage,
|
|
|
comeOnPackage: row.comeOnPackage,
|
|
|
cooperationOrganId: row.cooperationOrganId || null,
|
|
|
- extSubjectIds: row.extSubjectIds,
|
|
|
+ extSubjectIds: row.extSubjectIds
|
|
|
};
|
|
|
this.extVisible = true;
|
|
|
},
|
|
|
@@ -1542,7 +1569,7 @@ export default {
|
|
|
this.passwrodForm = {
|
|
|
phone: "",
|
|
|
password: "",
|
|
|
- password2: "",
|
|
|
+ password2: ""
|
|
|
};
|
|
|
this.$refs["passwrodForm"].resetFields();
|
|
|
this.passwrodVisiable = false;
|
|
|
@@ -1552,14 +1579,14 @@ export default {
|
|
|
this.$message.error("两次密码必须相同");
|
|
|
return;
|
|
|
}
|
|
|
- this.$refs["passwrodForm"].validate((res) => {
|
|
|
+ this.$refs["passwrodForm"].validate(res => {
|
|
|
if (res) {
|
|
|
// 发请求
|
|
|
resetPassword2({
|
|
|
mobile: this.passwrodForm.phone,
|
|
|
newPassword: this.passwrodForm.password,
|
|
|
- userId: this.activatedRow.userId,
|
|
|
- }).then((res) => {
|
|
|
+ userId: this.activatedRow.userId
|
|
|
+ }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
// 修改成功
|
|
|
this.$message.success("修改成功");
|
|
|
@@ -1573,7 +1600,7 @@ export default {
|
|
|
this.studentForm.teacherId = null;
|
|
|
this.studentForm.school = null;
|
|
|
if (val) {
|
|
|
- await getTeacher({ organId: val }).then((res) => {
|
|
|
+ await getTeacher({ organId: val }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.maskTeacherList = res.data;
|
|
|
if (this.maskTeacherList <= 0) {
|
|
|
@@ -1583,7 +1610,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
- queryByOrganId({ organId: val }).then((res) => {
|
|
|
+ queryByOrganId({ organId: val }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.cooperationList = res.data;
|
|
|
}
|
|
|
@@ -1594,7 +1621,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
async lookContracts(row) {
|
|
|
- await getLatest({ userId: row.userId }).then((res) => {
|
|
|
+ await getLatest({ userId: row.userId }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
if (res.data) {
|
|
|
this.protocolVersions = res.data;
|
|
|
@@ -1607,8 +1634,8 @@ export default {
|
|
|
let dayjs = this.$helpers.dayjs;
|
|
|
let nowDate = new Date().getTime();
|
|
|
return nowDate - dayjs(dateStr).valueOf() < 0;
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|
