From a3dcb7054a492910ed2f4dbcaec29b7ceace106d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 23 Oct 2024 14:09:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/CriterionQuestionForm.vue      | 1345 +++++++++--------
 .../template/components/CriterionsConfig.vue  |    2 +-
 .../template/components/TableQsForm.vue       |  962 ++++++------
 .../template/components/TableQsList.vue       |    2 +-
 .../reading-unit/components/QuestionsForm.vue |  156 +-
 .../reading-unit/components/TableQsForm.vue   | 1234 +++++++--------
 .../reading-unit/components/TableQsList.vue   |    2 +-
 7 files changed, 1859 insertions(+), 1844 deletions(-)

diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 9d2b6410..1497357c 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -8,687 +8,690 @@
     :disabled="type === 'look'"
     label-width="140px"
   >
-    <div class="base-dialog-body">
-      <!-- 类型 -->
-      <el-form-item label="类型" prop="Type">
-        <el-select
-          v-model="form.Type"
-          clearable
-          @change="
-            (val) => {
-              typeChange(val, form)
-            }
-          "
-        >
-          <el-option
-            v-for="item of $d.Criterion_Question_Type"
-            v-show="item.value !== 'class'"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
-        </el-select>
-      </el-form-item>
-      <!-- 分组名称 -->
-      <el-form-item
-        v-if="form.Type === 'group'"
-        label="分组名称"
-        prop="GroupName"
-      >
-        <el-input v-model="form.GroupName" />
-      </el-form-item>
-      
-      <el-form-item
-        v-if="form.Type === 'group'"
-        label="分组名称（EN）"
-        prop="GroupEnName"
-      >
-        <el-input v-model="form.GroupEnName" />
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        label="问题名称"
-        prop="QuestionName"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-        ]"
-      >
-        <el-input v-model="form.QuestionName" />
-      </el-form-item>
-
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        label="问题名称（EN）"
-        prop="QuestionEnName"
-        :rules="[
-          { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-        ]"
-      >
-        <el-input v-model="form.QuestionEnName" />
-      </el-form-item>
-      <el-divider content-position="left">公有属性</el-divider>
-      <el-form-item 
-        v-if="form.Type !== 'group'" 
-        label="问题分组"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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
-        v-if="form.Type !== 'group'"
-        label="是否显示"
-        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"
+    <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
+      <div style="height: 150px;">
+        <!-- 类型 -->
+        <el-form-item label="类型" prop="Type">
+          <el-select
+            v-model="form.Type"
+            clearable
+            @change="
+              (val) => {
+                typeChange(val, form)
+              }
+            "
           >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <!-- 显示时依赖父问题 -->
-      <el-form-item
-        v-if="form.Type !== 'group' && form.ShowQuestion === 1"
-        label="显示依赖父问题"
-        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="显示触发值"
-        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.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"
-          @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.Type !== 'group' && form.IsRequired === 1"
-        label="必填依赖父问题"
-        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="必填触发值"
-        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 === 'calculation' ||
-          form.Type === 'number'
-        "
-        label="是否裁判问题"
-        prop="IsJudgeQuestion"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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 label="导出标识" 
-        prop="ExportIdentification"
-        v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-      >
-        <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="item in CriterionDictionaryList.ExportResult"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      
-      <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'"
-        prop="LimitEdit"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <el-radio-group v-model="form.LimitEdit">
-          <el-radio
-            v-for="item of $d.LimitEdit"
-            :key="`LimitEdit${item.value}`"
-            :label="item.value"
-            >{{ item.label }}</el-radio
-          >
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item 
-        label="全局阅片是否显示"
-        prop="GlobalReadingShowType"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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="问题标识"
-        v-if="form.Type !== 'group' && form.Type !== 'summary'"
-        prop="QuestionType"
-      >
-        <el-select v-model="form.QuestionType" clearable>
-          <el-option
-            v-for="item of CriterionDictionaryList.QuestionType"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item 
-        label="是否在阅片页面显示"
-        prop="IsShowInDicom"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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
-        label="注释"
-        prop="Remark"
-      >
-        <el-input v-model="form.Remark" />
-      </el-form-item>
-      <el-form-item 
-        label="序号" 
-        prop="ShowOrder"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :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="高亮标记值"
-        prop="HighlightAnswerList"
-      >
-        <el-select v-model="form.HighlightAnswerList" clearable multiple>
-          <template v-if="form.TypeValue">
             <el-option
