From 24217c96c83b2e9df658c7215b6c52728cfe5e83 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 19 Oct 2020 17:30:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E8=AF=84=E5=AE=A1=E9=A1=B5=E9=9D=A2=E6=A0=87?=
 =?UTF-8?q?=E6=98=8E=E8=AF=84=E5=AE=A1=E7=BB=93=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TestReviewTestCaseService.java       |  6 ------
 .../review/view/components/TestReviewTestCaseEdit.vue  | 10 ++++++++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
index 89362dca7e..ab6d852dfe 100644
--- a/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
@@ -110,12 +110,6 @@ public class TestReviewTestCaseService {
             MSException.throwException("非此用例的评审人员！");
         }
 
-        TestCaseReview testCaseReview = testCaseReviewMapper.selectByPrimaryKey(reviewId);
-        Long endTime = testCaseReview.getEndTime();
-        if (System.currentTimeMillis() > endTime) {
-            MSException.throwException("此用例评审已到截止时间！");
-        }
-
         // 记录测试用例评审状态变更
         testCaseReviewTestCase.setStatus(testCaseReviewTestCase.getStatus());
         testCaseReviewTestCase.setReviewer(SessionUtils.getUser().getId());
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
index b03372812f..500004fbdf 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -38,10 +38,12 @@
                                  @click="handleNext()"/>
                       <el-divider direction="vertical"></el-divider>
 
-                      <el-button type="success" size="mini" :disabled="isReadOnly" plain @click="saveCase('Pass')">
+                      <el-button type="success" size="mini"
+                                 :disabled="isReadOnly" :plain="testCase.reviewStatus !== 'Pass'" @click="saveCase('Pass')">
                         {{ $t('test_track.review.pass') }}
                       </el-button>
-                      <el-button type="danger" size="mini" :disabled="isReadOnly" plain @click="saveCase('UnPass')">
+                      <el-button type="danger" size="mini"
+                                 :disabled="isReadOnly" :plain="testCase.reviewStatus !== 'UnPass'" @click="saveCase('UnPass')">
                         {{ $t('test_track.review.un_pass') }}
                       </el-button>
                     </el-col>
@@ -290,6 +292,10 @@ export default {
         this.$success(this.$t('commons.save_success'));
         this.updateTestCases(param);
         this.setReviewStatus(this.testCase.reviewId);
+        // 修改当前用例的评审状态
+        this.testCase.reviewStatus = status;
+        // 修改当前用例在整个用例列表的状态
+        this.testCases[this.index].reviewStatus = status;
       });
     },
     updateTestCases(param) {