From a3e544f6e495a02ea75d0f1d83f61baac2a009c9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 15 Oct 2024 15:30:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E6=A0=87=E5=87=86=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AECRF=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/dictionary.js                         |  16 +
 .../template/components/CriterionFormItem.vue |   2 +-
 .../components/CriterionQuestionForm.vue      | 719 ++++++++++-------
 .../template/components/CriterionsConfig.vue  |   4 +-
 .../template/components/TableQsForm.vue       | 485 +++++++-----
 .../customize/CustomizeQuestionFormItem.vue   |   6 +-
 .../customize/CustomizeQuestionsPreview.vue   |  22 +-
 .../dicoms/customize/CustomizeReportPage.vue  |  12 +-
 .../components/QuestionFormItem.vue           |  12 +-
 .../components/QuestionTableFormItem.vue      |  22 +-
 .../reading-unit/components/QuestionsForm.vue | 744 ++++++++++--------
 .../components/QuestionsPreview.vue           |   1 -
 .../reading-unit/components/TableQsForm.vue   | 440 +++++++----
 13 files changed, 1471 insertions(+), 1014 deletions(-)

diff --git a/src/api/dictionary.js b/src/api/dictionary.js
index 3a45df78..99be1f16 100644
--- a/src/api/dictionary.js
+++ b/src/api/dictionary.js
@@ -1045,4 +1045,20 @@ export function getExploreRecommentInfo(params) {
     method: 'get',
     params
   })
+}
+
+export function getSystemCalculateQuestions(params) {
+  return request({
+    url: `/ReadingQuestion/getSystemCalculateQuestions`,
+    method: 'post',
+    data: params
+  })
+}
+
+export function getSystemCalculateTableQuestions(params) {
+  return request({
+    url: `/ReadingQuestion/getSystemCalculateTableQuestions`,
+    method: 'post',
+    data: params
+  })
 }
\ No newline at end of file
diff --git a/src/views/dictionary/template/components/CriterionFormItem.vue b/src/views/dictionary/template/components/CriterionFormItem.vue
index efb01afe..16b7dfd4 100644
--- a/src/views/dictionary/template/components/CriterionFormItem.vue
+++ b/src/views/dictionary/template/components/CriterionFormItem.vue
@@ -13,7 +13,7 @@
       {{ question.GroupName }}
     </div>
     <div
-      v-else-if="question.Type==='table'"
+      v-else-if="question.Type==='table' || question.Type==='basicTable'"
       style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
     >
       {{ question.QuestionName }}
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 76512d45..0c3579c6 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -6,9 +6,10 @@
     size="small"
     :rules="rules"
     :disabled="type === 'look'"
-    label-width="130px"
+    label-width="140px"
   >
     <div class="base-dialog-body">
+      <!-- 类型 -->
       <el-form-item label="类型" prop="Type">
         <el-select
           v-model="form.Type"
@@ -27,6 +28,7 @@
           />
         </el-select>
       </el-form-item>
+      <!-- 分组名称 -->
       <el-form-item
         v-if="form.Type === 'group'"
         label="分组名称"
@@ -34,20 +36,7 @@
       >
         <el-input v-model="form.GroupName" />
       </el-form-item>
-      <el-form-item
-        label="分组标识"
-        v-if="form.Type === 'group'"
-        prop="GroupClassify"
-      >
-        <el-select v-model="form.GroupClassify" clearable>
-          <el-option
-            v-for="item of groupClassifyList"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="item.ValueCN"
-          />
-        </el-select>
-      </el-form-item>
+      
       <el-form-item
         v-if="form.Type === 'group'"
         label="分组名称（EN）"
@@ -70,185 +59,21 @@
       >
         <el-input v-model="form.QuestionEnName" />
       </el-form-item>
-      <!-- 数值类型 -->
-      <el-form-item
-        v-if="form.Type === 'number' || form.Type === 'calculation'"
-        label="数值类型"
-        prop="ValueType"
-        :rules="[{ required: true, message: '请选择' }]"
-      >
-        <el-radio-group v-model="form.ValueType">
-          <el-radio
-            v-for="item of $d.ValueType"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <!-- 数值单位 -->
-      <el-form-item
-        v-if="form.Type === 'number' || form.Type === 'calculation'"
-        label="单位"
-      >
-        <el-radio-group v-model="form.Unit">
-          <el-radio
-            v-for="item of $d.ValueUnit"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'table'"
-        label="表格类型标识"
-        prop="LesionType"
-      >
-        <el-select v-model="form.LesionType" clearable>
-          <el-option
-            v-for="item of lesionTypes"
-            :key="item.Code"
-            :value="parseInt(item.Code)"
-            :label="$fd('LesionType', parseInt(item.Code))"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'basicTable'"
-        label="表格类型标识"
-        prop="LesionType"
-      >
-        <el-select v-model="form.LesionType" clearable>
-          <el-option
-            v-for="item of lesionTypeList"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="item.ValueCN"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- <el-form-item
-        v-if="form.Type === 'select' || form.Type === 'radio'"
-        label="选项"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          placeholder="选项请用‘|’分割多个选项"
-        />
-      </el-form-item> -->
-      <!-- 选项类型 -->
-      <el-form-item
-        v-if="
-          form.Type === 'select' ||
-          form.Type === 'radio' ||
-          form.Type === 'calculation'
-        "
-        label="选项类型"
-        prop="QuestionGenre"
-        :rules="[{ required: form.Type !== 'calculation', message: '请选择' }]"
-      >
-        <el-radio-group
-          v-model="form.QuestionGenre"
-          @change="
-            (val) => {
-              questionGenreChange(val, form)
-            }
-          "
-        >
-          <el-radio :label="-1"> 无 </el-radio>
-          <el-radio
-            v-for="item of $d.TableQuestionType"
-            v-show="item.value === 0 || item.value === 3"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item
-        v-if="form.QuestionGenre === 0"
-        label="选项"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          placeholder="选项请用‘|’分割多个选项"
-        />
-      </el-form-item>
-      <el-form-item label="问题分类" v-if="form.Type !== 'group'">
-        <!-- <el-radio-group v-model="form.QuestionClassify">
-          <el-radio v-for="item of $d.QuestionClassify" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group> -->
-        <el-select v-model="form.QuestionClassify" clearable>
-          <el-option
-            v-for="item of $d.QuestionClassify"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="转化显示类型" prop="ConvertShowType">
-        <el-radio-group v-model="form.ConvertShowType">
-          <el-radio
-            v-for="item of $d.ConvertShowType"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 3"
-        label="关联字典"
-        prop="DictionaryCode"
-      >
+      <el-divider content-position="left">公有属性</el-divider>
+      <el-form-item v-if="form.Type !== 'group'" label="问题分组">
         <el-select
-          v-model="form.DictionaryCode"
+          v-model="form.GroupId"
           clearable
-          @change="
-            () => {
-              form.DefaultValue = null
-            }
-          "
+          :disabled="isParentExistGroup"
         >
           <el-option
-            v-for="item of dicList"
-            :key="item.Id"
-            :label="item.Code"
-            :value="item.Code"
+            v-for="group of groupOptions"
+            :key="group.GroupId"
+            :label="group.GroupName"
+            :value="group.GroupId"
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
-        <el-select v-model="form.DefaultValue" clearable>
-          <el-option
-            v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value.toString()"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item v-if="form.QuestionGenre === 0" label="默认值">
-        <el-select v-model="form.DefaultValue" clearable>
-          <el-option
-            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
-
       <el-form-item
         v-if="form.Type !== 'group'"
         label="是否显示"
@@ -301,14 +126,6 @@
         label="显示触发值"
         prop="ParentTriggerValueList"
       >
-        <!--        <el-select v-model="form.ParentTriggerValue" clearable>-->
-        <!--          <el-option-->
-        <!--            v-for="item of parentTriggerValOptions"-->
-        <!--            :key="item.id"-->
-        <!--            :label="item.label"-->
-        <!--            :value="item.value.toString()"-->
-        <!--          />-->
-        <!--        </el-select>-->
         <el-select v-model="form.ParentTriggerValueList" clearable multiple>
           <el-option
             v-for="item of parentTriggerValOptions"
@@ -319,32 +136,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        v-if="
-          form.Type === 'select' ||
-          form.Type === 'radio' ||
-          form.Type === 'calculation' ||
-          form.Type === 'number'
-        "
-        label="是否裁判问题"
-      >
-        <el-radio-group
-          v-model="form.IsJudgeQuestion"
-          @change="
-            (val) => {
-              isJudgeQuestionChange(val, form)
-            }
-          "
-        >
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="`YesOrNo${item.value}`"
-            :label="item.value"
-            >{{ item.label }}</el-radio
-          >
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type !== 'group' && form.Type !== 'table'"
+        v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable'"
         label="是否必填"
         prop="IsRequired"
       >
@@ -396,14 +188,6 @@
         label="必填触发值"
         prop="RelevanceValueList"
       >
-        <!--        <el-select v-model="form.RelevanceValue" clearable>-->
-        <!--          <el-option-->
-        <!--            v-for="item of reParentTriggerValOptions"-->
-        <!--            :key="item.id"-->
-        <!--            :label="item.label"-->
-        <!--            :value="item.value.toString()"-->
-        <!--          />-->
-        <!--        </el-select>-->
         <el-select v-model="form.RelevanceValueList" clearable multiple>
           <el-option
             v-for="item of reParentTriggerValOptions"
@@ -413,49 +197,60 @@
           />
         </el-select>
       </el-form-item>
-
-      <!-- 父问题 -->
-      <!-- <el-form-item v-if="form.Type !== 'group'" label="父问题">
-        <el-select
-          v-model="form.ParentId"
-          clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
+      <el-form-item
+        v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation' ||
+          form.Type === 'number'
+        "
+        label="是否裁判问题"
+      >
+        <el-radio-group
+          v-model="form.IsJudgeQuestion"
+          @change="
+            (val) => {
+              isJudgeQuestionChange(val, form)
+            }
+          "
         >