-              v-for="item of form.TypeValue.split('|')"
+              v-for="item of $d.Criterion_Question_Type"
+              v-show="item.value !== 'class'"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 分组名称 -->
+        <el-form-item
+          v-if="form.Type === 'group'"
+          label="分组名称"
+          prop="GroupName"
+        >
+          <el-input v-model="form.GroupName" />
+        </el-form-item>
+        
+        <el-form-item
+          v-if="form.Type === 'group'"
+          label="分组名称（EN）"
+          prop="GroupEnName"
+        >
+          <el-input v-model="form.GroupEnName" />
+        </el-form-item>
+        <el-form-item
+          v-if="form.Type !== 'group'"
+          label="问题名称"
+          prop="QuestionName"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
+          ]"
+        >
+          <el-input v-model="form.QuestionName" />
+        </el-form-item>
+
+        <el-form-item
+          v-if="form.Type !== 'group'"
+          label="问题名称（EN）"
+          prop="QuestionEnName"
+          :rules="[
+            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
+          ]"
+        >
+          <el-input v-model="form.QuestionEnName" />
+        </el-form-item>
+      </div>
+      <div style="flex: 1;overflow-y:auto;">
+        <el-divider content-position="left">公有属性</el-divider>
+        <el-form-item 
+          v-if="form.Type !== 'group'" 
+          label="问题分组"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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
+          v-if="form.Type !== 'group'"
+          label="是否显示"
+          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.ShowQuestion === 1"
+          label="显示依赖父问题"
+          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="显示触发值"
+          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.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"
+            @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.Type !== 'group' && form.IsRequired === 1"
+          label="必填依赖父问题"
+          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="必填触发值"
+          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 === 'calculation' ||
+            form.Type === 'number'
+          "
+          label="是否裁判问题"
+          prop="IsJudgeQuestion"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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 label="导出标识" 
+          prop="ExportIdentification"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
+          <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="item in CriterionDictionaryList.ExportResult"
+              :key="item.Id"
+              :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        
+        <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'"
+          prop="LimitEdit"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <el-radio-group v-model="form.LimitEdit">
+            <el-radio
+              v-for="item of $d.LimitEdit"
+              :key="`LimitEdit${item.value}`"
+              :label="item.value"
+              >{{ item.label }}</el-radio
+            >
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item 
+          label="全局阅片是否显示"
+          prop="GlobalReadingShowType"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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="问题标识"
+          v-if="form.Type !== 'group' && form.Type !== 'summary'"
+          prop="QuestionType"
+        >
+          <el-select v-model="form.QuestionType" clearable>
+            <el-option
+              v-for="item of CriterionDictionaryList.QuestionType"
+              :key="item.Id"
+              :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item 
+          label="是否在阅片页面显示"
+          prop="IsShowInDicom"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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
+          label="注释"
+          prop="Remark"
+        >
+          <el-input v-model="form.Remark" />
+        </el-form-item>
+        <el-form-item 
+          label="序号" 
+          prop="ShowOrder"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <el-input-number
+            v-model="form.ShowOrder"
+            controls-position="right"
+            :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"
             />
-          </template>
-          <template v-else-if="form.DictionaryCode">
-            <el-option
-              v-for="item of highlightAnswers"
-              :key="item.Id"
-              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-              :value="item.Code"
-            />
-          </template>
-        </el-select>
-      </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="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item 
-        v-if="form.Type === 'input' || form.Type === 'textarea'"
-        label="最大长度"
-        prop="MaxAnswerLength"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-        ]"
-      >
-        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
-      </el-form-item>
-      <el-form-item 
-        v-if="form.Type === 'table' || form.Type === 'basicTable'" 
-        label="最大行数"
-        prop="MaxQuestionCount"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-        ]"
-      >
-        <el-input-number
-          v-model="form.MaxQuestionCount"
-          controls-position="right"
-          :min="0"
-          :max="10"
-        />
-      </el-form-item>
-      <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.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="单位"
-        prop="Unit"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-          />
-        </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-select>
+        </el-form-item>
+        <el-form-item
+          v-if="form.Type === 'select' || form.Type === 'radio'"
+          label="高亮标记值"
+          prop="HighlightAnswerList"
         >
-          <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'"
+          <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 highlightAnswers"
+                :key="item.Id"
+                :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+                :value="item.Code"
+              />
+            </template>
+          </el-select>
+        </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="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item 
+          v-if="form.Type === 'input' || form.Type === 'textarea'"
+          label="最大长度"
+          prop="MaxAnswerLength"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
+          ]"
+        >
+          <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
+        </el-form-item>
+        <el-form-item 
+          v-if="form.Type === 'table' || form.Type === 'basicTable'" 
+          label="最大行数"
+          prop="MaxQuestionCount"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
+          ]"
+        >
+          <el-input-number
+            v-model="form.MaxQuestionCount"
+            controls-position="right"
+            :min="0"
+            :max="10"
+          />
+        </el-form-item>
+        <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.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="单位"
+          prop="Unit"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+            />
+          </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']
+              }
+            }"
           >
