From a9ec74a912fbe50bae48b62cf57149e8411a7d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 20 Feb 2024 09:56:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=A3=E6=8B=86?= =?UTF-8?q?=E5=88=86=E7=9A=84=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documentComparison/DocumentComparison.vue | 17 ++++++----------- .../documentSplit/DocumentSplit.vue | 13 ++++--------- .../documentSplit/DocumentSplitDetail.vue | 3 --- 3 files changed, 10 insertions(+), 23 deletions(-) diff --git a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue index 2cb8155..7d192a4 100644 --- a/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -187,43 +187,38 @@ export default { // 对比结果 { text: this.$t('docTool.comparison.comparisonResults'), - clickEvent: 'comparisonResultsClick', - has: 'documentComparison:comparisonResults' + clickEvent: 'comparisonResultsClick' }, // 发布 { text: this.$t('release'), clickEvent: 'subscribe', - has: 'documentComparison:publishWithdraw', show: (record) => { - return record.createBy === this.userInfo.username && (!record.releaseState || record.releaseState === 'draft') + return !record.releaseState || record.releaseState === 'draft' } }, // 撤回 { text: this.$t('withdraw'), clickEvent: 'subscribe', - has: 'documentComparison:publishWithdraw', show: (record) => { - return record.createBy === this.userInfo.username && !(!record.releaseState || record.releaseState === 'draft') + return !(!record.releaseState || record.releaseState === 'draft') } }, // 编辑 { text: this.$t('edit'), clickEvent: 'edit', - has: 'documentComparison:edit', show: (record) => { - return (record.createBy === this.userInfo.username || this.administrators) && (!record.releaseState || record.releaseState === 'draft') + return !record.releaseState || record.releaseState === 'draft' } }, // 删除 { text: this.$t('delete'), clickEvent: 'handleDelete', - has: 'documentComparison:delete', show: (record) => { - return (record.createBy === this.userInfo.username || this.administrators) && (!record.releaseState || record.releaseState === 'draft') + return !record.releaseState || record.releaseState === 'draft' } } ] @@ -279,7 +274,7 @@ export default { }, // 对比结果按钮点击 comparisonResultsClick (item) { - if (item.createBy === this.userInfo.username && item.releaseState === 'draft') { + if (item.releaseState === 'draft') { item.isDisplay = 2 } else { item.isDisplay = 1 diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue index 9b408e6..dbf6c30 100644 --- a/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue +++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplit.vue @@ -120,46 +120,41 @@ export default { { text: this.$t('release'), clickEvent: 'handleRelease', - has: 'split:sarFileSplitInfo:release', show: (record) => { // 创建人(更改权限更改的是这个字段)是当前登录人,且状态为编辑中可以发布 - return record.createBy === this.userInfo.id && record.splitStatus === SplitStatus.EDITING.value + return record.splitStatus === SplitStatus.EDITING.value } }, // 撤回 { text: this.$t('withdraw'), clickEvent: 'handleWithdraw', - has: 'split:sarFileSplitInfo:withdraw', show: (record) => { // 创建人(更改权限更改的是这个字段)是当前登录人,且状态为已发布可以撤回 - return record.createBy === this.userInfo.id && record.splitStatus === SplitStatus.RELEASED.value + return record.splitStatus === SplitStatus.RELEASED.value } }, // 查看 { text: this.$t('view'), clickEvent: 'handleDetail', - has: 'split:sarFileSplitItems:page' }, // 编辑 { text: this.$t('edit'), clickEvent: 'handleEdit', - has: 'split:sarFileSplitItems:edit', show: (record) => { // 创建人(更改权限更改的是这个字段)是当前登录人,且状态为编辑中可以编辑 - return record.createBy === this.userInfo.id && record.splitStatus === SplitStatus.EDITING.value + return record.splitStatus === SplitStatus.EDITING.value } }, // 删除 { text: this.$t('delete'), clickEvent: 'handleDelete', - has: 'split:sarFileSplitInfo:delete', show: (record) => { // 创建人(更改权限更改的是这个字段)是当前登录人或用户为管理员,且状态为编辑中可以删除 - return (record.createBy === this.userInfo.id || this.administrators) + return true } } ], diff --git a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue index 818545c..e8e8d23 100644 --- a/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue +++ b/jero-web/src/views/documentTool/documentSplit/DocumentSplitDetail.vue @@ -248,19 +248,16 @@ export default { { text: this.$t('edit'), clickEvent: 'handleEdit', - has: 'split:sarFileSplitItems:update' }, // 复制 { text: this.$t('copy'), clickEvent: 'handleCopy', - has: 'split:sarFileSplitItems:copy' }, // 删除 { text: this.$t('delete'), clickEvent: 'handleDelete', - has: 'split:sarFileSplitItems:delete' } ], url: {