-          <el-option
-            v-for="item of parentOptions"
-            :key="item.QuestionId"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item> -->
-      <!-- 父问题触发值 -->
-      <!-- <el-form-item v-if="form.ParentId" label="父问题触发值" prop="ParentTriggerValue">
-        <el-select v-model="form.ParentTriggerValue">
-          <el-option
-            v-for="item of parentTriggerValOptions"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item> -->
-
-      <el-form-item v-if="form.Type !== 'group'" label="问题分组">
-        <el-select
-          v-model="form.GroupId"
-          clearable
-          :disabled="isParentExistGroup"
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`YesOrNo${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出标识" prop="ExportIdentification">
+        <el-radio-group 
+          v-model="form.ExportIdentification"
+          @change="
+            (val) => {
+              form.ExportResult = []
+            }
+          "
         >
+          <el-radio
+            v-for="item of $d.ExportIdentification"
+            :key="`ExportIdentification${item.value}`"
+            :label="item.value"
+            >{{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="导出结果" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-select v-model="form.ExportResult" multiple>
           <el-option
-            v-for="group of groupOptions"
-            :key="group.GroupId"
-            :label="group.GroupName"
-            :value="group.GroupId"
-          />
+            v-for="item in $d.ExportResult"
+            :key="`ExportResult${item.value}`"
+            :label="item.value"
+            :value="item.label">
+          </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="限制编辑">
+      
+      <el-form-item label="限制编辑" v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'upload' || form.Type === 'number' || form.Type === 'screenshot'">
         <el-radio-group v-model="form.LimitEdit">
           <el-radio
             v-for="item of $d.LimitEdit"
@@ -489,20 +284,138 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item v-if="form.Type !== 'group'" label="是否必填">
-        <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion===true">
-          <el-radio :label="true">是</el-radio>
-          <el-radio :label="false">否</el-radio>
+      <el-form-item label="是否在阅片页面显示">
+        <el-radio-group v-model="form.IsShowInDicom">
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`YesOrNo${item.value}`"
+            :label="item.value"
+            >{{ item.label }}</el-radio
+          >
         </el-radio-group>
-      </el-form-item> -->
-      <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
+      </el-form-item>
+      <el-form-item
+        label="注释"
+        prop="Remark"
+      >
+        <el-input v-model="form.Remark" />
+      </el-form-item>
+      <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
-          v-model="form.ImageCount"
+          v-model="form.ShowOrder"
           controls-position="right"
-          :min="1"
-          :max="10"
+          :min="0"
         />
       </el-form-item>
+      <!-- 适用于Lugano 2014标准 -->
+      <el-form-item label="问题分类" v-if="form.Type !== 'group' && criterionType === 2">
+        <el-select v-model="form.QuestionClassify" clearable>
+          <el-option
+            v-for="item of $d.QuestionClassify"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+       <!-- 适用于iRECST标准 -->
+      <el-form-item label="转化显示类型" prop="ConvertShowType" v-if="criterionType === 3">
+        <el-radio-group v-model="form.ConvertShowType">
+          <el-radio
+            v-for="item of $d.ConvertShowType"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-divider content-position="left">私有属性</el-divider>
+      <el-form-item
+        v-if="
+          form.Type === 'select' ||
+          form.Type === 'radio' ||
+          form.Type === 'calculation'
+        "
+        label="选项类型"
+        prop="QuestionGenre"
+        :rules="[{ required: form.Type !== 'calculation', message: '请选择' }]"
+      >
+        <el-radio-group
+          v-model="form.QuestionGenre"
+          @change="
+            (val) => {
+              questionGenreChange(val, form)
+            }
+          "
+        >
+          <el-radio :label="-1"> 无 </el-radio>
+          <el-radio
+            v-for="item of $d.TableQuestionType"
+            v-show="item.value === 0 || item.value === 3"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-form-item
+        v-if="form.QuestionGenre === 0 || form.Type === 'class'"
+        label="选项"
+        prop="TypeValue"
+      >
+        <el-input
+          v-model="form.TypeValue"
+          placeholder="选项请用‘|’分割多个选项"
+          @change="typeValueChange"
+        />
+      </el-form-item>
+      
+      
+      <el-form-item
+        v-if="form.QuestionGenre === 3"
+        label="关联字典"
+        prop="DictionaryCode"
+      >
+        <el-select
+          v-model="form.DictionaryCode"
+          clearable
+          @change="
+            () => {
+              form.DefaultValue = null
+            }
+          "
+        >
+          <el-option
+            v-for="item of dicList"
+            :key="item.Id"
+            :label="item.Code"
+            :value="item.Code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="form.QuestionGenre === 3" label="默认值">
+        <el-select v-model="form.DefaultValue" clearable>
+          <el-option
+            v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="form.QuestionGenre === 0" label="默认值">
+        <el-select v-model="form.DefaultValue" clearable>
+          <el-option
+            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+            :key="item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item
         v-if="form.Type === 'select' || form.Type === 'radio'"
         label="高亮标记值"
@@ -527,17 +440,26 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item label="序号" prop="ShowOrder">
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
-        />
+      <el-form-item
+        label="分组标识"
+        v-if="form.Type === 'group'"
+        prop="GroupClassify"
+      >
+        <el-select v-model="form.GroupClassify" clearable>
+          <el-option
+            v-for="item of groupClassifyList"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="item.ValueCN"
+          />
+        </el-select>
       </el-form-item>
-      <el-form-item v-if="form.Type === 'table'" label="自增序号前缀">
-        <el-input v-model="form.OrderMark" />
+      <el-form-item 
+        v-if="form.Type === 'input' || form.Type === 'textarea'"
+        label="最大长度">
+        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
       </el-form-item>
-      <el-form-item v-if="form.Type === 'table'" label="最大行数">
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" label="最大行数">
         <el-input-number
           v-model="form.MaxQuestionCount"
           controls-position="right"
@@ -545,23 +467,162 @@
           :max="10"
         />
       </el-form-item>
-
-      <el-form-item label="是否在阅片页面显示">
-        <el-radio-group v-model="form.IsShowInDicom">
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" label="自增序号前缀">
+        <el-input v-model="form.OrderMark" />
+      </el-form-item>
+      
+      <!-- 数值类型 -->
+      <el-form-item
+        v-if="form.Type === 'number' || form.Type === 'calculation'"
+        label="数值类型"
+        prop="ValueType"
+        :rules="[{ required: true, message: '请选择' }]"
+      >
+        <el-radio-group v-model="form.ValueType">
           <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="`YesOrNo${item.value}`"
+            v-for="item of $d.ValueType"
+            :key="item.id"
             :label="item.value"
-            >{{ item.label }}</el-radio
           >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <!-- 数值单位 -->
+      <el-form-item
+        v-if="form.Type === 'number' || form.Type === 'calculation'"
+        label="单位"
+      >
+        <el-radio-group v-model="form.Unit">
+          <el-radio
+            v-for="item of $d.ValueUnit"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        :label="$t('trials:readingUnit:qsList:title:Remark')"
-        prop="Remark"
+        v-if="form.Type === 'table' || form.Type === 'basicTable'"
+        label="表格类型标识"
+        prop="LesionType"
       >
-        <el-input v-model="form.Remark" />
+        <el-select v-model="form.LesionType" clearable>
+          <el-option
+            v-for="item of lesionTypes"
+            :key="item.Code"
+            :value="parseInt(item.Code)"
+            :label="$fd('LesionType', parseInt(item.Code))"
+          />
+        </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'basicTable'"
+        label="表格类型标识"
+        prop="LesionType"
+      >
+        <el-select v-model="form.LesionType" clearable>
+          <el-option
+            v-for="item of lesionTypeList"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="item.ValueCN"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
+        <el-input-number
+          v-model="form.ImageCount"
+          controls-position="right"
+          :min="0"
+          :max="10"
+        />
+      </el-form-item>
+      <!-- 文件类型 -->
+      <el-form-item 
+        v-if="form.Type === 'upload'" 
+        label="文件类型"
+        prop="FileType"
+        :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      >
+        <el-checkbox-group
+          v-model="form.FileType"
+          @change="(v) => {
+            if (v && v.includes('-1')) {
+              form.FileType = ['-1']
+            }
+          }"
+        >
+          <el-checkbox
+            v-for="item of $d.fileType"
+            :key="`fileType${item.value}`"
+            :value="item.value + ''"
+            :label="item.value"
+            :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <!-- 分类 -->
+      <el-form-item
+        v-if="form.Type === 'class'"
+        label="分类数据来源"
+        prop="ClassifyQuestionId"
+      >
+        <el-select v-model="form.ClassifyQuestionId" clearable>
+          <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName"
+                     :value="item.QuestionId"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'class'"
+        label="分类算法"
+        prop="ClassifyAlgorithms"
+      >
+        <div>
+          <el-table
+            ref="CalculateTable"
+            :data="ClassifyAlgorithmsList"
+            style="margin: 10px;width: 100%"
+            size="small"
+          >
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:label')"
+              show-overflow-tooltip
+              min-width="70"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.label }}
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:gt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.gt"></el-input-number>
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:lt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.lt"></el-input-number>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-form-item>
+     
     </div>
 
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
@@ -596,10 +657,11 @@ import {
   getSystemGroupNameList,
   getCriterionDictionary,
   getCriterionDictionaryList,
+  getSystemCalculateQuestions
 } from '@/api/dictionary'
 import { getCriterionLesionType } from '@/api/trials'
 export default {
-  name: 'AddOrUpdateClinicalData',
+  name: 'CriterionQuestionForm',
   props: {
     data: {
       type: Object,
@@ -613,6 +675,14 @@ export default {
         return ''
       },
     },
+    criterionType: {
+      type: Number,
+      required: true
+    },
+    criterionId: {
+      type: String,
+      required: true
+    },
   },
   data() {
     var validateTypeVal = (rule, value, callback) => {
@@ -628,6 +698,7 @@ export default {
       }
     }
     return {
+      ClassifyAlgorithmsList: [],
       validateTypeVal: validateTypeVal,
       form: {
         Id: '',
@@ -651,7 +722,7 @@ export default {
         GroupEnName: '',
         GroupClassify: null,
         Remark: '',
-        ImageCount: 1,
+        ImageCount: 0,
         RelevanceId: '',
         RelevanceValue: '',
         RelevanceValueList: [],
@@ -667,6 +738,12 @@ export default {
         ConvertShowType: 0,
         QuestionClassify: null,
         HighlightAnswerList: [],
+        ExportIdentification: 0,
+        ExportResult: [],
+        MaxAnswerLength: 500,
+        FileType: [],
+        ClassifyQuestionId: null,
+        ClassifyAlgorithms: null,
       },
       rules: {
         Type: [{ required: true, message: '请选择', trigger: 'blur' }],
@@ -698,6 +775,12 @@ export default {
           { required: true, message: '请注明', trigger: 'blur' },
           { max: 50, message: '最大长度为 50' },
         ],
+        ExportIdentification: [
+          { required: true, message: '请选择', trigger: 'blur' },
+        ],
+        ExportResult: [
+          { required: true, message: '请选择', trigger: 'blur' },
+        ]
       },
       loading: false,
       btnLoading: false,
@@ -710,7 +793,8 @@ export default {
       CriterionDictionaryList: [],
       groupClassifyList: [],
       highlightAnswers: [],
-      lesionTypeList: []
+      lesionTypeList: [],
+      Questions: []
     }
   },
   watch: {
@@ -736,8 +820,32 @@ export default {
   },
   mounted() {
     this.initForm()
+    this.getCalculateQuestions('number')
   },
   methods: {
+    typeValueChange(v) {
+      this.form.DefaultValue = null
+      var list = v.split('|')
+      this.form.ClassifyAlgorithms = null
+      var arr = Object.assign([], this.ClassifyAlgorithmsList)
+      this.ClassifyAlgorithmsList = list.map((res, i) => {
+        return {
+          label: res,
+          lt: arr[i] ? arr[i].lt : 0,
+          gt: arr[i] ? arr[i].gt : 0
+        }
+      })
+    },
+    getCalculateQuestions(type) {
+      getSystemCalculateQuestions({
+        systemCriterionId: this.criterionId,
+        type: type
+      }).then(res => {
+        if (type === 'number') {
+          this.Questions = res.Result
+        }
+      })
+    },
     getCriterionDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
@@ -770,7 +878,13 @@ export default {
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
-            this.form[k] = this.data[k]
+            if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
+              this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
+            } else if(k === 'FileType'){
+              this.form[k] = this.data[k].split(',')
+            } else {
+              this.form[k] = this.data[k]
+            }
           }
         }
         if (
@@ -826,10 +940,13 @@ export default {
       this.$refs.clinicalDataForm.validate((valid) => {
         if (!valid) return
         this.btnLoading = true
+        this.form.ClassifyAlgorithms = JSON.stringify(this.ClassifyAlgorithmsList)
         if (this.form.Type !== 'upload') {
           this.form.ImageCount = 0
         }
-        addOrUpdateReadingQuestionSystem(this.form)
+        var params = Object.assign({}, this.form)
+        params.FileType = this.form.FileType.join(',')
+        addOrUpdateReadingQuestionSystem(params)
           .then((res) => {
             this.btnLoading = false
             this.$emit('getList')
@@ -905,7 +1022,7 @@ export default {
       if (val !== 'select' && val !== 'radio') {
         data.IsJudgeQuestion = false
       }
-      if (val === 'table') {
+      if (val === 'table' || val === 'basicTable') {
         data.IsRequired = 2
       } else {
         data.LesionType = null
@@ -916,7 +1033,7 @@ export default {
       data.Unit = ''
     },
     isShowQuestionChange(val, form) {
-      if (this.form.Type === 'table') return
+      if (this.form.Type === 'table' || this.form.Type === 'basicTable') return
       if (this.form.Type === 'group') {
         form.QuestionName = ''
         return
diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index ed7741cf..a8ce87a3 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -209,6 +209,8 @@
         ref="addOrEdit"
         :data="rowData"
         :type="type"
+        :criterionType="data.CriterionType"
+        :criterionId="data.Id"
         @close="addOrEdit.visible = false"
         @getList="getList"
       />
@@ -316,7 +318,7 @@ export default {
       }).catch(() => { this.loading = false })
     },
     handleAdd() {
-      this.rowData = { ReadingQuestionCriterionSystemId: this.criterionId, Id: '' }
+      this.rowData = { ReadingQuestionCriterionSystemId: this.criterionId, Id: ''}
       this.type = 'add'
       this.addOrEdit.title = '添加'
       this.addOrEdit.visible = true
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index b751763e..cc9237e5 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -6,7 +6,7 @@
     size="small"
     :disabled="type === 'look'"
     :rules="rules"
-    label-width="120px"
+    label-width="130px"
   >
     <div class="base-dialog-body">
       <el-form-item label="类型" prop="Type">
@@ -19,7 +19,7 @@
             :key="item.value"
             :value="item.value"
             :label="item.label"
-            :disabled="item.label === 'group' || item.label === 'table' || item.label === 'summary' || item.label === 'upload'"
+            :disabled="item.label === 'group' || item.label === 'table' || item.label === 'basicTable' || item.label === 'summary' || item.label === 'upload'"
           />
         </el-select>
       </el-form-item>
@@ -41,160 +41,7 @@
           v-model="form.QuestionEnName"
         />
       </el-form-item>
-      <!-- 选项类型 -->
-      <el-form-item
-        v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
-        label="选项类型"
-        prop="TableQuestionType"
-        :rules="[
-          { required: form.Type !== 'input', message: '请选择'}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.TableQuestionType"
-          @change="((val)=>{tableQuestionTypeChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.TableQuestionType"
-            :key="item.id"
-            :label="item.value"
-            :disabled="form.Type === 'radio' && (item.value===1 || item.value===2)"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item
-        v-if="form.TableQuestionType === 0"
-        label="选项"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          placeholder="选项请用‘|’分割多个选项"
-        />
-      </el-form-item>
-      <!-- 关联表 -->
-      <!-- <el-form-item
-        v-if="form.TableQuestionType === 1"
-        label="关联表"
-        prop="DataTableName"
-      >
-        <el-select
-          v-model="form.DataTableName"
-          clearable
-          @change="((val)=>{dataTableNameChange(val, form)})"
-        >
-          <el-option
-            v-for="item of tblOptions"
-            :key="`RelevanceId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item> -->
-      <el-form-item label="问题分类">
-        <!-- <el-radio-group v-model="form.QuestionClassify">
-          <el-radio v-for="item of $d.QuestionClassify" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group> -->
-        <el-select v-model="form.QuestionClassify" clearable>
-          <el-option
-            v-for="item of $d.QuestionClassify"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <!-- 数值类型 -->
-      <el-form-item
-        v-if="form.Type === 'number' || form.Type === 'calculation'"
-        label="数值类型"
-        prop="ValueType"
-        :rules="[
-          { required: true, message: '请选择'}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ValueType"
-        >
-          <el-radio
-            v-for="item of $d.ValueType"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <!-- 数值单位 -->
-      <el-form-item
-        v-if="form.Type === 'number' || form.Type === 'calculation'"
-        label="单位"
-      >
-        <el-radio-group
-          v-model="form.Unit"
-        >
-          <el-radio
-            v-for="item of $d.ValueUnit"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 关联字段 -->
-
-      <el-form-item
-        v-if="form.TableQuestionType === 2"
-        label="关联问题"
-        prop="DependParentId"
-      >
-        <el-select
-          v-model="form.DependParentId"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`DependParentId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.TableQuestionType === 1 || !!form.DependParentId"
-        label="关联字段"
-        prop="DataTableColumn"
-      >
-        <el-select v-model="form.DataTableColumn">
-          <el-option
-            v-for="item of CriterionDictionaryList.OrganColumn"
-            :key="item.Id"
-            :label="item.ValueCN"
-            :value="item.Code"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
-        label="关联字典"
-        prop="DictionaryCode"
-        :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
-      >
-        <el-select v-model="form.DictionaryCode">
-          <el-option
-            v-for="item of dicList"
-            :key="item.Id"
-            :label="item.Code"
-            :value="item.Code"
-          />
-        </el-select>
-      </el-form-item>
-
+      <el-divider content-position="left">公有属性</el-divider>
       <el-form-item v-if="form.Type !== 'group'" label="是否显示" prop="ShowQuestion">
         <el-radio-group
           v-model="form.ShowQuestion"
@@ -240,7 +87,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table'" label="是否必填" prop="IsRequired">
+      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary'" label="是否必填" prop="IsRequired">
         <el-radio-group
           v-model="form.IsRequired"
           :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
@@ -289,9 +136,13 @@
           />
         </el-select>
       </el-form-item>
-
+      <el-form-item label="限制编辑" v-if="form.Type !== 'summary'">
+        <el-radio-group v-model="form.LimitEdit">
+          <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item
-        v-if="form.Type !== 'group'"
+        v-if="form.Type !== 'group' && form.Type !== 'summary'"
         label="问题标识"
         prop="QuestionMark"
       >
@@ -306,15 +157,119 @@
           />
         </el-select>
       </el-form-item>
-
-      <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
+      <el-form-item
+        label="注释"
+        prop="Remark"
+      >
+        <el-input v-model="form.Remark" />
+      </el-form-item>
+      <el-form-item label="序号" prop="ShowOrder">
         <el-input-number
-          v-model="form.ImageCount"
+          v-model="form.ShowOrder"
           controls-position="right"
-          :min="1"
+          :min="0"
+        />
+      </el-form-item>
+      <el-form-item label="重复出现最大次数" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+        <el-input-number
+          v-model="form.MaxRowCount"
+          controls-position="right"
+          :min="0"
           :max="10"
         />
       </el-form-item>
+      <el-form-item label="问题分类">
+        <el-select v-model="form.QuestionClassify" clearable>
+          <el-option
+            v-for="item of $d.QuestionClassify"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      
+      <el-divider content-position="left">私有属性</el-divider>
+      <!-- 选项类型 -->
+      <el-form-item
+        v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
+        label="选项类型"
+        prop="TableQuestionType"
+        :rules="[
+          { required: form.Type !== 'input', message: '请选择'}
+        ]"
+      >
+        <el-radio-group
+          v-model="form.TableQuestionType"
+          @change="((val)=>{tableQuestionTypeChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.TableQuestionType"
+            :key="item.id"
+            :label="item.value"
+            :disabled="(form.Type === 'radio' && (item.value===1 || item.value===2)) || (form.Type === 'input' && (item.value===0 || item.value===3))"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <el-form-item
+        v-if="form.TableQuestionType === 0  || form.Type === 'class'"
+        label="选项"
+        prop="TypeValue"
+      >
+        <el-input
+          v-model="form.TypeValue"
+          placeholder="选项请用‘|’分割多个选项"
+          @change="typeValueChange"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="form.TableQuestionType === 2"
+        label="关联问题"
+        prop="DependParentId"
+      >
+        <el-select
+          v-model="form.DependParentId"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`DependParentId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.TableQuestionType === 1 || !!form.DependParentId"
+        label="关联字段"
+        prop="DataTableColumn"
+      >
+        <el-select v-model="form.DataTableColumn">
+          <el-option
+            v-for="item of CriterionDictionaryList.OrganColumn"
+            :key="item.Id"
+            :label="item.ValueCN"
+            :value="item.Code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2"
+        label="关联字典"
+        prop="DictionaryCode"
+        :rules="[{ required: form.TableQuestionType === 3, message: '请选择', trigger: 'blur' }]"
+      >
+        <el-select v-model="form.DictionaryCode">
+          <el-option
+            v-for="item of dicList"
+            :key="item.Id"
+            :label="item.Code"
+            :value="item.Code"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="高亮标记值" prop="HighlightAnswerList">
         <el-select v-model="form.HighlightAnswerList" clearable multiple>
           <template v-if="form.TypeValue">