-            {{ 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"
+            <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'"
             >
-              <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"
+              {{ 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"
             >
-              <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-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>
 
     <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index b0d0192f..484a8e3d 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -223,7 +223,7 @@
       :visible.sync="addOrEdit.visible"
       :close-on-click-modal="false"
       :title="`${addOrEdit.title}`"
-      width="600px"
+      width="650px"
       append-to-body
       custom-class="base-dialog-wrapper"
     >
diff --git a/src/views/dictionary/template/components/TableQsForm.vue b/src/views/dictionary/template/components/TableQsForm.vue
index 10bbf917..2964964a 100644
--- a/src/views/dictionary/template/components/TableQsForm.vue
+++ b/src/views/dictionary/template/components/TableQsForm.vue
@@ -8,501 +8,505 @@
     :rules="rules"
     label-width="130px"
   >
-    <div class="base-dialog-body">
-      <el-form-item label="类型" prop="Type">
-        <el-select
-          v-model="form.Type"
-          @change="((val)=>{qsTypeChange(val, form)})"
-        >
-          <el-option
-            v-for="item of $d.Criterion_Question_Type"
-            v-show="item.value !== 'class' && item.value !== 'group' && item.value !== 'table' && item.value !== 'basicTable'"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        label="问题名称"
-        prop="QuestionName"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-        ]"
-      >
-        <el-input
-          v-model="form.QuestionName"
-        />
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        label="问题名称（EN）"
-        prop="QuestionEnName"
-        :rules="[
-          { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-        ]"
-      >
-        <el-input
-          v-model="form.QuestionEnName"
-        />
-      </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"
-          @change="((val)=>{isShowQuestionChange(val, form)})"
-        >
-          <el-radio
-            v-for="item of $d.ShowQuestion"
-            :key="`ShowQuestion${item.value}`"
-            :label="item.value"
+    <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
+      <div style="height: 150px;">
+        <el-form-item label="类型" prop="Type">
+          <el-select
+            v-model="form.Type"
+            @change="((val)=>{qsTypeChange(val, form)})"
           >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <!-- 显示时依赖父问题 -->
-      <el-form-item
-        v-if="form.Type !== 'group' && form.ShowQuestion===1"
-        label="显示依赖父问题"
-        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="显示触发值" prop="ParentTriggerValueList">
-        <el-select v-model="form.ParentTriggerValueList" clearable multiple>
-          <el-option
-            v-for="item of parentTriggerValOptions"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-      <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"
-          @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.Type !== 'group' && form.IsRequired === 1"
-        label="必填依赖父问题"
-        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="必填触发值"
-        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 
-        :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification"
-        v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-      >
-        <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 CriterionDictionaryList.ExportResult"
-            :key="`ExportResult${item.value}`"
-            :value="parseInt(item.Code)"
-            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-          >
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item 
-        label="限制编辑" 
-        v-if="form.Type !== 'summary'"
-        prop="LimitEdit"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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' && form.Type !== 'summary'"
-        label="问题标识"
-        prop="QuestionMark"
-      >
-        <el-select
-          v-model="form.QuestionMark"
-        >
-          <el-option
-            v-for="item of CriterionDictionaryList.QuestionMark"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        label="注释"
-        prop="Remark"
-      >
-        <el-input v-model="form.Remark" />
-      </el-form-item>
-      <el-form-item 
-        label="序号" 
-        prop="ShowOrder"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <el-input-number
-          v-model="form.ShowOrder"
-          controls-position="right"
-          :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="问题分类" v-if="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>
-      
-      <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="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
-            :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">
             <el-option
-              v-for="item of form.TypeValue.split('|')"
-              :key="item"
-              :label="item"
-              :value="item"
+              v-for="item of $d.Criterion_Question_Type"
+              v-show="item.value !== 'class' && item.value !== 'group' && item.value !== 'table' && item.value !== 'basicTable'"
+              :key="item.value"
+              :value="item.value"
+              :label="item.label"
             />
-          </template>
-          <template v-else-if="form.DictionaryCode">
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="form.Type !== 'group'"
+          label="问题名称"
+          prop="QuestionName"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
+          ]"
+        >
+          <el-input
+            v-model="form.QuestionName"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="form.Type !== 'group'"
+          label="问题名称（EN）"
+          prop="QuestionEnName"
+          :rules="[
+            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
+          ]"
+        >
+          <el-input
+            v-model="form.QuestionEnName"
+          />
+        </el-form-item>
+      </div>
+      <div style="flex: 1;overflow-y:auto;">
+        <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"
+            @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.ShowQuestion===1"
+          label="显示依赖父问题"
+          prop="ParentId"
+        >
+          <el-select
+            v-model="form.ParentId"
+            clearable
+            @change="((val)=>{parentQuestionChange(val, form)})"
+          >
             <el-option
-              v-for="item of $d[form.DictionaryCode]"
+              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="显示触发值" prop="ParentTriggerValueList">
+          <el-select v-model="form.ParentTriggerValueList" clearable multiple>
+            <el-option
+              v-for="item of parentTriggerValOptions"
               :key="item.id"
               :label="item.label"
-              :value="item.value.toString()"
+              :value="item.value"
             />
-          </template>
-        </el-select>
-      </el-form-item>
-      <el-form-item 
-        v-if="form.Type === 'input' || form.Type === 'textarea'"
-        label="最大长度"
-        prop="MaxAnswerLength"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-        ]"
-      >
-        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
-      </el-form-item>
-      <!-- 是否复制前值 -->
-      <!-- <el-form-item 
-        label="是否复制前值" 
-        v-if="form.Type !== 'summary'"
-        prop="IsCopy"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <el-switch
-          v-model="form.IsCopy"
-        />
-      </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"
+          </el-select>
+        </el-form-item>
+        <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"
+            @change="((val)=>{isRequiredChange(val, form)})"
           >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
