From 4e518578d1c9c86dec70877efbc3ae0f2bfb4025 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Thu, 10 Oct 2024 09:31:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=88=E5=BC=82=E5=B8=B8=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/attendanceReport/monthlyError.js | 32 ++ .../attendanceReport/monthlyError/index.vue | 392 ++++++++++++++++++ 2 files changed, 424 insertions(+) create mode 100644 src/api/attendanceReport/monthlyError.js create mode 100644 src/views/attendanceReport/monthlyError/index.vue diff --git a/src/api/attendanceReport/monthlyError.js b/src/api/attendanceReport/monthlyError.js new file mode 100644 index 0000000..ff27669 --- /dev/null +++ b/src/api/attendanceReport/monthlyError.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' + +// 查询列表 +export function listMonthlyError(query) { + return request({ + url: '/system/attDetailByMonth/list', + method: 'get', + params: query + }) +} + +// 工程详情 +export function getDetail(query) { + return request({ + url: '/system/attDetailByMonth/getDetail', + method: 'get', + params: query + }) +} + + + +// 导出工程 +export function exportEngineering(query) { + return request({ + url: '/bracelet/export/exportEngineering', + method: 'get', + responseType: 'blob', + params: query + }) +} + diff --git a/src/views/attendanceReport/monthlyError/index.vue b/src/views/attendanceReport/monthlyError/index.vue new file mode 100644 index 0000000..24180bb --- /dev/null +++ b/src/views/attendanceReport/monthlyError/index.vue @@ -0,0 +1,392 @@ + + + + + \ No newline at end of file -- 2.43.0 From 105b60fbc5a6efe4d10fd4c16ad8a57b641ea52f Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Thu, 10 Oct 2024 09:51:06 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9C=88=E5=BC=82=E5=B8=B8=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/attendanceReport/monthlyError.js | 4 ++-- src/views/attendanceReport/monthlyError/index.vue | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/api/attendanceReport/monthlyError.js b/src/api/attendanceReport/monthlyError.js index ff27669..9fce7dd 100644 --- a/src/api/attendanceReport/monthlyError.js +++ b/src/api/attendanceReport/monthlyError.js @@ -21,9 +21,9 @@ export function getDetail(query) { // 导出工程 -export function exportEngineering(query) { +export function exportMonthlyError(query) { return request({ - url: '/bracelet/export/exportEngineering', + url: '/system/attDetailByMonth/export', method: 'get', responseType: 'blob', params: query diff --git a/src/views/attendanceReport/monthlyError/index.vue b/src/views/attendanceReport/monthlyError/index.vue index 24180bb..ea4b77d 100644 --- a/src/views/attendanceReport/monthlyError/index.vue +++ b/src/views/attendanceReport/monthlyError/index.vue @@ -128,7 +128,7 @@ /> - + + + \ No newline at end of file diff --git a/src/views/exceptionHandle/errorForm/index.vue b/src/views/exceptionHandle/errorForm/index.vue new file mode 100644 index 0000000..f45b031 --- /dev/null +++ b/src/views/exceptionHandle/errorForm/index.vue @@ -0,0 +1,412 @@ + + + + + \ No newline at end of file -- 2.43.0 From 632a7e331330455cda71a893d57742cfad71fe31 Mon Sep 17 00:00:00 2001 From: jjLv <1981429112@qq.com> Date: Sat, 12 Oct 2024 13:12:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=BD=AE=E4=BC=91=E5=A4=96=E5=87=BA?= =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/exceptionHandle/errorForm.js | 9 ++ .../attendanceReport/monthlyError/index.vue | 59 +++++---- src/views/exceptionHandle/errorData/index.vue | 26 +++- src/views/exceptionHandle/errorForm/index.vue | 116 ++++++++++++++---- 4 files changed, 160 insertions(+), 50 deletions(-) diff --git a/src/api/exceptionHandle/errorForm.js b/src/api/exceptionHandle/errorForm.js index 2b115c1..3c38f12 100644 --- a/src/api/exceptionHandle/errorForm.js +++ b/src/api/exceptionHandle/errorForm.js @@ -38,3 +38,12 @@ export function exportExceptionError(query) { }) } +// 审批提醒 +export function examineRemind(data) { + return request({ + url: '/system/attExceptionHandle/examineRemind', + method: 'post', + data: data + }) +} + diff --git a/src/views/attendanceReport/monthlyError/index.vue b/src/views/attendanceReport/monthlyError/index.vue index 0b79f1f..ad459d0 100644 --- a/src/views/attendanceReport/monthlyError/index.vue +++ b/src/views/attendanceReport/monthlyError/index.vue @@ -5,20 +5,13 @@ - - - - + + {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }} - @@ -210,23 +202,24 @@