diff --git a/src/api/pages/absence/index.ts b/src/api/pages/absence/index.ts
index 2b2b9e2..cb24ea9 100644
--- a/src/api/pages/absence/index.ts
+++ b/src/api/pages/absence/index.ts
@@ -12,7 +12,7 @@ export function queryZwmcAndExaApi(username : string) {
}
/*新增请假申请*/
-export function addApi(config) {
+export function addApi(config : Object) {
return http({
url: '/CxcQxj/cxcQxj/add',
method: 'POST',
diff --git a/src/api/pages/duty/index.ts b/src/api/pages/duty/index.ts
index 9c97820..0d3029a 100644
--- a/src/api/pages/duty/index.ts
+++ b/src/api/pages/duty/index.ts
@@ -1,6 +1,6 @@
import { http } from '@/utils/http';
-export function getListApi(config) { // 值班按月查看
+export function getListApi(config : Object) { // 值班按月查看
return http({
url: '/zhgl_zbgl/zhglZbglZbb/list',
method: 'GET',
diff --git a/src/api/pages/file/index.ts b/src/api/pages/file/index.ts
index bd4c1ac..ebf1571 100644
--- a/src/api/pages/file/index.ts
+++ b/src/api/pages/file/index.ts
@@ -1,6 +1,6 @@
import { http } from '@/utils/http';
-export function queryDocumentApi(config) { // 公文列表
+export function queryDocumentApi(config : Object) { // 公文列表
return http({
url: '/cxcoagwfb/cxcOaGwfb/bpmlist',
method: 'GET',
@@ -8,7 +8,7 @@ export function queryDocumentApi(config) { // 公文列表
})
}
-export function queryNoticeApi(config) { // 公告
+export function queryNoticeApi(config : Object) { // 公告
return http({
url: '/cxctz/cxcTz/list',
method: 'GET',
@@ -16,7 +16,7 @@ export function queryNoticeApi(config) { // 公告
})
}
-export function querySuperiorSystemApi(config) { // 上级制度
+export function querySuperiorSystemApi(config : Object) { // 上级制度
return http({
url: '/cxcjyglsjzdgl/cxcJyglSjzdgl/zslist',
method: 'GET',
@@ -24,7 +24,7 @@ export function querySuperiorSystemApi(config) { // 上级制度
})
}
-export function queryFactorySystemApi(config) { // 厂级制度
+export function queryFactorySystemApi(config : Object) { // 厂级制度
return http({
url: '/cxczd/cxcZdgl/list',
method: 'GET',
@@ -32,7 +32,7 @@ export function queryFactorySystemApi(config) { // 厂级制度
})
}
-export function queryRegulationsApi(config) { // 法律法规
+export function queryRegulationsApi(config : Object) { // 法律法规
return http({
url: '/cxcoaflgf/cxcOaFlgf/zslist',
method: 'GET',
diff --git a/src/api/pages/sc/index.ts b/src/api/pages/sc/index.ts
index 800d6e4..0f6c53a 100644
--- a/src/api/pages/sc/index.ts
+++ b/src/api/pages/sc/index.ts
@@ -8,7 +8,7 @@ export function getListApi(orgCode : string) {
})
}
-export function getJobDesIdByDepAndName(config) {
+export function getJobDesIdByDepAndName(config : Object) {
return http({
url: '/sjgl.tynr/cxcSjJobdescription/queryByNameDep',
method: 'GET',
@@ -16,7 +16,7 @@ export function getJobDesIdByDepAndName(config) {
})
}
-export function getPathByInsflagQuote(config) {
+export function getPathByInsflagQuote(config : Object) {
return http({
url: '/sjgl.scnr/cxcSjSc/getPathByInsflagQuote',
method: 'GET',
diff --git a/src/api/process/api.ts b/src/api/process/api.ts
deleted file mode 100644
index 26bd8ac..0000000
--- a/src/api/process/api.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { http } from '@/utils/http';
-
-export function getListApi(orgCode : string) {
- return http({
- url: '/sjgl.scnr/cxcSjSc/queryTreeData',
- method: 'GET',
- data: { orgCode }
- })
-}
-
-export function taskListApi(config : Object) { // 我的任务列表
- return http({
- url: '/act/task/list',
- method: 'GET',
- data: config
- })
-}
-export function taskHistoryListApi(config : Object) { // 我的历史任务列表
- return http({
- url: '/act/task/taskHistoryList',
- method: 'GET',
- data: config
- })
-}
-
-export function claim(config : Object) {
- return http({
- url: '/act/task/claim',
- method: 'PUT',
- data: config
- })
-}
\ No newline at end of file
diff --git a/src/api/process/index.ts b/src/api/process/index.ts
new file mode 100644
index 0000000..449692b
--- /dev/null
+++ b/src/api/process/index.ts
@@ -0,0 +1,37 @@
+import { http } from '@/utils/http';
+
+/*我的任务列表*/
+export function taskListApi(config : Object) {
+ return http({
+ url: '/act/task/list',
+ method: 'GET',
+ data: config
+ })
+}
+
+/*历史任务列表*/
+export function taskHistoryListApi(config : Object) {
+ return http({
+ url: '/act/task/taskHistoryList',
+ method: 'GET',
+ data: config
+ })
+}
+
+/*签收*/
+export function claim(config : Object) {
+ return http({
+ url: '/act/task/claim',
+ method: 'PUT',
+ data: config
+ })
+}
+
+/*发起流程*/
+export function startMutilProcessApi(config : Object) { // 发起流程
+ return http({
+ url: '/process/extActProcess/startMutilProcess',
+ method: 'POST',
+ data: config
+ })
+}
\ No newline at end of file
diff --git a/src/components/PageLayout/PageLayout.vue b/src/components/PageLayout/PageLayout.vue
index 167e533..ab20453 100644
--- a/src/components/PageLayout/PageLayout.vue
+++ b/src/components/PageLayout/PageLayout.vue
@@ -1,192 +1,191 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ .pageLayout {
+ display: flex;
+ flex-direction: column;
+ height: 100vh;
+ width: 100vw;
+
+ .pageNav {
+ background-image: linear-gradient(45deg, #0081ff, #1cbbb4);
+
+ &.transparent {
+ background-image: none;
+ }
+
+ &.fixed {
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ }
+
+ .statusBar {
+ width: 100%;
+ height: 0;
+ }
+
+ :deep(.wd-navbar) {
+ background-color: transparent;
+ --wot-navbar-title-font-weight: 400;
+ --wot-navbar-arrow-size: 18px;
+ --wot-navbar-desc-font-size: 14px;
+ --wot-navbar-title-font-size: 16px;
+ }
+ }
+
+ .pageContent {
+ flex: 1;
+ overflow: hidden;
+ display: flex;
+ flex-direction: column;
+ background-color: #f1f1f1;
+ }
+
+ .tabbar {
+ /* #ifdef H5 */
+ height: var(--window-bottom);
+ /* #endif */
+ }
+ }
+
\ No newline at end of file
diff --git a/src/pages-user/userEdit/userEdit.vue b/src/pages-user/userEdit/userEdit.vue
index dc8319d..ad67aea 100644
--- a/src/pages-user/userEdit/userEdit.vue
+++ b/src/pages-user/userEdit/userEdit.vue
@@ -9,33 +9,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/process/components/myTask.vue b/src/pages/process/components/myTask.vue
index cbbda38..c4679a4 100644
--- a/src/pages/process/components/myTask.vue
+++ b/src/pages/process/components/myTask.vue
@@ -55,7 +55,7 @@
\ No newline at end of file
diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue
index d839f29..a08c00a 100644
--- a/src/pages/user/people.vue
+++ b/src/pages/user/people.vue
@@ -10,46 +10,44 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -64,10 +62,8 @@
import useUpload from '@/hooks/useUpload'
import { getEnvBaseUrl } from '@/utils/index'
import { queryPostByUserIdApi, editUserApi } from '@/api/system/user'
- import { useAppStore } from '@/store'
const userStore = useUserStore()
- const appStore = useAppStore()
const toast = useToast()
const router = useRouter()
const message = useMessage()