Merge remote-tracking branch 'origin/0.8.X' into 0.8.X
This commit is contained in:
@@ -202,9 +202,9 @@ export default {
|
|||||||
leaveDays: [
|
leaveDays: [
|
||||||
{ required: true, message: '请假天数不能为空', trigger: ['blur', 'change'] },
|
{ required: true, message: '请假天数不能为空', trigger: ['blur', 'change'] },
|
||||||
],
|
],
|
||||||
leaveReason: [
|
// leaveReason: [
|
||||||
{ required: true, message: '具体原因不能为空', trigger: ['blur', 'change'] },
|
// { required: true, message: '具体原因不能为空', trigger: ['blur', 'change'] },
|
||||||
]
|
// ]
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
@@ -300,7 +300,7 @@ export default {
|
|||||||
},
|
},
|
||||||
/** 提交按钮 */
|
/** 提交按钮 */
|
||||||
submitForm() {
|
submitForm() {
|
||||||
this.form.leaveTitle = `${this.form.applicantName}-${this.form.leaveType}-${this.form.startTime}-${this.form.leaveReason}`
|
this.form.leaveTitle = `${this.form.applicantName}-${this.form.leaveType}-${this.form.startTime}-${this.form.leaveReason || ''}`
|
||||||
this.$refs["form"].validate(valid => {
|
this.$refs["form"].validate(valid => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
this.buttonLoading = true;
|
this.buttonLoading = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user