diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js index 9a1fe0f9..6a943121 100644 --- a/src/api/documentToolApi.js +++ b/src/api/documentToolApi.js @@ -28,6 +28,10 @@ const deleteComparisonResult = (params) => postAction('/compare/sarFileCompareIt const getComparisonResultDetail = (params) => getAction('/compare/sarFileCompareItemComment/queryCompareResult', params) // 文档对比-编辑对比评论 const editComparisonComment = (params) => postAction('/compare/sarFileCompareItemComment/edit', params) +// 文档对比-对比结果-评论-发表/回复评论 +const addComment = (params) => postAction('/compare/sarFileCompareResComment/add', params) +// 文档对比-对比结果-评论-评论列表 +const getCommentList = (params) => getAction('/compare/sarFileCompareResComment/queryListByInfoId', params) export { // 文档拆分 @@ -47,5 +51,7 @@ export { addFullTextComment, deleteComparisonResult, getComparisonResultDetail, - editComparisonComment + editComparisonComment, + addComment, + getCommentList } diff --git a/src/views/documentTool/documentComparison/ComparisonResults.vue b/src/views/documentTool/documentComparison/ComparisonResults.vue index ab5597da..e30e78ef 100644 --- a/src/views/documentTool/documentComparison/ComparisonResults.vue +++ b/src/views/documentTool/documentComparison/ComparisonResults.vue @@ -121,7 +121,8 @@ - + +
@@ -137,7 +138,7 @@ import { getAction, downloadFile, getFileAccessHttpUrl } from '../../../api/mana import { previewPdf } from '../../../utils/previewPdf.js' import { Base64 } from 'js-base64' import { mapGetters } from 'vuex' -import CommentList from '../modules/CommentList.vue' +import CommentList from './modules/CommentList.vue' import ComparisonResultEditModal from './modules/ComparisonResultEditModal.vue' import InternalDetailPage from '../../../components/InternalDetailPage.vue' import { deleteComparisonResult, getComparisonResultDetail } from '../../../api/documentToolApi.js' diff --git a/src/views/documentTool/documentComparison/DocumentComparison.vue b/src/views/documentTool/documentComparison/DocumentComparison.vue index a4aac9f0..a92c58f9 100644 --- a/src/views/documentTool/documentComparison/DocumentComparison.vue +++ b/src/views/documentTool/documentComparison/DocumentComparison.vue @@ -27,7 +27,7 @@
- {{ $t('query') }} + {{ $t('query') }} {{ $t('reset') }}
@@ -35,12 +35,11 @@
- - {{ $t('docTool.comparison.initiateComparison') }} + + {{ $t('docTool.comparison.initiateComparison') }} - - {{ $t('batchDelete') }} + {{ $t('batchDelete') }}
@@ -100,6 +99,7 @@ export default { // url传参严格按照当前命名 url: { list: '/compare/sarFileCompareInfo/page', + delete: '/compare/sarFileCompareInfo/delete', deleteBatch: '/compare/sarFileCompareInfo/deleteBatch' }, loading: false, @@ -179,13 +179,13 @@ export default { { text: this.$t('docTool.comparison.comparisonResults'), clickEvent: 'comparisonResultsClick', - has: 'domesticStandard:collection' + has: 'documentComparison:comparisonResults' }, // 发布 { text: this.$t('release'), clickEvent: 'subscribe', - has: 'domesticStandard:collection', + has: 'documentComparison:publishWithdraw', show: (record) => { return (record.createBy === this.userInfo.username || this.administrators) && (!record.releaseState || record.releaseState === 'draft') } @@ -194,7 +194,7 @@ export default { { text: this.$t('withdraw'), clickEvent: 'subscribe', - has: 'domesticStandard:collection', + has: 'documentComparison:publishWithdraw', show: (record) => { return (record.createBy === this.userInfo.username || this.administrators) && !(!record.releaseState || record.releaseState === 'draft') } @@ -203,7 +203,7 @@ export default { { text: this.$t('edit'), clickEvent: 'edit', - has: 'domesticStandard:collection', + has: 'documentComparison:edit', show: (record) => { return (record.createBy === this.userInfo.username || this.administrators) && record.releaseState === 'draft' } @@ -211,8 +211,8 @@ export default { // 删除 { text: this.$t('delete'), - clickEvent: 'comparisonResultsClick', - has: 'domesticStandard:collection', + clickEvent: 'handleDelete', + has: 'documentComparison:delete', show: (record) => { return (record.createBy === this.userInfo.username || this.administrators) && record.releaseState === 'draft' } diff --git a/src/views/documentTool/modules/CommentList.vue b/src/views/documentTool/documentComparison/modules/CommentList.vue similarity index 84% rename from src/views/documentTool/modules/CommentList.vue rename to src/views/documentTool/documentComparison/modules/CommentList.vue index 3535c368..f6bcc82a 100644 --- a/src/views/documentTool/modules/CommentList.vue +++ b/src/views/documentTool/documentComparison/modules/CommentList.vue @@ -1,7 +1,7 @@ diff --git a/src/views/system/PermissionList.vue b/src/views/system/PermissionList.vue index d5db6984..c9c3b183 100644 --- a/src/views/system/PermissionList.vue +++ b/src/views/system/PermissionList.vue @@ -18,7 +18,7 @@
已选择 {{ - selectedRowKeys.length }}项   + selectedRowKeys.length }}项   清空
@@ -36,10 +36,10 @@ 编辑 - + - 更多 + 更多 @@ -61,13 +61,12 @@ - - - - - - - +
@@ -94,11 +93,13 @@ const columns = [ }, { title: '菜单英文名称', dataIndex: 'englishName', - key: 'englishName' + key: 'englishName', + scopedSlots: { customRender: 'text' } }, { title: '菜单类型', dataIndex: 'menuType', key: 'menuType', + width: 90, customRender: function (text) { if ((text + '') === '0') { return '菜单' @@ -109,7 +110,8 @@ const columns = [ } else { return text } - } + }, + scopedSlots: { customRender: 'text' } }, /* { title: '权限编码', dataIndex: 'perms', @@ -117,24 +119,28 @@ const columns = [ }, */{ title: 'icon', dataIndex: 'icon', - key: 'icon' + key: 'icon', + width: 120, + scopedSlots: { customRender: 'text' } }, { title: '组件', dataIndex: 'component', key: 'component', - scopedSlots: { customRender: 'component' } + scopedSlots: { customRender: 'text' } }, { title: '路径', dataIndex: 'url', key: 'url', - scopedSlots: { customRender: 'url' } + scopedSlots: { customRender: 'text' } }, { title: '排序', dataIndex: 'sortNo', - key: 'sortNo' + key: 'sortNo', + width: 60, + scopedSlots: { customRender: 'text' } }, { title: '操作', @@ -195,5 +201,5 @@ export default { }