From 7a6bac4c6cb938323e4f4cc6e67c99f1fefc4b05 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Jan 2024 14:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E6=8E=A7=E5=88=B6=E6=8C=87=E5=AE=9A=E5=88=97=E6=98=BE?=
 =?UTF-8?q?=E9=9A=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../global-review/components/IRecistTable.vue       |  3 ++-
 .../global-review/components/LuganoTable.vue        |  5 +++--
 .../reading/global-review/components/PCWG3Table.vue |  4 ++--
 .../global-review/components/RecistBMTable.vue      |  3 ++-
 .../global-review/components/RecistTable.vue        |  3 ++-
 .../trials-panel/reading/global-review/index.vue    | 13 ++++++++-----
 6 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
index 7cf79fe3..3e9065d1 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
@@ -96,9 +96,10 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             show-overflow-tooltip
             :min-width="index === 3 ? '200' : '200'"
           >
diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
index 4ea91323..f0e0c245 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
@@ -88,9 +88,10 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             show-overflow-tooltip
             :min-width="index === 3 ? '200' : '200'"
           >
@@ -331,6 +332,7 @@ export default {
     ...mapGetters(['language'])
   },
   mounted() {
+    console.log(this.globalInfo)
     this.assessTypes = this.globalInfo.assessTypeList.filter(i => i.IsBaseLineUse === this.isBaseline)
   },
   methods: {
@@ -448,7 +450,6 @@ export default {
           }
         })
       }
-      console.log(this.globalForm)
     },
     getAssessType(v) {
       console.log(this.language)
diff --git a/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue b/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
index d93785ae..52392390 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
@@ -49,9 +49,10 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             :width="index > 0 ? '300' : '200'"
           >
             <template slot-scope="scope">
@@ -182,7 +183,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.globalInfo.adjustedQsList)
   },
   methods: {
     selectChange(v, row, index) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
index 6a2f6c5e..8687fb2e 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
@@ -96,9 +96,10 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             show-overflow-tooltip
             :min-width="index === 3 ? '200' : '200'"
           >
diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
index 4de01166..a38257c8 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
@@ -96,9 +96,10 @@
         <template>
           <el-table-column
             v-for="(qs,index) in globalInfo.adjustedQsList"
+            v-if="qs.isShow"
             :key="index"
             prop=""
-            :label="qs"
+            :label="qs.questionName"
             show-overflow-tooltip
             :min-width="index === 3 ? '200' : '200'"
           >
diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index 89440aeb..fd7bf318 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -257,19 +257,22 @@ export default {
                 evaluationQsList.push(qs.QuestionName)
               })
               qs.AfterQuestionList.map(qs => {
+                console.log(qs)
                 if (qs.GlobalAnswerType === 1 && (this.CriterionType === 10)) {
                   // 访视阅片备注
-                  adjustedQsList.push(this.$t('trials:globalReview:table:visitRemark'))
+                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:visitRemark'),isShow:true})
                 } else if (qs.GlobalAnswerType === 1 && (this.CriterionType !== 10)) {
                   // 全局阅片备注
-                  adjustedQsList.push(this.$t('trials:globalReview:table:globalRemark'))
+                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:globalRemark'),isShow:true})
                 } else if (qs.GlobalAnswerType === 3 && (this.CriterionType !== 10)) {
                   // 评估更新类型
-                  adjustedQsList.push(this.$t('trials:globalReview:table:updateType'))
+                  adjustedQsList.push({questionName:this.$t('trials:globalReview:table:updateType'),isShow:true})
                 } else {
-                  if(!(this.CriterionType === 2 && (qs.QuestionType !== 39 || qs.QuestionType !== 40 || qs.QuestionType !== 41))){
-                    adjustedQsList.push(qs.QuestionName)
+                  var isShow = true
+                  if(this.CriterionType === 2 && (qs.QuestionType === 39 || qs.QuestionType === 40 || qs.QuestionType === 41)){
+                    isShow = false
                   }
+                  adjustedQsList.push({questionName:qs.QuestionName,isShow:isShow})
                 }
               })
               qs.AgreeOrNot.map(qs => {