From a47a3ac9a248c106f4f3431df5bee91018c6a039 Mon Sep 17 00:00:00 2001 From: wxc <191104855@qq.com> Date: Sat, 3 Feb 2024 14:21:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E4=BB=B6=E7=AD=BE=E6=94=B6=20240203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/org/department.ts | 4 + src/components/PoliceSelect.vue | 2 +- src/utils/util.ts | 4 +- src/views/home/components/MailTable.vue | 232 ++++++++++++++---- src/views/work/Done.vue | 2 +- src/views/work/Todo.vue | 15 +- .../work/components/ApplicationCompleted.vue | 182 ++++++++++++++ src/views/work/components/MailDialog.vue | 19 ++ src/views/work/components/VerifyForm.vue | 144 ++++++++--- 9 files changed, 520 insertions(+), 84 deletions(-) create mode 100644 src/views/work/components/ApplicationCompleted.vue diff --git a/src/api/org/department.ts b/src/api/org/department.ts index 1bb1159..9cbdbae 100644 --- a/src/api/org/department.ts +++ b/src/api/org/department.ts @@ -32,4 +32,8 @@ export function listSecond() { export function listThree() { return request.get({ url: '/system/dept/three/list'}) +} + +export function listByThree() { + return request.get({ url: '/system/dept/three/listByThree'}) } \ No newline at end of file diff --git a/src/components/PoliceSelect.vue b/src/components/PoliceSelect.vue index 99bcb11..a93584d 100644 --- a/src/components/PoliceSelect.vue +++ b/src/components/PoliceSelect.vue @@ -3,7 +3,7 @@ v-model="value" filterable :remote-method="remoteMethod" - placeholder="" + placeholder="请输入姓名搜索" :loading="loading" remote-show-suffix @change="handleChange"> diff --git a/src/utils/util.ts b/src/utils/util.ts index 38d71df..52fdd7a 100644 --- a/src/utils/util.ts +++ b/src/utils/util.ts @@ -175,11 +175,11 @@ export const formatTimeText = (seconds: number) => { // 小时 if (seconds < 86400) { const remainder = seconds % 3600; - return `${ Math.floor(seconds / 3600) }小时${ formatTimeText(remainder) }` + return `${ Math.floor(seconds / 3600) }小时${ parseInt(seconds % 3600 / 60) }分` } // 天 const remainder = seconds % 86400; - return `${ Math.floor(seconds / 86400) }天${ formatTimeText(remainder) }` + return `${ Math.floor(seconds / 86400) }天${ parseInt(seconds % 86400 / 3600) }小时` } /** diff --git a/src/views/home/components/MailTable.vue b/src/views/home/components/MailTable.vue index 68a8adf..f087afb 100644 --- a/src/views/home/components/MailTable.vue +++ b/src/views/home/components/MailTable.vue @@ -1,67 +1,213 @@ \ No newline at end of file diff --git a/src/views/work/Done.vue b/src/views/work/Done.vue index 467bda0..6e37c62 100644 --- a/src/views/work/Done.vue +++ b/src/views/work/Done.vue @@ -182,7 +182,7 @@ show-overflow-tooltip /> - +