Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/views/wms/hrm/leaveRequest.vue

@@ -202,9 +202,9 @@ export default {
         leaveDays: [
           { required: true, message: '请假天数不能为空', trigger: ['blur', 'change'] },
         ],
-        leaveReason: [
-          { required: true, message: '具体原因不能为空', trigger: ['blur', 'change'] },
-        ]
+        // leaveReason: [
+        //   { required: true, message: '具体原因不能为空', trigger: ['blur', 'change'] },
+        // ]
       }
     };
   },
@@ -300,7 +300,7 @@ export default {
     },
     /** 提交按钮 */
     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 => {
         if (valid) {
           this.buttonLoading = true;