+            <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.Type !== 'group' && form.IsRequired === 1"
+          label="必填依赖父问题"
+          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="必填触发值"
+          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 
+          :label="$t('trials:readingUnit:qsList:title:ExportIdentification')" prop="ExportIdentification"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
+          <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 CriterionDictionaryList.ExportResult"
+              :key="`ExportResult${item.value}`"
+              :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item 
+          label="限制编辑" 
+          v-if="form.Type !== 'summary'"
+          prop="LimitEdit"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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' && form.Type !== 'summary'"
+          label="问题标识"
+          prop="QuestionMark"
+        >
+          <el-select
+            v-model="form.QuestionMark"
+          >
+            <el-option
+              v-for="item of CriterionDictionaryList.QuestionMark"
+              :key="item.Id"
+              :value="parseInt(item.Code)"
+              :label="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="注释"
+          prop="Remark"
+        >
+          <el-input v-model="form.Remark" />
+        </el-form-item>
+        <el-form-item 
+          label="序号" 
+          prop="ShowOrder"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <el-input-number
+            v-model="form.ShowOrder"
+            controls-position="right"
+            :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="问题分类" v-if="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>
+        
+        <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.Type === 'number' || form.Type === 'calculation'"
-        label="单位"
-        prop="Unit"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <el-radio-group
-          v-model="form.Unit"
+        <el-form-item
+          v-if="form.TableQuestionType === 0  || form.Type === 'class'"
+          label="选项"
+          prop="TypeValue"
         >
-          <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="最大上传个数"
-        prop="ImageCount"
-      >
-        <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-input
+            v-model="form.TypeValue"
+            placeholder="选项请用‘|’分割多个选项"
+            @change="typeValueChange"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="form.TableQuestionType === 2"
+          label="关联问题"
+          prop="DependParentId"
         >
-          <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'"
+          <el-select
+            v-model="form.DependParentId"
           >
