From 43c78904f3041216d8b256f148786bd4744b7d8e Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Mon, 24 Feb 2025 15:28:03 +0800 Subject: [PATCH 1/2] =?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 --- api/api.js | 2 +- api/{pages.js => leaveApi.js} | 9 + bpm/leaveApplication/index.vue | 2 +- pages.json | 8 + pages/document/index.vue | 6 +- pages/leave/application.vue | 5 +- pages/tab/index.vue | 4 +- .../views/renliziyuan/qingjiaxinxi/index.vue | 200 ++++++++++++++++++ 8 files changed, 225 insertions(+), 11 deletions(-) rename api/{pages.js => leaveApi.js} (82%) create mode 100644 pages/views/renliziyuan/qingjiaxinxi/index.vue diff --git a/api/api.js b/api/api.js index 7fd5110..f910e8d 100644 --- a/api/api.js +++ b/api/api.js @@ -72,7 +72,7 @@ export function indexChartScdtDataApi(config) { // 首页 data: config }) } -export function bpmlistApi(config) { // 公文 +export function gongwenlistApi(config) { // 公文 return https({ url: '/cxcoagwfb/cxcOaGwfb/bpmlist', method: 'get', diff --git a/api/pages.js b/api/leaveApi.js similarity index 82% rename from api/pages.js rename to api/leaveApi.js index eb755bb..34e3f2c 100644 --- a/api/pages.js +++ b/api/leaveApi.js @@ -10,6 +10,7 @@ export function qjAddApi(config) { // 发起请假流程申请 }) } + export function queryZwmcAndExaApi(username) { // 根据username获取职位名称和审批领导列表 return https({ url: '/CxcQxj/cxcQxj/queryZwmcByUsername', @@ -36,4 +37,12 @@ export function queryHisDateApi(username) { // 根据username获取最新请假 username } }) +} + +export function queryLeaveListApi(params) { // 获取所有请假信息 + return https({ + url: '/CxcQxj/cxcQxj/list', + method: 'get', + data: params + }) } \ No newline at end of file diff --git a/bpm/leaveApplication/index.vue b/bpm/leaveApplication/index.vue index 4a79283..3f41b56 100644 --- a/bpm/leaveApplication/index.vue +++ b/bpm/leaveApplication/index.vue @@ -110,7 +110,7 @@ } from '@/api/api.js'; import { qjQueryByIdApi - } from '@/api/pages.js'; + } from '@/api/leaveApi.js'; import { ref, onBeforeMount, diff --git a/pages.json b/pages.json index 52fd167..fc89fb0 100644 --- a/pages.json +++ b/pages.json @@ -233,6 +233,14 @@ "navigationBarTitleText": "人员年龄分组统计信息", "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/views/renliziyuan/qingjiaxinxi/index", + "style": { + "navigationBarTitleText": "请假信息", + "navigationBarTextStyle": "white" + } } ], diff --git a/pages/document/index.vue b/pages/document/index.vue index a45bacd..9b76af9 100644 --- a/pages/document/index.vue +++ b/pages/document/index.vue @@ -52,7 +52,7 @@ onLoad } from '@dcloudio/uni-app'; import { - bpmlistApi, + gongwenlistApi, faguiApi, zhiduApi, gonggaolistApi, @@ -62,7 +62,7 @@ useStore } from '@/store'; const store = useStore(); - import customNav from '../../bpm/customNav.vue'; + import customNav from '@/bpm/customNav.vue'; import { beforeJump, opendocument @@ -76,7 +76,7 @@ /**公文接口*/ const bpmlist = () => { loading = true - bpmlistApi({ + gongwenlistApi({ pageNo, pageSize, fwbt: formatSearchkey() diff --git a/pages/leave/application.vue b/pages/leave/application.vue index 97aa9ce..2819b41 100644 --- a/pages/leave/application.vue +++ b/pages/leave/application.vue @@ -111,7 +111,7 @@ qjAddApi, queryZwmcAndExaApi, queryHisDateApi - } from '@/api/pages.js'; + } from '@/api/leaveApi.js'; import { queryDepByCode, queryZbDepByLdhth @@ -178,7 +178,6 @@ } onLoad(() => { loadData() - // getTomorrowDate() }) const select = (e) => { @@ -278,10 +277,8 @@ queryHisDateApi(store.userinfo.username).then((res) => { // 最新请假结束日期 if (res) { - console.log('--0', res) getTomorrowDate(res); } else { - console.log('--1', res) getTomorrowDate(); } }) diff --git a/pages/tab/index.vue b/pages/tab/index.vue index a6fdff6..e8751c9 100644 --- a/pages/tab/index.vue +++ b/pages/tab/index.vue @@ -135,7 +135,7 @@ // onReachBottom } from '@dcloudio/uni-app'; import { - bpmlistApi, + gongwenlistApi, gonggaolistApi, zhibanApi, faguiApi, @@ -261,7 +261,7 @@ /**公文接口*/ const bpmlist = () => { loading = true - bpmlistApi({ + gongwenlistApi({ pageNo, pageSize }).then((res) => { diff --git a/pages/views/renliziyuan/qingjiaxinxi/index.vue b/pages/views/renliziyuan/qingjiaxinxi/index.vue new file mode 100644 index 0000000..c5a2846 --- /dev/null +++ b/pages/views/renliziyuan/qingjiaxinxi/index.vue @@ -0,0 +1,200 @@ + + + + + + \ No newline at end of file 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 2/2] =?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 @@