From a378a90dc8795e69df7a9135567b9b18fa0732e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 19 Jan 2026 09:48:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=85=A5=E5=BA=93=E6=97=B6=E5=BD=93=E5=89=8D=E9=92=A2?= =?UTF-8?q?=E5=8D=B7=E5=8F=B7=E6=9C=AA=E8=AE=BE=E7=BD=AE=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在获取最大入库钢卷号时,同时设置当前钢卷号为去掉最后一位的钢卷号,确保表单数据完整 --- klp-ui/src/views/wms/coil/do/warehousing.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/klp-ui/src/views/wms/coil/do/warehousing.vue b/klp-ui/src/views/wms/coil/do/warehousing.vue index 014fc406..3759be4d 100644 --- a/klp-ui/src/views/wms/coil/do/warehousing.vue +++ b/klp-ui/src/views/wms/coil/do/warehousing.vue @@ -735,6 +735,7 @@ export default { console.log(res) // 扣掉最后一位 this.$set(this.form, 'enterCoilNo', res.data.maxEnterCoilNo.slice(0, -1)); + this.$set(this.form, 'currentCoilNo', res.data.maxEnterCoilNo.slice(0, -1)); }) }, // 检查钢卷号是否合法(后端检查) From f6000018d851f7c56c1af4923fda95f226db28e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= Date: Mon, 19 Jan 2026 13:28:45 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(hrm):=20=E6=96=B0=E5=A2=9E=E8=AF=B7?= =?UTF-8?q?=E5=81=87=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=8F=8A=E4=BC=98=E5=8C=96=E8=AF=B7=E5=81=87=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增请假统计报表页面,包含趋势图、部门统计图、类型统计图和表格展示 优化请假申请页面布局和字段展示 添加多个图表组件用于数据可视化展示 调整样式和表单验证规则 --- .../wms/hrm/components/LeaveDeptChart.vue | 48 ++++ .../wms/hrm/components/LeaveRecordTable.vue | 38 +++ .../wms/hrm/components/LeaveTrendChart.vue | 68 +++++ .../wms/hrm/components/LeaveTypeChart.vue | 60 ++++ klp-ui/src/views/wms/hrm/leaveReport.vue | 256 ++++++++++++++++++ klp-ui/src/views/wms/hrm/leaveRequest.vue | 33 +-- klp-ui/src/views/wms/hrm/mealReport.vue | 5 + klp-ui/src/views/wms/hrm/report.vue | 2 +- 8 files changed, 493 insertions(+), 17 deletions(-) create mode 100644 klp-ui/src/views/wms/hrm/components/LeaveDeptChart.vue create mode 100644 klp-ui/src/views/wms/hrm/components/LeaveRecordTable.vue create mode 100644 klp-ui/src/views/wms/hrm/components/LeaveTrendChart.vue create mode 100644 klp-ui/src/views/wms/hrm/components/LeaveTypeChart.vue create mode 100644 klp-ui/src/views/wms/hrm/leaveReport.vue 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 @@ - - - + + +