@@ -335,31 +290,146 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item label="序号" prop="ShowOrder">
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
+      <el-form-item 
+        v-if="form.Type === 'input' || form.Type === 'textarea'"
+        label="最大长度">
+        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
+      </el-form-item>
+      <!-- 是否复制前值 -->
+      <el-form-item label="是否复制前值" v-if="form.Type !== 'summary'">
+        <el-switch
+          v-model="form.IsCopy"
         />
       </el-form-item>
-      <el-form-item label="重复出现最大次数">
+      <!-- 数值类型 -->
+      <el-form-item
+        v-if="form.Type === 'number' || form.Type === 'calculation'"
+        label="数值类型"
+        prop="ValueType"
+        :rules="[
+          { required: true, message: '请选择'}
+        ]"
+      >
+        <el-radio-group
+          v-model="form.ValueType"
+        >
+          <el-radio
+            v-for="item of $d.ValueType"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+
+      <!-- 数值单位 -->
+      <el-form-item
+        v-if="form.Type === 'number' || form.Type === 'calculation'"
+        label="单位"
+      >
+        <el-radio-group
+          v-model="form.Unit"
+        >
+          <el-radio
+            v-for="item of $d.ValueUnit"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item v-if="form.Type === 'upload'" label="最大上传个数">
         <el-input-number
