From 41fa8c8839a0e3810e49496bbbf3738d534c345b Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 29 Jul 2022 15:18:33 +0800
Subject: [PATCH] =?UTF-8?q?fix(=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=E4=B8=AD=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E7=8A=B6=E6=80=81=E4=B8=8E=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E7=9A=84=E7=8A=B6=E6=80=81=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1015533 --user=陈建星 【测试跟踪】用例评审，评审通过的用例，在新评审中评审的时候还是通过状态 https://www.tapd.cn/55049933/s/1215445
---
 .../components/TestReviewTestCaseExecute.vue       |  8 ++++----
 .../view/components/TestReviewTestCaseEdit.vue     | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/frontend/src/business/components/track/review/components/TestReviewTestCaseExecute.vue b/frontend/src/business/components/track/review/components/TestReviewTestCaseExecute.vue
index 5abf3bb4c4..a795c73f23 100644
--- a/frontend/src/business/components/track/review/components/TestReviewTestCaseExecute.vue
+++ b/frontend/src/business/components/track/review/components/TestReviewTestCaseExecute.vue
@@ -2,13 +2,13 @@
   <el-card class="executeCard">
     <div class="status-bnt">
       <el-button type="success" size="mini"
-                 :disabled="isReadOnly" :icon="testCase.reviewStatus === 'Pass' ? 'el-icon-check' : ''"
+                 :disabled="isReadOnly" :icon="testCase.status === 'Pass' ? 'el-icon-check' : ''"
                  @click="changeStatus('Pass')">
         {{ $t('test_track.review.pass') }}
       </el-button>
       <el-button type="danger" size="mini"
                  :disabled="isReadOnly"
-                 :icon="testCase.reviewStatus === 'UnPass' ? 'el-icon-check' : ''"
+                 :icon="testCase.status === 'UnPass' ? 'el-icon-check' : ''"
                  @click="changeStatus('UnPass')">
         {{ $t('test_track.review.un_pass') }}
       </el-button>
@@ -43,14 +43,14 @@ export default {
   methods: {
     saveCase() {
       // 从其他状态改成失败才需要写评论
-      if (this.testCase.reviewStatus === 'UnPass' && this.originStatus !== 'UnPass' && !this.testCase.comment) {
+      if (this.testCase.status === 'UnPass' && this.originStatus !== 'UnPass' && !this.testCase.comment) {
         this.$refs.comment.inputLight();
       } else {
         this.$emit('saveCase');
       }
     },
     changeStatus(status) {
-      this.testCase.reviewStatus = status;
+      this.testCase.status = status;
     }
   }
 }
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 9efdb60f07..41d822a019 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
@@ -292,16 +292,16 @@ export default {
       param.caseId = this.testCase.caseId;
       param.reviewId = this.testCase.reviewId;
       param.comment = this.testCase.comment;
-      param.status = this.testCase.reviewStatus;
+      param.status = this.testCase.status;
       this.$post('/test/review/case/edit', param, () => {
         this.$success(this.$t('commons.save_success'));
         this.updateTestCases(param);
         this.setReviewStatus(this.testCase.reviewId);
 
         // 修改当前用例在整个用例列表的状态
-        this.testCases[this.index].reviewStatus = this.testCase.reviewStatus;
+        this.testCases[this.index].status = this.testCase.status;
         // 切换状态后需要修改旧的状态
-        this.oldReviewStatus = this.testCase.reviewStatus;
+        this.oldReviewStatus = this.testCase.status;
 
         if (this.testCase.comment) {
           this.$refs.comment.getComments();
@@ -311,7 +311,7 @@ export default {
     },
     saveCaseReview() {
       let param = {};
-      let status = this.testCase.reviewStatus;
+      let status = this.testCase.status;
       param.id = this.testCase.id;
       param.caseId = this.testCase.caseId;
       param.reviewId = this.testCase.reviewId;
@@ -321,7 +321,7 @@ export default {
         this.setReviewStatus(this.testCase.reviewId);
         this.oldReviewStatus = status;
         // 修改当前用例在整个用例列表的状态
-        this.testCases[this.index].reviewStatus = status;
+        this.testCases[this.index].status = status;
         if (this.index < this.testCases.length - 1) {
           this.handleNext();
         }
@@ -381,7 +381,7 @@ export default {
         parseCustomField(item, this.testCaseTemplate, null, buildTestCaseOldFields(item));
         this.isCustomFiledActive = true;
         this.testCase = item;
-        this.oldReviewStatus = this.testCase.reviewStatus;
+        this.oldReviewStatus = this.testCase.status;
         if (!this.testCase.actualResult) {
           // 如果没值,使用模板的默认值
           this.testCase.actualResult = this.testCaseTemplate.actualResult;
@@ -405,7 +405,7 @@ export default {
     openTestCaseEdit(testCase, tableData) {
       this.showDialog = true;
       // 一开始加载时候需要保存用例评审旧的状态
-      this.oldReviewStatus = testCase.reviewStatus;
+      this.oldReviewStatus = testCase.status;
       this.activeTab = 'detail';
       this.hasTapdId = false;
       this.hasZentaoId = false;