-            {{ 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-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="$i18n.locale === 'zh' ? item.ValueCN : item.Value"
+              :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">
+              <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="最大长度"
+          prop="MaxAnswerLength"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
+          ]"
+        >
+          <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
+        </el-form-item>
+        <!-- 是否复制前值 -->
+        <!-- <el-form-item 
+          label="是否复制前值" 
+          v-if="form.Type !== 'summary'"
+          prop="IsCopy"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <el-switch
+            v-model="form.IsCopy"
+          />
+        </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-table-column
-              :label="$t('trials:readingUnit:label:label')"
-              show-overflow-tooltip
-              min-width="70"
+            <el-radio
+              v-for="item of $d.ValueType"
+              :key="item.id"
+              :label="item.value"
             >
-              <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"
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <!-- 数值单位 -->
+        <el-form-item
+          v-if="form.Type === 'number' || form.Type === 'calculation'"
+          label="单位"
+          prop="Unit"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <el-radio-group
+            v-model="form.Unit"
+          >
+            <el-radio
+              v-for="item of $d.ValueUnit"
+              :key="item.id"
+              :label="item.value"
             >
-              <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"
+              {{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item 
+          v-if="form.Type === 'upload'" 
+          label="最大上传个数"
+          prop="ImageCount"
+        >
+          <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'"
             >
-              <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>
+              {{ 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>
+      </div>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
diff --git a/src/views/dictionary/template/components/TableQsList.vue b/src/views/dictionary/template/components/TableQsList.vue
index 743933d7..651dcdb2 100644
--- a/src/views/dictionary/template/components/TableQsList.vue
+++ b/src/views/dictionary/template/components/TableQsList.vue
@@ -217,7 +217,7 @@
       :visible.sync="addOrEdit.visible"
       :close-on-click-modal="false"
       :title="addOrEdit.title"
-      width="600px"
+      width="650px"
       append-to-body
       custom-class="base-dialog-wrapper"
     >
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 17b84bdc..d5646930 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
@@ -8,83 +8,86 @@
     label-width="280px"
     :disabled="isLook"
   >
-    <div class="base-dialog-body">
-      <!-- 题型 -->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
-        <el-select
-          v-model="form.Type"
-          clearable
-          @change="((val)=>{qsTypeChange(val, form)})"
+    <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
+      <div style="height: 100px;">
+        <!-- 题型 -->
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
+          <el-select
+            v-model="form.Type"
+            clearable
+            @change="((val)=>{qsTypeChange(val, form)})"
+          >
+            <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>
+        <!-- 分组名称 -->
+        <el-form-item
+          v-if="(form.Type === 'group' &&  $i18n.locale !== 'en')"
+          :label="$t('trials:readingUnit:qsList:title:groupName')"
+          prop="GroupName"
         >
-          <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>
-      <!-- 分组名称 -->
-      <el-form-item
-        v-if="(form.Type === 'group' &&  $i18n.locale !== 'en')"
-        :label="$t('trials:readingUnit:qsList:title:groupName')"
-        prop="GroupName"
-      >
-        <el-input
-          v-model="form.GroupName"
-        />
-      </el-form-item>
-      <!-- 分组名称(En) -->
-      <el-form-item
-        v-if="(form.Type === 'group' &&  $i18n.locale !== 'zh')"
-        :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
-        prop="GroupEnName"
-      >
-        <el-input
-          v-model="form.GroupEnName"
-        />
-      </el-form-item>
-      <!-- 问题名称 -->
-      <el-form-item
-        v-if="(form.Type !== 'group' && $i18n.locale !== 'en' )"
-        :label="$t('trials:readingUnit:qsList:title:qsName')"
-        prop="QuestionName"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-        ]"
-      >
-        <el-input
-          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')"
-        prop="QuestionEnName"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-        ]"
-      >
-        <el-input
-          v-model="form.QuestionEnName"
-        />
-      </el-form-item>
-      <!-- 公有属性 -->
+          <el-input
+            v-model="form.GroupName"
+          />
+        </el-form-item>
+        <!-- 分组名称(En) -->
+        <el-form-item
+          v-if="(form.Type === 'group' &&  $i18n.locale !== 'zh')"
+          :label="$t('trials:readingUnit:qsList:title:groupNameEn')"
+          prop="GroupEnName"
+        >
+          <el-input
+            v-model="form.GroupEnName"
+          />
+        </el-form-item>
+        <!-- 问题名称 -->
+        <el-form-item
+          v-if="(form.Type !== 'group' && $i18n.locale !== 'en' )"
+          :label="$t('trials:readingUnit:qsList:title:qsName')"
+          prop="QuestionName"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
+          ]"
+        >
+          <el-input
+            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')"
+          prop="QuestionEnName"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
+          ]"
+        >
+          <el-input
+            v-model="form.QuestionEnName"
+          />
+        </el-form-item>
+      </div>
+      <div style="flex: 1;overflow-y:auto;">
+        <!-- 公有属性 -->
       <el-divider content-position="left">{{$t('trials:readingUnit:title:publicProperties')}}</el-divider>
       <!-- 分组 -->
       <el-form-item
@@ -820,6 +823,7 @@
           </el-table>
         </div>
       </el-form-item>
+      </div>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item v-if="!isLook">
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 e589396e..48fec499 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
@@ -8,662 +8,666 @@
     :disabled="type === 'look'"
     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"
-          clearable
-          @change="((val)=>{qsTypeChange(val, form)})"
-        >
-          <template v-for="item of $d.Criterion_Question_Type">
-            <el-option
-              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"
-            />
-          </template>
-        </el-select>
-      </el-form-item>
-      <!-- 问题名称 -->
-      <el-form-item
-        v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
-        :label="$t('trials:readingUnit:qsList:title:qsName')"
-        prop="QuestionName"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-        ]"
-      >
-        <el-input
-          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')"
-        prop="QuestionEnName"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-          { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
-        ]"
-      >
-        <el-input
-          v-model="form.QuestionEnName"
-        />
-      </el-form-item>
-      <!-- 公有属性 -->
-      <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"
+    <div class="base-dialog-body" style="height: 550px; display:flex;flex-direction: column;">
+      <div style="height: 100px;">
+        <!-- 类型 -->
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="Type">
+          <el-select
+            v-model="form.Type"
+            clearable
+            @change="((val)=>{qsTypeChange(val, form)})"
           >
-            {{ 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:ExportIdentification')" prop="ExportIdentification"
-        v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
-      >
-        <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.label"
-            :value="item.value">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- 限制编辑 -->
-      <el-form-item 
-        :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
-        v-if="form.Type !== 'summary'"
-        prop="LimitEdit"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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'"
-        prop="MaxRowCount"
-      >
-        <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"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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
-        v-if="form.Type === 'number'"
-        :label="$t('trials:readingUnit:qsList:title:valueType')"
-        prop="ValueType"
-        :rules="[
-          { required: true, message: $t('trials:researchForm:formRule:select')}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ValueType"
-        >
-        <template v-for="item of $d.ValueType">
-          <el-radio 
-            v-if="item.value !== 3"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </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')"
-        prop="ValueType"
-        :rules="[
-          { required: true, message:  $t('trials:researchForm:formRule:select')}
-        ]"
-      >
-        <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')"
-        prop="Unit"
-        :rules="[
-          { required: true, message: $t('trials:researchForm:formRule:select')}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.Unit"
-        >
-          <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')"
-        prop="CustomUnit"
-        :rules="[
-          { required: true, message: $t('trials:researchForm:formRule:select')}
-        ]"
-      >
-        <el-input v-model="form.CustomUnit" />
-      </el-form-item>
-      <div v-if="form.Type === 'number' && form.DataSource === 1" style="background: #f8f8f8;padding: 10px 0px;border-radius: 10px;position: relative;margin-bottom: 10px;">
+            <template v-for="item of $d.Criterion_Question_Type">
+              <el-option
+                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"
+              />
+            </template>
+          </el-select>
+        </el-form-item>
+        <!-- 问题名称 -->
         <el-form-item
