From 7ac1ee03bece28a9f79c367f340f9dffbeff36f5 Mon Sep 17 00:00:00 2001 From: guoyuqi Date: Fri, 29 Mar 2024 19:09:53 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=94=A8=E4=BE=8B=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1038134 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038134 --bug=1038128 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038128 --bug=1038048 --user=郭雨琦 https://www.tapd.cn/55049933/bugtrace/bugs/view/1155049933001038048 --- .../src/components/business/ms-case-associate/index.vue | 1 + frontend/src/models/caseManagement/caseReview.ts | 1 + .../caseManagementFeature/components/caseDetail.vue | 6 +++--- .../case-management/caseManagementFeature/locale/en-US.ts | 1 + .../case-management/caseManagementFeature/locale/zh-CN.ts | 1 + .../case-management/caseReview/components/reviewForm.vue | 4 ++-- frontend/src/views/case-management/caseReview/create.vue | 6 +++++- 7 files changed, 14 insertions(+), 6 deletions(-) diff --git a/frontend/src/components/business/ms-case-associate/index.vue b/frontend/src/components/business/ms-case-associate/index.vue index bab28880f5..0721757cb2 100644 --- a/frontend/src/components/business/ms-case-associate/index.vue +++ b/frontend/src/components/business/ms-case-associate/index.vue @@ -536,6 +536,7 @@ sourceType: caseType.value, projectId: innerProject.value, sourceId: props.caseId, + totalCount: propsRes.value.msPagination?.total, }; emit('save', params); diff --git a/frontend/src/models/caseManagement/caseReview.ts b/frontend/src/models/caseManagement/caseReview.ts index 3f13920420..87053bd827 100644 --- a/frontend/src/models/caseManagement/caseReview.ts +++ b/frontend/src/models/caseManagement/caseReview.ts @@ -36,6 +36,7 @@ export interface BaseAssociateCaseRequest { versionId: string; refId: string; projectId: string; + totalCount?: number; } // 评审 export interface Review { diff --git a/frontend/src/views/case-management/caseManagementFeature/components/caseDetail.vue b/frontend/src/views/case-management/caseManagementFeature/components/caseDetail.vue index 6f14d9da1d..a836b95217 100644 --- a/frontend/src/views/case-management/caseManagementFeature/components/caseDetail.vue +++ b/frontend/src/views/case-management/caseManagementFeature/components/caseDetail.vue @@ -41,7 +41,6 @@ import { useI18n } from '@/hooks/useI18n'; import useLeaveUnSaveTip from '@/hooks/useLeaveUnSaveTip'; import useVisit from '@/hooks/useVisit'; - import { useAppStore } from '@/store'; import useFeatureCaseStore from '@/store/modules/case/featureCase'; import { scrollIntoView } from '@/utils/dom'; @@ -99,16 +98,17 @@ if (isContinue) { Message.success(t('caseManagement.featureCase.addSuccess')); caseModuleDetailRef.value.resetForm(); - return; } createSuccessId.value = res.data.id; - Message.success(route.params.mode === 'copy' ? t('ms.description.copySuccess') : t('common.addSuccess')); isShowTip.value = !getIsVisited(); if (isReview) { + Message.success(t('caseManagement.featureCase.createAndLinkSuccess')); + setState(true); router.back(); return; } + Message.success(route.params.mode === 'copy' ? t('ms.description.copySuccess') : t('common.addSuccess')); if (isShowTip.value && !route.query.id) { router.push({ name: CaseManagementRouteEnum.CASE_MANAGEMENT_CASE_CREATE_SUCCESS, diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts index 92870985cb..41a22bcdc0 100644 --- a/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts +++ b/frontend/src/views/case-management/caseManagementFeature/locale/en-US.ts @@ -207,6 +207,7 @@ export default { 'caseManagement.featureCase.platformDemandState': 'Status', 'caseManagement.featureCase.platformDemandHandler': 'handler', 'caseManagement.featureCase.createAndLink': 'Create & Associate', + 'caseManagement.featureCase.createAndLinkSuccess': 'Created and associated successfully', 'caseManagement.featureCase.commentList': 'Comment list', 'caseManagement.featureCase.caseComment': 'Use case comment', 'caseManagement.featureCase.reviewComment': 'Review Comments', diff --git a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts index 03581daf57..1dae8a1724 100644 --- a/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts +++ b/frontend/src/views/case-management/caseManagementFeature/locale/zh-CN.ts @@ -206,6 +206,7 @@ export default { 'caseManagement.featureCase.platformDemandState': '状态', 'caseManagement.featureCase.platformDemandHandler': '处理人', 'caseManagement.featureCase.createAndLink': '创建并关联', + 'caseManagement.featureCase.createAndLinkSuccess': '创建并关联成功', 'caseManagement.featureCase.commentList': '评论列表', 'caseManagement.featureCase.caseComment': '用例评论', 'caseManagement.featureCase.reviewComment': '评审评论', diff --git a/frontend/src/views/case-management/caseReview/components/reviewForm.vue b/frontend/src/views/case-management/caseReview/components/reviewForm.vue index 71bb8421d6..9c93e9eb41 100644 --- a/frontend/src/views/case-management/caseReview/components/reviewForm.vue +++ b/frontend/src/views/case-management/caseReview/components/reviewForm.vue @@ -12,13 +12,13 @@ {{ t('caseManagement.caseReview.pass') }} - +
{{ t('caseManagement.caseReview.fail') }}
- +
{{ t('caseManagement.caseReview.suggestion') }} diff --git a/frontend/src/views/case-management/caseReview/create.vue b/frontend/src/views/case-management/caseReview/create.vue index fe0992e565..1958074000 100644 --- a/frontend/src/views/case-management/caseReview/create.vue +++ b/frontend/src/views/case-management/caseReview/create.vue @@ -132,7 +132,11 @@
{{ t('caseManagement.caseReview.selectedCases', { - count: isCopy ? reviewForm.caseCount : selectedAssociateCasesParams.selectIds.length, + count: isCopy + ? reviewForm.caseCount + : selectedAssociateCasesParams.selectAll + ? selectedAssociateCasesParams.totalCount + : selectedAssociateCasesParams.selectIds.length, }) }}