From aa1f4dae9be4d68c37ff1fe1760ca2465ee152db Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 19 Jun 2025 16:53:11 +0800
Subject: [PATCH] =?UTF-8?q?IVUS=E5=92=8COCT=E8=A1=A8=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=96=B0=E5=A2=9E=E9=9D=B6=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/IVUS/QuestionList.vue   | 282 ++++++++----------
 .../dicoms/components/OCT/QuestionList.vue    | 275 ++++++++---------
 2 files changed, 256 insertions(+), 301 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index 7fc3a390..2d163fcf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -8,39 +8,27 @@
           <span style="margin-left:5px;">{{ taskBlindName }}</span>
         </h3>
         <div v-if="readingTaskState < 2">
-          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
-            <i
-              class="el-icon-refresh-left"
-              @click="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 影像质量问题 -->
       <div class="lesions">
-        <Questions
-          ref="ecrf"
-          :question-form-change-state="true"
-          :question-form-change-num="0"
-          :is-qulity-issues="false"
-          :group-classify="1"
-        />
+        <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+          :group-classify="1" />
       </div>
-
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper"
+          style="margin-bottom: 10px">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <el-form
-              v-if="questions.length > 0"
-              :ref="`questions${index}`"
-              size="small"
-              :model="questionForm"
-            >
+            <el-form v-if="questions.length > 0" :ref="`questions${index}`" size="small" :model="questionForm">
               <div class="table-wrapper">
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
@@ -52,34 +40,25 @@
                       <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add',item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
                         <i class="el-icon-plus" />
                       </div>
                     </div>
 
                   </div>
