From bc6f15388d5e6218cf2e8ad1304a936e914f2f26 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 8 Nov 2024 17:47:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=86=E7=B1=BB=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/components/CriterionsConfig.vue      | 15 +++++++++++++--
 .../template/components/TableQsList.vue           | 11 +++++++++++
 .../reading-unit/components/QuestionsForm.vue     |  4 ++--
 .../reading-unit/components/TableQsForm.vue       |  4 ++--
 4 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index 484a8e3d..fba49f04 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -107,7 +107,7 @@
           <el-table-column
             prop="IsShowInDicom"
             label="是否在阅片页面显示"
-            width="140"
+            width="150"
             show-overflow-tooltip
           >
             <template slot-scope="scope">
@@ -132,7 +132,7 @@
               {{ $fd('GlobalReadingShowType', scope.row.GlobalReadingShowType) }}
             </template>
           </el-table-column>
-          <!-- 导出标识 -->
+          <!-- 导出标识 --> 
           <!-- <el-table-column
             prop="ExportIdentification"
             :label="$t('trials:readingUnit:qsList:title:ExportIdentification')"
@@ -143,6 +143,17 @@
               {{ $fd('ExportIdentification', scope.row.ExportIdentification) }}
             </template>
           </el-table-column> -->
+          <!-- 问题标识 -->
+          <el-table-column
+            prop="QuestionType"
+            label="问题标识"
+            width="140"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ $fd('QuestionType', scope.row.QuestionType) }}
+            </template>
+          </el-table-column>
           <!-- 导出目标表格 -->
           <el-table-column
             prop="ExportResult"
diff --git a/src/views/dictionary/template/components/TableQsList.vue b/src/views/dictionary/template/components/TableQsList.vue
index 651dcdb2..2a087a48 100644
--- a/src/views/dictionary/template/components/TableQsList.vue
+++ b/src/views/dictionary/template/components/TableQsList.vue
@@ -122,6 +122,17 @@
           {{ $fd('ExportIdentification', scope.row.ExportIdentification) }}
         </template>
       </el-table-column> -->
+      <!-- 问题标识 -->
+      <el-table-column
+        prop="QuestionMark"
+        label="问题标识"
+        width="140"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('QuestionMark', scope.row.QuestionMark) }}
+        </template>
+      </el-table-column>
       <!-- 导出目标表格 -->
       <el-table-column
         prop="ExportResult"
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 882c8799..737c672f 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -1142,7 +1142,7 @@ export default {
     }
     this.initForm()
     this.getBasicConfigSelect()
-    this.getCalculateQuestions(['number', 'select', 'radio', 'basicTable'])
+    this.getCalculateQuestions(['number', 'select', 'radio', 'class', 'basicTable'])
     // this.getTableQuestions()
     // this.getCalculateQuestions('number')
     // this.getCalculateQuestions('table')
@@ -1243,7 +1243,7 @@ export default {
         let res = await getCalculateQuestions(params)
         if (res.Result) {
           this.tableQuestions = res.Result.filter(i=>i.Type === 'basicTable')
-          this.selectQuestions = res.Result.filter(i=>i.Type === 'select' || i.Type === 'radio')
+          this.selectQuestions = res.Result.filter(i=>i.Type === 'select' || i.Type === 'radio' || i.Type === 'class')
           this.numberQuestions = res.Result.filter(i=>i.Type === 'number')
         }
       } catch(e) {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index 7f55b133..04dd00e2 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -980,7 +980,7 @@ export default {
       }
     }
     this.initForm()
-    this.getCalculateTableQuestions(['number', 'select', 'radio', 'basicTable'])
+    this.getCalculateTableQuestions(['number', 'select', 'radio', 'class', 'basicTable'])
     // this.getCalculateTableQuestions('number')
     // this.getCalculateTableQuestions('table')
   },
@@ -994,7 +994,7 @@ export default {
         let res = await getCalculateTableQuestions(params)
         if (res.Result) {
           this.tableQuestions = res.Result.filter(i=>i.Type === 'basicTable')
-          this.selectQuestions = res.Result.filter(i=>i.Type === 'select' || i.Type === 'radio')
+          this.selectQuestions = res.Result.filter(i=>i.Type === 'select' || i.Type === 'radio' || i.Type === 'class')
           this.numberQuestions = res.Result.filter(i=>i.Type === 'number')
         }
       } catch(e) {