From d9433307c670fdced4cce9adf21c0e4b1897cfff Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Thu, 27 Feb 2025 09:34:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E5=81=87=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- api/leaveApi.js | 8 + bpm/leaveApplication/index.vue | 20 +- package-lock.json | 56 +++++ pages.json | 18 +- pages/document/index.vue | 7 - pages/leave/application.vue | 6 +- pages/login/login.vue | 16 +- pages/tab/index.vue | 2 +- pages/userlist/index.vue | 1 - .../views/renliziyuan/qingjiaxinxi/detail.vue | 174 +++++++++++++++ .../views/renliziyuan/qingjiaxinxi/index.vue | 207 +++++++++++------- static/office/absence.png | Bin 13753 -> 0 bytes static/office/duty.png | Bin 14255 -> 3101 bytes static/office/leaveApplication.png | Bin 0 -> 3960 bytes static/office/leaveRecord.png | Bin 0 -> 3913 bytes static/office/person.png | Bin 33355 -> 2816 bytes .../trq-depart-select/trq-depart-select.vue | 5 - 18 files changed, 395 insertions(+), 127 deletions(-) create mode 100644 package-lock.json create mode 100644 pages/views/renliziyuan/qingjiaxinxi/detail.vue delete mode 100644 static/office/absence.png create mode 100644 static/office/leaveApplication.png create mode 100644 static/office/leaveRecord.png diff --git a/.env.development b/.env.development index a0af6a8..ad77649 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ # 开发环境 # 请求接口地址 VITE_REQUEST_BASE_URL = https://36.112.48.190 -#VITE_REQUEST_BASE_URL = http://10.75.15.247:8080 +#VITE_REQUEST_BASE_URL = http://10.75.15.249:8080 diff --git a/api/leaveApi.js b/api/leaveApi.js index 34e3f2c..1d4e7d1 100644 --- a/api/leaveApi.js +++ b/api/leaveApi.js @@ -45,4 +45,12 @@ export function queryLeaveListApi(params) { // 获取所有请假信息 method: 'get', data: params }) +} + +export function countByOrgApi(params) { // 获取所有请假信息 + return https({ + url: '/CxcQxj/cxcQxj/countByOrg', + method: 'get', + data: params + }) } \ No newline at end of file diff --git a/bpm/leaveApplication/index.vue b/bpm/leaveApplication/index.vue index 3f41b56..9e033aa 100644 --- a/bpm/leaveApplication/index.vue +++ b/bpm/leaveApplication/index.vue @@ -3,6 +3,7 @@ 申请信息 + 历史查询 @@ -44,7 +45,7 @@ 请假天数: - {{info.days}} + {{info.days}}天 @@ -113,8 +114,6 @@ } from '@/api/leaveApi.js'; import { ref, - onBeforeMount, - watch, onMounted } from 'vue' import { @@ -161,7 +160,6 @@ } } }) - } /**审批步骤*/ @@ -193,16 +191,16 @@ } }) } - // watch(() => props.dataId, (nval, oval) => { - // if (nval) { - // qjQueryById() - // extActFlowData() - // } - // }) onMounted(() => { qjQueryById() extActFlowData() }) + + const goToHis = () => { + uni.navigateTo({ + url: `/pages/views/renliziyuan/qingjiaxinxi/index?username=${info.value.username}` + }); + } \ No newline at end of file diff --git a/pages/views/renliziyuan/qingjiaxinxi/index.vue b/pages/views/renliziyuan/qingjiaxinxi/index.vue index c5a2846..409dad3 100644 --- a/pages/views/renliziyuan/qingjiaxinxi/index.vue +++ b/pages/views/renliziyuan/qingjiaxinxi/index.vue @@ -1,47 +1,45 @@