diff --git a/env/.env.development b/env/.env.development index 4cde61d..639f316 100644 --- a/env/.env.development +++ b/env/.env.development @@ -5,5 +5,6 @@ VITE_DELETE_CONSOLE = false # 是否开启sourcemap VITE_SHOW_SOURCEMAP = true -VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' -#VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' \ No newline at end of file +#VITE_SERVER_BASEURL = 'http://10.75.15.249:8080/jeecg-boot' + +VITE_SERVER_BASEURL = 'https://36.112.48.190/jeecg-boot' \ No newline at end of file diff --git a/package.json b/package.json index aed2f1e..22d5959 100644 --- a/package.json +++ b/package.json @@ -76,21 +76,33 @@ "@dcloudio/uni-mp-weixin": "3.0.0-4030620241128001", "@dcloudio/uni-mp-xhs": "3.0.0-4030620241128001", "@dcloudio/uni-quickapp-webview": "3.0.0-4030620241128001", + "@tanstack/query-core": "^5.76.0", "@tanstack/vue-query": "^5.62.16", "@vant/area-data": "^2.0.0", "abortcontroller-polyfill": "^1.7.8", "base-64": "^1.0.0", + "charenc": "^0.0.2", + "crypt": "^0.0.2", "dayjs": "1.11.10", "echarts": "^5.6.0", + "fs-extra": "^11.3.0", + "is-buffer": "^2.0.5", + "js-base64": "^3.6.1", + "lodash": "^4.17.21", + "lodash-es": "^4.17.21", "md5": "^2.3.0", "pinia": "2.0.36", "pinia-plugin-persistedstate": "3.2.1", "qs": "6.5.3", + "tanstack": "^1.0.0", + "tslib": "^2.8.1", "uni-parse-pages": "^0.0.1", "vue": "3.4.21", + "vue-demi": "^0.14.10", "vue-i18n": "9.1.9", "wot-design-uni": "^1.9.1", - "z-paging": "^2.8.4" + "z-paging": "^2.8.4", + "zrender": "^5.6.1" }, "devDependencies": { "@commitlint/cli": "^18.6.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7b46bfe..2a22990 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -56,6 +56,9 @@ importers: '@dcloudio/uni-quickapp-webview': specifier: 3.0.0-4030620241128001 version: 3.0.0-4030620241128001(@vueuse/core@11.3.0(vue@3.4.21(typescript@5.7.2)))(postcss@8.4.49)(rollup@4.28.0)(vue@3.4.21(typescript@5.7.2)) + '@tanstack/query-core': + specifier: ^5.76.0 + version: 5.76.0 '@tanstack/vue-query': specifier: ^5.62.16 version: 5.62.16(vue@3.4.21(typescript@5.7.2)) @@ -68,12 +71,33 @@ importers: base-64: specifier: ^1.0.0 version: 1.0.0 + charenc: + specifier: ^0.0.2 + version: 0.0.2 + crypt: + specifier: ^0.0.2 + version: 0.0.2 dayjs: specifier: 1.11.10 version: 1.11.10 echarts: specifier: ^5.6.0 version: 5.6.0 + fs-extra: + specifier: ^11.3.0 + version: 11.3.0 + is-buffer: + specifier: ^2.0.5 + version: 2.0.5 + js-base64: + specifier: ^3.6.1 + version: 3.7.7 + lodash: + specifier: ^4.17.21 + version: 4.17.21 + lodash-es: + specifier: ^4.17.21 + version: 4.17.21 md5: specifier: ^2.3.0 version: 2.3.0 @@ -86,12 +110,21 @@ importers: qs: specifier: 6.5.3 version: 6.5.3 + tanstack: + specifier: ^1.0.0 + version: 1.0.0 + tslib: + specifier: ^2.8.1 + version: 2.8.1 uni-parse-pages: specifier: ^0.0.1 version: 0.0.1 vue: specifier: 3.4.21 version: 3.4.21(typescript@5.7.2) + vue-demi: + specifier: ^0.14.10 + version: 0.14.10(vue@3.4.21(typescript@5.7.2)) vue-i18n: specifier: 9.1.9 version: 9.1.9(vue@3.4.21(typescript@5.7.2)) @@ -101,6 +134,9 @@ importers: z-paging: specifier: ^2.8.4 version: 2.8.4 + zrender: + specifier: ^5.6.1 + version: 5.6.1 devDependencies: '@commitlint/cli': specifier: ^18.6.1 @@ -2039,6 +2075,9 @@ packages: '@tanstack/query-core@5.62.16': resolution: {integrity: sha512-9Sgft7Qavcd+sN0V25xVyo0nfmcZXBuODy3FVG7BMWTg1HMLm8wwG5tNlLlmSic1u7l1v786oavn+STiFaPH2g==} + '@tanstack/query-core@5.76.0': + resolution: {integrity: sha512-FN375hb8ctzfNAlex5gHI6+WDXTNpe0nbxp/d2YJtnP+IBM6OUm7zcaoCW6T63BawGOYZBbKC0iPvr41TteNVg==} + '@tanstack/vue-query@5.62.16': resolution: {integrity: sha512-QVx/tAexhAN+q0IbwyhVXu3f3hujfvhqLlZMNAWKTrDSUcp2BxJNjPyiti5gcaDhQwBUK9BdSXIFFYLcjYWvvA==} peerDependencies: @@ -3962,6 +4001,10 @@ packages: resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} engines: {node: '>=12'} + fs-extra@11.3.0: + resolution: {integrity: sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==} + engines: {node: '>=14.14'} + fs-minipass@2.1.0: resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} engines: {node: '>= 8'} @@ -4321,6 +4364,10 @@ packages: is-buffer@1.1.6: resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} + is-buffer@2.0.5: + resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==} + engines: {node: '>=4'} + is-builtin-module@3.2.1: resolution: {integrity: sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==} engines: {node: '>=6'} @@ -4668,6 +4715,9 @@ packages: jpeg-js@0.3.7: resolution: {integrity: sha512-9IXdWudL61npZjvLuVe/ktHiA41iE8qFyLB+4VDTblEsWBzeg8WQTlktdUK4CdncUqtUgUg0bbOmTE2bKBKaBQ==} + js-base64@3.7.7: + resolution: {integrity: sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==} + js-tokens@4.0.0: resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} @@ -6249,6 +6299,9 @@ packages: resolution: {integrity: sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==} engines: {node: '>=10.0.0'} + tanstack@1.0.0: + resolution: {integrity: sha512-BUpDmwGlWHk2F183Uu1+k85biSLrpSh/zA9ephJwmZ9ze+XDEw3JOyN9vhcbFqrQFrf5yuWImt+0Kn4fUNgzTg==} + tapable@2.2.1: resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==} engines: {node: '>=6'} @@ -9477,6 +9530,8 @@ snapshots: '@tanstack/query-core@5.62.16': {} + '@tanstack/query-core@5.76.0': {} + '@tanstack/vue-query@5.62.16(vue@3.4.21(typescript@5.7.2))': dependencies: '@tanstack/match-sorter-utils': 8.19.4 @@ -11874,6 +11929,12 @@ snapshots: jsonfile: 6.1.0 universalify: 2.0.1 + fs-extra@11.3.0: + dependencies: + graceful-fs: 4.2.11 + jsonfile: 6.1.0 + universalify: 2.0.1 + fs-minipass@2.1.0: dependencies: minipass: 3.3.6 @@ -12262,6 +12323,8 @@ snapshots: is-buffer@1.1.6: {} + is-buffer@2.0.5: {} + is-builtin-module@3.2.1: dependencies: builtin-modules: 3.3.0 @@ -12807,6 +12870,8 @@ snapshots: jpeg-js@0.3.7: {} + js-base64@3.7.7: {} + js-tokens@4.0.0: {} js-tokens@9.0.1: {} @@ -14481,6 +14546,8 @@ snapshots: string-width: 4.2.3 strip-ansi: 6.0.1 + tanstack@1.0.0: {} + tapable@2.2.1: {} tar@6.2.1: diff --git a/src/api/process/api.ts b/src/api/process/api.ts new file mode 100644 index 0000000..26bd8ac --- /dev/null +++ b/src/api/process/api.ts @@ -0,0 +1,32 @@ +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/pages.json b/src/pages.json index 26bd249..8a00adb 100644 --- a/src/pages.json +++ b/src/pages.json @@ -155,6 +155,15 @@ "navigationStyle": "custom" } }, + { + "path": "pages/onlinePreview/detail", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "在线预览" + } + }, { "path": "pages/onlinePreview/onlinePreview", "type": "page", @@ -173,6 +182,24 @@ "navigationBarTitleText": "H5在线预览" } }, + { + "path": "pages/process/approvalTabbar", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "流程审批导航" + } + }, + { + "path": "pages/process/taskHandle", + "type": "page", + "layout": "default", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "任务处理" + } + }, { "path": "pages/user/people", "type": "page", diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 6633f26..de11bc5 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -39,7 +39,7 @@ - + @@ -104,6 +104,13 @@ url: `${item.path}?title=${item.text}` }) } + + const goToProcess = ()=>{ + uni.navigateTo({ + url: '/pages/process/approvalTabbar' + }) + } + const goPageMore = (page) => { router.replace({ name: 'more', params: { backRouteName: 'index', type: page } }) diff --git a/src/pages/onlinePreview/detail.vue b/src/pages/onlinePreview/detail.vue new file mode 100644 index 0000000..f16e0e9 --- /dev/null +++ b/src/pages/onlinePreview/detail.vue @@ -0,0 +1,159 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '在线预览', + }, + } + + + + + + + \ No newline at end of file diff --git a/src/pages/onlinePreview/onlinePreview.vue b/src/pages/onlinePreview/onlinePreview.vue index ab5e033..3976698 100644 --- a/src/pages/onlinePreview/onlinePreview.vue +++ b/src/pages/onlinePreview/onlinePreview.vue @@ -29,6 +29,7 @@ getEnvBaseUrl } from '@/utils/index' const appStore = useAppStore(); + const baseUrl = 'https://10.75.166.6/jeecg-boot/sys/common/static/'; var fileUrl = ""; const handleClickLeft = () => { uni.navigateBack() @@ -36,7 +37,7 @@ onLoad((options) => { let base64 = new Base64(); - var url = getEnvBaseUrl() + '/sys/common/static/' + options.data; + var url = baseUrl + JSON.parse(options.data); console.log('-----111',url) fileUrl = 'https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent(base64.encode(url)) console.log('-----222',fileUrl) diff --git a/src/pages/onlinePreview/onlinePreviewH5.vue b/src/pages/onlinePreview/onlinePreviewH5.vue index 6a51988..6610c35 100644 --- a/src/pages/onlinePreview/onlinePreviewH5.vue +++ b/src/pages/onlinePreview/onlinePreviewH5.vue @@ -27,17 +27,23 @@ getEnvBaseUrl } from '@/utils/index' const appStore = useAppStore(); - import Base64 from '@/utils/code'; + import { + Base64 + } from 'js-base64' var fileUrl = ""; + const baseUrl = 'https://10.75.166.6/jeecg-boot/sys/common/static/'; const handleClickLeft = () => { uni.navigateBack() } onLoad((options) => { - let base64 = new Base64(); - let url = getEnvBaseUrl() + '/sys/common/static/' + options.data; - fileUrl = 'https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent(base64.encode(url)) + console.log(options) + let url = JSON.parse(options.data) + url = baseUrl + url; + console.log(url) + fileUrl ='https://36.112.48.190/preview/onlinePreview?url=' + encodeURIComponent(Base64.encode(url)) + console.log(fileUrl) }) diff --git a/src/pages/operate/file/detail.vue b/src/pages/operate/file/detail.vue index a9091cf..68d5914 100644 --- a/src/pages/operate/file/detail.vue +++ b/src/pages/operate/file/detail.vue @@ -15,18 +15,12 @@ - - {{dataSource.zdmc}} - - + {{dataSource.zdmc}} - - {{dataSource.jdwj}} - - + {{dataSource.jdwj}} diff --git a/src/pages/operate/file/index.vue b/src/pages/operate/file/index.vue index 7af03c9..8d6e01f 100644 --- a/src/pages/operate/file/index.vue +++ b/src/pages/operate/file/index.vue @@ -194,9 +194,9 @@ } const onlinePreView = (e) => { - const path = ifH5 ? 'onlinePreviewH5' : 'onlinePreview'; + console.log(e) uni.navigateTo({ - url: `/pages/onlinePreview/${path}?data=${e}` + url: `/pages/onlinePreview/detail?data=${e}` }); }; diff --git a/src/pages/operate/sc/index.vue b/src/pages/operate/sc/index.vue index 2b079bd..e3fa069 100644 --- a/src/pages/operate/sc/index.vue +++ b/src/pages/operate/sc/index.vue @@ -133,7 +133,6 @@ } const onlinePreview = (e) => { - const path = isH5() ? 'onlinePreviewH5' : 'onlinePreview'; uni.navigateTo({ url: `/pages/onlinePreview/${path}?data=${e}` }); diff --git a/src/pages/process/approvalTabbar.vue b/src/pages/process/approvalTabbar.vue new file mode 100644 index 0000000..23eaa47 --- /dev/null +++ b/src/pages/process/approvalTabbar.vue @@ -0,0 +1,53 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '流程审批导航', + }, + } + + + + + + \ No newline at end of file diff --git a/src/pages/process/components/myTask.vue b/src/pages/process/components/myTask.vue new file mode 100644 index 0000000..cbbda38 --- /dev/null +++ b/src/pages/process/components/myTask.vue @@ -0,0 +1,170 @@ + + + + + \ No newline at end of file diff --git a/src/pages/process/taskHandle.vue b/src/pages/process/taskHandle.vue new file mode 100644 index 0000000..2808f81 --- /dev/null +++ b/src/pages/process/taskHandle.vue @@ -0,0 +1,62 @@ + + { + layout: 'default', + style: { + navigationStyle: 'custom', + navigationBarTitleText: '任务处理', + }, + } + + + + + + \ No newline at end of file diff --git a/src/pages/user/people.vue b/src/pages/user/people.vue index 5fd0242..d839f29 100644 --- a/src/pages/user/people.vue +++ b/src/pages/user/people.vue @@ -161,6 +161,7 @@ // #endif } const exit = () => { + console.log(message) message .confirm({ title: '提示', diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts index 54f8240..e08c24e 100644 --- a/src/types/uni-pages.d.ts +++ b/src/types/uni-pages.d.ts @@ -16,8 +16,11 @@ interface NavigateToOptions { "/pages/index/index" | "/pages/message/message" | "/pages/more/more" | + "/pages/onlinePreview/detail" | "/pages/onlinePreview/onlinePreview" | "/pages/onlinePreview/onlinePreviewH5" | + "/pages/process/approvalTabbar" | + "/pages/process/taskHandle" | "/pages/user/people" | "/pages/workHome/index" | "/pages/humanResources/absence/apply" |