Commit 1dca9bd8 authored by Mac's avatar Mac

1

parent 709e6e2d
......@@ -417,6 +417,7 @@
width="55"
:selectable="checkSelectable"
></el-table-column>
<el-table-column prop="SchoolName" label="校区"> </el-table-column>
<el-table-column prop="TeacherName" label="老师"> </el-table-column>
<el-table-column prop="Money" label="应发提成金额">
</el-table-column>
......@@ -883,13 +884,14 @@ export default {
let EmpIds = "";
let data = [];
this.multipleSelection.forEach((x) => {
data.push(x.TeacherId);
data.push(x.TSId);
});
EmpIds = data.join(",");
this.saveLoading = true;
setTeachingRewardsSendEmployee({
PeriodId: this.CheckID,
EmpIds: EmpIds,
// EmpIds: EmpIds,//之前是传字符串 现在是传的数组
EmpIds: data,
})
.then((res) => {
this.saveLoading = false;
......
......@@ -2,6 +2,11 @@
<div class="rewardDetailed page-body">
<div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3">
<q-select @input="getList" clearable filled stack-label option-value="SId" option-label="SName"
v-model="msg.School_Id" ref="School_Id" :options="schoolList" emit-value map-options label="所属校区"
:dense="false" />
</div>
<div class="col-3">
<q-select @input="getList" standout="bg-primary text-white" option-value="TId" option-label="TeacherName"
v-model="msg.TeacherId" :options="TeacherList" emit-value map-options label="关联老师" />
......@@ -40,30 +45,34 @@
<template v-slot:bottom>
</template>
</q-table>
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
style="margin-top: 30px" separator="none" :data="data.Statistics" :columns="columnsZ" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">教师课时费汇总</div>
<q-space />
</template>
<template v-slot:body-cell-UnitPrice="props">
<q-td :props="props" color="negative">
<span style="color: var(--q-color-negative)">{{props.row.UnitPrice.toFixed(2)}}</span>
</q-td>
</template>
<template v-slot:body-cell-Money="props">
<q-td :props="props" color="negative">
<span style="color: var(--q-color-negative)">{{props.row.Money.toFixed(2)}}</span>
</q-td>
</template>
<template v-slot:body-cell-Type="props">
<q-td :props="props">
<span>{{props.row.Type==1?'带班':'代课'}}</span>
</q-td>
</template>
<template v-slot:bottom>
</template>
</q-table>
<div style="font-size: 20px;font-weight: 400;">教师课时费汇总</div>
<div v-for="(x,y) in data.Statistics" :key='y'>
<q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
style="margin-top: 10px" separator="none" :data="x.TeacherList" :columns="columnsZ" row-key="name">
<template v-slot:top="props">
<div class="col-2 q-table__title">{{x.Key}}</div>
<q-space />
</template>
<template v-slot:body-cell-UnitPrice="props">
<q-td :props="props" color="negative">
<span style="color: var(--q-color-negative)">{{props.row.UnitPrice.toFixed(2)}}</span>
</q-td>
</template>
<template v-slot:body-cell-Money="props">
<q-td :props="props" color="negative">
<span style="color: var(--q-color-negative)">{{props.row.Money.toFixed(2)}}</span>
</q-td>
</template>
<template v-slot:body-cell-Type="props">
<q-td :props="props">
<span>{{props.row.Type==1?'带班':'代课'}}</span>
</q-td>
</template>
<template v-slot:bottom>
</template>
</q-table>
</div>
</div>
</div>
</template>
......@@ -74,6 +83,7 @@
} from '../../api/course/class'
import {
getTeacherDropDownList,
getSchoolDropdown
} from '../../api/school/index';
import {
EduDownLoad,
......@@ -96,12 +106,19 @@
align: 'left',
},
{
name: 'SName',
label: '校区',
field: 'SName',
align: 'left'
},
{
name: 'ClassName',
label: '班级',
field: 'ClassName',
align: 'left'
},
{
name: 'Type',
......@@ -186,8 +203,10 @@
TeacherId: 0,
Type: 0,
TeacherIds:'',
School_Id:-1
},
TeacherList: [], //关联教师下拉数据
schoolList: [],//校区的下拉
TypeList: [{
Id: 0,
Name: '不限'
......@@ -215,8 +234,18 @@
}
this.getList();
this.GetTeacherList()
this.getSchool()
},
methods: {
getSchool() {
getSchoolDropdown({}).then(res => {
this.schoolList = res.Data;
this.schoolList.unshift({
SId: -1,
SName: "不限"
})
})
},
Export() {
var msg = JSON.parse(JSON.stringify(this.msg));
this.loading = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment