|
|
@@ -657,7 +657,7 @@ export default {
|
|
|
if (res.success) {
|
|
|
//选择姓名获取页面的请假类型和时间间隔
|
|
|
that.leave = res.result.nannualNowNum
|
|
|
- that.$refs.KFB.setData({leave_remaining: that.leave})
|
|
|
+ // that.$refs.KFB.setData({leave_remaining: that.leave})
|
|
|
var category = that.$refs.KFB.form.getFieldValue('leave_category')
|
|
|
var time1 = that.$refs.KFB.form.getFieldValue('start_date')
|
|
|
var time2 = that.$refs.KFB.form.getFieldValue('end_date')
|
|
|
@@ -897,13 +897,12 @@ export default {
|
|
|
var estimate = this.$refs.KFB.form.getFieldValue('leave_days'),
|
|
|
// actual = that.$refs.KFB.form.getFieldValue('practical_leave'),
|
|
|
leaveCategory = this.$refs.KFB.form.getFieldValue('leave_category')
|
|
|
- debugger
|
|
|
if(leaveCategory=='2' && !estimate){
|
|
|
this.$message.error('请填写预计请假时长！')
|
|
|
addForm = 'yes'
|
|
|
}
|
|
|
if(estimate>this.leave){
|
|
|
- this.$message.error('年假天数不足！')
|
|
|
+ this.$message.error('预计请假年假'+estimate+'大于剩余年假'+this.leave)
|
|
|
addForm = 'yes'
|
|
|
}
|
|
|
}
|
jbb