diff --git a/src/views/dictionary/template/components/CriterionDictionary.vue b/src/views/dictionary/template/components/CriterionDictionary.vue
index a2cbdc69..97df91c9 100644
--- a/src/views/dictionary/template/components/CriterionDictionary.vue
+++ b/src/views/dictionary/template/components/CriterionDictionary.vue
@@ -213,7 +213,6 @@ export default {
       }).then(res => {
         this.loading = false
         this.list = res.Result
-        console.log(this.$d.GlobalAssessType)
       })
     },
     handleAdd() {
@@ -265,7 +264,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 /deep/ .el-form-item__content{
   width: calc(100% - 110px);
 }
diff --git a/src/views/dictionary/template/components/CriterionDictionaryConfig.vue b/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
index edd996dc..c8569eef 100644
--- a/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
+++ b/src/views/dictionary/template/components/CriterionDictionaryConfig.vue
@@ -62,7 +62,7 @@
         <template slot-scope="scope">
           <div>
             <el-radio-group v-model="scope.row.CrterionDictionaryGroup" @change="(v) => {crterionDictionaryGroupChange(v, scope.row)}" size="mini">
-              <el-radio-button v-for="item of $d.CrterionDictionaryGroup" :label="item.value">{{item.label}}</el-radio-button>
+              <el-radio-button v-for="item of $d.CrterionDictionaryGroup" :label="item.value" :key="item.id">{{item.label}}</el-radio-button>
             </el-radio-group>
           </div>
         </template>
@@ -158,7 +158,6 @@ export default {
   },
   mounted() {
     this.getList()
-    console.log(this.$d[this.parentCode])
   },
   methods: {
     crterionDictionaryGroupChange(v, row) {
@@ -231,7 +230,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 /deep/ .el-form-item__content{
   width: calc(100% - 110px);
 }
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index b659a9f3..76512d45 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -124,10 +124,10 @@
       >
         <el-select v-model="form.LesionType" clearable>
           <el-option
-            v-for="item of $d.LesionType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
+            v-for="item of lesionTypeList"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="item.ValueCN"
           />
         </el-select>
       </el-form-item>
@@ -710,6 +710,7 @@ export default {
       CriterionDictionaryList: [],
       groupClassifyList: [],
       highlightAnswers: [],
+      lesionTypeList: []
     }
   },
   watch: {
@@ -753,9 +754,18 @@ export default {
         this.groupClassifyList = res.Result.GroupClassify
       })
     },
+    getLesionTypeDictionary() {
+      getCriterionDictionary({
+        ReadingCriterionId: this.data.ReadingQuestionCriterionSystemId,
+        DictionaryCode: 'LesionType',
+      }).then((res) => {
+        this.lesionTypeList = res.Result.LesionType
+      })
+    },
     async initForm() {
       await this.getGroupOptions()
       await this.getParentQuestions()
+      await this.getLesionTypeDictionary()
       await this.getLesionType()
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index d4d31ade..ed7741cf 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -170,7 +170,7 @@
               <el-button
                 type="primary"
                 size="mini"
-                :disabled="scope.row.Type !== 'table'"
+                :disabled="!(scope.row.Type === 'table' || scope.row.Type === 'basicTable')"
                 @click="handleConfig(scope.row)"
               >
                 表格问题
diff --git a/src/views/dictionary/template/components/OrgansTbl.vue b/src/views/dictionary/template/components/OrgansTbl.vue
index 639676d7..efd5127c 100644
--- a/src/views/dictionary/template/components/OrgansTbl.vue
+++ b/src/views/dictionary/template/components/OrgansTbl.vue
@@ -5,7 +5,7 @@
       <el-form :inline="true" size="mini">
         <el-form-item label="器官类型">
           <el-select v-model="searchData.OrganType" clearable style="width:130px;">
-            <el-option v-for="item of CriterionDictionaryOrganTypeList.OrganType" :key="item.Id" :value="parseInt(item.Code)" :label="item.ValueCN" />
+            <el-option v-for="item of CriterionDictionaryOrganTypeList && CriterionDictionaryOrganTypeList.OrganType" :key="item.Id" :value="parseInt(item.Code)" :label="item.ValueCN" />
           </el-select>
         </el-form-item>
         <el-form-item label="部位">
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionForm.vue
deleted file mode 100644
index 7936bf69..00000000
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionForm.vue
+++ /dev/null
@@ -1,506 +0,0 @@
-<template>
-  <el-form
-    v-if="isRender"
-    ref="measurementForm"
-    v-loading="loading"
-    :model="questionForm"
-    size="mini"
-    class="measurement-form"
-  >
-    <div class="base-dialog-body">
-      <div style="display: flex;justify-content: space-between;">
-        <h3 v-if="questionName" style="color: #ddd;padding: 5px 0px;margin: 0;">
-          <!-- {{ `${questionName} (${orderMark}${String(rowIndex).padStart(2, '0')})` }} -->
-          {{ lesionName }}
-        </h3>
-        <!-- 关闭 -->
-        <div>
-          <i class="el-icon-circle-close" style="font-size: 25px;cursor: pointer;" @click="handleClose" />
-        </div>
-      </div>
-      <el-form-item
-        v-for="qs in questions"
-        v-show="qs.ShowQuestion!==2"
-        :key="qs.Id"
-        :label="`${qs.QuestionName}`"
-        :prop="qs.Id"
-        :rules="[
-          { required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue))) && qs.Type!=='group' && qs.Type!=='summary',
-            message:['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
-        ]"
-      >
-
-        <!-- 输入框 -->
-        <template v-if="qs.Type==='input'">
-          <el-input
-            v-model="questionForm[qs.Id]"
-            :disabled="!isCurrentTask || readingTaskState>=2 "
-            @change="((val)=>{formItemChange(val, qs)})"
-          />
-        </template>
-        <!-- 数值类型 -->
-        <template v-if="qs.Type==='number'">
-          <el-input
-            v-model="questionForm[qs.Id]"
-            :disabled="!isCurrentTask || readingTaskState>=2 "
-            @change="((val)=>{formItemChange(val, qs)})"
-            @blur="limitBlur(qs.Id, qs.ValueType)"
-          >
-            <template v-if="qs.Unit" slot="append">
-              {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-            </template>
-          </el-input>
-        </template>
-        <!-- 自动计算 -->
-        <template v-if="qs.Type==='calculation'">
-          <el-input
-            v-model="questionForm[qs.Id]"
-            disabled
-            @change="((val)=>{formItemChange(val, qs)})"
-          >
-            <template v-if="qs.Unit" slot="append">
-              {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
-            </template>
-          </el-input>
-        </template>
-        <!-- 多行文本输入框 -->
-        <el-input
-          v-if="qs.Type==='textarea'"
-          v-model="questionForm[qs.Id]"
-          type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
-          :disabled="!isCurrentTask || readingTaskState>=2"
-          @change="((val)=>{formItemChange(val, qs)})"
-        />
-
-        <el-select
-          v-if="qs.Type==='select'"
-          v-model="questionForm[qs.Id]"
-          filterable
-          :placeholder="$t('common:placeholder:select')"
-          :disabled="!isCurrentTask || readingTaskState>=2"
-          @change="((val)=>{formItemChange(val, qs)})"
-        >
-          <template v-if="qs.DictionaryCode">
-            <el-option
-              v-for="item of $d[qs.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
-          </template>
-          <template v-else>
-            <el-option
-              v-for="val in qs.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val"
-            />
-          </template>
-
-        </el-select>
-        <!-- 单选 -->
-        <el-radio-group
-          v-if="qs.Type==='radio'"
-          v-model="questionForm[qs.id]"
-          :disabled="!isCurrentTask || readingTaskState>=2"
-        >
-          <el-radio
-            v-for="val in qs.options.split('|')"
-            :key="val"
-            :label="val"
-          >
-            {{ val }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-    </div>
-
-    <div
-      v-if="isCurrentTask && readingTaskState<2"
-      class="base-dialog-footer"
-      style="text-align:right;margin-top:10px;"
-    >
-      <!-- 删除 -->
-      <el-button
-        v-if="isCurrentTaskAdd !== 'False'"
-        size="mini"
-        @click="handleDelete"
-      >
-        {{ $t('common:button:delete') }}
-      </el-button>
-      <!-- 保存 -->
-      <el-button
-        size="mini"
-        @click="handleSave"
-      >
-        {{ $t('common:button:save') }}
-      </el-button>
-    </div>
-  </el-form>
-</template>
-<script>
-import { submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
-import DicomEvent from './../DicomEvent'
-// import store from '@/store'
-export default {
-  name: 'MeasurementForm',
-  props: {
-    questions: {
-      type: Array,
-      default() { return [] }
-    },
-    answers: {
-      type: Object,
-      default() { return {} }
-    },
-    lesionType: {
-      type: Number,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      required: true
-    },
-    parentQsId: {
-      type: String,
-      required: true
-    },
-    isCurrentTask: {
-      type: Boolean,
-      required: true
-    },
-    readingTaskState: {
-      type: Number,
-      required: true
-    },
-    isBaseLineTask: {
-      type: Boolean,
-      required: true
-    },
-    orderMark: {
-      type: String,
-      default: ''
-    },
-    questionName: {
-      type: String,
-      required: true
-    },
-    rowIndex: {
-      type: String,
-      required: true
-    },
-    tableQuestions: {
-      type: Array,
-      default() { return [] }
-    }
-  },
-  data() {
-    return {
-      questionForm: {},
-      loading: false,
-      trialId: '',
-      originalQuestionForm: {},
-      isRender: false,
-      toolType: '',
-      lesionName: '',
-      isCurrentTaskAdd: 'False',
-      lesionMark: '',
-      pictureBaseStr: '',
-      digitPlaces: 2
-    }
-  },
-  mounted() {
-    this.trialId = this.$route.query.trialId
-    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
-    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-    this.initForm()
-    DicomEvent.$on('handleImageQualityAbnormal', () => {
-
-    })
-  },
-  beforeDestroy() {
-    DicomEvent.$off('handleImageQualityAbnormal')
-  },
-  methods: {
-    async initForm() {
-      const loading = this.$loading({ fullscreen: true })
-      this.questions.forEach(item => {
-        var val = this.answers[item.Id]
-        if (item.DictionaryCode) {
-          val = isNaN(parseInt(this.answers[item.Id])) ? this.answers[item.Id] : parseInt(this.answers[item.Id])
-        }
-
-        this.$set(this.questionForm, item.Id, val)
-      })
-      this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
-      this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
-      if (this.questionForm.RowId) {
-        this.$set(this.questionForm, 'saveTypeEnum', 2)
-      } else {
-        this.$set(this.questionForm, 'saveTypeEnum', 0)
-      }
-      this.$set(this.questionForm, 'IsDicomReading', this.answers.IsDicomReading !== 'False')
-      if (!this.questionForm.LesionType) {
-        this.$set(this.questionForm, 'LesionType', this.lesionType)
-      }
-      this.lesionName = this.getLesionInfo(this.orderMark, this.rowIndex)
-      this.isCurrentTaskAdd = this.answers.IsCurrentTaskAdd ? this.answers.IsCurrentTaskAdd : 'True'
-      this.lesionMark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
-      this.originalQuestionForm = { ...this.questionForm }
-      this.isRender = true
-      loading.close()
-    },
-    getLesionName(orderMark, rowIndex) {
-      var lessionName = ''
-      var rowIndexArr = rowIndex.split('.')
-      var x = parseInt(rowIndexArr[0])
-      var y = parseInt(rowIndexArr[1])
-      if (y > 0) {
-        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
-        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
-      } else {
-        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
-      }
-
-      return lessionName
-    },
-    getLesionInfo(orderMark, rowIndex) {
-      var arr = []
-      var lessionName = ''
-      var rowIndexArr = rowIndex.split('.')
-      var x = parseInt(rowIndexArr[0])
-      var y = parseInt(rowIndexArr[1])
-      if (y > 0) {
-        y = String.fromCharCode(parseInt(rowIndexArr[1]) - 1 + 65 + 32)
-        lessionName = `${orderMark}${String(x).padStart(2, '0')}${y}`
-        arr.push(lessionName)
-      } else {
-        lessionName = `${orderMark}${String(x).padStart(2, '0')}`
-        arr.push(lessionName)
-      }
-      return arr.join(' ')
-    },
-    getQuestionId(questionMark) {
-      var idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
-      if (idx > -1) {
-        return this.questions[idx].Id
-      } else {
-        return ''
-      }
-    },
-    async formItemChange(v, question) {
-      if (this.questionForm.RowId) {
-        this.$set(this.questionForm, 'saveTypeEnum', 1)
-      } else {
-        this.$set(this.questionForm, 'saveTypeEnum', 0)
-      }
-      if (question.QuestionMark === 1001 || question.QuestionMark === 1002) {
-        this.questionForm[this.getQuestionId(1003)] = this.calculate([1001, 1002], '-')
-      }
-      const area1 = this.getQuestionVal(1001)
-      const area2 = this.getQuestionVal(1002)
-      const diff = this.getQuestionVal(1003)
-      this.$emit('resetQuestions', { area1, area2, diff, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
-    },
-    calculate(qsMarkArr, type) {
-      var num = 0
-      for (let i = 0; i < qsMarkArr.length; i++) {
-        const mark = qsMarkArr[i]
-        const v = this.questionForm[this.getQuestionId(mark)]
-        if (isNaN(parseFloat(v))) {
-          num = null
-          break
-        }
-        if (i === 0) {
-          num = parseFloat(v)
-        } else {
-          switch (type) {
-            case '-':
-              num -= parseFloat(v)
-              break
-          }
-        }
-      }
-
-      return num === null ? num : num.toFixed(this.digitPlaces)
-    },
-    limitBlur(qId, valueType) {
-      const value = this.questionForm[qId]
-      if (isNaN(parseInt(value))) return
-      if (valueType === 0) {
-        this.$set(this.questionForm, qId, parseInt(value))
-      } else if (valueType === 3) {
-        this.$set(this.questionForm, qId, parseFloat(value))
-      } else {
-        this.$set(this.questionForm, qId, parseFloat(value).toFixed(this.digitPlaces))
-      }
-    },
-    returnFloat(num) {
-      if (num) return
-      var value = Math.round(parseFloat(num) * 100) / 100
-      var s = value.toString().split('.')
-      if (s.length === 1) {
-        value = value.toString() + '.00'
-        return value
-      }
-      if (s.length > 1) {
-        if (s[1].length < 2) {
-          value = value.toString() + '0'
-        }
-        return value
-      }
-    },
-    getQuestionVal(questionMark) {
-      const idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
-      if (idx > -1) {
-        const questionId = this.questions[idx].Id
-        const answer = this.questionForm[questionId]
-        if (isNaN(parseFloat(answer))) {
-          return answer
-        } else {
-          return parseFloat(answer)
-        }
-      } else {
-        return ''
-      }
-    },
-    async handleSave() {
-      const valid = await this.$refs.measurementForm.validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
-      try {
-        var answers = []
-        var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
-        for (const k in this.questionForm) {
-          if (reg.test(k)) {
-            if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
-              answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
-            }
-          }
-        }
-
-        var params = {
-          questionId: this.parentQsId,
-          rowId: this.questionForm.RowId,
-          rowIndex: this.answers.RowIndex,
-          visitTaskId: this.visitTaskId,
-          trialId: this.trialId,
-          answerList: answers
-        }
-        const res = await submitTableQuestion(params)
-        if (res.IsSuccess) {
-          // 保存成功！
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.$set(this.questionForm, 'saveTypeEnum', 2)
-          this.originalQuestionForm = { ...this.questionForm }
-          this.$set(this.questionForm, 'RowId', res.Result.RowId)
-          const area1 = this.getQuestionVal(1001)
-          const area2 = this.getQuestionVal(1002)
-          const diff = this.getQuestionVal(1003)
-          this.$emit('resetQuestions', { area1, area2, diff, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
-          this.$emit('close')
-
-          DicomEvent.$emit('refreshQuestions')
-          DicomEvent.$emit('getReportInfo', true)
-        }
-        loading.close()
-      } catch (e) {
-        console.log(e)
-        loading.close()
-      }
-    },
-    async handleDelete() {
-      const loading = this.$loading({ fullscreen: true })
-      try {
-        const confirm = await this.$confirm(
-          this.$t('trials:reading:warnning:msg48'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        if (this.questionForm.RowId) {
-          var param = {
-            visitTaskId: this.visitTaskId,
-            questionId: this.parentQsId,
-            rowId: this.questionForm.RowId
-          }
-          const res = await deleteReadingRowAnswer(param)
-          if (res.IsSuccess) {
-            this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-            DicomEvent.$emit('getReportInfo', true)
-            // '删除成功！'
-            this.$message.success(this.$t('common:message:deletedSuccessfully'))
-          }
-        } else {
-          this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-        }
-        loading.close()
-      } catch (e) {
-        loading.close()
-        console.log(e)
-      }
-    },
-    async handleClose() {
-      if (!this.questionForm.RowId) {
-        // '当前数据未保存。如果关闭窗口，将会删除，是否继续？'
-        const confirm = await this.$confirm(
-          this.$t('trials:reading:warnning:msg60'),
-          {
-            type: 'warning',
-            distinguishCancelAndClose: true
-          }
-        )
-        if (confirm !== 'confirm') return
-        this.$emit('close', { lesionType: this.lesionType, rowIndex: this.rowIndex, visitTaskId: this.visitTaskId })
-      } else {
-        this.$emit('close')
-      }
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.measurement-form{
-  /deep/ .el-form-item__label{
-    color: #c3c3c3;
-    text-align: left;
-  }
-  /deep/ .el-input .el-input__inner{
-    background-color: transparent;
-    color: #ddd;
-    border: 1px solid #5e5e5e;
-  }
-  /deep/ .el-form-item{
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-start;
-  }
-  /deep/ .el-form-item__content{
-    flex: 1;
-  }
-  /deep/ .el-input.is-disabled .el-input__inner{
-    background-color: #646464a1;
-  }
-  /deep/ .el-select.is-disabled .el-input__inner{
-    background-color: #646464a1;
-  }
-  /deep/ .el-button--mini, .el-button--mini.is-round {
-    padding: 7px 10px;
-  }
-  .el-form-item__content
-  .el-select{
-    width: 100%;
-  }
-  .input-width1{
-    width: calc(100% -60px)!important;
-  }
-  .input-width2{
-    width: 100% !important;
-  }
-}
-
-</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionFormItem.vue
new file mode 100644
index 00000000..eb5448a9
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionFormItem.vue
@@ -0,0 +1,864 @@
+<template>
+  <div class="criterion-form-item">
+    <div
+      v-if="!!question.GroupName && question.Type==='group'"
+      style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;"
+    >
+      {{ question.GroupName }}
+    </div>
+    <div
+      v-if=" question.Type==='table'"
+      style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
+    >
+      <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
+        <span>{{ question.QuestionName }}</span>
+        <el-button size="mini" v-if="readingTaskState<2" @click="openAddTableCol(question)">
+          {{ $t('common:button:add') }}
+        </el-button>
+      </div>
+      <el-table
+        :data="questionForm[question.Id]">
+        <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{question.OrderMark}}{{scope.$index + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          :prop="item.Id"
+          :label="item.QuestionName"
+          :key="item.Id"
+          v-for="item of question.TableQuestions.Questions"
+          show-overflow-tooltip
+          :render-header="renderHeader"
+        >
+          <template slot-scope="scope">
+            <span v-if="item.Type === 'upload'">
+              {{scope.row[item.Id] === '' ? '' : scope.row[item.Id].split('|').length}}
+            </span>
+            <span v-else-if="item.Type === 'number'">
+              {{scope.row[item.Id] ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) : null}}
+            </span>
+            <span v-else>
+              {{scope.row[item.Id]}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column
+            :label="$t('common:action:action')"
+            show-overflow-tooltip
+            width="100px"
+            v-if="readingTaskState < 2"
+            fixed="right"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">
+              {{$t('common:button:edit')}}
+            </el-button>
+            <el-button type="text" size="mini" v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || IsBaseline" @click="deleteTableCol(question, scope.$index)">
+              {{$t('common:button:delete')}}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <template v-else>
+      <el-form-item
+        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion===0"
+        :label="`${question.QuestionName}`"
+        :prop="question.Id"
+        :rules="[
+          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (question.RelevanceValueList.includes(questionForm[question.RelevanceId])))) && question.Type!=='group' && question.Type!=='summary',
+            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
+      >
+        <!-- 输入框 -->
+        <el-input
+          v-if="question.Type==='input'"
+          v-model="questionForm[question.Id]"
+          :disabled="question.TableQuestionType === 2"
+        />
+        <!-- 多行文本输入框 -->
+        <el-input
+          v-if="question.Type==='textarea'"
+          v-model="questionForm[question.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+        />
+        <!-- 下拉框 -->
+        <el-select
+          v-if="question.Type==='select'"
+          v-model="questionForm[question.Id]"
+          clearable
+          :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.TableQuestionType === 1">
+            <el-option
+              v-for="item in organList"
+              :key="item.Id"
+              :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]"
+            />
+          </template>
+          <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </template>
+          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+            <el-option
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :value="item.value"
+              :label="item.label"
+            />
+          </template>
+          <template v-else>
+            <el-option
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+              :value="val"
+            />
+          </template>
+
+        </el-select>
+        <!-- 单选 -->
+        <el-radio-group
+          v-if="question.Type==='radio'"
+          v-model="questionForm[question.Id]"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <el-radio
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
+            {{ val }}
+          </el-radio>
+        </el-radio-group>
+        <!-- 复选框 -->
+        <el-checkbox-group
+          v-if="question.Type==='checkbox'"
+          v-model="questionForm[question.Id]"
+        >
+          <el-checkbox
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
+            {{ val }}
+          </el-checkbox>
+        </el-checkbox-group>
+        <!-- 自动分类 -->
+        <el-input
+          v-if="question.Type === 'class'"
+          v-model="questionForm[question.Id]"
+          disabled
+        />
+        <!-- 自动计算 -->
+        <!-- :precision="2" :step="0.1" :max="10" -->
+        <el-input
+          v-if="question.Type==='calculation'"
+          v-model="questionForm[question.Id]"
+          @input="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')"
+          disabled
+        />
+        <!-- 自增 -->
+        <el-input
+          v-if="question.Type==='increment'"
+          v-model="questionForm[question.Id]"
+          disabled
+        />
+        <!-- 数值 -->
+        <!-- :precision="2" :step="0.1" :max="10" -->
+
+        <el-input
+          type="number"
+          v-if="question.Type === 'number' && question.DataSource !== 1"
+          @change="((val)=>{formItemNumberChange(val, question)})"
+          onblur="value=parseFloat(value).toFixed(parseInt(localStorage.getItem('digitPlaces')));console.log(localStorage.getItem('digitPlaces'))"
+          @input="limitInput($event, questionForm, question.Id)"
+          v-model="questionForm[question.Id]"
+        >
+          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
+          <template slot="append" v-else-if="question.ValueType === 2">%</template>
+        </el-input>
+        <el-input
+          type="number"
+          v-if="question.Type === 'number' && question.DataSource === 1"
+          onblur="value=parseFloat(value).toFixed(parseInt(localStorage.getItem('digitPlaces')));console.log(localStorage.getItem('digitPlaces'))"
+          @input="limitInput($event, questionForm, question.Id)"
+          :disabled="question.DataSource === 1"
+          v-model="questionForm[question.Id]"
+        >
+          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
+          <template slot="append" v-else-if="question.ValueType === 2">%</template>
+        </el-input>
+        <!-- 上传图像 -->
+        <el-upload
+          v-if="question.Type==='upload'"
+          :action="question.FileType"
+          :limit="question.ImageCount"
+          :on-preview="handlePictureCardPreview"
+          :before-upload="(file) => {return handleBeforeUpload(file, question.FileType)}"
+          :http-request="uploadScreenshot"
+          :on-remove="handleRemove"
+          :file-list="fileList"
+          :class="{disabled:fileList.length >= question.ImageCount}"
+        >
+          <el-button slot="default" class="el-icon-plus">
+            {{this.$t('common:button:upload')}}
+          </el-button>
+<!--          <div slot="file" slot-scope="{file}">--> 
+<!--            <div class="el-upload-list__item-name"></div>-->
+<!--&lt;!&ndash;            <img&ndash;&gt;-->
+<!--&lt;!&ndash;              class="el-upload-list__item-thumbnail"&ndash;&gt;-->
+<!--&lt;!&ndash;              :src="OSSclientConfig.basePath + file.url"&ndash;&gt;-->
+<!--&lt;!&ndash;              alt=""&ndash;&gt;-->
+<!--&lt;!&ndash;            >&ndash;&gt;-->
+<!--            <span class="el-upload-list__item-actions">-->
+<!--              <span-->
+<!--                class="el-upload-list__item-preview"-->
+<!--                @click="handlePictureCardPreview(file)"-->
+<!--              >-->
+<!--                <i class="el-icon-zoom-in" />-->
+<!--              </span>-->
+
+<!--              <span-->
+<!--                v-if="readingTaskState < 2"-->
+<!--                class="el-upload-list__item-delete"-->
+<!--                @click="handleRemove(file)"-->
+<!--              >-->
+<!--                <i class="el-icon-delete" />-->
+<!--              </span>-->
+<!--            </span>-->
+<!--          </div>-->
+        </el-upload>
+        <!-- <el-dialog
+          v-if="question.Type==='upload'"
+          append-to-body
+          :visible.sync="imgVisible"
+          width="600px"
+        >
+          <el-image :src="imageUrl" width="100%">
+            <div slot="placeholder" class="image-slot">
+              加载中<span class="dot">...</span>
+            </div>
+          </el-image>
+        </el-dialog> -->
+        <viewer
+          v-if="question.Type==='upload' && imgVisible"
+          :ref="imageUrl"
+          style="margin:0 10px;"
+          :images="[imageUrl]"
+        >
+          <img
+            v-show="false"
+            crossorigin="anonymous"
+            :src="imageUrl"
+            alt="Image"
+          >
+        </viewer>
+      </el-form-item>
+    </template>
+
+    <template v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table'">
+      <QuestionFormItem
+        v-for="(item) in question.Childrens"
+        :key="item.Id"
+        :question="item"
+        :IsBaseline="IsBaseline"
+        :reading-task-state="readingTaskState"
+        :question-form="questionForm"
+        :visit-task-id="visitTaskId"
+        :criterion-id="criterionId"
+        :CalculationList="CalculationList"
+        @formItemNumberChange="formItemNumberChange"
+        @setFormItemData="setFormItemData"
+        @resetFormItemData="resetFormItemData"
+      />
+    </template>
+  </div>
+</template>
+<script>
+import { uploadReadingAnswerImage, getTrialOrganList, deleteReadingRowAnswer, getCustomTableQuestionPreview, getQuestionCalculateRelation, submitTableQuestion } from '@/api/trials'
+import BaseModel from '@/components/BaseModel'
+import DicomEvent from './../DicomEvent'
+export default {
+  name: 'QuestionFormItem',
+  components: { BaseModel },
+  props: {
+    IsBaseline: {
+      type: Boolean,
+      required: true
+    },
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    question: {
+      type: Object,
+      default() {
+        return []
+      }
+    },
+    criterionId: {
+      type: String,
+      required: true
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    },
+    visitTaskId: {
+      type: String,
+      default: ''
+    },
+    CalculationList: {
+      type: Array,
+      default: []
+    }
+  },
+  data() {
+    return {
+      addOrEdit: { visible: false, title: '', width: '400px' },
+      fileList: [],
+      accept: '.png,.jpg,.jpeg',
+      imgVisible: false,
+      imageUrl: '',
+      urls: [],
+      organList: [],
+      QuestionsList: [],
+      QuestionsForm: {},
+      AnswersList: [],
+      loading: false,
+      RowIndex: 0,
+      RowId: null,
+      digitPlaces: 0,
+      CalculationTabelList: []
+    }
+  },
+  watch: {
+    questionForm: {
+      deep: true,
+      immediate: true,
+      handler(v, oldv) {
+        try {
+          if (!v[this.question.Id] || !oldv[this.question.Id]) return
+        } catch (e) {
+        }
+        this.formItemNumberChange(this.question.Id, false)
+      }
+    },
+  },
+  mounted() {
+    this.digitPlaces = localStorage.getItem('digitPlaces') ? parseInt(localStorage.getItem('digitPlaces')) : 0
+    if (this.question.Type === 'class') {
+      this.ClassifyAlgorithmsList = JSON.parse(this.question.ClassifyAlgorithms)
+    }
+    setInterval(()=> {
+      if (this.question.Type === 'class') {
+        let o = this.ClassifyAlgorithmsList.find(v => {
+          return this.questionForm[this.question.ClassifyQuestionId] >= v.gt && this.questionForm[this.question.ClassifyQuestionId] < v.lt
+        })
+        if (this.questionForm[this.question.ClassifyQuestionId]) {
+          this.questionForm[this.question.Id] = o ? o.label : null
+        } else {
+          this.questionForm[this.question.Id] = null
+        }
+      }
+    }, 300)
+    if (this.question.Type === 'upload') {
+      if (this.questionForm[this.question.Id]) {
+        this.urls = this.questionForm[this.question.Id].split('|')
+        this.fileList = []
+        this.urls.map((url, index) => {
+          this.fileList.push({ name: `${this.$t('trials:emailManageCfg:title:fileName')}${index + 1}`, url: `${url}` })
+        })
+      }
+    }
+    if (this.question.Type === 'table') {
+      this.getQuestionCalculateRelation()
+      if (this.questionForm[this.question.Id]) {
+        this.QuestionsForm = {}
+        this.question.TableQuestions.Questions.forEach(v => {
+          if (v.Type === 'number') {
+            this.$set(this.QuestionsForm, v.Id, 0)
+          } else {
+            this.$set(this.QuestionsForm, v.Id, '')
+          }
+        })
+      }
+    }
+  },
+  methods: {
+    limitInput(value, a, b) {
+      if (value.indexOf('.') > -1) {
+        if (value.split('.')[1].length >= this.digitPlaces) {
+          this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
+        }
+      } else {
+      }
+    },
+    deleteTableCol(row, index) {
+      console.log(row)
+      this.$confirm(this.$t('trials:uploadNonDicoms:message:msg1')).then(() => {
+        const loading = this.$loading({ fullscreen: true })
+        var param = {
+          visitTaskId: this.visitTaskId,
+          questionId: row.Id,
+          rowId: this.questionForm[row.Id][index].RowId
+        }
+        deleteReadingRowAnswer(param)
+          .then(async res => {
+            if (res.IsSuccess) {
+              this.$message.success('删除成功')
+              DicomEvent.$emit('reGetQuestionAnswer')
+            }
+            loading.close()
+          }).catch(() => {
+          loading.close()
+        })
+      })
+
+    },
+    setFormTableItemData(id, url) {
+      this.$set(this.QuestionsForm, id, url)
+    },
+    handleSave() {
+      console.log(this.QuestionsForm)
+      this.$refs.tableQsForm.validate(valid => {
+        if (!valid) return
+        const loading = this.$loading({ fullscreen: true })
+        var answers = []
+        var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+        for (const k in this.QuestionsForm) {
+          if (reg.test(k)) {
+            if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+              console.log(this.QuestionsForm)
+              answers.push({ tableQuestionId: k, answer: this.QuestionsForm[k] })
+            }
+          }
+        }
+        if (this.addOrEdit.type === 'edit') {
+          var params = {
+            questionId: this.question.Id,
+            RowIndex: parseInt(this.QuestionsForm.RowIndex),
+            RowId: this.QuestionsForm.RowId,
+            visitTaskId: this.visitTaskId,
+            trialId: this.$route.query.trialId,
+            answerList: answers,
+          }
+        } else {
+          var params = {
+            questionId: this.question.Id,
+            RowIndex: this.questionForm[this.question.Id].length + 1,
+            visitTaskId: this.visitTaskId,
+            trialId: this.$route.query.trialId,
+            answerList: answers,
+          }
+          this.QuestionsForm.RowIndex = this.questionForm[this.question.Id].length + 1
+        }
+        submitTableQuestion(params).then(async res => {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.QuestionsForm.RowId = res.Result.RowId
+          this.save()
+          loading.close()
+        }).catch(() => { loading.close() })
+      })
+    },
+    renderHeader(h, obj) {
+      let span = document.createElement('span')
+      span.style.fontSize = '14px'
+      span.innerText = obj.column.label
+      document.body.appendChild(span)
+      obj.column.realWidth = span.getBoundingClientRect().width + 40
+      document.body.removeChild(span)
+      return h('span', obj.column.label)
+    },
+    getQuestionCalculateRelation() {
+      getQuestionCalculateRelation({
+        ReadingQuestionId: this.question.Id
+      }).then(res => {
+        this.CalculationTabelList = res.Result
+      })
+    },
+    save() {
+      console.log(this.$refs.tableQsForm, this.QuestionsForm)
+      this.$refs['tableQsForm'].validate((valid) => {
+        console.log(valid)
+        if (!valid) return
+        if (this.addOrEdit.type === 'add') {
+          this.AnswersList.push(this.QuestionsForm)
+        } else {
+          var index = this.AnswersList.findIndex(v => v.RowId === this.QuestionsForm.RowId)
+          this.AnswersList.splice(index, 1, this.QuestionsForm)
+        }
+        this.$emit('setFormItemData', {key: this.question.Id, val: this.AnswersList})
+        this.formItemNumberChange(this.question.Id, true)
+        this.addOrEdit.visible = false
+      })
+    },
+    logic(rules, num = 0) {
+      try {
+        if (rules.CalculateQuestionList.length === 0) {
+          return false
+        }
+        rules.CalculateQuestionList.forEach((o, i) => {
+          if (i === 0) {
+            if (rules.CustomCalculateMark > 4) {
+              switch (rules.CustomCalculateMark) {
+                case 5:
+                  this.questionForm[o.QuestionId].forEach((q, qi) => {
+                    if (qi === 0) {
+                      num = parseFloat(q[o.TableQuestionId])
+                    } else {
+                      num *= parseFloat(q[o.TableQuestionId])
+                    }
+                  })
+                  break;
+                case 6:
+                  this.questionForm[o.QuestionId].forEach((q, qi) => {
+                    if (qi === 0) {
+                      num = parseFloat(q[o.TableQuestionId])
+                    } else {
+                      num += parseFloat(q[o.TableQuestionId])
+                    }
+                  })
+                  break;
+                case 7:
+                  this.questionForm[o.QuestionId].forEach((q, qi) => {
+                    if (qi === 0) {
+                      num = parseFloat(q[o.TableQuestionId])
+                    } else {
+                      num += parseFloat(q[o.TableQuestionId])
+                    }
+                  })
+                  num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
+                  break;
+                case 8:
+                  var arr = []
+                  this.questionForm[o.QuestionId].forEach(q => {
+                    arr.push(q[o.TableQuestionId])
+                  })
+                  num = arr.length === 0 ? 0 : Math.max(...arr)
+                  break;
+                case 9:
+                  var arr = []
+                  this.questionForm[o.QuestionId].forEach(q => {
+                    arr.push(q[o.TableQuestionId])
+                  })
+                  num = arr.length === 0 ? 0 : Math.min(...arr)
+                  break;
+              }
+            } else {
+              num = parseFloat(this.questionForm[o.TableQuestionId])
+            }
+          } else {
+            switch (rules.CustomCalculateMark) {
+              case 1:
+                num += parseFloat(this.questionForm[o.TableQuestionId])
+                break;
+              case 2:
+                num -= parseFloat(this.questionForm[o.TableQuestionId])
+                break;
+              case 3:
+                num *= parseFloat(this.questionForm[o.TableQuestionId])
+                break;
+              case 4:
+                if (parseFloat(this.questionForm[o.TableQuestionId]) === 0) {
+                  num = 0
+                } else {
+                  num /= parseFloat(this.questionForm[o.TableQuestionId])
+                }
+                break;
+            }
+          }
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      var digitPlaces = parseInt(localStorage.getItem('digitPlaces'))
+      if (rules.ValueType === 2) {
+        num = num * 100
+      }
+      return num.toFixed(digitPlaces)
+    },
+    formItemNumberChange(questionId, isTable) {
+      if (isTable) {
+        this.CalculationList.forEach((v, i) => {
+          var find = v.CalculateQuestionList.filter(o => {
+            return o.QuestionId === questionId
+          })
+          // find的自动计算值number
+          if (find) {
+            var num = this.logic(v)
+            if (num !== false) {
+              this.$emit('setFormItemData', { key: v.QuestionId, val: num })
+            }
+          }
+        })
+      } else {
+        this.CalculationList.forEach(v => {
+          var find = v.CalculateQuestionList.filter(o => {
+            return o.TableQuestionId === questionId
+          })
+          // find的自动计算值number
+          if (find) {
+            var num = this.logic(v)
+            if (num !== false) {
+              this.$emit('setFormItemData', { key: v.QuestionId, val: num })
+            }
+          }
+        })
+      }
+      // this.$emit('formItemNumberChange')
+    },
+    formItemTableNumberChange() {
+      this.question.TableQuestions.Questions.forEach(v => {
+        if (v.Type === 'number' && v.DataSource === 1) {
+          var CalculateQuestions = JSON.parse(v.CalculateQuestions)
+          var num
+          CalculateQuestions.forEach((o, i) => {
+            if (i === 0) {
+              num = this.QuestionsForm[o.TableQuestionId]
+            } else {
+              switch (v.CustomCalculateMark) {
+                case 1:
+                  num += this.QuestionsForm[o.TableQuestionId]
+                  break;
+                case 2:
+                  num -= this.QuestionsForm[o.TableQuestionId]
+                  break;
+                case 3:
+                  num *= this.QuestionsForm[o.TableQuestionId]
+                  break;
+                case 4:
+                  num /= this.QuestionsForm[o.TableQuestionId]
+                  break;
+              }
+            }
+          })
+          this.$set(this.QuestionsForm, v.Id, num.toString())
+        }
+      })
+
+    },
+    openAddTableCol(row, index) {
+      this.addOrEdit.visible = true
+      this.addOrEdit.title = row.QuestionName + this.$t('trials:readingUnit:qsList:title:tableQs')
+      this.QuestionsList = row.TableQuestions.Questions
+      this.AnswersList = row.TableQuestions.Answers
+      if (!index && index !== 0) {
+        this.addOrEdit.type = 'add'
+        this.QuestionsForm = {}
+      } else {
+        this.addOrEdit.type = 'edit'
+        console.log(this.questionForm)
+        this.QuestionsForm = Object.assign({}, this.questionForm[row.Id][index])
+      }
+    },
+    getOrganInfoList() {
+      var param = {
+        trialId: this.$route.query.trialId,
+        lesionType: this.question.LesionType,
+        // systemCriterionId: this.criterionId,
+        isEnable: true
+      }
+      getTrialOrganList(param).then(res => {
+        this.organList = res.Result
+      })
+    },
+    formNumberItemChange(v) {
+      this.$emit('setFormItemData', { key: v.QuestionId, val: num })
+    },
+    formItemChange(v, question) {
+      if (question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      }
+      if (question.TableQuestionType === 1 && question.RelationQuestions.length > 0) {
+        var index = this.organList.findIndex(item => item[question.DataTableColumn] === v)
+        if (index < 0) return
+        var selected = this.organList[index]
+        this.question.RelationQuestions.map(qs => {
+          var val = selected[qs.DataTableColumn]
+          // if (typeof val === 'boolean') {
+          //   // val = String(val)
+          // }
+          this.$emit('setFormItemData', { key: qs.Id, val: val })
+        })
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.$emit('resetFormItemData', i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
+    },
+    resetFormItemData(v) {
+      this.$emit('resetFormItemData', v)
+    },
+    setFormItemData(obj) {
+      this.$emit('setFormItemData', obj)
+    },
+    async uploadScreenshot(param) {
+      console.log('uploadScreenshot')
+      if (!this.visitTaskId) return
+      const loading = this.$loading({
+        target: document.querySelector('.ecrf-wrapper'),
+        fullscreen: false,
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading'
+      })
+      var fileName = param.file.name
+      let file = await this.fileToBlob(param.file)
+      let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file)
+      this.fileList.push({ name: `${this.$t('trials:emailManageCfg:title:fileName')}${this.fileList.length + 1}`, url: this.$getObjectName(res.url) })
+      console.log('fileList', this.fileList)
+      this.urls.push(this.$getObjectName(res.url))
+      this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '' })
+      loading.close()
+      // uploadReadingAnswerImage(this.$route.query.trialId, this.visitTaskId, formData).then(res => {
+      //   if (res.IsSuccess) {
+      //     this.fileList.push({ url: `/api/${res.Result.Path}` })
+      //     this.urls.push(res.Result.Path)
+      //     this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '' })
+      //   }
+      //   loading.close()
+      // }).catch(() => {
+      //   loading.close()
+      // })
+    },
+    handleBeforeUpload(file, accept) {
+      // 检测文件类型是否符合要求
+      console.log('handleBeforeUpload', file)
+      if (this.checkFileSuffix(file.name, accept) || accept === '-1') {
+        return true
+      } else {
+        const msg = this.$t('trials:adReview:title:msg4').replace('xxx', accept)
+        this.$alert(msg)
+        return false
+      }
+      console.log(file)
+    },
+    checkFileSuffix(fileName, accept) {
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
+      if (accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 预览图片
+    handlePictureCardPreview(file) {
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
+      suffix = suffix ? suffix.toLowerCase() : ''
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
+        window.open(this.OSSclientConfig.basePath + file.url,'_blank')
+      }else{
+        this.imageUrl = this.OSSclientConfig.basePath + file.url
+        this.imgVisible = true
+        this.$nextTick(()=>{
+          this.$refs[this.imageUrl].$viewer.show()
+        })
+      }
+    },
+    // 删除图片
+    handleRemove(file, fileList) {
+      console.log('handleRemove')
+      if (file && file.status === "success") {
+        this.imageUrl = ''
+        this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
+        this.urls.splice(this.fileList.findIndex(f => f === file.url), 1)
+        this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '' })
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.my_dialog{
+  .criterion-form-item{
+    width: 100%;
+    /deep/ .el-form-item__content{
+      width: auto;
+    }
+    ///deep/ .el-input-goup__append{
+    //  background-color: transparent;
+    //  color: #ddd;
+    //  border: 1px solid #5e5e5e;
+    //}
+  }
+}
+/deep/ .el-form-item__label{
+  color: #c3c3c3;
+}
+/deep/ .el-radio__label{
+  color: #c3c3c3;
+}
+/deep/ .el-input-group__append{
+  background: #000;
+  color: #ddd;
+  border: 1px solid #5e5e5e;
+}
+/deep/ .el-input .el-input__inner{
+  background-color: transparent;
+  color: #ddd;
+  border: 1px solid #5e5e5e;
+}
+.criterion-form-item{
+  /deep/ .criterion-form-item .el-form-item{
+    display: block;
+    .el-form-item__label{
+      display: block;
+      color: #c8c8c8;
+      float: none;
+      text-align: left;
+    }
+  }
+  .el-form-item{
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+  }
+  .el-input{
+    width:100%;
+  }
+  .mb{
+    margin-bottom: 0px;
+  }
+  .disabled{
+    /deep/ .el-upload--picture-card {
+      display: none;
+    }
+  }
+  .uploadWrapper{
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  }
+  /deep/ .el-table__body-wrapper::-webkit-scrollbar{
+    height: 10px!important;
+  }
+  /deep/ .el-table__fixed-right::before{
+    display: none;
+  }
+  /deep/ .el-upload-list__item-name{
+    color: #0a84ff;
+    .el-icon-document{
+      color: #0a84ff;
+    }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index f7978a3c..ef4127c5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -41,75 +41,59 @@
               size="small"
               :model="questionForm"
             >
-              <div class="base-dialog-body">
+              <div class="table-wrapper">
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'table'" class="flex-row" style="margin:3px 0;">
                     <div class="title">{{ item.QuestionName }}</div>
-                    <div v-if="readingTaskState < 2" class="add-icon" @click.prevent="handleAdd(item)">
-                      <i class="el-icon-plus" />
+                    <div>
+                      <div v-if="readingTaskState < 2" class="add-icon">
+                        <i class="el-icon-upload2" />
+                      </div>
+                      <div v-if="readingTaskState < 2" class="add-icon" style="margin: 0 5px;">
+                        <i class="el-icon-download" />
+                      </div>
+                      <div v-if="readingTaskState < 2" class="add-icon" @click.prevent="handleAdd(item)">
+                        <i class="el-icon-plus" />
+                      </div>
                     </div>
+                    
                   </div>
-                  <el-collapse
+                  <el-table
                     v-if="item.Type === 'table' && item.TableQuestions"
-                    v-model="activeName"
-                    accordion
-                    style="margin-bottom: 10px;"
-                    @change="handleCollapseChange"
+                    :data="item.TableQuestions.Answers"
+                    :ref="item.Id"
                   >
-                    <el-collapse-item
-                      v-for="(q,i) in item.TableQuestions.Answers"
-                      :key="`${item.Id}_${q.RowIndex}`"
-                      :name="`${item.Id}_${q.RowIndex}`"
-                    >
-                      <template slot="title">
-                        <div style="width:300px;position: relative;" :style="{color:(activeName===item.Id+q.RowIndex?'#ffeb3b':'#fff')}">
-
-                          {{ getLesionName(item.OrderMark,q.RowIndex) }}
-                          <!-- 未保存 -->
-                          <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
-                            <i class="el-icon-warning" style="color:red" />
-                          </el-tooltip>
-                          <!-- 信息不完整 -->
-                          <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
-                            <i class="el-icon-warning" style="color:#ff9800" />
-                          </el-tooltip>
-                          <div style="position: absolute;left: 60px;top: 2px;">
-                            <div style="display: flex;flex-direction: row;font-size: 11px;width:200px;height: 30px;">
-                              <div style="margin-left:10px;">
-                                {{ numberToFixed(item.TableQuestions.Answers[i].area1,'m㎡') }}
-                              </div>
-                              <div style="margin-left:10px;">
-                                {{ numberToFixed(item.TableQuestions.Answers[i].area2,'m㎡') }}
-                              </div>
-                              <div style="margin-left:10px;margin-bottom:5px;">
-                                {{ numberToFixed(item.TableQuestions.Answers[i].diff, 'm㎡') }}
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-
+                    <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
+                      <template slot-scope="scope">
+                        {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
                       </template>
-                      <QuestionForm
-                        :ref="`${item.Id}_${q.RowIndex}`"
-                        :questions="item.TableQuestions.Questions"
-                        :answers="item.TableQuestions.Answers[i]"
-                        :lesion-type="item.LesionType"
-                        :order-mark="item.OrderMark"
-                        :table-questions="tableQuestions"
-                        :row-index="String(q.RowIndex)"
-                        :question-name="item.QuestionName"
-                        :parent-qs-id="item.Id"
-                        :visit-task-id="visitTaskId"
-                        :is-current-task="isCurrentTask"
-                        :reading-task-state="readingTaskState"
-                        :is-base-line-task="isBaseLineTask"
-                        @getReadingQuestionAndAnswer="getReadingQuestionAndAnswer"
-                        @resetQuestions="resetQuestions"
-                        @close="close"
-                      />
-                    </el-collapse-item>
-
-                  </el-collapse>
+                    </el-table-column>
+                    <el-table-column
+                      v-for="q of item.TableQuestions.Questions"
+                      :key="q.Id"
+                      :prop="q.Id"
+                      :label="q.QuestionName"
+                      show-overflow-tooltip
+                      :render-header="renderHeader"
+                    >
+                    </el-table-column>
+                    <el-table-column
+                        :label="$t('common:action:action')"
+                        width="100px"
+                        v-if="readingTaskState < 2"
+                        fixed="right"
+                    >
+                      <template slot-scope="scope">
+                        <el-button type="text" size="mini" @click="editForm(question, scope.$index)">
+                          {{$t('common:button:edit')}}
+                        </el-button>
+                        <el-button type="text" size="mini" v-if="scope.row.IsCurrentTaskAdd === 'True'" @click="deleteData(question, scope.$index)">
+                          {{$t('common:button:delete')}}
+                        </el-button>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                 
                   <template v-else>
                     <!-- 数值 -->
                     <el-form-item
@@ -188,12 +172,10 @@ import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { mapGetters } from 'vuex'
 import Questions from './../Questions'
-import QuestionForm from './QuestionForm'
 export default {
   name: 'MeasurementList',
   components: {
-    Questions,
-    QuestionForm
+    Questions
   },
   props: {
     isShow: {
@@ -641,8 +623,20 @@ export default {
       this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
     },
     receiveMsg(event) {
-    }
+    },
+    renderHeader(h, obj) {
+      let span = document.createElement('span')
+      span.style.fontSize = '14px'
+      span.innerText = obj.column.label
+      document.body.appendChild(span)
+      obj.column.realWidth = span.getBoundingClientRect().width + 40
+      document.body.removeChild(span)
+      return h('span', obj.column.label)
+    },
+    editForm(){
 
+    },
+    deleteData(){}
   }
 }
 </script>
@@ -678,6 +672,7 @@ export default {
 
   }
   .add-icon{
+    display: inline-block;
     padding: 5px;
     font-weight: bold;
     color: #ddd;
@@ -722,14 +717,56 @@ export default {
     /deep/ .el-select.is-disabled .el-input__inner{
       background-color: #646464a1;
     }
-    /deep/ .el-button--mini, .el-button--mini.is-round {
-      padding: 7px 10px;
-    }
+    
     .el-form-item__content
     .el-select{
       width: 100%;
     }
   }
+  .table-wrapper {
+    ::-webkit-scrollbar {
+      width: 5px;
+      height: 8px;
+    }
+    ::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background: #d0d0d0;
+    }
+    /deep/ .el-table,
+    .el-table__expanded-cell {
+      background-color: #000;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table th,
+    .el-table tr {
+      background-color: #000;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table__body tr > td {
+      background-color: #000 !important;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table__body tr:hover > td {
+      background-color: #858282 !important;
+      color: #fff;
+      border-color: #444444;
+    }
+    /deep/ .el-table--border th.gutter:last-of-type {
+      border: none;
+    }
+    /deep/ .el-table__fixed-right {
+      height: 100% !important;
+    }
+    /deep/ .el-table .cell {
+      line-height: 15px;
+    }
+    /deep/ .el-table__cell {
+      padding: 5px 0;
+    }
+  }
   .el-collapse{
     border-bottom:none;
     border-top:none;