-          v-model="form.MaxRowCount"
+          v-model="form.ImageCount"
           controls-position="right"
           :min="0"
           :max="10"
         />
       </el-form-item>
-      <el-form-item label="限制编辑">
-        <el-radio-group v-model="form.LimitEdit">
-          <el-radio v-for="item of $d.LimitEdit" :key="item.value" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group>
+      <!-- 文件类型 -->
+      <el-form-item 
+        v-if="form.Type === 'upload'" 
+        label="文件类型"
+        prop="FileType"
+        :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      >
+        <el-checkbox-group
+          v-model="form.FileType"
+          @change="(v) => {
+            if (v && v.includes('-1')) {
+              form.FileType = ['-1']
+            }
+          }"
+        >
+          <el-checkbox
+            v-for="item of $d.fileType"
+            :key="`fileType${item.value}`"
+            :value="item.value + ''"
+            :label="item.value"
+            :disabled="form.FileType && form.FileType.includes('-1') && item.value !== '-1'"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <!-- 分类 -->
+      <el-form-item
+        v-if="form.Type === 'class'"
+        label="分类数据来源"
+        prop="ClassifyTableQuestionId"
+      >
+        <el-select v-model="form.ClassifyTableQuestionId" clearable>
+          <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName"
+                     :value="item.QuestionId"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'class'"
+        label="分类算法"
+        prop="ClassifyAlgorithms"
+      >
+        <div>
+          <el-table
+            ref="CalculateTable"
+            :data="ClassifyAlgorithmsList"
+            style="margin: 10px;width: 100%"
+            size="small"
+          >
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:label')"
+              show-overflow-tooltip
+              min-width="70"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.label }}
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:gt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.gt"></el-input-number>
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:lt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.lt"></el-input-number>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
       </el-form-item>
-      <!-- <el-form-item label="全局阅片是否显示">
-        <el-radio-group v-model="form.GlobalReadingShowType">
-          <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group> 
-      </el-form-item> -->
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
@@ -381,7 +451,7 @@
 </template>
 <script>
 import { addOrUpdateReadingTableQuestionSystem, getReadingTableOtherQuestionSystem } from '@/api/trials'
