From 4e1496dfaeb41906769859fdc11cc8fdd1a3b28b Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:08:46 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9A=82=E6=97=B6ok?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/kqdata/index.ts | 48 +++ src/views/Home/kqnr/kqdata/KqdataForm.vue | 131 +++++++++ src/views/Home/kqnr/kqdata/index.vue | 337 ++++++++++++++++++++++ 3 files changed, 516 insertions(+) create mode 100644 src/api/home/kqdata/index.ts create mode 100644 src/views/Home/kqnr/kqdata/KqdataForm.vue create mode 100644 src/views/Home/kqnr/kqdata/index.vue diff --git a/src/api/home/kqdata/index.ts b/src/api/home/kqdata/index.ts new file mode 100644 index 0000000..b647079 --- /dev/null +++ b/src/api/home/kqdata/index.ts @@ -0,0 +1,48 @@ +import request from '@/config/axios' + +// 考勤数据 VO +export interface KqdataVO { + id: number // id + userName: string // 员工 + userId: number // 员工id + deptName: string // 部门 + deptId: number // 部门id + dayStatus: string | number[] // 工作状态 + tokey: number // 标识 + workDay: number // 工作天数 + overDay: number // 加班天数 + yoverDay: number // 年班天数 +} + +// 考勤数据 API +export const KqdataApi = { + // 查询考勤数据分页 + getKqdataPage: async (params: any) => { + return await request.get({ url: `/home/kqdata/page`, params }) + }, + + // 查询考勤数据详情 + getKqdata: async (id: number) => { + return await request.get({ url: `/home/kqdata/get?id=` + id }) + }, + + // 新增考勤数据 + createKqdata: async (data: KqdataVO) => { + return await request.post({ url: `/home/kqdata/create`, data }) + }, + + // 修改考勤数据 + updateKqdata: async (data: KqdataVO) => { + return await request.put({ url: `/home/kqdata/update`, data }) + }, + + // 删除考勤数据 + deleteKqdata: async (id: number) => { + return await request.delete({ url: `/home/kqdata/delete?id=` + id }) + }, + + // 导出考勤数据 Excel + exportKqdata: async (params) => { + return await request.download({ url: `/home/kqdata/export-excel`, params }) + }, +} diff --git a/src/views/Home/kqnr/kqdata/KqdataForm.vue b/src/views/Home/kqnr/kqdata/KqdataForm.vue new file mode 100644 index 0000000..8ed761b --- /dev/null +++ b/src/views/Home/kqnr/kqdata/KqdataForm.vue @@ -0,0 +1,131 @@ + + diff --git a/src/views/Home/kqnr/kqdata/index.vue b/src/views/Home/kqnr/kqdata/index.vue new file mode 100644 index 0000000..f1f898d --- /dev/null +++ b/src/views/Home/kqnr/kqdata/index.vue @@ -0,0 +1,337 @@ + + + From 02c56341a4e4b6dcb8e91df4b8ced0e8a4b2c2f2 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Thu, 21 Nov 2024 18:58:21 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=BF=98=E5=9C=A8=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/kqgl/index.ts | 44 +++++ src/views/Home/kqnr/kqgl/index.vue | 249 +++++++++++++++++++++++++++++ src/views/Home/kqnr2/kqglForm.vue | 160 ++++++++++++++++++ 3 files changed, 453 insertions(+) create mode 100644 src/api/home/kqgl/index.ts create mode 100644 src/views/Home/kqnr/kqgl/index.vue create mode 100644 src/views/Home/kqnr2/kqglForm.vue diff --git a/src/api/home/kqgl/index.ts b/src/api/home/kqgl/index.ts new file mode 100644 index 0000000..c05cc94 --- /dev/null +++ b/src/api/home/kqgl/index.ts @@ -0,0 +1,44 @@ +import request from '@/config/axios' + +// 考勤管理 VO +export interface KqglVO { + id: number // id + userId: number // 用户id + userName: string // 用户名字 + deptId: number // 部门id + deptName: string // 部门名字 + date: Date // 考勤日期 +} + +// 考勤管理 API +export const KqglApi = { + // 查询考勤管理分页 + getKqglPage: async (params: any) => { + return await request.get({ url: `/home/kqgl/page`, params }) + }, + + // 查询考勤管理详情 + getKqgl: async (id: number) => { + return await request.get({ url: `/home/kqgl/get?id=` + id }) + }, + + // 新增考勤管理 + createKqgl: async (data: KqglVO) => { + return await request.post({ url: `/home/kqgl/create`, data }) + }, + + // 修改考勤管理 + updateKqgl: async (data: KqglVO) => { + return await request.put({ url: `/home/kqgl/update`, data }) + }, + + // 删除考勤管理 + deleteKqgl: async (id: number) => { + return await request.delete({ url: `/home/kqgl/delete?id=` + id }) + }, + + // 导出考勤管理 Excel + exportKqgl: async (params) => { + return await request.download({ url: `/home/kqgl/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/src/views/Home/kqnr/kqgl/index.vue b/src/views/Home/kqnr/kqgl/index.vue new file mode 100644 index 0000000..df1d93e --- /dev/null +++ b/src/views/Home/kqnr/kqgl/index.vue @@ -0,0 +1,249 @@ + + + diff --git a/src/views/Home/kqnr2/kqglForm.vue b/src/views/Home/kqnr2/kqglForm.vue new file mode 100644 index 0000000..0a34efb --- /dev/null +++ b/src/views/Home/kqnr2/kqglForm.vue @@ -0,0 +1,160 @@ + + + From b5d50d499d10a0f002d7efc921db0f0879d9a481 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Thu, 21 Nov 2024 19:07:59 +0800 Subject: [PATCH 03/15] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=BF=98=E5=9C=A8=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/kqnr/kqgl/KqglForm.vue | 119 ++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 src/views/Home/kqnr/kqgl/KqglForm.vue diff --git a/src/views/Home/kqnr/kqgl/KqglForm.vue b/src/views/Home/kqnr/kqgl/KqglForm.vue new file mode 100644 index 0000000..204869b --- /dev/null +++ b/src/views/Home/kqnr/kqgl/KqglForm.vue @@ -0,0 +1,119 @@ + + From 4ab2a56eb9d2eb0a7f304e9ad92e2a4151daeaf1 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:07:20 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=BF=98=E5=9C=A8=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/kqdata/index.ts | 2 +- src/api/home/kqgl/index.ts | 88 ++++++++++++++++++------------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/api/home/kqdata/index.ts b/src/api/home/kqdata/index.ts index b647079..33a4cb6 100644 --- a/src/api/home/kqdata/index.ts +++ b/src/api/home/kqdata/index.ts @@ -2,7 +2,7 @@ import request from '@/config/axios' // 考勤数据 VO export interface KqdataVO { - id: number // id + id: number|null // id userName: string // 员工 userId: number // 员工id deptName: string // 部门 diff --git a/src/api/home/kqgl/index.ts b/src/api/home/kqgl/index.ts index c05cc94..c7a156d 100644 --- a/src/api/home/kqgl/index.ts +++ b/src/api/home/kqgl/index.ts @@ -1,44 +1,44 @@ -import request from '@/config/axios' - -// 考勤管理 VO -export interface KqglVO { - id: number // id - userId: number // 用户id - userName: string // 用户名字 - deptId: number // 部门id - deptName: string // 部门名字 - date: Date // 考勤日期 -} - -// 考勤管理 API -export const KqglApi = { - // 查询考勤管理分页 - getKqglPage: async (params: any) => { - return await request.get({ url: `/home/kqgl/page`, params }) - }, - - // 查询考勤管理详情 - getKqgl: async (id: number) => { - return await request.get({ url: `/home/kqgl/get?id=` + id }) - }, - - // 新增考勤管理 - createKqgl: async (data: KqglVO) => { - return await request.post({ url: `/home/kqgl/create`, data }) - }, - - // 修改考勤管理 - updateKqgl: async (data: KqglVO) => { - return await request.put({ url: `/home/kqgl/update`, data }) - }, - - // 删除考勤管理 - deleteKqgl: async (id: number) => { - return await request.delete({ url: `/home/kqgl/delete?id=` + id }) - }, - - // 导出考勤管理 Excel - exportKqgl: async (params) => { - return await request.download({ url: `/home/kqgl/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 考勤管理 VO +export interface KqglVO { + id: number // id + userId: number // 用户id + userName: string // 用户名字 + deptId: number // 部门id + deptName: string // 部门名字 + date: Date|number// 考勤日期 +} + +// 考勤管理 API +export const KqglApi = { + // 查询考勤管理分页 + getKqglPage: async (params: any) => { + return await request.get({ url: `/home/kqgl/page`, params }) + }, + + // 查询考勤管理详情 + getKqgl: async (id: number) => { + return await request.get({ url: `/home/kqgl/get?id=` + id }) + }, + + // 新增考勤管理 + createKqgl: async (data: KqglVO) => { + return await request.post({ url: `/home/kqgl/create`, data }) + }, + + // 修改考勤管理 + updateKqgl: async (data: KqglVO) => { + return await request.put({ url: `/home/kqgl/update`, data }) + }, + + // 删除考勤管理 + deleteKqgl: async (id: number) => { + return await request.delete({ url: `/home/kqgl/delete?id=` + id }) + }, + + // 导出考勤管理 Excel + exportKqgl: async (params) => { + return await request.download({ url: `/home/kqgl/export-excel`, params }) + }, +} From 875a01769a2ff1c74f87fa396b4ca23202f88eea Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:49:38 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=8B=BF=E5=88=B0=E5=85=A8=E9=83=A8=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/user/index.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index beb6e51..bb49ad6 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -21,6 +21,10 @@ export interface UserVO { export const getUserPage = (params: PageParam) => { return request.get({ url: '/system/user/page', params }) } +// 查询用户管理列表 +export const getUserPageKQ = (params: PageParam) => { + return request.get({ url: '/system/user/pageKQ', params }) +} // 查询所有用户列表 export const getAllUser = () => { From a8049518a9ff7caadeebf9ef5548014b330fd709 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:22:17 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E9=9C=80=E8=A6=81=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=8B=BF=E5=88=B0=E5=85=A8=E9=83=A8=E7=94=A8=E6=88=B7=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/home/kqgl/index.ts | 1 + src/router/modules/remaining.ts | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/src/api/home/kqgl/index.ts b/src/api/home/kqgl/index.ts index c7a156d..a0b96cf 100644 --- a/src/api/home/kqgl/index.ts +++ b/src/api/home/kqgl/index.ts @@ -7,6 +7,7 @@ export interface KqglVO { userName: string // 用户名字 deptId: number // 部门id deptName: string // 部门名字 + status: number // 申请状态 date: Date|number// 考勤日期 } diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 0006795..9522714 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -760,6 +760,30 @@ const remainingRouter: AppRouteRecordRaw[] = [ activeMenu: '/Home/hygl/Hyglflow' } }, + { + path: 'kqnr/kqgl/KqglCreate', + component: () => import('@/views/Home/kqnr/kqgl/KqglCreate.vue'), + name: 'KqglCreate', + meta: { + noCache: true, + hidden: true, + canTo: true, + title: '发起考勤管理流程', + activeMenu: '/Home/kqnr/kqgl/Kqglflow' + } + }, + { + path: 'kqnr/kqgl/KqglDetail', + component: () => import('@/views/Home/kqnr/kqgl/KqglDetail.vue'), + name: 'KqglDetail', + meta: { + noCache: true, + hidden: true, + canTo: true, + title: '查看考勤管理流程', + activeMenu: '/Home/kqnr/kqgl/Kqglflow' + } + }, ] }, ] From f1988205a24a3cb6330cc66c251d06ad69ba28eb Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:22:44 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/{kqnr2/kqglForm.vue => kqnr/kqglForm-bk.vue} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/views/Home/{kqnr2/kqglForm.vue => kqnr/kqglForm-bk.vue} (100%) diff --git a/src/views/Home/kqnr2/kqglForm.vue b/src/views/Home/kqnr/kqglForm-bk.vue similarity index 100% rename from src/views/Home/kqnr2/kqglForm.vue rename to src/views/Home/kqnr/kqglForm-bk.vue From 91ddca78abf0c0b9cc0afe94d9c17ff7bcd0cd36 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:27:33 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/kqnr/kqdata/index.vue | 74 ++++++++++++++-------------- src/views/Home/kqnr/kqgl/index.vue | 66 +++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 37 deletions(-) diff --git a/src/views/Home/kqnr/kqdata/index.vue b/src/views/Home/kqnr/kqdata/index.vue index f1f898d..b3b4475 100644 --- a/src/views/Home/kqnr/kqdata/index.vue +++ b/src/views/Home/kqnr/kqdata/index.vue @@ -113,22 +113,22 @@ 搜索 重置 - - 新增 - - - 创建本月数据 - + + + + + + + + + + + + + + + + - + @@ -162,26 +162,26 @@ - - - + + + + + + + + + + + + + + + + + + + + 新增 + + 发起流程 + + + + @@ -139,6 +155,22 @@ > 删除 + + 详情 + + + 进度 + @@ -160,6 +192,9 @@ import { dateFormatter } from '@/utils/formatTime' import download from '@/utils/download' import { KqglApi, KqglVO } from '@/api/home/kqgl' import KqglForm from './KqglForm.vue' +import * as LeaveApi from '@/api/bpm/leave' +import router from "@/router"; +import {DICT_TYPE} from "@/utils/dict"; /** 考勤管理 列表 */ defineOptions({ name: 'Kqgl' }) @@ -178,12 +213,43 @@ const queryParams = reactive({ userName: undefined, deptId: undefined, deptName: undefined, + status: undefined, date: [], createTime: [], }) const queryFormRef = ref() // 搜索的表单 const exportLoading = ref(false) // 导出的加载中 +/**发起操作 */ +const handleCreate = () => { + router.push({ name: 'KqglCreate' }) +} +/** 详情操作 */ +const handleDetail = (row: LeaveApi.LeaveVO) => { + router.push({ + name: 'KqglDetail', + query: { + id: row.id + } + }) +} +/** 审批进度 */ +const handleProcessDetail = (row) => { + router.push({ + name: 'BpmProcessInstanceDetail', + query: { + id: row.processInstanceId + } + }) +} +// fix: 列表不刷新的问题。 +watch( + () => router.currentRoute.value, + () => { + getList() + } +) + /** 查询列表 */ const getList = async () => { loading.value = true From e090542c56bf9a3746002e18052e16152fa9f495 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:28:33 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Home/kqnr/kqgl/KqglForm.vue | 267 ++++++++++++++++++++++++-- 1 file changed, 249 insertions(+), 18 deletions(-) diff --git a/src/views/Home/kqnr/kqgl/KqglForm.vue b/src/views/Home/kqnr/kqgl/KqglForm.vue index 204869b..880570e 100644 --- a/src/views/Home/kqnr/kqgl/KqglForm.vue +++ b/src/views/Home/kqnr/kqgl/KqglForm.vue @@ -1,5 +1,5 @@