Commit 577e9043a1df2569712df40e19f128e4c1a94115
1 parent
ed849db8
fix: 场景联动不论是超级租户管理员还是租户管理员,只要是所属组织下的都可以进行操作
Showing
1 changed file
with
2 additions
and
6 deletions
| @@ -30,7 +30,7 @@ | @@ -30,7 +30,7 @@ | ||
| 30 | auth: 'api:yt:sceneLinkage:update', | 30 | auth: 'api:yt:sceneLinkage:update', |
| 31 | icon: 'clarity:note-edit-line', | 31 | icon: 'clarity:note-edit-line', |
| 32 | onClick: handleEdit.bind(null, record), | 32 | onClick: handleEdit.bind(null, record), |
| 33 | - ifShow: record.creator === userId && record.status !== 1, | 33 | + ifShow: record.status !== 1, |
| 34 | }, | 34 | }, |
| 35 | ]" | 35 | ]" |
| 36 | :drop-down-actions="[ | 36 | :drop-down-actions="[ |
| @@ -39,7 +39,7 @@ | @@ -39,7 +39,7 @@ | ||
| 39 | auth: 'api:yt:sceneLinkage:delete', | 39 | auth: 'api:yt:sceneLinkage:delete', |
| 40 | icon: 'ant-design:delete-outlined', | 40 | icon: 'ant-design:delete-outlined', |
| 41 | color: 'error', | 41 | color: 'error', |
| 42 | - ifShow: record.creator === userId && record.status !== 1, | 42 | + ifShow: record.status !== 1, |
| 43 | popConfirm: { | 43 | popConfirm: { |
| 44 | title: '是否确认删除', | 44 | title: '是否确认删除', |
| 45 | confirm: handleDeleteOrBatchDelete.bind(null, record), | 45 | confirm: handleDeleteOrBatchDelete.bind(null, record), |
| @@ -82,8 +82,6 @@ | @@ -82,8 +82,6 @@ | ||
| 82 | import { useBatchDelete } from '/@/hooks/web/useBatchDelete'; | 82 | import { useBatchDelete } from '/@/hooks/web/useBatchDelete'; |
| 83 | import { Switch, Popconfirm, Tag } from 'ant-design-vue'; | 83 | import { Switch, Popconfirm, Tag } from 'ant-design-vue'; |
| 84 | import { columns, searchFormSchema } from './config/config.data'; | 84 | import { columns, searchFormSchema } from './config/config.data'; |
| 85 | - import { USER_INFO_KEY } from '/@/enums/cacheEnum'; | ||
| 86 | - import { getAuthCache } from '/@/utils/auth'; | ||
| 87 | import { SceneLinkageDrawer } from './components/SceneLinkageDrawer'; | 85 | import { SceneLinkageDrawer } from './components/SceneLinkageDrawer'; |
| 88 | import { useMessage } from '/@/hooks/web/useMessage'; | 86 | import { useMessage } from '/@/hooks/web/useMessage'; |
| 89 | import { Authority } from '/@/components/Authority'; | 87 | import { Authority } from '/@/components/Authority'; |
| @@ -91,8 +89,6 @@ | @@ -91,8 +89,6 @@ | ||
| 91 | import { SceneLinkageDrawerDataType } from './components/SceneLinkageDrawer/type'; | 89 | import { SceneLinkageDrawerDataType } from './components/SceneLinkageDrawer/type'; |
| 92 | import { DataActionModeEnum } from '/@/enums/toolEnum'; | 90 | import { DataActionModeEnum } from '/@/enums/toolEnum'; |
| 93 | 91 | ||
| 94 | - const userInfo: any = getAuthCache(USER_INFO_KEY); | ||
| 95 | - const userId = userInfo.userId; | ||
| 96 | const { hasPermission } = usePermission(); | 92 | const { hasPermission } = usePermission(); |
| 97 | 93 | ||
| 98 | const [registerDrawer, { openDrawer }] = useDrawer(); | 94 | const [registerDrawer, { openDrawer }] = useDrawer(); |