|
@@ -5,230 +5,249 @@
|
|
|
<div class="squrt"></div>课酬确认
|
|
|
</h2>
|
|
|
<div class="m-core">
|
|
|
- <div
|
|
|
- @click="openSalary"
|
|
|
- v-if="isOpen == 0"
|
|
|
- v-permission="'courseScheduleTeacherSalary/openSalaryConfirm'"
|
|
|
- class="newBand"
|
|
|
- >开启课酬确认</div>
|
|
|
- <div
|
|
|
- v-if="isOpen == 1"
|
|
|
- @click="closeSalary"
|
|
|
- v-permission="'courseScheduleTeacherSalary/closeSalaryConfirm'"
|
|
|
- class="newBand"
|
|
|
- >关闭课酬确认</div>
|
|
|
- <el-form :inline="true" :model="searchForm">
|
|
|
+ <div @click="openSalary"
|
|
|
+ v-if="isOpen == 0"
|
|
|
+ v-permission="'courseScheduleTeacherSalary/openSalaryConfirm'"
|
|
|
+ class="newBand">开启课酬确认</div>
|
|
|
+ <div v-if="isOpen == 1"
|
|
|
+ @click="closeSalary"
|
|
|
+ v-permission="'courseScheduleTeacherSalary/closeSalaryConfirm'"
|
|
|
+ class="newBand">关闭课酬确认</div>
|
|
|
+ <el-form :inline="true"
|
|
|
+ :model="searchForm">
|
|
|
<el-form-item>
|
|
|
- <el-input
|
|
|
- v-model.trim="searchForm.search"
|
|
|
- @keyup.enter.native="search"
|
|
|
- placeholder="课程编号、课程组名称"
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model.trim="searchForm.search"
|
|
|
+ @keyup.enter.native="search"
|
|
|
+ placeholder="课程编号、课程组名称"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="organId">
|
|
|
- <el-select
|
|
|
- class="multiple"
|
|
|
- v-model.trim="searchForm.organIdList"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="请选择分部"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item,index) in organList"
|
|
|
- :key="index"
|
|
|
- :label="item.name"
|
|
|
- :value="item.id"
|
|
|
- ></el-option>
|
|
|
+ <el-select class="multiple"
|
|
|
+ v-model.trim="searchForm.organIdList"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ placeholder="请选择分部">
|
|
|
+ <el-option v-for="(item,index) in organList"
|
|
|
+ :key="index"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item prop="organId">
|
|
|
- <el-select
|
|
|
- class="multiple"
|
|
|
- v-model.trim="searchForm.groupType"
|
|
|
- filterable
|
|
|
- clearable
|
|
|
- placeholder="请选择课程组类型"
|
|
|
- >
|
|
|
- <el-option
|
|
|
- v-for="(item,index) in groupTypeList"
|
|
|
- :key="index"
|
|
|
- :label="item.label"
|
|
|
- :value="item.value"
|
|
|
- ></el-option>
|
|
|
+ <el-select class="multiple"
|
|
|
+ v-model.trim="searchForm.groupType"
|
|
|
+ filterable
|
|
|
+ clearable
|
|
|
+ placeholder="请选择课程组类型">
|
|
|
+ <el-option v-for="(item,index) in groupTypeList"
|
|
|
+ :key="index"
|
|
|
+ :label="item.label"
|
|
|
+ :value="item.value"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select placeholder="老师姓名" v-model="searchForm.teacherId" clearable filterable>
|
|
|
- <el-option
|
|
|
- v-for="(item,index) in teacherList"
|
|
|
- :label="item.realName"
|
|
|
- :value="item.id"
|
|
|
- :key="index"
|
|
|
- ></el-option>
|
|
|
+ <el-select placeholder="老师姓名"
|
|
|
+ v-model="searchForm.teacherId"
|
|
|
+ clearable
|
|
|
+ filterable>
|
|
|
+ <el-option v-for="(item,index) in teacherList"
|
|
|
+ :label="item.realName"
|
|
|
+ :value="item.id"
|
|
|
+ :key="index"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select placeholder="正常签到" v-model="searchForm.signInStatus" clearable>
|
|
|
- <el-option label="是" value="1"></el-option>
|
|
|
- <el-option label="否" value="0"></el-option>
|
|
|
+ <el-select placeholder="正常签到"
|
|
|
+ v-model="searchForm.signInStatus"
|
|
|
+ clearable>
|
|
|
+ <el-option label="是"
|
|
|
+ value="1"></el-option>
|
|
|
+ <el-option label="否"
|
|
|
+ value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select placeholder="正常签退" v-model="searchForm.signOutStatus" clearable>
|
|
|
- <el-option label="是" value="1"></el-option>
|
|
|
- <el-option label="否" value="0"></el-option>
|
|
|
+ <el-select placeholder="正常签退"
|
|
|
+ v-model="searchForm.signOutStatus"
|
|
|
+ clearable>
|
|
|
+ <el-option label="是"
|
|
|
+ value="1"></el-option>
|
|
|
+ <el-option label="否"
|
|
|
+ value="0"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-select placeholder="状态" v-model="searchForm.confirmStatus" clearable>
|
|
|
- <el-option label="待确定" value="1"></el-option>
|
|
|
- <el-option label="已确定" value="2"></el-option>
|
|
|
- <el-option label="已完成" value="3"></el-option>
|
|
|
+ <el-select placeholder="状态"
|
|
|
+ v-model="searchForm.confirmStatus"
|
|
|
+ clearable>
|
|
|
+ <el-option label="待确定"
|
|
|
+ value="1"></el-option>
|
|
|
+ <el-option label="已确定"
|
|
|
+ value="2"></el-option>
|
|
|
+ <el-option label="已完成"
|
|
|
+ value="3"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-date-picker
|
|
|
- :clearable="false"
|
|
|
- v-model="searchForm.month"
|
|
|
- type="month"
|
|
|
- value-format="yyyy-MM"
|
|
|
- placeholder="选择年月"
|
|
|
- ></el-date-picker>
|
|
|
+ <el-date-picker :clearable="false"
|
|
|
+ v-model="searchForm.month"
|
|
|
+ type="month"
|
|
|
+ value-format="yyyy-MM"
|
|
|
+ placeholder="选择年月"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item>
|
|
|
- <el-button type="danger" @click="search">搜索</el-button>
|
|
|
- <el-button @click="onReSet" type="primary">重置</el-button>
|
|
|
+ <el-button type="danger"
|
|
|
+ @click="search">搜索</el-button>
|
|
|
+ <el-button @click="onReSet"
|
|
|
+ type="primary">重置</el-button>
|
|
|
<!-- export/isSettlementCourseSalarys -->
|
|
|
- <el-button
|
|
|
- @click="onExport"
|
|
|
- type="primary"
|
|
|
- v-permission="'export/exercisesSituations'"
|
|
|
- style=" background: #14928a; border:1px solid #14928a;"
|
|
|
- >导出</el-button>
|
|
|
+ <el-button @click="onExport"
|
|
|
+ type="primary"
|
|
|
+ v-permission="'export/exercisesSituations'"
|
|
|
+ style=" background: #14928a; border:1px solid #14928a;">导出</el-button>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<div class="tableWrap">
|
|
|
- <el-table
|
|
|
- style="width: 100%"
|
|
|
- :header-cell-style="{background:'#EDEEF0',color:'#444'}"
|
|
|
- :data="tableList"
|
|
|
- >
|
|
|
- <el-table-column align="center" prop="organName" label="分部"></el-table-column>
|
|
|
- <el-table-column align="center" prop="groupType" width="100" label="课程组类型">
|
|
|
+ <el-table style="width: 100%"
|
|
|
+ :header-cell-style="{background:'#EDEEF0',color:'#444'}"
|
|
|
+ :data="tableList">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="organName"
|
|
|
+ label="分部"></el-table-column>
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="groupType"
|
|
|
+ width="100"
|
|
|
+ label="课程组类型">
|
|
|
<template slot-scope="scope">{{scope.row.groupType | coursesType}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="courseScheduleId" label="课程编号"></el-table-column>
|
|
|
- <el-table-column align="center" prop="courseScheduleId" width="150" label="时间">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="courseScheduleId"
|
|
|
+ label="课程编号"></el-table-column>
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="courseScheduleId"
|
|
|
+ width="150"
|
|
|
+ label="时间">
|
|
|
<template slot-scope="scope">{{scope.row.startClassTime | dateForMinFormat}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="courseName" width="120" label="课程名称"></el-table-column>
|
|
|
- <el-table-column align="center" prop="teacherId" label="老师编号"></el-table-column>
|
|
|
- <el-table-column align="center" prop="teacherName" label="老师姓名"></el-table-column>
|
|
|
- <el-table-column align="center" prop="courseScheduleId" width="150" label="签到时间">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="courseName"
|
|
|
+ width="120"
|
|
|
+ label="课程名称"></el-table-column>
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="teacherId"
|
|
|
+ label="老师编号"></el-table-column>
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="teacherName"
|
|
|
+ label="老师姓名"></el-table-column>
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="courseScheduleId"
|
|
|
+ width="150"
|
|
|
+ label="签到时间">
|
|
|
<template slot-scope="scope">
|
|
|
- <p
|
|
|
- :class="scope.row.signInStatus == 1?'':'red'"
|
|
|
- >{{scope.row.signInTime | dateForMinFormat}}</p>
|
|
|
- <p
|
|
|
- :class="scope.row.signInStatus == 1?'':'red'"
|
|
|
- >{{scope.row.signInStatus | attendanceType }}</p>
|
|
|
- <p class="red" v-if="!scope.row.signInStatus&&scope.row.signInStatus!=0">未签到</p>
|
|
|
+ <p :class="scope.row.signInStatus == 1?'':'red'">{{scope.row.signInTime | dateForMinFormat}}</p>
|
|
|
+ <p :class="scope.row.signInStatus == 1?'':'red'">{{scope.row.signInStatus | attendanceType }}</p>
|
|
|
+ <p class="red"
|
|
|
+ v-if="!scope.row.signInStatus&&scope.row.signInStatus!=0">未签到</p>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="courseScheduleId" width="150" label="签退时间">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="courseScheduleId"
|
|
|
+ width="150"
|
|
|
+ label="签退时间">
|
|
|
<template slot-scope="scope">
|
|
|
- <p
|
|
|
- :class="scope.row.signOutStatus == 1?'':'red'"
|
|
|
- >{{scope.row.signOutTime | dateForMinFormat}}</p>
|
|
|
- <p
|
|
|
- :class="scope.row.signOutStatus == 1?'':'red'"
|
|
|
- >{{scope.row.signOutStatus | attendanceOutType}}</p>
|
|
|
- <p class="red" v-if="!scope.row.signOutStatus&&scope.row.signOutStatus!=0">未签退</p>
|
|
|
+ <p :class="scope.row.signOutStatus == 1?'':'red'">{{scope.row.signOutTime | dateForMinFormat}}</p>
|
|
|
+ <p :class="scope.row.signOutStatus == 1?'':'red'">{{scope.row.signOutStatus | attendanceOutType}}</p>
|
|
|
+ <p class="red"
|
|
|
+ v-if="!scope.row.signOutStatus&&scope.row.signOutStatus!=0">未签退</p>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="actualReceipts" label="实际收款">
|
|
|
+ <!-- <el-table-column align="center" prop="actualReceipts" label="实际收款">
|
|
|
<template slot-scope="scope">{{(scope.row.actualReceipts ? scope.row.actualReceipts : 0) + '元'}}</template>
|
|
|
- </el-table-column>
|
|
|
+ </el-table-column> -->
|
|
|
<!-- expectSalary -->
|
|
|
- <el-table-column align="center" prop="actualSalary" label="应发课酬">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="actualSalary"
|
|
|
+ label="应发课酬">
|
|
|
<template slot-scope="scope">{{scope.row.actualSalary + '元'}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="reduceSalary" label="课酬扣款">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="reduceSalary"
|
|
|
+ label="课酬扣款">
|
|
|
<template slot-scope="scope">{{scope.row.reduceSalary + '元'}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="finalSalary" label="结算课酬">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="finalSalary"
|
|
|
+ label="结算课酬">
|
|
|
<template slot-scope="scope">{{scope.row.finalSalary + '元'}}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop label="状态" fixed="right">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop
|
|
|
+ label="状态"
|
|
|
+ fixed="right">
|
|
|
<template slot-scope="scope">{{scope.row.confirmStatus | confirmFilter }}</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column align="center" prop="memo" label="备注" width="300" fixed="right"></el-table-column>
|
|
|
- <el-table-column align="center" label="操作" fixed="right">
|
|
|
+ <el-table-column align="center"
|
|
|
+ prop="memo"
|
|
|
+ label="备注"
|
|
|
+ width="300"
|
|
|
+ fixed="right"></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>
|
|
|
+ <el-button type="text"
|
|
|
+ @click="resetSalary(scope.row)">课酬调整</el-button>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <pagination
|
|
|
- :total="rules.total"
|
|
|
- :page.sync="rules.page"
|
|
|
- :limit.sync="rules.limit"
|
|
|
- :page-sizes="rules.page_size"
|
|
|
- @pagination="getList"
|
|
|
- />
|
|
|
+ <pagination :total="rules.total"
|
|
|
+ :page.sync="rules.page"
|
|
|
+ :limit.sync="rules.limit"
|
|
|
+ :page-sizes="rules.page_size"
|
|
|
+ @pagination="getList" />
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-dialog title="课酬调整" :visible.sync="dialogVisible" width="400px">
|
|
|
+ <el-dialog title="课酬调整"
|
|
|
+ :visible.sync="dialogVisible"
|
|
|
+ width="400px">
|
|
|
<div>
|
|
|
- <el-form
|
|
|
- ref="visibleForm"
|
|
|
- :model="visibleForm"
|
|
|
- class="visibleForm"
|
|
|
- :inline="true"
|
|
|
- label-width="60px"
|
|
|
- >
|
|
|
- <el-form-item
|
|
|
- label="应发"
|
|
|
- :rules="[{ required: true, message: '请填写应发数',trigger: 'blur'}]"
|
|
|
- prop="actualSalary"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model.trim="visibleForm.actualSalary"
|
|
|
- type="number"
|
|
|
- @mousewheel.native.prevent
|
|
|
- ></el-input>
|
|
|
+ <el-form ref="visibleForm"
|
|
|
+ :model="visibleForm"
|
|
|
+ class="visibleForm"
|
|
|
+ :inline="true"
|
|
|
+ label-width="60px">
|
|
|
+ <el-form-item label="应发"
|
|
|
+ :rules="[{ required: true, message: '请填写应发数',trigger: 'blur'}]"
|
|
|
+ prop="actualSalary">
|
|
|
+ <el-input v-model.trim="visibleForm.actualSalary"
|
|
|
+ type="number"
|
|
|
+ @mousewheel.native.prevent></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="扣款"
|
|
|
- :rules="[{ required: true, message: '请填写扣款数',trigger: 'blur'}]"
|
|
|
- prop="reduceSalary"
|
|
|
- >
|
|
|
- <el-input
|
|
|
- v-model.trim="visibleForm.reduceSalary"
|
|
|
- type="number"
|
|
|
- @mousewheel.native.prevent
|
|
|
- ></el-input>
|
|
|
+ <el-form-item label="扣款"
|
|
|
+ :rules="[{ required: true, message: '请填写扣款数',trigger: 'blur'}]"
|
|
|
+ prop="reduceSalary">
|
|
|
+ <el-input v-model.trim="visibleForm.reduceSalary"
|
|
|
+ type="number"
|
|
|
+ @mousewheel.native.prevent></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="实发">
|
|
|
- <el-input
|
|
|
- v-model.trim="visibleForm.finalSalary"
|
|
|
- disabled
|
|
|
- type="number"
|
|
|
- @mousewheel.native.prevent
|
|
|
- ></el-input>
|
|
|
+ <el-input v-model.trim="visibleForm.finalSalary"
|
|
|
+ disabled
|
|
|
+ type="number"
|
|
|
+ @mousewheel.native.prevent></el-input>
|
|
|
</el-form-item>
|
|
|
- <el-form-item
|
|
|
- label="说明"
|
|
|
- :rules="[{ required: true, message: '请填写说明',trigger: 'blur'}]"
|
|
|
- prop="memo"
|
|
|
- >
|
|
|
- <el-input type="textarea" :rows="5" v-model.trim="visibleForm.memo"></el-input>
|
|
|
+ <el-form-item label="说明"
|
|
|
+ :rules="[{ required: true, message: '请填写说明',trigger: 'blur'}]"
|
|
|
+ prop="memo">
|
|
|
+ <el-input type="textarea"
|
|
|
+ :rows="5"
|
|
|
+ v-model.trim="visibleForm.memo"></el-input>
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
</div>
|
|
|
<div slot="footer">
|
|
|
<el-button @click="dialogVisible = false">取 消</el-button>
|
|
|
- <el-button type="primary" @click="subreset">确 定</el-button>
|
|
|
+ <el-button type="primary"
|
|
|
+ @click="subreset">确 定</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
@@ -249,7 +268,7 @@ import {
|
|
|
import { courseListType } from "@/utils/searchArray";
|
|
|
export default {
|
|
|
components: { pagination },
|
|
|
- data() {
|
|
|
+ data () {
|
|
|
return {
|
|
|
searchForm: {
|
|
|
search: null,
|
|
@@ -286,9 +305,9 @@ export default {
|
|
|
};
|
|
|
},
|
|
|
//生命周期 - 创建完成(可以访问当前this实例)
|
|
|
- created() {},
|
|
|
+ created () { },
|
|
|
//生命周期 - 挂载完成(可以访问DOM元素)
|
|
|
- mounted() {
|
|
|
+ mounted () {
|
|
|
getTeacher().then(res => {
|
|
|
if (res.code == 200) {
|
|
|
this.teacherList = res.data;
|
|
@@ -302,11 +321,11 @@ export default {
|
|
|
// 获取分部
|
|
|
this.init();
|
|
|
},
|
|
|
- activated() {
|
|
|
+ activated () {
|
|
|
this.init();
|
|
|
},
|
|
|
methods: {
|
|
|
- init() {
|
|
|
+ init () {
|
|
|
if (!this.searchForm.month) {
|
|
|
var now = new Date();
|
|
|
this.searchForm.month = new Date(
|
|
@@ -318,7 +337,7 @@ export default {
|
|
|
|
|
|
this.getList();
|
|
|
},
|
|
|
- getList() {
|
|
|
+ getList () {
|
|
|
let obj = this.getDate();
|
|
|
findIsSettlementCourseSalarys(obj).then(res => {
|
|
|
if (res.code == 200) {
|
|
@@ -328,11 +347,11 @@ export default {
|
|
|
}
|
|
|
});
|
|
|
},
|
|
|
- search() {
|
|
|
+ search () {
|
|
|
this.rules.page = 1;
|
|
|
this.getList();
|
|
|
},
|
|
|
- onReSet() {
|
|
|
+ onReSet () {
|
|
|
this.searchForm = {
|
|
|
search: null,
|
|
|
organIdList: null,
|
|
@@ -345,7 +364,7 @@ export default {
|
|
|
};
|
|
|
this.search();
|
|
|
},
|
|
|
- getDate() {
|
|
|
+ getDate () {
|
|
|
let obj = {
|
|
|
search: this.searchForm.search,
|
|
|
organIdList: this.searchForm.organIdList || null,
|
|
@@ -360,7 +379,7 @@ export default {
|
|
|
};
|
|
|
return obj;
|
|
|
},
|
|
|
- openSalary() {
|
|
|
+ openSalary () {
|
|
|
this.$confirm("您确定开启课酬确认?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
@@ -374,7 +393,7 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
- closeSalary() {
|
|
|
+ closeSalary () {
|
|
|
this.$confirm("您确定关闭课酬确认?", "提示", {
|
|
|
confirmButtonText: "确定",
|
|
|
cancelButtonText: "取消",
|
|
@@ -388,7 +407,7 @@ export default {
|
|
|
});
|
|
|
});
|
|
|
},
|
|
|
- onExport() {
|
|
|
+ onExport () {
|
|
|
let url = "/api-web/export/isSettlementCourseSalarys";
|
|
|
let obj = this.getDate();
|
|
|
const options = {
|
|
@@ -450,9 +469,9 @@ export default {
|
|
|
load.endLoading();
|
|
|
});
|
|
|
})
|
|
|
- .catch(() => {});
|
|
|
+ .catch(() => { });
|
|
|
},
|
|
|
- resetSalary(row) {
|
|
|
+ resetSalary (row) {
|
|
|
let obj = {
|
|
|
finalSalary: row.finalSalary, // 实发
|
|
|
reduceSalary: row.reduceSalary, // 扣款
|
|
@@ -461,11 +480,11 @@ export default {
|
|
|
memo: row.memo,
|
|
|
teacherId: row.teacherId
|
|
|
};
|
|
|
- this.$set(this,'visibleForm',obj)
|
|
|
+ this.$set(this, 'visibleForm', obj)
|
|
|
console.log(this.visibleForm.finalSalary)
|
|
|
this.dialogVisible = true;
|
|
|
},
|
|
|
- subreset() {
|
|
|
+ subreset () {
|
|
|
this.$refs["visibleForm"].validate(flag => {
|
|
|
if (flag) {
|
|
|
let obj = {
|
|
@@ -487,7 +506,7 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
filters: {
|
|
|
- confirmFilter(val) {
|
|
|
+ confirmFilter (val) {
|
|
|
if (val) {
|
|
|
let template = {
|
|
|
1: "待确认",
|
|
@@ -499,27 +518,27 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
|
- getActualsalary() {
|
|
|
+ getActualsalary () {
|
|
|
// 应发
|
|
|
return this.visibleForm.actualSalary;
|
|
|
},
|
|
|
- getReduceSalary() {
|
|
|
+ getReduceSalary () {
|
|
|
// 扣款
|
|
|
return this.visibleForm.reduceSalary;
|
|
|
},
|
|
|
},
|
|
|
watch: {
|
|
|
- getActualsalary(val) {
|
|
|
+ getActualsalary (val) {
|
|
|
this.visibleForm.finalSalary = parseFloat(
|
|
|
val - this.getReduceSalary > 0 ? val - this.getReduceSalary : 0
|
|
|
);
|
|
|
},
|
|
|
- getReduceSalary(val) {
|
|
|
+ getReduceSalary (val) {
|
|
|
this.visibleForm.finalSalary = parseFloat(
|
|
|
this.getActualsalary - val > 0 ? this.getActualsalary - val : 0
|
|
|
);
|
|
|
},
|
|
|
- dialogVisible(val) {
|
|
|
+ dialogVisible (val) {
|
|
|
if (!val) {
|
|
|
this.visibleForm = {
|
|
|
expectSalary: null,
|