|
@@ -10,6 +10,7 @@
|
|
<div class="main-header-item">
|
|
<div class="main-header-item">
|
|
<div class="block">
|
|
<div class="block">
|
|
<el-date-picker
|
|
<el-date-picker
|
|
|
|
+ v-if="ActiveIndex != 2"
|
|
v-model="selMonth"
|
|
v-model="selMonth"
|
|
type="month"
|
|
type="month"
|
|
placeholder="选择月份"
|
|
placeholder="选择月份"
|
|
@@ -17,6 +18,15 @@
|
|
:picker-options="pickerOptions0"
|
|
:picker-options="pickerOptions0"
|
|
@change="GetTeacherSalaryListDatas()"
|
|
@change="GetTeacherSalaryListDatas()"
|
|
></el-date-picker>
|
|
></el-date-picker>
|
|
|
|
+ <el-date-picker
|
|
|
|
+ v-if="ActiveIndex == 2"
|
|
|
|
+ v-model="selMonth1"
|
|
|
|
+ type="month"
|
|
|
|
+ placeholder="选择月份"
|
|
|
|
+ value-format="yyyy-MM"
|
|
|
|
+ :picker-options="pickerOptions0"
|
|
|
|
+ @change="GetTeacherSalaryListDatas()"
|
|
|
|
+ ></el-date-picker>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</el-col>
|
|
</el-col>
|
|
@@ -86,7 +96,7 @@
|
|
border
|
|
border
|
|
stripe
|
|
stripe
|
|
>
|
|
>
|
|
- <el-table-column label="注册老师" header-align="center">
|
|
|
|
|
|
+ <el-table-column label="注册老师" header-align="center" width="150">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<div class="scope-list">
|
|
<div class="scope-list">
|
|
<img
|
|
<img
|
|
@@ -118,7 +128,11 @@
|
|
<el-table-column prop="manualMiddleGradeCount" label="3-4年级手动批改"></el-table-column>
|
|
<el-table-column prop="manualMiddleGradeCount" label="3-4年级手动批改"></el-table-column>
|
|
<el-table-column prop="manualHighGradeCount" label="5-6年级手动批改"></el-table-column>
|
|
<el-table-column prop="manualHighGradeCount" label="5-6年级手动批改"></el-table-column>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column prop="basicSalary" label="底薪金额" header-align="center"></el-table-column>
|
|
|
|
|
|
+ <el-table-column prop label="底薪金额" header-align="center">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span>{{scope.row.basicSalary?scope.row.basicSalary:'无'}}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column prop="correctDecution" label="批改提成" header-align="center"></el-table-column>
|
|
<el-table-column prop="correctDecution" label="批改提成" header-align="center"></el-table-column>
|
|
<el-table-column prop="total" label="总计" header-align="center" ></el-table-column>
|
|
<el-table-column prop="total" label="总计" header-align="center" ></el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -150,7 +164,7 @@
|
|
border
|
|
border
|
|
stripe
|
|
stripe
|
|
>
|
|
>
|
|
- <el-table-column label="注册老师" header-align="center">
|
|
|
|
|
|
+ <el-table-column label="注册老师" header-align="center" width="150">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<div class="scope-list">
|
|
<div class="scope-list">
|
|
<img
|
|
<img
|
|
@@ -178,7 +192,11 @@
|
|
<el-table-column prop="attendanceRate" label="出勤率" header-align="center"></el-table-column>
|
|
<el-table-column prop="attendanceRate" label="出勤率" header-align="center"></el-table-column>
|
|
<el-table-column prop="accuracy" label="正确率" header-align="center"></el-table-column>
|
|
<el-table-column prop="accuracy" label="正确率" header-align="center"></el-table-column>
|
|
<el-table-column prop="correctCount" label="作业批改数量" header-align="center"></el-table-column>
|
|
<el-table-column prop="correctCount" label="作业批改数量" header-align="center"></el-table-column>
|
|
- <el-table-column prop="basicSalary" label="底薪金额" header-align="center"></el-table-column>
|
|
|
|
|
|
+ <el-table-column prop label="底薪金额" header-align="center">
|
|
|
|
+ <template slot-scope="scope">
|
|
|
|
+ <span>{{scope.row.basicSalary?scope.row.basicSalary:'无'}}</span>
|
|
|
|
+ </template>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column prop="correctDecution" label="批改提成" header-align="center"></el-table-column>
|
|
<el-table-column prop="correctDecution" label="批改提成" header-align="center"></el-table-column>
|
|
<el-table-column prop="total" label="总计" header-align="center"></el-table-column>
|
|
<el-table-column prop="total" label="总计" header-align="center"></el-table-column>
|
|
</el-table>
|
|
</el-table>
|
|
@@ -208,7 +226,7 @@
|
|
border
|
|
border
|
|
stripe
|
|
stripe
|
|
>
|
|
>
|
|
- <el-table-column label="注册老师" header-align="center">
|
|
|
|
|
|
+ <el-table-column label="注册老师" header-align="center" width="150">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<div class="scope-list">
|
|
<div class="scope-list">
|
|
<img
|
|
<img
|
|
@@ -285,7 +303,7 @@
|
|
border
|
|
border
|
|
stripe
|
|
stripe
|
|
>
|
|
>
|
|
- <el-table-column label="注册老师" header-align="center">
|
|
|
|
|
|
+ <el-table-column label="注册老师" header-align="center" width="150">
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
<div class="scope-list">
|
|
<div class="scope-list">
|
|
<img
|
|
<img
|
|
@@ -411,6 +429,7 @@ export default {
|
|
inputValue: "",
|
|
inputValue: "",
|
|
BASE_URL: IMG_BASE_URL,
|
|
BASE_URL: IMG_BASE_URL,
|
|
selMonth:this.monthFormatDate(),
|
|
selMonth:this.monthFormatDate(),
|
|
|
|
+ selMonth1:this.nextFormatDate(),
|
|
hiddenModel: false,
|
|
hiddenModel: false,
|
|
isPigai: false,
|
|
isPigai: false,
|
|
currentPageSize: 10,
|
|
currentPageSize: 10,
|
|
@@ -803,7 +822,14 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
//年月时间封装
|
|
//年月时间封装
|
|
- monthFormatDate: function() {
|
|
|
|
|
|
+ monthFormatDate: function(str) {
|
|
|
|
+ let date = new Date();
|
|
|
|
+ let y = date.getFullYear();
|
|
|
|
+ let MM = date.getMonth();
|
|
|
|
+ MM = MM < 10 ? "0" + MM : MM;
|
|
|
|
+ return y + "-" + MM;
|
|
|
|
+ },
|
|
|
|
+ nextFormatDate: function(str) {
|
|
let date = new Date();
|
|
let date = new Date();
|
|
let y = date.getFullYear();
|
|
let y = date.getFullYear();
|
|
let MM = date.getMonth() + 1;
|
|
let MM = date.getMonth() + 1;
|