-          :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
-          prop="CustomCalculateMark"
+          v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
+          :label="$t('trials:readingUnit:qsList:title:qsName')"
+          prop="QuestionName"
           :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
+          ]"
         >
+          <el-input
+            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')"
+          prop="QuestionEnName"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+            { max: form.Type === 'summary' ? 300 : 100, message: `${this.$t('common:ruleMessage:maxLength')} ${form.Type === 'summary' ? 300 : 100}` }
+          ]"
+        >
+          <el-input
+            v-model="form.QuestionEnName"
+          />
+        </el-form-item>
+      </div>
+      <div style="flex: 1;overflow-y:auto;">
+        <!-- 公有属性 -->
+        <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.CustomCalculateMark"
-            style="line-height: 40px;"
-            @change="(v) => CustomCalculateMarkChange(v)"
+            v-model="form.ShowQuestion"
+            @change="((val)=>{isShowQuestionChange(val, form)})"
           >
-            <div>
-              <el-radio
-                v-for="item of $d.CustomCalculateMark"
-                v-show="item.value <= 4"
-                :key="`CustomCalculateMark${item.value}`"
-                :label="item.value"
-              >
-                {{ item.label }}
-              </el-radio>
-            </div>
-            <div>
-              <el-radio
-                v-for="item of $d.CustomCalculateMark"
-                v-show="item.value > 6"
-                :key="`CustomCalculateMark${item.value}`"
-                :label="item.value"
-              >
-                {{ item.label }}
-              </el-radio>
-            </div>
+            <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-table
-          :data="form.CalculateQuestions"
-          style="margin: 10px;width: calc(100% - 20px)"
-          size="small"
+        <!-- 是否必填 -->
+        <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-table-column
-            :label="$t('trials:readingUnit:qsList:title:order')"
-            min-width="70"
+          <el-select
+            v-model="form.ParentId"
+            clearable
+            @change="((val)=>{parentQuestionChange(val, form)})"
           >
-            <template slot-scope="scope">
-              {{ scope.$index + 1 }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
-            show-overflow-tooltip
-            min-width="70"
-          >
-            <template slot-scope="scope">
-              {{ scope.$index === 0 && [1, 2, 3, 4].includes(form.CustomCalculateMark) ? null : $fd('CustomCalculateMark', form.CustomCalculateMark) }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
-            prop="TableQuestionId"
-            show-overflow-tooltip
-            min-width="180"
-          >
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.TableQuestionId" clearable>
-                <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName" :value="item.QuestionId" />
-              </el-select>
-            </template>
-          </el-table-column>
-          <el-table-column
-            :label="$t('common:action:action')"
-            prop="TableQuestionId"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <el-button
-                icon="el-icon-plus"
-                size="mini"
-                circle
-                :title="$t('common:button:add')"
-                @click="addCustomCalculateMark(scope.$index)"
-              />
-              <el-button
-                icon="el-icon-minus"
-                size="mini"
-                circle
-                :disabled="form.CalculateQuestions.length <= 2"
-                :title="$t('common:button:delete')"
-                @click="deleteCustomCalculateMark(scope.$index)"
-              />
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="font-size: 12px;color:#666;padding: 0 15px 0;text-align: right">
-          <i class="el-icon-info" />{{ [1, 2, 3, 4].includes(form.CustomCalculateMark) ? '请选择同级问题！' : '请选择表格问题下的子问题！' }}
-        </div>
-      </div>
-      <el-form-item
-        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'input') && isFromSystem"
-        :label="$t('trials:readingUnit:label:QuestionGenre')"
-        prop="TableQuestionType"
-        :rules="[
-          { required: form.Type !== 'input', message: $t('common:ruleMessage:select')}
-        ]"
-      >
-        <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="(!isFromSystem || form.TableQuestionType === 3) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class' || form.Type === 'number')"
-        :label="$t('trials:readingUnit:qsList:title:typeValue')"
-        prop="TypeValue"
-        :rules="[
-          {required: form.Type !== 'number', trigger: ['blur', 'change']},
-          {validator: validateTypeVal, trigger: ['blur', 'change']},
-          {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}]"
-      >
-        <el-input
-          v-model="form.TypeValue"
-          :placeholder="$t('trials:readingUnit:qsList:message:msg3')"
-          @change="typeValueChange"
-        />
-      </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.TableQuestionType === 2 && isFromSystem"
-        :label="$t('trials:readingUnit:qsList:title:DependParentId')"
-        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 && isFromSystem"
-        :label="$t('trials:readingUnit:qsList:title:DataTableColumn')"
-        prop="DataTableColumn"
-      >
-        <el-select v-model="form.DataTableColumn">
-          <el-option
-            v-for="item of $d.OrganColumn"
-            :key="item.id"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-form-item>
-
-      <el-form-item
-        v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2 && isFromSystem"
-        :label="$t('trials:readingUnit:label:DictionaryCode')"
-        prop="DictionaryCode"
-        :rules="[{ required: form.TableQuestionType === 3, message: $t('common:ruleMessage:select'), 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="$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="'HighlightAnswerList' + item"
+              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"
             />
