|
@@ -133,6 +133,7 @@
|
|
|
<el-date-picker
|
|
|
:clearable="false"
|
|
|
v-model="searchForm.month"
|
|
|
+ style="width: 100%"
|
|
|
type="month"
|
|
|
value-format="yyyy-MM"
|
|
|
placeholder="选择年月"
|
|
@@ -591,16 +592,25 @@ export default {
|
|
|
.catch(() => {});
|
|
|
},
|
|
|
resetSalary(row) {
|
|
|
- let obj = {
|
|
|
- finalSalary: row.finalSalary, // 实发
|
|
|
- reduceSalary: row.reduceSalary, // 扣款
|
|
|
- actualSalary: row.actualSalary, // 应发
|
|
|
- courseScheduleId: row.courseScheduleId,
|
|
|
- memo: row.memo,
|
|
|
- teacherId: row.teacherId,
|
|
|
- };
|
|
|
- this.$set(this, "visibleForm", obj);
|
|
|
- console.log(this.visibleForm.finalSalary);
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.visibleForm = {
|
|
|
+ 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, // 扣款
|
|
|
+ // actualSalary: row.actualSalary, // 应发
|
|
|
+ // courseScheduleId: row.courseScheduleId,
|
|
|
+ // memo: row.memo,
|
|
|
+ // teacherId: row.teacherId,
|
|
|
+ // };
|
|
|
+ // this.$set(this, "visibleForm", obj);
|
|
|
this.dialogVisible = true;
|
|
|
},
|
|
|
subreset() {
|
|
@@ -664,14 +674,14 @@ export default {
|
|
|
},
|
|
|
dialogVisible(val) {
|
|
|
if (!val) {
|
|
|
- this.visibleForm = {
|
|
|
- expectSalary: null,
|
|
|
- reduceSalary: null,
|
|
|
- actualSalary: null,
|
|
|
- courseScheduleId: null,
|
|
|
- teacherId: null,
|
|
|
- memo: null,
|
|
|
- };
|
|
|
+ // this.visibleForm = {
|
|
|
+ // expectSalary: null,
|
|
|
+ // reduceSalary: null,
|
|
|
+ // actualSalary: null,
|
|
|
+ // courseScheduleId: null,
|
|
|
+ // teacherId: null,
|
|
|
+ // memo: null,
|
|
|
+ // };
|
|
|
this.$refs["visibleForm"].resetFields();
|
|
|
}
|
|
|
},
|