-import { getBasicConfigSelect, getCriterionDictionaryList, getCriterionDictionary } from '@/api/dictionary'
+import { getBasicConfigSelect, getCriterionDictionaryList, getCriterionDictionary, getSystemCalculateTableQuestions } from '@/api/dictionary'
 
 export default {
   name: 'AddOrUpdateTableQs',
@@ -418,6 +488,7 @@ export default {
       }
     }
     return {
+      ClassifyAlgorithmsList: [],
       form: {
         Id: '',
         ReadingQuestionId: '',
@@ -430,7 +501,7 @@ export default {
         ParentId: '',
         ParentTriggerValue: '',
         ShowOrder: 0,
-        ShowQuestion: null,
+        ShowQuestion: 0,
         IsRequired: true,
         Remark: '',
         RelevanceId: '',
@@ -447,8 +518,13 @@ export default {
         LimitEdit: 0,
         // GlobalReadingShowType: null,
         QuestionClassify: null,
-        HighlightAnswerList: []
-
+        HighlightAnswerList: [],
+        MaxAnswerLength: 500,
+        IsCopy: false,
+        FileType: [],
+        ImageCount: 0,
+        ClassifyTableQuestionId: null,
+        ClassifyAlgorithms: null,
         // IsEnable: true
       },
       rules: {
@@ -481,14 +557,39 @@ export default {
       tblOptions: [],
       colOptions: [],
       dicList: [],
-      CriterionDictionaryList: []
+      CriterionDictionaryList: [],
+      Questions: []
     }
   },
   mounted() {
     this.initForm()
     this.getCriterionDictionary()
+    this.getCalculateQuestions('number')
   },
   methods: {
+    typeValueChange(v) {
+      this.form.DefaultValue = null
+      var list = v.split('|')
+      this.form.ClassifyAlgorithms = null
+      var arr = Object.assign([], this.ClassifyAlgorithmsList)
+      this.ClassifyAlgorithmsList = list.map((res, i) => {
+        return {
+          label: res,
+          lt: arr[i] ? arr[i].lt : 0,
+          gt: arr[i] ? arr[i].gt : 0
+        }
+      })
+    },
+    getCalculateQuestions(type) {
+      getSystemCalculateTableQuestions({
+        questionId: this.readingQuestionId,
+        type: type
+      }).then(res => {
+        if (type === 'number') {
+          this.Questions = res.Result
+        }
+      })
+    },
     getCriterionDictionary() {
       getCriterionDictionary({
         ReadingCriterionId: this.criterionId,
@@ -503,7 +604,13 @@ export default {
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
-            this.form[k] = this.data[k]
+            if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
+              this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
+            } else if(k === 'FileType'){
+              this.form[k] = this.data[k].split(',')
+            } else {
+              this.form[k] = this.data[k]
+            }
           }
         }
 
@@ -546,9 +653,15 @@ export default {
       this.$refs.tableQsForm.validate(valid => {
         if (!valid) return
         this.loading = true
+        this.form.ClassifyAlgorithms = JSON.stringify(this.ClassifyAlgorithmsList)
         this.form.SystemCriterionId = this.criterionId
         this.form.ReadingQuestionId = this.readingQuestionId
-        addOrUpdateReadingTableQuestionSystem(this.form).then(res => {
+        var params = Object.assign({}, this.form)
+        if (this.form.Type !== 'upload') {
+          this.form.ImageCount = 0
+        }
+        params.FileType = this.form.FileType.join(',')
+        addOrUpdateReadingTableQuestionSystem(params).then(res => {
           this.$emit('getList')
           this.loading = false
           this.$emit('close')
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
index bf289f13..bcf50bb6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
@@ -7,7 +7,7 @@
       {{ question.GroupName }}
     </div>
     <div
-      v-if=" question.Type==='table'"
+      v-if="question.Type==='table' || question.Type==='basicTable'"
       style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
     >
       <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
@@ -267,7 +267,7 @@
       </el-form-item>
     </template>
 
-    <template v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table'">
+    <template v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table' && question.Type !== 'basicTable'">
       <CustomizeQuestionFormItem
         v-for="(item) in question.Childrens"
         :key="item.Id"
@@ -429,7 +429,7 @@ export default {
         })
       }
     }
-    if (this.question.Type === 'table') {
+    if (this.question.Type === 'table' || this.question.Type === 'baiscTable') {
       this.getQuestionCalculateRelation()
       if (this.questionForm[this.question.Id]) {
         this.QuestionsForm = {}
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
index db9855ae..7d87e083 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue
@@ -122,10 +122,10 @@ export default {
         DicomEvent.$emit('setReadingState', res.OtherInfo.ReadingTaskState)
         res.Result.SinglePage.map((v) => {
           if (v.Type === 'group' && v.Childrens.length === 0) return
-          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'number') {
+          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'basicTable' && v.Type !== 'number') {
             this.$set(this.questionForm, v.Id, v.Answer)
           }
-          if (v.Type === 'table') {
+          if (v.Type === 'table' || v.Type === 'basicTable') {
             this.$set(this.questionForm, v.Id, v.TableQuestions.Answers)
           }
           if (v.Type === 'number') {
@@ -151,8 +151,8 @@ export default {
         if (res.OtherInfo.FormType === 2) {
           if (res.Result.MultiPage.length > 0) {
             res.Result.MultiPage.map((v) => {
-              if (v.Type === 'group' && v.Childrens.length === 0 && i.Type !== 'table') return
-              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Type !== 'table') {
+              if (v.Type === 'group' && v.Childrens.length === 0 && i.Type !== 'table' && i.Type !== 'basicTable') return
+              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Type !== 'table' && i.Type !== 'basicTable') {
                 this.$set(this.questionForm, v.Id, '')
               }
               if (v.Childrens.length > 0) {
@@ -164,8 +164,8 @@ export default {
           }
           if (res.Result.PublicPage.length > 0) {
             res.Result.PublicPage.map((v) => {
-              if (v.Type === 'group' && v.Childrens.length === 0 && i.Type !== 'table') return
-              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Type !== 'table') {
+              if (v.Type === 'group' && v.Childrens.length === 0 && i.Type !== 'table' && i.Type !== 'basicTable') return
+              if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && i.Type !== 'table' && i.Type !== 'basicTable') {
                 this.$set(this.questionForm, v.Id, '')
               }
               if (v.Childrens.length > 0) {
@@ -176,11 +176,11 @@ export default {
           }
         } else {
           res.Result.SinglePage.map((v) => {
-            if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table') return
-            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'number') {
+            if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table' && v.Type !== 'basicTable') return
+            if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'basicTable' && v.Type !== 'number') {
               this.$set(this.questionForm, v.Id, v.Answer)
             }
-            if (v.Type === 'table') {
+            if (v.Type === 'table' || v.Type === 'basicTable') {
               this.$set(this.questionForm, v.Id, v.TableQuestions.Answers)
             }
             if (v.Type === 'number') {
@@ -198,10 +198,10 @@ export default {
     },
     setChild(obj) {
       obj.forEach(i => {
-        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table') {
+        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table'  && i.Type !== 'basicTable') {
           this.$set(this.questionForm, i.Id, i.Answer)
         }
-        if (i.Type === 'table') {
+        if (i.Type === 'table' || i.Type === 'basicTable') {
           i.TableQuestions.Questions.forEach(o => {
             if (o.Type === 'number') {
               i.TableQuestions.Answers.forEach((ite, index) => {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
index 6cf08af4..559efb2d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPage.vue
@@ -425,11 +425,11 @@ export default {
     },
     InitVisitTaskQuestionForm() {
       this.taskQuestions.map((v, i) => {
-        if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table') return
-        if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'number') {
+        if (v.Type === 'group' && v.Childrens.length === 0 && v.Type !== 'table' && v.Type !== 'basicTable') return
+        if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'basicTable' && v.Type !== 'number') {
           this.$set(this.questionForm, v.QuestionId, v.Answers[this.visitTaskId])
         }
-        if (v.Type === 'table') {
+        if (v.Type === 'table' || v.Type === 'basicTable') {
           var tableAnswers = this.getTableAnswers(v.QuestionId, v.Childrens, i)
           this.$set(this.questionForm, v.QuestionId, tableAnswers)
           // this.$set(v, 'xfIndex', i)
@@ -445,17 +445,17 @@ export default {
     },
     setChild(obj) {
       obj.forEach((i, index) => {
-        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table') {
+        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table'  && i.Type !== 'basicTable') {
           this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId])
         }
-        if (i.Type === 'table') {
+        if (i.Type === 'table' || i.Type === 'basicTable') {
           var tableAnswers = this.getTableAnswers(i.QuestionId, i.Childrens, index)
           this.$set(this.questionForm, i.QuestionId, tableAnswers)
         }
         if (i.Type === 'number') {
           this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : i.Answers[this.visitTaskId])
         }
-        if (i.Childrens && i.Childrens.length > 0 && i.Type !== 'table') {
+        if (i.Childrens && i.Childrens.length > 0 && i.Type !== 'table'  && i.Type !== 'basicTable') {
           this.setChild(i.Childrens)
         }
       })
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
index ee8bc6c0..3b11279e 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
@@ -13,7 +13,7 @@
       {{ language === "en" ? question.GroupEnName : question.GroupName }}
     </div>
     <div
-      v-if="question.Type === 'table'"
+      v-if="question.Type === 'table' || question.Type === 'basicTable'"
       style="font-weight: bold; font-size: 14px; margin: 5px 0px"
     >
       <div style="display: flex; justify-content: space-between">
@@ -290,16 +290,16 @@
       v-if="
         question.Childrens &&
         question.Childrens.length > 0 &&
-        question.Type !== 'table'
+        (question.Type !== 'table' && question.Type !== 'basicTable')
       "
     >
       <QuestionFormItem
         v-for="item in question.Childrens"
         :key="item.Id"
+        :questionForm="questionForm"
         :question="item"
         :reading-task-state="readingTaskState"
         :is-system-criterion="isSystemCriterion"
-        :question-form="questionForm"
         :visit-task-id="visitTaskId"
         :criterion-id="criterionId"
         :calculation-list="calculationList"
@@ -375,14 +375,12 @@ export default {
     },
     isSystemCriterion: {
       type: Boolean,
-      default() {
-        return false;
-      },
+      default: false
     },
     question: {
       type: Object,
       default() {
-        return [];
+        return {};
       },
     },
     criterionId: {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
index 903185e0..f39bb20b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
@@ -195,7 +195,7 @@ export default {
     question: {
       type: Object,
       default() {
-        return []
+        return {}
       }
     },
     criterionId: {
@@ -244,6 +244,26 @@ export default {
     }
   },
   mounted() {
+    if (this.question.Type === "class") {
+      this.ClassifyAlgorithmsList = JSON.parse(
+        this.question.ClassifyAlgorithms
+      );
+    }
+    setInterval(() => {
+      if (this.question.Type === "class") {
+        let o = this.ClassifyAlgorithmsList.find((v) => {
+          return (
+            this.questionForm[this.question.ClassifyQuestionId] >= v.gt &&
+            this.questionForm[this.question.ClassifyQuestionId] < v.lt
+          );
+        });
+        if (this.questionForm[this.question.ClassifyQuestionId]) {
+          this.questionForm[this.question.Id] = o ? o.label : null;
+        } else {
+          this.questionForm[this.question.Id] = null;
+        }
+      }
+    }, 300);
     if (this.question.Type === 'upload') {
       if (this.questionForm[this.question.Id]) {
         this.urls = this.questionForm[this.question.Id].split('|')
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 bd98039d..cd8e4390 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
@@ -16,13 +16,24 @@
           clearable
           @change="((val)=>{qsTypeChange(val, form)})"
         >
-          <el-option
-            v-for="item of $d.Criterion_Question_Type"
-            v-show="item.value !== 'calculation' && item.value !== 'increment'"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
+          <template v-if="isFromSystem">
+            <el-option
+              v-for="item of $d.Criterion_Question_Type"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            />
+          </template>
+          <template v-else>
+            <el-option
+              v-for="item of $d.Criterion_Question_Type"
+              v-show="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table'"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            />
+          </template>
+          
         </el-select>
       </el-form-item>
       <!-- 分组名称 -->
@@ -65,53 +76,342 @@
           v-model="form.QuestionEnName"
         />
       </el-form-item>
-      <!-- 最大上传个数 -->
-      <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')">
-        <el-input-number
-          v-model="form.ImageCount"
-          controls-position="right"
-          :min="1"
-          :max="10"
-        />
-      </el-form-item>
-      <!-- 文件类型 -->
-      <el-form-item 
-        v-show="form.Type === 'upload'" 
-        :label="$t('trials:readingUnit:qsList:title:FileType')"
-        prop="FileType"
-        :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      <!-- 公有属性 -->
+      <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+      <!-- 分组 -->
+      <el-form-item
+        v-if="form.Type !== 'group'"
+        :label="$t('trials:readingUnit:qsList:title:groupName')"
       >
-        <el-checkbox-group
-          v-model="form.FileType"
-          @change="(v) => {
-            if (v.includes('-1')) {
-              form.FileType = ['-1']
-            } else {
-            }
-          }"
+        <el-select
+          v-model="form.GroupId"
+          clearable
+          :disabled="isParentExistGroup"
         >
-          <el-checkbox
-            v-for="item of $d.fileType"
-            :key="`fileType${item.value}`"
-            :value="item.value + ''"
+          <el-option
+            v-for="group of groupOptions"
+            :key="group.GroupId"
+            :label="group.GroupName"
+            :value="group.GroupId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 是否显示 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion" v-if="form.Type !== 'group'">
+        <el-radio-group
+          v-model="form.ShowQuestion"
+          @change="((val)=>{isShowQuestionChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.ShowQuestion"
+            :key="`ShowQuestion${item.value}`"
             :label="item.value"
-            :disabled="form.FileType.includes('-1') && item.value !== '-1'"
           >
             {{ item.label }}
-          </el-checkbox>
-        </el-checkbox-group>
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 是否必填 -->
+      <el-form-item
+        v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'basicTable' && form.Type !== 'summary' || form.Type === 'class'"
+        :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+        <el-radio-group
+          v-model="form.IsRequired"
+          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
+          @change="((val)=>{isRequiredChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.QuestionRequired"
+            :key="`QuestionRequired${item.value}`"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 显示时依赖父问题 -->
+      <el-form-item
+        v-if="form.ShowQuestion===1"
+        :label="$t('trials:readingUnit:qsList:title:parentId')"
+        prop="ParentId"
+      >
+        <el-select
+          v-model="form.ParentId"
+          clearable
+          @change="((val)=>{parentQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`ParentId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 显示时依赖父问题触发值 -->
+      <el-form-item v-if="form.ParentId && form.ShowQuestion===1"
+                    :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
+        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
+          <el-option
+            v-for="item of parentTriggerValOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value + ''"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 必填依赖父问题 -->
+      <el-form-item
+        v-if="form.Type !== 'group' && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
+        prop="RelevanceId"
+      >
+        <el-select
+          v-model="form.RelevanceId"
+          clearable
+          @change="((val)=>{relevanceQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`RelevanceId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 必填触发值 -->
+      <el-form-item
+        v-if="form.RelevanceId && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
+        prop="RelevanceValueList"
+      >
+        <el-select v-model="form.RelevanceValueList" clearable multiple>
+          <el-option
+            v-for="item of reParentTriggerValOptions"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value + ''"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 是否裁判问题 -->
+      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'number'|| form.Type === 'class'"
+                    :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')">
+        <el-radio-group
+          v-model="form.IsJudgeQuestion"
+          @change="((val)=>{isJudgeQuestionChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'IsJudgeQuestion'+item.value"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 导出标识 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification">
+        <el-radio-group 
+          v-model="form.ExportIdentification"
+          @change="
+            (val) => {
+              form.ExportResult = []
+            }
+          "
+        >
+          <el-radio
+            v-for="item of $d.ExportIdentification"
+            :key="`ExportIdentification${item.value}`"
+            :label="item.value"
+            >{{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 导出结果 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:ExportResult')" v-if="form.ExportIdentification" prop="ExportResult">
+        <el-select v-model="form.ExportResult" multiple>
+          <el-option
+            v-for="item in $d.ExportResult"
+            :key="`ExportResult${item.value}`"
+            :label="item.value"
+            :value="item.label">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 限制显示 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:LimitShow')" v-if="form.Type !== 'group'">
+        <el-radio-group v-model="form.LimitShow" @change="(v) => {
+          if (v !== 0) {
+             form.LimitEdit = v
+          }
+        }">
+          <el-radio v-for="item of $d.LimitShow" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 限制编辑 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="!(form.Type === 'group' || form.Type === 'summary' || form.Type === 'table' || form.Type === 'basicTable')">
+        <el-radio-group v-model="form.LimitEdit" :disabled="form.LimitShow !== 0">
+          <el-radio v-for="item of $d.LimitEdit" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 全局阅片是否显示 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')">
+        <el-radio-group v-model="form.GlobalReadingShowType">
+          <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{
+              item.label
+            }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 是否在影像页面显示 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShowInDicom')" v-if="form.ShowQuestion !== 2">
+        <el-radio-group v-model="form.IsShowInDicom">
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'IsShowInDicom'+item.value"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 注释 -->
+      <el-form-item
+        :label="$t('trials:readingUnit:qsList:title:Remark')"
+        prop="Remark"
+      >
+        <el-input
+          v-model="form.Remark"
+        />
+      </el-form-item>
+      <!-- 序号 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
+        <el-input-number
+          v-model="form.ShowOrder"
+          controls-position="right"
+          :min="0"
+          :max="1000"
+        />
+      </el-form-item>
+      <!-- 私有属性 -->
+      <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
+      <!-- 选项类型 -->
+      <el-form-item
+        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation') && isFromSystem"
+        :label="$t('trials:readingUnit:label:QuestionGenre')"
+        prop="QuestionGenre"
+        :rules="[
+          { required: form.Type !== 'calculation', message: '请选择'}
+        ]"
+      >
+        <el-radio-group
+          v-model="form.QuestionGenre"
+          @change="((val)=>{questionGenreChange(val, form)})"
+        >
+          <el-radio
+            :label="-1"
+          >
+            {{ $i18n.locale === 'zh' ? '无' : 'None' }}
+          </el-radio>
+          <el-radio
+            v-for="item of $d.TableQuestionType"
+            v-show="item.value===0 || item.value===3"
+            :key="item.id"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        v-if="(!isFromSystem || (isFromSystem && form.QuestionGenre !== 3)) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class')"
+        :label="$t('trials:qcCfg:table:typeValue')"
+        prop="TypeValue"
+      >
+        <el-input
+          v-model="form.TypeValue"
+          @change="typeValueChange"
+          :placeholder="$t('trials:qcCfg:message:typeValue')"
+        />
+      </el-form-item>
+      <el-form-item
+        v-if="form.QuestionGenre === 3 && isFromSystem"
+        :label="$t('trials:readingUnit:label:DictionaryCode')"
+        prop="DictionaryCode"
+      >
+        <el-select v-model="form.DictionaryCode" clearable @change="() => {form.DefaultValue = null}">
+          <el-option
+            v-for="item of dicList"
+            :key="item.Id"
+            :label="item.Code"
+            :value="item.Code"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.QuestionGenre === 3 && (form.Type === 'select' || form.Type === 'radio')  && isFromSystem"
+        :label="$t('trials:qcCfg:table:typeValue')"
+      >
+        <el-select v-model="form.DefaultValue" clearable>
+          <el-option
+            v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
+      >
+        <el-select v-model="form.DefaultValue" clearable>
+          <el-option
+            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+            :key="'TypeValue' + item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="(form.Type === 'number') && !isFromSystem"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
+      >
+        <el-input
+          :disabled="form.DataSource === 1"
+          v-model="form.DefaultValue"
+        />
+      </el-form-item>
+      <!-- 高亮标记值 -->
+      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+        <el-select v-model="form.HighlightAnswerList" clearable multiple>
+          <template v-if="form.TypeValue">
+            <el-option
+              v-for="item of form.TypeValue.split('|')"
+              :key="item"
+              :label="item"
+              :value="item"
+            />
+          </template>
+          <template v-else-if="form.DictionaryCode">
+            <el-option
+              v-for="item of $d[form.DictionaryCode]"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value.toString()"
+            />
+          </template>
+        </el-select>
       </el-form-item>
       <!-- 最大字符数 -->
       <el-form-item v-if="form.Type === 'input' || form.Type === 'textarea'"
                     :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')">
-        <el-input v-model="form.MaxAnswerLength"/>
-      </el-form-item>
-      <!-- 自增序号前缀 -->
-      <el-form-item v-if="form.Type === 'table'" :label="$t('trials:readingUnit:qsList:title:orderMark')">
-        <el-input v-model="form.OrderMark"/>
+        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
       </el-form-item>
       <!-- 最大行数 -->
-      <el-form-item v-if="form.Type === 'table'" :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
         <el-input-number
           v-model="form.MaxQuestionCount"
           controls-position="right"
@@ -119,8 +419,12 @@
           :max="10"
         />
       </el-form-item>
+      <!-- 自增序号前缀 -->
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:orderMark')">
+        <el-input v-model="form.OrderMark"/>
+      </el-form-item>
       <!-- 随访是否复制 -->
-      <el-form-item v-if="form.Type === 'table'" :label="$t('trials:readingUnit:qsList:title:isCopyLesions')">
+      <el-form-item v-if="form.Type === 'table' || form.Type === 'basicTable'" :label="$t('trials:readingUnit:qsList:title:isCopyLesions')">
         <el-switch
           v-model="form.IsCopyLesions"
         />
@@ -329,45 +633,43 @@
           }}
         </div>
       </div>
-      <!-- 选项类型 -->
-      <el-form-item
-        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation') && isFromSystem"
-        :label="$t('trials:readingUnit:label:QuestionGenre')"
-        prop="QuestionGenre"
-        :rules="[
-          { required: form.Type !== 'calculation', message: '请选择'}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.QuestionGenre"
-          @change="((val)=>{questionGenreChange(val, form)})"
-        >
-          <el-radio
-            :label="-1"
-          >
-            {{ $i18n.locale === 'zh' ? '无' : 'None' }}
-          </el-radio>
-          <el-radio
-            v-for="item of $d.TableQuestionType"
-            v-show="item.value===0 || item.value===3"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        v-if="(!isFromSystem || (isFromSystem && form.QuestionGenre !== 3)) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class')"
-        :label="$t('trials:qcCfg:table:typeValue')"
-        prop="TypeValue"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          @change="typeValueChange"
-          :placeholder="$t('trials:qcCfg:message:typeValue')"
+      <!-- 最大上传个数 -->
+      <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')">
+        <el-input-number
+          v-model="form.ImageCount"
+          controls-position="right"
+          :min="1"
+          :max="10"
         />
       </el-form-item>
+      <!-- 文件类型 -->
+      <el-form-item 
+        v-show="form.Type === 'upload'" 
+        :label="$t('trials:readingUnit:qsList:title:FileType')"
+        prop="FileType"
+        :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      >
+        <el-checkbox-group
+          v-model="form.FileType"
+          @change="(v) => {
+            if (v.includes('-1')) {
+              form.FileType = ['-1']
+            } else {
+            }
+          }"
+        >
+          <el-checkbox
+            v-for="item of $d.fileType"
+            :key="`fileType${item.value}`"
+            :value="item.value + ''"
+            :label="item.value"
+            :disabled="form.FileType.includes('-1') && item.value !== '-1'"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <!-- 分类 -->
       <el-form-item
         v-if="form.Type === 'class'"
         :label="$t('trials:readingUnit:label:ClassifyQuestion')"
@@ -423,263 +725,6 @@
           </el-table>
         </div>
       </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 3 && isFromSystem"
-        :label="$t('trials:readingUnit:label:DictionaryCode')"
-        prop="DictionaryCode"
-      >
-        <el-select v-model="form.DictionaryCode" clearable @change="() => {form.DefaultValue = null}">
-          <el-option
-            v-for="item of dicList"
-            :key="item.Id"
-            :label="item.Code"
-            :value="item.Code"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.QuestionGenre === 3 && (form.Type === 'select' || form.Type === 'radio')  && isFromSystem"
-        :label="$t('trials:qcCfg:table:typeValue')"
-      >
-        <el-select v-model="form.DefaultValue" clearable>
-          <el-option
-            v-for="item of form.DictionaryCode ? $d[form.DictionaryCode] : []"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value.toString()"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem"
-        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
-      >
-        <el-select v-model="form.DefaultValue" clearable>
-          <el-option
-            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
-            :key="'TypeValue' + item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="(form.Type === 'number') && !isFromSystem"
-        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
-      >
-        <el-input
-          :disabled="form.DataSource === 1"
-          v-model="form.DefaultValue"
-        />
-      </el-form-item>
-      <!-- 分组 -->
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        :label="$t('trials:readingUnit:qsList:title:groupName')"
-      >
-        <el-select
-          v-model="form.GroupId"
-          clearable
-          :disabled="isParentExistGroup"
-        >
-          <el-option
-            v-for="group of groupOptions"
-            :key="group.GroupId"
-            :label="group.GroupName"
-            :value="group.GroupId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 是否显示 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ShowQuestion">
-        <el-radio-group
-          v-model="form.ShowQuestion"
-          @change="((val)=>{isShowQuestionChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.ShowQuestion"
-            :key="`ShowQuestion${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 是否必填 -->
-      <el-form-item
-        v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'summary' || form.Type === 'class'"
-        :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
-        <el-radio-group
-          v-model="form.IsRequired"
-          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-          @change="((val)=>{isRequiredChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.QuestionRequired"
-            :key="`QuestionRequired${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 显示时依赖父问题 -->
-      <el-form-item
-        v-if="form.ShowQuestion===1"
-        :label="$t('trials:readingUnit:qsList:title:parentId')"
-        prop="ParentId"
-      >
-        <el-select
-          v-model="form.ParentId"
-          clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`ParentId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 显示时依赖父问题触发值 -->
-      <el-form-item v-if="form.ParentId && form.ShowQuestion===1"
-                    :label="$t('trials:readingUnit:qsList:title:parentTriggerValueList')" prop="ParentTriggerValueList">
-        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-          <el-option
-            v-for="item of parentTriggerValOptions"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value + ''"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 必填依赖父问题 -->
-      <el-form-item
-        v-if="form.Type !== 'group' && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-        prop="RelevanceId"
-      >
-        <el-select
-          v-model="form.RelevanceId"
-          clearable
-          @change="((val)=>{relevanceQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`RelevanceId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 必填触发值 -->
-      <el-form-item
-        v-if="form.RelevanceId && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-        prop="RelevanceValueList"
-      >
-        <el-select v-model="form.RelevanceValueList" clearable multiple>
-          <el-option
-            v-for="item of reParentTriggerValOptions"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value + ''"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 高亮标记值 -->
-      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
-        <el-select v-model="form.HighlightAnswerList" clearable multiple>
-          <template v-if="form.TypeValue">
-            <el-option
-              v-for="item of form.TypeValue.split('|')"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
-          </template>
-          <template v-else-if="form.DictionaryCode">
-            <el-option
-              v-for="item of $d[form.DictionaryCode]"
-              :key="item.id"
-              :label="item.label"
-              :value="item.value.toString()"
-            />
-          </template>
-        </el-select>
-      </el-form-item>
-      <!-- 序号 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
-          :max="1000"
-        />
-      </el-form-item>
-      <!-- 是否在影像页面显示 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:isShowInDicom')" v-if="form.ShowQuestion !== 2">
-        <el-radio-group v-model="form.IsShowInDicom">
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="'IsShowInDicom'+item.value"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 是否裁判问题 -->
-      <el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'number'|| form.Type === 'class'"
-                    :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')">
-        <el-radio-group
-          v-model="form.IsJudgeQuestion"
-          @change="((val)=>{isJudgeQuestionChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.YesOrNo"
-            :key="'IsJudgeQuestion'+item.value"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 限制显示 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:LimitShow')">
-        <el-radio-group v-model="form.LimitShow" @change="(v) => {
-          if (v !== 0) {
-             form.LimitEdit = v
-          }
-        }">
-          <el-radio v-for="item of $d.LimitShow" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 限制编辑 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')">
-        <el-radio-group v-model="form.LimitEdit" :disabled="form.LimitShow !== 0">
-          <el-radio v-for="item of $d.LimitEdit" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 全局阅片是否显示 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')">
-        <el-radio-group v-model="form.GlobalReadingShowType">
-          <el-radio v-for="item of $d.GlobalReadingShowType" :key="item.id" :label="item.value">{{
-              item.label
-            }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item
-        :label="$t('trials:readingUnit:qsList:title:Remark')"
-        prop="Remark"
-      >
-        <!-- 选项请用‘|’分割多个选项 -->
-        <el-input
-          v-model="form.Remark"
-        />
-      </el-form-item>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item v-if="!isLook">
@@ -797,14 +842,16 @@ export default {
         OrderMark: null,
         MaxQuestionCount: null,
         IsCopyLesions: false,
-        MaxAnswerLength: null,
+        MaxAnswerLength: 500,
         FileType: [],
         DictionaryCode: null,
         GroupId: null,
         ClassifyQuestionId: null,
         ClassifyAlgorithms: null,
         LimitShow: 0,
-        HighlightAnswerList: []
+        HighlightAnswerList: [],
+        ExportIdentification: 0,
+        ExportResult: []
         // IsEnable: true
       },
       rules: {
@@ -831,7 +878,13 @@ export default {
           trigger: ['blur', 'change']
         }],
         GroupName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
-          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}]
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
+        ExportIdentification: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        ],
+        ExportResult: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' },
+        ]
       },
       loading: false,
       dicList: [],
@@ -859,6 +912,7 @@ export default {
   },
   methods: {
     typeValueChange(v) {
+      this.form.DefaultValue = null
       var list = v.split('|')
       this.form.ClassifyAlgorithms = null
       var arr = Object.assign([], this.ClassifyAlgorithmsList)
@@ -931,6 +985,14 @@ export default {
       })
     },
     async initForm() {
+      // this.Questions = await getCalculateQuestions({
+      //   QuestionId: this.trialCriterionId,
+      //   type: 'number'
+      // })
+      // this.tableQuestions = await getCalculateQuestions({
+      //   QuestionId: this.trialCriterionId,
+      //   type: 'table'
+      // })
       await this.getGroupOptions()
       await this.getParentQuestions()
       await this.getLesionType()
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue
index 1b2179c6..2e00247a 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsPreview.vue
@@ -63,7 +63,6 @@ export default {
   mounted() {
     this.getQuestionCalculateRelation()
     this.getCustomTableQuestionPreview()
-    console.log('qp', this.isSystemCriterion)
   },
   methods: {
     getQuestionCalculateRelation() {
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 3d4f419c..74dc41cf 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
@@ -6,9 +6,10 @@
     size="small"
     :rules="rules"
     :disabled="type === 'look'"
-    label-width="120px"
+    label-width="130px"
   >
     <div class="base-dialog-body">
+      <!-- 类型 -->
       <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
         <el-select
           v-model="form.Type"
@@ -17,7 +18,7 @@
         >
           <template v-for="item of $d.Criterion_Question_Type">
             <el-option
-              v-if="item.value !== 'calculation' && item.value !== 'increment'&& item.value !== 'table'&& item.value !== 'group'"
+              v-if="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group'"
               :key="item.value"
               :value="item.value"
               :label="item.label"
@@ -25,15 +26,7 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'group'"
-        :label="$t('trials:readingUnit:qsList:title:groupName')"
-        prop="GroupName"
-      >
-        <el-input
-          v-model="form.GroupName"
-        />
-      </el-form-item>
+      <!-- 问题名称 -->
       <el-form-item
         v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
         :label="$t('trials:readingUnit:qsList:title:qsName')"
@@ -43,6 +36,7 @@
           v-model="form.QuestionName"
         />
       </el-form-item>
+      <!-- 问题名称（EN） -->
       <el-form-item
         v-if="form.Type !== 'group'&& $i18n.locale !== 'zh'"
         :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
@@ -52,24 +46,145 @@
           v-model="form.QuestionEnName"
         />
       </el-form-item>
-      <!--      <el-form-item v-if="form.Type === 'number'" label="问题数据来源" prop="DataSource">-->
-      <!--        <el-radio-group-->
-      <!--          v-model="form.DataSource"-->
-      <!--        >-->
-      <!--          <el-radio-->
-      <!--            v-for="item of $d.DataSource"-->
-      <!--            :key="`DataSource${item.value}`"-->
-      <!--            :label="item.value"-->
-      <!--          >-->
-      <!--            {{ item.label }}-->
-      <!--          </el-radio>-->
-      <!--        </el-radio-group>-->
-      <!--      </el-form-item>-->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:PrecopyValue')">
+      <!-- 公有属性 -->
+      <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
+      <!-- 是否显示 -->
+      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isEnable')" prop="ShowQuestion">
+        <el-radio-group
+          v-model="form.ShowQuestion"
+          @change="((val)=>{isShowQuestionChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.ShowQuestion"
+            :key="`ShowQuestion${item.value}`"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 是否必填 -->
+      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table' && form.Type !== 'summary'" :label="$t('trials:qcCfg:table:isRequired')" prop="IsRequired">
+        <el-radio-group
+          v-model="form.IsRequired"
+          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
+          @change="((val)=>{isRequiredChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.QuestionRequired"
+            :key="`QuestionRequired${item.value}`"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 显示时依赖父问题 -->
+      <el-form-item
+        v-if="form.ShowQuestion===1"
+        :label="$t('trials:readingUnit:qsList:title:parentId')"
+        prop="ParentId"
+      >
+        <el-select
+          v-model="form.ParentId"
+          clearable
+          @change="((val)=>{parentQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`ParentId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 显示时依赖父问题触发值 -->
+      <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValueList">
+        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
+          <el-option
+            v-for="item of parentTriggerValOptions"
+            :key="item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 父问题 -->
+      <el-form-item
+        v-if="form.Type !== 'group' && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
+        prop="RelevanceId"
+      >
+        <el-select
+          v-model="form.RelevanceId"
+          clearable
+          @change="((val)=>{relevanceQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`RelevanceId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.QuestionId"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 必填依赖的父问题触发值 -->
+      <el-form-item
+        v-if="form.RelevanceId && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
+        prop="RelevanceValueList"
+      >
+        <el-select v-model="form.RelevanceValueList" clearable multiple>
+          <el-option
+            v-for="item of reParentTriggerValOptions"
+            :key="item"
+            :label="item"
+            :value="item"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 限制编辑 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')" v-if="form.Type !== 'summary'">
+        <el-radio-group v-model="form.LimitEdit">
+          <el-radio v-for="item of $d.LimitEdit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <!-- 是否复制前值 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:PrecopyValue')" v-if="form.Type !== 'summary'">
         <el-switch
           v-model="form.IsCopy"
         />
       </el-form-item>
+      <!-- 注释 -->
+      <el-form-item
+        :label="$t('trials:readingUnit:qsList:title:Remark')"
+        prop="Remark"
+      >
+        <el-input
+          v-model="form.Remark"
+        />
+      </el-form-item>
+      <!-- 序号 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
+        <el-input-number
+          v-model="form.ShowOrder"
+          controls-position="right"
+          :min="0"
+        />
+      </el-form-item>
+      <!-- 重复出现最大次数 -->
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:MaxRowCount')" v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'">
+        <el-input-number
+          v-model="form.MaxRowCount"
+          controls-position="right"
+          :min="0"
+          :max="10"
+        />
+      </el-form-item>
+
+
+      <!-- 私有属性 -->
+      <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
       <!-- 问题数据来源 -->
       <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
                     prop="DataSource">
@@ -85,6 +200,7 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
+      <!-- 数值类型 -->
       <el-form-item
         v-if="form.Type === 'number'"
         :label="$t('trials:readingUnit:qsList:title:valueType')"
@@ -107,6 +223,7 @@
         </template>
         </el-radio-group>
       </el-form-item>
+
       <el-form-item
         v-if="form.Type === 'number' && form.ValueType === 1"
         :label="$t('trials:readingUnit:qsList:title:digitPlaces')"
@@ -117,6 +234,7 @@
       >
         <el-input :value="$fd('DigitPlaces', digitPlaces).toString()" :disabled="true" />
       </el-form-item>
+      <!-- 单位 -->
       <el-form-item
         v-if="form.Type === 'number'"
         :label="$t('trials:readingUnit:qsList:title:unit')"
@@ -131,7 +249,7 @@
           <el-radio v-for="item of $d.ValueUnit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <!-- 数值单位 -->
+      <!-- 自定义单位 -->
       <el-form-item
         v-if="form.Type === 'number' && form.Unit === 4"
         :label="$t('trials:readingUnit:qsList:title:customUnit')"
@@ -259,34 +377,38 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item
-        v-if="(!isFromSystem || form.TableQuestionType === 3) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation')"
+        v-if="(!isFromSystem || form.TableQuestionType === 3) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class')"
         :label="$t('trials:readingUnit:qsList:title:typeValue')"
         prop="TypeValue"
       >
         <el-input
           v-model="form.TypeValue"
           :placeholder="$t('trials:readingUnit:qsList:message:msg3')"
+          @change="typeValueChange"
         />
       </el-form-item>
-      <!-- 关联表 -->
-      <!-- <el-form-item
-        v-if="form.TableQuestionType === 1"
-        label="关联表"
-        prop="DataTableName"
+      <el-form-item
+        v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
       >
-        <el-select
-          v-model="form.DataTableName"
-          clearable
-          @change="((val)=>{dataTableNameChange(val, form)})"
-        >
+        <el-select v-model="form.DefaultValue" clearable>
           <el-option
-            v-for="item of tblOptions"
-            :key="`RelevanceId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
+            v-for="item of form.TypeValue ? form.TypeValue.split('|') : []"
+            :key="'TypeValue' + item"
+            :label="item"
+            :value="item"
           />
         </el-select>
-      </el-form-item> -->
+      </el-form-item>
+      <el-form-item
+        v-if="(form.Type === 'number') && !isFromSystem"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
+      >
+        <el-input
+          :disabled="form.DataSource === 1"
+          v-model="form.DefaultValue"
+        />
+      </el-form-item>
       <el-form-item
         v-if="form.TableQuestionType === 2 && isFromSystem"
         :label="$t('trials:readingUnit:qsList:title:DependParentId')"
@@ -333,106 +455,14 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:baseDataCfg:title:isEnable')" prop="ShowQuestion">
-        <el-radio-group
-          v-model="form.ShowQuestion"
-          @change="((val)=>{isShowQuestionChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.ShowQuestion"
-            :key="`ShowQuestion${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item v-if="form.Type !== 'group' && form.Type !== 'table'" :label="$t('trials:qcCfg:table:isRequired')" prop="IsRequired">
-        <el-radio-group
-          v-model="form.IsRequired"
-          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
-          @change="((val)=>{isRequiredChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.QuestionRequired"
-            :key="`QuestionRequired${item.value}`"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 显示时依赖父问题 -->
-      <el-form-item
-        v-if="form.ShowQuestion===1"
-        :label="$t('trials:readingUnit:qsList:title:parentId')"
-        prop="ParentId"
-      >
-        <el-select
-          v-model="form.ParentId"
-          clearable
-          @change="((val)=>{parentQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`ParentId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 显示时依赖父问题触发值 -->
-      <el-form-item v-if="form.ParentId && form.ShowQuestion===1" :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValueList">
-        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-          <el-option
-            v-for="item of parentTriggerValOptions"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 父问题 -->
-      <el-form-item
-        v-if="form.Type !== 'group' && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
-        prop="RelevanceId"
-      >
-        <el-select
-          v-model="form.RelevanceId"
-          clearable
-          @change="((val)=>{relevanceQuestionChange(val, form)})"
-        >
-          <el-option
-            v-for="item of parentOptions"
-            :key="`RelevanceId${item.QuestionId}`"
-            :label="item.QuestionName"
-            :value="item.QuestionId"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 必填依赖的父问题触发值 -->
-      <el-form-item
-        v-if="form.RelevanceId && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-        prop="RelevanceValueList"
-      >
-        <el-select v-model="form.RelevanceValueList" clearable multiple>
-          <el-option
-            v-for="item of reParentTriggerValOptions"
-            :key="item"
-            :label="item"
-            :value="item"
-          />
-        </el-select>
-      </el-form-item>
+      
       <!-- 高亮标记值 -->
-      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
+      <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
         <el-select v-model="form.HighlightAnswerList" clearable multiple>
           <template v-if="form.TypeValue">
             <el-option
               v-for="item of form.TypeValue.split('|')"
-              :key="item"
+              :key="'HighlightAnswerList' + item"
               :label="item"
               :value="item"
             />
@@ -447,26 +477,97 @@
           </template>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :min="0"
-        />
+      <!-- 最大字符数 -->
+      <el-form-item 
+        v-if="form.Type === 'input' || form.Type === 'textarea'"
+        :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
+      >
+        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
       </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:MaxRowCount')">
-        <el-input-number
-          v-model="form.MaxRowCount"
-          controls-position="right"
-          :min="0"
-          :max="10"
-        />
+      <!-- 文件类型 -->
+      <el-form-item 
+        v-show="form.Type === 'upload'" 
+        :label="$t('trials:readingUnit:qsList:title:FileType')"
+        prop="FileType"
+        :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
+      >
+        <el-checkbox-group
+          v-model="form.FileType"
+          @change="(v) => {
+            if (v.includes('-1')) {
+              form.FileType = ['-1']
+            } else {
+            }
+          }"
+        >
+          <el-checkbox
+            v-for="item of $d.fileType"
+            :key="`fileType${item.value}`"
+            :value="item.value + ''"
+            :label="item.value"
+            :disabled="form.FileType.includes('-1') && item.value !== '-1'"
+          >
+            {{ item.label }}
+          </el-checkbox>
+        </el-checkbox-group>
       </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:limitEdit')">
-        <el-radio-group v-model="form.LimitEdit">
-          <el-radio v-for="item of $d.LimitEdit" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
-        </el-radio-group>
+      <!-- 分类 -->
+      <el-form-item
+        v-if="form.Type === 'class'"
+        :label="$t('trials:readingUnit:label:ClassifyQuestion')"
+        prop="ClassifyTableQuestionId"
+      >
+        <el-select v-model="form.ClassifyTableQuestionId" clearable>
+          <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName"
+                     :value="item.QuestionId"/>
+        </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'class'"
+        :label="$t('trials:readingUnit:label:ClassifyAlgorithms')"
+        prop="ClassifyAlgorithms"
+      >
+        <div>
+          <el-table
+            ref="CalculateTable"
+            :data="ClassifyAlgorithmsList"
+            style="margin: 10px;width: calc(100% - 20px)"
+            size="small"
+          >
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:label')"
+              show-overflow-tooltip
+              min-width="70"
+            >
+              <template slot-scope="scope">
+                {{ scope.row.label }}
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:gt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.gt"></el-input-number>
+              </template>
+            </el-table-column>
+            <!-- 运算类型 -->
+            <el-table-column
+              :label="$t('trials:readingUnit:label:lt')"
+              show-overflow-tooltip
+              min-width="128"
+            >
+              <template slot-scope="scope">
+                <el-input-number v-model="scope.row.lt"></el-input-number>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-form-item>
+      
     </div>
     <div v-if="type !== 'look'" class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <!-- 取消 -->
@@ -534,6 +635,7 @@ export default {
       }
     }
     return {
+      ClassifyAlgorithmsList: [],
       form: {
         Id: '',
         ReadingQuestionId: '',
@@ -554,6 +656,7 @@ export default {
         DictionaryCode: '',
         TableQuestionType: null,
         MaxRowCount: null,
+        FileType: [],
         DependParentId: '',
         QuestionMark: null,
         CalculateQuestions: [],
@@ -566,7 +669,10 @@ export default {
         LimitEdit: 0,
         DefaultValue: null,
         IsCopy: false,
-        HighlightAnswerList: []
+        HighlightAnswerList: [],
+        MaxAnswerLength: 0,
+        ClassifyTableQuestionId: null,
+        ClassifyAlgorithms: null,
         // IsEnable: true
       },
       rules: {
@@ -642,6 +748,19 @@ export default {
         TableQuestionId: null
       })
     },
+    typeValueChange(v) {
+      this.form.DefaultValue = null
+      var list = v.split('|')
+      this.form.ClassifyAlgorithms = null
+      var arr = Object.assign([], this.ClassifyAlgorithmsList)
+      this.ClassifyAlgorithmsList = list.map((res, i) => {
+        return {
+          label: res,
+          lt: arr[i] ? arr[i].lt : 0,
+          gt: arr[i] ? arr[i].gt : 0
+        }
+      })
+    },
     CustomCalculateMarkChange() {
       if (this.form.CustomCalculateMark <= 4) {
         this.form.CalculateQuestions = [
@@ -684,6 +803,12 @@ export default {
           if (k === 'CalculateQuestions') {
             this.form[k] = JSON.parse(this.data[k])
             console.log('CalculateQuestions', this.form[k])
+          } else if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
+            this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
+          } else if(k === 'FileType'){
+            if (this.data[k]){
+              this.form[k] = this.data[k].split(',')
+            }
           } else {
             if (this.data.hasOwnProperty(k)) {
               this.form[k] = this.data[k]
@@ -740,6 +865,7 @@ export default {
       this.$refs.tableQsForm.validate(valid => {
         if (!valid) return
         this.loading = true
+        this.form.ClassifyAlgorithms = JSON.stringify(this.ClassifyAlgorithmsList)
         if(this.form.QuestionName && this.$i18n.locale === 'zh'){
           this.form.QuestionEnName = this.form.QuestionName;
         }else if(this.form.QuestionEnName && this.$i18n.locale === 'en'){
@@ -750,6 +876,10 @@ export default {
         params.ReadingQuestionId = this.readingQuestionId
         params.TrialCriterionId = this.criterionId
         params.CalculateQuestions = JSON.stringify(this.form.CalculateQuestions)
+        if (this.form.Type !== 'upload') {
+          this.form.ImageCount = 0
+        }
+        params.FileType = this.form.FileType.join(',')
         addOrUpdateReadingTableQuestionTrial(params).then(res => {
           this.$emit('getList')
           this.loading = false