|
@@ -6,22 +6,19 @@
|
|
|
课酬确认
|
|
|
</h2>
|
|
|
<div class="m-core">
|
|
|
- <div
|
|
|
- @click="openSalary"
|
|
|
+ <auth
|
|
|
+ auths="courseScheduleTeacherSalary/openSalaryConfirm"
|
|
|
v-if="isOpen == 0"
|
|
|
- v-permission="'courseScheduleTeacherSalary/openSalaryConfirm'"
|
|
|
- class="newBand"
|
|
|
>
|
|
|
- 开启课酬确认
|
|
|
- </div>
|
|
|
- <div
|
|
|
+ <div @click="openSalary" class="newBand">开启课酬确认</div>
|
|
|
+ </auth>
|
|
|
+ <auth
|
|
|
v-if="isOpen == 1"
|
|
|
- @click="closeSalary"
|
|
|
- v-permission="'courseScheduleTeacherSalary/closeSalaryConfirm'"
|
|
|
- class="newBand"
|
|
|
+ auths="courseScheduleTeacherSalary/closeSalaryConfirm"
|
|
|
>
|
|
|
- 关闭课酬确认
|
|
|
- </div>
|
|
|
+ <div @click="closeSalary" class="newBand">关闭课酬确认</div>
|
|
|
+ </auth>
|
|
|
+
|
|
|
<save-form
|
|
|
:inline="true"
|
|
|
@submit="search"
|
|
@@ -83,7 +80,10 @@
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <remoteSearch :commit='"setTeachers"' v-model='searchForm.teacherId' />
|
|
|
+ <remoteSearch
|
|
|
+ :commit="'setTeachers'"
|
|
|
+ v-model="searchForm.teacherId"
|
|
|
+ />
|
|
|
<!-- <el-select
|
|
|
placeholder="老师姓名"
|
|
|
v-model="searchForm.teacherId"
|
|
@@ -250,12 +250,8 @@
|
|
|
<template slot-scope="scope">{{(scope.row.actualReceipts ? scope.row.actualReceipts : 0) + '元'}}</template>
|
|
|
</el-table-column> -->
|
|
|
<!-- expectSalary -->
|
|
|
- <el-table-column
|
|
|
- align="center"
|
|
|
- prop="belongDaya"
|
|
|
- label="课酬类型"
|
|
|
- >
|
|
|
- <template slot-scope="scope">{{
|
|
|
+ <el-table-column align="center" prop="belongDaya" label="课酬类型">
|
|
|
+ <template slot-scope="scope">{{
|
|
|
belongDaya[scope.row.belongDaya]
|
|
|
}}</template>
|
|
|
</el-table-column>
|
|
@@ -288,9 +284,11 @@
|
|
|
></el-table-column>
|
|
|
<el-table-column align="center" label="操作" fixed="right">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button type="text" @click="resetSalary(scope.row)"
|
|
|
- >课酬调整</el-button
|
|
|
- >
|
|
|
+ <auth auths='teacherSalaryModifyLog/add'>
|
|
|
+ <el-button type="text" @click="resetSalary(scope.row)"
|
|
|
+ >课酬调整</el-button
|
|
|
+ >
|
|
|
+ </auth>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
@@ -384,11 +382,11 @@ import numeral from "numeral";
|
|
|
import axios from "axios";
|
|
|
import { getToken } from "@/utils/auth";
|
|
|
import pagination from "@/components/Pagination/index";
|
|
|
-import remoteSearch from '@/components/remote-search/index'
|
|
|
+import remoteSearch from "@/components/remote-search/index";
|
|
|
import load from "@/utils/loading";
|
|
|
-import { belongDaya } from '@/constant'
|
|
|
-import { objectToOptions } from '@/utils'
|
|
|
-import dayjs from 'dayjs'
|
|
|
+import { belongDaya } from "@/constant";
|
|
|
+import { objectToOptions } from "@/utils";
|
|
|
+import dayjs from "dayjs";
|
|
|
import {
|
|
|
findIsSettlementCourseSalarys,
|
|
|
openSalaryConfirm,
|
|
@@ -436,20 +434,20 @@ export default {
|
|
|
},
|
|
|
//生命周期 - 创建完成(可以访问当前this实例)
|
|
|
created() {
|
|
|
- if (!this.searchForm.month) {
|
|
|
- var now = new Date();
|
|
|
- this.searchForm.month = new Date(
|
|
|
- Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
|
|
|
- )
|
|
|
- .toISOString()
|
|
|
- .slice(0, 7);
|
|
|
- }
|
|
|
+ if (!this.searchForm.month) {
|
|
|
+ var now = new Date();
|
|
|
+ this.searchForm.month = new Date(
|
|
|
+ Date.UTC(now.getFullYear(), now.getMonth(), now.getDate())
|
|
|
+ )
|
|
|
+ .toISOString()
|
|
|
+ .slice(0, 7);
|
|
|
+ }
|
|
|
},
|
|
|
//生命周期 - 挂载完成(可以访问DOM元素)
|
|
|
async mounted() {
|
|
|
- await this.$store.dispatch('setBranchs')
|
|
|
+ await this.$store.dispatch("setBranchs");
|
|
|
|
|
|
- await this.$store.dispatch('setTeachers')
|
|
|
+ await this.$store.dispatch("setTeachers");
|
|
|
// 获取分部
|
|
|
this.init();
|
|
|
},
|
|
@@ -479,7 +477,7 @@ export default {
|
|
|
teacherId: null,
|
|
|
signInStatus: null,
|
|
|
signOutStatus: null,
|
|
|
- month: dayjs().format('YYYY-MM'),
|
|
|
+ month: dayjs().format("YYYY-MM"),
|
|
|
confirmStatus: null,
|
|
|
};
|
|
|
this.search();
|
|
@@ -595,14 +593,14 @@ export default {
|
|
|
resetSalary(row) {
|
|
|
this.$nextTick(() => {
|
|
|
this.visibleForm = {
|
|
|
- finalSalary: row.finalSalary, // 实发
|
|
|
- reduceSalary: row.reduceSalary, // 扣款
|
|
|
- actualSalary: row.actualSalary, // 应发
|
|
|
- courseScheduleId: row.courseScheduleId,
|
|
|
- memo: row.memo,
|
|
|
- teacherId: row.teacherId
|
|
|
- }
|
|
|
- })
|
|
|
+ finalSalary: row.finalSalary, // 实发
|
|
|
+ reduceSalary: row.reduceSalary, // 扣款
|
|
|
+ actualSalary: row.actualSalary, // 应发
|
|
|
+ courseScheduleId: row.courseScheduleId,
|
|
|
+ memo: row.memo,
|
|
|
+ teacherId: row.teacherId,
|
|
|
+ };
|
|
|
+ });
|
|
|
// let obj = {
|
|
|
// finalSalary: row.finalSalary, // 实发
|
|
|
// reduceSalary: row.reduceSalary, // 扣款
|
|
@@ -657,8 +655,8 @@ export default {
|
|
|
return this.visibleForm.reduceSalary;
|
|
|
},
|
|
|
belongDayaOption() {
|
|
|
- return objectToOptions(belongDaya)
|
|
|
- }
|
|
|
+ return objectToOptions(belongDaya);
|
|
|
+ },
|
|
|
},
|
|
|
watch: {
|
|
|
getActualsalary(val) {
|