-          </template>
-          <template v-else-if="form.DictionaryCode">
-            <el-option
-              v-for="item of highlightAnswers"
-              :key="item.Id"
-              :label="item.ValueCN"
-              :value="item.Code"
-            />
-          </template>
-        </el-select>
-      </el-form-item>
-      <!-- 最大字符数 -->
-      <el-form-item 
-        v-if="form.Type === 'input' || form.Type === 'textarea'"
-        :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
-        prop="MaxAnswerLength"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-        ]"
-      >
-        <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
-      </el-form-item>
-       <!-- 最大上传个数 -->
-      <el-form-item 
-        v-if="form.Type === 'upload'" 
-        :label="$t('trials:readingUnit:qsList:title:imageCount')"
-        prop="ImageCount"
-      >
-        <el-input-number
-          v-model="form.ImageCount"
-          controls-position="right"
-          :min="0"
-          :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-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-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'"
+          <el-select
+            v-model="form.RelevanceId"
+            clearable
+            @change="((val)=>{relevanceQuestionChange(val, form)})"
           >
-            {{ item.label }}
-          </el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      
-      <!-- 分类 -->
-      <el-form-item
-        v-if="form.Type === 'class'"
-        :label="$t('trials:readingUnit:label:ClassifyQuestion')"
-        prop="ClassifyTableQuestionId"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <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"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <div>
+            <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:ExportIdentification')" prop="ExportIdentification"
+          v-if="form.Type === 'radio' || form.Type === 'select' || form.Type === 'input' || form.Type === 'textarea' || form.Type === 'number' || form.Type === 'class' || form.Type === 'calculation'"
+        >
+          <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.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <!-- 限制编辑 -->
+        <el-form-item 
+          :label="$t('trials:readingUnit:qsList:title:limitEdit')" 
+          v-if="form.Type !== 'summary'"
+          prop="LimitEdit"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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'"
+          prop="MaxRowCount"
+        >
+          <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"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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
+          v-if="form.Type === 'number'"
+          :label="$t('trials:readingUnit:qsList:title:valueType')"
+          prop="ValueType"
+          :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:select')}
+          ]"
+        >
+          <el-radio-group
+            v-model="form.ValueType"
+          >
+          <template v-for="item of $d.ValueType">
+            <el-radio 
+              v-if="item.value !== 3"
+              :key="item.id"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
+          </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')"
+          prop="ValueType"
+          :rules="[
+            { required: true, message:  $t('trials:researchForm:formRule:select')}
+          ]"
+        >
+          <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')"
+          prop="Unit"
+          :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:select')}
+          ]"
+        >
+          <el-radio-group
+            v-model="form.Unit"
+          >
+            <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')"
+          prop="CustomUnit"
+          :rules="[
+            { required: true, message: $t('trials:researchForm:formRule:select')}
+          ]"
+        >
+          <el-input v-model="form.CustomUnit" />
+        </el-form-item>
+        <div v-if="form.Type === 'number' && form.DataSource === 1" style="background: #f8f8f8;padding: 10px 0px;border-radius: 10px;position: relative;margin-bottom: 10px;">
+          <el-form-item
+            :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
+            prop="CustomCalculateMark"
+            :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+          >
+            <el-radio-group
+              v-model="form.CustomCalculateMark"
+              style="line-height: 40px;"
+              @change="(v) => CustomCalculateMarkChange(v)"
+            >
+              <div>
+                <el-radio
+                  v-for="item of $d.CustomCalculateMark"
+                  v-show="item.value <= 4"
+                  :key="`CustomCalculateMark${item.value}`"
+                  :label="item.value"
+                >
+                  {{ item.label }}
+                </el-radio>
+              </div>
+              <div>
+                <el-radio
+                  v-for="item of $d.CustomCalculateMark"
+                  v-show="item.value > 6"
+                  :key="`CustomCalculateMark${item.value}`"
+                  :label="item.value"
+                >
+                  {{ item.label }}
+                </el-radio>
+              </div>
+            </el-radio-group>
+          </el-form-item>
           <el-table
-            ref="CalculateTable"
-            :data="ClassifyAlgorithmsList"
+            :data="form.CalculateQuestions"
             style="margin: 10px;width: calc(100% - 20px)"
             size="small"
           >
-            <!-- 运算类型 -->
             <el-table-column
-              :label="$t('trials:readingUnit:label:label')"
+              :label="$t('trials:readingUnit:qsList:title:order')"
+              min-width="70"
+            >
+              <template slot-scope="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
               show-overflow-tooltip
               min-width="70"
             >
               <template slot-scope="scope">
-                {{ scope.row.label }}
+                {{ scope.$index === 0 && [1, 2, 3, 4].includes(form.CustomCalculateMark) ? null : $fd('CustomCalculateMark', form.CustomCalculateMark) }}
               </template>
             </el-table-column>