-                  <el-table
-                    v-if="item.Type === 'basicTable' && item.TableQuestions"
-                    :ref="item.Id"
-                    :data="item.TableQuestions.Answers"
-                  >
+                  <el-table v-if="item.Type === 'basicTable' && item.TableQuestions" :ref="item.Id"
+                    :data="item.TableQuestions.Answers">
                     <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
                       <template slot-scope="scope">
                         {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
                       </template>
-                    </el-table-column> -->
+</el-table-column> -->
                     <!-- <el-table-column
                       type="index"
                       width="40px"
                     /> -->
-                    <el-table-column
-                      v-for="q of item.TableQuestions.Questions"
-                      :key="q.Id"
-                      :prop="q.Id"
-                      :label="q.QuestionName"
-                      show-overflow-tooltip
-                      :render-header="renderHeader"
-                    >
+                    <el-table-column v-for="q of item.TableQuestions.Questions" :key="q.Id" :prop="q.Id"
+                      :label="q.QuestionName" show-overflow-tooltip :render-header="renderHeader">
                       <template slot-scope="scope">
                         <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
                           {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
@@ -92,14 +71,10 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column
-                      v-if="readingTaskState < 2 && item.LesionType === 102"
-                      :label="$t('common:action:action')"
-                      width="90px"
-                      fixed="right"
-                    >
+                    <el-table-column v-if="readingTaskState < 2 && item.LesionType === 102"
+                      :label="$t('common:action:action')" width="90px" fixed="right">
                       <template slot-scope="scope">
-                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit',item, scope.$index)">
+                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
                         <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)">
@@ -111,41 +86,57 @@
 
                   <template v-else>
                     <!-- 数值 -->
-                    <el-form-item
-                      v-if="item.ShowQuestion!==2"
-                      :key="item.Id"
-                      :label="`${item.QuestionName}`"
-                      :prop="item.Id"
-                      :rules="[
-                        { required: (item.IsRequired === 0 || (item.IsRequired ===1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type!=='group' && item.Type!=='summary',
-                          message:['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
-                      ]"
-                    >
+                    <el-form-item v-if="item.ShowQuestion !== 2" :key="item.Id" :label="`${item.QuestionName}`"
+                      :prop="item.Id" :rules="[
+                        {
+                          required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
+                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                        },
+                      ]">
                       <!-- 数值类型 -->
-                      <template v-if="item.Type==='textarea'">
-                        <el-input
-                          v-model="questionForm[qs.Id]"
-                          type="textarea"
-                          :autosize="{ minRows: 2, maxRows: 4}"
-                          :disabled="!isCurrentTask || readingTaskState>=2"
-                          @change="((val)=>{formItemChange(val, qs)})"
-                        />
+                      <template v-if="item.Type === 'textarea'">
+                        <el-input v-model="questionForm[item.Id]" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+                          :disabled="!isCurrentTask || readingTaskState >= 2"
+                          @change="((val) => { formItemChange(val, item) })" />
+                      </template>
+                      <template v-if="item.Type === 'number'">
+                        <el-input-number v-model="questionForm[item.Id]"
+                          :disabled="!isCurrentTask || readingTaskState >= 2" :precision="0"
+                          @change="((val) => { formItemChange(val, item) })" />
+                      </template>
+                      <template v-if="item.Type === 'select'">
+                        <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
+                          @change="((val) => { formItemChange(val, item) })">
+                          <el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
+                            :label="dict.label" />
+                        </el-select>
                       </template>
                     </el-form-item>
+                    <template v-if="item.Childrens && item.Childrens.length > 0">
+                      <template v-for="child in item.Childrens">
+                        <el-form-item :key="child.Id"
+                          v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
+                          :label="`${child.QuestionName}`" :prop="child.Id" :rules="[
+                            {
+                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
+                              message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                            },
+                          ]">
+                          <template v-if="child.Type === 'input'">
+                            <el-input v-model="questionForm[child.Id]"
+                              :disabled="!isCurrentTask || readingTaskState >= 2"
+                              @change="((val) => { formItemChange(val, child) })" />
+                          </template>
+                        </el-form-item>
+                      </template>
+
+                    </template>
                   </template>
                 </div>
-                <div
-                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
-                  class="base-dialog-footer"
-                  style="text-align:right;margin-top:10px;"
-                >
+                <div v-if="isCurrentTask && readingTaskState < 2 && (qs.GroupClassify === 5 || qs.GroupClassify === 6)"
+                  class="base-dialog-footer" style="text-align:right;margin-top:10px;">
                   <!-- 保存 -->
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    :disabled="!formChanged"
-                    @click="handleSave(index)"
-                  >
+                  <el-button type="primary" size="mini" :disabled="!formChanged" @click="handleSave(index)">
                     {{ $t('common:button:save') }}
                   </el-button>
                 </div>
@@ -156,51 +147,21 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions
-        ref="ecrf2"
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="4"
-        style="margin-top:20px"
-      />
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+        :group-classify="4" style="margin-top:20px" />
 
       <!-- 评估结果 -->
-      <Questions
-        ref="ecrf3"
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="5"
-      />
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+        :group-classify="5" />
       <!-- 新增、编辑弹窗 -->
-      <el-dialog
-        v-if="addOrEdit.visible"
-        :visible.sync="addOrEdit.visible"
-        :close-on-click-modal="false"
-        :title="addOrEdit.title"
-        width="500px"
-      >
-        <el-form
-          ref="tableQsForm"
-          v-loading="loading"
-          :model="qsForm"
-          size="small"
-        >
-          <QuestionTableFormItem
-            v-for="item in qsList"
-            :key="item.Id"
-            :question="item"
-            :question-form="qsForm"
-            :reading-task-state="readingTaskState"
-            @setFormItemData="setFormItemData"
-            @resetFormItemData="resetFormItemData"
-          />
+      <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
+        :title="addOrEdit.title" width="500px">
+        <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
+          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
+            :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
+            @resetFormItemData="resetFormItemData" />
           <el-form-item style="text-align: right">
-            <el-button
-              size="small"
-              @click="addOrEdit.visible = false"
-            >
+            <el-button size="small" @click="addOrEdit.visible = false">
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -211,17 +172,9 @@
         </el-form>
       </el-dialog>
       <!-- 导入 -->
-      <el-dialog
-        v-if="upload.visible"
-        :visible.sync="upload.visible"
-        :close-on-click-modal="false"
-        :title="upload.title"
-        width="500px"
-      >
-        <UploadExcel
-          :visit-task-id="visitTaskId"
-          @close="uploadDlgClose"
-        />
+      <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
+        :title="upload.title" width="500px">
+        <UploadExcel :visit-task-id="visitTaskId" @close="uploadDlgClose" />
       </el-dialog>
     </div>
   </div>
@@ -485,8 +438,11 @@ export default {
     setMeasuredData(measureData) {
 
     },
-    formItemChange() {
+    formItemChange(val, item) {
       this.formChanged = true
+      if (item.Type === 'number') {
+        this.limitBlur(item.Id, item.ValueType)
+      }
     },
     limitBlur(qId, valueType) {
       const value = this.questionForm[qId]
@@ -523,7 +479,7 @@ export default {
         answers: answers
       }
       try {
-        await saveTaskQuestion(8, params)
+        await saveTaskQuestion(12, params)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         loading.close()
         DicomEvent.$emit('getReportInfo', true)
@@ -730,21 +686,25 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
-  .container{
+
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -752,14 +712,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     display: inline-block;
     padding: 5px;
     font-weight: bold;
@@ -769,103 +731,123 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
-    ::v-deep .el-form-item__label{
+
+    ::v-deep .el-form-item__label {
       color: #c3c3c3;
       text-align: left;
     }
-    ::v-deep .el-input .el-input__inner{
+
+    ::v-deep .el-input .el-input__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-textarea__inner{
+
+    ::v-deep .el-textarea__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-form-item{
+
+    ::v-deep .el-form-item {
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
     }
-    ::v-deep .el-form-item__content{
+
+    ::v-deep .el-form-item__content {
       flex: 1;
     }
-    ::v-deep .el-input.is-disabled .el-input__inner{
-      background-color: #646464a1;
-    }
-    ::v-deep .el-select.is-disabled .el-input__inner{
+
+    ::v-deep .el-input.is-disabled .el-input__inner {
       background-color: #646464a1;
     }
 
-    .el-form-item__content
-    .el-select{
+    ::v-deep .el-select.is-disabled .el-input__inner {
+      background-color: #646464a1;
+    }
+
+    .el-form-item__content .el-select {
       width: 100%;
     }
   }
+
   .table-wrapper {
     ::-webkit-scrollbar {
       width: 5px;
       height: 8px;
     }
+
     ::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: #d0d0d0;
     }
+
     ::v-deep .el-table,
     .el-table__expanded-cell {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table th,
     .el-table tr {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
-    ::v-deep .el-table__body tr > td {
+
+    ::v-deep .el-table__body tr>td {
       background-color: #000 !important;
       color: #fff;
       border-color: #444444;
     }
-    ::v-deep .el-table__body tr:hover > td {
+
+    ::v-deep .el-table__body tr:hover>td {
       background-color: #858282 !important;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table--border th.gutter:last-of-type {
       border: none;
     }
+
     ::v-deep .el-table__fixed-right {
       height: 100% !important;
     }
+
     // ::v-deep .el-table .cell {
     //   line-height: 20px;
     // }
     ::v-deep .el-table__cell {
       padding: 5px 0;
     }
+
     ::v-deep.el-table__fixed-right-patch {
       background-color: #000 !important;
       border-color: #444444;
     }
-    ::v-deep.el-table__fixed-body-wrapper tr:hover > td {
+
+    ::v-deep.el-table__fixed-body-wrapper tr:hover>td {
       background-color: #000 !important;
     }
+
     ::v-deep.el-table--scrollable-x .el-table__body-wrapper {
       z-index: 2;
     }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index ef0a04dc..4f43d990 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -7,39 +7,28 @@
           <span style="margin-left:5px;">{{ taskBlindName }}</span>
         </h3>
         <div v-if="readingTaskState < 2">
-          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
-            <i
-              class="el-icon-refresh-left"
-              @click="resetMeasuredData"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 影像质量问题 -->
       <div class="lesions">
-        <Questions
-          ref="ecrf"
-          :question-form-change-state="true"
-          :question-form-change-num="0"
-          :is-qulity-issues="false"
-          :group-classify="1"
-        />
+        <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+          :group-classify="1" />
       </div>
 
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper"
+          style="margin-bottom: 10px">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <el-form
-              v-if="questions.length > 0"
-              :ref="`questions${index}`"
-              size="small"
-              :model="questionForm"
-            >
+            <el-form v-if="questions.length > 0" :ref="`questions${index}`" size="small" :model="questionForm">
               <div class="table-wrapper">
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
@@ -51,35 +40,25 @@
                       <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add',item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
                         <i class="el-icon-plus" />
                       </div>
                     </div>
 
                   </div>
-                  <el-table
-                    v-if="item.Type === 'basicTable' && item.TableQuestions"
-                    :ref="item.Id"
-                    :data="item.TableQuestions.Answers"
-                    max-height="600"
-                  >
+                  <el-table v-if="item.Type === 'basicTable' && item.TableQuestions" :ref="item.Id"
+                    :data="item.TableQuestions.Answers" max-height="600">
                     <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
                       <template slot-scope="scope">
                         {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
                       </template>
-                    </el-table-column> -->
+</el-table-column> -->
                     <!-- <el-table-column
                       type="index"
                       width="40px"
                     /> -->
-                    <el-table-column
-                      v-for="q of item.TableQuestions.Questions"
-                      :key="q.Id"
-                      :prop="q.Id"
-                      :label="q.QuestionName"
-                      show-overflow-tooltip
-                      :render-header="renderHeader"
-                    >
+                    <el-table-column v-for="q of item.TableQuestions.Questions" :key="q.Id" :prop="q.Id"
+                      :label="q.QuestionName" show-overflow-tooltip :render-header="renderHeader">
                       <template slot-scope="scope">
                         <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
                           {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
@@ -92,17 +71,14 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column
-                      v-if="readingTaskState < 2"
-                      :label="$t('common:action:action')"
-                      width="90px"
-                      fixed="right"
-                    >
+                    <el-table-column v-if="readingTaskState < 2" :label="$t('common:action:action')" width="90px"
+                      fixed="right">
                       <template slot-scope="scope">
-                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit',item, scope.$index)">
+                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
-                        <el-button v-if="item.LesionType === 112 || item.LesionType === 111" type="text" size="mini" @click="handleDelete(item, scope.$index)">
+                        <el-button v-if="item.LesionType === 112 || item.LesionType === 111" type="text" size="mini"
+                          @click="handleDelete(item, scope.$index)">
                           {{ $t('common:button:delete') }}
                         </el-button>
                       </template>
@@ -111,41 +87,52 @@
 
                   <template v-else>
                     <!-- 数值 -->
-                    <el-form-item
-                      v-if="item.ShowQuestion!==2"
-                      :key="item.Id"
-                      :label="`${item.QuestionName}`"
-                      :prop="item.Id"
-                      :rules="[
-                        { required: (item.IsRequired === 0 || (item.IsRequired ===1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type!=='group' && item.Type!=='summary',
-                          message:['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
-                      ]"
-                    >
+                    <el-form-item v-if="item.ShowQuestion !== 2" :key="item.Id" :label="`${item.QuestionName}`"
+                      :prop="item.Id" :rules="[
+                        {
+                          required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
+                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                        },
+                      ]">
                       <!-- 数值类型 -->
-                      <template v-if="item.Type==='textarea'">
-                        <el-input
-                          v-model="questionForm[qs.Id]"
-                          type="textarea"
-                          :autosize="{ minRows: 2, maxRows: 4}"
-                          :disabled="!isCurrentTask || readingTaskState>=2"
-                          @change="((val)=>{formItemChange(val, qs)})"
-                        />
+                      <template v-if="item.Type === 'textarea'">
+                        <el-input v-model="questionForm[item.Id]" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+                          :disabled="!isCurrentTask || readingTaskState >= 2"
+                          @change="((val) => { formItemChange(val, item) })" />
+                      </template>
+                      <template v-if="item.Type === 'select'">
+                        <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
+                          @change="((val) => { formItemChange(val, item) })">
+                          <el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
+                            :label="dict.label" />
+                        </el-select>
                       </template>
                     </el-form-item>
+                    <template v-if="item.Childrens && item.Childrens.length > 0">
+                      <template v-for="child in item.Childrens">
+                        <el-form-item :key="child.Id"
+                          v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
+                          :label="`${child.QuestionName}`" :prop="child.Id" :rules="[
+                            {
+                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
+                              message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                            },
+                          ]">
+                          <template v-if="child.Type === 'input'">
+                            <el-input v-model="questionForm[child.Id]"
+                              :disabled="!isCurrentTask || readingTaskState >= 2"
+                              @change="((val) => { formItemChange(val, child) })" />
+                          </template>
+                        </el-form-item>
+                      </template>
+
+                    </template>
                   </template>
                 </div>
-                <div
-                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
-                  class="base-dialog-footer"
-                  style="text-align:right;margin-top:10px;"
-                >
+                <div v-if="isCurrentTask && readingTaskState < 2 && (qs.GroupClassify === 5 || qs.GroupClassify === 6)"
+                  class="base-dialog-footer" style="text-align:right;margin-top:10px;">
                   <!-- 保存 -->
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    :disabled="!formChanged"
-                    @click="handleSave(index)"
-                  >
+                  <el-button type="primary" size="mini" :disabled="!formChanged" @click="handleSave(index)">
                     {{ $t('common:button:save') }}
                   </el-button>
                 </div>
@@ -156,50 +143,20 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions
-        ref="ecrf2"
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="4"
-        style="margin-top:20px"
-      />
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+        :group-classify="4" style="margin-top:20px" />
 
       <!-- 评估结果 -->
-      <Questions
-        ref="ecrf3"
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="5"
-      />
-      <el-dialog
-        v-if="addOrEdit.visible"
-        :visible.sync="addOrEdit.visible"
-        :close-on-click-modal="false"
-        :title="addOrEdit.title"
-        width="500px"
-      >
-        <el-form
-          ref="tableQsForm"
-          v-loading="loading"
-          :model="qsForm"
-          size="small"
-        >
-          <QuestionTableFormItem
-            v-for="item in qsList"
-            :key="item.Id"
-            :question="item"
-            :question-form="qsForm"
-            :reading-task-state="readingTaskState"
-            @setFormItemData="setFormItemData"
-            @resetFormItemData="resetFormItemData"
-          />
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+        :group-classify="5" />
+      <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
+        :title="addOrEdit.title" width="500px">
+        <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
+          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
+            :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
+            @resetFormItemData="resetFormItemData" />
           <el-form-item style="text-align: right">
-            <el-button
-              size="small"
-              @click="addOrEdit.visible = false"
-            >
+            <el-button size="small" @click="addOrEdit.visible = false">
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -210,18 +167,9 @@
         </el-form>
       </el-dialog>
       <!-- 导入 -->
-      <el-dialog
-        v-if="upload.visible"
-        :visible.sync="upload.visible"
-        :close-on-click-modal="false"
-        :title="upload.title"
-        width="500px"
-      >
-        <UploadExcel
-          :visit-task-id="visitTaskId"
-          :lesion-type="upload.lesionType"
-          @close="uploadDlgClose"
-        />
+      <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
+        :title="upload.title" width="500px">
+        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" @close="uploadDlgClose" />
       </el-dialog>
     </div>
   </div>
@@ -521,7 +469,7 @@ export default {
         answers: answers
       }
       try {
-        await saveTaskQuestion(8, params)
+        await saveTaskQuestion(12, params)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         loading.close()
         DicomEvent.$emit('getReportInfo', true)
@@ -741,23 +689,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
   // overflow: hidden;
 
-  .container{
+  .container {
     padding: 10px;
-    .basic-info{
+
+    .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      h3{
+
+      h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
-      i{
+
+      i {
         color: #fff;
         font-size: 22px;
         font-weight: bold;
@@ -765,14 +716,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     display: inline-block;
     padding: 5px;
     font-weight: bold;
@@ -782,103 +735,123 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
-  .add-icon:hover{
+
+  .add-icon:hover {
     background-color: #607d8b;
   }
 
-  .flex-row{
+  .flex-row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     background-color: #424242;
 
   }
-  .lesion_list{
+
+  .lesion_list {
     position: relative;
-    ::v-deep .el-form-item__label{
+
+    ::v-deep .el-form-item__label {
       color: #c3c3c3;
       text-align: left;
     }
-    ::v-deep .el-input .el-input__inner{
+
+    ::v-deep .el-input .el-input__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-textarea__inner{
+
+    ::v-deep .el-textarea__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-form-item{
+
+    ::v-deep .el-form-item {
       display: flex;
       flex-direction: column;
       justify-content: flex-start;
     }
-    ::v-deep .el-form-item__content{
+
+    ::v-deep .el-form-item__content {
       flex: 1;
     }
-    ::v-deep .el-input.is-disabled .el-input__inner{
-      background-color: #646464a1;
-    }
-    ::v-deep .el-select.is-disabled .el-input__inner{
+
+    ::v-deep .el-input.is-disabled .el-input__inner {
       background-color: #646464a1;
     }
 
-    .el-form-item__content
-    .el-select{
+    ::v-deep .el-select.is-disabled .el-input__inner {
+      background-color: #646464a1;
+    }
+
+    .el-form-item__content .el-select {
       width: 100%;
     }
   }
+
   .table-wrapper {
     ::-webkit-scrollbar {
       width: 5px;
       height: 8px;
     }
+
     ::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: #d0d0d0;
     }
+
     ::v-deep .el-table,
     .el-table__expanded-cell {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table th,
     .el-table tr {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
-    ::v-deep .el-table__body tr > td {
+
+    ::v-deep .el-table__body tr>td {
       background-color: #000 !important;
       color: #fff;
       border-color: #444444;
     }
-    ::v-deep .el-table__body tr:hover > td {
+
+    ::v-deep .el-table__body tr:hover>td {
       background-color: #858282 !important;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table--border th.gutter:last-of-type {
       border: none;
     }
+
     ::v-deep .el-table__fixed-right {
       height: 100% !important;
     }
+
     // ::v-deep .el-table .cell {
     //   line-height: 20px;
     // }
     ::v-deep .el-table__cell {
       padding: 5px 0;
     }
+
     ::v-deep.el-table__fixed-right-patch {
       background-color: #000 !important;
       border-color: #444444;
     }
-    ::v-deep.el-table__fixed-body-wrapper tr:hover > td {
+
+    ::v-deep.el-table__fixed-body-wrapper tr:hover>td {
       background-color: #000 !important;
     }
+
     ::v-deep.el-table--scrollable-x .el-table__body-wrapper {
       z-index: 2;
     }