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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item._sysOrgCode}}的{{item._username}}{{item._type}}申请
+
+
+
+ {{item._begintime}}至{{item._endtime}}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file