diff --git a/apps/web-antd/src/api/license/license/index.ts b/apps/web-antd/src/api/license/license/index.ts index f0a94e2..d15bd45 100644 --- a/apps/web-antd/src/api/license/license/index.ts +++ b/apps/web-antd/src/api/license/license/index.ts @@ -26,6 +26,7 @@ export namespace LicenseApi { action: number; // 操作 neCodeList: NeCode[]; // 操作 oldLicense: License; + hasHistory: boolean; } export interface NeCode { id: number; // 主键 diff --git a/apps/web-antd/src/views/license/license/data.ts b/apps/web-antd/src/views/license/license/data.ts index ac8687c..8b92651 100644 --- a/apps/web-antd/src/views/license/license/data.ts +++ b/apps/web-antd/src/views/license/license/data.ts @@ -369,59 +369,8 @@ export function useGridColumns( field: 'operation', title: $t('license.operation'), minWidth: 200, - align: 'center', fixed: 'right', - headerAlign: 'center', - showOverflow: false, - cellRender: { - attrs: { - nameField: 'serialNo', - nameTitle: 'License', - onClick: onActionClick, - }, - name: 'CellOperation', - options: [ - { - code: 'detail', - text: $t('license.detail'), - }, - { - code: 'history', - text: $t('license.history'), - }, - { - code: 'reapply', - text: $t('license.reapply'), - show: (values: LicenseApi.License) => { - return ( - hasAccessByCodes(['license:license:apply']) && - values.status === 3 - ); - }, - }, - { - code: 'generate', - text: $t('license.generate'), - show: (values: LicenseApi.License) => { - return ( - hasAccessByCodes(['license:license:generate']) && - (values.status === 1 || values.status === 4) - ); - }, - }, - { - code: 'download', - text: $t('license.download'), - show: (values: LicenseApi.License) => { - return values.status === 3; - }, - }, - { - code: 'delete', - show: hasAccessByCodes(['license:license:delete']), - }, - ], - }, + slots: { default: 'actions' }, }, ]; } diff --git a/apps/web-antd/src/views/license/license/index.vue b/apps/web-antd/src/views/license/license/index.vue index 1853caa..8d2ba63 100644 --- a/apps/web-antd/src/views/license/license/index.vue +++ b/apps/web-antd/src/views/license/license/index.vue @@ -1,8 +1,5 @@