From 79eaa32b11a1e82c30ba766e0b49788707828e7f Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 20 Feb 2025 21:50:29 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E7=94=B3=E8=AF=B7=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .prettierrc | 30 +- src/api/receive-apply/index.js | 4 +- src/router/index.js | 396 +++++++++--------- .../receive-apply/business-details.vue | 125 ++++-- .../receive-apply/components/title-tip.vue | 4 +- .../business-examine/receive-apply/index.vue | 22 +- 6 files changed, 334 insertions(+), 247 deletions(-) diff --git a/.prettierrc b/.prettierrc index f124b4e6..028eed89 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,17 +1,17 @@ { - "printWidth": 120, - "tabWidth": 2, - "singleQuote": true, - "semi": false, - "bracketSpacing": true, - "jsxBracketSameLine": true, - "arrowParens": "avoid", - "endOfLine": "lf", - "useTabs": false, - "trailingComma": "none", - "bracketSameLine": false, - "htmlWhitespaceSensitivity": "ignore", - "vueIndentScriptAndStyle": false, - "singleAttributePerLine": false, - "importStatement": "none" + "printWidth": 120, + "tabWidth": 2, + "singleQuote": true, + "semi": false, + "bracketSpacing": true, + "jsxBracketSameLine": true, + "arrowParens": "avoid", + "endOfLine": "lf", + "useTabs": false, + "trailingComma": "none", + "bracketSameLine": false, + "htmlWhitespaceSensitivity": "ignore", + "vueIndentScriptAndStyle": false, + "singleAttributePerLine": false, + "importStatement": "none" } diff --git a/src/api/receive-apply/index.js b/src/api/receive-apply/index.js index 77108ccb..b2c63fc4 100644 --- a/src/api/receive-apply/index.js +++ b/src/api/receive-apply/index.js @@ -3,7 +3,7 @@ import request from '@/utils/request' // 获取领用申请列表 export function getReceiveApplyApi(query) { return request({ - url: '/material/ma_type/getMaTypeTreeSelect', + url: '/material/leaseTask/auditList', method: 'get', params: query }) @@ -19,7 +19,7 @@ export function getReceiveApplyDetailsApi(query) { // 获取审核记录详情 export function getAuditingDetailsApi(query) { return request({ - url: '/material/ma_type/getMaTypeTreeSelect', + url: '/material//sysWorkflowNode/listByTaskId', method: 'get', params: query }) diff --git a/src/router/index.js b/src/router/index.js index 343073ed..02877a62 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -30,204 +30,204 @@ import Layout from '@/layout' // 公共路由 export const constantRoutes = [ - { - path: '/redirect', - component: Layout, - hidden: true, - children: [ - { - path: '/redirect/:path(.*)', - component: () => import('@/views/redirect') - } - ] - }, - { - path: '/login', - component: () => import('@/views/login1'), - hidden: true - }, - { - path: '/register', - component: () => import('@/views/register1'), - hidden: true - }, - { - path: '/404', - component: () => import('@/views/error/404'), - hidden: true - }, - { - path: '/401', - component: () => import('@/views/error/401'), - hidden: true - }, - { - path: '', - component: Layout, - redirect: 'index', - children: [ - { - path: 'index', - component: () => import('@/views/index'), - name: 'Index', - meta: { title: '首页', icon: 'dashboard', affix: true } - } - ] - }, - { - path: '/qrCode/qrCodePage', - component: () => import('@/views/qrCode/qrCode'), - hidden: true - }, - { - path: '/user', - component: Layout, - hidden: true, - redirect: 'noredirect', - children: [ - { - path: 'profile', - component: () => import('@/views/system/user/profile/index'), - name: 'Profile', - meta: { title: '个人中心', icon: 'user' } - } - ] - } + { + path: '/redirect', + component: Layout, + hidden: true, + children: [ + { + path: '/redirect/:path(.*)', + component: () => import('@/views/redirect') + } + ] + }, + { + path: '/login', + component: () => import('@/views/login1'), + hidden: true + }, + { + path: '/register', + component: () => import('@/views/register1'), + hidden: true + }, + { + path: '/404', + component: () => import('@/views/error/404'), + hidden: true + }, + { + path: '/401', + component: () => import('@/views/error/401'), + hidden: true + }, + { + path: '', + component: Layout, + redirect: 'index', + children: [ + { + path: 'index', + component: () => import('@/views/index'), + name: 'Index', + meta: { title: '首页', icon: 'dashboard', affix: true } + } + ] + }, + { + path: '/qrCode/qrCodePage', + component: () => import('@/views/qrCode/qrCode'), + hidden: true + }, + { + path: '/user', + component: Layout, + hidden: true, + redirect: 'noredirect', + children: [ + { + path: 'profile', + component: () => import('@/views/system/user/profile/index'), + name: 'Profile', + meta: { title: '个人中心', icon: 'user' } + } + ] + } ] // 动态路由,基于用户权限动态去加载 export const dynamicRoutes = [ - { - path: '/system/user-auth', - component: Layout, - hidden: true, - permissions: ['system:user:edit'], - children: [ - { - path: 'role/:userId(\\d+)', - component: () => import('@/views/system/user/authRole'), - name: 'AuthRole', - meta: { title: '分配角色', activeMenu: '/system/user' } - } - ] - }, - { - path: '/system/role-auth', - component: Layout, - hidden: true, - permissions: ['system:role:edit'], - children: [ - { - path: 'user/:roleId(\\d+)', - component: () => import('@/views/system/role/authUser'), - name: 'AuthUser', - meta: { title: '分配用户', activeMenu: '/system/role' } - } - ] - }, - { - path: '/system/dict-data', - component: Layout, - hidden: true, - permissions: ['system:dict:list'], - children: [ - { - path: 'index/:dictId(\\d+)', - component: () => import('@/views/system/dict/data'), - name: 'Data', - meta: { title: '字典数据', activeMenu: '/system/dict' } - } - ] - }, - { - path: '/monitor/job-log', - component: Layout, - hidden: true, - permissions: ['monitor:job:list'], - children: [ - { - path: 'index/:jobId(\\d+)', - component: () => import('@/views/monitor/job/log'), - name: 'JobLog', - meta: { title: '调度日志', activeMenu: '/monitor/job' } - } - ] - }, - { - path: '/tool/gen-edit', - component: Layout, - hidden: true, - permissions: ['tool:gen:edit'], - children: [ - { - path: 'index/:tableId(\\d+)', - component: () => import('@/views/tool/gen/editTable'), - name: 'GenEdit', - meta: { title: '修改生成配置', activeMenu: '/tool/gen' } - } - ] - }, + { + path: '/system/user-auth', + component: Layout, + hidden: true, + permissions: ['system:user:edit'], + children: [ + { + path: 'role/:userId(\\d+)', + component: () => import('@/views/system/user/authRole'), + name: 'AuthRole', + meta: { title: '分配角色', activeMenu: '/system/user' } + } + ] + }, + { + path: '/system/role-auth', + component: Layout, + hidden: true, + permissions: ['system:role:edit'], + children: [ + { + path: 'user/:roleId(\\d+)', + component: () => import('@/views/system/role/authUser'), + name: 'AuthUser', + meta: { title: '分配用户', activeMenu: '/system/role' } + } + ] + }, + { + path: '/system/dict-data', + component: Layout, + hidden: true, + permissions: ['system:dict:list'], + children: [ + { + path: 'index/:dictId(\\d+)', + component: () => import('@/views/system/dict/data'), + name: 'Data', + meta: { title: '字典数据', activeMenu: '/system/dict' } + } + ] + }, + { + path: '/monitor/job-log', + component: Layout, + hidden: true, + permissions: ['monitor:job:list'], + children: [ + { + path: 'index/:jobId(\\d+)', + component: () => import('@/views/monitor/job/log'), + name: 'JobLog', + meta: { title: '调度日志', activeMenu: '/monitor/job' } + } + ] + }, + { + path: '/tool/gen-edit', + component: Layout, + hidden: true, + permissions: ['tool:gen:edit'], + children: [ + { + path: 'index/:tableId(\\d+)', + component: () => import('@/views/tool/gen/editTable'), + name: 'GenEdit', + meta: { title: '修改生成配置', activeMenu: '/tool/gen' } + } + ] + }, - // 会签配置 - { - path: '/countersign/config-data', - component: Layout, - hidden: true, - permissions: ['system:dict:list'], // 权限字符 - children: [ - { - path: 'index/:processName(.*)/:id(.*)', - component: () => import('@/views/material/countersign/config/config-data.vue'), - name: 'config-data', - meta: { title: '流程配置', activeMenu: '/countersign/config' } - } - ] - }, - // 领料审核 业务详情 - { - path: '/business-details/receive-apply', - component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 - hidden: true, - permissions: ['system:dict:list'], // 权限字符 - children: [ - { - path: 'index', - name: 'receive-apply-details', - meta: { title: '领料详情', activeMenu: '/business-examine/receive-apply' }, - component: () => import('@/views/business-examine/receive-apply/business-details.vue') - } - ] - }, - // 直转审核 业务详情 - { - path: '/business-details/direct-rotation-apply', - component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 - hidden: true, - permissions: ['system:dict:list'], // 权限字符 - children: [ - { - path: 'index', - name: 'direct-rotation-apply', - meta: { title: '直转详情', activeMenu: '/business-examine/direct-rotation-apply' }, - component: () => import('@/views/business-examine/direct-rotation-apply/business-details.vue') - } - ] - }, - // 减免审核 业务详情 - { - path: '/business-details/reduction-apply', - component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 - hidden: true, - permissions: ['system:dict:list'], // 权限字符 - children: [ - { - path: 'index', - name: 'reduction-apply', - meta: { title: '减免详情', activeMenu: '/business-examine/reduction-apply' }, - component: () => import('@/views/business-examine/reduction-apply/business-details.vue') - } - ] - } + // 会签配置 + { + path: '/countersign/config-data', + component: Layout, + hidden: true, + permissions: ['system:dict:list'], // 权限字符 + children: [ + { + path: 'index/:processName(.*)/:id(.*)', + component: () => import('@/views/material/countersign/config/config-data.vue'), + name: 'config-data', + meta: { title: '流程配置', activeMenu: '/countersign/config' } + } + ] + }, + // 领料审核 业务详情 + { + path: '/business-details/receive-apply', + component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 + hidden: true, + permissions: ['receive-apply:list'], // 权限字符 + children: [ + { + path: 'index', + name: 'receive-apply-details', + meta: { title: '领料详情', activeMenu: '/business-examine/receive-apply' }, + component: () => import('@/views/business-examine/receive-apply/business-details.vue') + } + ] + }, + // 直转审核 业务详情 + { + path: '/business-details/direct-rotation-apply', + component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 + hidden: true, + permissions: ['*'], // 权限字符 + children: [ + { + path: 'index', + name: 'direct-rotation-apply', + meta: { title: '直转详情', activeMenu: '/business-examine/direct-rotation-apply' }, + component: () => import('@/views/business-examine/direct-rotation-apply/business-details.vue') + } + ] + }, + // 减免审核 业务详情 + { + path: '/business-details/reduction-apply', + component: Layout, // 后续单独拎出来时 要取消layout 直接是独立页面 类似于404页面配置即可 + hidden: true, + permissions: ['system:dict:list'], // 权限字符 + children: [ + { + path: 'index', + name: 'reduction-apply', + meta: { title: '减免详情', activeMenu: '/business-examine/reduction-apply' }, + component: () => import('@/views/business-examine/reduction-apply/business-details.vue') + } + ] + } ] // 防止连续点击多次路由报错 @@ -235,15 +235,15 @@ let routerPush = Router.prototype.push let routerReplace = Router.prototype.replace // push Router.prototype.push = function push(location) { - return routerPush.call(this, location).catch(err => err) + return routerPush.call(this, location).catch(err => err) } // replace Router.prototype.replace = function push(location) { - return routerReplace.call(this, location).catch(err => err) + return routerReplace.call(this, location).catch(err => err) } export default new Router({ - mode: 'history', // 去掉url中的# - scrollBehavior: () => ({ y: 0 }), - routes: constantRoutes + mode: 'history', // 去掉url中的# + scrollBehavior: () => ({ y: 0 }), + routes: constantRoutes }) diff --git a/src/views/business-examine/receive-apply/business-details.vue b/src/views/business-examine/receive-apply/business-details.vue index b4aed05b..ced5b8c0 100644 --- a/src/views/business-examine/receive-apply/business-details.vue +++ b/src/views/business-examine/receive-apply/business-details.vue @@ -6,64 +6,64 @@