-            <!-- 运算类型 -->
             <el-table-column
-              :label="$t('trials:readingUnit:label:gt')"
+              :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
+              prop="TableQuestionId"
               show-overflow-tooltip
-              min-width="128"
+              min-width="180"
             >
               <template slot-scope="scope">
-                <el-input-number v-model="scope.row.gt"></el-input-number>
+                <el-select v-model="scope.row.TableQuestionId" clearable>
+                  <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName" :value="item.QuestionId" />
+                </el-select>
               </template>
             </el-table-column>
-            <!-- 运算类型 -->
             <el-table-column
-              :label="$t('trials:readingUnit:label:lt')"
+              :label="$t('common:action:action')"
+              prop="TableQuestionId"
               show-overflow-tooltip
-              min-width="128"
             >
               <template slot-scope="scope">
-                <el-input-number v-model="scope.row.lt"></el-input-number>
+                <el-button
+                  icon="el-icon-plus"
+                  size="mini"
+                  circle
+                  :title="$t('common:button:add')"
+                  @click="addCustomCalculateMark(scope.$index)"
+                />
+                <el-button
+                  icon="el-icon-minus"
+                  size="mini"
+                  circle
+                  :disabled="form.CalculateQuestions.length <= 2"
+                  :title="$t('common:button:delete')"
+                  @click="deleteCustomCalculateMark(scope.$index)"
+                />
               </template>
             </el-table-column>
           </el-table>
+          <div style="font-size: 12px;color:#666;padding: 0 15px 0;text-align: right">
+            <i class="el-icon-info" />{{ [1, 2, 3, 4].includes(form.CustomCalculateMark) ? '请选择同级问题！' : '请选择表格问题下的子问题！' }}
+          </div>
         </div>
-      </el-form-item>
+        <el-form-item
+          v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'input') && isFromSystem"
+          :label="$t('trials:readingUnit:label:QuestionGenre')"
+          prop="TableQuestionType"
+          :rules="[
+            { required: form.Type !== 'input', message: $t('common:ruleMessage:select')}
+          ]"
+        >
+          <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="(!isFromSystem || form.TableQuestionType === 3) && (form.Type === 'select' || form.Type === 'radio' || form.Type === 'calculation' || form.Type === 'class' || form.Type === 'number')"
+          :label="$t('trials:readingUnit:qsList:title:typeValue')"
+          prop="TypeValue"
+          :rules="[
+            {required: form.Type !== 'number', trigger: ['blur', 'change']},
+            {validator: validateTypeVal, trigger: ['blur', 'change']},
+            {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}]"
+        >
+          <el-input
+            v-model="form.TypeValue"
+            :placeholder="$t('trials:readingUnit:qsList:message:msg3')"
+            @change="typeValueChange"
+          />
+        </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.TableQuestionType === 2 && isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:DependParentId')"
+          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 && isFromSystem"
+          :label="$t('trials:readingUnit:qsList:title:DataTableColumn')"
+          prop="DataTableColumn"
+        >
+          <el-select v-model="form.DataTableColumn">
+            <el-option
+              v-for="item of $d.OrganColumn"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item
+          v-if="form.TableQuestionType === 3 || form.TableQuestionType === 2 && isFromSystem"
+          :label="$t('trials:readingUnit:label:DictionaryCode')"
+          prop="DictionaryCode"
+          :rules="[{ required: form.TableQuestionType === 3, message: $t('common:ruleMessage:select'), 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="$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="'HighlightAnswerList' + item"
+                :label="item"
+                :value="item"
+              />
+            </template>
+            <template v-else-if="form.DictionaryCode">
+              <el-option
+                v-for="item of highlightAnswers"
+                :key="item.Id"
+                :label="item.ValueCN"
+                :value="item.Code"
+              />
+            </template>
+          </el-select>
+        </el-form-item>
+        <!-- 最大字符数 -->
+        <el-form-item 
+          v-if="form.Type === 'input' || form.Type === 'textarea'"
+          :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')"
+          prop="MaxAnswerLength"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
+          ]"
+        >
+          <el-input-number v-model="form.MaxAnswerLength" :min="0"></el-input-number>
+        </el-form-item>
+        <!-- 最大上传个数 -->
+        <el-form-item 
+          v-if="form.Type === 'upload'" 
+          :label="$t('trials:readingUnit:qsList:title:imageCount')"
+          prop="ImageCount"
+        >
+          <el-input-number
+            v-model="form.ImageCount"
+            controls-position="right"
+            :min="0"
+            :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')"
+          prop="ClassifyTableQuestionId"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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"
+          :rules="[
+            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          ]"
+        >
+          <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>
     <div v-if="type !== 'look'" class="base-dialog-footer" style="text-align:right;margin-top:10px;">
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue
index d2892cda..ec04179b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue
@@ -151,7 +151,7 @@
       <el-table-column
         prop=""
         :label="$t('common:action:action')"
-        width="150"
+        width="200"
         show-overflow-tooltip
       >
         <template slot-scope="scope">