From 23378a663b6fe6f9dac32d4870f2f743707046e3 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 20 Sep 2024 15:07:11 +0800
Subject: [PATCH] =?UTF-8?q?ivus=E6=A0=87=E5=87=86=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/reading.js                  |  10 +-
 .../reading/dicoms/components/DicomViewer.vue |  18 +-
 .../components/IVUS/QuestionFormItem.vue      | 864 ------------------
 .../dicoms/components/IVUS/QuestionList.vue   | 356 ++++----
 .../components/IVUS/QuestionTableFormItem.vue | 255 ++++++
 .../dicoms/components/QuestionItem.vue        |   2 +-
 .../reading-unit/components/QuestionsList.vue |   2 +-
 7 files changed, 470 insertions(+), 1037 deletions(-)
 delete mode 100644 src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionFormItem.vue
 create mode 100644 src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue

diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index 7c11814a..4a411426 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -37,7 +37,7 @@ const getDefaultState = () => {
 function getQuestions(questions) {
   const criterionType = parseInt(localStorage.getItem('CriterionType'))
   questions.forEach(item => {
-    if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+    if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
       item.TableQuestions.Answers.forEach(answerObj => {
         answerObj.isDicomReading = answerObj.IsDicomReading === 'True'
 
@@ -94,7 +94,7 @@ function getQuestions(questions) {
 }
 function findQuestionAndRemoveLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
-    if (questions[i].Type === 'table' && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType) && questions[i].TableQuestions.Answers.length > 0) {
+    if ((questions[i].Type === 'table' || questions[i].Type === 'basicTable') && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType) && questions[i].TableQuestions.Answers.length > 0) {
       var idx = questions[i].TableQuestions.Answers.findIndex(i => String(i.RowIndex) === String(obj.rowIndex))
       if (idx > -1) {
         questions[i].TableQuestions.Answers.splice(idx, 1)
@@ -110,7 +110,7 @@ function findQuestionAndRemoveLesion(questions, obj) {
 function findQuestionAndUpdateLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
     var item = questions[i]
-    if (item.Type === 'table' && item.Id === obj.questionId) {
+    if ((item.Type === 'table' || item.Type === 'basicTable') && item.Id === obj.questionId) {
       var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
       item.TableQuestions.Answers[idx].isLymphLesion = obj.isLymphLesion
       item.TableQuestions.Answers[idx].loctation = obj.lesionOrgan
@@ -139,10 +139,10 @@ function findQuestionAndUpdateLesion(questions, obj) {
 }
 function findQuestionAndAddLesion(questions, obj) {
   for (var i = 0; i < questions.length; i++) {
-    if (questions[i].Type === 'table' && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType)) {
+    if ((questions[i].Type === 'table' || questions[i].Type === 'basicTable') && questions[i].TableQuestions && (questions[i].LesionType === obj.lesionType)) {
       var sourceObj = {}
       questions[i].TableQuestions.Questions.forEach(item => {
-        sourceObj[item.Id] = ''
+        sourceObj[item.Id] = null
       })
       var targetObj = Object.assign(sourceObj, obj.lesionObj)
       targetObj.IsCurrentTaskAdd = 'True'
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index e2adddf3..70704988 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -715,17 +715,17 @@
     </el-dialog>
     <upload-dicom-and-nonedicom
       v-if="uploadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :SubjectCode="uploadSubjectCode"
-      :Criterion="uploadTrialCriterion"
+      :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode"
+      :criterion="uploadTrialCriterion"
       :visible.sync="uploadImageVisible"
     />
     <download-dicom-and-nonedicom
       v-if="downloadImageVisible"
-      :SubjectId="uploadSubjectId"
-      :SubjectCode="uploadSubjectCode"
-      :Criterion="uploadTrialCriterion"
-      :TaskId="taskId"
+      :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode"
+      :criterion="uploadTrialCriterion"
+      :task-id="taskId"
       :visible.sync="downloadImageVisible"
     />
   </div>
@@ -780,7 +780,7 @@ export default {
     IVUSList,
     OCTList,
     'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
-    'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
+    'upload-dicom-and-nonedicom': uploadDicomAndNonedicom
   },
   props: {
     isShow: {
@@ -1162,7 +1162,7 @@ export default {
     getTrialCriterion() {
       getCriterionReadingInfo({
         TrialId: this.trialId || this.$route.query.trialId,
-        TrialReadingCriterionId: this.trialReadingCriterionId || this.$route.query.TrialReadingCriterionId,
+        TrialReadingCriterionId: this.trialReadingCriterionId || this.$route.query.TrialReadingCriterionId
       })
         .then((res) => {
           this.trialCriterion = res.Result
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
deleted file mode 100644
index eb5448a9..00000000
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionFormItem.vue
+++ /dev/null
@@ -1,864 +0,0 @@
-<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 ef4127c5..9f60fa44 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
@@ -29,8 +29,8 @@
       </div>
 
       <!-- 测量问题 -->
-      <template v-if="questions.length > 0 && CriterionType !== 10">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper">
+      <template v-if="questions.length > 0">
+        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
             {{ language==='en'?qs.GroupEnName:qs.GroupName }}
           </h4>
@@ -43,57 +43,61 @@
             >
               <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 v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
                     <div class="title">{{ item.QuestionName }}</div>
-                    <div>
-                      <div v-if="readingTaskState < 2" class="add-icon">
+                    <div v-if="item.LesionType === 102 && readingTaskState < 2">
+                      <div class="add-icon">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div v-if="readingTaskState < 2" class="add-icon" style="margin: 0 5px;">
+                      <div 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)">
+                      <div class="add-icon" @click.prevent="handleAdd(item)">
                         <i class="el-icon-plus" />
                       </div>
                     </div>
-                    
+
                   </div>
                   <el-table
-                    v-if="item.Type === 'table' && item.TableQuestions"
-                    :data="item.TableQuestions.Answers"
+                    v-if="item.Type === 'basicTable' && item.TableQuestions"
                     :ref="item.Id"
+                    :data="item.TableQuestions.Answers"
+                    max-height="600"
+                    style="width:100%;"
                   >
-                    <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
+                    <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
                       <template slot-scope="scope">
                         {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
                       </template>
-                    </el-table-column>
+                    </el-table-column> -->
+                    <el-table-column
+                      type="index"
+                      width="50"
+                    />
                     <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"
+                      v-if="readingTaskState < 2"
+                      :label="$t('common:action:action')"
+                      width="100px"
+                      fixed="right"
                     >
                       <template slot-scope="scope">
-                        <el-button type="text" size="mini" @click="editForm(question, scope.$index)">
-                          {{$t('common:button:edit')}}
+                        <el-button type="text" size="mini" @click="handleEdit('edit',item, 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 v-if="scope.row.IsCurrentTaskAdd === 'True'" type="text" size="mini" @click="handleDelete(question, scope.$index)">
+                          {{ $t('common:button:delete') }}
                         </el-button>
                       </template>
                     </el-table-column>
                   </el-table>
-                 
+
                   <template v-else>
                     <!-- 数值 -->
                     <el-form-item
@@ -107,24 +111,20 @@
                       ]"
                     >
                       <!-- 数值类型 -->
-                      <template v-if="item.Type==='number'">
+                      <template v-if="item.Type==='textarea'">
                         <el-input
-                          v-model="questionForm[item.Id]"
-                          :disabled="!isCurrentTask || readingTaskState>=2 "
-                          @change="((val)=>{formItemChange(val, item)})"
-                          @blur="limitBlur(item.Id, item.ValueType)"
-                        >
-                          <template v-if="item.Unit" slot="append">
-                            {{ $fd('ValueUnit', parseInt(item.Unit)) }}
-                          </template>
-                        </el-input>
+                          v-model="questionForm[qs.Id]"
+                          type="textarea"
+                          :autosize="{ minRows: 2, maxRows: 4}"
+                          :disabled="!isCurrentTask || readingTaskState>=2"
+                          @change="((val)=>{formItemChange(val, qs)})"
+                        />
                       </template>
                     </el-form-item>
                   </template>
-
                 </div>
                 <div
-                  v-if="isCurrentTask && readingTaskState<2"
+                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
                   class="base-dialog-footer"
                   style="text-align:right;margin-top:10px;"
                 >
@@ -162,20 +162,58 @@
         :is-qulity-issues="false"
         :group-classify="5"
       />
+      <el-dialog
+        v-if="addOrEdit.visible"
+        :visible.sync="addOrEdit.visible"
+        :close-on-click-modal="false"
+        :title="addOrEdit.title"
+        width="500px"
+      >
+        <el-form
+          ref="tableQsForm"
+          v-loading="loading"
+          :model="qsForm"
+          size="small"
+        >
+          <QuestionTableFormItem
+            v-for="item in qsList"
+            :key="item.Id"
+            :question="item"
+            :question-form="qsForm"
+            :reading-task-state="readingTaskState"
+            @setFormItemData="setFormItemData"
+            @resetFormItemData="resetFormItemData"
+          />
+          <el-form-item style="text-align: right">
+            <el-button
+              size="small"
+              @click="addOrEdit.visible = false"
+            >
+              {{ $t('common:button:cancel') }}
+            </el-button>
+            <!-- 保存 -->
+            <el-button size="small" class="my_upload_btn" @click="saveFormData">
+              {{ $t('common:button:save') }}
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </el-dialog>
     </div>
   </div>
 </template>
 <script>
-import { saveTaskQuestion } from '@/api/trials'
+import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
 import { resetReadingTask } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { mapGetters } from 'vuex'
 import Questions from './../Questions'
+import QuestionTableFormItem from './QuestionTableFormItem'
 export default {
   name: 'MeasurementList',
   components: {
-    Questions
+    Questions,
+    QuestionTableFormItem
   },
   props: {
     isShow: {
@@ -222,7 +260,14 @@ export default {
       subjectCode: '',
       questionForm: {},
       formChanged: false,
-      digitPlaces: 2
+      digitPlaces: 2,
+      addOrEdit: { visible: false, title: '' },
+      qsList: [],
+      answersList: [],
+      qsForm: {},
+      diffId: '',
+      eemId: '',
+      lumenId: ''
     }
   },
   computed: {
@@ -305,13 +350,6 @@ export default {
           this.$refs['ecrf'].getQuestions(this.visitTaskId)
           this.$refs['ecrf2'].getQuestions(this.visitTaskId)
           this.$refs['ecrf3'].getQuestions(this.visitTaskId)
-          this.getTableQuestions()
-          this.tableQuestions.forEach(item => {
-            item.TableQuestions.Answers.forEach(i => {
-              var refName = `${item.Id}_${i.RowIndex}`
-              this.$refs[refName] && this.$refs[refName][0].initForm()
-            })
-          })
         })
       }
     },
@@ -335,7 +373,7 @@ export default {
     },
     setQuestions(questions, obj) {
       questions.forEach(item => {
-        if (item.Type === 'table' && item.Id === obj.questionId) {
+        if ((item.Type === 'table' || item.Type === 'basicTable') && item.Id === obj.questionId) {
           var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
           item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
           item.TableQuestions.Answers[idx].area1 = obj.area1
@@ -352,7 +390,7 @@ export default {
     },
     getQuestions(questions) {
       questions.forEach(item => {
-        if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
+        if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
           item.TableQuestions.Answers.forEach(answerObj => {
             if (answerObj.RowId) {
               var diffVal = this.getQuestionAnswer(item.TableQuestions.Questions, 1003, answerObj)
@@ -368,37 +406,6 @@ export default {
       })
       return questions
     },
-    getTableQuestions() {
-      this.tableQuestions = []
-      this.questions.map(item => {
-        if (item.Type === 'table') {
-          this.tableQuestions.push(item)
-        }
-        if (item.Childrens.length > 0) {
-          this.getTableQuestionsChild(item.Childrens)
-        }
-      })
-    },
-    getTableQuestionsChild(obj) {
-      obj.map(item => {
-        if (item.Type === 'table') {
-          this.tableQuestions.push(item)
-        }
-        if (item.Childrens.length > 0) {
-          this.getTableQuestionsChild(item.Childrens)
-        }
-      })
-    },
-    refreshReadingQuestionAndAnswer(type) {
-      if (type === 0) {
-        // 删除
-        this.activeName = ''
-        this.activeItem.activeRowIndex = null
-        this.activeItem.activeCollapseId = null
-      }
-
-      this.getReadingQuestionAndAnswer(this.visitTaskId)
-    },
     getReadingQuestionAndAnswer() {
       return new Promise(async resolve => {
         try {
@@ -414,15 +421,6 @@ export default {
               this.isBaseLineTask = this.visitTaskList[idx].IsBaseLineTask
               this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
             }
-            this.getTableQuestions()
-            this.$nextTick(() => {
-              this.tableQuestions.forEach(item => {
-                item.TableQuestions.Answers.forEach(i => {
-                  var refName = `${item.Id}_${i.RowIndex}`
-                  this.$refs[refName] && this.$refs[refName][0].initForm()
-                })
-              })
-            })
           })
           loading.close()
           resolve()
@@ -501,24 +499,6 @@ export default {
       }
 
       return lessionName
-    },
-    handleCollapseChange(val) {
-      if (this.activeName) {
-        var arr = this.activeName.split('_')
-        this.activeItem.activeRowIndex = arr[1]
-        this.activeItem.activeCollapseId = arr[0]
-      } else {
-        this.activeItem.activeRowIndex = null
-        this.activeItem.activeCollapseId = null
-      }
-    },
-    collapseRightClick(e, obj, activeCollapseId, activeRowIndex) {
-      e.stopImmediatePropagation()
-      e.stopPropagation()
-      e.preventDefault()
-    },
-    setCollapseActive(measureData) {
-
     },
     modifyMeasuredData(measureObj) {
     },
@@ -568,15 +548,6 @@ export default {
         loading.close()
       }
     },
-    async close(questionsObj) {
-      if (questionsObj) {
-        this.getReadingQuestionAndAnswer(questionsObj.visitTaskId)
-        this.refreshQuestions()
-      }
-      this.activeItem.activeRowIndex = null
-      this.activeItem.activeCollapseId = null
-      this.activeName = ''
-    },
     getECRFQuestions(obj) {
       this.$refs['ecrf'].getQuestions(obj.visitTaskId)
       this.$refs['ecrf2'].getQuestions(obj.visitTaskId)
@@ -617,6 +588,7 @@ export default {
     },
     async refreshQuestions() {
       const triald = this.$router.currentRoute.query.trialId
+      await this.getReadingQuestionAndAnswer(this.visitTaskId)
       await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: triald, visitTaskId: this.visitTaskId })
       this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
       this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
@@ -624,19 +596,110 @@ export default {
     },
     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)
+    resetFormItemData(v) {
+      this.qsForm[v] = null
     },
-    editForm(){
+    setFormItemData(obj) {
+      this.qsForm[obj.key] = obj.val
+      if (obj.key === this.eemId || obj.key === this.lumenId) {
+        const eem = this.qsForm[this.eemId]
+        const lumen = this.qsForm[this.lumenId]
+        if (isNaN(parseFloat(eem)) || isNaN(parseFloat(lumen))) {
+          this.$set(this.qsForm, this.diffId, null)
+        } else {
+          const diff = parseFloat(eem) - parseFloat(lumen)
+          this.$set(this.qsForm, this.diffId, diff.toFixed(this.digitPlaces))
+        }
+      }
+    },
+    handleEdit(type, row, index) {
+      this.addOrEdit.title = row.QuestionName
+      this.qsList = row.TableQuestions.Questions
+      this.qsForm = {}
+      this.qsForm.questionId = row.Id
+      this.qsForm.rowId = type === 'add' ? null : row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index].RowId : null
+      this.qsForm.rowIndex = type === 'add' ? null : row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index].RowIndex : null
+      row.TableQuestions.Questions.map(i => {
+        if (i.QuestionMark === 1001) {
+          this.eemId = i.Id
+        }
+        if (i.QuestionMark === 1002) {
+          this.lumenId = i.Id
+        }
+        if (i.QuestionMark === 1003) {
+          this.diffId = i.Id
+        }
+        this.$set(this.qsForm, i.Id, type === 'add' ? null : row.TableQuestions.Answers && row.TableQuestions.Answers[index] ? row.TableQuestions.Answers[index][i.Id] : null)
+      })
+      this.addOrEdit.visible = true
+    },
+    async saveFormData() {
+      const valid = await this.$refs.tableQsForm.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.qsForm) {
+          if (reg.test(k)) {
+            if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+              answers.push({ tableQuestionId: k, answer: this.qsForm[k] })
+            }
+          }
+        }
 
+        var params = {
+          questionId: this.qsForm.questionId,
+          rowId: this.qsForm.rowId,
+          rowIndex: this.qsForm.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.addOrEdit.visible = false
+          this.refreshQuestions()
+          DicomEvent.$emit('getReportInfo', true)
+        }
+        loading.close()
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
     },
-    deleteData(){}
+    async handleDelete(row, index) {
+      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: row.Id,
+            rowId: row.TableQuestions.Answers[index].RowId
+          }
+          const res = await deleteReadingRowAnswer(param)
+          if (res.IsSuccess) {
+            DicomEvent.$emit('getReportInfo', true)
+            // '删除成功！'
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          }
+        }
+        loading.close()
+      } catch (e) {
+        loading.close()
+        console.log(e)
+      }
+    }
   }
 }
 </script>
@@ -703,6 +766,11 @@ export default {
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
+    /deep/ .el-textarea__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
     /deep/ .el-form-item{
       display: flex;
       flex-direction: column;
@@ -717,7 +785,7 @@ export default {
     /deep/ .el-select.is-disabled .el-input__inner{
       background-color: #646464a1;
     }
-    
+
     .el-form-item__content
     .el-select{
       width: 100%;
@@ -766,38 +834,12 @@ export default {
     /deep/ .el-table__cell {
       padding: 5px 0;
     }
-  }
-  .el-collapse{
-    border-bottom:none;
-    border-top:none;
-    /deep/ .el-collapse-item{
-      background-color: #000!important;
-      color: #ddd;
-
+    /deep/.el-table__fixed-right-patch {
+      background-color: #000 !important;
+      border-color: #444444;
     }
-    /deep/ .el-collapse-item__header{
-      background-color: #000!important;
-      color: #ddd;
-      border-bottom-color:#5a5a5a;
-      padding-left: 5px;
-      height: 35px;
-      line-height: 35px;
-    }
-    /deep/ .el-collapse-item__wrap{
-      background-color: #000!important;
-      color: #ddd;
-    }
-    /deep/ .el-collapse-item__content{
-      width:260px;
-      position: absolute;
-      top: 0px;
-      right: 0px;
-      // border: 1px solid #ffeb3b;
-      border: 1px solid #fff;
-      z-index: 1;
-      color: #ddd;
-      padding: 5px;
-      background-color:#1e1e1e;
+    /deep/.el-table__fixed-body-wrapper tr:hover > td {
+      background-color: #000 !important;
     }
 
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
new file mode 100644
index 00000000..a4f6fd85
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
@@ -0,0 +1,255 @@
+<template>
+  <div>
+    <div
+      v-if="!!question.GroupName && question.Type==='group'"
+    >
+      <h4 style="color: #ddd;padding: 5px 0px;margin: 0;">
+        {{ language==='en'?question.GroupEnName:question.GroupName }}
+      </h4>
+    </div>
+    <template v-else>
+      <el-form-item
+        v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0 "
+        :label="`${question.QuestionName}`"
+        :prop="question.Id"
+        :rules="[
+          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (questionForm[question.RelevanceId] === question.RelevanceValue))) && question.Type!=='group' && question.Type!=='summary',
+            message: ['radio', 'select', 'checkbox'].includes(question.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        ]"
+        :class="[question.Type==='group' ? 'mb' : (question.Type==='upload' || question.QuestionName.length > 15) ?'uploadWrapper' : '']"
+      >
+        <!-- 输入框 -->
+        <el-input
+          v-if="question.Type==='input'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 多行文本输入框 -->
+        <el-input
+          v-else-if="question.Type==='textarea'"
+          v-model="questionForm[question.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        />
+        <!-- 下拉框 -->
+        <el-select
+          v-else-if="question.Type==='select'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
+          clearable
+          @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="String(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="String(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-else-if="question.Type==='radio'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.DictionaryCode">
+            <el-radio
+              v-for="item of $d[question.DictionaryCode]"
+              :key="item.id"
+              :label="String(item.value)"
+            >
+              {{ item.label }}
+            </el-radio>
+          </template>
+          <template v-else-if="question.TypeValue">
+            <el-radio
+              v-for="val in question.TypeValue.split('|')"
+              :key="val"
+              :label="val"
+            >
+              {{ val }}
+            </el-radio>
+          </template>
+        </el-radio-group>
+        <!-- 复选框 -->
+        <el-checkbox-group
+          v-else-if="question.Type==='checkbox'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState >= 2"
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <el-checkbox
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
+            {{ val }}
+          </el-checkbox>
+        </el-checkbox-group>
+        <!-- 数值 -->
+        <template v-else-if="question.Type==='number'">
+          <el-input-number
+            v-if="question.ValueType === 0"
+            v-model="questionForm[question.Id]"
+            :precision="0"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 3"
+            v-model="questionForm[question.Id]"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+          <el-input-number
+            v-else-if="question.ValueType === 1 || question.ValueType === 2"
+            v-model="questionForm[question.Id]"
+            :precision="digitPlaces"
+            :disabled="readingTaskState >= 2"
+            style="width: 100%"
+            @change="((val)=>{formItemChange(val, question)})"
+          />
+        </template>
+        <el-input
+          v-else-if="question.Type==='calculation'"
+          v-model="questionForm[question.Id]"
+          disabled
+          @change="((val)=>{formItemChange(val, question)})"
+        >
+          <template v-if="question.Unit" slot="append">
+            {{ $fd('ValueUnit', parseInt(question.Unit)) }}
+          </template>
+        </el-input>
+      </el-form-item>
+    </template>
+
+    <QuestionTableFormItem
+      v-for="item in question.Childrens"
+      :key="item.Id"
+      :question="item"
+      :question-form="questionForm"
+      :reading-task-state="readingTaskState"
+      @setFormItemData="setFormItemData"
+      @resetFormItemData="resetFormItemData"
+    />
+  </div>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+export default {
+  name: 'QuestionTableFormItem',
+  props: {
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    question: {
+      type: Object,
+      default() {
+        return []
+      }
+    },
+    readingTaskState: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    return {
+      digitPlaces: 2
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  mounted() {
+    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : parseInt(digitPlaces)
+  },
+  methods: {
+    formItemChange(v, question) {
+      if (question.Childrens && question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      } else {
+        this.$emit('setFormItemData', { key: question.Id, val: v })
+      }
+    },
+    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)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.mb{
+  margin-bottom: 0px;
+}
+.disabled{
+  /deep/ .el-upload--picture-card {
+    display: none;
+  }
+}
+.uploadWrapper{
+  display: flex;
+  flex-direction: column !important;
+  align-items: flex-start;
+}
+/deep/ .el-input.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+  /deep/ .el-input-group__append, .el-input-group__prepend{
+    padding: 0 10px;
+  }
+  /deep/ .el-form-item__content {
+    width: 100%;
+  }
+  /deep/ .el-select.is-disabled .el-input__inner{
+    background-color: #646464a1;
+  }
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index af6f9c7e..07a305f5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -221,7 +221,7 @@
           <el-input-number
             v-if="question.ValueType === 0"
             v-model="questionForm[question.Id]"
-            precision="0"
+            :precision="0"
             :disabled="readingTaskState >= 2 || isFirstChangeTask"
           />
           <el-input-number
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
index a99e4019..037c4de9 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
@@ -170,7 +170,7 @@
           </el-button>
           <!-- 表格问题 -->
           <el-button
-            v-if="scope.row.Type === 'table'"
+            v-if="scope.row.Type === 'table' || scope.row.Type === 'basicTable'"
             type="primary"
             size="mini"
             @click="handleConfig(scope.row)"