|
@@ -60,7 +60,9 @@
|
|
|
v-else-if="scope.row.courseScheduleType == 'CLASSROOM'"
|
|
|
>元/40分钟</template
|
|
|
>
|
|
|
- <template slot="append" v-else>元/90分钟</template>
|
|
|
+ <template slot="append" v-else
|
|
|
+ >元/90分钟</template
|
|
|
+ >
|
|
|
<!-- <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template> -->
|
|
|
</el-input>
|
|
|
</template>
|
|
@@ -83,7 +85,9 @@
|
|
|
v-else-if="scope.row.courseScheduleType == 'CLASSROOM'"
|
|
|
>元/40分钟</template
|
|
|
>
|
|
|
- <template slot="append" v-else>元/90分钟</template>
|
|
|
+ <template slot="append" v-else
|
|
|
+ >元/90分钟</template
|
|
|
+ >
|
|
|
<!-- <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template> -->
|
|
|
</el-input>
|
|
|
</template>
|
|
@@ -109,7 +113,9 @@
|
|
|
v-model.trim="scope.row.v1"
|
|
|
placeholder="请输入课酬"
|
|
|
>
|
|
|
- <template slot="append">元/节</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/节</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -121,7 +127,9 @@
|
|
|
v-model.trim="scope.row.v2"
|
|
|
placeholder="请输入课酬"
|
|
|
>
|
|
|
- <template slot="append">元/节</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/节</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -133,7 +141,9 @@
|
|
|
v-model.trim="scope.row.v3"
|
|
|
placeholder="请输入课酬"
|
|
|
>
|
|
|
- <template slot="append">元/节</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/节</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -145,7 +155,9 @@
|
|
|
v-model.trim="scope.row.v4"
|
|
|
placeholder="请输入课酬"
|
|
|
>
|
|
|
- <template slot="append">元/节</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/节</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -157,7 +169,9 @@
|
|
|
v-model.trim="scope.row.v5"
|
|
|
placeholder="请输入课酬"
|
|
|
>
|
|
|
- <template slot="append">元/节</template>
|
|
|
+ <template slot="append"
|
|
|
+ >元/节</template
|
|
|
+ >
|
|
|
</el-input>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
@@ -194,7 +208,9 @@
|
|
|
v-model.trim="scope.row.offlineClassesSalary"
|
|
|
placeholder="请输入内容"
|
|
|
>
|
|
|
- <template slot="append"> 人/节</template>
|
|
|
+ <template slot="append">
|
|
|
+ 人/节</template
|
|
|
+ >
|
|
|
<!-- <template slot="append" v-else>节/人</template> v-if="scope.row.musicTheory" -->
|
|
|
</el-input>
|
|
|
|
|
@@ -205,7 +221,9 @@
|
|
|
v-model.trim="scope.row.offlineClassesSalary"
|
|
|
placeholder="请输入内容"
|
|
|
>
|
|
|
- <template slot="append"> 元/节</template>
|
|
|
+ <template slot="append">
|
|
|
+ 元/节</template
|
|
|
+ >
|
|
|
<!-- <template slot="append" v-else>节/人</template> v-if="scope.row.musicTheory" -->
|
|
|
</el-input>
|
|
|
</div>
|
|
@@ -247,8 +265,8 @@
|
|
|
{
|
|
|
required: true,
|
|
|
message: '请选择是否结算课酬',
|
|
|
- trigger: 'change',
|
|
|
- },
|
|
|
+ trigger: 'change'
|
|
|
+ }
|
|
|
]"
|
|
|
>
|
|
|
<el-select
|
|
@@ -267,7 +285,7 @@
|
|
|
label-width="120px"
|
|
|
prop="startDate"
|
|
|
:rules="[
|
|
|
- { required: true, message: '请选择生效日期', trigger: 'change' },
|
|
|
+ { required: true, message: '请选择生效日期', trigger: 'change' }
|
|
|
]"
|
|
|
>
|
|
|
<el-date-picker
|
|
@@ -309,7 +327,7 @@ import {
|
|
|
teacherDefaultPracticeGroupSalary,
|
|
|
PracticeGroupSalaryUpdate,
|
|
|
teacherGet,
|
|
|
- teacherUpdate1,
|
|
|
+ teacherUpdate1
|
|
|
} from "@/api/teacherManager";
|
|
|
|
|
|
import { sysConfigList } from "@/api/generalSettings";
|
|
@@ -335,7 +353,7 @@ export default {
|
|
|
courseScheduleType: "SINGLE",
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
},
|
|
|
{
|
|
|
assistantTeacher30MinSalary: 0,
|
|
@@ -343,7 +361,7 @@ export default {
|
|
|
courseScheduleType: "MIX",
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
},
|
|
|
{
|
|
|
assistantTeacher30MinSalary: 0,
|
|
@@ -351,7 +369,7 @@ export default {
|
|
|
courseScheduleType: "COMPREHENSIVE",
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
},
|
|
|
{
|
|
|
assistantTeacher30MinSalary: 0,
|
|
@@ -359,7 +377,7 @@ export default {
|
|
|
courseScheduleType: "TRAINING_SINGLE",
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
},
|
|
|
{
|
|
|
assistantTeacher30MinSalary: 0,
|
|
@@ -367,7 +385,7 @@ export default {
|
|
|
courseScheduleType: "TRAINING_MIX",
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
},
|
|
|
{
|
|
|
assistantTeacher30MinSalary: 0,
|
|
@@ -375,7 +393,7 @@ export default {
|
|
|
courseScheduleType: "HIGH",
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
},
|
|
|
{
|
|
|
assistantTeacher30MinSalary: 0,
|
|
@@ -383,8 +401,8 @@ export default {
|
|
|
courseScheduleType: "CLASSROOM",
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
- },
|
|
|
+ userId: this.teacherId
|
|
|
+ }
|
|
|
],
|
|
|
// salaryRuleJson: { 3: 0, 4: 0, 5: 0 },
|
|
|
// userId: this.teacherId
|
|
@@ -401,7 +419,7 @@ export default {
|
|
|
assistantTeacher90MinSalary: 0,
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
},
|
|
|
{
|
|
|
courseScheduleType: "MUSIC_NETWORK",
|
|
@@ -415,8 +433,8 @@ export default {
|
|
|
assistantTeacher90MinSalary: 0,
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: this.teacherId,
|
|
|
- },
|
|
|
+ userId: this.teacherId
|
|
|
+ }
|
|
|
],
|
|
|
vipTable: [],
|
|
|
musicGroupTable: [],
|
|
@@ -424,7 +442,7 @@ export default {
|
|
|
vipList: [],
|
|
|
updateForm: {
|
|
|
startDate: null,
|
|
|
- isSettlementSalary: 1,
|
|
|
+ isSettlementSalary: 1
|
|
|
},
|
|
|
rules: {},
|
|
|
accompanyTable: [
|
|
@@ -432,17 +450,17 @@ export default {
|
|
|
assistantTeacherSalary: 30,
|
|
|
minutes: 25,
|
|
|
userId: this.teacherId,
|
|
|
- mainTeacherSalary: 0,
|
|
|
- },
|
|
|
+ mainTeacherSalary: 0
|
|
|
+ }
|
|
|
],
|
|
|
pickerOptions: {
|
|
|
disabledDate(time) {
|
|
|
return time.getTime() > Date.now();
|
|
|
},
|
|
|
- firstDayOfWeek: 1,
|
|
|
+ firstDayOfWeek: 1
|
|
|
},
|
|
|
tenantId: "",
|
|
|
- studentRuleNum: "",
|
|
|
+ studentRuleNum: ""
|
|
|
};
|
|
|
},
|
|
|
created() {},
|
|
@@ -470,7 +488,7 @@ export default {
|
|
|
if (this.$route.query.rules) {
|
|
|
this.Frules = this.$route.query.rules;
|
|
|
}
|
|
|
- teacherGet({ teacherId: this.teacherId }).then((res) => {
|
|
|
+ teacherGet({ teacherId: this.teacherId }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
let result = res.data;
|
|
|
this.updateForm.isSettlementSalary = result.isSettlementSalary
|
|
@@ -480,25 +498,25 @@ export default {
|
|
|
});
|
|
|
|
|
|
// 获取课程形态 设置vip课酬
|
|
|
- findTeacherDefaultSalary({ userId: this.teacherId }).then((res) => {
|
|
|
+ findTeacherDefaultSalary({ userId: this.teacherId }).then(res => {
|
|
|
if (res.code == 200 && res.data.length > 0) {
|
|
|
let vipData = [];
|
|
|
- res.data.forEach((item) => {
|
|
|
+ res.data.forEach(item => {
|
|
|
vipData.push({
|
|
|
offlineClassesSalary: null,
|
|
|
onlineClassesSalary: null,
|
|
|
vipGroupCategoryId: item.id,
|
|
|
vipGroupCategoryName: item.name,
|
|
|
userId: this.teacherId,
|
|
|
- musicTheory: item.musicTheory,
|
|
|
+ musicTheory: item.musicTheory
|
|
|
});
|
|
|
});
|
|
|
// VIP课列表
|
|
|
vipGroupSalaryList({
|
|
|
rows: 9999,
|
|
|
page: 1,
|
|
|
- search: this.teacherId,
|
|
|
- }).then((res) => {
|
|
|
+ search: this.teacherId
|
|
|
+ }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
let rows = res.data.rows;
|
|
|
this.vipListCompare(vipData, rows);
|
|
@@ -510,9 +528,9 @@ export default {
|
|
|
teacherSalaryList({
|
|
|
rows: 9999,
|
|
|
page: 1,
|
|
|
- teacherId: this.teacherId,
|
|
|
+ teacherId: this.teacherId
|
|
|
// settlementType: 'FIXED_SALARY'
|
|
|
- }).then((res) => {
|
|
|
+ }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
// this.teamTable = res.data.rows
|
|
|
let rows = res.data.rows;
|
|
@@ -521,7 +539,7 @@ export default {
|
|
|
});
|
|
|
// 网管课
|
|
|
teacherDefaultPracticeGroupSalary({ teacherId: this.teacherId }).then(
|
|
|
- (res) => {
|
|
|
+ res => {
|
|
|
if (res.code == 200 && res.data.length > 0) {
|
|
|
this.accompanyTable = res.data;
|
|
|
}
|
|
@@ -536,8 +554,8 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
let result = [];
|
|
|
- vipData.forEach((item) => {
|
|
|
- rows.forEach((c) => {
|
|
|
+ vipData.forEach(item => {
|
|
|
+ rows.forEach(c => {
|
|
|
if (item.vipGroupCategoryId == c.vipGroupCategoryId) {
|
|
|
item.checked = true;
|
|
|
result.push({
|
|
@@ -546,13 +564,13 @@ export default {
|
|
|
onlineClassesSalary: c.onlineClassesSalary,
|
|
|
vipGroupCategoryName: c.vipGroupCategoryName,
|
|
|
userId: c.userId,
|
|
|
- musicTheory: c.musicTheory,
|
|
|
+ musicTheory: c.musicTheory
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
if (result.length > 0) {
|
|
|
- vipData.forEach((item) => {
|
|
|
+ vipData.forEach(item => {
|
|
|
if (!item.checked) {
|
|
|
result.push(item);
|
|
|
}
|
|
@@ -568,8 +586,8 @@ export default {
|
|
|
if (!rows || rows.length <= 0) return;
|
|
|
let teamTable = this.teamTable;
|
|
|
let result = [];
|
|
|
- teamTable.forEach((item) => {
|
|
|
- rows.forEach((c) => {
|
|
|
+ teamTable.forEach(item => {
|
|
|
+ rows.forEach(c => {
|
|
|
if (item.courseScheduleType == c.courseScheduleType) {
|
|
|
item.checked = true;
|
|
|
result.push({
|
|
@@ -578,13 +596,13 @@ export default {
|
|
|
assistantTeacher30MinSalary: c.assistantTeacher30MinSalary,
|
|
|
assistantTeacher90MinSalary: c.assistantTeacher90MinSalary,
|
|
|
courseScheduleType: c.courseScheduleType,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
if (result.length > 0) {
|
|
|
- teamTable.forEach((item) => {
|
|
|
+ teamTable.forEach(item => {
|
|
|
if (!item.checked) {
|
|
|
result.push(item);
|
|
|
}
|
|
@@ -596,8 +614,8 @@ export default {
|
|
|
|
|
|
let smallResult = [];
|
|
|
let teamSmallTable = this.teamSmallTable;
|
|
|
- teamSmallTable.forEach((item) => {
|
|
|
- rows.forEach((c) => {
|
|
|
+ teamSmallTable.forEach(item => {
|
|
|
+ rows.forEach(c => {
|
|
|
if (item.courseScheduleType == c.courseScheduleType) {
|
|
|
item.checked = true;
|
|
|
let tempJson = c.salaryRuleJson
|
|
@@ -616,14 +634,14 @@ export default {
|
|
|
v4: tempJson[4] ? tempJson[4] : 0,
|
|
|
v5: tempJson[5] ? tempJson[5] : 0,
|
|
|
courseScheduleType: c.courseScheduleType,
|
|
|
- userId: this.teacherId,
|
|
|
+ userId: this.teacherId
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
|
|
|
if (smallResult.length > 0) {
|
|
|
- teamSmallTable.forEach((item) => {
|
|
|
+ teamSmallTable.forEach(item => {
|
|
|
if (!item.checked) {
|
|
|
smallResult.push(item);
|
|
|
}
|
|
@@ -636,7 +654,7 @@ export default {
|
|
|
onSave() {
|
|
|
let teamTable = this.teamTable;
|
|
|
let checkStatus = true;
|
|
|
- teamTable.forEach((item) => {
|
|
|
+ teamTable.forEach(item => {
|
|
|
if (
|
|
|
item.assistantTeacher30MinSalary < 0 ||
|
|
|
item.assistantTeacher90MinSalary < 0 ||
|
|
@@ -649,7 +667,7 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
let temps = [];
|
|
|
- this.teamSmallTable.forEach((item) => {
|
|
|
+ this.teamSmallTable.forEach(item => {
|
|
|
if (
|
|
|
item.v1 < 0 ||
|
|
|
item.v2 < 0 ||
|
|
@@ -668,16 +686,16 @@ export default {
|
|
|
2: Number(item.v2),
|
|
|
3: Number(item.v3),
|
|
|
4: Number(item.v4),
|
|
|
- 5: Number(item.v5),
|
|
|
+ 5: Number(item.v5)
|
|
|
}),
|
|
|
assistantTeacher30MinSalary: 0,
|
|
|
assistantTeacher90MinSalary: 0,
|
|
|
mainTeacher30MinSalary: 0,
|
|
|
mainTeacher90MinSalary: 0,
|
|
|
- userId: item.userId,
|
|
|
+ userId: item.userId
|
|
|
});
|
|
|
});
|
|
|
- this.vipTable.forEach((item) => {
|
|
|
+ this.vipTable.forEach(item => {
|
|
|
// console.log(item)
|
|
|
if (item.offlineClassesSalary < 0 || item.onlineClassesSalary < 0) {
|
|
|
this.$message.error("输入课酬不能为负数");
|
|
@@ -685,7 +703,7 @@ export default {
|
|
|
return;
|
|
|
}
|
|
|
});
|
|
|
- this.accompanyTable.forEach((item) => {
|
|
|
+ this.accompanyTable.forEach(item => {
|
|
|
if (item.mainTeacherSalary < 0) {
|
|
|
this.$message.error("输入课酬不能为负数");
|
|
|
checkStatus = false;
|
|
@@ -700,19 +718,19 @@ export default {
|
|
|
if (!checkStatus) {
|
|
|
return;
|
|
|
}
|
|
|
- this.$refs["salaryForm"].validate((valid) => {
|
|
|
+ this.$refs["salaryForm"].validate(valid => {
|
|
|
if (valid) {
|
|
|
this.$confirm("您确定更改老师课酬", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
|
- type: "warning",
|
|
|
+ type: "warning"
|
|
|
})
|
|
|
.then(async () => {
|
|
|
let params = teamTable.concat(temps);
|
|
|
let updateForm = this.updateForm;
|
|
|
let res = await teacherUpdate1({
|
|
|
id: this.teacherId,
|
|
|
- isSettlementSalary: updateForm.isSettlementSalary,
|
|
|
+ isSettlementSalary: updateForm.isSettlementSalary
|
|
|
});
|
|
|
if (res.code != 200) {
|
|
|
this.$message.error(res.msg);
|
|
@@ -720,26 +738,25 @@ export default {
|
|
|
}
|
|
|
teacherSalaryBatchUpset({
|
|
|
teacherDefaultMusicGroupSalaries: params,
|
|
|
- startDate: updateForm.startDate,
|
|
|
- }).then((res) => {
|
|
|
+ startDate: updateForm.startDate
|
|
|
+ }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
// 判断输入的值是否正确
|
|
|
vipGroupSalarySet({
|
|
|
teacherDefaultVipGroupSalaries: this.vipTable,
|
|
|
- startDate: updateForm.startDate,
|
|
|
- }).then((res) => {
|
|
|
+ startDate: updateForm.startDate
|
|
|
+ }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
PracticeGroupSalaryUpdate({
|
|
|
startDate: updateForm.startDate,
|
|
|
- teacherDefaultPracticeGroupSalaries:
|
|
|
- this.accompanyTable,
|
|
|
- }).then((res) => {
|
|
|
+ teacherDefaultPracticeGroupSalaries: this.accompanyTable
|
|
|
+ }).then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.$message.success("保存成功");
|
|
|
this.$store.dispatch("delVisitedViews", this.$route);
|
|
|
this.$router.push({
|
|
|
path: "/teacherManager/teacherList",
|
|
|
- query: { rules: this.Frules, search: this.Fsearch },
|
|
|
+ query: { rules: this.Frules, search: this.Fsearch }
|
|
|
});
|
|
|
}
|
|
|
});
|
|
@@ -756,8 +773,8 @@ export default {
|
|
|
// this.$message.error("请填写生效日期");
|
|
|
// return;
|
|
|
// }
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="scss" scoped>
|