From 0a83c5e811ff2a3ab0bb63b045ae35dc34198128 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期一, 08 九月 2025 15:59:06 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdminBClient --- src/views/ServiceChargeManage/ServiceChargeDetail.vue | 2 +- src/views/ServiceChargeManage/ServiceChargeManage.vue | 3 +-- src/router/index.ts | 26 +++++++++++++------------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index 98978f2..aa8aa80 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -256,19 +256,19 @@ icon: 'home', }, }, - { - path: '/BalanceManage', - name: 'BalanceManage', - hidden: false, - alwaysShow: true, - component: () => import('@/views/ServiceChargeManage/BalanceManage.vue'), - meta: { - rank: 10042, - title: '浣欓绠$悊', - // rootMenu: true, - icon: 'home', - }, - }, + // { + // path: '/BalanceManage', + // name: 'BalanceManage', + // hidden: false, + // alwaysShow: true, + // component: () => import('@/views/ServiceChargeManage/BalanceManage.vue'), + // meta: { + // rank: 10042, + // title: '浣欓绠$悊', + // // rootMenu: true, + // icon: 'home', + // }, + // }, { path: '/ServiceChargeDetail/:id', name: 'ServiceChargeDetail', diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue index d316f43..9ce53c0 100644 --- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue +++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue @@ -90,7 +90,7 @@ :auto-height="false" ref="proTable" :tableProps="{ - maxHeight: '400px', + maxHeight: '250px', }" > </ProTableV2> diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue index 134f3d2..8cbbe76 100644 --- a/src/views/ServiceChargeManage/ServiceChargeManage.vue +++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue @@ -201,7 +201,7 @@ onClick: (role) => handleExport(role), }, extraProps: { - hide: () => false, + hide: () => true, }, }, ]); @@ -288,7 +288,6 @@ }); async function handleAddOrEdit() { - console.log('editForm: ', editForm); goDetail(editForm.id, editForm.settlementUrl[0]?.path); } -- Gitblit v1.9.1