diff --git a/src/option/business/project-change.js b/src/option/business/project-change.js index 659162b..bc8e955 100644 --- a/src/option/business/project-change.js +++ b/src/option/business/project-change.js @@ -7,7 +7,8 @@ import { export const changeTypeOptions = [ { label: '项目变更', value: '项目变更' }, - { label: '项目备案调整', value: '项目备案调整' }, + { label: '项目备案流程(本部流程)', value: '项目备案流程(本部流程)' }, + { label: '项目备案流程(运输部流程)', value: '项目备案流程(运输部流程)' }, ]; export const config = { diff --git a/src/option/business/temporary-credit-limit.js b/src/option/business/temporary-credit-limit.js index 12b480d..a18da8e 100644 --- a/src/option/business/temporary-credit-limit.js +++ b/src/option/business/temporary-credit-limit.js @@ -85,13 +85,6 @@ export const config = { status: ['draft', 'withdrawn', 'rejected'], permission: 'temporary_credit_limit_submit', }, - { - action: 'flow', - label: '流程', - statusProp: 'approvalStatus', - status: ['reviewing'], - permission: 'temporary_credit_limit_view', - }, { action: 'withdraw', label: '撤回', @@ -99,6 +92,14 @@ export const config = { status: ['reviewing'], permission: 'temporary_credit_limit_withdraw', }, + { + action: 'mkAudit', + label: '流程', + statusProp: 'approvalStatus', + status: ['reviewing'], + permission: 'temporary_credit_limit_approve', + mkOnly: true, + }, { action: 'approve', label: '审批通过', @@ -106,6 +107,7 @@ export const config = { statusProp: 'approvalStatus', status: ['reviewing'], permission: 'temporary_credit_limit_approve', + localOnly: true, }, { action: 'reject', @@ -114,6 +116,7 @@ export const config = { statusProp: 'approvalStatus', status: ['reviewing'], permission: 'temporary_credit_limit_reject', + localOnly: true, }, ], }; diff --git a/src/router/page/index.js b/src/router/page/index.js index 2c126f6..21184fb 100644 --- a/src/router/page/index.js +++ b/src/router/page/index.js @@ -106,6 +106,17 @@ export default [ bizType: 'project-change', }, }, + { + path: '/business/project-record-change/public-view', + name: '查看项目备案信息', + component: () => import('@/views/business/project-apply-public-view.vue'), + meta: { + keepAlive: false, + isTab: false, + isAuth: false, + bizType: 'project-record-change', + }, + }, { path: '/business/contract-manage/public-view', name: '查看合同信息', @@ -194,6 +205,39 @@ export default [ bizType: 'bill-payment', }, }, + { + path: '/business/temporary-credit-limit/public-view', + name: '查看临时额度申请信息', + component: () => import('@/views/business/temporary-credit-limit-public-view.vue'), + meta: { + keepAlive: false, + isTab: false, + isAuth: false, + bizType: 'temporary-credit-limit', + }, + }, + { + path: '/transportCapacity/cert-audit-driver/public-view', + name: '查看司机认证审核信息', + component: () => import('@/views/transportCapacity/cert-audit-driver-public-view.vue'), + meta: { + keepAlive: false, + isTab: false, + isAuth: false, + bizType: 'cert-audit-driver', + }, + }, + { + path: '/transportCapacity/cert-audit-vehicle/public-view', + name: '查看车辆认证审核信息', + component: () => import('@/views/transportCapacity/cert-audit-vehicle-public-view.vue'), + meta: { + keepAlive: false, + isTab: false, + isAuth: false, + bizType: 'cert-audit-vehicle', + }, + }, { path: '/', name: '主页', diff --git a/src/utils/mk-approval.js b/src/utils/mk-approval.js index 6415d21..e1cc962 100644 --- a/src/utils/mk-approval.js +++ b/src/utils/mk-approval.js @@ -21,6 +21,19 @@ export const MK_BIZ = { rejected: ['rejected', 'withdrawn'], approved: ['approved'], }, + /** 项目备案流程(本部/运输部)共用 */ + 'project-record-change': { + dictName: '提交项目备案审核流', + subjectPrefix: '项目备案审批', + rejected: ['rejected', 'withdrawn'], + approved: ['approved'], + }, + 'temporary-credit-limit': { + dictName: '提交临时额度审核流', + subjectPrefix: '临时额度审批', + rejected: ['rejected', 'withdrawn'], + approved: ['approved'], + }, 'contract-manage': { dictName: '提交合同审核流', subjectPrefix: '合同审批', @@ -69,10 +82,42 @@ export const MK_BIZ = { rejected: ['returned'], approved: ['approved'], }, + 'cert-audit-driver': { + dictName: '提交司机审核流', + subjectPrefix: '司机认证审批', + // 认证记录 status:0审核中 1已通过 2已驳回 + rejected: ['2'], + approved: ['1'], + }, + 'cert-audit-vehicle': { + dictName: '提交车辆审核流', + subjectPrefix: '车辆认证审批', + rejected: ['2'], + approved: ['1'], + }, }; +/** 按认证对象类型解析 MK 业务类型 */ +export function resolveCertAuditMkBizType(bizType) { + return String(bizType || '') === 'vehicle' ? 'cert-audit-vehicle' : 'cert-audit-driver'; +} + const MK_SWITCH_NAME = '开启MK'; +/** 项目备案类变更类型(含历史「项目备案调整」) */ +export const PROJECT_RECORD_CHANGE_TYPES = [ + '项目备案流程(本部流程)', + '项目备案流程(运输部流程)', + '项目备案调整', +]; + +/** 按变更类型选择项目变更 / 项目备案 MK 业务类型 */ +export function resolveProjectChangeMkBizType(changeType) { + return PROJECT_RECORD_CHANGE_TYPES.includes(String(changeType || '').trim()) + ? 'project-record-change' + : 'project-change'; +} + /** 进程内缓存,避免每次提交都打字典;登录后同一会话开关一般不变 */ let mkEnabledCache = null; let mkEnabledPromise = null; diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue index 78172d3..d058514 100644 --- a/src/views/authority/role.vue +++ b/src/views/authority/role.vue @@ -92,6 +92,7 @@ ref="treeMenu" :default-checked-keys="menuTreeObj" :props="props" + @check="handleMenuCheck" > @@ -102,7 +103,7 @@ style="margin-bottom: 12px; background: #f5f7fa; padding: 6px 10px; border-radius: 4px" > 仅展示菜单权限已勾选的菜单,已配置的数据权限会保留。勾选多个菜单后点击「设置」可批量配置菜单权限勾选/反选会自动同步到此页;仅展示已勾选菜单,已配置的数据权限会保留。可再调整勾选后点击「设置」批量配置 设置 @@ -191,20 +192,8 @@ 所在部门及下级 全部组织 本人创建 - 自定义组织 - - -