|
|
@@ -112,7 +112,7 @@
|
|
|
>
|
|
|
<el-form-item
|
|
|
label="赠课资格"
|
|
|
- prop="freeVip"
|
|
|
+ prop="free_vip"
|
|
|
:rules="[
|
|
|
{ required: true, message: '请填写赠课资格' },
|
|
|
{ validator: this.validateCom, trigger: 'blur' },
|
|
|
@@ -120,7 +120,7 @@
|
|
|
>
|
|
|
<el-input
|
|
|
style="width: 400px !important"
|
|
|
- v-model.trim="maskForm.freeVip"
|
|
|
+ v-model.trim="maskForm.free_vip"
|
|
|
maxlength="50"
|
|
|
></el-input>
|
|
|
</el-form-item>
|
|
|
@@ -157,7 +157,7 @@
|
|
|
</el-form-item>
|
|
|
<el-form-item
|
|
|
label="乐理课资格"
|
|
|
- prop="musicTheory"
|
|
|
+ prop="music_theory"
|
|
|
:rules="[
|
|
|
{ required: true, message: '请填写乐理课资格' },
|
|
|
{ validator: this.validateCom, trigger: 'blur' },
|
|
|
@@ -165,7 +165,7 @@
|
|
|
>
|
|
|
<el-input
|
|
|
style="width: 400px !important"
|
|
|
- v-model.trim="maskForm.musicTheory"
|
|
|
+ v-model.trim="maskForm.music_theory"
|
|
|
type="number"
|
|
|
@mousewheel.native.prevent
|
|
|
></el-input>
|
|
|
@@ -224,7 +224,9 @@ export default {
|
|
|
});
|
|
|
this.tableList = res.data.rows.map((student) => {
|
|
|
let activityCourseDetail = JSON.parse(student.activityCourseDetail);
|
|
|
- return { ...student, ...activityCourseDetail };
|
|
|
+ let obj = { ...student, ...activityCourseDetail,}
|
|
|
+ console.log(obj)
|
|
|
+ return obj;
|
|
|
});
|
|
|
this.rules.total = res.data.total;
|
|
|
} catch (e) {
|
|
|
@@ -240,8 +242,8 @@ export default {
|
|
|
(this.maskForm = {
|
|
|
vip1: row.vip1,
|
|
|
vip2: row.vip2,
|
|
|
- freeVip: row.free_vip,
|
|
|
- musicTheory: row.music_theory,
|
|
|
+ free_vip: row.free_vip,
|
|
|
+ music_theory: row.music_theory,
|
|
|
userId: row.userId,
|
|
|
}),
|
|
|
(this.daysVisible = true);
|
mo