diff --git a/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue new file mode 100644 index 00000000..a51f316c --- /dev/null +++ b/klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue @@ -0,0 +1,48 @@ + + + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue b/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue new file mode 100644 index 00000000..2291d07b --- /dev/null +++ b/klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue new file mode 100644 index 00000000..e3eff65c --- /dev/null +++ b/klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue @@ -0,0 +1,68 @@ + + + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue b/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue new file mode 100644 index 00000000..0491445d --- /dev/null +++ b/klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue @@ -0,0 +1,60 @@ + + + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/leaveReport.vue b/klp-ui/src/views/wms/hrm/leaveReport.vue new file mode 100644 index 00000000..e8c9f4a1 --- /dev/null +++ b/klp-ui/src/views/wms/hrm/leaveReport.vue @@ -0,0 +1,256 @@ + + + + + + + + + + + + + 查询 + 重置 + 导出 + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/klp-ui/src/views/wms/hrm/leaveRequest.vue b/klp-ui/src/views/wms/hrm/leaveRequest.vue index 23fa7f19..d552c40d 100644 --- a/klp-ui/src/views/wms/hrm/leaveRequest.vue +++ b/klp-ui/src/views/wms/hrm/leaveRequest.vue @@ -46,9 +46,7 @@ - - - + @@ -64,6 +62,7 @@ + {{ parseTime(scope.row.startTime, '{y}-{m}-{d}') }} @@ -79,6 +78,7 @@ + @@ -94,9 +94,6 @@ - - - - + + @@ -193,16 +193,16 @@ export default { form: {}, // 表单校验规则【核心新增:完整必填校验】 rules: { - leaveTitle: [ { required: true, message: '请假原因不能为空', trigger: ['blur', 'change'] } ], - leaveType: [ { required: true, message: '请假类型不能为空', trigger: 'change' } ], - applicantName: [ { required: true, message: '请假人姓名不能为空', trigger: 'change' } ], - startTime: [ { required: true, message: '开始时间不能为空', trigger: 'change' } ], - endTime: [ { required: true, message: '结束时间不能为空', trigger: 'change' } ], - leaveShift: [ { required: true, message: '请假班次不能为空', trigger: 'change' } ], - leaveDays: [ + leaveTitle: [{ required: true, message: '请假原因不能为空', trigger: ['blur', 'change'] }], + leaveType: [{ required: true, message: '请假类型不能为空', trigger: 'change' }], + applicantName: [{ required: true, message: '请假人姓名不能为空', trigger: 'change' }], + startTime: [{ required: true, message: '开始时间不能为空', trigger: 'change' }], + endTime: [{ required: true, message: '结束时间不能为空', trigger: 'change' }], + leaveShift: [{ required: true, message: '请假班次不能为空', trigger: 'change' }], + leaveDays: [ { required: true, message: '请假天数不能为空', trigger: ['blur', 'change'] }, ], - leaveReason: [ + leaveReason: [ { required: true, message: '具体原因不能为空', trigger: ['blur', 'change'] }, ] } @@ -221,7 +221,7 @@ export default { this.calculateLeaveDays() }, immediate: false - } + }, }, created() { this.getList(); @@ -300,6 +300,7 @@ export default { }, /** 提交按钮 */ submitForm() { + 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; diff --git a/klp-ui/src/views/wms/hrm/mealReport.vue b/klp-ui/src/views/wms/hrm/mealReport.vue index 7f291acb..e7418c74 100644 --- a/klp-ui/src/views/wms/hrm/mealReport.vue +++ b/klp-ui/src/views/wms/hrm/mealReport.vue @@ -80,6 +80,11 @@ + + + + {{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }} + diff --git a/klp-ui/src/views/wms/hrm/report.vue b/klp-ui/src/views/wms/hrm/report.vue index 95d1f034..c2d655a9 100644 --- a/klp-ui/src/views/wms/hrm/report.vue +++ b/klp-ui/src/views/wms/hrm/report.vue @@ -387,7 +387,7 @@ export default { font-weight: 500; color: #666; background-color: #fff; - margin-bottom: 10px; + margin-top: 10px; text-align: center; }