1

tableQuestionId为空时增加判断
1
2025-07-24 17:48:00 +08:00 · 2025-07-24 16:41:00 +08:00 · 2025-07-23 17:41:18 +08:00 · 2025-07-23 13:48:45 +08:00 · 2025-07-22 17:20:19 +08:00 · 2025-07-22 15:36:35 +08:00
115 changed files with 10502 additions and 11396 deletions
@@ -48,7 +48,6 @@
        "nprogress": "^0.2.0",
        "path-to-regexp": "^0.1.10",
        "pdfobject": "^2.3.0",
-        "prismjs": "^1.30.0",
        "qrcodejs2": "^0.0.2",
        "screenfull": "^6.0.2",
        "sortablejs": "^1.15.5",
@@ -63,7 +62,6 @@
        "vue-count-to": "^1.0.13",
        "vue-demi": "^0.14.10",
        "vue-i18n": "^8.28.2",
-        "vue-prism-editor": "^1.3.0",
        "vue-puzzle-vcode": "^1.1.10",
        "vue-router": "^3.0.6",
        "vue-seamless-scroll": "^1.1.23",
@@ -18046,15 +18044,6 @@
        "renderkid": "^3.0.0"
      }
    },
-    "node_modules/prismjs": {
-      "version": "1.30.0",
-      "resolved": "https://registry.npmmirror.com/prismjs/-/prismjs-1.30.0.tgz",
-      "integrity": "sha512-DEvV2ZF2r2/63V+tK8hQvrR2ZGn10srHbXviTlcv7Kpzw8jWiNTqbVgjO3IY8RxrrOUF8VPMQQFysYYYv0YZxw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6"
-      }
-    },
    "node_modules/process": {
      "version": "0.11.10",
      "resolved": "https://registry.npmmirror.com/process/-/process-0.11.10.tgz",
@@ -23008,18 +22997,6 @@
        "url": "https://github.com/chalk/chalk?sponsor=1"
      }
    },
-    "node_modules/vue-prism-editor": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmmirror.com/vue-prism-editor/-/vue-prism-editor-1.3.0.tgz",
-      "integrity": "sha512-54RfgtMGRMNr9484zKMOZs1wyLDR6EfFylzE2QrMCD9alCvXyYYcS0vX8oUHh+6pMUu6ts59uSN9cHglpU2NRQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "vue": "^2.6.11"
-      }
-    },
    "node_modules/vue-puzzle-vcode": {
      "version": "1.1.10",
      "resolved": "https://registry.npmmirror.com/vue-puzzle-vcode/-/vue-puzzle-vcode-1.1.10.tgz",
@@ -54,7 +54,6 @@
    "nprogress": "^0.2.0",
    "path-to-regexp": "^0.1.10",
    "pdfobject": "^2.3.0",
-    "prismjs": "^1.30.0",
    "qrcodejs2": "^0.0.2",
    "screenfull": "^6.0.2",
    "sortablejs": "^1.15.5",
@@ -69,7 +68,6 @@
    "vue-count-to": "^1.0.13",
    "vue-demi": "^0.14.10",
    "vue-i18n": "^8.28.2",
-    "vue-prism-editor": "^1.3.0",
    "vue-puzzle-vcode": "^1.1.10",
    "vue-router": "^3.0.6",
    "vue-seamless-scroll": "^1.1.23",
@@ -418,11 +418,10 @@ export function addOrUpdateBasicDic(param) {
  })
 }

-export function getDictionaryChildList(data) {
+export function getDictionaryChildList(id) {
  return request({
-    url: `/Dictionary/getChildList`,
-    method: 'post',
-    data
+    url: `/Dictionary/getChildList/${id}`,
+    method: 'get'
  })
 }

@@ -1358,42 +1357,3 @@ export function deleteAttachment(data) {
    data
  })
 }
-// 项目文档-获取历史记录列表
-export function getTrialHistoryRecordFileList(data) {
-  return request({
-    url: `/TrialHistoryRecordFile/getTrialHistoryRecordFileList`,
-    method: 'post',
-    data
-  })
-}
-// 项目文档-新增/修改历史记录
-export function addOrUpdateTrialHistoryRecordFile(data) {
-  return request({
-    url: `/TrialHistoryRecordFile/addOrUpdateTrialHistoryRecordFile`,
-    method: 'post',
-    data
-  })
-}
-// 项目文档-批量新增历史记录
-export function batchAddTrialHistoryRecordFile(data) {
-  return request({
-    url: `/TrialHistoryRecordFile/batchAddTrialHistoryRecordFile`,
-    method: 'post',
-    data
-  })
-}
-// 项目文档-删除历史记录
-export function deleteTrialHistoryRecordFile(id) {
-  return request({
-    url: `/TrialHistoryRecordFile/deleteTrialHistoryRecordFile/${id}`,
-    method: 'delete',
-  })
-}
-// 邮件管理-批量修改邮件
-export function batchUpdateEmail(data) {
-  return request({
-    url: `/EmailNoticeConfig/batchUpdateEmail`,
-    method: 'post',
-    data
-  })
-}
@@ -45,19 +45,10 @@ export function changeFrontAuditSort(param) {
  })
 }

-export function getModuleTypeDescriptionList(params) {
+export function getModuleTypeDescriptionList(param) {
  return request({
-    url: `/FrontAuditConfig/getModuleTypeDescriptionList`,
-    method: 'get',
-    params
-  })
-}
-
-export function getModuleTypeList(data) {
-  return request({
-    url: `/FrontAuditConfig/getModuleTypeList`,
-    method: 'post',
-    data
+    url: `${param === '' ? '/FrontAuditConfig/getModuleTypeDescriptionList' : '/FrontAuditConfig/getModuleTypeDescriptionList?moduleTypeId=' + param}`,
+    method: 'get'
  })
 }

@@ -72,14 +72,7 @@ export function getReadingTaskList_Export(param) {
    data: param
  })
 }
-export function getTrialVisitImageStatList_Export(param) {
-  return requestDownload({
-    url: '/ExcelExport/getTrialVisitImageStatList_Export',
-    method: 'post',
-    responseType: 'blob',
-    data: param
-  })
-}
+
 export function getReReadingTaskList_Export(param) {
  return requestDownload({
    url: '/ExcelExport/getReReadingTaskList_Export',
@@ -4130,78 +4130,4 @@ export function addFolder(data) {
    method: 'post',
    data
  })
-}
-
-
-// 配置-项目文档发布
-export function publishTrialDocument(data) {
-  return request({
-    url: `/TrialDocument/publishTrialDocument`,
-    method: 'post',
-    data
-  })
-}
-// 配置-获取项目文档附件列表
-export function getTrialDocumentAttachmentList(data) {
-  return request({
-    url: `/TrialDocument/getTrialDocumentAttachmentList`,
-    method: 'post',
-    data
-  })
-}
-// 配置-新增或修改项目文档附件
-export function addOrUpdateTrialDocumentAttachment(data) {
-  return request({
-    url: `/TrialDocument/addOrUpdateTrialDocumentAttachment`,
-    method: 'post',
-    data
-  })
-}
-// 配置-删除项目文档附件
-export function deleteTrialDocumentAttachment(data) {
-  return request({
-    url: `/TrialDocument/deleteTrialDocumentAttachment/${data}`,
-    method: 'delete',
-  })
-}
-
-// 配置-获取稽查管理列表
-export function getTrialShowInspection(data) {
-  return request({
-    url: `/Inspection/getTrialShowInspection`,
-    method: 'post',
-    data
-  })
-}
-// 配置-设置稽查管理配置
-export function setTrialShowInspection(data) {
-  return request({
-    url: `/Inspection/setTrialShowInspection`,
-    method: 'post',
-    data
-  })
-}
-// 影像汇总-获取列表
-export function getTrialVisitImageStatList(data) {
-  return request({
-    url: `/DownloadAndUpload/getTrialVisitImageStatList`,
-    method: 'post',
-    data
-  })
-}
-// 影像汇总-获取统计
-export function getTrialVisitImageStatInfo(params) {
-  return request({
-    url: `/DownloadAndUpload/getTrialVisitImageStatInfo`,
-    method: 'get',
-    params
-  })
-}
-// 影像汇总-影像下载
-export function getExportSubjectVisitImageList(data) {
-  return request({
-    url: `/DownloadAndUpload/getExportSubjectVisitImageList`,
-    method: 'post',
-    data
-  })
 }
@@ -459,9 +459,9 @@ export function setMedicalReviewInvalid(params) {
  })
 }

-export function getTrialCriterionList(trialId, isRandom = false) {
+export function getTrialCriterionList(trialId) {
  return request({
-    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}&isRandom=${isRandom}`,
+    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}`,
    method: 'get'
  })
 }
@@ -487,4 +487,4 @@ export function setRandomTaskOrder(data) {
    method: 'post',
    data
  })
-}
+}
@@ -26,11 +26,9 @@
      <div v-show="dicomInfo.location">Location {{ dicomInfo.location }}mm</div> -->
      <!-- <div v-show="toolState.clipPlaying">FPS {{ dicomInfo.fps }}</div> -->
      <div v-show="mousePosition.mo">
-        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) :
-          '' }}
+        Pos: {{ mousePosition.x?mousePosition.x.toFixed(0):'' }}, {{ mousePosition.y?mousePosition.y.toFixed(0):'' }}
      </div>
-      <div
-        v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
+      <div v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
        HU: {{ mousePosition.mo }}
      </div>
      <div v-else-if="(dicomInfo.modality === 'PT' && mousePosition.suv)">
@@ -55,12 +53,8 @@
      <!-- <div v-show="dicomInfo.acc">ACC {{ dicomInfo.acc }}</div> -->
      <!-- <div>{{ dicomInfo.time }}</div> -->
    </div>
-    <div ref="sliderBox" class="my_slider_box"
-      style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer"
-      @click.stop="goViewer($event)">
-      <div :style="{ top: height + '%' }"
-        style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move"
-        @mousedown="sliderMousedown($event)" />
+    <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
+      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown="sliderMousedown($event)" />
    </div>
    <div style="position: absolute;left: 50%;top: 15px;color: #f44336;">
      {{ markers.top }}
@@ -87,8 +81,15 @@
    <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
      Loading Series #{{ stack.seriesNumber }}...
    </div>-->
-    <el-dialog v-if="dcmTag.visible" :visible.sync="dcmTag.visible" :close-on-click-modal="false" :title="dcmTag.title"
-      width="1000px" custom-class="base-dialog-wrapper" append-to-body>
+    <el-dialog
+      v-if="dcmTag.visible"
+      :visible.sync="dcmTag.visible"
+      :close-on-click-modal="false"
+      :title="dcmTag.title"
+      width="1000px"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
      <dicom-tags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
    </el-dialog>
  </div>
@@ -267,9 +268,9 @@ export default {
            )
            if (!toolAlreadyAddedToElement) {
              if (toolName === 'RectangleRoi') {
-                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true } })
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true, showStatsText: true}})
              } else if (toolName === 'EllipticalRoi') {
-                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true } })
+                cornerstoneTools.addToolForElement(element, apiTool, { configuration: { showMinMax: true}})
              } else {
                cornerstoneTools.addToolForElement(element, apiTool)
              }
@@ -332,7 +333,7 @@ export default {
      // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
      cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
      // cornerstoneTools.stackPrefetch.enable(this.canvas)
-      cornerstone.updateImage(element, true)
+      cornerstone.updateImage(element, true) 
      // cornerstoneTools.stackPrefetch.setConfiguration({ maxImagesToPrefetch: Infinity,
      // preserveExistingPool: true })
      // cornerstoneTools.stackPrefetch.enable(this.canvas)
@@ -372,8 +373,9 @@ export default {
        data.string('x00080030')
      )
      this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
-        }`
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
+        this.stack.imageIds.length
+      }`
      this.dicomInfo.size = `${data.uint16('x00280011')}x${data.uint16(
        'x00280010'
      )}`
@@ -391,7 +393,6 @@ export default {
      this.stack.imageIdIndex = newImageIdIndex
      this.series.imageIdIndex = newImageIdIndex
      this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-      this.resetWwwc()
    },
    stackScrollCallback(e) {
      const { detail } = e
@@ -682,7 +683,7 @@ export default {
      cornerstoneTools.getToolState(
        this.canvas,
        'playClip'
-      ).data[0].loop = true
+      ).data[0].loop = false
    },
    setFps(fps) {
      this.dicomInfo.fps = fps
@@ -1140,7 +1141,6 @@ export default {
  font-size: 12px;
  /* z-index: 1; */
 }
-
 .info-image {
  position: absolute;
  left: 10px;
@@ -1160,7 +1160,6 @@ export default {
  font-size: 12px;
  /* z-index: 1; */
 }
-
 .info-instance {
  position: absolute;
  right: 15px;
@@ -1193,7 +1192,6 @@ export default {
  margin: 10px;
  cursor: default;
 }
-
 .menu__item:hover {
  color: #ff0000;
 }
@@ -1213,8 +1211,7 @@ li:hover {
  background-color: #e0e0e2;
  color: white;
 }
-
-.my_slider_box:after {
+.my_slider_box:after{
  content: '';
  position: absolute;
  bottom: -20px;
@@ -11,8 +11,6 @@
    <!--      v-else-if="fileType.indexOf('pdf') !== -1"-->
    <!--      :src="`/static/pdfjs/web/viewer.html?file=${filePath}`">-->
    <!--    </pdf>-->
-    <video :src="`${OSSclientConfig.basePath}${filePath}`" style="width: 100%;height: 99%;" autoplay controls
-      controlsList="nodownload" v-else-if="fileType.indexOf('mp4') !== -1"></video>
    <iframe v-else
      :src="`/static/onlyOffice/viewer.html?url=${OSSclientConfig.basePath}${filePath}?onlyOffice_url=${onlyOffice_url}&type=${fileType}&title=${title}&documentType=${documentType}&userName=${currentUser}`"
      width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
@@ -53,6 +51,7 @@ export default {
  },
  computed: {
    documentType() {
+      console.log(DOCUMENTTYPE[`.${this.fileType}`], 'documentType')
      return DOCUMENTTYPE[`.${this.fileType}`]
    }
  },
@@ -1,23 +0,0 @@
-import Vue from "vue";
-import Video from "./index.vue";
-
-const PreviewConstructor = Vue.extend(Video);
-
-const video = options => {
-    const { path, type, title } = options;
-    if (!path) throw `path is requred.but ${path}`
-    const id = `OnlyOffice_${new Date().getTime()}`;
-    const instance = new PreviewConstructor();
-    instance.id = id;
-    instance.vm = instance.$mount();
-    if (instance.vm.visible) return;
-    document.body.appendChild(instance.vm.$el);
-    instance.vm.open(path, type, title);
-    instance.vm.$on("closed", () => {
-        instance.vm.docEditor = null
-        document.body.removeChild(instance.vm.$el);
-        instance.vm.$destroy();
-    });
-    return instance.vm;
-}
-export default video;
@@ -1,7 +0,0 @@
-import Video from "./index.vue";
-import video from "./fun";
-
-export default Vue => {
-    Vue.component(Video.name, Video);
-    Vue.prototype.$video = video;
-};
@@ -1,38 +0,0 @@
-<template>
-  <el-dialog v-if="visible" :visible.sync="visible" :title="title" :fullscreen="true" append-to-body
-    custom-class="base-dialog-wrapper" @close="handleClose">
-    <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-      <video :src="path" style="width: 100%;height: 99%;" autoplay controls controlsList="nodownload"></video>
-    </div>
-  </el-dialog>
-</template>
-<script>
-export default {
-  name: "Video",
-  data() {
-    return {
-      visible: false,
-      path: null,
-      type: null,
-      title: null,
-    };
-  },
-  methods: {
-
-    open(path, type, title) {
-      this.path = this.OSSclientConfig.basePath + path;
-      this.title = title;
-      this.visible = true;
-    },
-    handleClose() {
-      this.$emit("closed");
-    },
-  },
-};
-</script>
-<style lang="scss" scoped>
-#placeholder {
-  width: 100%;
-  height: 100%;
-}
-</style>
@@ -22,13 +22,7 @@
      </div>
      <el-table :data="questionForm[question.Id]">
        <el-table-column v-for="item of question.TableQuestions" :key="item.Id" :prop="item.Id"
-          :label="item.QuestionName" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row[item.Id] && Array.isArray(scope.row[item.Id]) ?
-              scope.row[item.Id].join(" | ")
-              : scope.row[item.Id] }}
-          </template>
-        </el-table-column>
+          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
        <el-table-column :label="$t('common:action:action')" min-width="100" show-overflow-tooltip
          v-if="SecondReviewState <= 0">
          <template slot-scope="scope">
@@ -82,7 +76,7 @@
            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val.trim()" />
          </template>
        </el-select>
-        <!-- 日期 -->
+        <!-- 单选 -->
        <el-date-picker v-if="question.ClinicalQuestionType === 'time'" v-model="questionForm[question.Id]"
          style="width: 200px" align="right" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
        <!-- 单选 -->
@@ -323,6 +317,8 @@ export default {
                  })
                  break
                case 6:
+                  console.log(this.questionForm[o.QuestionId])
+                  console.log(this.questionForm)
                  this.questionForm[o.QuestionId].forEach((q, qi) => {
                    if (qi === 0) {
                      num = parseFloat(q[o.TableQuestionId])
@@ -365,16 +361,11 @@ export default {
                  }
                  break
                case 11:
-                  if (parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId])) > 0) {
-                    num = parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId]))
+                  if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
+                    num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
                  } else {
                    num = 0
                  }
-                  // if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
-                  //   num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
-                  // } else {
-                  //   num = 0
-                  // }
                  break
              }
            } else {
@@ -414,19 +405,19 @@ export default {
      } catch (e) {
        console.log(e)
      }
-      if (rules.DigitPlaces) {
-        num = num.toFixed(rules.DigitPlaces)
-      }
+      console.log(num)
      return num
    },
    formItemNumberChange(questionId, isTable) {
      try {
        if (isTable) {
          this.calculationList.forEach((v, i) => {
+            console.log(v, i)
            var find = v.CalculateQuestionList.filter(o => {
              return o.QuestionId === questionId
            })
            // find的自动计算值number
+            console.log('find', find)
            if (find) {
              var num = this.logic(v)
              if (num !== false) {
@@ -440,6 +431,7 @@ export default {
              return o.TableQuestionId === questionId
            })
            // find的自动计算值number
+            console.log('find', find)
            // find的自动计算值number
            if (find) {
              var num = this.logic(v)
@@ -510,9 +502,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep .el-form-item__label{
-  color: #606266 !important;
-}
 .my_dialog {
  .criterion-form-item {
    ::v-deep .el-form-item__content {
@@ -1,65 +1,125 @@
 <template>
  <div class="criterion-form-item">

-    <el-form-item :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
-      {
-        required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
-        message: $t('common:ruleMessage:specify'), trigger: ['blur'],
-        type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''
-      },
-    ]"
-      :class="[question.ClinicalTableQuestionType === 'group' ? 'mb' : question.ClinicalTableQuestionType === 'upload' ? 'uploadWrapper' : '']">
-      <el-input v-if="question.ClinicalTableQuestionType === 'input'" v-model="questionForm[question.Id]"
-        :max-length="200" :disabled="question.TableQuestionType === 2" />
+    <el-form-item
+      :label="`${question.QuestionName}`"
+      :prop="question.Id"
+      :rules="[
+        { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
+          message: $t('common:ruleMessage:specify'), trigger: ['blur'],
+          type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''},
+      ]"
+      :class="[question.ClinicalTableQuestionType==='group'?'mb':question.ClinicalTableQuestionType==='upload'?'uploadWrapper':'']"
+    >
+      <el-input
+        v-if="question.ClinicalTableQuestionType==='input'"
+        v-model="questionForm[question.Id]"
+        :max-length="200"
+        :disabled="question.TableQuestionType === 2"
+      />
      <!-- 多行文本输入框 -->
-      <el-input v-if="question.ClinicalTableQuestionType === 'textarea'" v-model="questionForm[question.Id]"
-        :max-length="200" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
+      <el-input
+        v-if="question.ClinicalTableQuestionType==='textarea'"
+        v-model="questionForm[question.Id]"
+        :max-length="200"
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+      />
      <!-- 下拉框 -->
-      <el-select v-if="question.ClinicalTableQuestionType === 'select'" v-model="questionForm[question.Id]" clearable
-        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode">
+      <el-select
+        v-if="question.ClinicalTableQuestionType==='select'"
+        v-model="questionForm[question.Id]"
+        clearable
+        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode"
+      >
        <template v-if="question.TableQuestionType === 1">
-          <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-            :value="item[question.DataTableColumn]" />
+          <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" />
+          <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 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" />
+          <el-option
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+            :value="val"
+          />
        </template>

      </el-select>
      <!-- 单选 -->
-      <el-date-picker v-if="question.ClinicalTableQuestionType === 'time'" v-model="questionForm[question.Id]"
-        format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px" align="right" type="date" />
+      <el-date-picker
+        v-if="question.ClinicalTableQuestionType === 'time'"
+        v-model="questionForm[question.Id]"
+        format="yyyy-MM-dd"
+        value-format="yyyy-MM-dd"
+        style="width: 200px"
+        align="right"
+        type="date"
+      />
      <!-- 单选 -->
-      <el-radio-group v-if="question.ClinicalTableQuestionType === 'radio'" v-model="questionForm[question.Id]"
-        @change="((val) => { formItemChange(val, question) })">
+      <el-radio-group
+        v-if="question.ClinicalTableQuestionType==='radio'"
+        v-model="questionForm[question.Id]"
+        @change="((val)=>{formItemChange(val, question)})"
+      >
        <template v-if="question.DictionaryCode">
-          <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="item.value">
+          <el-radio
+            v-for="item of $d[question.DictionaryCode]"
+            :key="item.id"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </template>
        <template v-if="question.TypeValue">
-          <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
+          <el-radio
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val"
+          >
            {{ val }}
          </el-radio>
        </template>
      </el-radio-group>
      <!-- 复选框 -->
-      <el-checkbox-group v-if="question.ClinicalTableQuestionType === 'checkbox'" v-model="questionForm[question.Id]">
-        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
+      <el-checkbox-group
+        v-if="question.ClinicalTableQuestionType==='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.ClinicalTableQuestionType === 'number'" v-model="questionForm[question.Id]" type="number"
-        @input="limitInput($event, questionForm, question)" style="width: 200px">
+      <el-input
+        v-if="question.ClinicalTableQuestionType === 'number'"
+        v-model="questionForm[question.Id]"
+        type="number"
+        style="width: 200px"
+      >
        <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
      </el-input>
    </el-form-item>
@@ -127,14 +187,6 @@ export default {
    }
  },
  methods: {
-    limitInput(value, form, row) {
-      if (value.indexOf('.') > -1) {
-        if (value.split('.')[1].length >= row.DigitPlaces) {
-          this.$set(form, row.Id, parseFloat(value).toFixed(row.DigitPlaces))
-        }
-      }
-      this.$forceUpdate()
-    },
    save() {
    },
    openAddTableCol(row) {
@@ -168,40 +220,34 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog {
-  .criterion-form-item {
-    ::v-deep .el-form-item__content {
+.my_dialog{
+  .criterion-form-item{
+    ::v-deep .el-form-item__content{
      width: auto;
    }
  }
 }
-
-.criterion-form-item {
-  .el-form-item {
+.criterion-form-item{
+  .el-form-item{
    display: flex;
    flex-direction: row;
    align-items: flex-start;
  }
-
-  ::v-deep .el-form-item__content {
+  ::v-deep .el-form-item__content{
    width: 500px;
  }
-
-  .el-input {
-    width: 100%;
+  .el-input{
+    width:100%;
  }
-
-  .mb {
+  .mb{
    margin-bottom: 0px;
  }
-
-  .disabled {
+  .disabled{
    ::v-deep .el-upload--picture-card {
      display: none;
    }
  }
-
-  .uploadWrapper {
+  .uploadWrapper{
    display: flex;
    flex-direction: column;
    align-items: flex-start;
@@ -375,7 +375,7 @@ export default {
          console.log(i.Answer ? i.Answer.split(',') : [])
          console.log(this.questionForm)
        } else if (i.ClinicalQuestionType === 'number') {
-          this.$set(this.questionForm, i.Id, i.Answer || i.DefaultValue)
+          this.$set(this.questionForm, i.Id, i.Answer)
        } else if (i.Childrens && i.Childrens.length > 0) {
          this.setChild(i.Childrens)
        }
@@ -22,7 +22,7 @@
      <i class="el-icon-warning-outline"></i>
      <div v-html="$t('download:tip:message')"></div>
    </div>
-    <!--上传列表@selection-change="handleSelectionChange" @sort-change="handleSortByColumn"-->
+    <!--上传列表@selection-change="handleSelectionChange"-->
    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
      class="dicomFiles-table" 
      :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
@@ -4,63 +4,123 @@
      <span>{{ $t('upload:dicom:title') }}</span>
      <div class="tip">
        <i class="el-icon-warning-outline"></i>
-        <div v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"></div>
+        <div
+          v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"
+        ></div>
      </div>
    </div>
    <!--检查列表-->
    <el-table :data="list" style="width: 100%" height="300" :loading="loading">
      <!--受试者-->
-      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
+      <el-table-column
+        prop="SubjectCode"
+        :label="$t('upload:dicom:table:subjectCode')"
+      />
      <!--任务名称-->
-      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
+      <el-table-column
+        prop="TaskBlindName"
+        :label="$t('upload:dicom:table:taskBlindName')"
+      />
      <!--原始检查数-->
-      <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
+      <el-table-column
+        prop="OrginalStudyList"
+        :label="$t('upload:dicom:table:orginalStudyListNum')"
+      >
        <template slot-scope="scope">
-          <el-button v-if="
-            scope.row.OrginalStudyList &&
-            scope.row.OrginalStudyList.length >= 1
-          " type="text" @click="handleOpenDialog(scope.row, 'OrginalStudyList')">
+          <el-button
+            v-if="
+              scope.row.OrginalStudyList &&
+              scope.row.OrginalStudyList.length >= 1
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row, 'OrginalStudyList')"
+          >
            <span>{{ scope.row.OrginalStudyList.length }}</span>
          </el-button>
          <span v-else>0</span>
        </template>
      </el-table-column>
      <!--后处理检查数-->
-      <el-table-column prop="UploadStudyList" :label="$t('upload:dicom:table:uploadStudyListNum')">
+      <el-table-column
+        prop="UploadStudyList"
+        :label="$t('upload:dicom:table:uploadStudyListNum')"
+      >
        <template slot-scope="scope">
-          <el-button v-if="
-            scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
-          " type="text" @click="handleOpenDialog(scope.row, 'UploadStudyList', true)">
+          <el-button
+            v-if="
+              scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
+            "
+            type="text"
+            @click="handleOpenDialog(scope.row, 'UploadStudyList', true)"
+          >
            <span>{{ scope.row.UploadStudyList.length }}</span>
          </el-button>
          <span v-else>0</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('common:action:action')" fixed="right" width="180">
+      <el-table-column
+        :label="$t('common:action:action')"
+        fixed="right"
+        width="180"
+      >
        <template slot-scope="scope">
          <div class="btnBox">
            <!--上传--->
-            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data">
+            <form
+              id="inputForm"
+              :ref="`uploadForm_${scope.row.Id}`"
+              enctype="multipart/form-data"
+            >
              <div class="form-group" style="margin-right: 10px">
-                <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
-                  <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
-                    :title="$t('upload:dicom:button:upload')" />
-                  <input :title="$t('upload:dicom:button:upload')" type="file" :name="`file_${scope.row.VisitTaskId}`"
-                    :ref="`pathClear_${scope.row.VisitTaskId}`" :disabled="btnLoading" webkitdirectory multiple @change="
+                <div
+                  :id="`directoryInputWrapper_${scope.row.Id}`"
+                  class="btn btn-link file-input"
+                >
+                  <el-button
+                    circle
+                    icon="el-icon-upload2"
+                    :disabled="btnLoading"
+                    :loading="btnLoading"
+                    :title="$t('upload:dicom:button:upload')"
+                  />
+                  <input
+                    :title="$t('upload:dicom:button:upload')"
+                    type="file"
+                    :name="`file_${scope.row.VisitTaskId}`"
+                    :ref="`pathClear_${scope.row.VisitTaskId}`"
+                    :disabled="btnLoading"
+                    webkitdirectory
+                    multiple
+                    @change="
                      ($event) => beginScanFiles($event, scope.row.VisitTaskId)
-                    " />
+                    "
+                  />
                </div>
              </div>
            </form>
            <!--预览--->
-            <el-button circle icon="el-icon-view" :disabled="!scope.row.UploadStudyList ||
-              scope.row.UploadStudyList.length <= 0
-              " @click.stop="handleViewReadingImages(scope.row)" :title="$t('upload:dicom:button:preview')" />
+            <el-button
+              circle
+              icon="el-icon-view"
+              :disabled="
+                !scope.row.UploadStudyList ||
+                scope.row.UploadStudyList.length <= 0
+              "
+              @click.stop="handleViewReadingImages(scope.row)"
+              :title="$t('upload:dicom:button:preview')"
+            />
            <!--删除--->
-            <el-button circle :disabled="!scope.row.UploadStudyList ||
-              scope.row.UploadStudyList.length <= 0 ||
-              scope.row.ReadingTaskState === 2
-              " icon="el-icon-delete" :title="$t('upload:dicom:button:delete')" @click.stop="remove(scope.row)" />
+            <el-button
+              circle
+              :disabled="
+                !scope.row.UploadStudyList ||
+                scope.row.UploadStudyList.length <= 0 ||
+                scope.row.ReadingTaskState === 2
+              "
+              icon="el-icon-delete"
+              :title="$t('upload:dicom:button:delete')"
+              @click.stop="remove(scope.row)"
+            />
          </div>
        </template>
      </el-table-column>
@@ -74,19 +134,38 @@
        <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
          <div class="form-group">
            <div id="directoryInputWrapper" class="btn btn-link file-input">
-              <el-button type="primary" :disabled="btnLoading" :loading="btnLoading" size="mini">
+              <el-button
+                type="primary"
+                :disabled="btnLoading"
+                :loading="btnLoading"
+                size="mini"
+              >
                {{ $t('upload:dicom:button:batchUpload') }}
              </el-button>
-              <input type="file" name="file" ref="pathClear" :disabled="btnLoading" webkitdirectory multiple title=""
-                @change="beginScanFiles($event)" />
+              <input
+                type="file"
+                name="file"
+                ref="pathClear"
+                :disabled="btnLoading"
+                webkitdirectory
+                multiple
+                title=""
+                @change="beginScanFiles($event)"
+              />
            </div>
          </div>
        </form>
      </div>
    </div>
    <!--上传列表-->
-    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 80 }" height="100" :data="uploadQueues"
-      class="dicomFiles-table" @selection-change="handleSelectionChange">
+    <el-table
+      ref="dicomFilesTable"
+      v-adaptive="{ bottomOffset: 80 }"
+      height="100"
+      :data="uploadQueues"
+      class="dicomFiles-table"
+      @selection-change="handleSelectionChange"
+    >
      <el-table-column type="index" width="40" />
      <el-table-column min-width="200" show-overflow-tooltip>
        <template slot="header">
@@ -103,21 +182,28 @@
          <div style="line-height: 15px">
            <div>
              <div>
-                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight: 500">Acc:</span>
-                  {{ scope.row.dicomInfo.accNumber }}</span>
+                <span v-if="scope.row.dicomInfo.accNumber"
+                  ><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</span
+                >
                <span v-else style="color: #f44336">N/A</span>
              </div>
              <div style="display: inline-block; margin-right: 2px">
                <span v-if="scope.row.dicomInfo.modality.length > 0">
-                  {{ scope.row.dicomInfo.modality.join('、') }},</span>
+                  {{ scope.row.dicomInfo.modality.join('、') }},</span
+                >
                <span v-else style="color: #f44336">N/A,</span>
              </div>
              <div style="display: inline-block; margin-right: 2px">
-                <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
+                <span v-if="scope.row.seriesList.length"
+                  >{{ scope.row.seriesList.length }} Series,</span
+                >
                <span v-else style="color: #f44336">N/A,</span>
              </div>
              <div style="display: inline-block">
-                <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
+                <span v-if="scope.row.fileList.length"
+                  >{{ scope.row.fileList.length }} Instances</span
+                >
                <span v-else style="color: #f44336">N/A</span>
              </div>
            </div>
@@ -131,7 +217,8 @@
              </div>
              <div style="display: inline-block">
                <span v-if="scope.row.dicomInfo.description">
-                  {{ scope.row.dicomInfo.description }}</span>
+                  {{ scope.row.dicomInfo.description }}</span
+                >
                <span v-else style="color: #f44336">N/A</span>
              </div>
            </div>
@@ -155,12 +242,16 @@
        <template slot-scope="scope">
          <div style="line-height: 15px">
            <div>
-              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight: 500">PID: </span>{{
-                scope.row.dicomInfo.patientId }}</span>
+              <span v-if="scope.row.dicomInfo.patientId"
+                ><span style="font-weight: 500">PID: </span
+                >{{ scope.row.dicomInfo.patientId }}</span
+              >
              <span v-else style="color: #f44336">N/A</span>
            </div>
            <div>
-              <span :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']">
+              <span
+                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
+              >
                {{
                  scope.row.dicomInfo.patientName
                    ? scope.row.dicomInfo.patientName
@@ -169,7 +260,9 @@
              </span>
            </div>
            <div>
-              <span :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']">
+              <span
+                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
+              >
                {{
                  scope.row.dicomInfo.patientSex
                    ? scope.row.dicomInfo.patientSex
@@ -177,7 +270,9 @@
                }},
              </span>

-              <span :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']">
+              <span
+                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
+              >
                {{
                  scope.row.dicomInfo.patientAge
                    ? scope.row.dicomInfo.patientAge
@@ -185,9 +280,11 @@
                }},
              </span>

-              <span :class="[
-                scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
-              ]">
+              <span
+                :class="[
+                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+                ]"
+              >
                {{
                  scope.row.dicomInfo.patientBirthDate
                    ? scope.row.dicomInfo.patientBirthDate
@@ -198,14 +295,21 @@
          </div>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="150"
-        show-overflow-tooltip>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:failedFileCount')"
+        min-width="150"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
-          <el-progress color="#409eff" :percentage="(
-            (scope.row.dicomInfo.uploadFileSize * 100) /
-            (scope.row.dicomInfo.fileSize ? scope.row.dicomInfo.fileSize : 1)
-          ).toFixed(2) * 1
-            " />
+          <el-progress
+            color="#409eff"
+            :percentage="
+              (
+                (scope.row.dicomInfo.uploadFileSize * 100) /
+                scope.row.dicomInfo.fileSize
+              ).toFixed(2) * 1
+            "
+          />
          <span>
            {{ $t('trials:uploadDicomList:table:uploadNow')
            }}{{ scope.row.dicomInfo.failedFileCount }}/{{
@@ -220,52 +324,85 @@
        </template>
      </el-table-column>

-      <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="140" show-overflow-tooltip>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:status')"
+        min-width="140"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
-          <span v-if="
-            !scope.row.dicomInfo.failedFileCount &&
-            !scope.row.dicomInfo.isInit
-          ">
-            {{ $t('trials:uploadDicomList:table:status1') }}</span>
-          <span style="color: #409eff" v-else-if="
-            !scope.row.dicomInfo.failedFileCount &&
-            scope.row.dicomInfo.isInit &&
-            btnLoading
-          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-          <span style="color: #409eff" v-else-if="
-            scope.row.dicomInfo.failedFileCount <
-            scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
-          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-          <span style="color: #2cc368" v-else-if="
-            scope.row.dicomInfo.failedFileCount ===
-            scope.row.dicomInfo.fileCount
-          ">{{ $t('trials:uploadDicomList:table:status3') }}</span>
-          <span style="color: #f66" v-else-if="
-            scope.row.uploadState.record &&
-            scope.row.uploadState.record.fileCount === 0
-          ">{{ $t('trials:uploadDicomList:table:status5') }}</span>
+          <span
+            v-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              !scope.row.dicomInfo.isInit
+            "
+          >
+            {{ $t('trials:uploadDicomList:table:status1') }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              scope.row.dicomInfo.isInit &&
+              btnLoading
+            "
+            >{{ $t('trials:uploadDicomList:table:status2') }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
+            "
+            >{{ $t('trials:uploadDicomList:table:status2') }}</span
+          >
+          <span
+            style="color: #2cc368"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount ===
+              scope.row.dicomInfo.fileCount
+            "
+            >{{ $t('trials:uploadDicomList:table:status3') }}</span
+          >
+          <span
+            style="color: #f66"
+            v-else-if="
+              scope.row.uploadState.record &&
+              scope.row.uploadState.record.fileCount === 0
+            "
+            >{{ $t('trials:uploadDicomList:table:status5') }}</span
+          >
          <span style="color: #f66" v-else>{{
            $t('trials:uploadDicomList:table:Failed')
          }}</span>
        </template>
      </el-table-column>
-      <el-table-column :label="$t('trials:uploadDicomList:table:record')" min-width="140" show-overflow-tooltip>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:record')"
+        min-width="140"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
          <el-tooltip placement="top" v-if="scope.row.uploadState.record">
            <div slot="content">
              <div style="max-height: 500px; overflow-y: auto">
                {{ $t('trials:uploadDicomList:table:Existed') }}:
                <div v-if="scope.row.uploadState.record.Existed.length">
-                  <div v-for="item of scope.row.uploadState.record.Existed" :key="item"
-                    style="font-size: 12px; color: #baa72a">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Existed"
+                    :key="item"
+                    style="font-size: 12px; color: #baa72a"
+                  >
                    {{ item }}
                  </div>
                </div>
                <div v-else>&nbsp;</div>
                {{ $t('trials:uploadDicomList:table:Uploaded') }}:
                <div v-if="scope.row.uploadState.record.Uploaded.length">
-                  <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item"
-                    style="font-size: 12px; color: #24b837">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Uploaded"
+                    :key="item"
+                    style="font-size: 12px; color: #24b837"
+                  >
                    {{ item }}
                  </div>
                </div>
@@ -273,8 +410,11 @@
                <br />
                {{ $t('trials:uploadDicomList:table:Failed') }}:
                <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div v-for="item of scope.row.uploadState.record.Failed" :key="item"
-                    style="font-size: 12px; color: #f66">
+                  <div
+                    v-for="item of scope.row.uploadState.record.Failed"
+                    :key="item"
+                    style="font-size: 12px; color: #f66"
+                  >
                    {{ item }}
                  </div>
                </div>
@@ -298,8 +438,16 @@
        </template>
      </el-table-column>
    </el-table>
-    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
-      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
+    <study-view
+      v-if="model_cfg.visible"
+      :model_cfg="model_cfg"
+      :IsDicom="true"
+      :bodyPart="bodyPart"
+      :modelList="modelList"
+      :isUpload="openIsUpload"
+      :TrialModality="TrialModality"
+      @getList="getList"
+    />
  </div>
 </template>
 <script>
@@ -647,7 +795,7 @@ export default {
        })
        var validFilesCount = 0
        for (var i = 0; i < checkFiles.length; ++i) {
-          ; (function (index) {
+          ;(function (index) {
            p = p.then(function () {
              if (
                checkFiles[index].name.toUpperCase().indexOf('DICOMDIR') === -1
@@ -686,7 +834,6 @@ export default {
            var studyUid = data.string('x0020000d')
            if (!studyUid) return resolve()
            var pixelDataElement = data.elements.x7fe00010
-            if (!pixelDataElement && modality !== 'SR') return resolve()
            var studyIndex = 0
            while (
              studyIndex < scope.uploadQueues.length &&
@@ -1132,14 +1279,16 @@ export default {
                            dicomInfo.failedFileCount++
                            Record.FileCount++
                          } else {
-                            let path = `/${params.trialId}/Image/${params.subjectId
-                              }/${params.subjectVisitId}/${dicomInfo.visitTaskId
-                              }/${scope.getGuid(
-                                dicomInfo.studyUid +
+                            let path = `/${params.trialId}/Image/${
+                              params.subjectId
+                            }/${params.subjectVisitId}/${
+                              dicomInfo.visitTaskId
+                            }/${scope.getGuid(
+                              dicomInfo.studyUid +
                                v.seriesUid +
                                o.instanceUid +
                                params.trialId
-                              )}`
+                            )}`
                            if (scope.isClose) return
                            let res = await dcmUpload(
                              {
@@ -1410,19 +1559,16 @@ export default {
  align-items: center;
  justify-content: space-between;
 }
-
 .btnBox,
 .form-group {
  display: flex;
  align-items: center;
 }
-
 #inputForm .file-input {
  position: relative;
  overflow: hidden;
  display: inline-block;
 }
-
 #inputForm .file-input input[type='file'] {
  position: absolute;
  top: 0;
@@ -1432,12 +1578,10 @@ export default {
  opacity: 0;
  cursor: pointer;
 }
-
 .tip {
  display: flex;
  align-items: flex-start;
  margin-top: 5px;
-
  i {
    margin: 3px 5px 0 0;
  }
@@ -29,7 +29,9 @@
              <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                <template slot-scope="scope">
                  <span>{{
-                    $FormatSize(scope.row.FileSize)
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
+                      : ''
                  }}</span>
                </template>
              </el-table-column>
@@ -66,7 +68,9 @@
              <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                <template slot-scope="scope">
                  <span>{{
-                    $FormatSize(scope.row.FileSize)
+                    scope.row.FileSize && scope.row.FileSize > 0
+                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
+                      : ''
                  }}</span>
                </template>
              </el-table-column>
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751350116150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20392" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M870.4 819.2a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4zM512 179.2a332.8 332.8 0 1 1 0 665.6 332.8 332.8 0 0 1 0-665.6z m0 51.2a281.6 281.6 0 1 0 0 563.2 281.6 281.6 0 0 0 0-563.2zM153.6 102.4a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4z" fill="#ADAEB8" p-id="20393"></path></svg>
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751349783728" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9505" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M838.4 279.466667zM802.133333 814.933333H279.466667c-38.4 0-70.4-32-70.4-70.4V219.733333c0-38.4 32-70.4 70.4-70.4h123.733333c38.4 0 70.4 32 70.4 70.4v339.2h347.733333c2.133333 0-2.133333 0 0 0 25.6-2.133333 51.2 21.333333 51.2 46.933334v136.533333c0 40.533333-32 72.533333-70.4 72.533333z m25.6-179.2c2.133333-29.866667-34.133333-27.733333-34.133333-27.733333H445.866667c-2.133333 0-2.133333-2.133333-4.266667-2.133333h-2.133333c-8.533333-4.266667-12.8-10.666667-12.8-21.333334v-362.666666c0-14.933333-12.8-27.733333-27.733334-27.733334h-117.333333c-14.933333 0-27.733333 12.8-27.733333 27.733334v64h115.2c12.8 0 23.466667 10.666667 23.466666 23.466666 0 12.8-10.666667 23.466667-23.466666 23.466667h-115.2v78.933333h78.933333c12.8 0 23.466667 10.666667 23.466667 23.466667 0 12.8-10.666667 23.466667-23.466667 23.466667h-78.933333v78.933333h115.2c12.8 0 23.466667 10.666667 23.466666 23.466667 0 12.8-10.666667 23.466667-23.466666 23.466666h-115.2v149.333334c0 14.933333 12.8 27.733333 27.733333 27.733333H426.666667v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h96v-68.266667c0-12.8 10.666667-25.6 23.466667-25.6 12.8 0 23.466667 10.666667 23.466666 25.6V768h78.933334v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h51.2c14.933333 0 27.733333-12.8 27.733333-27.733333l6.4-104.533334z" p-id="9506"></path></svg>
@@ -26,9 +26,6 @@ Vue.use(VueClipboard)
 import permission from './utils/permission'
 Vue.use(permission)

-import { formatSize } from "./utils"
-Vue.prototype.$FormatSize = formatSize
-
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
 Viewer.setDefaults({
@@ -59,8 +56,6 @@ import Preview from '@/components/Preview/index'
 Vue.use(Preview)
 import Onlyoffice from '@/components/Preview_onlyoffice/index'
 Vue.use(Onlyoffice)
-import Video from '@/components/Preview_video/index'
-Vue.use(Video)
 import MFA from '@/components/MFA/index'
 Vue.use(MFA)
 import FB from '@/components/feedBack/index'
@@ -316,9 +311,9 @@ async function VueInit() {
      })
    }
    let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
-    if (CompanyInfo && CompanyInfo.SystemShortName) {
+    if(CompanyInfo&&CompanyInfo.SystemShortName){
      let test = new RegExp('IRC', 'ig')
-      text = text.replace(test, CompanyInfo.SystemShortName)
+        text = text.replace(test, CompanyInfo.SystemShortName)
    }
    // return i18n.t(key)
    return text;
@@ -50,8 +50,6 @@ const getters = {
  IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
  TrialStatusStr: state => state.user.TrialStatusStr,
  lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
-  currentTaskState: state => state.noneDicomReview.currentTaskState,
-  operateInfo: state => state.dicom3d.operateInfo,
-  deleteAnnotationIds: state => state.dicom3d.deleteAnnotationIds
+  currentTaskState: state => state.noneDicomReview.currentTaskState
 }
 export default getters
@@ -13,7 +13,6 @@ import financials from './modules/financials'
 import reading from './modules/reading'
 import lang from './modules/lang'
 import noneDicomReview from './modules/noneDicomReview'
-import dicom3d from './modules/dicom3d'
 Vue.use(Vuex)

 const store = new Vuex.Store({
@@ -29,8 +28,7 @@ const store = new Vuex.Store({
    financials,
    reading,
    lang,
-    noneDicomReview,
-    dicom3d
+    noneDicomReview
  },
  getters
 })
@@ -1,28 +0,0 @@
-const getDefaultState = () => {
-  return {
-    operateInfo: [],
-    deleteAnnotationIds: []
-  }
-}
-const state = getDefaultState
-
-const mutations = {
-
-}
-
-const actions = {
-  setOperateInfo({ state }, arr) {
-    state.operateInfo = arr
-  },
-  setDeleteAnnotationIds({ state }, arr) {
-    state.deleteAnnotationIds = arr
-  },
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
-
@@ -50,8 +50,7 @@ service.interceptors.response.use(
        const a = document.createElement('a')
        // xls类型: application/vnd.ms-excel
        // xlsx类型：application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8
-        // const href = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
-        const href = URL.createObjectURL(new Blob([res], { type: response.headers['content-type'] }))
+        const href = URL.createObjectURL(new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
        a.download = fileName
        a.href = href
        a.click()
@@ -10,7 +10,7 @@

      <el-form-item :label="$t('dictionary:signature:form:File')">
        <div class="upload-container">
-          <el-upload class="upload-demo" action accept=".pdf,.mp4" :before-upload="beforeUpload"
+          <el-upload class="upload-demo" action accept=".pdf" :before-upload="beforeUpload"
            :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
            :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed"
            :disabled="form.Type === ''">
@@ -229,7 +229,7 @@ export default {
      this.$message.warning(this.$t('upload:rule:maxFile1'))
    },
    checkFileSuffix(fileName) {
-      var typeArr = ['pdf', 'mp4']
+      var typeArr = ['pdf']
      var extendName = fileName
        .substring(fileName.lastIndexOf('.') + 1)
        .toLocaleLowerCase()
@@ -16,7 +16,7 @@
                        :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
                        :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed">
                        <el-button size="small" type="primary" :loading="btnLoading">{{ $t('common:button:check')
-                            }}</el-button>
+                        }}</el-button>
                        <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
                            ({{ $t('trials:signature:label:type').replace("xxx", this.accept.join(", ")) }})
                        </span>
@@ -82,8 +82,7 @@ export default {
                '.doc',
                '.docx',
                '.xls',
-                '.xlsx',
-                '.mp4']
+                '.xlsx']
        }
    },
    mounted() {
@@ -173,7 +172,18 @@ export default {
            this.$message.warning(this.$t('upload:rule:maxFile1'))
        },
        checkFileSuffix(fileName) {
-            var typeArr = this.accept.map(item => item.split('.')[1])
+            var typeArr = [
+                'jpg',
+                'jpeg',
+                'png',
+                'pdf',
+                'ppt',
+                'pptx',
+                'doc',
+                'docx',
+                'xls',
+                'xlsx',
+            ]
            var extendName = fileName
                .substring(fileName.lastIndexOf('.') + 1)
                .toLocaleLowerCase()
@@ -46,16 +46,16 @@
                <!-- 新增/编辑附件 -->
                <el-dialog :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true" :title="title"
                    width="800px" custom-class="base-dialog-wrapper">
-                    <attachmentForm v-if="visible" :data="rowDATA" :SystemDocumentId="SystemDocumentId"
+                    <attachmentForm v-if="visible" :data="rowData" :SystemDocumentId="SystemDocumentId"
                        @closeDialog="closeDialog" @getList="getAllList" />
                </el-dialog>
            </template>
        </base-model>
        <viewer ref="picture_perview2" style="margin: 0 10px"
-            v-if="rowDATA.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowDATA.FileFormat.toLowerCase())"
-            :images="[`${OSSclientConfig.basePath}${rowDATA.FilePath}`]" :options="viewerOptions">
+            v-if="rowData.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowData.FileFormat.toLowerCase())"
+            :images="[`${OSSclientConfig.basePath}${rowData.FilePath}`]" :options="viewerOptions">

-            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowDATA.FilePath}`" alt="Image" />
+            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowData.FilePath}`" alt="Image" />
        </viewer>
        <!-- <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible"
            v-if="perview_visible" /> -->
@@ -113,7 +113,7 @@ export default {
            visible: false,
            title: null,
            list: [],
-            rowDATA: {},
+            rowData: {},
            loading: false,
            viewerOptions: {
                toolbar: {
@@ -167,7 +167,7 @@ export default {
            if (!row.Id) {
                this.title = this.$t('dictionary:signature:attachmentForm:title:add')
            }
-            this.rowDATA = Object.assign({}, row)
+            this.rowData = Object.assign({}, row)
            this.visible = true
        },
        async getList() {
@@ -207,7 +207,7 @@ export default {
        },
        preview(data) {
            // return this.perview_visible = true
-            this.rowDATA = Object.assign({}, data)
+            this.rowData = Object.assign({}, data)
            if (['.ppt',
                '.pptx',
                '.doc',
@@ -234,13 +234,6 @@ export default {
                    title: data.Name,
                })
            }
-            if (['.mp4'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$video({
-                    path: data.Path || data.FilePath,
-                    type: 'mp4',
-                    title: data.Name,
-                })
-            }
        },
        // 排序
        handleSortByColumn(column) {
@@ -70,11 +70,10 @@ import ppt from '@/assets/file_icon/ppt.png'
 import pptx from '@/assets/file_icon/pptx.png'
 import xls from '@/assets/file_icon/xls.png'
 import xlsx from '@/assets/file_icon/xlsx.png'
-import mp4 from '@/assets/file_icon/mp4.png'
+import mp4 from '@/assets/file_icon/xlsx.png'
 import PreviewFile from '@/components/PreviewFile'
 import imageViewer from './image-viewer'
 import { getSystemDocumentAttachmentList } from '@/api/dictionary'
-import { getTrialDocumentAttachmentList } from '@/api/trials'
 const defaultSearchData = () => {
    return {
        PageIndex: 1,
@@ -102,10 +101,6 @@ export default {
        isView: {
            type: Boolean,
            default: false
-        },
-        isTrial: {
-            type: Boolean,
-            default: false
        }
    },
    data() {
@@ -147,20 +142,11 @@ export default {
            try {
                if (!this.SystemDocumentId) return false
                this.loading = true
-                if (!this.isTrial) {
-                    this.searchData.SystemDocumentId = this.SystemDocumentId
-                } else {
-                    this.searchData.TrialDocumentId = this.SystemDocumentId
-                }
+                this.searchData.SystemDocumentId = this.SystemDocumentId
                if (this.isView) {
                    this.searchData.OffLine = false
                }
-                let res = null
-                if (!this.isTrial) {
-                    res = await getSystemDocumentAttachmentList(this.searchData)
-                } else {
-                    res = await getTrialDocumentAttachmentList(this.searchData)
-                }
+                let res = await getSystemDocumentAttachmentList(this.searchData)
                this.loading = false
                if (res.IsSuccess) {
                    this.list = res.Result.CurrentPageData
@@ -171,9 +171,7 @@
            <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
              <el-form-item label="对象类型" prop="menuType">
                <el-select v-model="form.ObjectTypeId" placeholder="对象类型" clearable size="small" @change="changeDescription">
-                  <template v-for="item of dict.type.ObjectType">
-                    <el-option :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
-                  </template>
+                  <el-option v-for="item of dict.type.ObjectType" :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
                </el-select>
              </el-form-item>
            </el-col>
@@ -246,7 +244,15 @@
                  <el-form-item label="前端展示类型">
                    <el-radio-group v-model="form.DataType" style="line-height: 30px;padding-top: 10px;" @change="(v) => {if (v === 'Table'){rowDrop2()}}">
                      <el-radio :label="''">字符串</el-radio>
-                      <el-radio :label="item.value" v-for="item in $d.AuditDataType" :key="item.id">{{item.label}}</el-radio>
+                      <el-radio label="Array">数组(类似QC问题审核)</el-radio>
+                      <el-radio label="Dialog">对话</el-radio>
+                      <el-radio label="Link">外链</el-radio>
+                      <el-radio label="DialogTable">弹框列表</el-radio>
+                      <el-radio label="Table">表格</el-radio>
+                      <el-radio label="Router">路由</el-radio>
+                      <el-radio label="Image">图片</el-radio>
+                      <el-radio label="ImageList">图片数组</el-radio>
+                      <el-radio label="OSS">OSS</el-radio>
                    </el-radio-group>
                  </el-form-item>
                </el-col>
@@ -277,35 +283,32 @@
                      </el-button>
                    </el-col>
                  </el-row>
-                  <template v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []">
-                    <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters"  :key="`Router${index}`">
-                      <el-col :span="10">
-                        <el-form-item>
-                        <span slot="label">
-                          参数名{{index + 1}}
-                        </span>
-                          <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterName" placeholder="参数名" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="10" >
-                        <el-form-item>
-                        <span slot="label">
-                          参数值{{index + 1}}
-                        </span>
-                          <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterValueName" placeholder="参数值" />
-                        </el-form-item>
-                      </el-col>
-                      <el-col :span="4">
-                        <el-button
-                          size="mini"
-                          type="text"
-                          icon="el-icon-delete"
-                          @click="handleParameterListDelete(index)"
-                        >删除</el-button>
-                      </el-col>
-                    </el-row>
-                  </template>
-
+                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters" v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []" :key="`Router${index}`">
+                    <el-col :span="10">
+                      <el-form-item>
+                      <span slot="label">
+                        参数名{{index + 1}}
+                      </span>
+                        <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterName" placeholder="参数名" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="10" >
+                      <el-form-item>
+                      <span slot="label">
+                        参数值{{index + 1}}
+                      </span>
+                        <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterValueName" placeholder="参数值" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="4">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-delete"
+                        @click="handleParameterListDelete(index)"
+                      >删除</el-button>
+                    </el-col>
+                  </el-row>
                </el-col>
                <el-button v-show="form.DataType === 'Table'" type="primary" size="mini" style="position: relative;top: -15px" @click="addCol">
                  增加列
@@ -517,7 +520,7 @@
                    <el-input v-model="form.ChildDataEnLabel" placeholder="请输入子数据LableEN" />
                  </el-form-item>
                </el-col>
-                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && (form.DataType === 'Array' || form.DataType === 'ArrayImage')" :span="12">
+                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
                  <el-form-item>
                    <span slot="label">
                      子数据Value
@@ -611,18 +614,6 @@
                />
              </el-form-item>
            </el-col>
-            <el-col v-show="title !== '复制'" :span="24">
-              <el-form-item>
-              <span slot="label">
-                是否默认
-              </span>
-                <el-switch
-                  v-model="form.IsDefaultChoice"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
-              </el-form-item>
-            </el-col>
            <!--分割线-->
            <el-col v-show="title !== '复制' && form.ConfigType == 'M'" :span="24">
              <el-divider content-position="left">其他信息</el-divider>
@@ -668,15 +659,11 @@
      <div style="padding: 0 40px;display: flex;flex-direction: column">
        <div style="text-align: right;height: 50px;">
          <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable size="small">
-              <template v-for="item of list">
-                <el-option :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
-              </template>
-            </el-select>
+            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+          </el-select>
          <el-button type="primary" size="mini" style="margin-right: 10px" @click="handleOverCope(selectRow)">完全拷贝</el-button>
          <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable size="small">
-            <template v-for="item of list">
-              <el-option  :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
-            </template>
+            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
          </el-select>
          <el-button type="primary" size="mini" @click="handleCope(selectRow)">拷贝</el-button>
          <el-button type="primary" size="mini" @click="handleAdd(selectRow)">新建</el-button>
@@ -1143,7 +1130,6 @@ export default {
        DescriptionCN: null,
        InterfaceName: null,
        IsEnable: true,
-        IsDefaultChoice: true,
        ModuleTypeId: null,
        OptTypeId: null,
        ChildrenTypeId: null,
@@ -7,28 +7,74 @@
        <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
      </span>
    </div>
-    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe size="small" height="100"
-      @sort-change="handleSortByColumn">
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:45}"
+      :data="list"
+      stripe
+      size="small"
+      height="100"
+    >
      <el-table-column type="index" width="60" />
-      <el-table-column v-if="!~$route.path.indexOf('select')" prop="Code" label="字典键值" min-width="180"
-        show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ValueCN" label="中文值" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="Value" label="英文值" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ChildGroup" label="分组" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="ShowOrder" label="显示顺序" min-width="180" show-overflow-tooltip sortable='custom' />
-      <el-table-column prop="Description" label="描述" min-width="180" show-overflow-tooltip sortable='custom' />
+      <el-table-column
+        v-if="!~$route.path.indexOf('select')"
+        prop="Code"
+        label="字典键值"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ValueCN"
+        label="中文值"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Value"
+        label="英文值"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ChildGroup"
+        label="分组"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ShowOrder"
+        label="显示顺序"
+        min-width="180"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Description"
+        label="描述"
+        min-width="180"
+        show-overflow-tooltip
+      />
      <el-table-column label="是否可用" width="100" fixed="right">
        <template slot-scope="scope">
-          <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
-            @change="(event) => { return switchChange(event, scope.row) }" />
+          <el-switch
+            v-model="scope.row.IsEnable"
+            :active-value="true"
+            :inactive-value="false"
+            @change="(event) => {return switchChange(event, scope.row)}"
+          />
        </template>
      </el-table-column>
      <el-table-column label="操作" width="150" fixed="right">
        <template slot-scope="scope">
-          <el-button type="text" @click="handleEdit(scope.row)">
+          <el-button
+            type="text"
+            @click="handleEdit(scope.row)"
+          >
            编辑
          </el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">
+          <el-button
+            type="text"
+            @click="handleDelete(scope.row)"
+          >
            删除
          </el-button>
        </template>
@@ -45,8 +91,7 @@ import DictionaryChildAddOrUpdateForm from './DictionaryChildAddOrUpdateForm'

 const searchDataDefault = () => {
  return {
-    Asc: true,
-    SortField: 'ShowOrder',
+    parentId: ''
  }
 }
 export default {
@@ -76,17 +121,6 @@ export default {
    this.getList()
  },
  methods: {
-    // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
    handleChild(row) {
      this.drawerChild = true
      this.getDictionaryChildList(row.Id)
@@ -138,8 +172,7 @@ export default {
    // 获取匿名化配置信息
    getList() {
      this.loading = true
-      this.searchData.ParentId = this.parent.Id
-      getDictionaryChildList(this.searchData).then(res => {
+      getDictionaryChildList(this.parent.Id).then(res => {
        this.loading = false
        this.list = res.Result
      }).catch(() => { this.loading = false })
@@ -157,4 +190,6 @@ export default {
 }
 </script>

-<style scoped></style>
+<style scoped>
+
+</style>
@@ -5,81 +5,151 @@
      </div>
      <div>
        <!-- 配置 -->
-        <el-button size="mini" type="primary" :disabled="isCompleteConfig" @click="handleAdd"
-          style="margin-right: 10px;">
+        <el-button
+          size="mini"
+          type="primary"
+          :disabled="isCompleteConfig"
+          @click="handleAdd"
+          style="margin-right: 10px;"
+        >
          {{ $t('dictionary:template:criterionDictionary:button:config') }}
        </el-button>
      </div>
    </div>
-    <el-table v-loading="loading" style="width: 100%" :data="list" stripe>
+    <el-table
+      v-loading="loading"
+      style="width: 100%"
+      :data="list"
+      stripe
+    >
      <!-- 序号 -->
-      <el-table-column prop="" label="" width="50">
+      <el-table-column
+        prop=""
+        label=""
+        width="50"
+      >
        <template slot-scope="scope">
-          {{ scope.$index + 1 }}
+          {{scope.$index + 1}}
        </template>
      </el-table-column>
      <!-- 字典表名 -->
-      <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Code"
+        :label="$t('dictionary:template:criterionDictionary:table:code')"
+        show-overflow-tooltip
+      >
      </el-table-column>
      <!-- 描述 -->
-      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Description"
+        :label="$t('dictionary:template:criterionDictionary:table:description')"
+        show-overflow-tooltip
+      >
      </el-table-column>
      <!-- 子项数量 -->
-      <el-table-column prop="Count" :label="$t('dictionary:template:criterionDictionary:table:count')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Count"
+        :label="$t('dictionary:template:criterionDictionary:table:count')"
+        show-overflow-tooltip
+      >
      </el-table-column>
      <!-- 排序 -->
-      <el-table-column prop="ShowOrder" :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="ShowOrder"
+        :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
+        show-overflow-tooltip
+      >
      </el-table-column>
      <!-- 操作 -->
-      <el-table-column prop="Description" :label="$t('common:action:action')" show-overflow-tooltip>
+      <el-table-column
+        prop="Description"
+        :label="$t('common:action:action')"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
          <!-- 配置 -->
-          <el-button type="text" @click="openChildren(scope.row)">
+          <el-button :disabled="isCompleteConfig" type="text" @click="openChildren(scope.row)">
            {{ $t('dictionary:template:criterionDictionary:button:config') }}
          </el-button>
          <!-- 删除 -->
-          <el-button type="text" :disabled="isCompleteConfig" @click="handleDelete(scope.row)">
+          <el-button
+            type="text"
+            :disabled="isCompleteConfig"
+            @click="handleDelete(scope.row)"
+          >
            {{ $t('common:button:delete') }}
          </el-button>
        </template>
      </el-table-column>
    </el-table>
-    <el-drawer :title="drawer_cfg.title" :append-to-body="true" :modal-append-to-body="false"
-      :visible.sync="drawer_cfg.drawerChild" direction="rtl" size="80%">
-      <CriterionDictionaryConfig v-if="drawer_cfg.drawerChild" @getList="getList" :isCompleteConfig="isCompleteConfig"
-        :criterionId="criterionId" :parentCode="drawer_cfg.title"></CriterionDictionaryConfig>
+    <el-drawer
+      :title="drawer_cfg.title"
+      :append-to-body="true"
+      :modal-append-to-body="false"
+      :visible.sync="drawer_cfg.drawerChild"
+      direction="rtl"
+      size="80%"
+    >
+      <CriterionDictionaryConfig v-if="drawer_cfg.drawerChild" @getList="getList" :criterionId="criterionId" :parentCode="drawer_cfg.title"></CriterionDictionaryConfig>
    </el-drawer>
-    <el-drawer :title="drawer_cfg2.title" :append-to-body="true" :modal-append-to-body="false"
-      :visible.sync="drawer_cfg2.drawerChild" direction="rtl" size="80%">
+    <el-drawer
+      :title="drawer_cfg2.title"
+      :append-to-body="true"
+      :modal-append-to-body="false"
+      :visible.sync="drawer_cfg2.drawerChild"
+      direction="rtl"
+      size="80%"
+    >
      <div style="text-align: right;">
-        <el-button size="mini" type="primary" @click="handleSave" v-loading="loading">
-          {{ $t('common:button:save') }}
+        <el-button
+          size="mini"
+          type="primary"
+          @click="handleSave"
+          v-loading="loading"
+        >
+          {{ $t('common:button:save')}}
        </el-button>
      </div>
-      <el-table v-loading="loading" v-adaptive="{ bottomOffset: 0 }" height="100" ref="multipleTable" style="width: 100%"
-        :data="dicList" stripe @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55">
+      <el-table
+        v-loading="loading"
+        v-adaptive="{bottomOffset:0}"
+        height="100"
+        ref="multipleTable"
+        style="width: 100%"
+        :data="dicList"
+        stripe
+        @selection-change="handleSelectionChange"
+      >
+        <el-table-column
+          type="selection"
+          width="55">
        </el-table-column>
-        <el-table-column width="55">
+        <el-table-column
+          width="55">
          <template slot-scope="scope">
-            {{ scope.$index + 1 }}
+            {{ scope.$index + 1}}
          </template>
        </el-table-column>
        <!-- 字典表名 -->
-        <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="Code"
+          :label="$t('dictionary:template:criterionDictionary:table:code')"
+          show-overflow-tooltip
+        >
        </el-table-column>
        <!-- 描述 -->
-        <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="Description"
+          :label="$t('dictionary:template:criterionDictionary:table:description')"
+          show-overflow-tooltip
+        >
        </el-table-column>
        <!-- 排序 -->
-        <el-table-column prop="ShowOrder" :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="ShowOrder"
+          :label="$t('dictionary:template:criterionDictionary:table:showOrder')"
+          show-overflow-tooltip
+        >
        </el-table-column>
      </el-table>
    </el-drawer>
@@ -194,7 +264,7 @@ export default {
      this.loading = true
      // 是否确认删除
      this.$confirm(this.$t('template:criterionDictionary:message:msg1')).then(() => {
-        deleteSystemCriterionDictionary({ Id: row.Id }).then(res => {
+        deleteSystemCriterionDictionary({Id: row.Id}).then(res => {
          this.$message.success(this.$t('common:message:deletedSuccessfully'))
          this.loading = false
          this.getList()
@@ -207,7 +277,7 @@ export default {
 </script>

 <style lang="scss" scoped>
-::v-deep .el-form-item__content {
+::v-deep .el-form-item__content{
  width: calc(100% - 110px);
 }
 </style>
@@ -4,74 +4,134 @@
      <div>
      </div>
      <div>
-        <el-button size="mini" type="primary" @click="handleAdd" style="margin-right: 10px;" v-if="!isCompleteConfig">
+        <el-button
+          size="mini"
+          type="primary"
+          @click="handleAdd"
+          style="margin-right: 10px;"
+        >
          {{ $t('dictionary:template:criterionDictionary:button:config') }}
        </el-button>
      </div>
    </div>
-    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 0 }" height="100" style="width: 100%" :data="list" stripe>
-      <el-table-column prop="" label="" width="50">
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:0}"
+      height="100"
+      style="width: 100%"
+      :data="list"
+      stripe
+    >
+      <el-table-column
+        prop=""
+        label=""
+        width="50"
+      >
        <template slot-scope="scope">
-          {{ scope.$index + 1 }}
+          {{scope.$index + 1}}
        </template>
      </el-table-column>
      <!-- 键值 -->
-      <el-table-column prop="Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-        show-overflow-tooltip />
+      <el-table-column
+        prop="Code"
+        :label="$t('dictionary:template:criterionDictionary:table:code')"
+        show-overflow-tooltip
+      />
      <!-- 中文值 -->
-      <el-table-column prop="ValueCN" :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="ValueCN"
+        :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
+        show-overflow-tooltip
+      >
      </el-table-column>
      <!-- 英文值 -->
-      <el-table-column prop="Value" :label="$t('dictionary:template:criterionDictionary:table:value')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Value"
+        :label="$t('dictionary:template:criterionDictionary:table:value')"
+        show-overflow-tooltip
+      >
      </el-table-column>
      <!-- 描述 -->
-      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:description')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Description"
+        :label="$t('dictionary:template:criterionDictionary:table:description')"
+        show-overflow-tooltip
+      >
      </el-table-column>
      <!-- 分组 -->
-      <el-table-column prop="Description" :label="$t('dictionary:template:criterionDictionary:table:group')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="Description"
+        :label="$t('dictionary:template:criterionDictionary:table:group')"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
-          <div v-if="!isCompleteConfig">
-            <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" :key="item.id">{{
-                item.label }}</el-radio-button>
+          <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" :key="item.id">{{item.label}}</el-radio-button>
            </el-radio-group>
          </div>
-          <div v-else>{{ $fd('CrterionDictionaryGroup', scope.row.CrterionDictionaryGroup) }}</div>
        </template>
      </el-table-column>
    </el-table>
-    <el-dialog v-if="config.visible" :visible.sync="config.visible" :close-on-click-modal="false" :title="config.title"
-      width="90%" append-to-body>
+    <el-dialog
+      v-if="config.visible"
+      :visible.sync="config.visible"
+      :close-on-click-modal="false"
+      :title="config.title"
+      width="90%"
+      append-to-body
+    >
      <div>
        <div style="text-align: right;">
-          <el-button size="mini" type="primary" @click="handleSave" v-loading="loading">
-            {{ $t('common:button:save') }}
+          <el-button
+            size="mini"
+            type="primary"
+            @click="handleSave"
+            v-loading="loading"
+          >
+            {{ $t('common:button:save')}}
          </el-button>
        </div>
-        <el-table v-loading="loading" v-adaptive="{ bottomOffset: 100 }" height="100" ref="multipleTable"
-          :data="$d[parentCode]" stripe @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55">
+        <el-table
+          v-loading="loading"
+          v-adaptive="{bottomOffset:100}"
+          height="100"
+          ref="multipleTable"
+          :data="$d[parentCode]"
+          stripe
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="55">
          </el-table-column>
          <!-- 键值 -->
-          <el-table-column prop="raw.Code" :label="$t('dictionary:template:criterionDictionary:table:code')"
-            show-overflow-tooltip>
+          <el-table-column
+            prop="raw.Code"
+            :label="$t('dictionary:template:criterionDictionary:table:code')"
+            show-overflow-tooltip
+          >
          </el-table-column>
          <!-- 中文值 -->
-          <el-table-column prop="raw.ValueCN" :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
-            show-overflow-tooltip>
+          <el-table-column
+            prop="raw.ValueCN"
+            :label="$t('dictionary:template:criterionDictionary:table:valueCN')"
+            show-overflow-tooltip
+          >
          </el-table-column>
          <!-- 英文值 -->
-          <el-table-column prop="raw.Value" :label="$t('dictionary:template:criterionDictionary:table:value')"
-            show-overflow-tooltip>
+          <el-table-column
+            prop="raw.Value"
+            :label="$t('dictionary:template:criterionDictionary:table:value')"
+            show-overflow-tooltip
+          >
          </el-table-column>
          <!-- 描述 -->
-          <el-table-column prop="raw.Description"
-            :label="$t('dictionary:template:criterionDictionary:table:description')" show-overflow-tooltip>
+          <el-table-column
+            prop="raw.Description"
+            :label="$t('dictionary:template:criterionDictionary:table:description')"
+            show-overflow-tooltip
+          >
          </el-table-column>
        </el-table>
      </div>
@@ -90,10 +150,6 @@ export default {
    parentCode: {
      type: String,
      required: true
-    },
-    isCompleteConfig: {
-      type: Boolean,
-      default: false
    }
  },
  data() {
@@ -122,7 +178,7 @@ export default {
        this.loading = false
        this.$message.success(this.$t('common:message:savedSuccessfully'))
        this.getList()
-      }).catch(() => { this.loading = false })
+      }).catch(() => {this.loading = false})
    },
    toggleSelection(rows) {
      console.log(this.$refs.multipleTable)
@@ -184,7 +240,7 @@ export default {
 </script>

 <style lang="scss" scoped>
-::v-deep .el-form-item__content {
+::v-deep .el-form-item__content{
  width: calc(100% - 110px);
 }
 </style>
@@ -1,5 +1,12 @@
 <template>
-  <el-form ref="emailForm" v-loading="loading" :model="form" label-width="180px" size="small" :rules="rules">
+  <el-form
+    ref="emailForm"
+    v-loading="loading"
+    :model="form"
+    label-width="180px"
+    size="small"
+    :rules="rules"
+  >
    <el-row>
      <el-col :span="24">
        <!-- Code -->
@@ -22,7 +29,12 @@
      <el-col :span="12">
        <!-- 邮件延时发送s数 -->
        <el-form-item :label="$t('dictionary:email:label:emailDelaySeconds')" prop="EmailDelaySeconds">
-          <el-input v-model.number="form.EmailDelaySeconds" style="width: 300px" type="number" clearable>
+          <el-input
+            v-model.number="form.EmailDelaySeconds"
+            style="width: 300px"
+            type="number"
+            clearable
+          >
          </el-input>
        </el-form-item>
      </el-col>
@@ -30,8 +42,12 @@
        <!-- 业务层级 -->
        <el-form-item :label="$t('dictionary:email:label:businessLevel')" prop="BusinessLevelEnum">
          <el-select v-model="form.BusinessLevelEnum" clearable class="mr">
-            <el-option v-for="item of $d.BusinessLevel" :key="`BusinessLevel${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of $d.BusinessLevel"
+              :key="`BusinessLevel${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
@@ -39,8 +55,12 @@
        <!-- 业务模块 -->
        <el-form-item :label="$t('dictionary:email:label:businessModule')" prop="BusinessModuleEnum">
          <el-select v-model="form.BusinessModuleEnum" clearable class="mr">
-            <el-option v-for="item of $d.BusinessModule" :key="`BusinessModule${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of $d.BusinessModule"
+              :key="`BusinessModule${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
@@ -48,46 +68,80 @@
        <!-- 业务场景 -->
        <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
          <el-select v-model="form.BusinessScenarioEnum" clearable class="mr">
-            <el-option v-for="item of $d.Email_BusinessScenario" :key="`BusinessScenarioEnum${item.label}`"
-              :label="item.label" :value="item.value" />
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :key="`BusinessScenarioEnum${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <!-- 收件人 -->
        <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
-          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
-            <el-option v-for="item of $d.UserType" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+          <el-select
+            v-model="form.ToUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.UserType"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <!-- 抄送人 -->
        <el-form-item :label="$t('trials:emailManageCfg:title:copyUserTypeList')" prop="CopyUserTypeList">
-          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
-            <el-option v-for="item of $d.UserType" :key="`CopyUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+          <el-select
+            v-model="form.CopyUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.UserType"
+              :key="`CopyUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <!-- 加急状态 -->
        <el-form-item :label="$t('dictionary:email:label:IsUrgent')" prop="EmailUrgentEnum">
-          <el-select v-model="form.EmailUrgentEnum" @change="
-            (v) => {
-              v === 1 ? (form.EmailCron = null) : null
-            }
-          " clearable class="mr">
-            <el-option v-for="item of $d.EmailUrgent" :key="`EmailUrgent${item.label}`" :label="item.label"
-              :value="item.value" />
+          <el-select
+            v-model="form.EmailUrgentEnum"
+            @change="
+              (v) => {
+                v === 1 ? (form.EmailCron = null) : null
+              }
+            "
+            clearable
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.EmailUrgent"
+              :key="`EmailUrgent${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <!-- 发送周期和时间 -->
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')" v-if="form.EmailUrgentEnum !== 1"
-          prop="EmailCron">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailCron')"
+          v-if="form.EmailUrgentEnum !== 1"
+          prop="EmailCron"
+        >
          <el-input style="width: 300px" readonly v-model="form.EmailCron" />
          <!-- 生成 cron -->
          <el-button type="primary" @click="showDialog"> {{ $t('dictionary:email:button:cron') }} </el-button>
@@ -97,8 +151,12 @@
        <!-- 是否需要回执 -->
        <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
          <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{
-              item.label }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsReturnRequired${item.value}`"
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
      </el-col>
@@ -106,30 +164,48 @@
        <!-- 是否自动发送 -->
        <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
          <el-radio-group v-model="form.IsAutoSend">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label
-            }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsAutoSend${item.value}`"
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
      </el-col>
      <el-col :span="12" v-if="systemLevel">
        <!-- 是否区分标准 -->
        <el-form-item :label="$t('dictionary:email:button:isDistinguishCriteria')" prop="IsDistinguishCriteria">
-          <el-radio-group v-model="form.IsDistinguishCriteria" @change="
-            () => {
-              form.CriterionTypeEnum = null
-            }
-          ">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsDistinguishCriteria${item.value}`">{{
-              item.label }}</el-radio>
+          <el-radio-group
+            v-model="form.IsDistinguishCriteria"
+            @change="
+              () => {
+                form.CriterionTypeEnum = null
+              }
+            "
+          >
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsDistinguishCriteria${item.value}`"
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
      </el-col>
      <el-col :span="12">
-        <el-form-item :label="$t('trials:auditRecord:table:criterion')" v-if="form.IsDistinguishCriteria"
-          prop="CriterionTypeList">
-          <el-select v-model="form.CriterionTypeList" clearable class="mr" multiple>
-            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:auditRecord:table:criterion')"
+          v-if="form.IsDistinguishCriteria"
+          prop="CriterionTypeEnum"
+        >
+          <el-select v-model="form.CriterionTypeEnum" clearable class="mr">
+            <el-option
+              v-for="item of $d.CriterionType"
+              :key="`CriterionType${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
@@ -137,65 +213,106 @@
        <!-- 是否启用 -->
        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
          <el-radio-group v-model="form.IsEnable">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label
-            }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsEnable${item.value}`"
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <!-- 附件（CN） -->
        <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
-          <el-upload class="upload-demo" action :before-upload="beforeUploadCN" :http-request="handleUploadFileCN"
-            :on-preview="handlePreviewCN" :on-remove="handleRemoveFileCN" :show-file-list="true" :limit="1"
-            :file-list="fileListCN">
-            <el-button size="small" type="primary" :disabled="fileListCN.length > 0">{{ $t('common:button:upload')
-            }}</el-button>
+          <el-upload
+            class="upload-demo"
+            action
+            :before-upload="beforeUploadCN"
+            :http-request="handleUploadFileCN"
+            :on-preview="handlePreviewCN"
+            :on-remove="handleRemoveFileCN"
+            :show-file-list="true"
+            :limit="1"
+            :file-list="fileListCN"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="fileListCN.length > 0"
+              >{{ $t('common:button:upload') }}</el-button
+            >
          </el-upload>
        </el-form-item>
      </el-col>
      <el-col :span="12">
        <!-- 附件（EN） -->
        <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
-          <el-upload class="upload-demo" action :before-upload="beforeUploadEN" :http-request="handleUploadFileEN"
-            :on-preview="handlePreviewEN" :on-remove="handleRemoveFileEN" :show-file-list="true" :limit="1"
-            :file-list="fileListEN">
-            <el-button size="small" type="primary" :disabled="fileListEN.length > 0">{{ $t('common:button:upload')
-            }}</el-button>
+          <el-upload
+            class="upload-demo"
+            action
+            :before-upload="beforeUploadEN"
+            :http-request="handleUploadFileEN"
+            :on-preview="handlePreviewEN"
+            :on-remove="handleRemoveFileEN"
+            :show-file-list="true"
+            :limit="1"
+            :file-list="fileListEN"
+          >
+            <el-button
+              size="small"
+              type="primary"
+              :disabled="fileListEN.length > 0"
+              >{{ $t('common:button:upload') }}</el-button
+            >
          </el-upload>
        </el-form-item>
      </el-col>
    </el-row>
    <!-- 邮件内容模版（CN） -->
-    <el-form-item :label="$t('dictionary:email:label:emailHtmlContentCN')" prop="EmailHtmlContentCN"
-      style="position: relative">
-      <div class="html_temp">
-        <prism-editor class="my-editor" v-model="form.EmailHtmlContentCN" :highlight="highlighter" :line-numbers="true"
-          style="width: 50%;max-height: 500px;"></prism-editor>
-        <div v-html="form.EmailHtmlContentCN" style="width: 50%;"></div>
-      </div>
-      <!-- <el-input v-model="form.EmailHtmlContentCN" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
-      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
+    <el-form-item
+      :label="$t('dictionary:email:label:emailHtmlContentCN')"
+      prop="EmailHtmlContentCN"
+      style="position: relative"
+    >
+      <el-input
+        v-model="form.EmailHtmlContentCN"
+        type="textarea"
+        :autosize="{ minRows: 8, maxRows: 8 }"
+      />
+      <el-button
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
+        type="text"
        @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
-        style="position: absolute; left: -50px; top: 30px">
+        style="position: absolute; left: -50px; top: 30px"
+      >
        {{ $t('common:button:preview') }}
-      </el-button> -->
+      </el-button>
    </el-form-item>
    <!-- 邮件内容模版（EN） -->
-    <el-form-item :label="$t('dictionary:email:label:emailHtmlContent')" prop="EmailHtmlContent"
-      style="position: relative">
-      <div class="html_temp">
-        <prism-editor class="my-editor" v-model="form.EmailHtmlContent" :highlight="highlighter" :line-numbers="true"
-          style="width: 50%;max-height: 500px;"></prism-editor>
-        <div v-html="form.EmailHtmlContent" style="width: 50%;"></div>
-      </div>
-      <!-- <el-input v-model="form.EmailHtmlContent" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
-      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
+    <el-form-item
+      :label="$t('dictionary:email:label:emailHtmlContent')"
+      prop="EmailHtmlContent"
+      style="position: relative"
+    >
+      <el-input
+        v-model="form.EmailHtmlContent"
+        type="textarea"
+        :autosize="{ minRows: 8, maxRows: 8 }"
+      />
+      <el-button
+        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
+        type="text"
        @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
-        style="position: absolute; left: -50px; top: 30px">
+        style="position: absolute; left: -50px; top: 30px"
+      >
        {{ $t('common:button:preview') }}
-      </el-button> -->
+      </el-button>
    </el-form-item>
-    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px; padding-bottom: 10px">
+    <div
+      class="base-dialog-footer"
+      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
+    >
      <el-form-item style="text-align: right">
        <el-button size="small" type="primary" @click="handleSave">
          {{ $t('common:button:save') }}
@@ -204,7 +321,12 @@
    </div>
    <!-- 生成 cron -->
    <el-dialog append-to-body :title="$t('dictionary:email:button:cron')" :visible.sync="showCron">
-      <vcrontab :hideComponent="['year']" @hide="showCron = false" @fill="crontabFill" :expression="expression">
+      <vcrontab
+        :hideComponent="['year']"
+        @hide="showCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      >
      </vcrontab>
    </el-dialog>
  </el-form>
@@ -212,14 +334,6 @@
 <script>
 import { Upload, addOrUpdateEmailNoticeConfigList } from '@/api/dictionary'
 import vcrontab from 'vcrontab'
-
-import { PrismEditor } from 'vue-prism-editor';
-import 'vue-prism-editor/dist/prismeditor.min.css';
-import { highlight, languages } from 'prismjs/components/prism-core';
-import 'prismjs/components/prism-clike';
-import 'prismjs/components/prism-javascript';
-import 'prismjs/themes/prism.css';
-
 export default {
  props: {
    data: {
@@ -241,7 +355,7 @@ export default {
      },
    },
  },
-  components: { vcrontab, PrismEditor },
+  components: { vcrontab },
  data() {
    return {
      expression: '',
@@ -271,7 +385,6 @@ export default {
        IsAutoSend: true,
        CriterionTypeEnum: null,
        EmailDelaySeconds: null,
-        CriterionTypeList: []
      },
      rules: {
        Code: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
@@ -302,8 +415,8 @@ export default {
        EmailHtmlContent: [
          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
        ],
-        CriterionTypeList: [
-          { required: true, type: 'array', message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        CriterionTypeEnum: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
        ],
      },
      scenarioOption: [],
@@ -327,9 +440,6 @@ export default {
    }
  },
  methods: {
-    highlighter(code) {
-      return highlight(code, languages.js);
-    },
    showDialog() {
      this.expression = this.form.EmailCron //传入的 cron 表达式，可以反解析到 UI 上
      this.showCron = true
@@ -453,13 +563,3 @@ export default {
  },
 }
 </script>
-<style lang="scss" scoped>
-.html_temp {
-  display: flex;
-
-  .my-editor {
-    border: 1px solid #333;
-  }
-
-}
-</style>
@@ -67,26 +67,20 @@
          <el-button type="primary" @click="handleAdd">
            {{ $t('common:button:new') }}
          </el-button>
-          <el-button type="primary" @click="openDrawer" :disabled="multipleSelection.length <= 0">
-            {{ $t('trials:emailManageCfg:button:batchAudit') }}
-          </el-button>
        </el-form-item>
      </el-form>
    </div>
    <!-- 受试者列表 -->
    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe height="100" style="width: 100%"
-      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-      <!-- <el-table-column type="index" width="40" /> -->
-      <el-table-column type="selection" width="55">
-      </el-table-column>
+      @sort-change="handleSortByColumn">
+      <el-table-column type="index" width="40" />
      <!-- Code -->
      <el-table-column prop="Code" :label="$t('trials:emailManageCfg:title:code')" sortable="custom"
        show-overflow-tooltip min-width="100" />
      <el-table-column v-if="isDistinguishCriteria" prop="TrialReadingCriterionId"
        :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
        <template slot-scope="scope">
-          {{scope.row.CriterionTypeList ? scope.row.CriterionTypeList.map(item => $fd('CriterionType', item)).join(', ')
-          : ''}}
+          {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
        </template>
      </el-table-column>
      <!-- 邮件主题（中文） -->
@@ -255,76 +249,12 @@
        </div>
      </div>
    </el-dialog>
-    <el-drawer :title="$t('trials:emailManageCfg:title:audit')" :visible.sync="drawer" direction="rtl" size="80%">
-      <!-- <div style="width: 800px">
-        <el-form label-width="100px" @submit.native.prevent size="small" :inline="true" class="demo-form-inline">
-          <el-form-item :label="$t('il8n:search:keyword')">
-            <el-input v-model="key" @input="keyChange" />
-          </el-form-item>
-          <el-form-item :label="$t('il8n:search:state')">
-            <el-select v-model="State" clearable filterable @change="handleStateChange">
-              <el-option v-for="item of $d.InternationalizationKeyState"
-                :key="'InternationalizationKeyState' + item.value" :label="item.label" :value="item.value" />
-            </el-select>
-          </el-form-item>
-        </el-form>
-      </div> -->
-      <el-table :data="tableData" v-adaptive="{ bottomOffset: 50 }" height="100" style="width: 100%"
-        @sort-change="handleSortByColumnDrawer">
-        <!-- Code -->
-        <el-table-column prop="Code" :label="$t('trials:emailManageCfg:title:code')" sortable="custom"
-          show-overflow-tooltip min-width="100" />
-        <el-table-column v-if="isDistinguishCriteria" prop="TrialReadingCriterionId"
-          :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" min-width="120">
-          <template slot-scope="scope">
-            {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
-          </template>
-        </el-table-column>
-        <!-- 邮件主题（中文） -->
-        <el-table-column prop="EmailTopicCN" :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom"
-          show-overflow-tooltip min-width="160">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.EmailTopicCN" @input="
-              (e) => {
-                $set(scope.row, 'EmailTopicCN', e)
-              }
-            " size="mini"></el-input>
-          </template>
-        </el-table-column>
-        <!-- 邮件主题（英文） -->
-        <el-table-column prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')" sortable="custom"
-          show-overflow-tooltip min-width="160">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.EmailTopic" @input="
-              (e) => {
-                $set(scope.row, 'EmailTopic', e)
-              }
-            " size="mini"></el-input>
-          </template>
-        </el-table-column>
-        <!-- 业务层级 -->
-        <el-table-column prop="BusinessLevelEnum" :label="$t('dictionary:email:label:businessLevel')" sortable="custom"
-          show-overflow-tooltip min-width="150">
-          <template slot-scope="scope">
-            {{ $fd('BusinessLevel', scope.row.BusinessLevelEnum) }}
-          </template>
-        </el-table-column>
-      </el-table>
-      <div style="text-align: right; padding-top: 10px; padding-right: 10px">
-        <el-button size="mini" @click="drawer = false">{{ $t('common:button:cancel') }}
-        </el-button>
-        <el-button size="mini" type="primary" @click="handleSave">{{
-          $t('common:button:save')
-        }}</el-button>
-      </div>
-    </el-drawer>
  </box-content>
 </template>
 <script>
 import {
  getEmailNoticeConfigList,
  deleteEmailNoticeConfig,
-  batchUpdateEmail
 } from '@/api/dictionary'
 import { GetEmailNoticeConfigList_Export } from '@/api/export'
 import BoxContent from '@/components/BoxContent'
@@ -378,9 +308,6 @@ export default {
      previewVisible: false,
      previewHTML: null,
      previewHTMLEN: null,
-      multipleSelection: [],
-      drawer: false,
-      tableData: []
    }
  },
  computed: {
@@ -398,50 +325,6 @@ export default {
    this.getList()
  },
  methods: {
-    async handleSave() {
-      try {
-        let arr = []
-        this.tableData.forEach(item => {
-          let obj = {
-            EmailTopic: item.EmailTopic,
-            EmailTopicCN: item.EmailTopicCN,
-            Id: item.Id
-          }
-          arr.push(obj)
-        })
-        this.drawer = false
-        let res = await batchUpdateEmail(arr)
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('trials:emailManageCfg:message:auditSuccess'))
-          this.getList()
-        }
-      } catch (err) {
-        console.log(err)
-      }
-    },
-    // 排序
-    handleSortByColumnDrawer(column) {
-      if (column.order === 'ascending') {
-        this.tableData.sort((a, b) =>
-          a[column.prop].localeCompare(b[column.prop])
-        )
-      } else {
-        this.tableData.sort((a, b) =>
-          b[column.prop].localeCompare(a[column.prop])
-        )
-      }
-    },
-    openDrawer() {
-      this.tableData = []
-      this.multipleSelection.forEach(item => {
-        let obj = Object.assign({}, item)
-        this.tableData.push(obj)
-      })
-      this.drawer = true
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
    // 获取受试者列表
    getList() {
      this.loading = true
@@ -289,7 +289,7 @@ export default {
    },
    handleEmailChange() {
      var reg =
-        /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/
+        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
      if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
        this.sendDisabled = false
      } else {
@@ -62,9 +62,8 @@
        <!-- 用户类型 -->
        <el-form-item :label="$t('trials:signRecords:table:userType')" v-if="!isDoc">
          <el-select v-model="searchData.UserTypeId" clearable filterable style="width: 120px">
-            <el-option v-for="item of userTypeOptions"
-              v-show="isSystem || (item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27)" :key="item.Id"
-              :label="item.UserTypeShortName" :value="item.Id">
+            <el-option v-for="item of userTypeOptions" v-show="item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27"
+              :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
              <span>{{ item.UserType }}</span>
            </el-option>
          </el-select>
@@ -6,8 +6,12 @@
        <!-- 中心编号 -->
        <el-form-item :label="$t('trials:reviewAssign:readingTask:table:siteCode')">
          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
-            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
-              :value="item.TrialSiteId" />
+            <el-option
+              v-for="(item,index) of siteOptions"
+              :key="index"
+              :label="item.TrialSiteCode"
+              :value="item.TrialSiteId"
+            />
          </el-select>
        </el-form-item>
        <!-- 受试者编号 -->
@@ -16,47 +20,51 @@
        </el-form-item>
        <!-- 访视/阅片期名称 -->
        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:visitName')">
-          <el-input v-model="searchData.TaskName" style="width:100px;" clearable />
+          <el-input
+            v-model="searchData.TaskName"
+            style="width:100px;"
+            clearable
+          />
        </el-form-item>
        <!-- 阅片人 -->
        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:reader')">
          <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
-            <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId"
-              :value="item.DoctorUserId" :label="item.UserName" />
+            <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId" :value="item.DoctorUserId" :label="item.UserName" />
          </el-select>
        </el-form-item>
        <!-- 是否加急 -->
        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:isUrgent')">
          <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value"
-              :label="item.label" />
+            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
          </el-select>
        </el-form-item>
        <!-- 任务状态 -->
        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:taskStatus')">
          <el-select v-model="searchData.TaskState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value"
-              :label="item.label" />
+            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
          </el-select>
        </el-form-item>
        <!-- 任务类型 -->
        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:taskType')">
          <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
-            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value"
-              :label="item.label" />
+            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
          </el-select>
        </el-form-item>
        <!-- 分配状态 -->
        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:assignStatus')">
          <el-select v-model="searchData.TaskAllocationState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label"
-              :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label" :value="item.value" :label="item.label" />
          </el-select>
        </el-form-item>
        <!-- 分配时间 -->
        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:assignTime')">
-          <el-date-picker v-model="timeList" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
-            :default-time="['00:00:00', '23:59:59']" @change="changeTimeList" />
+          <el-date-picker
+            v-model="timeList"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="changeTimeList"
+          />
        </el-form-item>
        <el-form-item style="margin-bottom:10px">
          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -69,117 +77,180 @@
      </el-form>
    </template>
    <template slot="main-container">
-      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
-        @sort-change="handleSortChange">
-        <el-table-column prop="OriginalReReadingTask.IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
-          show-overflow-tooltip min-width="100" sortable="custom">
+      <el-table
+        v-adaptive="{bottomOffset:60}"
+        v-loading="loading"
+        :data="list"
+        stripe
+        height="100"
+        @sort-change="handleSortChange"
+      >
+        <el-table-column
+          prop="OriginalReReadingTask.IsUrgent"
+          :label="$t('trials:consistencyCheck:table:isUrgent')"
+          show-overflow-tooltip
+          min-width="100"
+          sortable="custom"
+        >
          <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.IsUrgent" type="danger">{{ $fd('YesOrNo',
-              scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.IsUrgent" type="danger">{{ $fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
          </template>
        </el-table-column>
        <!-- 任务编号 -->
-        <el-table-column prop="OriginalReReadingTask.TaskCode" :label="$t('trials:readTask:table:taskCode')"
-          min-width="100" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.TaskCode"
+          :label="$t('trials:readTask:table:taskCode')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 中心编号 -->
-        <el-table-column prop="OriginalReReadingTask.TrialSiteCode" :label="$t('trials:readTask:table:siteCode')"
-          min-width="100" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.TrialSiteCode"
+          :label="$t('trials:readTask:table:siteCode')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 受试者编号 -->
-        <el-table-column prop="OriginalReReadingTask.SubjectCode" :label="$t('trials:readTask:table:subjectCode')"
-          min-width="120" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.SubjectCode"
+          :label="$t('trials:readTask:table:subjectCode')"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 访视/阅片期名称 -->
-        <el-table-column prop="OriginalReReadingTask.TaskName"
-          :label="$t('trials:reviewAssign:readingTask:table:visitName')" min-width="160" sortable="custom"
-          show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.TaskName"
+          :label="$t('trials:reviewAssign:readingTask:table:visitName')"
+          min-width="160"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 盲态任务标识 -->
-        <el-table-column prop="OriginalReReadingTask.TaskBlindName"
-          :label="$t('trials:reviewAssign:readingTask:table:blindName')" min-width="140" sortable="custom"
-          show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.TaskBlindName"
+          :label="$t('trials:reviewAssign:readingTask:table:blindName')"
+          min-width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 任务创建时间 -->
-        <el-table-column prop="OriginalReReadingTask.CreateTime"
-          :label="$t('trials:reviewAssign:readingTask:table:createTime')" min-width="140" sortable="custom"
-          show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.CreateTime"
+          :label="$t('trials:reviewAssign:readingTask:table:createTime')"
+          min-width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 任务状态 -->
-        <el-table-column prop="OriginalReReadingTask.TaskState"
-          :label="$t('trials:reviewAssign:readingTask:table:taskStatus')" min-width="100" sortable="custom"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.TaskState"
+          :label="$t('trials:reviewAssign:readingTask:table:taskStatus')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 0" type="primary">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 1" type="info">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 3" type="danger">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 4" type="warning">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 5" type="danger">{{ $fd('TaskState',
-              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
          </template>
        </el-table-column>
        <!-- 任务类型 -->
-        <el-table-column prop="OriginalReReadingTask.ReadingCategory"
-          :label="$t('trials:reviewAssign:readingTask:table:taskType')" min-width="100" sortable="custom"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.ReadingCategory"
+          :label="$t('trials:reviewAssign:readingTask:table:taskType')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 1" type="primary">{{
-              $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory',
-              scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory',
-              scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 5" type="warning">{{
-              $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
          </template>
        </el-table-column>
        <!-- 角色 -->
-        <el-table-column prop="OriginalReReadingTask.ArmEnum" :label="$t('trials:reviewAssign:readingTask:table:role')"
-          min-width="80" sortable="custom" show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.ArmEnum"
+          :label="$t('trials:reviewAssign:readingTask:table:role')"
+          min-width="80"
+          sortable="custom"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 1" type="primary">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 2" type="success">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 3" type="info">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 4" type="danger">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 5" type="warning">{{ $fd('ArmEnum',
-              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 1" type="primary">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 2" type="success">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 3" type="info">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 4" type="danger">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 5" type="warning">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
          </template>
        </el-table-column>
        <!-- 阅片人 -->
-        <el-table-column prop="OriginalReReadingTask.UserName"
-          :label="$t('trials:reviewAssign:readingTask:table:reader')" min-width="100" sortable="custom"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.UserName"
+          :label="$t('trials:reviewAssign:readingTask:table:reader')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
            {{ scope.row.OriginalReReadingTask.UserName }}({{ scope.row.OriginalReReadingTask.FullName }})
          </template>
        </el-table-column>
        <!-- 阅片完成时间 -->
-        <el-table-column prop="OriginalReReadingTask.SignTime" :label="$t('trials:reviewTrack:table:signTime')"
-          min-width="180" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="OriginalReReadingTask.SignTime"
+          :label="$t('trials:reviewTrack:table:signTime')"
+          min-width="180"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 重阅申请类型 -->
-        <el-table-column prop="OriginalReReadingTask.RequestReReadingType"
-          :label="$t('trials:rereadTask:table:requestReReadingType')" min-width="140" sortable="custom"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="OriginalReReadingTask.RequestReReadingType"
+          :label="$t('trials:rereadTask:table:requestReReadingType')"
+          min-width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
            <div v-if="scope.row.RequestReReadingType">
-              <el-tag v-if="scope.row.RequestReReadingType === 2" type="danger">{{ $fd('RequestReReadingType',
-                scope.row.RequestReReadingType) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingType === 2" type="danger">{{ $fd('RequestReReadingType', scope.row.RequestReReadingType) }}</el-tag>
              <el-tag v-else type="primary">{{ $fd('RequestReReadingType', scope.row.RequestReReadingType) }}</el-tag>
            </div>
          </template>
        </el-table-column>
        <!-- 申请时间 -->
-        <el-table-column prop="RequestReReadingTime" :label="$t('trials:rereadTask:table:requestReReadingTime')"
-          min-width="100" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="RequestReReadingTime"
+          :label="$t('trials:rereadTask:table:requestReReadingTime')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 申请原因 -->
-        <el-table-column prop="RequestReReadingReason" :label="$t('trials:rereadTask:table:requestReReadingReason')"
-          min-width="100" sortable="custom" show-overflow-tooltip />
+        <el-table-column
+          prop="RequestReReadingReason"
+          :label="$t('trials:rereadTask:table:requestReReadingReason')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 审批结果 -->
-        <el-table-column prop="AllocateTime" :label="$t('trials:rereadTask:table:requestReReadingResultEnum')"
-          min-width="100" sortable="custom" show-overflow-tooltip>
+        <el-table-column
+          prop="AllocateTime"
+          :label="$t('trials:rereadTask:table:requestReReadingResultEnum')"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
            <div v-if="scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingResultEnum === 0">
              <el-tooltip v-if="scope.row.RequestReReadingResultEnum === 2" class="item" effect="dark" placement="top">
@@ -188,217 +259,90 @@
                </div>
                <el-tag type="danger">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
              </el-tooltip>
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult',
-                scope.row.RequestReReadingResultEnum) }}</el-tag>
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult',
-                scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
            </div>
          </template>
        </el-table-column>
        <!-- 新任务编号 -->
-        <el-table-column prop="ReReadingNewTaskCode" :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
-          min-width="120" sortable="custom" show-overflow-tooltip />
-        <el-table-column v-if="hasPermi(['role:spm'])" fixed="right" :label="$t('common:action:action')" width="210">
+        <el-table-column
+          prop="ReReadingNewTaskCode"
+          :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          v-if="hasPermi(['role:spm'])"
+          fixed="right"
+          :label="$t('common:action:action')"
+          width="210"
+        >
          <template slot-scope="scope">
            <!-- 同意 -->
-            <!-- <el-button :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
-              icon="el-icon-check" circle :title="$t('trials:spmAudit:button:agree')"
-              @click="openReReadingOrBackList(scope.row, 1)" /> -->
+            <el-button
+              :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
+              icon="el-icon-check"
+              circle
+              :title="$t('trials:spmAudit:button:agree')"
+              @click="openReReadingOrBackList(scope.row,1)"
+            />
            <!-- 拒绝 -->
-            <!-- <el-button :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
-              icon="el-icon-close" circle :title="$t('trials:spmAudit:button:reject')"
-              @click="confirmReReading(scope.row, 2, true)" /> -->
-            <el-button :disabled="!!scope.row.RequestReReadingResultEnum ||
-              scope.row.RequestReReadingType === 1
-              " icon="el-icon-edit-outline" circle :title="$t('trials:spmAudit:table:Approval')"
-              @click="audit(scope.row)" />
+            <el-button
+              :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
+              icon="el-icon-close"
+              circle
+              :title="$t('trials:spmAudit:button:reject')"
+              @click="confirmReReading(scope.row,2, true)"
+            />
            <!-- 已影响任务列表 -->
-            <el-button :disabled="scope.row.RequestReReadingResultEnum !== 1" icon="el-icon-document-copy" circle
-              :title="$t('trials:spmAudit:button:influenceList')" @click="getInfluencedTaskList(scope.row)" />
+            <el-button
+              :disabled="scope.row.RequestReReadingResultEnum !== 1"
+              icon="el-icon-document-copy"
+              circle
+              :title="$t('trials:spmAudit:button:influenceList')"
+              @click="getInfluencedTaskList(scope.row)"
+            />
          </template>
        </el-table-column>
      </el-table>
      <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-        @pagination="getList" />
-      <base-model v-if="config.visible" :config="config">
-        <template slot="dialog-body">
-          <el-form ref="imageBackform" :model="form" class="demo-form-inline" :rules="rules"
-            :label-width="isEN ? '200px' : '150px'">
-            <el-form-item :label="$t('trials:spmAudit:table:Matters')" prop="Matters">
-              <span>{{ rowData.title }}</span>
-            </el-form-item>
-            <el-form-item :label="$t('trials:spmAudit:form:ApplyReason')" prop="ApplyReason">
-              <span>{{ rowData.RequestReReadingReason }}</span>
-            </el-form-item>
-            <el-form-item :label="$t('trials:spmAudit:form:IsAgree')" prop="RequestReReadingResultEnum">
-              <el-radio-group v-model="form.RequestReReadingResultEnum">
-                <el-radio :label="1">{{ $t('trials:spmAudit:button:auditYes') }}</el-radio>
-                <el-radio :label="2">{{ $t('trials:spmAudit:button:auditNo') }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <el-form-item :label="$t('trials:spmAudit:form:ResultRemark')" v-if="form.RequestReReadingResultEnum !== 2"
-              key="1">
-              <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder=""
-                v-model="form.RequestReReadingRejectReason">
-              </el-input>
-            </el-form-item>
-            <el-form-item :label="$t('trials:spmAudit:form:ResultRemark')" prop="RequestReReadingRejectReason" v-else
-              key="2">
-              <el-input type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" placeholder=""
-                v-model="form.RequestReReadingRejectReason">
-              </el-input>
-            </el-form-item>
-            <el-form-item :label="$t('trials:reviewTrack:dialog:backImpactList')" />
-            <el-table v-loading="loading" :data="InfluenceTaskList" stripe height="100" style="min-height:200px;max-height: 300px">
-              <!-- 任务编号 -->
-              <el-table-column prop="TaskCode" :label="$t('trials:reviewTrack:table:taskCode')" min-width="100"
-                show-overflow-tooltip />
-              <!-- 中心编号 -->
-              <el-table-column prop="TrialSiteCode" :label="$t('trials:reviewTrack:table:siteCode')" min-width="100"
-                show-overflow-tooltip />
-              <!-- 受试者编号 -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewTrack:table:subjectCode')" min-width="120"
-                show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <span v-if="
-                    scope.row.BlindSubjectCode &&
-                    scope.row.BlindSubjectCode !== scope.row.SubjectCode
-                  ">
-                    {{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
-                  </span>
-                  <span v-else>{{ scope.row.SubjectCode }}</span>
-                </template>
-              </el-table-column>
-              <!-- 任务名称 -->
-              <el-table-column prop="VisitTaskNum" :label="$t('trials:reviewTrack:table:taskName')" min-width="120"
-                show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <span v-if="
-                    scope.row.TaskBlindName &&
-                    scope.row.TaskName !== scope.row.TaskBlindName
-                  ">
-                    {{ `${scope.row.TaskName}/${scope.row.TaskBlindName}` }}
-                  </span>
-                  <span v-else>{{ scope.row.TaskName }}</span>
-                </template>
-              </el-table-column>
-              <!-- 盲态任务标识 -->
-              <!-- <el-table-column
-              prop="TaskBlindName"
-              :label="$t('trials:reviewTrack:table:blindName')"
-              min-width="120"
-              show-overflow-tooltip
-            /> -->
-              <!-- 阅片标准 -->
-              <el-table-column prop="TrialReadingCriterionName" :label="$t('trials:reviewTrack:table:criterionName')"
-                min-width="100" show-overflow-tooltip />
-              <!-- 任务状态 -->
-              <el-table-column prop="TaskState" :label="$t('trials:reviewTrack:table:taskStatus')" min-width="100"
-                show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.TaskState === 0" type="primary">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 1" type="info">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 3" type="danger">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 4" type="warning">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.TaskState === 5" type="danger">{{
-                    $fd('TaskState', scope.row.TaskState)
-                  }}</el-tag>
-                </template>
-              </el-table-column>
-              <!-- 任务类型 -->
-              <el-table-column prop="ReadingCategory" min-width="100" :label="$t('trials:reviewTrack:table:taskType')"
-                show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{
-                    $fd('ReadingCategory', scope.row.ReadingCategory)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{
-                    $fd('ReadingCategory', scope.row.ReadingCategory)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{
-                    $fd('ReadingCategory', scope.row.ReadingCategory)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{
-                    $fd('ReadingCategory', scope.row.ReadingCategory)
-                  }}</el-tag>
-                </template>
-              </el-table-column>
-              <!-- 阅片状态 -->
-              <el-table-column prop="ReadingTaskState" :label="$t('trials:reviewTrack:table:readingStatus')"
-                min-width="100" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{
-                    $fd('ReadingTaskState', scope.row.ReadingTaskState)
-                  }}</el-tag>
-                  <el-tag v-else type="danger">{{
-                    $fd('ReadingTaskState', scope.row.ReadingTaskState)
-                  }}</el-tag>
-                </template>
-              </el-table-column>
-              <!-- 生效后影响 -->
-              <el-table-column prop="OptType" :label="$t('trials:reviewTrack:applyReread:title:postEffectiveImpacts')
-                " min-width="100" show-overflow-tooltip>
-                <template slot-scope="scope">
-                  <el-tag v-if="scope.row.OptType === 0" type="primary">{{
-                    $fd('ReReadingOrBackOptType', scope.row.OptType)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.OptType === 1" type="danger">{{
-                    $fd('ReReadingOrBackOptType', scope.row.OptType)
-                  }}</el-tag>
-                  <el-tag v-if="scope.row.OptType === 2" type="warning">{{
-                    $fd('ReReadingOrBackOptType', scope.row.OptType)
-                  }}</el-tag>
-                </template>
-              </el-table-column>
-              <!-- 阅片人 -->
-              <el-table-column prop="UserName" :label="$t('trials:reviewTrack:table:reader')" min-width="160"
-                show-overflow-tooltip>
-                <template v-if="scope.row.DoctorUser" slot-scope="scope">
-                  {{ scope.row.DoctorUser.UserName }}({{
-                    scope.row.DoctorUser.FullName
-                  }})
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form>
-        </template>
-        <template slot="dialog-footer">
-          <el-button type="primary" @click="auditImageBack" :loading="loading">
-            {{ $t('common:button:confirm') }}
-          </el-button>
-          <el-button @click="config.visible = false" :loading="loading">
-            {{ $t('common:button:cancel') }}
-          </el-button>
-        </template>
-      </base-model>
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
      <!-- 驳回  +++-->
-      <el-dialog v-if="ConfirmReReadingVisible" :title="$t('trials:spmAudit:title:rejected')"
-        :visible.sync="ConfirmReReadingVisible" width="600px" append-to-body :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper">
+      <el-dialog
+        v-if="ConfirmReReadingVisible"
+        :title="$t('trials:spmAudit:title:rejected')"
+        :visible.sync="ConfirmReReadingVisible"
+        width="600px"
+        append-to-body
+        :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper"
+      >
        <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
-          <el-form ref="reasonForm" :rules="rules" :model="ConfirmReReadingForm" class="demo-ruleForm" size="small"
-            label-width="120px">
+          <el-form
+            ref="reasonForm"
+            :rules="rules"
+            :model="ConfirmReReadingForm"
+            class="demo-ruleForm"
+            size="small"
+            label-width="120px"
+          >
            <!-- 驳回原因 -->
            <el-form-item :label="$t('trials:spmAudit:title:rejectedReason')" prop="RequestReReadingRejectReason">
-              <el-input v-model="ConfirmReReadingForm.RequestReReadingRejectReason" type="textarea"
-                :autosize="{ minRows: 2, maxRows: 4 }" :placeholder="$t('common:ruleMessage:specify')" maxlength="500"
-                show-word-limit />
+              <el-input
+                v-model="ConfirmReReadingForm.RequestReReadingRejectReason"
+                type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4}"
+                :placeholder="$t('common:ruleMessage:specify')"
+                maxlength="500"
+                show-word-limit
+              />
            </el-form-item>
          </el-form>
        </div>
        <div slot="footer" class="dialog-footer">
          <!-- 取消 -->
-          <el-button :disabled="btnLoading" size="small" type="primary"
-            @click="ConfirmReReadingVisible = false; ConfirmReReadingForm = { RequestReReadingRejectReason: null }">
+          <el-button :disabled="btnLoading" size="small" type="primary" @click="ConfirmReReadingVisible = false;ConfirmReReadingForm = { RequestReReadingRejectReason: null }">
            {{ $t('common:button:cancel') }}
          </el-button>
          <!-- 保存 -->
@@ -408,95 +352,137 @@
        </div>
      </el-dialog>
      <!-- '重阅影响任务列表' : '已影响任务列表'" +++-->
-      <el-dialog v-if="ReReadingOrBackVisible"
-        :title="opentype === 'read' ? this.$t('trials:spmAudit:title:title1') : this.$t('trials:spmAudit:title:title2')"
-        :visible.sync="ReReadingOrBackVisible" width="1460px" append-to-body :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper">
+      <el-dialog
+        v-if="ReReadingOrBackVisible"
+        :title="opentype === 'read' ? this.$t('trials:spmAudit:title:title1'):this.$t('trials:spmAudit:title:title2')"
+        :visible.sync="ReReadingOrBackVisible"
+        width="1460px"
+        append-to-body
+        :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper"
+      >
        <div class="base-dialog-body">
-          <el-table v-loading="loading" :data="InfluenceTaskList" stripe height="100" style="min-height: 400px;">
+          <el-table
+            v-loading="loading"
+            :data="InfluenceTaskList"
+            stripe
+            height="100"
+            style="min-height: 400px;"
+          >
            <!-- 任务编号 -->
-            <el-table-column prop="TaskCode" :label="$t('trials:readTask:table:taskCode')" min-width="100"
-              show-overflow-tooltip />
+            <el-table-column
+              prop="TaskCode"
+              :label="$t('trials:readTask:table:taskCode')"
+              min-width="100"
+              show-overflow-tooltip
+            />
            <!-- 中心编号 -->
-            <el-table-column prop="TrialSiteCode" :label="$t('trials:readTask:table:siteCode')" min-width="100"
-              show-overflow-tooltip />
+            <el-table-column
+              prop="TrialSiteCode"
+              :label="$t('trials:readTask:table:siteCode')"
+              min-width="100"
+              show-overflow-tooltip
+            />
            <!-- 受试者编号 -->
-            <el-table-column prop="SubjectCode" :label="$t('trials:readTask:table:subjectCode')" min-width="120"
-              show-overflow-tooltip />
+            <el-table-column
+              prop="SubjectCode"
+              :label="$t('trials:readTask:table:subjectCode')"
+              min-width="120"
+              show-overflow-tooltip
+            />
            <!-- 访视/阅片期名称 -->
-            <el-table-column prop="VisitTaskNum" :label="$t('trials:consistencyCheck:table:visitName')" min-width="140"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="VisitTaskNum"
+              :label="$t('trials:consistencyCheck:table:visitName')"
+              min-width="140"
+              show-overflow-tooltip
+            >
              <template slot-scope="scope">
                {{ scope.row.TaskName }}
              </template>
            </el-table-column>
            <!-- 盲态任务标识 -->
-            <el-table-column prop="TaskBlindName" :label="$t('trials:readTask:table:blindName')" min-width="120"
-              show-overflow-tooltip />
+            <el-table-column
+              prop="TaskBlindName"
+              :label="$t('trials:readTask:table:blindName')"
+              min-width="120"
+              show-overflow-tooltip
+            />
            <!-- 阅片标准 -->
-            <el-table-column prop="TrialReadingCriterionName" :label="$t('trials:readTask:table:criterionName')"
-              min-width="100" show-overflow-tooltip />
+            <el-table-column
+              prop="TrialReadingCriterionName"
+              :label="$t('trials:readTask:table:criterionName')"
+              min-width="100"
+              show-overflow-tooltip
+            />
            <!-- 任务状态 -->
-            <el-table-column prop="TaskState" :label="$t('trials:readTask:table:taskState')" min-width="100"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="TaskState"
+              :label="$t('trials:readTask:table:taskState')"
+              min-width="100"
+              show-overflow-tooltip
+            >
              <template slot-scope="scope">
-                <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState)
-                }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
              </template>
            </el-table-column>
            <!-- 任务类型 -->
-            <el-table-column prop="ReadingCategory" min-width="100" :label="$t('trials:readTask:table:readingCategory')"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="ReadingCategory"
+              min-width="100"
+              :label="$t('trials:readTask:table:readingCategory')"
+              show-overflow-tooltip
+            >
              <template slot-scope="scope">
-                <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory',
-                  scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory',
-                  scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory',
-                  scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory',
-                  scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
              </template>
            </el-table-column>
            <!-- 阅片状态 -->
-            <el-table-column prop="ReadingTaskState" :label="$t('trials:readTask:table:readingTaskState')"
-              min-width="100" show-overflow-tooltip>
+            <el-table-column
+              prop="ReadingTaskState"
+              :label="$t('trials:readTask:table:readingTaskState')"
+              min-width="100"
+              show-overflow-tooltip
+            >
              <template slot-scope="scope">
-                <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState',
-                  scope.row.ReadingTaskState) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
                <el-tag v-else type="danger">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
              </template>
            </el-table-column>
            <!-- 生效后影响 -->
-            <el-table-column prop="OptType" :label="$t('trials:readTask:table:optType')" min-width="100"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="OptType"
+              :label="$t('trials:readTask:table:optType')"
+              min-width="100"
+              show-overflow-tooltip
+            >
              <template slot-scope="scope">
-                <el-tag v-if="scope.row.OptType === 0" type="primary">{{ $fd('ReReadingOrBackOptType',
-                  scope.row.OptType) }}</el-tag>
-                <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType)
-                }}</el-tag>
-                <el-tag v-if="scope.row.OptType === 2" type="warning">{{ $fd('ReReadingOrBackOptType',
-                  scope.row.OptType) }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 0" type="primary">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 2" type="warning">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
              </template>
            </el-table-column>
            <!-- 阅片人 -->
-            <el-table-column prop="UserName" :label="$t('trials:readTask:table:reader')" min-width="160"
-              show-overflow-tooltip>
+            <el-table-column
+              prop="UserName"
+              :label="$t('trials:readTask:table:reader')"
+              min-width="160"
+              show-overflow-tooltip
+            >
              <template v-if="scope.row.DoctorUser" slot-scope="scope">
                {{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
              </template>
            </el-table-column>
          </el-table>
        </div>
-        <div v-if="opentype === 'read'" slot="footer" class="dialog-footer">
+        <div v-if="opentype==='read'" slot="footer" class="dialog-footer">
          <!-- 取消 -->
          <el-button :disabled="btnLoading" size="small" type="primary" @click="ReReadingOrBackVisible = false">
            {{ $t('common:button:cancel') }}
@@ -507,11 +493,16 @@
          </el-button>
        </div>
      </el-dialog>
-      <el-dialog :destroy-on-close="true" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-        custom-class="base-dialog-wrapper">
+      <el-dialog
+        :destroy-on-close="true"
+        :visible.sync="signVisible"
+        :close-on-click-modal="false"
+        width="600px"
+        custom-class="base-dialog-wrapper"
+      >
        <div slot="title">
          <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-          <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
+          <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
        </div>
        <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
      </el-dialog>
@@ -527,7 +518,7 @@ import { getToken } from '@/utils/auth'
 import { changeURLStatic } from '@/utils/history.js'
 import const_ from '@/const/sign-code'
 import SignForm from '@/views/trials/components/newSignForm'
-import baseModel from '@/components/BaseModel'
+
 const searchDataDefault = () => {
  return {
    PageIndex: 1,
@@ -551,7 +542,7 @@ const searchDataDefault = () => {
 }
 export default {
  name: 'TrialsNotice',
-  components: { BaseContainer, Pagination, SignForm, baseModel },
+  components: { BaseContainer, Pagination, SignForm },
  data() {
    return {
      searchData: searchDataDefault(),
@@ -602,40 +593,9 @@ export default {
      readVisible: false,
      TaskOptType: null,
      OtherInfo: null,
-      ReadingType: null,
-      config: {
-        visible: false,
-        title: this.$t("trials:spmAudit:confirmMessage:imageBack"),
-        width: '1000px',
-        appendToBody: true,
-      },
-      form: {
-        RequestReReadingResultEnum: null,
-        RequestReReadingRejectReason: null
-      },
-      rules: {
-        RequestReReadingResultEnum: [
-          {
-            required: true,
-            message: this.$t('common:ruleMessage:select'),
-            trigger: ['blur', 'change'],
-          },
-        ],
-        RequestReReadingRejectReason: [
-          {
-            required: true,
-            message: this.$t('common:ruleMessage:specify'),
-            trigger: ['blur', 'change'],
-          },
-        ]
-      }
+      ReadingType: null
    }
  },
-  computed: {
-    isEN() {
-      return this.$i18n.locale !== 'zh'
-    },
-  },
  mounted() {
    if (this.$route.query.SiteId) {
      this.searchData.TrialSiteId = this.$route.query.SiteId
@@ -652,39 +612,6 @@ export default {
    this.getDoctorUserSelectList()
  },
  methods: {
-    async auditImageBack() {
-      try {
-        console.log(this.form)
-        let validate = await this.$refs.imageBackform.validate()
-        if (!validate) return false
-        this.confirmSign(this.form.RequestReReadingResultEnum)
-      } catch (err) {
-        console.log(err)
-      }
-    },
-    async audit(row) {
-      try {
-        this.rowData = Object.assign({}, row)
-        this.rowData.title = `${row.ApplicantName} (${this.$fd('RequestReReadingType', row.RequestReReadingType)}) ${this.$t('trials:spmAudit:title:imageBack').replace('xxx', row.OriginalReReadingTask.SubjectCode).replace('yyy', row.OriginalReReadingTask.TaskName)}`
-        Object.keys(this.form).forEach(key => {
-          this.form[key] = null
-        })
-        this.loading = true
-        let res = await getReReadingOrBackInfluenceTaskList(
-          row.OriginalReReadingTaskId,
-          true,
-          row.Id
-        )
-        if (res.IsSuccess) {
-          this.InfluenceTaskList = res.Result
-          this.config.visible = true
-          this.loading = false
-        }
-      } catch (err) {
-        this.loading = false
-        console.log(err)
-      }
-    },
    getInfluencedTaskList(row) {
      this.loading = true
      this.opentype = 'look'
@@ -736,7 +663,7 @@ export default {
        return
      }
      if (type === 2) {
-        this.$refs.imageBackform.validate((valid) => {
+        this.$refs.reasonForm.validate((valid) => {
          if (!valid) return
          var params = {
            data: {
@@ -748,7 +675,7 @@ export default {
                  NewReReadingTaskId: row.NewReReadingTaskId
                }
              ],
-              RequestReReadingRejectReason: this.form.RequestReReadingRejectReason,
+              RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason,
              TrialId: this.$route.query.trialId,
              RequestReReadingResultEnum: type
            },
@@ -761,7 +688,7 @@ export default {
            this.btnLoading = false
            this.$message.success(`${type === 1 ? this.$t('trials:spmAudit:title:title4') : this.$t('trials:spmAudit:title:title5')}`)
            this.getList()
-            this.config.visible = false
+            this.ConfirmReReadingVisible = false
            this.$refs['signForm'].btnLoading = false
            this.signVisible = false
          }).catch(() => {
@@ -793,7 +720,7 @@ export default {
        this.loading = false
        this.btnLoading = false
        this.$message.success(`${type === 1 ? this.$t('trials:spmAudit:title:title4') : this.$t('trials:spmAudit:title:title5')}`)
-        this.config.visible = false
+        this.ReReadingOrBackVisible = false
        this.$refs['signForm'].btnLoading = false
        this.signVisible = false
        this.getList()
@@ -860,25 +787,22 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep .hidden-row {
+::v-deep .hidden-row{
  display: none;
 }
-
 ::v-deep .el-dialog__body {
  padding: 15px 20px;
 }

 ::v-deep .el-tag--danger.el-tag--dark {
  // background-color: #f56c6c!important;
-  border-color: none !important;
+  border-color: none!important;
  // color: #fff!important;
 }
-
-::v-deep #TaskAllocationRuleList thead .el-checkbox__inner {
+::v-deep #TaskAllocationRuleList thead .el-checkbox__inner{
  display: none;
 }
-
-::v-deep .el-descriptions-item__label.has-colon:after {
+::v-deep .el-descriptions-item__label.has-colon:after{
  display: none;
 }
 </style>
@@ -130,12 +130,10 @@
      <SignForm :is-system-doc="currentRow.IsSystemDoc" :document-id="currentRow.Id" :file-name="fileName"
        :trial-id="trialId" @closeDialog="closeSignDialog" />
    </el-dialog>
-    <attachmentList2 v-if="config.visible && !currentRow.IsSystemDoc" :config="config" :rowData="currentRow"
-      :TrialDocumentId="TrialDocumentId" :isView="true" @getList="getList" />
-    <attachmentList v-if="config.visible && currentRow.IsSystemDoc" :config="config" :rowData="currentRow"
-      :SystemDocumentId="TrialDocumentId" :isView="true" @getList="getList" />
-    <attachmentPreview :SystemDocumentId="TrialDocumentId" :isTrial="!currentRow.IsSystemDoc"
-      :visible.sync="perview_visible" :isView="true" v-if="perview_visible" />
+    <attachmentList v-if="config.visible" :config="config" :rowData="currentRow" :SystemDocumentId="SystemDocumentId"
+      :isView="true" @getList="getList" />
+    <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible" :isView="true"
+      v-if="perview_visible" />
  </BaseContainer>
 </template>
 <script>
@@ -147,7 +145,6 @@ import SignForm from './components/SignForm'
 import store from '@/store'
 import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
 import attachmentList from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentList'
-import attachmentList2 from '@/views/trials/trials-panel/setting/attachment/components/attachmentList'
 const searchDataDefault = () => {
  return {
    FileTypeId: '',
@@ -161,7 +158,7 @@ const searchDataDefault = () => {
 }
 export default {
  name: 'TrialAttachments',
-  components: { BaseContainer, Pagination, PreviewFile, SignForm, attachmentPreview, attachmentList, attachmentList2 },
+  components: { BaseContainer, Pagination, PreviewFile, SignForm, attachmentPreview, attachmentList },
  data() {
    return {
      searchData: searchDataDefault(),
@@ -183,7 +180,7 @@ export default {
      currentUser: zzSessionStorage.getItem('userName'),
      typeOptions: [],
      trialId: this.$route.query.trialId,
-      TrialDocumentId: null,
+      SystemDocumentId: null,
      perview_visible: null,
      config: {
        visible: false,
@@ -208,7 +205,7 @@ export default {
  methods: {
    openAttachment(row, isList = false) {
      if (!row.AttachmentCount) return false
-      this.TrialDocumentId = row.Id
+      this.SystemDocumentId = row.Id
      this.currentRow = { ...row }
      if (!isList) {
        this.perview_visible = true
@@ -12,18 +12,35 @@

    <template slot="main-container">
      <!-- 入组医生列表 -->
-      <el-table ref="myTable" v-loading="listLoading" v-adaptive="{ bottomOffset: 55 }" :data="list" stripe height="100"
-        @sort-change="handleSortByColumn">
-        <el-table-column type="index" width="40" fixed />
+      <el-table
+        ref="myTable"
+        v-loading="listLoading"
+        v-adaptive="{ bottomOffset: 55 }"
+        :data="list"
+        stripe
+        height="100"
+        @sort-change="handleSortByColumn"
+      >
+        <el-table-column type="index" width="40" />
        <!-- Name -->
-        <el-table-column :label="$t('trials:enrolledReviews:table:name')" show-overflow-tooltip fixed width="150"
-          prop="FirstName" sortable="custom" v-if="!hasPermi(['role:ea'])">
+        <el-table-column
+          :label="$t('trials:enrolledReviews:table:name')"
+          show-overflow-tooltip
+          width="150"
+          prop="FirstName"
+          sortable="custom"
+          v-if="!hasPermi(['role:ea'])"
+        >
          <template slot-scope="scope">
-            <el-button type="text" @click="
-              go(
-                `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`
-              )
-              ">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <el-button
+              type="text"
+              @click="
+                go(
+                  `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`
+                )
+              "
+              >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button
+            >
          </template>
        </el-table-column>
        <!-- Name CN -->
@@ -36,11 +53,21 @@
          show-overflow-tooltip
        /> -->
        <!-- 用户名 -->
-        <el-table-column prop="UserName" :label="$t('trials:enrolledReviews:table:userName')"
-          :width="hasPermi(['role:ea']) ? 300 : 150" sortable="custom" show-overflow-tooltip fixed />
+        <el-table-column
+          prop="UserName"
+          :label="$t('trials:enrolledReviews:table:userName')"
+          :width="hasPermi(['role:ea']) ? 300 : 150"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 入组时间 -->
-        <el-table-column prop="EnrollTimeStr" :label="$t('trials:enrolledReviews:table:enrollmentTime')"
-          :width="hasPermi(['role:ea']) ? 320 : 130" sortable="custom" show-overflow-tooltip fixed>
+        <el-table-column
+          prop="EnrollTimeStr"
+          :label="$t('trials:enrolledReviews:table:enrollmentTime')"
+          :width="hasPermi(['role:ea']) ? 320 : 130"
+          sortable="custom"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
            {{
              scope.row.EnrollTime
@@ -49,39 +76,64 @@
            }}
          </template>
        </el-table-column>
-        <el-table-column prop="EnrollTimeStr" :label="$t('trials:enrolledReviews:table:status')" width="200"
-          sortable="custom" fixed>
+        <el-table-column
+          prop="EnrollTimeStr"
+          :label="$t('trials:enrolledReviews:table:status')"
+          width="200"
+          sortable="custom"
+        >
          <template slot-scope="scope">
            <div>
-              <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
-                :active-text="$fd('IsEnable', true)" :inactive-text="$fd('IsEnable', false)" @change="
+              <el-switch
+                v-model="scope.row.IsEnable"
+                :active-value="true"
+                :inactive-value="false"
+                :active-text="$fd('IsEnable', true)"
+                :inactive-text="$fd('IsEnable', false)"
+                @change="
                  (v) => {
                    return isEnableChange(scope.row, v)
                  }
-                " :disabled="!hasPermi([
-                  'trials:trials-panel:enrolled-reviewers:list:edit',
-                ])
-                  " />
+                "
+                :disabled="
+                  !hasPermi([
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ])
+                "
+              />
              <!-- <span :style="{color:scope.row.IsEnable?'#409eff':'#dcdfe6'}"> {{$fd('IsEnable', scope.row.IsEnable)}}</span> -->
            </div>
          </template>
        </el-table-column>
-        <el-table-column v-for="ite of TrialReadingCriterionList" :key="ite.TrialReadingCriterionName"
-          :label="ite.TrialReadingCriterionName" width="360" header-align="center" show-overflow-tooltip>
-          <el-table-column :label="$t('trials:enrolledReviews:table:readingType')" width="300">
+        <el-table-column
+          v-for="ite of TrialReadingCriterionList"
+          :key="ite.TrialReadingCriterionName"
+          :label="ite.TrialReadingCriterionName"
+          width="360"
+          header-align="center"
+          show-overflow-tooltip
+        >
+          <el-table-column
+            :label="$t('trials:enrolledReviews:table:readingType')"
+            width="300"
+          >
            <template slot-scope="scope">
-              <span v-for="item of scope.row.CriterionCategoryList.find((v) => {
-                return (
-                  v.TrialReadingCriterionId === ite.TrialReadingCriterionId
-                )
-              })
-                ? scope.row.CriterionCategoryList.find((v) => {
+              <span
+                v-for="item of scope.row.CriterionCategoryList.find((v) => {
                  return (
-                    v.TrialReadingCriterionId ===
-                    ite.TrialReadingCriterionId
+                    v.TrialReadingCriterionId === ite.TrialReadingCriterionId
                  )
-                }).ReadingCategorys
-                : []" :key="item.TrialReadingCriterionId" style="margin: 5px 5px 5px 0">
+                })
+                  ? scope.row.CriterionCategoryList.find((v) => {
+                      return (
+                        v.TrialReadingCriterionId ===
+                        ite.TrialReadingCriterionId
+                      )
+                    }).ReadingCategorys
+                  : []"
+                :key="item.TrialReadingCriterionId"
+                style="margin: 5px 5px 5px 0"
+              >
                <el-tag v-if="item === 1" type="primary">{{
                  $fd('ReadingCategory', item) +
                  ' & ' +
@@ -95,101 +147,152 @@
                  $fd('ReadingCategory', item)
                }}</el-tag>
              </span>
-              <el-button v-hasPermi="[
-                'trials:trials-panel:enrolled-reviewers:list:edit',
-              ]" type="text" @click="
-                openSetEnrollReadingCategory(
-                  scope.row,
-                  ite.TrialReadingCriterionId
-                )
-                ">
+              <el-button
+                v-hasPermi="[
+                  'trials:trials-panel:enrolled-reviewers:list:edit',
+                ]"
+                type="text"
+                @click="
+                  openSetEnrollReadingCategory(
+                    scope.row,
+                    ite.TrialReadingCriterionId
+                  )
+                "
+              >
                {{ $t('trials:enrolledReviews:button:config') }}
              </el-button>
            </template>
          </el-table-column>
-          <el-table-column :label="$t('trials:enrolledReviews:table:consistency-analysis')" width="160"
-            show-overflow-tooltip>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:table:consistency-analysis')"
+            width="160"
+            show-overflow-tooltip
+          >
            <template slot-scope="scope">
-              <el-switch v-model="scope.row.CriterionCategoryList.find((v) => {
-                return (
-                  v.TrialReadingCriterionId === ite.TrialReadingCriterionId
-                )
-              }).IsJoinAnalysis
-                " :active-value="true" :inactive-value="false" :active-text="$fd('YesOrNo', true)"
-                :inactive-text="$fd('YesOrNo', false)" @change="
+              <el-switch
+                v-model="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).IsJoinAnalysis
+                "
+                :active-value="true"
+                :inactive-value="false"
+                :active-text="$fd('YesOrNo', true)"
+                :inactive-text="$fd('YesOrNo', false)"
+                @change="
                  (v) => {
                    return isConsistencyChange(scope.row, ite, v, true)
                  }
-                " :disabled="!hasPermi([
-                  'trials:trials-panel:enrolled-reviewers:list:edit',
-                ])
-                  " />
+                "
+                :disabled="
+                  !hasPermi([
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ])
+                "
+              />
              <!-- <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
              <span v-else> {{$fd('YesOrNo',false)}}</span> -->
            </template>
          </el-table-column>
-          <el-table-column :label="$t('trials:enrolledReviews:message:SOW')" width="160" show-overflow-tooltip>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:message:SOW')"
+            width="160"
+            show-overflow-tooltip
+          >
            <template slot-scope="scope">
-              <div v-if="
-                scope.row.CriterionCategoryList.find((v) => {
-                  return (
-                    v.TrialReadingCriterionId === ite.TrialReadingCriterionId
-                  )
-                }).StatementCriterionFileList.length > 0
-              ">
-                <el-button type="text" @click="preview(scope.row, ite.TrialReadingCriterionId)">View</el-button>
+              <div
+                v-if="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).StatementCriterionFileList.length > 0
+                "
+              >
+                <el-button
+                  type="text"
+                  @click="preview(scope.row, ite.TrialReadingCriterionId)"
+                  >View</el-button
+                >
                <!-- <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button> -->
              </div>
              <div v-else>
                <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
                <!-- 上传 -->
-                <el-button v-if="ite.CriterionType === 0" v-hasPermi="[
-                  'trials:trials-panel:enrolled-reviewers:list:edit',
-                ]" type="text" style="margin-left: 10px" @click="
-                  addCol(
-                    0,
-                    scope.row,
-                    ite,
-                    $t('trials:enrolledReviews:message:SOW')
-                  )
-                  ">
+                <el-button
+                  v-if="ite.CriterionType === 0"
+                  v-hasPermi="[
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ]"
+                  type="text"
+                  style="margin-left: 10px"
+                  @click="
+                    addCol(
+                      0,
+                      scope.row,
+                      ite,
+                      $t('trials:enrolledReviews:message:SOW')
+                    )
+                  "
+                >
                  {{ $t('trials:enrolledReviews:button:upload') }}
                </el-button>
              </div>
            </template>
          </el-table-column>
-          <el-table-column :label="$t('trials:enrolledReviews:message:EQC')" width="160" show-overflow-tooltip>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:message:EQC')"
+            width="160"
+            show-overflow-tooltip
+          >
            <template slot-scope="scope">
-              <div v-if="
-                scope.row.CriterionCategoryList.find((v) => {
-                  return (
-                    v.TrialReadingCriterionId === ite.TrialReadingCriterionId
-                  )
-                }).AcknowledgementCriterionFileList.length > 0
-              ">
-                <el-button type="text" @click="preview(scope.row, ite.TrialReadingCriterionId)">
+              <div
+                v-if="
+                  scope.row.CriterionCategoryList.find((v) => {
+                    return (
+                      v.TrialReadingCriterionId === ite.TrialReadingCriterionId
+                    )
+                  }).AcknowledgementCriterionFileList.length > 0
+                "
+              >
+                <el-button
+                  type="text"
+                  @click="preview(scope.row, ite.TrialReadingCriterionId)"
+                >
                  View
                </el-button>
              </div>
              <div v-else>
                <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
                <!-- 上传 -->
-                <el-button v-if="ite.CriterionType === 0" v-hasPermi="[
-                  'trials:trials-panel:enrolled-reviewers:list:edit',
-                ]" type="text" style="margin-left: 10px" @click="
-                  addCol(
-                    1,
-                    scope.row,
-                    ite,
-                    $t('trials:enrolledReviews:message:SOW')
-                  )
-                  ">
+                <el-button
+                  v-if="ite.CriterionType === 0"
+                  v-hasPermi="[
+                    'trials:trials-panel:enrolled-reviewers:list:edit',
+                  ]"
+                  type="text"
+                  style="margin-left: 10px"
+                  @click="
+                    addCol(
+                      1,
+                      scope.row,
+                      ite,
+                      $t('trials:enrolledReviews:message:SOW')
+                    )
+                  "
+                >
                  {{ $t('trials:enrolledReviews:button:upload') }}
                </el-button>
              </div>
            </template>
          </el-table-column>
-          <el-table-column :label="$t('trials:enrolledReviews:button:tackNum')" width="300" show-overflow-tooltip>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:button:tackNum')"
+            width="300"
+            show-overflow-tooltip
+          >
            <template slot-scope="scope">
              <div>
                {{
@@ -239,17 +342,31 @@
      <template slot="dialog-body">
        <!-- Reading Type -->
        <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
-        <el-select v-model="readingType" filterable allow-create default-first-option style="width: 70%">
+        <el-select
+          v-model="readingType"
+          filterable
+          allow-create
+          default-first-option
+          style="width: 70%"
+        >
          <el-option :value="0" label="TP&GL&AD" />
          <el-option :value="1" label="TP&GL" />
          <el-option :value="2" label="AD" />
        </el-select>
      </template>
      <template slot="dialog-footer">
-        <el-button :disabled="readingType_model.btnLoading" type="primary" @click="readingType_model.visible = false">
+        <el-button
+          :disabled="readingType_model.btnLoading"
+          type="primary"
+          @click="readingType_model.visible = false"
+        >
          {{ $t('common:button:cancel') }}
        </el-button>
-        <el-button type="primary" :loading="readingType_model.btnLoading" @click="handleUpdateReadingType">
+        <el-button
+          type="primary"
+          :loading="readingType_model.btnLoading"
+          @click="handleUpdateReadingType"
+        >
          {{ $t('common:button:save') }}
        </el-button>
      </template>
@@ -259,28 +376,56 @@
      <template slot="dialog-body">
        <!-- Reading Type -->
        <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
-        <el-select v-model="ReadingCategorys" filterable allow-create multiple default-first-option style="width: 50%">
+        <el-select
+          v-model="ReadingCategorys"
+          filterable
+          allow-create
+          multiple
+          default-first-option
+          style="width: 50%"
+        >
          <template v-for="item of $d.ReadingCategory">
-            <el-option v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)
-              " />
+            <el-option
+              v-if="item.value === 1"
+              :key="item.id"
+              :value="1"
+              :label="
+                $fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)
+              "
+            />
          </template>
          <template v-for="item of $d.ReadingCategory">
-            <el-option v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value"
-              :label="$fd('ReadingCategory', 4)" />
+            <el-option
+              v-if="item.value === 4 && IsArbitrationReading"
+              :key="item.id"
+              :value="item.value"
+              :label="$fd('ReadingCategory', 4)"
+            />
          </template>
          <template v-for="item of $d.ReadingCategory">
-            <el-option v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value"
-              :label="$fd('ReadingCategory', 5)" />
+            <el-option
+              v-if="item.value === 5 && IsOncologyReading"
+              :key="item.id"
+              :value="item.value"
+              :label="$fd('ReadingCategory', 5)"
+            />
          </template>
        </el-select>
      </template>
      <template slot="dialog-footer">
        <div style="margin-top: 30px">
-          <el-button :disabled="readingCategory_model.btnLoading" type="primary"
-            @click="readingCategory_model.visible = false">
+          <el-button
+            :disabled="readingCategory_model.btnLoading"
+            type="primary"
+            @click="readingCategory_model.visible = false"
+          >
            {{ $t('common:button:cancel') }}
          </el-button>
-          <el-button type="primary" :loading="readingCategory_model.btnLoading" @click="handleUpdateReadingCategory">
+          <el-button
+            type="primary"
+            :loading="readingCategory_model.btnLoading"
+            @click="handleUpdateReadingCategory"
+          >
            {{ $t('common:button:save') }}
          </el-button>
        </div>
@@ -289,52 +434,112 @@
    <!-- 修改医生状态 -->
    <base-model :config="reviewerStatus_model">
      <template slot="dialog-body">
-        <el-form ref="updateStatusForm" :model="updateStatusForm" :rules="updateStatusFormrules">
-          <el-form-item :label="$t('trials:enrolledReviews:label:enrollmentStatus')" prop="Status">
+        <el-form
+          ref="updateStatusForm"
+          :model="updateStatusForm"
+          :rules="updateStatusFormrules"
+        >
+          <el-form-item
+            :label="$t('trials:enrolledReviews:label:enrollmentStatus')"
+            prop="Status"
+          >
            <el-select v-model="updateStatusForm.Status" style="width: 60%">
              <!-- 0：回退；1：出组； -->
-              <el-option v-for="item of $d.OutOrInEnrollment" :key="`OutOrInEnrollment${item.value}`"
-                :value="item.value" :label="item.label" :disabled="item.value === 0 && currentWorkload > 0" />
+              <el-option
+                v-for="item of $d.OutOrInEnrollment"
+                :key="`OutOrInEnrollment${item.value}`"
+                :value="item.value"
+                :label="item.label"
+                :disabled="item.value === 0 && currentWorkload > 0"
+              />
            </el-select>
          </el-form-item>
-          <el-form-item v-if="updateStatusForm.Status == 1"
-            :label="$t('trials:enrolledReviews:label:outOfEnrollmentTime')" prop="OutEnrollmentTime">
-            <el-date-picker v-model="updateStatusForm.OutEnrollmentTime" type="date" value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd" />
+          <el-form-item
+            v-if="updateStatusForm.Status == 1"
+            :label="$t('trials:enrolledReviews:label:outOfEnrollmentTime')"
+            prop="OutEnrollmentTime"
+          >
+            <el-date-picker
+              v-model="updateStatusForm.OutEnrollmentTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd"
+            />
          </el-form-item>
        </el-form>
      </template>
      <template slot="dialog-footer">
-        <el-button :disabled="reviewerStatus_model.btnLoading" type="primary"
-          @click="reviewerStatus_model.visible = false">
+        <el-button
+          :disabled="reviewerStatus_model.btnLoading"
+          type="primary"
+          @click="reviewerStatus_model.visible = false"
+        >
          {{ $t('common:button:cancel') }}
        </el-button>
-        <el-button type="primary" :loading="reviewerStatus_model.btnLoading" @click="handleUpdateReviewerStatus">
+        <el-button
+          type="primary"
+          :loading="reviewerStatus_model.btnLoading"
+          @click="handleUpdateReviewerStatus"
+        >
          {{ $t('common:button:save') }}
        </el-button>
      </template>
    </base-model>
    <BaseModel :config="model_cfg">
      <template slot="dialog-body">
-        <el-form ref="DictionaryTypeConfigForm" :model="form" label-width="120px" size="small">
-          <el-form-item :label="$t('trials:enrolledReviews:table:criterionName')" prop="CriterionType">
+        <el-form
+          ref="DictionaryTypeConfigForm"
+          :model="form"
+          label-width="120px"
+          size="small"
+        >
+          <el-form-item
+            :label="$t('trials:enrolledReviews:table:criterionName')"
+            prop="CriterionType"
+          >
            <el-input v-model="form.CriterionName" disabled />
          </el-form-item>
-          <el-form-item :label="$t('trials:enrolledReviews:table:file')" prop="FilePath">
-            <el-upload class="upload-demo" action :before-upload="beforeUpload" :http-request="handleUploadFile"
-              :on-preview="handlePreview2" :on-remove="handleRemoveFile2" :show-file-list="true" accept=".pdf"
-              :limit="1" :file-list="fileList">
-              <el-button size="small" type="primary" :disabled="fileList.length > 0">{{ $t('common:button:upload')
-              }}</el-button>
+          <el-form-item
+            :label="$t('trials:enrolledReviews:table:file')"
+            prop="FilePath"
+          >
+            <el-upload
+              class="upload-demo"
+              action
+              :before-upload="beforeUpload"
+              :http-request="handleUploadFile"
+              :on-preview="handlePreview2"
+              :on-remove="handleRemoveFile2"
+              :show-file-list="true"
+              accept=".pdf"
+              :limit="1"
+              :file-list="fileList"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                :disabled="fileList.length > 0"
+                >{{ $t('common:button:upload') }}</el-button
+              >
            </el-upload>
          </el-form-item>
        </el-form>
      </template>
      <template slot="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleCancle"
+        >
          {{ $t('common:button:cancel') }}
        </el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+        <el-button
+          size="small"
+          type="primary"
+          :loading="btnLoading"
+          @click="handleSave"
+        >
          {{ $t('common:button:save') }}
        </el-button>
      </template>
@@ -574,7 +779,8 @@ export default {
      var fileName = param.file.name
      let file = await this.fileToBlob(param.file)
      let res = await this.OSSclient.put(
-        `/SystemData/reviewer/${this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
+        `/SystemData/reviewer/${
+          this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
        }/${this.rowData.DoctorId}/${fileName}`,
        file
      )
@@ -683,15 +889,15 @@ export default {
        return v.TrialReadingCriterionId === TrialReadingCriterionId
      })
        ? row.CriterionCategoryList.find((v) => {
-          return v.TrialReadingCriterionId === TrialReadingCriterionId
-        })
+            return v.TrialReadingCriterionId === TrialReadingCriterionId
+          })
        : null
      var i = row.TrialReadingCriterionList.find((v) => {
        return v.TrialReadingCriterionId === TrialReadingCriterionId
      })
        ? row.TrialReadingCriterionList.find((v) => {
-          return v.TrialReadingCriterionId === TrialReadingCriterionId
-        })
+            return v.TrialReadingCriterionId === TrialReadingCriterionId
+          })
        : null
      if (i) {
        this.IsArbitrationReading = i.IsArbitrationReading
@@ -842,8 +1048,8 @@ export default {
      zzSessionStorage.setItem(
        'ReviewerName',
        this.currentClickRowData.FirstName +
-        ' ' +
-        this.currentClickRowData.LastName
+          ' ' +
+          this.currentClickRowData.LastName
      )
      this.$router.push({
        path: `/trials/trials-panel/enrolled-reviewers/stats?doctorId=${this.currentClickRowData.DoctorId}&trialId=${this.listQuery.TrialId}&trialCode=${this.trialId}&doctorName=${this.currentClickRowData.LastName}/${this.currentClickRowData.FirstName}`,
@@ -879,7 +1085,6 @@ export default {
 <style lang="scss">
 .enroll-list {
  height: 100%;
-
  .readingCategory_model {
    .base-modal-body {
      min-height: 150px;
@@ -126,7 +126,7 @@ import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import metaDataProvider from '@/utils/metaDataProvider'
-
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
 const scroll = cornerstoneTools.import('util/scrollToIndex')
@@ -1126,7 +1126,6 @@ export default {
        //   resolve()
        // })
        this.loading = true
-        cornerstone.metaData.addProvider(metaDataProvider, 1);
        cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
          .then(async image => {
            if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
@@ -1686,7 +1685,7 @@ export default {
        cornerstoneTools.getToolState(
          this.canvas,
          'playClip'
-        ).data[0].loop = true
+        ).data[0].loop = false
      } else {
        cornerstoneTools.stopClip(this.canvas)
        this.toolState.clipPlaying = false
@@ -276,7 +276,7 @@ export default {
      window.opener.postMessage(data, window.location)
    },
    async receiveMsg(event) {
-      // console.log('nonedicoms', event.data.type)
+      console.log('nonedicoms', event.data.type)
      if (event.data.type === 'isCanActiveNoneDicomTool') {
        if (event.data.data.isCanActiveTool) {
          // this.model = 'ArrowAnnotate'
@@ -304,12 +304,8 @@ export default {
        //     this.canvasData.splice(i, 1)
        //   }
        // }
-        if (!event.data.data) {
-          this.canvasData = []
-        } else {
-          var idx = this.canvasData.findIndex(item => item.data.uuid === event.data.data.data.uuid)
-          this.canvasData.splice(idx, 1)
-        }
+        var idx = this.canvasData.findIndex(item => item.data.uuid === event.data.data.data.uuid)
+        this.canvasData.splice(idx, 1)
        ctx.clearRect(0, 0, this.canvasSize.width, this.canvasSize.height) // 清除画布后立刻重新绘制视觉上形成动画
        await ctx.drawImage(
          this.currentImg,
@@ -516,11 +512,6 @@ export default {
          this.canvasData.push(this.currentDrawData) // 添加当前绘图数据
        }
      }
-      // 向主窗体发送测量数据
-      if (this.model) {
-        var data = { type: 'setMeasurement', data: this.currentDrawData }
-        window.opener.postMessage(data, window.location)
-      }
      this.isMouseDown = false // 关闭鼠标状态
      this.model = ''
      this.lesionName = ''
@@ -528,6 +519,9 @@ export default {
        x: e.offsetX, // 更新位置
        y: e.offsetY
      }
+      // 向主窗体发送测量数据
+      var data = { type: 'setMeasurement', data: this.currentDrawData }
+      window.opener.postMessage(data, window.location)
    },

    // 画标注
@@ -576,7 +570,7 @@ export default {
            end: { x: e.offsetX, y: e.offsetY }
          },
          remark: this.lesionName,
-          uuid: `${this.imgId}-${this.lesionName ? this.lesionName : Date.now()}`,
+          uuid: `${this.imgId}-${this.lesionName}`,
          toolName: 'ArrowAnnotate',
          toolType: 'ArrowAnnotate'
        }
@@ -607,7 +601,7 @@ export default {
            end: { x: e.offsetX, y: e.offsetY }
          },
          remark: this.lesionName,
-          uuid: `${this.imgId}-${this.lesionName ? this.lesionName : Date.now()}`,
+          uuid: `${this.imgId}-${this.lesionName}`,
          toolName: 'RectangleRoi',
          toolType: 'RectangleRoi'
        }
@@ -126,7 +126,7 @@ import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import metaDataProvider from '@/utils/metaDataProvider'
-
+cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
 const scroll = cornerstoneTools.import('util/scrollToIndex')
@@ -1080,7 +1080,6 @@ export default {
        //   resolve()
        // })
        this.loading = true
-        cornerstone.metaData.addProvider(metaDataProvider, 1);
        cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
          .then(async image => {
            if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
@@ -1277,6 +1276,7 @@ export default {
        'imagePlaneModule',
        enabledElement.image.imageId
      )
+
      if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) {
        return
      }
@@ -1615,7 +1615,7 @@ export default {
        cornerstoneTools.getToolState(
          this.canvas,
          'playClip'
-        ).data[0].loop = true
+        ).data[0].loop = false
      } else {
        cornerstoneTools.stopClip(this.canvas)
        this.toolState.clipPlaying = false
@@ -1,48 +1,61 @@
 <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;">
+    <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' || question.Type === 'basicTable'"
-      style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
+    <div
+      v-if="question.Type==='table' || question.Type==='basicTable'"
+      style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
+    >
      <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
-        <span :title="question.Remark">{{ question.QuestionName }}</span>
-        <el-button size="mini" v-if="readingTaskState < 2" @click="openAddTableCol(question)">
+        <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
+        :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 }}
+            {{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">
+        <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] ? scope.row[item.Id].split('|').length : '' }}
+              {{scope.row[item.Id] === '' ? '' : scope.row[item.Id] ? scope.row[item.Id].split('|').length : ''}}
            </span>
            <span v-else-if="item.Type === 'number'">
-              {{ !isNaN(parseFloat(scope.row[item.Id])) ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) :
-                scope.row[item.Id] }}
+              {{!isNaN(parseFloat(scope.row[item.Id])) ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) : scope.row[item.Id]}}
            </span>
            <span v-else>
-              {{ scope.row[item.Id] }}
+              {{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">
+        <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') }}
+              {{$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 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>
@@ -50,149 +63,284 @@
    </div>
    <template v-else>
      <el-form-item
-        v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-        :label="`${question.QuestionName}`" :title="question.Remark" :prop="question.Id" :rules="[
-          {
-            required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type !== 'group' && question.Type !== 'summary',
-            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-          },
-          {
-            validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput : (rule, value, callback) => { callback() },
-            trigger: ['blur', 'change']
-          }
-        ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
+        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(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type!=='group' && question.Type!=='summary',
+            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+            {
+              validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput :(rule,value,callback )=>{callback()},
+              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 || readingTaskState === 2" />
+        <el-input
+          v-if="question.Type==='input'"
+          v-model="questionForm[question.Id]"
+          :disabled="question.TableQuestionType === 2 || readingTaskState === 2"
+        />
        <!-- 多行文本输入框 -->
-        <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4 }" :disabled="readingTaskState === 2" />
+        <el-input
+          v-if="question.Type==='textarea'"
+          v-model="questionForm[question.Id]"
+          type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4}"
+          :disabled="readingTaskState === 2"
+        />
        <!-- 下拉框 -->
-        <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
+        <el-select
+          v-if="question.Type==='select'"
+          v-model="questionForm[question.Id]"
+          clearable
          :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode || readingTaskState === 2"
-          @change="((val) => { formItemChange(val, question) })">
+          @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]" />
+            <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" />
+            <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 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.trim()" :label="val.trim()"
-              :value="val.trim()" />
+            <el-option
+              v-for="val in question.TypeValue.split('|')"
+              :key="val.trim()"
+              :label="val.trim()"
+              :value="val.trim()"
+            />
          </template>

        </el-select>
        <!-- 单选 -->
-        <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState === 2">
-          <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
+        <el-radio-group
+          v-if="question.Type==='radio'"
+          v-model="questionForm[question.Id]"
+          @change="((val)=>{formItemChange(val, question)})"
+          :disabled="readingTaskState === 2"
+        >
+          <el-radio
+            v-for="val in question.TypeValue.split('|')"
+            :key="val.trim()"
+            :label="val.trim()"
+          >
            {{ val.trim() }}
          </el-radio>
        </el-radio-group>
        <!-- 复选框 -->
-        <el-checkbox-group v-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
-          :disabled="readingTaskState === 2">
-          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()">
+        <el-checkbox-group
+          v-if="question.Type==='checkbox'"
+          v-model="questionForm[question.Id]"
+          :disabled="readingTaskState === 2"
+        >
+          <el-checkbox
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val.trim()"
+          >
            {{ val.trim() }}
          </el-checkbox>
        </el-checkbox-group>
        <!-- 自动分类 -->
-        <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
-          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2" />
-        <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          @change="(val) => { formItemChange(val, question) }">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
+        <el-input
+          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+          v-model="questionForm[question.Id]"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+        />
+        <el-select
+          v-if="question.Type === 'class' && question.ClassifyShowType === 2"
+          v-model="questionForm[question.Id]"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          @change="(val) => { formItemChange(val, question) }"
+        >
+          <el-option
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val.trim()"
+            :value="val.trim()"
+          />
        </el-select>
-        <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          @change="(val) => { formItemChange(val, question) }">
-          <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
+        <el-radio-group
+          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+          v-model="questionForm[question.Id]"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          @change="(val) => { formItemChange(val, question) }"
+        >
+          <el-radio
+            v-for="item of question.TypeValue.split('|')"
+            :key="item.trim()"
+            :label="item.trim()"
+          >
            {{ item.trim() }}
          </el-radio>
        </el-radio-group>
-        <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 4" type="number"
-          :disabled="!question.ClassifyEditType || readingTaskState === 2" v-model="questionForm[question.Id]"
-          @change="(val) => { formItemNumberChange(val, question) }" />
+        <el-input
+          v-if="question.Type === 'class' && question.ClassifyShowType === 4"
+          type="number"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          v-model="questionForm[question.Id]"
+          @change="(val) => { formItemNumberChange(val, question) }"
+        />
        <!-- 自动计算 -->
        <!-- :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==='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 />
+        <el-input
+          v-if="question.Type==='increment'"
+          v-model="questionForm[question.Id]"
+          disabled
+        />
        <!-- 数值 -->
        <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-          @change="(val) => { formItemNumberChange(val, question) }" :disabled="readingTaskState === 2">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
+        <el-select
+          v-if="question.Type === 'number' && question.TypeValue"
+          v-model="questionForm[question.Id]"
+          clearable
+          @change="(val) => { formItemNumberChange(val, question) }"
+          :disabled="readingTaskState === 2"
+        >
+          <el-option
+            v-for="val in question.TypeValue.split('|')"
+            :key="val"
+            :label="val.trim()"
+            :value="val.trim()"
+          />
        </el-select>
-        <el-input type="text" v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
-          @change="(val) => { formItemNumberChange(val, question) }" @input="numberInput(question.Id)"
+        <el-input
+          type="text"
+          v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
+          @change="(val) => { formItemNumberChange(val, question) }"
+          @input="numberInput(question.Id)"
          @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model.trim="questionForm[question.Id]" :disabled="readingTaskState === 2">
+          v-model.trim="questionForm[question.Id]"
+          :disabled="readingTaskState === 2"
+        >
          <!-- <template slot="append">1</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
+          <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="text" @input="numberInput(question.Id)"
+        <el-input
+          type="text"
+          @input="numberInput(question.Id)"
          v-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
          @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          :disabled="question.DataSource === 1 || readingTaskState === 2" v-model.trim="questionForm[question.Id]">
+          :disabled="question.DataSource === 1 || readingTaskState === 2"
+          v-model.trim="questionForm[question.Id]"
+        >
          <!-- <template slot="append">2</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
+          <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'" :disabled="readingTaskState === 2" action
-          :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
+        <el-upload
+          v-if="question.Type==='upload'"
+          :disabled="readingTaskState === 2"
+          action
+          :accept="question.FileType"
+          :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
          :on-preview="handlePictureCardPreview"
-          :before-upload="(file) => { return handleBeforeUpload(file, question.FileType) }"
-          :http-request="uploadScreenshot" :on-remove="handleRemove" :file-list="fileList"
-          :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
+          :before-upload="(file) => {return handleBeforeUpload(file, question.FileType)}"
+          :http-request="uploadScreenshot"
+          :on-remove="handleRemove"
+          :file-list="fileList"
+          :class="{disabled:question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
+        >
          <el-button slot="default" class="el-icon-plus" v-if="readingTaskState < 2">
-            {{ this.$t('common:button:upload') }}
+            {{this.$t('common:button:upload')}}
          </el-button>
        </el-upload>
-        <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
+          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' && question.Type !== 'basicTable'">
-      <CustomizeQuestionFormItem 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 v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table' && question.Type !== 'basicTable'">
+      <CustomizeQuestionFormItem
+        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>
-    <base-model :config="addOrEdit" class="my_dialog" :close-on-click-modal="false" width="400px" append-to-body>
+    <base-model :config="addOrEdit"
+      class="my_dialog"
+      :close-on-click-modal="false"
+      width="400px"
+      append-to-body
+    >
      <template slot="dialog-body">
-        <el-form ref="tableQsForm" :model="QuestionsForm" v-loading="loading" size="small">
-          <QuestionTableFormItem v-for="(item) in QuestionsList" :key="item.Id" :question="item"
-            :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="QuestionsForm"
-            :visit-task-id="visitTaskId" :criterion-id="criterionId" :type="addOrEdit.type"
-            :CalculationList="CalculationTabelList" @formItemTableNumberChange="formItemTableNumberChange"
-            @resetFormItemData="resetTableFormItemData" @setFormItemData="setFormTableItemData" />
+        <el-form
+            ref="tableQsForm"
+            :model="QuestionsForm"
+            v-loading="loading"
+            size="small"
+        >
+          <QuestionTableFormItem
+              v-for="(item) in QuestionsList"
+              :key="item.Id"
+              :question="item"
+              :IsBaseline="IsBaseline"
+              :reading-task-state="readingTaskState"
+              :question-form="QuestionsForm"
+              :visit-task-id="visitTaskId"
+              :criterion-id="criterionId"
+              :type="addOrEdit.type"
+              :CalculationList="CalculationTabelList"
+              @formItemTableNumberChange="formItemTableNumberChange"
+              @resetFormItemData="resetTableFormItemData"
+              @setFormItemData="setFormTableItemData" 
+          />
        </el-form>
      </template>
      <template slot="dialog-footer">
-        <el-button size="small" @click="addOrEdit.visible = false">
+        <el-button
+            size="small"
+            @click="addOrEdit.visible = false"
+        >
          {{ $t('common:button:cancel') }}
        </el-button>
        <!-- 保存 -->
@@ -202,10 +350,23 @@
      </template>
    </base-model>
    <!-- 预览文件 -->
-    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
-      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
+    <el-dialog
+      v-if="previewVisible"
+      :visible.sync="previewVisible"
+      :title="$t('common:button:preview')"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewVisible"
+          :file-path="currentPath"
+          :file-type="currentType"
+        />
      </div>
    </el-dialog>
  </div>
@@ -352,15 +513,15 @@ export default {
    },
    validatorNumberInput(rule, value, callback) {
      let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
-      if (value === '') {
-        callback(new Error(this.$t('common:ruleMessage:specify')));
-      } else {
-        if (!reg.test(value)) {
-          callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
+       if (value === '') {
+          callback(new Error(this.$t('common:ruleMessage:specify')));
        } else {
-          callback();
+          if (!reg.test(value)) {
+            callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
+          }else{
+            callback();
+          }
        }
-      }
    },
    limitInput(value, a, b) {
      if (value.indexOf('.') > -1) {
@@ -371,7 +532,7 @@ export default {
    },
    handleBlur(value, a, b) {
      if (!value) return false
-      if (!isNaN(parseFloat(value))) {
+      if(!isNaN(parseFloat(value))) {
        this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
      }
    },
@@ -392,19 +553,19 @@ export default {
              this.AnswersList = row.TableQuestions.Answers
              var index = this.AnswersList.findIndex(v => v.RowId === RowId)
              this.AnswersList.splice(index, 1)
-              this.$emit('setFormItemData', { key: this.question.Id, val: this.AnswersList, question: this.question })
+              this.$emit('setFormItemData', {key: this.question.Id, val: this.AnswersList, question: this.question})
              this.formItemNumberChange(this.question.Id, true)
            }
            loading.close()
          }).catch(() => {
-            loading.close()
-          })
+          loading.close()
+        })
      })

    },
    setFormTableItemData(obj) {
      this.$set(this.QuestionsForm, obj.key, obj.val)
-      this.classArr.map(i => {
+      this.classArr.map(i=>{
        if (i.triggerId === obj.key) {
          let answer = null
          let list = JSON.parse(i.classifyAlgorithms)
@@ -415,12 +576,12 @@ export default {
                parseFloat(obj.val) < parseFloat(v.lt)
              )
            })
-            answer = o ? o.label : null
+            answer = o ? o.label : null 
          } else if (i.classifyType === 1) {
            let o = list.find(v => {
              return v.val.includes(obj.val)
            })
-            answer = o ? o.label : null
+            answer = o ? o.label : null 
          }
          this.$set(this.QuestionsForm, i.classId, answer)
        }
@@ -519,8 +680,8 @@ export default {
          var index = this.AnswersList.findIndex(v => v.RowId === this.QuestionsForm.RowId)
          this.AnswersList.splice(index, 1, this.QuestionsForm)
        }
-        console.log({ key: this.question.Id, val: this.AnswersList, question: this.question })
-        this.$emit('setFormItemData', { key: this.question.Id, val: this.AnswersList, question: this.question })
+        console.log({key: this.question.Id, val: this.AnswersList, question: this.question})
+        this.$emit('setFormItemData', {key: this.question.Id, val: this.AnswersList, question: this.question})
        this.formItemNumberChange(this.question.Id, true)
        this.addOrEdit.visible = false
      })
@@ -551,9 +712,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  })
                  break;
                case 6:
@@ -568,9 +726,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  })
                  break;
                case 7:
@@ -585,9 +740,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  })
                  num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
                  break;
@@ -625,9 +777,6 @@ export default {
              }
            }
          } else {
-            if (this.questionForm[o.TableQuestionId] === 'NE') {
-              isNE = true
-            }
            switch (rules.CustomCalculateMark) {
              case 1:
                if (isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -658,8 +807,8 @@ export default {
                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
                }
                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
-                  return acc + (typeof curr === "number" ? curr : 0);
-                }, 0) / dataArr.length;
+                    return acc + (typeof curr === "number" ? curr : 0);
+                  }, 0) / dataArr.length;
                break;
              case 11:
                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -674,7 +823,7 @@ export default {
                num = Math.min(...dataArr);
                break;
              case 13:
-                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+               if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
                }
                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
@@ -702,7 +851,7 @@ export default {
      } else {
        return num.toFixed(this.digitPlaces)
      }
-
+      
    },
    formItemNumberChange(questionId, isTable) {
      if (typeof isTable === 'object') {
@@ -766,7 +915,7 @@ export default {
    //       this.$set(this.QuestionsForm, v.Id, num.toString())
    //     }
    //   })
-
+ 
    // },
    formItemTableNumberChange() {
      this.question.TableQuestions.Questions.forEach((v) => {
@@ -812,8 +961,8 @@ export default {
                    arr.length === 0
                      ? 0
                      : arr.reduce((acc, curr) => {
-                        return acc + (typeof curr === "number" ? curr : 0);
-                      }, 0) / arr.length;
+                          return acc + (typeof curr === "number" ? curr : 0);
+                        }, 0) / arr.length;
                  break;
                case 8:
                  if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
@@ -834,7 +983,7 @@ export default {
          if (isNE) {
            num = 'NE'
          } else {
-            num = num.toFixed(this.digitPlaces)
+           num =  num.toFixed(this.digitPlaces)
          }
          this.$set(this.QuestionsForm, v.Id, num.toString());
        }
@@ -844,9 +993,9 @@ export default {
      this.addOrEdit.visible = true
      this.addOrEdit.title = row.QuestionName + this.$t('trials:readingUnit:qsList:title:tableQs')
      this.QuestionsList = row.TableQuestions.Questions
-      row.TableQuestions.Questions.map(v => {
+      row.TableQuestions.Questions.map(v=>{
        if (v.Type === 'class') {
-          this.classArr.push({ triggerId: v.ClassifyTableQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType })
+          this.classArr.push({triggerId: v.ClassifyTableQuestionId, classId: v.Id, classifyAlgorithms: v.ClassifyAlgorithms, classifyType: v.ClassifyType})
        }
      })
      this.AnswersList = row.TableQuestions.Answers
@@ -955,17 +1104,17 @@ export default {
    },
    // 预览图片
    handlePictureCardPreview(file) {
-      var suffix = file.url.substring(file.url.lastIndexOf(".") + 1)
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
      suffix = suffix ? suffix.toLowerCase() : ''
-      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf') {
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
        // window.open(this.OSSclientConfig.basePath + file.url,'_blank')
        this.currentPath = file.url
        this.currentType = suffix
        this.previewVisible = true
-      } else {
+      }else{
        this.imageUrl = this.OSSclientConfig.basePath + file.url
        this.imgVisible = true
-        this.$nextTick(() => {
+        this.$nextTick(()=>{
          this.$refs[this.imageUrl].$viewer.show()
        })
      }
@@ -975,8 +1124,8 @@ export default {
      if (file && file.status === "success") {
        this.imageUrl = ''
        this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
-        this.fileList.forEach((i, index) => {
-          i.name = `${this.$t('trials:emailManageCfg:title:fileName')}${index + 1}`
+        this.fileList.forEach((i,index)=>{
+          i.name = `${this.$t('trials:emailManageCfg:title:fileName')}${index+ 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('|') : '', question: this.question })
@@ -987,14 +1136,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog {
-  .criterion-form-item {
+.my_dialog{
+  .criterion-form-item{
    width: 100%;
-
-    ::v-deep .el-form-item__content {
+    ::v-deep .el-form-item__content{
      width: auto;
    }
-
    //::v-deep .el-input-goup__append{
    //  background-color: transparent;
    //  color: #ddd;
@@ -1002,88 +1149,63 @@ export default {
    //}
  }
 }
-
-::v-deep .el-select .el-input__prefix {
-  left: calc(100% - 50px);
-  cursor: pointer;
-}
-
-::v-deep .el-select .el-input__inner {
-  padding-left: 15px;
-  padding-right: 50px;
-}
-
-::v-deep .el-form-item__label {
+::v-deep .el-form-item__label{
  color: #c3c3c3;
 }
-
-::v-deep .el-radio__label {
+::v-deep .el-radio__label{
  color: #c3c3c3;
 }
-
-::v-deep .el-input-group__append {
+::v-deep .el-input-group__append{
  background: #000;
  color: #ddd;
  border: 1px solid #5e5e5e;
 }
-
-::v-deep .el-input .el-input__inner {
+::v-deep .el-input .el-input__inner{
  background-color: transparent;
  color: #ddd;
  border: 1px solid #5e5e5e;
 }
-
-.criterion-form-item {
-  ::v-deep .criterion-form-item .el-form-item {
+.criterion-form-item{
+  ::v-deep .criterion-form-item .el-form-item{
    display: block;
-
-    .el-form-item__label {
+    .el-form-item__label{
      display: block;
      color: #c8c8c8;
      float: none;
      text-align: left;
    }
  }
-
-  .el-form-item {
+  .el-form-item{
    display: flex;
    flex-direction: row;
    align-items: flex-start;
  }
-
-  .el-input {
-    width: 100%;
+  .el-input{
+    width:100%;
  }
-
-  .mb {
-    margin-bottom: 0px;
-  }
-
-  .disabled {
-    ::v-deep .el-upload--picture-card {
-      display: none;
-    }
-  }
-
-  .uploadWrapper {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
+.mb{
+  margin-bottom: 0px;
+}
+.disabled{
+  ::v-deep .el-upload--picture-card {
+    display: none;
  }
 }
-
-::v-deep .el-table__body-wrapper::-webkit-scrollbar {
-  height: 10px !important;
+.uploadWrapper{
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
 }
-
-::v-deep .el-table__fixed-right::before {
+}
+::v-deep .el-table__body-wrapper::-webkit-scrollbar{
+  height: 10px!important;
+}
+::v-deep .el-table__fixed-right::before{
  display: none;
 }
-
-::v-deep .el-upload-list__item-name {
+::v-deep .el-upload-list__item-name{
  color: #0a84ff;
-
-  .el-icon-document {
+  .el-icon-document{
    color: #0a84ff;
  }
 }
@@ -2,7 +2,7 @@
  <div class="criterion-form-item">
    <el-form-item
      v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-      :label="`${question.QuestionName}`" :prop="question.Id" :title="question.Remark" :rules="[
+      :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
        {
          required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type !== 'group' && question.Type !== 'summary',
          message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
@@ -83,9 +83,6 @@
        @change="(val) => { formItemNumberChange(val, question) }"
        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')">
        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-        <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
-        <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
      </el-select>
      <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
@@ -453,8 +450,7 @@ export default {
      return num.toFixed(this.digitPlaces)
    },
    formItemNumberChange(v, question) {
-      this.$emit('formItemTableNumberChange')
-      this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
+      this.$emit('formItemTableNumberChange', v, question)
      // this.$emit('formItemTableNumberChange', v, question)
    },
    resetChild(obj) {
@@ -544,16 +540,6 @@ export default {
  }
 }

-::v-deep .el-select .el-input__prefix {
-  left: calc(100% - 50px);
-  cursor: pointer;
-}
-
-::v-deep .el-select .el-input__inner {
-  padding-left: 15px;
-  padding-right: 50px;
-}
-
 .criterion-form-item {
  .el-form-item {
    display: flex;
@@ -233,7 +233,9 @@ export default {
      this.questionForm[v] = ''
    },
    setFormItemData(obj) {
+      console.log('setFormItemData', obj)
      this.$set(this.questionForm, obj.key, JSON.parse(JSON.stringify(obj.val)))
+      console.log(this.questionForm)
      this.classArr.map(i=>{
        if (i.triggerId === obj.key) {
          let answer = null
@@ -85,7 +85,7 @@
                      </template>
                    </el-select>
                    <span
-                      v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'select' || scope.row.Type === 'radio'">
+                      v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
                      {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
                    </span>
                    <el-select
@@ -1,7 +1,7 @@
 <template>
  <div ref="container" style="width:100%;height:100%" class="dicom-container">
    <!-- 访视阅片 -->
-    <div v-if="readingCategory === 1 && (CriterionType === 7 || ((CriterionType === 1 || CriterionType === 0) && readingVersionEnum === 1)) " class="reading-wrapper">
+    <div v-if="readingCategory=== 1 && (CriterionType === 7 || ((CriterionType === 1 || CriterionType === 0) && readingVersionEnum === 1)) " class="reading-wrapper">
      <VisitReview :reading-tool="readingTool" />
    </div>
    <div v-else-if="(isReadingTaskViewInOrder === 1 || ((isReadingTaskViewInOrder !== 1) && isShow)) && readingCategory=== 1 && CriterionType !== 0" class="reading-wrapper">
@@ -799,7 +799,6 @@ export default {
  width: 100%;
  height: 100%;
  position: relative;
-  cursor: default !important;

  .left-top-text {
    position: absolute;
@@ -8,24 +8,35 @@
          <span style="margin-left:5px;">{{ visitInfo.TaskBlindName }}</span>
        </h3>
        <div v-if="readingTaskState < 2">
-          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
-            placement="bottom">
-            <i class="el-icon-refresh-left" @click="resetForm" />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+            <i
+              class="el-icon-refresh-left"
+              @click="resetForm"
+            />
          </el-tooltip>
        </div>
      </div>

      <!-- 影像质量评估 -->
      <div v-if="outerQuestions.length > 0" class="outer_form_wrapper">
-        <el-form ref="outerForm" size="small" :model="outerForm">
-          <question-form-item v-for="outerQs in outerQuestions" :key="outerQs.Id" :question="outerQs"
-            :question-form="outerForm" :reading-task-state="readingTaskState" :visit-task-id="visitTaskId"
-            @resetFormItemData="resetOuterFormItemData" @setFormItemData="setOuterFormItemData" />
+        <el-form
+          ref="outerForm"
+          size="small"
+          :model="outerForm"
+        >
+          <question-form-item
+            v-for="outerQs in outerQuestions"
+            :key="outerQs.Id"
+            :question="outerQs"
+            :question-form="outerForm"
+            :reading-task-state="readingTaskState"
+            :visit-task-id="visitTaskId"
+            @resetFormItemData="resetOuterFormItemData"
+            @setFormItemData="setOuterFormItemData"
+          />
          <el-form-item v-if="readingTaskState < 2">
            <div class="outer_form-footer">
-              <i class="el-icon-warning feedback-icon"
-                :style="{ color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }"
-                @click="openFeedBackTable" />
+              <i class="el-icon-warning feedback-icon" :style="{color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff'}" @click="openFeedBackTable" />
              <el-button size="mini" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
            </div>
          </el-form-item>
@@ -33,116 +44,146 @@
      </div>
      <!-- 病灶评估 -->
      <template v-if="tableQuestions.length > 0 && criterionType !== 10">
-        <div v-for="(qs, index) in tableQuestions" :key="index" class="lesions lesions_wrapper">
-          <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
+        <div
+          v-for="(qs,index) in tableQuestions"
+          :key="index"
+          class="lesions lesions_wrapper"
+        >
+          <h4
+            v-if="qs.Type === 'group'"
+            style="color: #ddd;padding: 5px 0px;margin: 0;"
+          >
+            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
          </h4>
          <div class="lesion_list">
-            <div v-for="table in qs.Childrens" v-show="!(isBaseLineTask && table.LesionType === 2)" :key="table.Id">
-              <div v-if="table.Type === 'table'" class="flex-row" style="margin:3px 0;">
+            <div
+              v-for="table in qs.Childrens"
+              v-show="!(isBaseLineTask && table.LesionType === 2)"
+              :key="table.Id"
+            >
+              <div
+                v-if="table.Type === 'table'"
+                class="flex-row"
+                style="margin:3px 0;"
+              >
                <div class="title">{{ table.QuestionName }}</div>
-                <div v-if="readingTaskState < 2 && (isBaseLineTask || table.LesionType === 2)" class="add-icon"
-                  @click.prevent="addTarget(table)">
+                <div
+                  v-if="readingTaskState<2 && (isBaseLineTask || table.LesionType === 2)"
+                  class="add-icon"
+                  @click.prevent="addTarget(table)"
+                >
                  <i class="el-icon-plus" />
                </div>
              </div>
-              <el-collapse v-if="table.Type === 'table' && table.TableQuestions" v-model="activeName" accordion
-                @change="handleCollapseChange">
-                <el-collapse-item v-for="(answer, i) in table.TableQuestions.Answers"
-                  :key="`${table.Id}_${answer.RowIndex}`" :name="`${table.Id}_${answer.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event, table.Id, answer.RowIndex)">
+              <el-collapse
+                v-if="table.Type === 'table' && table.TableQuestions"
+                v-model="activeName"
+                accordion
+                @change="handleCollapseChange"
+              >
+                <el-collapse-item
+                  v-for="(answer,i) in table.TableQuestions.Answers"
+                  :key="`${table.Id}_${answer.RowIndex}`"
+                  :name="`${table.Id}_${answer.RowIndex}`"
+                  @contextmenu.prevent.native="collapseRightClick($event, table.Id, answer.RowIndex)"
+                >
                  <template slot="title">
-                    <div style="width:340px;position: relative;"
-                      :style="{ color: (activeName === table.Id + answer.RowIndex ? '#ffeb3b' : '#fff') }">
-                      {{ getLesionName(table.OrderMark, answer.RowIndex) }}
+                    <div
+                      style="width:340px;position: relative;"
+                      :style="{color:(activeName===table.Id+answer.RowIndex?'#ffeb3b':'#fff')}"
+                    >
+                      {{ getLesionName(table.OrderMark,answer.RowIndex) }}
                      <!-- 未保存 -->
-                      <el-tooltip
-                        v-if="readingTaskState < 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 0"
-                        class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].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(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 1"
-                        class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')"
-                        placement="bottom">
+                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].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: 50px;top: 2px;">
                        <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                          <div
+                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
                            style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
-                            :title="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart">
+                            :title="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                          >
                            {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart }}
                          </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                            <span v-if="table.LesionType === 0">
-                              {{
-                                $fd('TargetState', parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
-                              }}
+                              {{ $fd('TargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
                            </span>
                            <span v-else-if="table.LesionType === 1">
-                              {{
-                                $fd('NoTargetState',
-                                  parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
-                              }}
+                              {{ $fd('NoTargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
                            </span>
                            <span v-else>
-                              {{
-                                $fd('NewLesionState',
-                                  parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
-                              }}
+                              {{ $fd('NewLesionState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
                            </span>
                          </div>
-                          <div
-                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
-                            <template
-                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
+                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
                              {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
                            </template>
-                            <template
-                              v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                            <template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
                              {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
                            </template>
                          </div>
                        </div>
                      </div>
                      <!-- 分裂 -->
-                      <div
-                        v-if="((table.LesionType === 0 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0) || (table.LesionType === 1 && [0, 1].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (table.LesionType === 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0)) && innerFormData[`${table.Id}_${answer.RowIndex}`].IsCurrentTaskAdd === 'False'"
-                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
-                        <el-tooltip
-                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false"
-                          class="table" :content="$t('trials:reading:button:split')" placement="left">
-                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
-                            @click.stop="lesionSplit(table.Id, innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)" />
+                      <div v-if="((table.LesionType === 0 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0) || (table.LesionType === 1 && [0,1].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (table.LesionType === 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0)) && innerFormData[`${table.Id}_${answer.RowIndex}`].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        <el-tooltip v-show="readingTaskState<2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false" class="table" :content="$t('trials:reading:button:split')" placement="left">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="lesionSplit(table.Id, innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)" />
                        </el-tooltip>
                      </div>

                    </div>

                  </template>
-                  <el-form :ref="`${table.Id}_${answer.RowIndex}`" size="small"
-                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]">
-                    <table-question-form-item :ref="`form_${table.Id}_${answer.RowIndex}`" :table-info="table"
-                      :answer="answer" :question-form="innerFormData[`${table.Id}_${answer.RowIndex}`]"
-                      :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
-                      :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
-                      @lesionTypeChange="lesionTypeChange" />
-                    <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
+                  <el-form
+                    :ref="`${table.Id}_${answer.RowIndex}`"
+                    size="small"
+                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                  >
+                    <table-question-form-item
+                      :ref="`form_${table.Id}_${answer.RowIndex}`"
+                      :table-info="table"
+                      :answer="answer"
+                      :question-form="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                      :reading-task-state="readingTaskState"
+                      :organs="organs"
+                      :is-base-line-task="isBaseLineTask"
+                      :is-current-task="isCurrentTask"
+                      @update="innerFormDataUpdate"
+                      @close="closeInnerForm"
+                      @lesionTypeChange="lesionTypeChange"
+                    />
+                    <div
+                      v-if="readingTaskState<2"
+                      style="text-align:right;margin-top:10px;"
+                    >
                      <!-- 清除标记 -->
-                      <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
-                        @click="clearMeasureData(table, answer.RowIndex)">
+                      <el-button
+                        v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData"
+                        size="mini"
+                        @click="clearMeasureData(table, answer.RowIndex)"
+                      >
                        {{ $t('trials:reading:button:removeMark') }}
                      </el-button>
                      <!-- 删除 -->
-                      <el-button v-if="table.TableQuestions.Answers[i].IsCurrentTaskAdd !== 'False'" size="mini"
-                        @click="deleteLesion(table, answer.RowIndex)">
+                      <el-button
+                        v-if="table.TableQuestions.Answers[i].IsCurrentTaskAdd !== 'False'"
+                        size="mini"
+                        @click="deleteLesion(table, answer.RowIndex)"
+                      >
                        {{ $t('common:button:delete') }}
                      </el-button>
                      <!-- 保存 -->
-                      <el-button size="mini" @click="saveLesion(table, answer.RowIndex)">
+                      <el-button
+                        size="mini"
+                        @click="saveLesion(table, answer.RowIndex)"
+                      >
                        {{ $t('common:button:save') }}
                      </el-button>
                    </div>
@@ -171,7 +212,6 @@ import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
 import QuestionFormItem from './QuestionFormItem'
 import TableQuestionFormItem from './TableQuestionFormItem'
-import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 export default {
  name: 'QuestionList',
  components: {
@@ -243,7 +283,6 @@ export default {
    this.getOrganList()
    this.getOuterQuestions()
    this.getTableQuestions()
-    window.addEventListener('message', this.receiveMsg)
  },
  methods: {
    // 获取器官信息
@@ -305,7 +344,7 @@ export default {
      this.$set(this.outerForm, v, null)
    },
    setOuterFormItemData(obj) {
-
+      
    },
    // 获取表格问题
    async getTableQuestions() {
@@ -429,7 +468,7 @@ export default {
      }
    },
    setAnnotation(obj) {
-      const annotation = Object.assign({}, !Object.hasOwn(obj, 'isDicomReading') ? obj.annotation : obj)
+      const annotation = Object.assign({}, obj.annotation)
      if (this.activeName) {
        // 判断当前激活的病灶是否有标注信息
        const tableId = this.activeName.split('_')[0]
@@ -454,13 +493,6 @@ export default {
            child => child.Id === tableId
          )
          if (typeof targetTable !== 'object') return
-          if (Object.hasOwn(annotation, 'isDicomReading') && !annotation.isDicomReading) {
-            // 非dicom获取名称进行重绘
-            annotation.data.remark = innerForm.LesionName
-            annotation.markTool = annotation.data.toolName
-            DicomEvent.$emit('addNoneDicomMeasureData', annotation)
-            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'IsDicomReading', false)
-          }
          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'MeasureData', annotation)
          let length = null
          let short = null
@@ -512,7 +544,7 @@ export default {
          }
          this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0)
          this.setMarkName(this.innerFormData[`${tableId}_${rowIndex}`].LesionType, this.innerFormData[`${tableId}_${rowIndex}`][stateId], this.innerFormData[`${tableId}_${rowIndex}`].LesionName, annotation)
-
+          
        }
      } else {
        if (this.isBaseLineTask) {
@@ -624,7 +656,7 @@ export default {
        this.$confirm(msg, {
          type: 'warning',
          showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
        })
        return
      }
@@ -635,7 +667,7 @@ export default {
        this.$confirm(msg, {
          type: 'warning',
          showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
        })
        return
      }
@@ -644,16 +676,10 @@ export default {
      answer.RowId = ''
      const maxIndex = this.getMaxRowIndex(tableInfo.TableQuestions.Answers)
      answer.RowIndex = `${maxIndex + 1}.00`
-      answer.IsDicomReading = annotation && Object.hasOwn(annotation, 'isDicomReading') ? annotation.isDicomReading : true
+      answer.IsDicomReading = true
      answer.SaveTypeEnum = 0
      answer.LesionType = tableInfo.LesionType
      answer.LesionName = this.getLesionName(tableInfo.OrderMark, answer.RowIndex)
-      if (!answer.IsDicomReading) {
-        // 非dicom获取名称进行重绘
-        annotation.data.remark = answer.LesionName
-        annotation.markTool = annotation.data.toolName
-        DicomEvent.$emit('addNoneDicomMeasureData', annotation)
-      }
      let state = null
      if (this.isBaseLineTask && tableInfo.LesionType === 0) {
        state = 0
@@ -667,14 +693,14 @@ export default {
      tableInfo.TableQuestions.Answers.push(answer)
      if (typeof annotation === 'object') {
        answer.MeasureData = annotation
-        if (annotation.metadata?.toolName === 'Length') {
+        if (annotation.metadata.toolName === 'Length') {
          const referencedImageId = annotation.metadata.referencedImageId
          let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
          length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
          const lengthId = this.getQuestionId(0, tableInfo.TableQuestions.Questions)
          answer.LesionLength = length
          answer[lengthId] = length
-        } else if (annotation.metadata?.toolName === 'Bidirectional') {
+        } else if (annotation.metadata.toolName === 'Bidirectional') {
          const referencedImageId = annotation.metadata.referencedImageId
          let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
          length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
@@ -749,11 +775,7 @@ export default {
      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionState', null)
      const obj = Object.assign({}, innerForm.MeasureData)
      // 移除标注信息
-      if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
-        this.$emit('removeAnnotation', obj)
-      } else {
-        DicomEvent.$emit('removeNoneDicomMeasureData', obj)
-      }
+      this.$emit('removeAnnotation', obj)
      // 重置标注信息
      this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'MeasureData', null)
      // 重置保存标志
@@ -784,11 +806,7 @@ export default {
            if (innerForm.MeasureData) {
              // 移除标注信息
              const obj = Object.assign({}, innerForm.MeasureData)
-              if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
-                this.$emit('removeAnnotation', obj)
-              } else {
-                DicomEvent.$emit('removeNoneDicomMeasureData', obj)
-              }
+              this.$emit('removeAnnotation', obj)
            }
            // 刷新表格问题
            await this.getTableQuestions()
@@ -801,11 +819,7 @@ export default {
          if (innerForm.MeasureData) {
            // 移除标注信息
            const obj = Object.assign({}, innerForm.MeasureData)
-            if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
-              this.$emit('removeAnnotation', obj)
-            } else {
-              DicomEvent.$emit('removeNoneDicomMeasureData', obj)
-            }
+            this.$emit('removeAnnotation', obj)
          }
          // 移除病灶
          this.removeAnswer(table.Id, rowIndex)
@@ -843,7 +857,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg19'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -855,7 +869,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg20'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -867,25 +881,24 @@ export default {
          if (lesionType === 1 && lesionState === 0) {
            if (lymphNodes === 1) {
              // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
                this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
              }
            } else {
              // 非淋巴结非靶病灶 直径测量工具或箭头工具
-              console.log(measureData, 'measureData')
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
                this.$confirm(this.$t('trials:reading:warnning:msg22'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -903,7 +916,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg23'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -915,7 +928,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg24'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -931,7 +944,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg25'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -948,7 +961,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg26'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -970,7 +983,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg27'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -982,7 +995,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg28'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -998,7 +1011,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg29'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1010,7 +1023,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg30'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1027,24 +1040,24 @@ export default {
          if (lesionType === 1 && lesionState === 0) {
            if (lymphNodes === 1) {
              // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
                this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
              }
            } else {
              // 非淋巴结非靶病灶 直径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
                this.$confirm(this.$t('trials:reading:warnning:msg32'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1056,24 +1069,24 @@ export default {
          if (lesionType === 1 && lesionState === 1) {
            if (lymphNodes === 1) {
              // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
                this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
              }
            } else {
              // 非淋巴结非靶病灶 直径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
                this.$confirm(this.$t('trials:reading:warnning:msg34'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1090,7 +1103,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg35'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1102,7 +1115,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg36'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1119,7 +1132,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg37'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1131,7 +1144,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg38'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1148,7 +1161,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg39'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1160,7 +1173,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg40'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1177,7 +1190,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg41'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1189,7 +1202,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg42'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1206,7 +1219,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg43'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1218,7 +1231,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg44'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1235,7 +1248,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg45'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1247,7 +1260,7 @@ export default {
                this.$confirm(this.$t('trials:reading:warnning:msg46'), {
                  type: 'warning',
                  showCancelButton: false,
-                  callback: action => { }
+                  callback: action => {}
                })
                loading.close()
                return
@@ -1377,7 +1390,7 @@ export default {
        if (annotation) {
          this.setMarkName(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].LesionType, obj.val, this.innerFormData[`${obj.tableId}_${obj.rowIndex}`].LesionName, annotation)
        }
-
+        
      }
      if (obj.questionMark === 8) {
        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionPart', obj.val)
@@ -1435,7 +1448,7 @@ export default {
          this.$confirm(msg, {
            type: 'warning',
            showCancelButton: false,
-            callback: action => { }
+            callback: action => {}
          })
          return
        }
@@ -1489,7 +1502,6 @@ export default {
          this.getOuterQuestions()
          this.getTableQuestions()
          this.$emit('resetAnnotations', this.visitTaskId)
-          DicomEvent.$emit('removeNoneDicomMeasureData', null)
        }
        loading.close()
      } catch (e) {
@@ -1539,7 +1551,7 @@ export default {
        type: 'imgfail',
        trialId: this.$route.query.trialId,
        visitTaskId: this.visitTaskId,
-        callBack: async () => {
+        callBack: async() => {
          const confirm = await this.$confirm(
            this.$t('trials:reading:confirm:feedbackmsg'),
            {
@@ -1576,7 +1588,7 @@ export default {
        this.$confirm(msg, {
          type: 'warning',
          showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
        })
        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
        return
@@ -1593,7 +1605,7 @@ export default {
        this.$confirm(msg, {
          type: 'warning',
          showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
        })
        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
        return
@@ -1604,7 +1616,7 @@ export default {
        this.$confirm(this.$t(' trials:reading:warnning:msg15'), {
          type: 'warning',
          showCancelButton: false,
-          callback: action => { }
+          callback: action => {}
        })
        this.$set(this.innerFormData[`${obj.tableId}_${obj.rowIndex}`], 'LesionType', innerForm.LesionType)
        return
@@ -1682,11 +1694,7 @@ export default {
        // 移除标注信息
        if (innerForm.MeasureData) {
          const obj = Object.assign({}, innerForm.MeasureData)
-          if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
-            this.$emit('removeAnnotation', obj)
-          } else {
-            DicomEvent.$emit('removeNoneDicomMeasureData', obj)
-          }
+          this.$emit('removeAnnotation', obj)
        }
        // 关闭窗口
        this.activeName = ''
@@ -1746,9 +1754,9 @@ export default {
        if (this.activeName) {
          return this.checkToolCanActive(toolName)
        } else {
-          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi' || toolName === 'RectangleROI')) {
+          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleROI')) {
            return { isCanActiveTool: true, reason: '' }
-          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi' || toolName === 'RectangleROI')) {
+          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleROI')) {
            return { isCanActiveTool: true, reason: '' }
          } else if (this.isBaseLineTask && toolName === 'ArrowAnnotate') {
            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
@@ -1771,10 +1779,10 @@ export default {
          } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length') {
            // '非淋巴结靶病灶需使用直径测量工具'
            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg7') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi' && toolName !== 'RectangleROI') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleROI') {
            // '淋巴结非靶病灶需使用长短径测量工具或矩形工具'
            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg8') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleRoi' && toolName !== 'RectangleROI') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleROI') {
            // '非淋巴结非靶病灶需使用直径测量工具或矩形工具'
            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg9') }
          } else if (toolName === 'ArrowAnnotate') {
@@ -1789,10 +1797,10 @@ export default {
          } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
            // 非淋巴结靶病灶需使用直径测量工具或箭头工具
            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg11') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi' && toolName !== 'RectangleROI') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleROI') {
            // 淋巴结非靶病灶需使用长短径测量工具或矩形工具或矩形工具或箭头工具
            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg52') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi' && toolName !== 'RectangleROI') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleROI') {
            // 非淋巴结非靶病灶需使用直径测量工具或矩形工具或矩形工具或箭头工具
            return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg53') }
          } else if (innerForm.LesionType === 2 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
@@ -1811,44 +1819,28 @@ export default {
      } else {
        return { isCanActiveTool: true, reason: '' }
      }
-    },
-    receiveMsg(event) {
-      if (event.data.type === 'isCanActiveNoneDicomTool') {
-        let obj = { isCanActiveTool: true, lesionName: '', reason: '', toolName: event.data.toolName }
-        let { isCanActiveTool, reason } = this.validTool(event.data.toolName)
-        obj.isCanActiveTool = isCanActiveTool
-        obj.reason = reason
-        DicomEvent.$emit('isCanActiveNoneDicomTool', obj)
-      } else if (event.data.type === 'setMeasurement') {
-        if (JSON.stringify(event.data.data) !== "{}") {
-          this.setAnnotation(event.data.data)
-        }
-      }
    }
  }
 }
 </script>
 <style lang="scss" scoped>
-.questionList-wrapper {
+.questionList-wrapper{
  height: 100%;
  overflow-y: auto;
  // overflow: hidden;

-  .container {
+  .container{
    padding: 10px;
-
-    .basic-info {
+    .basic-info{
      display: flex;
      justify-content: space-between;
      align-items: center;
-
-      h3 {
+      h3{
        color: #ddd;
        padding: 5px 0px;
        margin: 0;
      }
-
-      i {
+      i{
        color: #fff;
        font-size: 22px;
        font-weight: bold;
@@ -1856,75 +1848,64 @@ export default {
      }
    }
  }
-
-  .outer_form_wrapper {
-    ::v-deep .el-form-item__label {
+  .outer_form_wrapper{
+    ::v-deep .el-form-item__label{
      color: #c3c3c3;
      text-align: left;
    }
-
-    ::v-deep .el-input__inner {
+    ::v-deep .el-input__inner{
+      background-color: transparent;
+      color: #ddd;
+      border: 1px solid #5e5e5e;
+    }
+    ::v-deep .el-textarea__inner{
      background-color: transparent;
      color: #ddd;
      border: 1px solid #5e5e5e;
    }

-    ::v-deep .el-textarea__inner {
-      background-color: transparent;
-      color: #ddd;
-      border: 1px solid #5e5e5e;
-    }
-
-    ::v-deep .el-form-item {
+    ::v-deep .el-form-item{
      display: flex;
      flex-direction: row;
      justify-content: flex-start;
      flex-wrap: wrap;
    }
-
-    ::v-deep .el-form-item__content {
+    ::v-deep .el-form-item__content{
      flex: 1;
    }
-
-    ::v-deep .el-button--mini,
-    .el-button--mini.is-round {
+    ::v-deep .el-button--mini, .el-button--mini.is-round {
      padding: 7px 10px;
    }
-
-    ::v-deep .el-form-item__content .el-select {
+    ::v-deep .el-form-item__content
+    .el-select{
      width: 100%;
    }
-
-    .outer_form-footer {
+    .outer_form-footer{
      display: flex;
      flex-direction: row;
      justify-content: flex-end;
      align-items: center;
-
-      .feedback-icon {
+      .feedback-icon{
        padding: 0 10px;
        color: #fff;
        font-weight: 400;
        font-size: 22px;
        cursor: pointer;
-
-        &:hover {
+        &:hover{
          color: #68a2d5;
        }
      }
    }

  }
-
-  .title {
+  .title{
    padding: 5px;
    font-weight: bold;
    color: #ddd;
    font-size: 15px;

  }
-
-  .add-icon {
+  .add-icon{
    padding: 5px;
    font-weight: bold;
    color: #ddd;
@@ -1933,49 +1914,42 @@ export default {
    margin-bottom: 2px;
    cursor: pointer;
  }
-
-  .add-icon:hover {
+  .add-icon:hover{
    background-color: #607d8b;
  }

-  .flex-row {
+  .flex-row{
    display: flex;
    flex-direction: row;
    justify-content: space-between;
    background-color: #424242;

  }
-
-  .lesion_list {
+  .lesion_list{
    position: relative;
  }
-
-  .el-collapse {
-    border-bottom: none;
-    border-top: none;
-
-    ::v-deep .el-collapse-item {
-      background-color: #000 !important;
+  .el-collapse{
+    border-bottom:none;
+    border-top:none;
+    ::v-deep .el-collapse-item{
+      background-color: #000!important;
      color: #ddd;

    }
-
-    ::v-deep .el-collapse-item__header {
-      background-color: #000 !important;
+    ::v-deep .el-collapse-item__header{
+      background-color: #000!important;
      color: #ddd;
-      border-bottom-color: #5a5a5a;
+      border-bottom-color:#5a5a5a;
      padding-left: 5px;
      height: 35px;
      line-height: 35px;
    }
-
-    ::v-deep .el-collapse-item__wrap {
-      background-color: #000 !important;
+    ::v-deep .el-collapse-item__wrap{
+      background-color: #000!important;
      color: #ddd;
    }
-
-    ::v-deep .el-collapse-item__content {
-      width: 260px;
+    ::v-deep .el-collapse-item__content{
+      width:260px;
      position: absolute;
      top: 0px;
      right: 0px;
@@ -1984,7 +1958,7 @@ export default {
      z-index: 1;
      color: #ddd;
      padding: 5px;
-      background-color: #1e1e1e;
+      background-color:#1e1e1e;
    }

  }
@@ -59,7 +59,7 @@
                <div class="series-image">
                  <el-image
                    style="width: 100%;height: 100%;"
-                    :src="`${OSSclientConfig.basePath}${series.ImageResizePath || series.NoneDicomFileFirstFile}`"
+                    :src="`${OSSclientConfig.basePath}${series.ImageResizePath}`"
                    fit="fill"
                    crossorigin="anonymous"
                  />
@@ -323,7 +323,7 @@ export default {
      const viewport = renderingEngine.getViewport(this.viewportId)

      if (isPlay) {
-        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: true })
+        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: false })
      } else {
        cornerstoneTools.utilities.cine.stopClip(viewport.element)
      }
@@ -403,7 +403,6 @@ export default {
        }
        // if (isLocate && obj.SliceIndex === this.series.SliceIndex) return
        if (this.series?.Stack && obj.Stack[obj.SliceIndex] === this.series.Stack[this.series.SliceIndex]) return
-        this.toggleClipPlay(false)
        this.series = { ...obj }
        const renderingEngine = getRenderingEngine(this.renderingEngineId)
        const viewport = renderingEngine.getViewport(this.viewportId)
@@ -416,7 +415,6 @@ export default {
        }
        this.prefetchMetadataInformation(obj.ImageIds, obj.Modality)
        await viewport.setStack(this.series.Stack, obj.SliceIndex)
-        
        viewport.render()
      } catch (e) {
        console.log(e)
@@ -552,7 +550,6 @@ export default {
  width:100%;
  height:100%;
  position: relative;
-  cursor: default !important;
  .left-top-text {
    position: absolute;
    left: 5px;
@@ -1,682 +0,0 @@
-<template>
-  <div class="criterion-table-form-item">
-    <el-form-item
-      v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-      :title="question.Remark" :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
-        {
-          required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type !== 'group' && question.Type !== 'summary',
-          message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
-        },
-        {
-          validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput : (rule, value, callback) => { callback() },
-          trigger: ['blur', 'change']
-        }
-      ]"
-      :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' || question.Type === 'screenshot' ? 'uploadWrapper' : '']">
-      <!-- 输入框 -->
-      <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')" />
-      <!-- 多行文本输入框 -->
-      <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        :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.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        @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]"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        @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'"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        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' && question.ClassifyShowType === 1"
-        v-model="questionForm[question.Id]" />
-      <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType" @change="(val) => { formItemChange(val, question) }">
-        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-      </el-select>
-      <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType"
-        @change="(val) => { formItemChange(val, question) }">
-        <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
-          {{ item.trim() }}
-        </el-radio>
-      </el-radio-group>
-      <!-- 自动计算 -->
-      <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-        oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
-      <!-- 自增 -->
-      <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
-      <!-- 数值 -->
-      <template v-if="question.Type === 'number' && (question.ImageMarkEnum === 1 || question.ImageMarkEnum === 2)">
-        <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
-          <el-input type="text" @change="(val) => { formItemNumberChange(val, question) }"
-            @input="numberInput(question.Id)"
-            @blur="questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked ? () => { } : handleMarkedQsBlur(questionForm[question.Id], questionForm, question.Id, question)"
-            v-model="questionForm[question.Id]"
-            :title="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] ? questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].OrderMarkName : ''"
-            :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1"
-            style="width: 150px;margin-right: 5px;">
-            <template v-if="question.Unit !== 0" slot="append">
-              {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
-            </template>
-          </el-input>
-          <!-- 测量 -->
-          <el-button
-            v-if="readingTaskState < 2 && (!questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] || (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked))"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 1, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:measure') }}
-          </el-button>
-          <!-- 绑定 -->
-          <el-button
-            v-if="readingTaskState < 2 && (!questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] || (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked))"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 0, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:bind') }}
-          </el-button>
-          <!-- 查看 -->
-          <el-button
-            v-if="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 2, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:view') }}
-          </el-button>
-          <!-- 更改 -->
-          <el-button
-            v-if="readingTaskState < 2 && (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked)"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 3, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:edit') }}
-          </el-button>
-          <!-- 移除 -->
-          <el-button
-            v-if="readingTaskState < 2 && (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isMarked)"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 4, question })">
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:remove') }}
-          </el-button>
-          <!-- 保存 -->
-          <el-button
-            v-if="readingTaskState < 2 && (questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isSaved)"
-            size="mini" type="text" @click="operateImageMarker({ operateStateEnum: 7, question })">
-            <el-tooltip
-              v-if="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] && !questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].isSaved"
-              class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
-              <i class="el-icon-warning" style="color:red" />
-            </el-tooltip>
-            {{ $t('dicom3D:CustomizeQuestionFormItem:button:save') }}
-          </el-button>
-        </div>
-      </template>
-      <template v-else-if="question.Type === 'number'">
-        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-          @change="((val) => { formItemChange(val, question) })">
-          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
-        </el-select>
-        <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
-          @blur="handleBlur(questionForm[question.Id], 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>
-        </el-input>
-        <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource === 1"
-          :disabled="question.DataSource === 1" @input="numberInput(question.Id, true)"
-          @blur="handleCalculationBlur(calculationValue)" v-model="calculationValue">
-          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-        </el-input>
-      </template>
-      <!-- 上传图像 -->
-      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'" :disabled="readingTaskState === 2"
-        action :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
-        :on-preview="handlePictureCardPreview"
-        :before-upload="(file) => { return handleBeforeUpload(file, question.FileType, question.Type) }"
-        :http-request="uploadScreenshot" :on-remove="handleRemove" :file-list="fileList"
-        :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
-        <el-button slot="default" class="el-icon-plus" v-if="readingTaskState < 2">
-          {{ this.$t('common:button:upload') }}
-        </el-button>
-      </el-upload>
-      <viewer v-if="(question.Type === 'upload' || question.Type === 'screenshot') && imgVisible" :ref="imageUrl"
-        style="margin:0 10px;" :images="[imageUrl]">
-        <img v-show="false" crossorigin="anonymous" :src="imageUrl" alt="Image">
-      </viewer>
-    </el-form-item>
-  </div>
-</template>
-<script>
-import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
-export default {
-  name: 'QuestionTableFormItem',
-  props: {
-    isBaseline: {
-      type: Boolean,
-      required: true
-    },
-    questionForm: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    question: {
-      type: Object,
-      default() {
-        return []
-      }
-    },
-    criterionId: {
-      type: String,
-      required: true
-    },
-    calculationList: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingTaskState: {
-      type: Number,
-      required: true
-    },
-    visitTaskId: {
-      type: String,
-      default: ''
-    },
-    type: {
-      type: String,
-      default: 'add'
-    },
-    questionsMarkStatus: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    parentQsId: {
-      type: String,
-      default: ''
-    },
-  },
-  computed: {
-    calculationValue: {
-      get() {
-        return this.questionForm[this.question.Id]
-      },
-      set() {
-
-      }
-    }
-  },
-  data() {
-    return {
-      addOrEdit: { visible: false, title: '' },
-      fileList: [],
-      accept: '.png,.jpg,.jpeg',
-      imgVisible: false,
-      imageUrl: '',
-      urls: [],
-      organList: [],
-      QuestionsList: [],
-      QuestionsForm: {},
-      digitPlaces: 2,
-      rowId: ''
-    }
-  },
-  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)
-        this.rowId = this.questionForm.RowId
-      }
-    },
-    questionsMarkStatus: {
-      deep: true,
-      immediate: true,
-      handler(v) {
-        this.$forceUpdate()
-      }
-    }
-  },
-  mounted() {
-    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
-    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-    if (this.question.Type === 'upload' || this.question.Type === 'screenshot') {
-      if (this.questionForm[this.question.Id]) {
-        this.urls = this.questionForm[this.question.Id].split('|')
-        this.fileList = []
-        this.urls.map((url, index) => {
-          var index = url.lastIndexOf('.')
-          var suffix = url.substring(index + 1, url.length)
-          this.fileList.push({ name: `${this.$t('trials:emailManageCfg:title:fileName')}${index + 1}(${suffix})`, url: `${url}` })
-        })
-      }
-    }
-    DicomEvent.$on('operateImageMarkerTable', (data) => {
-      let { operateStateEnum, QuestionId, picturePath } = data
-      if (this.question.Id === QuestionId) {
-        this.operateImageMarker({ operateStateEnum, question: this.question, picturePath })
-      }
-    })
-    if (this.type === 'edit') return
-  },
-  methods: {
-    numberInput(id, notId = false) {
-      if (notId) {
-        this.calculationValue = this.calculationValue.toUpperCase();
-      } else {
-        this.questionForm[id] = this.questionForm[id].toUpperCase();
-      }
-    },
-    validatorNumberInput(rule, value, callback) {
-      let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
-      if (value === '') {
-        callback(new Error(this.$t('common:ruleMessage:specify')));
-      } else {
-        if (!reg.test(value)) {
-          callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
-        } else {
-          callback();
-        }
-      }
-    },
-    save() {
-    },
-    openAddTableCol(row) {
-      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
-      this.QuestionsForm = {}
-    },
-    formItemChange(v, question) {
-      if (question.Childrens && 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, question: qs })
-        })
-      } else {
-        this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
-      }
-    },
-    handleBlur(value, a, b) {
-      if (!value) return false
-      if (!isNaN(parseFloat(value))) {
-        this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
-      }
-    },
-    handleMarkedQsBlur(value, a, b, question) {
-      this.$set(a, b, !isNaN(parseFloat(value)) ? parseFloat(value).toFixed(this.digitPlaces) : value)
-      question.IsTableQuestion = true
-      // this.$emit('operateImageMarker', {operateStateEnum: 6, question})
-    },
-    handleCalculationBlur(v) {
-      if (!v) return false
-      if (!isNaN(parseFloat(v))) {
-        this.calculationValue = parseFloat(v).toFixed(this.digitPlaces)
-      }
-    },
-    limitInput(value, q) {
-      if (value.indexOf('.') > -1) {
-        if (value.split('.')[1].length >= this.digitPlaces) {
-          this.$set(this.questionForm, q.Id, parseFloat(value).toFixed(this.digitPlaces))
-        }
-      } else {
-      }
-    },
-    logic(rules, num = 0) {
-      let isNE = false
-      try {
-        if (rules.CalculateQuestionList.length === 0) {
-          return false
-        }
-        let dataArr = []
-        var count = 0
-        var maxList = [], minList = []
-        rules.CalculateQuestionList.forEach((o, i) => {
-          if (this.questionForm[o.TableQuestionId] === 'NE') {
-            isNE = true
-          }
-          if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
-            if (i !== 0) {
-              switch (rules.CustomCalculateMark) {
-                case 7:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    count += parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = count / rules.CalculateQuestionList.length
-                  }
-                  break;
-                case 8:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    maxList.push(this.questionForm[o.TableQuestionId])
-                  }
-
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = minList.length > 0 ? Math.max(...maxList) : 0
-                  }
-                  break;
-                case 9:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    minList.push(this.questionForm[o.TableQuestionId])
-                  }
-
-                  if (i === rules.CalculateQuestionList.length - 1) {
-                    num = minList.length > 0 ? Math.min(...minList) : 0
-                  }
-                  break;
-              }
-            } else {
-              if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                maxList.push(this.questionForm[o.TableQuestionId])
-                minList.push(this.questionForm[o.TableQuestionId])
-                count = parseFloat(this.questionForm[o.TableQuestionId])
-                num = parseFloat(this.questionForm[o.TableQuestionId])
-                dataArr.push(num)
-              }
-
-            }
-          } else {
-            if (i !== 0) {
-              switch (rules.CustomCalculateMark) {
-                case 1:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    num += parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-
-                  break;
-                case 2:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    num -= parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-
-                  break;
-                case 3:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    num *= parseFloat(this.questionForm[o.TableQuestionId])
-                  }
-
-                  break;
-                case 4:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    if (parseFloat(this.questionForm[o.TableQuestionId]) === 0) {
-                      num = 0
-                    } else {
-                      num /= parseFloat(this.questionForm[o.TableQuestionId])
-                    }
-                  }
-
-                  break;
-                case 10:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                  }
-                  num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
-                    return acc + (typeof curr === "number" ? curr : 0);
-                  }, 0) / dataArr.length;
-                  break;
-                case 11:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                  }
-                  num = Math.max(...dataArr);
-                  break;
-                case 12:
-                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
-                  }
-                  num = Math.min(...dataArr);
-                  break;
-              }
-            } else {
-              if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
-                num = parseFloat(this.questionForm[o.TableQuestionId])
-              }
-
-            }
-          }
-        })
-      } catch (e) {
-        console.log(e)
-      }
-      if (isNE) {
-        return 'NE'
-      }
-      if (rules.ValueType === 2) {
-        num = num * 100
-      }
-      return num.toFixed(this.digitPlaces)
-    },
-    formItemNumberChange(v, question) {
-      this.$emit('formItemTableNumberChange', v, question)
-      this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
-      // this.$emit('formItemTableNumberChange', v, question)
-    },
-    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 operateImageMarker(obj) {
-      obj.question.IsTableQuestion = true
-      obj.question.RowId = this.rowId
-      obj.question.ParentQsId = this.parentQsId
-      if (obj.operateStateEnum === 7 && this.questionForm[obj.question.Id] && isNaN(parseFloat(this.questionForm[obj.question.Id])) && this.questionForm[obj.question.Id] !== 'NE') return false
-      if (obj.operateStateEnum === 7) {
-        // 保存表格问题标记
-        // if (!obj.question.RowId) {
-        //   // 生成rowId
-        //   const loading = this.$loading({ fullscreen: true })
-        //   try {
-        //     let params = {
-        //       questionId: this.parentQsId,
-        //       RowIndex: this.questionForm.RowIndex,
-        //       visitTaskId: this.visitTaskId,
-        //       trialId: this.$route.query.trialId,
-        //       answerList: [],
-        //     }
-        //     let res = await submitTableQuestion(params)
-        //     // this.$emit('save',rowId)
-        //     this.QuestionsForm.RowId = res.Result.RowId
-        //     obj.rowId = res.Result.RowId
-        //     this.rowId = res.Result.RowId
-        //     loading.close()
-        //   } catch(e) {
-        //     loading.close()
-        //   }
-        // }
-        obj.rowIndex = this.questionForm.RowIndex
-        // obj.parentQsId = this.parentQsId
-        obj.answer = this.questionForm[obj.question.Id]
-      }
-      this.$emit('operateImageMarker', obj)
-    },
-    async uploadScreenshot(param) {
-      if (!this.visitTaskId) return
-      const loading = this.$loading({
-        target: document.querySelector('.el-dialog'),
-        fullscreen: false,
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading'
-      })
-      var fileName = param.file.name
-      var index = fileName.lastIndexOf('.')
-      var suffix = fileName.substring(index + 1, fileName.length)
-      var 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}(${suffix})`, url: this.$getObjectName(res.url) })
-      this.urls.push(this.$getObjectName(res.url))
-      this.$emit('setFormItemData', { key: this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question })
-      loading.close()
-    },
-    handleBeforeUpload(file, accept, type) {
-      if (type === 'screenshot') {
-        accept = '.png,.jpeg,.jpg'
-      }
-      // 检测文件类型是否符合要求
-      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
-      }
-    },
-    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 (['ppt',
-        'pptx',
-        'doc',
-        'docx',
-        'xls',
-        'xlsx'].includes(suffix)) {
-        // window.open(this.OSSclientConfig.basePath + file.url,'_blank')
-        this.$onlyOffice({
-          path: file.url,
-          type: suffix,
-          title: file.name
-        })
-        // this.currentPath = file.url
-        // this.currentType = suffix
-        // this.previewVisible = true
-      } else if (['pdf'].includes(suffix)) {
-        this.$preview({
-          path: file.url,
-          type: 'pdf',
-          title: file.name,
-        })
-      } else {
-        this.imageUrl = this.OSSclientConfig.basePath + file.url
-        this.imgVisible = true
-        this.$nextTick(() => {
-          this.$refs[this.imageUrl].$viewer.show()
-        })
-      }
-    },
-    // 删除图片
-    handleRemove(file, fileList) {
-      if (file && file.status === "success") {
-        this.imageUrl = ''
-        this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
-        this.fileList.forEach((i, index) => {
-          i.name = `${this.$t('trials:emailManageCfg:title:fileName')}${index + 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('|') : '', question: this.question })
-      }
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.criterion-table-form-item {
-  .el-form-item {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-  }
-
-  ::v-deep .el-select .el-input__prefix {
-    left: calc(100% - 50px);
-    cursor: pointer;
-  }
-
-  ::v-deep .el-select .el-input__inner {
-    padding-left: 15px;
-    padding-right: 50px;
-  }
-
-  .el-input {
-    width: 100%;
-  }
-
-  .el-select {
-    width: 100%;
-  }
-
-  .mb {
-    margin-bottom: 0px;
-  }
-
-  .disabled {
-    ::v-deep .el-upload--picture-card {
-      display: none;
-    }
-  }
-
-  .uploadWrapper {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-  }
-}
-</style>
@@ -73,13 +73,13 @@
                      <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                    </template>
                  </el-select>
-                  <span
-                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
+                  <span v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'select'">
                    {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
                  </span>
                  <el-select
-                    v-else-if="(scope.row.Type === 'select' || scope.row.Type === 'radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
-                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable>
+                    v-else-if="(scope.row.Type === 'select' || scope.row.Type === 'radio' || (scope.row.Type === 'number' && scope.row.TypeValue)) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable
+                    @focus="() => { questionId = scope.row.QuestionId }">
                    <template>
                      <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                    </template>
@@ -200,12 +200,12 @@
    </el-dialog>

    <!-- 预览文件 -->
-    <viewer ref="picture_perview_customizeReportPage" style="margin: 0 10px"
-      v-if="currentType && ['png', 'jpg', 'jpeg'].includes(currentType.toLowerCase())"
-      :images="[`${OSSclientConfig.basePath}${currentPath}`]" :options="viewerOptions">
-
-      <img v-show="false" :src="`${OSSclientConfig.basePath}${currentPath}`" alt="Image" />
-    </viewer>
+    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
+      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
+      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
+      </div>
+    </el-dialog>
  </div>
 </template>
 <script>
@@ -214,10 +214,12 @@ import { setSkipReadingCache } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import SignForm from '@/views/trials/components/newSignForm'
+import PreviewFile from '@/components/PreviewFile/index'
 import { getToken } from '@/utils/auth'
+import store from '@/store'
 export default {
  name: 'CustomizeReportPage',
-  components: { SignForm },
+  components: { SignForm, PreviewFile },
  data() {
    return {
      trialId: '',
@@ -242,23 +244,9 @@ export default {
      questionForm: {},
      questionId: null,
      taskInfo: null,
+      previewVisible: false,
      currentPath: '',
-      currentType: '',
-
-
-      viewerOptions: {
-        toolbar: {
-          zoomIn: true,
-          zoomOut: true,
-          reset: true,
-          prev: false,
-          next: false,
-          rotateLeft: true,
-          rotateRight: true,
-          flipHorizontal: true,
-          flipVertical: true,
-        }
-      }
+      currentType: ''
    }
  },
  watch: {
@@ -820,33 +808,7 @@ export default {
      this.currentPath = path
      const arr = path.split('.')
      this.currentType = arr[arr.length - 1]
-      // this.previewVisible = true
-      if (['.ppt',
-        '.pptx',
-        '.doc',
-        '.docx',
-        '.xls',
-        '.xlsx'].includes(`.${this.currentType.toLowerCase()}`)) {
-        this.$onlyOffice({
-          path: path,
-          type: this.currentType,
-          title: this.$t('trials:readingReport:title:preview')
-        })
-      }
-      if (['.jpg',
-        '.jpeg',
-        '.png'].includes(`.${this.currentType.toLowerCase()}`)) {
-        this.$nextTick(() => {
-          this.$refs['picture_perview_customizeReportPage'].$viewer.show()
-        })
-      }
-      if (['.pdf'].includes(`.${this.currentType.toLowerCase()}`)) {
-        this.$preview({
-          path: path,
-          type: 'pdf',
-          title: this.$t('trials:readingReport:title:preview')
-        })
-      }
+      this.previewVisible = true
    }
  }
 }
@@ -234,7 +234,6 @@ const config = {
      'name': '直径测量工具',
      'icon': 'length',
      'toolName': 'Length',
-      'props': ['length'],
      'i18nKey': 'trials:reading:button:length',
      'isDisabled': false,
      'disabledReason': ''
@@ -243,7 +242,6 @@ const config = {
      'name': '长短径测量工具',
      'icon': 'bidirection',
      'toolName': 'Bidirectional',
-      'props': ['length', 'width'],
      'i18nKey': 'trials:reading:button:bidirectional',
      'isDisabled': false,
      'disabledReason': ''
@@ -252,7 +250,6 @@ const config = {
      'name': '矩形工具',
      'icon': 'rectangle',
      'toolName': 'RectangleROI',
-      'props': ['area', 'mean', 'max', 'stdDev'],
      'i18nKey': 'trials:reading:button:rectangle',
      'isDisabled': false,
      'disabledReason': ''
@@ -261,7 +258,6 @@ const config = {
      'name': '箭头工具',
      'icon': 'arrow',
      'toolName': 'ArrowAnnotate',
-      'props': [],
      'i18nKey': 'trials:reading:button:arrowAnnotate',
      'isDisabled': false,
      'disabledReason': ''
@@ -270,95 +266,11 @@ const config = {
      'name': '椭圆工具',
      'icon': 'oval',
      'toolName': 'CircleROI',
-      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
      'i18nKey': 'trials:reading:button:Circle',
      'isDisabled': false,
      'disabledReason': ''
-    },
-    {
-      'name': '角度工具',
-      'icon': 'angle',
-      'toolName': 'Angle',
-      'props': ['angle'],
-      'i18nKey': 'trials:reading:button:Angle',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-    {
-      'name': '角度工具',
-      'icon': 'cobb',
-      'toolName': 'CobbAngle',
-      'props': ['angle'],
-      'i18nKey': 'trials:reading:button:CobbAngle',
-      'isDisabled': false,
-      'disabledReason': ''
    }
-  ],
-  'customizeStandardsNoneDicom': [
-    {
-      'name': '直径测量工具',
-      'icon': 'length',
-      'toolName': 'Length',
-      'props': ['length'],
-      'i18nKey': 'trials:reading:button:length',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-    {
-      'name': '矩形工具',
-      'icon': 'rectangle',
-      'toolName': 'RectangleROI',
-      'props': ['area', 'mean', 'max', 'stdDev'],
-      'i18nKey': 'trials:reading:button:rectangle',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-    {
-      'name': '箭头工具',
-      'icon': 'arrow',
-      'toolName': 'ArrowAnnotate',
-      'props': [],
-      'i18nKey': 'trials:reading:button:arrowAnnotate',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-    {
-      'name': '圆形工具',
-      'icon': 'oval',
-      'toolName': 'CircleROI',
-      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
-      'i18nKey': 'trials:reading:button:Circle',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-    {
-      'name': '椭圆工具',
-      'icon': 'elliptical',
-      'toolName': 'EllipticalROI',
-      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
-      'i18nKey': 'trials:reading:button:Elliptical',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-    {
-      'name': '角度工具',
-      'icon': 'angle',
-      'toolName': 'Angle',
-      'props': ['angle'],
-      'i18nKey': 'trials:reading:button:Angle',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-    {
-      'name': '自由曲线',
-      'icon': 'polygon',
-      'toolName': 'PlanarFreehandROI',
-      'props': [],
-      'i18nKey': 'trials:reading:button:planarFreehandROI',
-      'isDisabled': false,
-      'disabledReason': ''
-    },
-  ],
+  ]
 }
 const getTools = (criterionType) => {
  const standard = config.standards.find(s => s.type === criterionType)
@@ -368,8 +280,4 @@ const getCustomizeStandardsTools = (toolNames) => {
  const filteredTools = config.customizeStandards.filter(item => toolNames.includes(item.toolName))
  return filteredTools || []
 }
-const getCustomizeStandardsNoneDicomTools = (toolNames) => {
-  const filteredTools = config.customizeStandardsNoneDicom.filter(item => toolNames.includes(item.toolName))
-  return filteredTools || []
-}
-export { config, getTools, getCustomizeStandardsTools, getCustomizeStandardsNoneDicomTools }
+export { config, getTools, getCustomizeStandardsTools }
@@ -2,7 +2,7 @@
  <div v-loading="loading" class="reading-viewer-container">
    <!-- 访视阅片 -->
    <visit-review 
-      v-if="taskInfo && taskInfo.ReadingCategory === 1" 
+      v-if="taskInfo && taskInfo.ReadingCategory=== 1" 
    />
    <!-- 临床数据 -->
    <el-dialog
@@ -1,39 +1,59 @@
 <template>
  <div v-loading="loading" class="reading-viewer-container">
    <!-- 访视阅片 -->
-    <visit-review v-if="taskInfo && taskInfo.ReadingCategory === 1" />
+    <visit-review v-if="taskInfo && taskInfo.ReadingCategory=== 1" />
    <!-- 全局阅片 -->
-    <global-review v-else-if="taskInfo && taskInfo.ReadingCategory === 2" :trial-id="trialId"
-      :subject-id="taskInfo.SubjectId" :visit-task-id="taskInfo.VisitTaskId"
-      :reading-category="taskInfo.ReadingCategory" :subject-code="taskInfo.SubjectCode"
-      :task-blind-name="taskInfo.TaskBlindName" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
+    <global-review
+      v-else-if="taskInfo && taskInfo.ReadingCategory=== 2"
+      :trial-id="trialId"
+      :subject-id="taskInfo.SubjectId"
+      :visit-task-id="taskInfo.VisitTaskId"
+      :reading-category="taskInfo.ReadingCategory"
+      :subject-code="taskInfo.SubjectCode"
+      :task-blind-name="taskInfo.TaskBlindName"
+      :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
      :is-reading-show-previous-results="taskInfo.IsReadingShowPreviousResults"
-      :is-exists-clinical-data="taskInfo.IsExistsClinicalData" />
+      :is-exists-clinical-data="taskInfo.IsExistsClinicalData"
+    />
    <!-- 裁判阅片 -->
-    <ad-review v-else-if="taskInfo && taskInfo.ReadingCategory === 4" :trial-id="trialId"
-      :subject-id="taskInfo.SubjectId" :visit-task-id="taskInfo.VisitTaskId"
-      :reading-category="taskInfo.ReadingCategory" :subject-code="taskInfo.SubjectCode"
-      :task-blind-name="taskInfo.TaskBlindName" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
+    <ad-review
+      v-else-if="taskInfo && taskInfo.ReadingCategory=== 4"
+      :trial-id="trialId"
+      :subject-id="taskInfo.SubjectId"
+      :visit-task-id="taskInfo.VisitTaskId"
+      :reading-category="taskInfo.ReadingCategory"
+      :subject-code="taskInfo.SubjectCode"
+      :task-blind-name="taskInfo.TaskBlindName"
+      :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
      :is-reading-show-previous-results="taskInfo.IsReadingShowPreviousResults"
-      :is-exists-clinical-data="taskInfo.IsExistsClinicalData" />
+      :is-exists-clinical-data="taskInfo.IsExistsClinicalData"
+    />
    <!-- 肿瘤学阅片 -->
    <!-- <oncology-review v-else-if="taskInfo && taskInfo.ReadingCategory=== 5" /> -->
-    <el-dialog :visible.sync="clinicalDataVisible"
-      :custom-class="isClinicalDataFullscreen ? 'full-dialog-container' : 'dialog-container'" :show-close="false"
-      :close-on-click-modal="false" :fullscreen="isClinicalDataFullscreen">
+    <el-dialog
+      :visible.sync="clinicalDataVisible"
+      :custom-class="isClinicalDataFullscreen?'full-dialog-container':'dialog-container'"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :fullscreen="isClinicalDataFullscreen"
+    >
      <span slot="title" class="dialog-footer">
        <!-- 当前阅片任务存在临床数据，请查看。若已查看，请点击“确认” -->
        <span v-if="!closeCDVisible">{{ $t('trials:reading:dagTitle:msg1') }}</span>
        <div style="position: absolute;right: 20px;top: 10px;">
-          <svg-icon :icon-class="isClinicalDataFullscreen ? 'exit-fullscreen' : 'fullscreen'"
-            style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen = !isClinicalDataFullscreen" />
-          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
-            @click="clinicalDataVisible = false" />
+          <svg-icon :icon-class="isClinicalDataFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen=!isClinicalDataFullscreen" />
+          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="clinicalDataVisible = false" />
        </div>
      </span>
      <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
-        <clinical-data v-if="clinicalDataVisible" style="flex: 1" :trial-id="trialId" :subject-id="taskInfo.SubjectId"
-          :visit-task-id="cdVisitTaskId" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo" />
+        <clinical-data
+          v-if="clinicalDataVisible"
+          style="flex: 1"
+          :trial-id="trialId"
+          :subject-id="taskInfo.SubjectId"
+          :visit-task-id="cdVisitTaskId"
+          :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
+        />
        <div v-if="!closeCDVisible" style="text-align:right">
          <el-button type="primary" @click="handleConfirmCD">{{ $t('trials:reading:button:confirm') }}</el-button>
        </div>
@@ -45,7 +65,6 @@
 <script>
 import { getNextTask, readClinicalData } from '@/api/trials'
 import store from '@/store'
-import { changeURLStatic } from '@/utils/history.js'
 import VisitReview from '@/views/trials/trials-panel/reading/visit-review'
 import GlobalReview from '@/views/trials/trials-panel/reading/global-review'
 import AdReview from '@/views/trials/trials-panel/reading/ad-review'
@@ -73,10 +92,6 @@ export default {
  },
  mounted() {
    this.trialId = this.$route.query.trialId
-    if (this.$router.currentRoute.query.TokenKey) {
-      store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
-      changeURLStatic('TokenKey', '')
-    }
    this.getTaskInfo()
  },
  methods: {
@@ -127,24 +142,20 @@ export default {
 .reading-viewer-container {
  width: 100%;
  height: 100%;
-
-  ::v-deep .dialog-container {
+  ::v-deep .dialog-container{
    margin-top: 50px !important;
-    width: 75%;
-    height: 80%;
+    width:75%;
+    height:80%;
  }
-
-  ::v-deep .el-dialog__body {
-    padding: 10px;
-    height: calc(100% - 70px);
-  }
-
-  .el-dialog__header {
+  ::v-deep .el-dialog__body{
+      padding: 10px;
+      height: calc(100% - 70px);
+    }
+  .el-dialog__header{
    position: relative;
  }
-
-  .full-dialog-container {
-    ::v-deep .is-fullscreen .el-dialog__body {
+  .full-dialog-container{
+    ::v-deep .is-fullscreen .el-dialog__body{
      height: calc(100% - 70px);
    }
  }
@@ -2,15 +2,18 @@
 <template>
  <BaseContainer class="read-task-allocation">
    <el-tabs type="border-card" v-model="TrialReadingCriterionId">
-      <el-tab-pane :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId"
-        v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId">
+      <el-tab-pane :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId" v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId">
        <div v-if="TrialReadingCriterionId === i.TrialReadingCriterionId">
          <div slot="search-container">
            <el-form :inline="true">
              <el-form-item :label="$t('trials:reviewAssign:table:siteCode')">
                <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:240px;">
-                  <el-option v-for="(item, index) of siteOptions" :key="'taskSearchData' + index"
-                    :label="item.TrialSiteCode" :value="item.TrialSiteId" />
+                  <el-option
+                    v-for="(item,index) of siteOptions"
+                    :key="'taskSearchData' + index"
+                    :label="item.TrialSiteCode"
+                    :value="item.TrialSiteId"
+                  />
                </el-select>
              </el-form-item>
              <!-- 受试者编号 -->
@@ -20,22 +23,20 @@
              <!-- 阅片人 -->
              <el-form-item :label="$t('trials:reviewAssign:searchForm:reader')">
                <el-select v-model="searchData.DoctorUserId" clearable style="width:240px;">
-                  <el-option v-for="item of DoctorUserList" :key="'taskSearchData' + item.DoctorUserId"
-                    :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
+                  <el-option v-for="item of DoctorUserList" :key="'taskSearchData' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
                </el-select>
              </el-form-item>
-              <!-- 分配状态 -->
+                <!-- 分配状态 -->
              <el-form-item :label="$t('trials:reviewAssign:searchForm:status')">
                <el-select v-model="searchData.SubjectAllocateState" clearable style="width:240px;">
-                  <el-option v-for="item of $d.SubjectAllocateState" :key="item.id" :value="item.value"
-                    :label="item.label" />
+                  <el-option v-for="item of $d.SubjectAllocateState" :key=" item.id" :value="item.value" :label="item.label" />
                </el-select>
              </el-form-item>
-              <!-- 分配角色 -->
+                <!-- 分配角色 -->
              <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
                  <template v-for="item of $d.ArmEnum">
-                    <el-option :key="item.id" :value="item.value" :label="item.label" v-if="item.label !== 'GR'" />
+                    <el-option  :key="item.id" :value="item.value" :label="item.label" v-if="item.label!=='GR'"/>
                  </template>
                </el-select>
              </el-form-item>
@@ -49,14 +50,11 @@
                  {{ $t('common:button:reset') }}
                </el-button>
                <!-- 分配规则 -->
-                <el-button type="primary" icon="el-icon-edit-outline"
-                  v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']"
-                  @click="openAllocationConfigVisible">
+                <el-button type="primary" icon="el-icon-edit-outline" v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="openAllocationConfigVisible">
                  {{ $t('trials:reviewAssign:button:assignRules') }}
                </el-button>
                <!-- 手动分配 -->
-                <el-button type="primary" :loading="btnLoading"
-                  v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="manualAllocation()">
+                <el-button type="primary" :loading="btnLoading" v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="manualAllocation()">
                  {{ $t('trials:reviewAssign:button:manualAllocation') }}
                </el-button>
                <!-- 访视、全局、肿瘤学阅片任务 -->
@@ -65,216 +63,320 @@
                </el-button>
                <!-- 裁判阅片任务 -->
                <el-button type="primary" :loading="btnLoading" @click="openAllocation('referee')">
-                  {{ $t('trials:reviewAssign:button:adReadingTasks') }}
+                  {{$t('trials:reviewAssign:button:adReadingTasks')}}
                </el-button>
              </el-form-item>
            </el-form>
          </div>
          <div slot="main-container">
-            <el-table :ref="TrialReadingCriterionId" v-loading="loading" v-adaptive="{ bottomOffset: 85 }" border
-              :data="list" stripe height="100" @selection-change="handleSubjectAssignListSelectChange"
-              @sort-change="handleSortChange">
+            <el-table
+              :ref="TrialReadingCriterionId"
+              v-loading="loading"
+              v-adaptive="{bottomOffset:85}"
+              border
+              :data="list"
+              stripe
+              height="100"
+              @selection-change="handleSubjectAssignListSelectChange"
+              @sort-change="handleSortChange"
+            >
              <el-table-column type="selection" align="left" width="45" />
              <!-- 中心编号 -->
-              <el-table-column prop="TrialSiteCode" :label="$t('trials:reviewAssign:table:siteCode')" width="140"
-                show-overflow-tooltip sortable="custom" />
+              <el-table-column
+                prop="TrialSiteCode"
+                :label="$t('trials:reviewAssign:table:siteCode')"
+                width="140"
+                show-overflow-tooltip
+                sortable="custom"
+              />
              <!-- 受试者编号 -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:subjectCode')" width="140"
-                show-overflow-tooltip sortable="custom" />
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:subjectCode')"
+                width="140"
+                show-overflow-tooltip
+                sortable="custom"
+              />
              <!-- 访视 -->
-              <el-table-column prop="VisitTaskTypeCount" :label="$t('trials:reviewAssign:table:visit')" width="140"
-                show-overflow-tooltip sortable="custom">
+              <el-table-column
+                prop="VisitTaskTypeCount"
+                :label="$t('trials:reviewAssign:table:visit')"
+                width="140"
+                show-overflow-tooltip
+                sortable="custom"
+              >
                <template slot-scope="scope">
-                  <span @click="openAllocation('task', 1, scope.row.SubjectCode)"
-                    style="color:#428bca;cursor: pointer">{{ scope.row.VisitTaskTypeCount }}</span>
+                  <span @click="openAllocation('task', 1, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.VisitTaskTypeCount}}</span>
                </template>
              </el-table-column>
              <!-- 全局 -->
-              <el-table-column prop="GlobalTaskTypeCount" :label="$t('trials:reviewAssign:table:global')" width="140"
-                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsGlobalReading" sortable="custom">
+              <el-table-column
+                prop="GlobalTaskTypeCount"
+                :label="$t('trials:reviewAssign:table:global')"
+                width="140"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsGlobalReading"
+                sortable="custom"
+              >
                <template slot-scope="scope">
-                  <span @click="openAllocation('task', 2, scope.row.SubjectCode)"
-                    style="color:#428bca;cursor: pointer">{{ scope.row.GlobalTaskTypeCount }}</span>
+                  <span @click="openAllocation('task', 2, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.GlobalTaskTypeCount}}</span>
                </template>
              </el-table-column>
              <!-- 裁判 -->
-              <el-table-column prop="JudgeTaskTypeCount" :label="$t('trials:reviewAssign:table:ad')" width="140"
-                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
-                sortable="custom">
+              <el-table-column
+                prop="JudgeTaskTypeCount"
+                :label="$t('trials:reviewAssign:table:ad')"
+                width="140"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
+                sortable="custom"
+              >
                <template slot-scope="scope">
-                  <span @click="openAllocation('referee', 4, scope.row.SubjectCode)"
-                    style="color:#428bca;cursor: pointer">{{ scope.row.JudgeTaskTypeCount }}</span>
+                  <span @click="openAllocation('referee', 4, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.JudgeTaskTypeCount}}</span>
                </template>
              </el-table-column>
              <!-- 肿瘤学 -->
-              <el-table-column prop="OncologyTaskTypeCount" :label="$t('trials:reviewAssign:table:oncology')"
-                width="140" show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsOncologyReading" sortable="custom">
+              <el-table-column
+                prop="OncologyTaskTypeCount"
+                :label="$t('trials:reviewAssign:table:oncology')"
+                width="140"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsOncologyReading"
+                sortable="custom"
+              >
                <template slot-scope="scope">
-                  <span @click="openAllocation('task', 5, scope.row.SubjectCode)"
-                    style="color:#428bca;cursor: pointer">{{ scope.row.OncologyTaskTypeCount }}</span>
+                  <span @click="openAllocation('task', 5, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.OncologyTaskTypeCount}}</span>
                </template>
              </el-table-column>
              <!-- 阅片人（R1） -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r1')" min-width="100"
-                show-overflow-tooltip v-if="ReadingType === 1">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:r1')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="ReadingType === 1"
+              >
                <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                    <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        0).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.FullName})` }}
                    </el-tag>
                  </div>
                </template>
              </el-table-column>
              <!-- 阅片人（R1） -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r1')" min-width="100"
-                show-overflow-tooltip v-if="ReadingType === 2">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:r1')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="ReadingType === 2"
+              >
                <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                    <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        1).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.FullName})` }}
                    </el-tag>
                  </div>
                </template>
              </el-table-column>
              <!-- 阅片人（R2） -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r2')" min-width="100"
-                show-overflow-tooltip v-if="ReadingType === 2">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:r2')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="ReadingType === 2"
+              >
                <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                    <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        2).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.FullName})` }}
                    </el-tag>
                  </div>
                </template>
              </el-table-column>
              <!-- 裁判(AD) -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:ad')" min-width="100"
-                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:ad')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
+              >
                <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                    <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        3).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.FullName})` }}
                    </el-tag>
                  </div>
                </template>
              </el-table-column>
              <!-- 肿瘤阅片人（O1） -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:o1')" min-width="100"
-                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsOncologyReading">
+              <el-table-column
+                prop="SubjectCode"
+                :label="$t('trials:reviewAssign:table:o1')"
+                min-width="100"
+                show-overflow-tooltip
+                v-if="OtherInfo && OtherInfo.IsOncologyReading"
+              >
                <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length"
-                    style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
                    <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
-                        4).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.FullName})` }}
                    </el-tag>
                  </div>
                </template>
              </el-table-column>
-              <el-table-column prop="" :label="$t('common:action:action')" width="180" show-overflow-tooltip
-                v-if="hasPermi(['trials:trials-panel:reading:readTaskAllocation:edit'])">
+              <el-table-column
+                prop=""
+                :label="$t('common:action:action')"
+                width="180"
+                show-overflow-tooltip
+                v-if="hasPermi(['trials:trials-panel:reading:readTaskAllocation:edit'])"
+              >
                <template slot-scope="scope">
                  <!-- 手动分配 -->
-                  <el-button circle :disabled="scope.row.NowDoctorUserList.length === 4" icon="el-icon-thumb"
+                  <el-button
+                    circle
+                    :disabled="scope.row.NowDoctorUserList.length === 4"
+                    icon="el-icon-thumb"
                    :title="$t('trials:reviewAssign:tableAction:manualAssignment')"
-                    @click="manualAllocation(scope.row)" />
+                    @click="manualAllocation(scope.row)"
+                  />
                  <!-- 清除阅片人 -->
-                  <el-button circle :disabled="scope.row.NowDoctorUserList.length === 0" icon="el-icon-close"
-                    :title="$t('trials:reviewAssign:tableAction:clearReaders')" @click="openClearAudience(scope.row)" />
+                  <el-button
+                    circle
+                    :disabled="scope.row.NowDoctorUserList.length === 0"
+                    icon="el-icon-close"
+                    :title="$t('trials:reviewAssign:tableAction:clearReaders')"
+                    @click="openClearAudience(scope.row)"
+                  />
                  <!-- 查看取消历史 -->
-                  <el-button circle icon="el-icon-document-copy"
+                  <el-button
+                    circle
+                    icon="el-icon-document-copy"
                    :title="$t('trials:reviewAssign:tableAction:viewHistory')"
-                    @click="openSubjectCancelDoctorHistoryList(scope.row)" />
+                    @click="openSubjectCancelDoctorHistoryList(scope.row)"
+                  />
                </template>
              </el-table-column>
            </el-table>
-            <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total"
-              :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+            <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
            <!-- 分配规则 -->
-            <el-dialog :title="$t('trials:reviewAssign:dialog:allocationRules')" :visible.sync="AllocationConfigVisible"
-              width="1400px" :close-on-click-modal="false" custom-class="base-dialog-wrapper">
+            <el-dialog
+              :title="$t('trials:reviewAssign:dialog:allocationRules')"
+              :visible.sync="AllocationConfigVisible"
+              width="1400px"
+              :close-on-click-modal="false"
+              custom-class="base-dialog-wrapper"
+            >
              <div class="base-dialog-body" style="position: relative;">
                <!-- 阅片人列表 -->
                <el-divider content-position="left" style="margin-bottom: 40px;">
-                  {{ $t('trials:reviewAssign:allocationRules:title:readersList') }}
+                  {{$t('trials:reviewAssign:allocationRules:title:readersList')}}
                </el-divider>
-                <el-form style="margin-top: 40px" ref="signForm" size="small" label-width="0px">
+                <el-form
+                  style="margin-top: 40px"
+                  ref="signForm"
+                  size="small"
+                  label-width="0px"
+                >
                  <el-form-item>
-                    <el-table v-loading="loading" border :data="TaskAllocationRuleList" stripe>
-                      <!-- 阅片人 -->
-                      <el-table-column prop="DoctorUser.UserName"
-                        :label="$t('trials:reviewAssign:allocationRules:table:reader')" min-width="180"
-                        show-overflow-tooltip>
+                    <el-table
+                      v-loading="loading"
+                      border
+                      :data="TaskAllocationRuleList"
+                      stripe
+                    >
+                    <!-- 阅片人 -->
+                      <el-table-column
+                        prop="DoctorUser.UserName"
+                        :label="$t('trials:reviewAssign:allocationRules:table:reader')"
+                        min-width="180"
+                        show-overflow-tooltip
+                      >
                        <template slot-scope="scope">
                          {{ `${scope.row.DoctorUser.UserName}(${scope.row.DoctorUser.FullName})` }}
                        </template>
                      </el-table-column>
                      <!-- 计划受试者数量 -->
-                      <el-table-column prop="PlanSubjectCount"
-                        :label="$t('trials:reviewAssign:allocationRules:table:plannedCount')" min-width="130"
-                        show-overflow-tooltip />
+                      <el-table-column
+                        prop="PlanSubjectCount"
+                        :label="$t('trials:reviewAssign:allocationRules:table:plannedCount')"
+                        min-width="130"
+                        show-overflow-tooltip
+                      />
                      <!-- 阅片类型 -->
-                      <el-table-column prop="ReadingCategorys"
+                      <el-table-column
+                        prop="ReadingCategorys"
                        :label="$t('trials:reviewAssign:allocationRules:table:readingType')"
-                        :width="360 * TrialReadingCriterionList.length" show-overflow-tooltip>
-                        <template v-for="ite of TrialReadingCriterionList">
-                          <el-table-column :label="ite.TrialReadingCriterionName" :key="ite.TrialReadingCriterionId"
-                            v-if="TrialReadingCriterionId === ite.TrialReadingCriterionId" width="260"
-                            show-overflow-tooltip>
-                            <template slot-scope="scope">
-                              <span
-                                v-for="item of scope.row.CriterionCategoryList.find(v => { return v.TrialReadingCriterionId === ite.TrialReadingCriterionId }) ? scope.row.CriterionCategoryList.find(v => { return v.TrialReadingCriterionId === ite.TrialReadingCriterionId }).ReadingCategorys : []"
-                                :key="item">
-                                <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' +
-                                  $fd('ReadingCategory', 2) }}</el-tag>
-                                <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
-                                <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
-                                <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
-                              </span>
-                            </template>
-                          </el-table-column>
-                        </template>
+                        :width="360 * TrialReadingCriterionList.length"
+                        show-overflow-tooltip
+                      >
+                        <el-table-column
+                          v-for="ite of TrialReadingCriterionList"
+                          :label="ite.TrialReadingCriterionName"
+                          :key="ite.TrialReadingCriterionId"
+                          width="260"
+                          show-overflow-tooltip
+                        >
+                          <template slot-scope="scope">
+                        <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []"  :key="item">
+                          <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
+                          <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
+                          <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
+                          <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
+                        </span>
+                          </template>
+                        </el-table-column>
                      </el-table-column>
                      <!-- 状态 -->
-                      <el-table-column prop="IsEnable" :label="$t('trials:reviewAssign:allocationRules:table:status')"
-                        min-width="80" show-overflow-tooltip>
+                      <el-table-column
+                        prop="IsEnable"
+                        :label="$t('trials:reviewAssign:allocationRules:table:status')"
+                        min-width="80"
+                        show-overflow-tooltip
+                      >
                        <template slot-scope="scope">
-                          <el-tag v-if="!scope.row.IsEnable" type="danger">{{ $fd('IsEnable', scope.row.IsEnable)
-                          }}</el-tag>
+                          <el-tag v-if="!scope.row.IsEnable" type="danger">{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
                          <el-tag v-else>{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
                        </template>
                      </el-table-column>
                      <!-- 备注 -->
-                      <el-table-column prop="Note" :label="$t('trials:reviewAssign:allocationRules:table:remark')"
-                        min-width="100" show-overflow-tooltip />
-                      <el-table-column fixed="right" :label="$t('common:action:action')" width="80">
+                      <el-table-column
+                        prop="Note"
+                        :label="$t('trials:reviewAssign:allocationRules:table:remark')"
+                        min-width="100"
+                        show-overflow-tooltip
+                      />
+                      <el-table-column
+                        fixed="right"
+                        :label="$t('common:action:action')"
+                        width="80"
+                      >
                        <template slot-scope="scope">
                          <!-- 编辑 -->
-                          <el-button circle icon="el-icon-edit-outline" :title="$t('common:button:edit')"
-                            @click="addOrEdit(scope.row)" />
+                          <el-button
+                            circle
+                            icon="el-icon-edit-outline"
+                            :title="$t('common:button:edit')"
+                            @click="addOrEdit(scope.row)"
+                          />
                        </template>
                      </el-table-column>
                    </el-table>
                  </el-form-item>
                  <!-- 后续分配规则 -->
                  <el-divider content-position="left">
-                    {{ $t('trials:reviewAssign:allocationRules:title:subsequentAllocationRules') }}
+                    {{$t('trials:reviewAssign:allocationRules:title:subsequentAllocationRules')}}
                  </el-divider>
                  <el-descriptions class="margin-top" :column="1">
                    <el-descriptions-item>
                      <template slot="label">
                        <el-checkbox v-model="TrialTaskInfo.IsFollowVisitAutoAssign" disabled>
                          <!-- 同一病例随访阅片任务自动分配（在拟分配的阅片人未标记为退出项目状态时）默认状态 -->
-                          {{ $t('trials:reviewAssign:allocationRules:message1') }} {{ $fd('AutoAssignDefaultState',
-                            TrialTaskInfo.FollowVisitAutoAssignDefaultState) }} </el-checkbox>
+                          {{$t('trials:reviewAssign:allocationRules:message1')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowVisitAutoAssignDefaultState)}} </el-checkbox>
                      </template>
                      <div style="margin-left: 10px;">
                      </div>
@@ -284,8 +386,7 @@
                      <template slot="label">
                        <el-checkbox v-model="TrialTaskInfo.IsFollowGlobalVisitAutoAssign" disabled>
                          <!-- 同一病例全局任务自动分配（在拟分配的阅片人未标记为退出项目状态时 默认状态 -->
-                          {{ $t('trials:reviewAssign:allocationRules:message3') }} {{ $fd('AutoAssignDefaultState',
-                            TrialTaskInfo.FollowGlobalVisitAutoAssignDefaultState) }} </el-checkbox>
+                          {{$t('trials:reviewAssign:allocationRules:message3')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowGlobalVisitAutoAssignDefaultState)}} </el-checkbox>
                      </template>
                      <div style="margin-left: 10px;">

@@ -295,8 +396,7 @@
                      <template slot="label">
                        <el-checkbox v-model="TrialTaskInfo.IsFollowJudgeTaskAutoAssign" disabled>
                          <!-- 同一病例第二次裁判任务自动分配（在拟分配的阅片人未标记为退出项目状态时）默认状态 -->
-                          {{ $t('trials:reviewAssign:allocationRules:message4') }} {{ $fd('AutoAssignDefaultState',
-                            TrialTaskInfo.FollowJudgeTaskAutoAssignDefaultState) }} </el-checkbox>
+                          {{$t('trials:reviewAssign:allocationRules:message4')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowJudgeTaskAutoAssignDefaultState)}} </el-checkbox>
                      </template>
                      <div style="margin-left: 10px;" />
                    </el-descriptions-item>
@@ -305,7 +405,12 @@
              </div>
              <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
                <!-- 取消 -->
-                <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancel">
+                <el-button
+                  :disabled="btnLoading"
+                  size="small"
+                  type="primary"
+                  @click="handleCancel"
+                >
                  {{ $t('common:button:cancel') }}
                </el-button>
                <!-- 保存 -->
@@ -314,47 +419,72 @@
                </el-button>
              </div>
            </el-dialog>
-            <el-dialog v-if="taskAllocationRuleVisible" :title="title" :visible.sync="taskAllocationRuleVisible"
-              width="600px" :close-on-click-modal="false">
-              <AddOrEditTaskAllocationRule :data="rowData" :TaskAllocationRuleList="TaskAllocationRuleList"
-                :doctor-user-list="DoctorUserList" @close="() => { taskAllocationRuleVisible = false }"
-                @getList="openAllocationConfigVisible" />
+            <el-dialog
+              v-if="taskAllocationRuleVisible"
+              :title="title"
+              :visible.sync="taskAllocationRuleVisible"
+              width="600px"
+              :close-on-click-modal="false"
+            >
+              <AddOrEditTaskAllocationRule :data="rowData" :TaskAllocationRuleList="TaskAllocationRuleList" :doctor-user-list="DoctorUserList" @close="() => {taskAllocationRuleVisible = false}" @getList="openAllocationConfigVisible" />
            </el-dialog>
            <!--分配阅片人  -->
-            <el-dialog v-if="manualAllocationVisible" :title="$t('trials:reviewAssign:dialog:assignReader')"
-              :visible.sync="manualAllocationVisible" width="1320px" :close-on-click-modal="false">
-              <ManualAllocationTable :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"
-                :reading-type="ReadingType" :SubjectAssignSelectList="SubjectAssignSelectList"
-                @close="() => { manualAllocationVisible = false }" @getList="getList"></ManualAllocationTable>
+            <el-dialog
+              v-if="manualAllocationVisible"
+              :title="$t('trials:reviewAssign:dialog:assignReader')"
+              :visible.sync="manualAllocationVisible"
+              width="1320px"
+              :close-on-click-modal="false"
+            >
+              <ManualAllocationTable :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :reading-type="ReadingType" :SubjectAssignSelectList="SubjectAssignSelectList" @close="() => {manualAllocationVisible = false}" @getList="getList"></ManualAllocationTable>
            </el-dialog>
            <!-- 清除阅片人 -->
-            <el-dialog v-if="ClearAudienceVisible" :title="$t('trials:reviewAssign:dialog:clearReader')"
-              :visible.sync="ClearAudienceVisible" width="500px" :close-on-click-modal="false">
-              <ClearAudienceList :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"
-                @close="() => { ClearAudienceVisible = false }" @getList="getList"></ClearAudienceList>
+            <el-dialog
+              v-if="ClearAudienceVisible"
+              :title="$t('trials:reviewAssign:dialog:clearReader')"
+              :visible.sync="ClearAudienceVisible"
+              width="500px"
+              :close-on-click-modal="false"
+            >
+              <ClearAudienceList :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"  @close="() => {ClearAudienceVisible = false}" @getList="getList"></ClearAudienceList>
            </el-dialog>
            <!-- 访视/全局/肿瘤学阅片任务 : 裁判阅片任务 -->
-            <el-dialog v-if="AllocationVisible"
+            <el-dialog
+              v-if="AllocationVisible"
              :title="AllocationType === 'task' ? $t('trials:reviewAssign:button:visitReadingTasks') : $t('trials:reviewAssign:button:adReadingTasks')"
-              :visible.sync="AllocationVisible" :fullscreen="true" :close-on-click-modal="false">
-              <taskAllacation :trialReadingCriterionId="TrialReadingCriterionId"
-                :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode"
-                v-if="AllocationType === 'task'"></taskAllacation>
-              <refereeAllacation :trialReadingCriterionId="TrialReadingCriterionId"
-                :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode"
-                v-else>
-              </refereeAllacation>
+              :visible.sync="AllocationVisible"
+              :fullscreen="true"
+              :close-on-click-modal="false"
+            >
+              <taskAllacation :trialReadingCriterionId="TrialReadingCriterionId" :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode" v-if="AllocationType === 'task'"></taskAllacation>
+              <refereeAllacation :trialReadingCriterionId="TrialReadingCriterionId" :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode" v-else></refereeAllacation>
            </el-dialog>
            <!-- 取消历史 -->
-            <el-dialog v-if="SubjectCancelDoctorHistoryVisible" :title="$t('trials:reviewAssign:dialog:cancelHistory')"
-              :visible.sync="SubjectCancelDoctorHistoryVisible" width="800px" :close-on-click-modal="false">
-              <el-table border :data="SubjectCancelDoctorHistoryList" stripe>
-                <!-- 取消时间 -->
-                <el-table-column prop="CreateTime" :label="$t('trials:reviewAssign:cancelHistory:table:cancelTime')"
-                  width="180" show-overflow-tooltip />
+            <el-dialog
+              v-if="SubjectCancelDoctorHistoryVisible"
+              :title="$t('trials:reviewAssign:dialog:cancelHistory')"
+              :visible.sync="SubjectCancelDoctorHistoryVisible"
+              width="800px"
+              :close-on-click-modal="false"
+            >
+              <el-table
+                border
+                :data="SubjectCancelDoctorHistoryList"
+                stripe
+              >
+              <!-- 取消时间 -->
+                <el-table-column
+                  prop="CreateTime"
+                  :label="$t('trials:reviewAssign:cancelHistory:table:cancelTime')"
+                  width="180"
+                  show-overflow-tooltip
+                />
                <!-- 原因 -->
-                <el-table-column prop="Note" :label="$t('trials:reviewAssign:cancelHistory:table:cancelReason')"
-                  show-overflow-tooltip />
+                <el-table-column
+                  prop="Note"
+                  :label="$t('trials:reviewAssign:cancelHistory:table:cancelReason')"
+                  show-overflow-tooltip
+                />
              </el-table>
            </el-dialog>
          </div>
@@ -387,8 +517,8 @@ const searchDataDefault = () => {
    IsHaveAssigned: null,
    IsAssignConfirmed: null,
    TrialReadingCriterionId: null,
-    SubjectAllocateState: null,
-    ArmList: []
+    SubjectAllocateState:null,
+    ArmList:[]
  }
 }
 const taskSearchDataDefault = () => {
@@ -409,8 +539,8 @@ const taskSearchDataDefault = () => {
    TaskAllocationState: null,
    BeginAllocateDate: null,
    EndAllocateDate: null,
-    SubjectAllocateState: null,
-    ArmList: []
+    SubjectAllocateState:null,
+    ArmList:[]
  }
 }
 export default {
@@ -477,7 +607,7 @@ export default {
    }
  },
  watch: {
-    TrialReadingCriterionId(v) {
+    TrialReadingCriterionId (v) {
      if (v) {
        this.getList()
      }
@@ -501,10 +631,10 @@ export default {
      getTrialCriterionList(this.trialId).then(res => {
        this.trialCriterionList = res.Result
        this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
-      }).catch(() => { })
+      }).catch(() => {})
    },
    openSubjectCancelDoctorHistoryList(row) {
-      getSubjectCancelDoctorHistoryList(row.SubjectId, this.TrialReadingCriterionId).then((res) => {
+      getSubjectCancelDoctorHistoryList(row.SubjectId,this.TrialReadingCriterionId).then((res) => {
        this.SubjectCancelDoctorHistoryVisible = true
        this.SubjectCancelDoctorHistoryList = res.Result
      })
@@ -516,7 +646,7 @@ export default {
      this.AllocationSubjectCode = SubjectCode
    },
    openClearAudience(row) {
-      this.rowData = { ...row }
+      this.rowData = {...row}
      this.ClearAudienceVisible = true
    },
    findDoctorUser(list, type) {
@@ -680,7 +810,7 @@ export default {
      if (this.TaskAllocationRuleSelectList.length !== num) {
        // 当前阅片模式为xxx，请选择正确阅片人数量
        var msg = this.$t('trials:reviewAssign:message:message08')
-        msg = msg.replaceAll('xxx', this.$fd('ReadingMethod', this.ReadingType))
+        msg = msg.replaceAll('xxx',this.$fd('ReadingMethod', this.ReadingType))
        this.$alert(msg)
        return
      }
@@ -772,7 +902,7 @@ export default {
    handleDelete(row) {
      // 确定要删除${row.DoctorUser.UserName}(${row.DoctorUser.FullName})的任务分配规则?
      var msg = this.$t('trials:reviewAssign:message:message11')
-      msg = msg.replaceAll('xxx', `${row.DoctorUser.UserName}(${row.DoctorUser.FullName})`)
+        msg = msg.replaceAll('xxx',`${row.DoctorUser.UserName}(${row.DoctorUser.FullName})`)
      this.$confirm(msg, {
        type: 'warning',
        distinguishCancelAndClose: true
@@ -817,7 +947,7 @@ export default {
      this.loading = true
      getTaskAllocationRuleList({
        TrialId: this.$route.query.trialId
-      }).then(async (res) => {
+      }).then(async(res) => {
        this.taskSearchData.TrialId = this.$route.query.trialId
        var params = Object.assign({}, this.taskSearchData)
        var SubjectAssignListRes = await getSubjectAssignList(params)
@@ -883,35 +1013,30 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.read-task-allocation {
-  ::v-deep.search {
-    padding: 0px !important;
+  .read-task-allocation{
+    ::v-deep.search {
+      padding: 0px !important;
+    }
+  }
+  ::v-deep .hidden-row{
+    display: none;
+  }
+  ::v-deep .el-dialog__body {
+    padding: 15px 20px;
  }
-}

-::v-deep .hidden-row {
-  display: none;
-}
-
-::v-deep .el-dialog__body {
-  padding: 15px 20px;
-}
-
-::v-deep .el-tag--danger.el-tag--dark {
-  // background-color: #f56c6c!important;
-  border-color: none !important;
-  // color: #fff!important;
-}
-
-::v-deep #TaskAllocationRuleList thead .el-checkbox__inner {
-  display: none;
-}
-
-::v-deep .el-descriptions-item__label.has-colon:after {
-  display: none;
-}
-
-::v-deep .base-dialog-wrapper .base-dialog-body {
-  max-height: 1000px;
-}
+  ::v-deep .el-tag--danger.el-tag--dark {
+    // background-color: #f56c6c!important;
+    border-color: none!important;
+    // color: #fff!important;
+  }
+  ::v-deep #TaskAllocationRuleList thead .el-checkbox__inner{
+    display: none;
+  }
+  ::v-deep .el-descriptions-item__label.has-colon:after{
+    display: none;
+  }
+  ::v-deep .base-dialog-wrapper .base-dialog-body{
+    max-height: 1000px;
+  }
 </style>
@@ -45,7 +45,7 @@
          <el-input 
            v-model="scope.row.CDISCCode"
            size="mini"
-            :disabled="scope.row.HasChildren || (scope.row.IsTableQuestion && exportInfo.CriterionType !== 0)"
+            :disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
            v-show="!scope.row.IsGroup || !scope.row.HasChildren"
          >
          </el-input>
@@ -68,7 +68,7 @@ export default {
  data() {
    return {
      loading: false,
-      exportInfo: {}
+      exportInfo: []
    }
  },
  mounted() {
@@ -152,8 +152,7 @@ export default {
      } else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
        // 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
        return true
-      } else if (item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0))) {
-        // else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion))
+      } else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion)) {
        // CDISC导出不能配置表格问题
        return true
      } else if (item.Code === 2 && row.HasChildren) {
@@ -205,10 +205,6 @@
              {{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
            </span>
            <span v-else>{{ scope.row.SubjectCode }}</span>
-            <!-- 终止 -->
-            <span v-if="scope.row.IsSubjectQuit" class="status-primary-circle">
-              {{ $t('trials:crcUpload:label:ISQ') }}
-            </span>
          </template>
        </el-table-column>
        <!-- 任务名称 -->
@@ -253,7 +249,7 @@
        <!-- 阅片人 -->
        <el-table-column prop="UserName" :label="$t('trials:reviewTrack:table:reader')" width="130" sortable="custom"
          show-overflow-tooltip>
-          <template v-if="scope.row.TaskAllocationState" slot-scope="scope">
+          <template v-if="scope.row.UserName" slot-scope="scope">
            <span v-if="viewStatus">{{ scope.row.UserName }}</span>
            <span v-else>{{ scope.row.UserName }}({{ scope.row.FullName }})</span>
          </template>
@@ -340,29 +336,27 @@
        <el-table-column fixed="right" :label="$t('common:action:action')" width="220">
          <template slot-scope="scope">
            <!-- 查看阅片结果 -->
-            <el-button :disabled="scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit" icon="el-icon-view"
-              circle :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
+            <el-button :disabled="scope.row.ReadingTaskState !== 2" icon="el-icon-view" circle
+              :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
            <!-- 申请重阅 -->
            <el-button :disabled="scope.row.ReadingCategory !== 1 ||
              (scope.row.TaskState !== 0 && scope.row.TaskState !== 5) ||
              scope.row.ReadingTaskState !== 2 ||
              scope.row.ReReadingApplyState === 2 ||
              scope.row.ReReadingApplyState === 4 ||
-              scope.row.ReReadingApplyState === 5 || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)
+              scope.row.ReReadingApplyState === 5
              " v-if="
                hasPermi(['trials:trials-panel:readingTracking:edit']) && !isDoc
              " icon="el-icon-collection" circle :title="$t('trials:reviewTrack:action:applyReread')"
              @click="openApplyReReading(scope.row)" />
            <!-- 退回重阅历史 -->
-            <el-button
-              :disabled="!scope.row.ReReadingApplyState || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)"
-              icon="el-icon-toilet-paper" v-if="!isDoc" circle
+            <el-button :disabled="!scope.row.ReReadingApplyState" icon="el-icon-toilet-paper" v-if="!isDoc" circle
              :title="$t('trials:reviewTrack:action:backToRereadHistory')" @click="reReadingHistory(scope.row, 1)" />
            <!-- 退回 -->
            <el-button :disabled="scope.row.ReadingTaskState === 2 ||
              scope.row.ReadingCategory !== 1 ||
              scope.row.TaskState !== 0 ||
-              scope.row.IsManualGeneration || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)
+              scope.row.IsManualGeneration
              " v-if="
                hasPermi(['trials:trials-panel:readingTracking:edit']) && !isDoc
              " icon="el-icon-back" circle :title="$t('trials:reviewTrack:action:back')"
@@ -381,12 +375,6 @@
      <!-- 分页组件 -->
      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
        @pagination="getList" />
-      <div class="remark">
-        <span class="status-primary-circle">
-          {{ $t('trials:crcUpload:label:ISQ') }}
-        </span>
-        <span>: {{ $t('trials:crcUpload:label:IsSubjectQuit') }}</span>
-      </div>
      <!-- 阅片任务规则 -->
      <el-dialog title="阅片任务规则" :visible.sync="ReadingRulesVisible" width="500px" :close-on-click-modal="false"
        custom-class="base-dialog-wrapper">
@@ -1385,25 +1373,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.remark {
-  position: absolute;
-  left: 5px;
-  bottom: 7px;
-  font-size: 12px;
-}
-
-.status-primary-circle {
-  display: inline-block;
-  width: 20px;
-  height: 20px;
-  text-align: center;
-  line-height: 18px;
-  border-radius: 50%;
-  border: 1px solid #f56c6c;
-  color: #f56c6c;
-  font-size: 10px;
-}
-
 .title {
  line-height: 40px;
  font-weight: bold;
@@ -230,7 +230,7 @@
          sortable="custom"
          show-overflow-tooltip
        >
-          <template v-if="scope.row.TaskAllocationState" slot-scope="scope">
+          <template v-if="scope.row.UserName" slot-scope="scope">
            {{ `${scope.row.UserName}(${scope.row.FullName})` }}
          </template>
        </el-table-column>
@@ -1,17 +1,36 @@
 <template>
  <div v-loading="loading" class="ecrf-list-container">
-    <el-form v-if="taskInfo" ref="questions" size="small" :model="questionForm" class="ecrf-form">
-      <template v-if="taskInfo.CriterionType === 16">
-        <FormItem v-for="question of questions" :key="question.Id" :question="question" :question-form="questionForm"
-          :reading-task-state="readingTaskState" :visit-task-id="visitTaskId" :calculation-list="calculationList"
-          @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
-      </template>
-      <template v-else>
-        <QuestionFormItem v-for="question of questions" :key="question.Id" :visit-task-id="visitTaskId"
-          :question="question" :question-form="questionForm" :reading-task-state="readingTaskState"
-          :criterion-id="criterionId" :calculation-list="calculationList" :is-baseline="isBaseline"
-          @resetFormItemData="resetFormItemData" @setFormItemData="setFormItemData" />
-      </template>
+    <el-form
+      v-if="taskInfo"
+      ref="questions"
+      size="small"
+      :model="questionForm"
+      class="ecrf-form"
+    >
+      <!-- <FormItem
+        v-for="question of questions"
+        :key="question.Id"
+        :question="question"
+        :question-form="questionForm"
+        :reading-task-state="readingTaskState"
+        :visit-task-id="visitTaskId"
+        :calculation-list="calculationList"
+        @setFormItemData="setFormItemData"
+        @resetFormItemData="resetFormItemData"
+      /> -->
+      <QuestionFormItem
+        v-for="question of questions"
+        :key="question.Id"
+        :visit-task-id="visitTaskId"
+        :question="question"
+        :question-form="questionForm"
+        :reading-task-state="readingTaskState"
+        :criterion-id="criterionId"
+        :calculation-list="calculationList"
+        :is-baseline="isBaseline"
+        @resetFormItemData="resetFormItemData"
+        @setFormItemData="setFormItemData"
+      />

      <el-form-item v-if="readingTaskState < 2">
        <div style="text-align:center;">
@@ -29,11 +48,16 @@
    </el-form>

    <!-- 签名框 -->
-    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-      custom-class="base-dialog-wrapper">
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
      <div slot="title">
        <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
      </div>
      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
    </el-dialog>
@@ -48,15 +72,14 @@ import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import store from '@/store'
 import { mapGetters } from 'vuex'
-import FormItem from './FormItem'
+// import FormItem from './FormItem'
 import QuestionFormItem from '@/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem'
 import SignForm from '@/views/trials/components/newSignForm'
 export default {
  name: 'EcrfList',
  components: {
    QuestionFormItem,
-    SignForm,
-    FormItem
+    SignForm
  },
  props: {
    visitTaskInfo: {
@@ -81,8 +104,7 @@ export default {
      classArr: [],
      calculationList: [],
      taskInfo: null,
-      isBaseline: false,
-      digitPlaces: 2
+      isBaseline: false
    }
  },
  computed: {
@@ -113,8 +135,6 @@ export default {
  mounted() {
    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
    this.isBaseline = this.taskInfo.IsBaseLine
-    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
-    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
  },
  methods: {
    async getQuestions(visitTaskId) {
@@ -193,7 +213,7 @@ export default {
      try {
        var answers = []
        for (const k in this.questionForm) {
-          if (this.questionForm[k] instanceof Array) { } else {
+          if (this.questionForm[k] instanceof Array) {} else {
            answers.push({ id: k, answer: this.questionForm[k] })
          }
        }
@@ -306,7 +326,7 @@ export default {
            const o = list.find(v => {
              return (
                parseFloat(obj.val) >= parseFloat(v.gt) &&
-                parseFloat(obj.val) < parseFloat(v.lt)
+                  parseFloat(obj.val) < parseFloat(v.lt)
              )
            })
            answer = o ? o.label : null
@@ -324,17 +344,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.ecrf-list-container {
-  min-height: 400px;
+.ecrf-list-container{
+  min-height:400px;
  color: #ddd;
-
-  .ecrf-form {
-    ::v-deep .el-form-item__label {
+  .ecrf-form{
+    ::v-deep .el-form-item__label{
      color: #ddd;
    }

  }
-
  ::v-deep .el-table,
  .el-table__expanded-cell {
    background-color: #000;
@@ -348,43 +366,35 @@ export default {
    color: #fff;
    border-color: #444444;
  }
-
-  ::v-deep .el-table__body tr>td {
+  ::v-deep .el-table__body tr > td {
    background-color: #000 !important;
    color: #fff;
    border-color: #444444;
  }
-
-  ::v-deep .el-table__body tr:hover>td {
+  ::v-deep .el-table__body tr:hover > td {
    background-color: #858282 !important;
    color: #fff;
    border-color: #444444;
  }
-
  ::v-deep .el-table--border th.gutter:last-of-type {
    border: none;
  }
-
-  ::v-deep .el-dialog {
+  ::v-deep .el-dialog{
    background: #1e1e1e;
    border: 1px solid #ddd;
    color: #ddd;
-
-    .el-dialog__title {
-      color: #fff;
+    .el-dialog__title{
+      color:#fff;
    }
-
-    .el-input .el-input__inner {
+    .el-input .el-input__inner{
      background-color: transparent;
      color: #ddd;
      border: 1px solid #5e5e5e;
    }
-
-    .el-input.is-disabled .el-input__inner {
+    .el-input.is-disabled .el-input__inner{
      background-color: #646464a1;
    }
-
-    .el-form-item__label {
+    .el-form-item__label{
      color: #dfdfdf
    }
  }
@@ -17,26 +17,52 @@
          </el-dropdown>
        </div>
        <!-- 缩放 -->
-        <div :class="['tool-item', activeTool === 'Zoom' ? 'tool-item-active' : '']"
-          :title="$t('trials:reading:button:zoom')" @click.prevent="setToolActive('Zoom')">
+        <div
+          :class="['tool-item', activeTool === 'Zoom' ? 'tool-item-active' : '']"
+          :title="$t('trials:reading:button:zoom')"
+          @click.prevent="setToolActive('Zoom')"
+        >
          <svg-icon icon-class="magnifier" class="svg-icon" />
        </div>
        <!-- 移动 -->
-        <div :class="['tool-item', activeTool === 'Pan' ? 'tool-item-active' : '']"
-          :title="$t('trials:reading:button:move')" @click.prevent="setToolActive('Pan')">
+        <div
+          :class="['tool-item', activeTool === 'Pan' ? 'tool-item-active' : '']"
+          :title="$t('trials:reading:button:move')"
+          @click.prevent="setToolActive('Pan')"
+        >
          <svg-icon icon-class="move" class="svg-icon" />
        </div>
        <!-- 旋转 -->
-        <div :class="['tool-item', activeTool === 'PlanarRotate' ? 'tool-item-active' : '']"
-          :title="$t('trials:reading:button:rotate')" @click.prevent="setToolActive('PlanarRotate')">
+        <div
+          :class="['tool-item', activeTool === 'PlanarRotate' ? 'tool-item-active' : '']"
+          :title="$t('trials:reading:button:rotate')"
+          @click.prevent="setToolActive('PlanarRotate')"
+        >
          <svg-icon icon-class="rotate" class="svg-icon" />
        </div>
-        <div v-for="tool in tools" :key="tool.toolName"
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === tool.toolName ? 'tool-item-active' : '']"
-          :style="{ cursor: tool.isDisabled ? 'not-allowed' : 'pointer' }"
-          :title="tool.disabledReason ? tool.disabledReason : $t(`${tool.i18nKey}`)"
-          @click.prevent="setAnnotateToolActive(tool.toolName)">
-          <svg-icon :icon-class="tool.icon" class="svg-icon" />
+        <!-- 箭头工具 -->
+        <div
+          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'ArrowAnnotate' ? 'tool-item-active' : '']"
+          :title="$t('trials:reading:button:arrowAnnotate')"
+          @click.prevent="setAnnotateToolActive('ArrowAnnotate')"
+        >
+          <svg-icon icon-class="arrow" class="svg-icon" />
+        </div>
+        <!-- 矩形工具 -->
+        <div
+          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'RectangleROI' ? 'tool-item-active' : '']"
+          :title="$t('trials:dicom-show:RectangleRoi')"
+          @click.prevent="setAnnotateToolActive('RectangleROI')"
+        >
+          <svg-icon icon-class="rectangle" class="svg-icon" />
+        </div>
+        <!-- 自由曲线 -->
+        <div
+          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'PlanarFreehandROI' ? 'tool-item-active' : '']"
+          :title="$t('trials:reading:button:planarFreehandROI')"
+          @click.prevent="setAnnotateToolActive('PlanarFreehandROI')"
+        >
+          <svg-icon icon-class="polygon" class="svg-icon" />
        </div>
        <!-- <div
          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'SplineROITool' ? 'tool-item-active' : '']"
@@ -48,14 +74,17 @@

        <div
          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Eraser' ? 'tool-item-active' : '']"
-          :title="$t('trials:dicom-show:Eraser')" @click.prevent="setAnnotateToolActive('Eraser')">
+          :title="$t('trials:dicom-show:Eraser')"
+          @click.prevent="setAnnotateToolActive('Eraser')"
+        >
          <svg-icon icon-class="clear" class="svg-icon" />
        </div>
-        <!--比例尺-->
        <div
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Lengthscale' ? 'tool-item-active' : '']"
-          :title="$t('trials:nondicom-show:scale')" @click.prevent="setAnnotateToolActive('Lengthscale')">
-          <svg-icon icon-class="lengthscale" class="svg-icon" />
+          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Length' ? 'tool-item-active' : '']"
+          :title="$t('trials:nondicom-show:scale')"
+          @click.prevent="setAnnotateToolActive('Length')"
+        >
+          <svg-icon icon-class="length" class="svg-icon" />
        </div>
        <!-- 截图 -->
        <!-- <div
@@ -66,30 +95,13 @@
          <svg-icon icon-class="image" class="svg-icon" />
        </div> -->
        <!-- 重置 -->
-        <div class="tool-item" :title="$t('trials:reading:button:reset')" @click.prevent="resetViewport">
+        <div
+          class="tool-item"
+          :title="$t('trials:reading:button:reset')"
+          @click.prevent="resetViewport"
+        >
          <svg-icon icon-class="refresh" class="svg-icon" />
        </div>
-        <!-- 更多 -->
-        <div v-if="criterionType === 0" :title="$t('trials:reading:button:more')"
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']" @click.stop="showPanel($event)"
-          @mouseleave="toolMouseout">
-          <div class="dropdown">
-            <div class="icon" data-tool="more">
-              <svg-icon icon-class="more" class="svg-icon" />
-              <i class="el-icon-arrow-down" style="color:#fff;" />
-            </div>
-            <div class="dropdown-content">
-              <ul v-if="readingTaskState < 2" style="width:100px;">
-                <li v-for="i in customizeStandardsNoneDicom" :key="i.toolName" style="text-align:left;">
-                  <a href="#" @click.prevent="setAnnotateToolActive(i.toolName)">
-                    <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
-                    {{ $t(i.i18nKey) }}
-                  </a>
-                </li>
-              </ul>
-            </div>
-          </div>
-        </div>
      </div>

      <div>
@@ -99,84 +111,112 @@
    <!-- viewports -->
    <div class="viewports-wrapper">
      <div class="grid-container" :style="gridStyle">
-        <div v-for="(v, index) in viewportInfos" v-show="index < cells.length" :key="index" :style="cellStyle"
+        <div
+          v-for="(v, index) in viewportInfos"
+          v-show="index < cells.length"
+          :key="index"
+          :style="cellStyle"
          :class="['grid-cell', index === activeCanvasIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
-          @dblclick="toggleFullScreen($event, index)" @click="activeCanvas(index)"
-          @mouseup="sliderMouseup($event, index)" @mousemove="sliderMousemove($event, index)"
-          @mouseleave="sliderMouseleave($event, index)">
+          @dblclick="toggleFullScreen($event, index)"
+          @click="activeCanvas(index)"
+          @mouseup="sliderMouseup($event, index)"
+          @mousemove="sliderMousemove($event, index)"
+          @mouseleave="sliderMouseleave($event, index)"
+        >
          <div v-show="imageType.includes(v.fileType)" :ref="`canvas-${index}`" class="content">
            <div class="left-top-text">
-              <div v-if="v.taskInfo.IsExistsClinicalData" class="cd-info"
-                :title="$t('trials:reading:button:clinicalData')">
-                <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon"
-                  @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
+              <div
+                v-if="v.taskInfo.IsExistsClinicalData"
+                class="cd-info"
+                :title="$t('trials:reading:button:clinicalData')"
+              >
+                <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon" @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
              </div>
-              <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
+              <h2
+                v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo"
+                class="subject-info"
+              >
                {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
              </h2>
              <!-- <div v-if="v.currentFileName">{{ v.currentFileName }}</div> -->
            </div>
-            <div v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo" class="top-center-tool">
+            <div
+              v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo"
+              class="top-center-tool"
+            >
              <div class="toggle-visit-container">
-                <div class="arrw_icon"
-                  :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff' : '#6b6b6b' }"
+                <div
+                  class="arrw_icon"
+                  :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff': '#6b6b6b' }"
                  @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, -1, v.index)"
-                  @dblclick.stop="preventDefault($event)">
+                  @dblclick.stop="preventDefault($event)"
+                >
                  <i class="el-icon-caret-left" />
                </div>
                <div class="arrow_text">
                  {{ v.taskInfo.TaskBlindName }}
                </div>
-                <div class="arrw_icon"
-                  :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff' : '#6b6b6b' }"
+                <div
+                  class="arrw_icon"
+                  :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff': '#6b6b6b' }"
                  @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, 1, v.index)"
-                  @dblclick.stop="preventDefault($event)">
+                  @dblclick.stop="preventDefault($event)"
+                >
                  <i class="el-icon-caret-right" />
                </div>
              </div>
            </div>
            <div :ref="`sliderBox-${index}`" class="right-slider-box" @click.stop="clickSlider($event, index)">
-              <div :style="{ top: v.height + '%' }" class="slider" @click.stop.prevent="() => { return }"
-                @mousedown.stop="sliderMousedown($event, index)" />
+              <div :style="{top: v.height + '%'}" class="slider" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event, index)" />
            </div>
          </div>
-          <div v-show="v.fileType === 'application/pdf' && fullScreenIndex === null" class="content flex_col">
+          <div v-show="v.fileType === 'application/pdf' && fullScreenIndex === null " class="content flex_col">
            <div class="content-top" style="height: 50px;">
              <div class="left-top-text">
-                <div v-if="v.taskInfo.IsExistsClinicalData" class="cd-info"
-                  :title="$t('trials:reading:button:clinicalData')">
-                  <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon"
-                    @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
+                <div
+                  v-if="v.taskInfo.IsExistsClinicalData"
+                  class="cd-info"
+                  :title="$t('trials:reading:button:clinicalData')"
+                >
+                  <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon" @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
                </div>
-                <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
+                <h2
+                  v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo"
+                  class="subject-info"
+                >
                  {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
                </h2>
-                <!-- <div v-if="v.currentFileName">{{ v.currentFileName }}</div> -->
+              <!-- <div v-if="v.currentFileName">{{ v.currentFileName }}</div> -->
              </div>
-              <div v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo" class="top-center-tool">
+              <div
+                v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo"
+                class="top-center-tool"
+              >
                <div class="toggle-visit-container">
-                  <div class="arrw_icon"
-                    :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff' : '#6b6b6b' }"
+                  <div
+                    class="arrw_icon"
+                    :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff': '#6b6b6b' }"
                    @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, -1, v.index)"
-                    @dblclick.stop="preventDefault($event)">
+                    @dblclick.stop="preventDefault($event)"
+                  >
                    <i class="el-icon-caret-left" />
                  </div>
                  <div class="arrow_text">
                    {{ v.taskInfo.TaskBlindName }}
                  </div>
-                  <div class="arrw_icon"
-                    :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff' : '#6b6b6b' }"
+                  <div
+                    class="arrw_icon"
+                    :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff': '#6b6b6b' }"
                    @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, 1, v.index)"
-                    @dblclick.stop="preventDefault($event)">
+                    @dblclick.stop="preventDefault($event)"
+                  >
                    <i class="el-icon-caret-right" />
                  </div>
                </div>
              </div>
            </div>
            <div class="content-main" style="flex: 1;">
-              <iframe v-if="v.currentFilePath" :ref="`iframe-${index}`"
-                :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${v.currentFilePath}?index=${index}`"
-                width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+              <iframe v-if="v.currentFilePath" :ref="`iframe-${index}`" :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${v.currentFilePath}?index=${index}`" width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
            </div>

          </div>
@@ -184,8 +224,14 @@
      </div>
    </div>

-    <el-dialog :title="$t('trials:noneDicom:message:msg2')" :visible.sync="dialogVisible" :close-on-click-modal="false"
-      :close-on-press-escape="false" :show-close="false" width="400px">
+    <el-dialog
+      :title="$t('trials:noneDicom:message:msg2')"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :show-close="false"
+      width="400px"
+    >
      <el-form ref="lengthForm" :model="form" :rules="rules">
        <el-form-item label="" prop="length">
          <el-input v-model="form.length" type="number">
@@ -198,8 +244,13 @@
      </span>
    </el-dialog>

-    <el-dialog v-if="personalConfigDialog.visible" :visible.sync="personalConfigDialog.visible"
-      :close-on-click-modal="false" :title="personalConfigDialog.title" width="600px">
+    <el-dialog
+      v-if="personalConfigDialog.visible"
+      :visible.sync="personalConfigDialog.visible"
+      :close-on-click-modal="false"
+      :title="personalConfigDialog.title"
+      width="600px"
+    >
      <Others />
    </el-dialog>
  </div>
@@ -226,8 +277,6 @@ import store from '@/store'
 import Others from '@/views/trials/trials-panel/reading/dicoms/components/Others'
 const { ViewportType } = Enums
 const renderingEngineId = 'myRenderingEngine'
-import LengthscaleTool from "../tools/LengthscaleTool"
-import { getCustomizeStandardsNoneDicomTools, config } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
 const {
  ToolGroupManager,
  Enums: csToolsEnums,
@@ -240,10 +289,7 @@ const {
  PlanarFreehandROITool,
  SplineROITool,
  EraserTool,
-  LengthTool,
-  EllipticalROITool,
-  CircleROITool,
-  AngleTool
+  LengthTool
  // cursors
 } = cornerstoneTools
 const { MouseBindings, Events: toolsEvents } = csToolsEnums
@@ -292,11 +338,7 @@ export default {
          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
          { pattern: /^\d+$/, message: this.$t('trials:noneDicom:message:msg3'), trigger: ['blur', 'change'] }
        ]
-      },
-
-      customizeStandardsNoneDicom: [],
-      tools: [],
-      criterionType: null
+      }
    }
  },
  computed: {
@@ -347,16 +389,7 @@ export default {
  },
  mounted() {
    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
-    console.log(this.taskInfo, 'this.taskInfo')
    this.readingTaskState = this.taskInfo.ReadingTaskState
-    this.criterionType = this.taskInfo.CriterionType
-    if (this.criterionType === 0) {
-      this.tools = getCustomizeStandardsNoneDicomTools(this.taskInfo.ReadingToolList)
-      const toolNames = this.tools.map(i => i.toolName)
-      this.customizeStandardsNoneDicom = config.customizeStandardsNoneDicom.filter(item => !toolNames.includes(item.toolName))
-    } else {
-      this.tools = config.customizeStandardsNoneDicom
-    }
    if (!this.taskInfo.IsBaseLine && this.taskInfo.IsReadingTaskViewInOrder !== 0) {
      this.rows = 1
      this.cols = 2
@@ -386,12 +419,6 @@ export default {
    window.removeEventListener('message', this.handleIframeMessage)
  },
  methods: {
-    showPanel(e) {
-      e.currentTarget.firstChild.lastChild.style.display = 'block'
-    },
-    toolMouseout(e) {
-      e.currentTarget.firstChild.lastChild.style.display = 'none'
-    },
    // 初始化加载器
    async initLoader() {
      registerWebImageLoader(imageLoader)
@@ -453,14 +480,10 @@ export default {
      cornerstoneTools.addTool(PlanarRotateTool)
      cornerstoneTools.addTool(ArrowAnnotateTool)
      cornerstoneTools.addTool(RectangleROITool)
-      cornerstoneTools.addTool(EllipticalROITool)
-      cornerstoneTools.addTool(CircleROITool)
-      cornerstoneTools.addTool(AngleTool)
      cornerstoneTools.addTool(PlanarFreehandROITool)
      cornerstoneTools.addTool(SplineROITool)
      cornerstoneTools.addTool(EraserTool)
      cornerstoneTools.addTool(LengthTool)
-      cornerstoneTools.addTool(LengthscaleTool)

      viewportIds.forEach((viewportId, i) => {
        const toolGroupId = `canvas-${i}`
@@ -472,10 +495,10 @@ export default {
        toolGroup.addTool(PlanarRotateTool.toolName)
        toolGroup.addTool(ArrowAnnotateTool.toolName, {
          arrowHeadStyle: 'standard',
-          changeTextCallback: async (data, eventData, doneChangingTextCallback) => {
+          changeTextCallback: async(data, eventData, doneChangingTextCallback) => {
            return doneChangingTextCallback(await this.customPrompt())
          },
-          getTextCallback: async (doneChangingTextCallback) => {
+          getTextCallback: async(doneChangingTextCallback) => {
            return doneChangingTextCallback(await this.customPrompt())
          }
        })
@@ -483,15 +506,6 @@ export default {
          cachedStats: false,
          getTextLines: this.getRectangleROIToolTextLines
        })
-        toolGroup.addTool(EllipticalROITool.toolName, {
-          cachedStats: false,
-          getTextLines: this.getEllipticalROIToolTextLines
-        })
-        toolGroup.addTool(CircleROITool.toolName, {
-          cachedStats: false,
-          getTextLines: this.getCircleROIToolTextLines
-        })
-        toolGroup.addTool(AngleTool.toolName)
        toolGroup.addTool(PlanarFreehandROITool.toolName, {
          allowOpenContours: false,
          cachedStats: false,
@@ -508,10 +522,6 @@ export default {
          getTextLines: this.getLengthToolTextLines,
          cachedStats: false
        })
-        toolGroup.addTool(LengthscaleTool.toolName, {
-          getTextLines: this.getLengthscaleToolTextLines,
-          cachedStats: false
-        })

        toolGroup.setToolActive(StackScrollTool.toolName, {
          bindings: [{ mouseButton: MouseBindings.Wheel }]
@@ -522,23 +532,15 @@ export default {
        if (this.readingTaskState < 2) {
          toolGroup.setToolPassive(ArrowAnnotateTool.toolName)
          toolGroup.setToolPassive(RectangleROITool.toolName)
-          toolGroup.setToolPassive(EllipticalROITool.toolName)
-          toolGroup.setToolPassive(CircleROITool.toolName)
-          toolGroup.setToolPassive(AngleTool.toolName)
          toolGroup.setToolPassive(PlanarFreehandROITool.toolName)
          toolGroup.setToolPassive(SplineROITool.toolName)
          toolGroup.setToolPassive(LengthTool.toolName)
-          toolGroup.setToolPassive(LengthscaleTool.toolName)
        } else {
          toolGroup.setToolEnabled(ArrowAnnotateTool.toolName)
          toolGroup.setToolEnabled(RectangleROITool.toolName)
-          toolGroup.setToolEnabled(EllipticalROITool.toolName)
-          toolGroup.setToolEnabled(CircleROITool.toolName)
-          toolGroup.setToolEnabled(AngleTool.toolName)
          toolGroup.setToolEnabled(PlanarFreehandROITool.toolName)
          toolGroup.setToolEnabled(SplineROITool.toolName)
          toolGroup.setToolEnabled(LengthTool.toolName)
-          toolGroup.setToolEnabled(LengthscaleTool.toolName)
        }
        toolGroup.setToolPassive(EraserTool.toolName)
      })
@@ -802,12 +804,12 @@ export default {
          if (this.activeTool) {
            toolGroup.setToolPassive(this.activeTool)
          }
-          if (toolName === 'Lengthscale') {
+          if (toolName === 'Length') {
            const renderingEngine = getRenderingEngine(renderingEngineId)
            const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
            const imageId = viewport.csImage.imageId
            const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
-            const idx = annotations.findIndex(i => i.metadata.referencedImageId === imageId && i.metadata.toolName === 'Lengthscale')
+            const idx = annotations.findIndex(i => i.metadata.referencedImageId === imageId && i.metadata.toolName === 'Length')
            if (idx > -1) {
              this.activeTool = ''
              // 当前图像已存在比例尺！
@@ -872,7 +874,7 @@ export default {
      const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
      const fileList = this.viewportInfos[i].fileList
      const fileIndex = fileList.findIndex(f => f.Path === path)
-      if (annotation.metadata.toolName === 'Lengthscale') {
+      if (annotation.metadata.toolName === 'Length') {
        this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: null })
      }
    },
@@ -891,7 +893,7 @@ export default {
      const fileList = this.viewportInfos[i].fileList
      const fileIndex = fileList.findIndex(f => f.Path === path)
      if (fileIndex === -1) return
-      if (annotation.metadata.toolName === 'Lengthscale') {
+      if (annotation.metadata.toolName === 'Length') {
        const value = annotation.data.l
        if (value) {
          const cachedStats = Object.keys(annotation.data.cachedStats)
@@ -927,7 +929,7 @@ export default {
      const fileList = this.viewportInfos[i].fileList
      const fileIndex = fileList.findIndex(f => f.Path === path)
      if (fileIndex === -1) return
-      if (annotation.metadata.toolName === 'Lengthscale') {
+      if (annotation.metadata.toolName === 'Length') {
        this.form.annotationObj = {
          id: '',
          visitTaskId: this.viewportInfos[i].taskInfo.VisitTaskId,
@@ -994,7 +996,7 @@ export default {
      viewport.render()
      this.dialogVisible = false
    },
-    getLengthscaleToolTextLines(data, targetId) {
+    getLengthToolTextLines(data, targetId) {
      const cachedVolumeStats = data.cachedStats[targetId]
      const { length, unit } = cachedVolumeStats
      if (length === undefined || length === null || isNaN(length)) {
@@ -1011,27 +1013,6 @@ export default {
      }
      return textLines
    },
-    // 直线工具注释
-    getLengthToolTextLines(data, targetId) {
-      const cachedVolumeStats = data.cachedStats[targetId]
-      const { length, unit } = cachedVolumeStats
-      if (length === undefined || length === null || isNaN(length)) {
-        return
-      }
-      let ps = null
-      const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
-      const i = this.psArr.findIndex(i => i.Path === path)
-      if (i > -1 && this.psArr[i].PS) {
-        ps = parseFloat(this.psArr[i].PS).toFixed(3)
-      }
-      const textLines = []
-      if (ps) {
-        textLines.push(`${this.reRound(csUtils.roundNumber(length * ps), this.digitPlaces)} mm`)
-      } else {
-        textLines.push(`${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit}`)
-      }
-      return textLines
-    },
    getPlanarFreehandROIToolTextLines(data, targetId) {
      const cachedVolumeStats = data.cachedStats[targetId]
      const {
@@ -1057,26 +1038,26 @@ export default {
      if (area) {
        const areaLine = isEmptyArea
          ? `Area: Oblique not supported`
-          : `Area: ${ps ? this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces) : this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${ps ? 'mm' + '\xb2' : areaUnit}`
+          : `Area: ${ps ? parseFloat(area * ps * ps).toFixed(this.digitPlaces) : parseFloat(area).toFixed(this.digitPlaces)} ${ps ? 'mm' + '\xb2' : areaUnit}`
        textLines.push(areaLine)
      }
      if (mean) {
-        textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
+        textLines.push(`Mean: ${parseFloat(mean).toFixed(this.digitPlaces)} ${modalityUnit}`)
      }

-      if (max) {
-        textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
+      if (Number.isFinite(max)) {
+        textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
      }

      if (stdDev) {
-        textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
+        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
      }

      if (perimeter) {
        if (ps) {
-          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter * ps), this.digitPlaces)} mm`)
+          textLines.push(`Perimeter: ${parseFloat(perimeter * ps).toFixed(this.digitPlaces)} mm`)
        } else {
-          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter), this.digitPlaces)} ${unit}`)
+          textLines.push(`Perimeter: ${parseFloat(perimeter).toFixed(this.digitPlaces)} ${unit}`)
        }
      }

@@ -1089,7 +1070,6 @@ export default {
    },
    getRectangleROIToolTextLines(data, targetId) {
      const cachedVolumeStats = data.cachedStats[targetId]
-      const points = data.handles.points
      const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats

      if (mean === undefined) {
@@ -1104,104 +1084,20 @@ export default {
        ps = parseFloat(this.psArr[i].PS).toFixed(3)
      }
      if (ps) {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces)} ${'mm' + '\xb2'}`)
+        textLines.push(`Area: ${parseFloat(area * ps * ps).toFixed(this.digitPlaces)} ${'mm' + '\xb2'}`)
      } else {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${areaUnit}`)
-      }
-      textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
-      if (Array.isArray(points) && points.length === 4) {
-        let perimeter = 2 * Math.abs(points[0][0] - points[1][0]) + 2 * Math.abs(points[1][1] - points[2][1])
-        if (perimeter) {
-          if (ps) {
-            textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter * ps), this.digitPlaces)} mm`)
-          } else {
-            textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter), this.digitPlaces)} px`)
-          }
-        }
+        textLines.push(`Area: ${parseFloat(area).toFixed(this.digitPlaces)} ${areaUnit}`)
      }
+
+      textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`)
+      textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
+      textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
+
      return textLines
    },
-    // 椭圆工具注释信息
-    getEllipticalROIToolTextLines(data, targetId) {
-      const cachedVolumeStats = data.cachedStats[targetId]
-      const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats
-
-      if (mean === undefined) {
-        return
-      }
-
-      const textLines = []
-      let ps = null
-      const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
-      const i = this.psArr.findIndex(i => i.Path === path)
-      if (i > -1 && this.psArr[i].PS) {
-        ps = parseFloat(this.psArr[i].PS).toFixed(3)
-      }
-      if (ps) {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces)} ${'mm' + '\xb2'}`)
-      } else {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${areaUnit}`)
-      }
-      textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
-      return textLines
-    },
-    // 圆形工具注释信息
-    getCircleROIToolTextLines(data, targetId) {
-      const cachedVolumeStats = data.cachedStats[targetId]
-      const { area, mean, max, stdDev, perimeter, areaUnit, modalityUnit } = cachedVolumeStats
-
-      if (mean === undefined) {
-        return
-      }
-
-      const textLines = []
-      let ps = null
-      const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
-      const i = this.psArr.findIndex(i => i.Path === path)
-      if (i > -1 && this.psArr[i].PS) {
-        ps = parseFloat(this.psArr[i].PS).toFixed(3)
-      }
-      if (ps) {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces)} ${'mm' + '\xb2'}`)
-      } else {
-        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${areaUnit}`)
-      }
-      textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
-      if (perimeter) {
-        if (ps) {
-          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter * ps), this.digitPlaces)} mm`)
-        } else {
-          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter), this.digitPlaces)} px`)
-        }
-      }
-      return textLines
-    },
-    reRound(result, finalPrecision) {
-      if (typeof result === 'string' && result.includes(', ')) {
-        const numStrs = result.split(', ')
-        const processed = numStrs.map(str => this.processSingle(str, finalPrecision))
-        return processed.join(', ')
-      }
-      return this.processSingle(result, finalPrecision)
-    },
-    processSingle(str, precision) {
-      const num = parseFloat(str)
-      if (isNaN(num)) return 'NaN'
-
-      // 保留原极小值处理逻辑
-      if (Math.abs(num) < 0.0001) return str
-      const factor = 10 ** precision
-      return (Math.round(num * factor + 0.0000001) / factor).toFixed(precision)
-    },
    debounce(callback, delay) {
      let timerId
-      return function () {
+      return function() {
        clearTimeout(timerId)
        timerId = setTimeout(() => {
          callback.apply(this, arguments)
@@ -1311,54 +1207,12 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.content {
-  cursor: default !important;
-}
-
-.dropdown {
-  position: relative;
-  display: inline-block;
-
-  .text {
-    text-align: center;
-  }
-}
-
-.dropdown-content {
-  display: none;
-  position: absolute;
-  background-color: #383838;
-  color: #fff;
-  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
-  z-index: 9999;
-  font-size: 12px;
-
-  ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-    text-align: center;
-
-    li {
-      a {
-        display: block;
-        padding: 5px;
-      }
-    }
-  }
-
-  ul li a:hover {
-    background-color: #727272;
-  }
-}
-
 .none-dicom-viewer {
  display: flex;
  flex-direction: column;
-  width: 100%;
+  width:100%;
  height: 100%;
  user-select: none;
-
  .tools-wrapper {
    height: 50px;
    display: flex;
@@ -1366,7 +1220,6 @@ export default {
    border-bottom: 1px solid #727272;
    color: #ddd;
    padding: 0 5px;
-
    .tools-left {
      flex: 1;
      display: flex;
@@ -1374,7 +1227,6 @@ export default {
      justify-content: flex-start;
      align-items: center;
    }
-
    .tool-item {
      padding: 5px;
      margin: 0 5px;
@@ -1382,19 +1234,15 @@ export default {
      font-size: 20px;
      cursor: pointer;
    }
-
    .tool-item-active {
      background-color: #607d8b;
    }
-
    .tool-disabled {
      cursor: not-allowed;
    }
  }
-
  .viewports-wrapper {
    flex: 1;
-
    .grid-container {
      display: grid;
      height: 100%;
@@ -1403,32 +1251,26 @@ export default {
    }

    .grid-cell {
-      border: 1px dashed #ccc;
-      ;
+      border: 1px dashed #ccc;;
      display: flex;
      align-items: center;
      justify-content: center;
    }
-
    .cell_active {
-      border-color: #fafa00 !important;
+      border-color: #fafa00!important;
    }
-
    .cell-full-screen {
      grid-column: 1 / -1;
      grid-row: 1 / -1;
    }
-
    .flex_col {
      display: flex;
      flex-direction: column;
    }
-
    .content {
      width: 100%;
      height: 100%;
      position: relative;
-
      .left-top-text {
        position: absolute;
        left: 5px;
@@ -1436,31 +1278,26 @@ export default {
        color: #ddd;
        z-index: 1;
        font-size: 12px;
-
        .cd-info {
          color: #ddd;
          font-size: 18px;
        }
-
        .subject-info {
-          color: #f44336;
+          color:#f44336;
          padding: 5px 0px;
          margin: 0;
        }
      }
-
      .top-center-tool {
        position: absolute;
-        left: 50%;
+        left:50%;
        top: 5px;
        transform: translateX(-50%);
        z-index: 1;
-
        .toggle-visit-container {
          display: flex;
        }
-
-        .arrw_icon {
+        .arrw_icon{
          width: 20px;
          height: 20px;
          background-color: #3f3f3f;
@@ -1468,17 +1305,15 @@ export default {
          line-height: 20px;
          border-radius: 10%;
        }
-
-        .arrow_text {
+        .arrow_text{
          height: 20px;
          line-height: 20px;
          background-color: #00000057;
          color: #fff;
-          padding: 0 10px;
+          padding:0 10px;
          font-size: 14px;
        }
      }
-
      .right-slider-box {
        position: absolute;
        right: 1px;
@@ -1490,8 +1325,7 @@ export default {
        z-index: 1;
        cursor: pointer;
      }
-
-      .right-slider-box:after {
+      .right-slider-box:after{
        content: '';
        position: absolute;
        bottom: -20px;
@@ -1500,39 +1334,33 @@ export default {
        width: 100%;
        background: #333;
      }
-
      .slider {
        height: 20px;
        width: 100%;
        position: absolute;
        top: 0;
-        z-index: 10;
+        z-index:10;
        background: #9e9e9e;
        cursor: move
      }
    }
  }
-
-  ::v-deep .el-dialog {
+  ::v-deep .el-dialog{
    background: #1e1e1e;
    border: 1px solid #ddd;
    color: #ddd;
-
-    .el-dialog__title {
-      color: #fff;
+    .el-dialog__title{
+      color:#fff;
    }
-
-    .el-input .el-input__inner {
+    .el-input .el-input__inner{
      background-color: transparent;
      color: #ddd;
      border: 1px solid #5e5e5e;
    }
-
-    .el-input.is-disabled .el-input__inner {
+    .el-input.is-disabled .el-input__inner{
      background-color: #646464a1;
    }
-
-    .el-form-item__label {
+    .el-form-item__label{
      color: #dfdfdf
    }
  }
@@ -264,7 +264,7 @@ export default {
            if (typeof i.MeasureData === 'string') {
              i.MeasureData = JSON.parse(i.MeasureData)
            }
-            if (i.MeasureData.metadata.toolName === 'Lengthscale' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
+            if (i.MeasureData.metadata.toolName === 'Length' && this.psArr.findIndex(p => p.NoneDicomFileId === i.NoneDicomFileId) === -1) {
              this.psArr.push({ NoneDicomFileId: i.NoneDicomFileId, Path: i.Path, PS: i.MeasureData.data.ps })
            }
            return i
@@ -444,9 +444,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  })
                  break
                case 6:
@@ -462,9 +459,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  })
                  break
                case 7:
@@ -480,9 +474,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  })
                  num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
                  break
@@ -551,9 +542,6 @@ export default {

            }
          } else {
-            if (this.questionForm[o.TableQuestionId] === 'NE') {
-              isNE = true
-            }
            switch (rules.CustomCalculateMark) {
              case 1:
                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -1,11 +0,0 @@
-import * as cornerstoneTools from '@cornerstonejs/tools'
-class LengthscaleTool extends cornerstoneTools.LengthTool {
-  static { this.toolName = 'Lengthscale'; }
-  constructor(
-    toolProps,
-    defaultToolProps
-  ) {
-    super(toolProps, defaultToolProps);
-  }
-}
-export default LengthscaleTool;
@@ -1,213 +1,288 @@
 <template>
-    <el-form ref="attachmentFrom" v-loading="loading" :model="form" label-width="190px" size="small" :rules="rules"
-        class="upload-temporary-file">
-        <div class="base-dialog-body">
-            <el-form-item :label="$t('trials:attachment:form:FileName')" prop="Name">
-                <el-input v-model="form.Name" clearable></el-input>
-            </el-form-item>
-            <el-form-item :label="$t('trials:attachment:form:OffLine')" prop="OffLine">
-                <el-switch v-model="form.OffLine" :active-value="true" :inactive-value="false"
-                    :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
-                </el-switch>
-            </el-form-item>
-            <el-form-item :label="$t('trials:attachment:form:File')">
-                <div class="upload-container">
-                    <el-upload class="upload-demo" action :accept="this.accept.join(',')" :before-upload="beforeUpload"
-                        :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
-                        :show-file-list="true" :file-list="fileList" :limit="1" :on-exceed="handleExceed">
-                        <el-button size="small" type="primary" :loading="btnLoading">{{ $t('common:button:check')
-                            }}</el-button>
-                        <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
-                            ({{ $t('trials:signature:label:type').replace("xxx", this.accept.join(", ")) }})
-                        </span>
-                    </el-upload>
-                </div>
-            </el-form-item>
+  <el-form
+    ref="trialAttachmentFrom"
+    v-loading="loading"
+    :model="form"
+    label-width="240px"
+    size="small"
+    :rules="rules"
+    class="upload-temporary-file"
+  >
+    <div class="base-dialog-body">
+      <!-- 文件类型 -->
+      <el-form-item :label="$t('trials:attachment:table:fileType')" prop="FileTypeId">
+        <el-select
+          v-model="form.FileTypeId"
+          style="width:100%;"
+          size="small"
+        >
+          <el-option
+            v-for="item of dictionaryList.Trial_Document"
+            :key="item.Id"
+            :label="item.Value"
+            :value="item.Id"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- 文件 -->
+      <el-form-item :label="$t('trials:attachment:form:file')">
+        <div class="upload-container">
+          <el-upload
+            class="upload-demo"
+            action
+            accept=".pdf"
+            :before-upload="beforeUpload"
+            :http-request="handleUploadFile"
+            :on-remove="handleRemoveFile"
+            :show-file-list="true"
+            :file-list="fileList"
+            :limit="1"
+            :on-exceed="handleExceed"
+            :disabled="form.FileTypeId === ''"
+          >
+            <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || saveBtnLoading" :loading="btnLoading">
+              {{ $t('trials:attachment:button:select') }}
+            </el-button>
+            <span
+              slot="tip"
+              style="margin-left:10px;"
+              class="el-upload__tip"
+            >
+              {{ $t('system:tip:file:pdf') }}
+            </span>
+          </el-upload>
        </div>
-        <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
-            <el-form-item style="text-align: right">
-                <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
-                    :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
-            </el-form-item>
-        </div>
-    </el-form>
+      </el-form-item>
+      <!-- 需要签署的用户类型 -->
+      <el-form-item :label="$t('trials:attachment:table:userType')" prop="NeedConfirmedUserTypeIdList">
+        <el-select
+          v-model="form.NeedConfirmedUserTypeIdList"
+          style="width:100%;"
+          multiple
+        >
+          <el-option
+            v-for="item of userTypeOptions"
+            v-show="item.UserTypeEnum !== 1 && item.UserTypeEnum !== 8 && item.UserTypeEnum !== 20 && item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27 && item.UserTypeEnum !== 31"
+            :key="item.Id"
+            :label="item.UserTypeShortName"
+            :value="item.Id"
+          >
+            <span>{{ item.UserType }}</span>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <!-- 查看最短时间（分钟） -->
+      <el-form-item :label="$t('trials:attachment:table:min')" prop="SignViewMinimumMinutes">
+        <el-input-number
+          v-model="form.SignViewMinimumMinutes"
+          controls-position="right"
+          :min="1"
+          :max="50"
+        />
+      </el-form-item>
+      <!-- 描述 -->
+      <el-form-item :label="$t('trials:attachment:table:description')" prop="Description">
+        <el-input
+          v-model="form.Description"
+          type="textarea"
+          :autosize="{ minRows: 5, maxRows: 6}"
+          maxlength="500"
+          show-word-limit
+        />
+      </el-form-item>
+    </div>
+    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+      <el-form-item style="text-align:right;">
+        <!-- Save -->
+        <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''" :loading="saveBtnLoading" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </el-form-item>
+    </div>
+  </el-form>
 </template>
 <script>
-import { addOrUpdateTrialDocumentAttachment } from '@/api/trials'
+import { addOrUpdateTrialDocument, uploadTrialDoc, getTrialUserTypeList } from '@/api/trials'
+import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 export default {
-    props: {
-        data: {
-            type: Object,
-            default() {
-                return {}
-            },
-        },
-        TrialDocumentId: {
-            type: String,
-            default: ''
-        }
-    },
+  name: 'TrialAttachmentFrom',
+  props: {
+    data: {
+      type: Object,
+      default() { return {} }
+    }
+  },

-    data() {
-        return {
-            form: {
-                Id: '',
-                Name: null,
-                FileFormat: null,
-                FileName: null,
-                FilePath: null,
-                FileSize: null,
-                OffLine: false,
-                TrialDocumentId: null,
-            },
-            rules: {
-                Name: [
-                    {
-                        required: true,
-                        message: this.$t('common:ruleMessage:specify'),
-                        trigger: ['change'],
-                    },
-                ],
-            },
-            fileList: [],
-            btnLoading: false,
-            saveBtnLoading: false,
-            loading: false,
-            accept: ['.jpg',
-                '.jpeg',
-                '.png',
-                '.pdf',
-                '.ppt',
-                '.pptx',
-                '.doc',
-                '.docx',
-                '.xls',
-                '.xlsx',
-                ".mp4"]
+  data() {
+    return {
+      form: {
+        Id: '',
+        TrialId: '',
+        FileTypeId: '',
+        Name: '',
+        Path: '',
+        IsDeleted: false,
+        SignViewMinimumMinutes: null,
+        Description: '',
+        NeedConfirmedUserTypeIdList: []
+      },
+      rules: {
+        FileTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
+        SignViewMinimumMinutes: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }],
+        NeedConfirmedUserTypeIdList: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
+        Description: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur', 'change'] }]
+      },
+      fileList: [],
+      userTypeOptions: [],
+      btnLoading: false,
+      saveBtnLoading: false,
+      loading: false,
+      dictionaryList: {}
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    // 保存
+    handleSave() {
+      this.$refs.trialAttachmentFrom.validate(valid => {
+        if (!valid) return
+        if (!this.form.Name) {
+          this.$alert(this.$t('trials:attachment:message:selectFile'))
+          return
        }
+        if (this.form.TrialId === '') {
+          this.form.TrialId = this.$route.query.trialId
+        }
+        this.saveBtnLoading = true
+        addOrUpdateTrialDocument(this.form).then(res => {
+          this.saveBtnLoading = false
+          this.$emit('closeDialog')
+          this.$emit('getList')
+          if (this.form.Id) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          } else {
+            this.$message.success(this.$t('common:message:addedSuccessfully'))
+          }
+          // this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }).catch(() => {
+          this.saveBtnLoading = false
+        })
+      })
    },
-    mounted() {
-        this.initForm()
-    },
-    methods: {
-        async initForm() {
-            this.loading = true
-            if (this.data && this.data.Id) {
-                Object.keys(this.form).forEach(key => {
-                    this.form[key] = this.data[key]
-                })
-                this.fileList = [
-                    {
-                        name: this.data.FileName,
-                        url: this.data.FilePath,
-                        path: this.data.FilePath,
-                    },
-                ]
+    async initForm() {
+      this.loading = true
+      await this.getDicData()
+      await this.getUserType()
+      if (Object.keys(this.data).length > 0) {
+        if (this.data.Path) {
+          this.fileList = [
+            {
+              name: this.data.Name,
+              path: this.data.Path,
+              url: this.data.Path,
            }
-            this.loading = false
-        },
-        beforeUpload(file) {
-            // 检测文件类型是否符合要求
-            if (this.checkFileSuffix(file.name)) {
-                this.fileList = []
-                return true
-            } else {
-                this.$alert(this.$t('trials:signature:label:type').replace("xxx", this.accept.join(", ")))
+          ]
+        }
+        this.form.Id = this.data.Id
+        this.form.FileTypeId = this.data.FileTypeId
+        this.form.Name = this.data.Name
+        this.form.Path = this.data.Path
+        this.form.IsDeleted = this.data.IsDeleted
+        this.form.Description = this.data.Description
+        this.form.SignViewMinimumMinutes = this.data.SignViewMinimumMinutes
+      }
+      this.loading = false
+    },
+    // 获取文件类型下拉框数据
+    getDicData() {
+      getBasicDataSelects(['Trial_Document']).then(res => {
+        this.dictionaryList = { ...res.Result }
+      })
+    },
+    // 获取用户类型下拉数据
+    getUserType() {
+      getTrialUserTypeList().then(res => {
+        this.userTypeOptions = res.Result
+        if (this.form.Id) {
+          this.form.NeedConfirmedUserTypeIdList = this.data.NeedConfirmedUserTypeeIds
+        }
+      }).catch(() => { this.loading = false })
+    },
+    handleViewableUserTypeChange(valArr) {
+      this.form.NeedConfirmedUserTypeIdList = []
+      this.needConfirmedUserTypeOptions = []
+      valArr.forEach((val) => {
+        const i = this.userTypeOptions.findIndex(userType => { return userType.Id === val })
+        this.needConfirmedUserTypeOptions.push(this.userTypeOptions[i])
+      })
+    },
+    // 检测文件类型是否符合要求
+    beforeUpload(file) {
+      if (this.checkFileSuffix(file.name)) {
+        this.fileList = []
+        return true
+      } else {
+        this.$alert(this.$t('trials:attachment:message:pdf'))

-                return false
-            }
-        },
-        async handleUploadFile(param) {
-            this.loading = true
-            var file = await this.fileToBlob(param.file)
-            const res = await this.OSSclient.put(
-                `/${this.$route.query.trialId}/DocumentToSign/${param.file.name}${new Date().getTime()}`,
-                file
-            )
-            this.fileList.push({
-                name: param.file.name,
-                path: this.$getObjectName(res.url),
-                url: this.$getObjectName(res.url),
-            })
-            this.form.Name = param.file.name
-            this.form.FileName = param.file.name
-            this.form.FilePath = this.$getObjectName(res.url)
-            this.form.FileSize = param.file.size
-            this.form.FileFormat = param.file.name
-                .substring(param.file.name.lastIndexOf('.'))
-                .toLocaleLowerCase().split('.')[1]
-            this.loading = false
-        },
-        handleSave() {
-            this.$refs.attachmentFrom.validate((valid) => {
-                if (!valid) return false
-                if (!this.form.FilePath)
-                    return this.$alert(this.$t('trials:signature:message:selectFile'))
-                this.saveBtnLoading = true
-                if (this.TrialDocumentId) this.form.TrialDocumentId = this.TrialDocumentId
-                addOrUpdateTrialDocumentAttachment(this.form)
-                    .then((res) => {
-                        this.saveBtnLoading = false
-                        this.$emit('closeDialog')
-                        this.$emit('getList')
-                        this.$message.success(this.$t('common:message:updatedSuccessfully'))
-                    })
-                    .catch(() => {
-                        this.saveBtnLoading = false
-                    })
-            })
-        },
-        handleRemoveFile() {
-            this.fileList = []
-            this.form.FilePath = ''
-            this.form.FileSize = ''
-            this.form.FileFormat = ''
-            this.form.FileName = ''
-        },
-        handlePreview(file) {
-            if (file.fullPath) {
-                window.open(file.fullPath, '_blank')
-            }
-        },
-        handleExceed(files, fileList) {
-            this.$message.warning(this.$t('upload:rule:maxFile1'))
-        },
-        checkFileSuffix(fileName) {
-            var typeArr = this.accept.map(item => item.split('.')[1])
-            var extendName = fileName
-                .substring(fileName.lastIndexOf('.') + 1)
-                .toLocaleLowerCase()
-            if (typeArr.indexOf(extendName) !== -1) {
-                return true
-            } else {
-                return false
-            }
-        },
+        return false
+      }
    },
+    // 上传文件
+    async handleUploadFile(param) {
+      this.loading = true
+      var file = await this.fileToBlob(param.file)
+      const trialId = this.$route.query.trialId
+      console.log(this.OSSclient.put)
+      const res = await this.OSSclient.put(`/${trialId}/DocumentToSign/${param.file.name}`, file)
+      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
+      this.form.Path = this.$getObjectName(res.url)
+      this.form.Name = param.file.name
+      this.loading = false
+    },
+    // 移除
+    handleRemoveFile() {
+      this.fileList = []
+      this.form.Path = ''
+      this.form.Name = ''
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(this.$t('trials:attachment:message:uploadFile'))
+    },
+    // 文件类型是否是pdf
+    checkFileSuffix(fileName) {
+      var typeArr = ['pdf']
+      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      if (typeArr.indexOf(extendName) !== -1) {
+        return true
+      } else {
+        return false
+      }
+    }
+  }
 }
 </script>

 <style lang="scss">
-.upload-temporary-file {
-    .upload-container .el-upload--text {
-        border: none;
-        width: 80px;
-        height: 40px;
+.upload-temporary-file{
+  .upload-container .el-upload--text {
+    border: none;
+    width: 80px;
+    height: 40px;
+  }
+  .upload-container .el-input--small {
+    margin-bottom: 5px;
+  }
+  .upload-container .el-icon-circle-check {
+    color: #428bca;
+    font-size: 13px;
+  }
+  .account_item_clear{
+    .el-tag__close{
+      display: none !important;
    }
+  }

-    .upload-container .el-input--small {
-        margin-bottom: 5px;
-    }
-
-    .upload-container .el-icon-circle-check {
-        color: #428bca;
-        font-size: 13px;
-    }
-
-    .account_item_clear {
-        .el-tag__close {
-            display: none !important;
-        }
-    }
 }
-</style>
+</style>
@@ -1,265 +0,0 @@
-<template>
-    <div v-if="config.visible">
-        <base-model :config="config">
-            <template slot="dialog-body">
-                <el-form ref="form" :model="rowData" label-width="80px" style="width: 80%;display: inline-block;">
-                    <el-form-item :label="`${$t('trials:attachment:table:Name')}: `">
-                        <span class="name text-ellipsis" :title="rowData.Name">{{ rowData.Name }}</span>
-                    </el-form-item>
-                </el-form>
-                <el-button size="mini" type="primary" style="float:right" @click.stop="edit({})" v-if="!isView">
-                    {{ $t('common:button:add') }}</el-button>
-                <el-table :data="list" style="width: 100%" max-height="300px" v-loading="loading"
-                    @sort-change="handleSortByColumn">
-                    <el-table-column type="index" width="60" />
-                    <el-table-column prop="Name" :label="$t('trials:attachment:attachmentList:FileName')"
-                        sortable="custom" />
-                    <el-table-column prop="OffLine" :label="$t('trials:attachment:attachmentList:OffLine')"
-                        sortable="custom" v-if="!isView">
-                        <template slot-scope="scope">
-                            <el-switch v-model="scope.row.OffLine" @change="(val) => OffLine(scope.row, val)"
-                                :active-value="true" :inactive-value="false" :active-text="$fd('YesOrNo', true)"
-                                :inactive-text="$fd('YesOrNo', false)">
-                            </el-switch>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="CreateTime" :label="$t('trials:attachment:attachmentList:CreateTime')"
-                        sortable="custom" />
-                    <el-table-column :label="$t('common:action:action')" min-width="120px">
-                        <template slot-scope="scope">
-                            <el-button size="mini" type="text" @click.stop="preview(scope.row)">
-                                {{ $t('common:button:preview') }}
-                            </el-button>
-                            <el-button size="mini" type="text" @click.stop="edit(scope.row)" v-if="!isView">
-                                {{ $t('common:button:edit') }}
-                            </el-button>
-                            <!-- <el-button size="mini" type="text" @click.stop="OffLine(scope.row, true)"
-                                :disabled="scope.row.OffLine">
-                                {{ $t('trials:attachment:attachmentList:OffLine') }}
-                            </el-button> -->
-                            <el-button size="mini" type="text" @click.stop="del(scope.row)" v-if="!isView">
-                                {{ $t('common:button:delete') }}
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-                <!-- 新增/编辑附件 -->
-                <el-dialog :visible.sync="visible" :close-on-click-modal="false" :append-to-body="true" :title="title"
-                    width="800px" custom-class="base-dialog-wrapper">
-                    <attachmentForm v-if="visible" :data="rowDATA" :TrialDocumentId="TrialDocumentId"
-                        @closeDialog="closeDialog" @getList="getAllList" />
-                </el-dialog>
-            </template>
-        </base-model>
-        <viewer ref="picture_perview3" style="margin: 0 10px"
-            v-if="rowDATA.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowDATA.FileFormat.toLowerCase())"
-            :images="[`${OSSclientConfig.basePath}${rowDATA.FilePath}`]" :options="viewerOptions">
-
-            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowDATA.FilePath}`" alt="Image" />
-        </viewer>
-        <!-- <attachmentPreview :TrialDocumentId="TrialDocumentId" :visible.sync="perview_visible"
-            v-if="perview_visible" /> -->
-    </div>
-</template>
-<script>
-import BaseModel from '@/components/BaseModel'
-import attachmentForm from './attachmentForm'
-// import attachmentPreview from './attachmentPreview'
-import { addOrUpdateTrialDocumentAttachment, getTrialDocumentAttachmentList, deleteTrialDocumentAttachment } from '@/api/trials'
-const defaultSearchData = () => {
-    return {
-        PageIndex: 1,
-        PageSize: 1000,
-        Asc: false,
-        OffLine: null,
-        SortField: null
-    }
-}
-export default {
-    components: {
-        BaseModel,
-        attachmentForm,
-        //  attachmentPreview 
-    },
-    props: {
-        config: {
-            type: Object,
-            default: () => {
-                return {
-                    visible: false,
-                    title: this.$t('trials:attachment:attachmentList:title'),
-                    width: '800px',
-                }
-            }
-        },
-        isView: {
-            type: Boolean,
-            default: false
-        },
-        rowData: {
-            type: Object,
-            default: () => {
-                return {}
-            }
-        },
-        TrialDocumentId: {
-            type: String,
-            default: ''
-        }
-    },
-    data() {
-        return {
-            searchData: defaultSearchData(),
-            visible: false,
-            title: null,
-            list: [],
-            rowDATA: {},
-            loading: false,
-            viewerOptions: {
-                toolbar: {
-                    zoomIn: true,
-                    zoomOut: true,
-                    reset: true,
-                    prev: false,
-                    next: false,
-                    rotateLeft: true,
-                    rotateRight: true,
-                    flipHorizontal: true,
-                    flipVertical: true,
-                }
-            },
-            // perview_visible: false
-        }
-    },
-    watch: {
-        TrialDocumentId: {
-            handler() {
-                this.getList()
-            },
-            immediate: true,
-        }
-    },
-    methods: {
-        closeDialog() {
-            this.visible = false
-        },
-        getAllList() {
-            this.getList()
-            this.$emit("getList")
-        },
-        async del(row) {
-            try {
-                let confirm = await this.$confirm(this.$t("trials:attachment:attachmentList:message:del"))
-                if (!confirm) return false
-                this.loading = true
-                let res = await deleteTrialDocumentAttachment(row.Id)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.getAllList()
-                }
-            } catch (err) {
-                console.log(err)
-                this.loading = false
-            }
-        },
-        edit(row) {
-            this.title = this.$t('trials:attachment:attachmentForm:title:update')
-            if (!row.Id) {
-                this.title = this.$t('trials:attachment:attachmentForm:title:add')
-            }
-            this.rowDATA = Object.assign({}, row)
-            this.visible = true
-        },
-        async getList() {
-            try {
-                if (!this.TrialDocumentId) return false
-                this.loading = true
-                this.searchData.TrialDocumentId = this.TrialDocumentId
-                if (this.isView) {
-                    this.searchData.OffLine = false
-                }
-                let res = await getTrialDocumentAttachmentList(this.searchData)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = res.Result.CurrentPageData
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        async OffLine(row, val) {
-            try {
-                let data = Object.assign({}, row)
-                data.OffLine = val
-                this.loading = true
-                let res = await addOrUpdateTrialDocumentAttachment(data)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.$t('trials:attachment:attachmentList:updateSuccessfully')
-                    this.getList()
-                }
-            } catch (err) {
-                this.loading = false
-                row.OffLine = !row.OffLine
-                console.log(err)
-            }
-        },
-        preview(data) {
-            // return this.perview_visible = true
-            this.rowDATA = Object.assign({}, data)
-            if (['.ppt',
-                '.pptx',
-                '.doc',
-                '.docx',
-                '.xls',
-                '.xlsx'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$onlyOffice({
-                    path: data.FilePath,
-                    type: data.FileFormat,
-                    title: data.Name
-                })
-            }
-            if (['.jpg',
-                '.jpeg',
-                '.png'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$nextTick(() => {
-                    this.$refs['picture_perview3'].$viewer.show()
-                })
-            }
-            if (['.pdf'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$preview({
-                    path: data.Path || data.FilePath,
-                    type: 'pdf',
-                    title: data.Name,
-                })
-            }
-            if (['.mp4'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$video({
-                    path: data.Path || data.FilePath,
-                    type: 'mp4',
-                    title: data.Name,
-                })
-            }
-        },
-        // 排序
-        handleSortByColumn(column) {
-            if (column.order === 'ascending') {
-                this.searchData.Asc = true
-            } else {
-                this.searchData.Asc = false
-            }
-            this.searchData.SortField = column.prop
-            this.searchData.PageIndex = 1
-            this.getList()
-        },
-    }
-
-}
-</script>
-<style lang="scss" scoped>
-.name {
-    display: block;
-    width: 90%;
-}
-</style>
@@ -1,257 +0,0 @@
-<template>
-  <el-form ref="trialAttachmentFrom" v-loading="loading" :model="form" label-width="240px" size="small" :rules="rules"
-    class="upload-temporary-file">
-    <div class="base-dialog-body">
-      <!-- 文件类型 -->
-      <el-form-item :label="$t('trials:attachment:table:fileType')" prop="FileTypeId">
-        <el-select v-model="form.FileTypeId" style="width:100%;" size="small">
-          <el-option v-for="item of dictionaryList.Trial_Document" :key="item.Id" :label="item.Value"
-            :value="item.Id" />
-        </el-select>
-      </el-form-item>
-      <!-- 文件 -->
-      <el-form-item :label="$t('trials:attachment:form:file')">
-        <div class="upload-container">
-          <el-upload class="upload-demo" action accept=".pdf,.mp4" :before-upload="beforeUpload"
-            :http-request="handleUploadFile" :on-remove="handleRemoveFile" :show-file-list="true" :file-list="fileList"
-            :limit="1" :on-exceed="handleExceed" :disabled="form.FileTypeId === ''">
-            <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || saveBtnLoading"
-              :loading="btnLoading">
-              {{ $t('trials:attachment:button:select') }}
-            </el-button>
-            <span slot="tip" style="margin-left:10px;" class="el-upload__tip">
-              {{ $t('system:tip:file:pdf') }}
-            </span>
-          </el-upload>
-        </div>
-      </el-form-item>
-      <!-- 需要签署的用户类型 -->
-      <el-form-item :label="$t('trials:attachment:table:userType')" prop="NeedConfirmedUserTypeIdList">
-        <el-select v-model="form.NeedConfirmedUserTypeIdList" style="width:100%;" multiple>
-          <el-option v-for="item of userTypeOptions"
-            v-show="item.UserTypeEnum !== 1 && item.UserTypeEnum !== 8 && item.UserTypeEnum !== 20 && item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27 && item.UserTypeEnum !== 31"
-            :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
-            <span>{{ item.UserType }}</span>
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <!-- 查看最短时间（分钟） -->
-      <el-form-item :label="$t('trials:attachment:table:min')" prop="SignViewMinimumMinutes">
-        <el-input-number v-model="form.SignViewMinimumMinutes" controls-position="right" :min="1" :max="50" />
-      </el-form-item>
-      <el-form-item :label="$t('trials:attachment:form:CurrentStaffTrainDays')" prop="CurrentStaffTrainDays">
-        <el-input-number v-model="form.CurrentStaffTrainDays" controls-position="right" :min="0" :max="1000" />
-      </el-form-item>
-      <el-form-item :label="$t('trials:attachment:form:NewStaffTrainDays')" prop="NewStaffTrainDays">
-        <el-input-number v-model="form.NewStaffTrainDays" controls-position="right" :min="0" :max="1000" />
-      </el-form-item>
-      <!-- 描述 -->
-      <el-form-item :label="$t('trials:attachment:table:description')" prop="Description">
-        <el-input v-model="form.Description" type="textarea" :autosize="{ minRows: 5, maxRows: 6 }" maxlength="500"
-          show-word-limit />
-      </el-form-item>
-    </div>
-    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-form-item style="text-align:right;">
-        <!-- Save -->
-        <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
-          :loading="saveBtnLoading" @click="handleSave">
-          {{ $t('common:button:save') }}
-        </el-button>
-      </el-form-item>
-    </div>
-  </el-form>
-</template>
-<script>
-import { addOrUpdateTrialDocument, uploadTrialDoc, getTrialUserTypeList } from '@/api/trials'
-import { getBasicDataSelects } from '@/api/dictionary/dictionary'
-export default {
-  name: 'TrialAttachmentFrom',
-  props: {
-    data: {
-      type: Object,
-      default() { return {} }
-    }
-  },
-
-  data() {
-    return {
-      form: {
-        Id: '',
-        TrialId: '',
-        FileTypeId: '',
-        Name: '',
-        Path: '',
-        IsPublish: false,
-        IsDeleted: false,
-        SignViewMinimumMinutes: null,
-        Description: '',
-        NeedConfirmedUserTypeIdList: [],
-        CurrentStaffTrainDays: 1,
-        NewStaffTrainDays: 14,
-      },
-      rules: {
-        FileTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        SignViewMinimumMinutes: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['change'] }],
-        NeedConfirmedUserTypeIdList: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
-        Description: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur', 'change'] }]
-      },
-      fileList: [],
-      userTypeOptions: [],
-      btnLoading: false,
-      saveBtnLoading: false,
-      loading: false,
-      dictionaryList: {}
-    }
-  },
-  mounted() {
-    this.initForm()
-  },
-  methods: {
-    // 保存
-    handleSave() {
-      this.$refs.trialAttachmentFrom.validate(valid => {
-        if (!valid) return
-        if (!this.form.Name) {
-          this.$alert(this.$t('trials:attachment:message:selectFile'))
-          return
-        }
-        if (this.form.TrialId === '') {
-          this.form.TrialId = this.$route.query.trialId
-        }
-        this.saveBtnLoading = true
-        addOrUpdateTrialDocument(this.form).then(res => {
-          this.saveBtnLoading = false
-          this.$emit('closeDialog')
-          this.$emit('getList')
-          if (this.form.Id) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-          } else {
-            this.$message.success(this.$t('common:message:addedSuccessfully'))
-          }
-          // this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }).catch(() => {
-          this.saveBtnLoading = false
-        })
-      })
-    },
-    async initForm() {
-      this.loading = true
-      await this.getDicData()
-      await this.getUserType()
-      if (Object.keys(this.data).length > 0) {
-        if (this.data.Path) {
-          this.fileList = [
-            {
-              name: this.data.Name,
-              path: this.data.Path,
-              url: this.data.Path,
-            }
-          ]
-        }
-        this.form.Id = this.data.Id
-        this.form.FileTypeId = this.data.FileTypeId
-        this.form.Name = this.data.Name
-        this.form.Path = this.data.Path
-        this.form.IsDeleted = this.data.IsDeleted
-        this.form.IsPublish = this.data.IsPublish
-        this.form.Description = this.data.Description
-        this.form.SignViewMinimumMinutes = this.data.SignViewMinimumMinutes
-        this.form.CurrentStaffTrainDays = this.data.CurrentStaffTrainDays
-        this.form.NewStaffTrainDays = this.data.NewStaffTrainDays
-      }
-      this.loading = false
-    },
-    // 获取文件类型下拉框数据
-    getDicData() {
-      getBasicDataSelects(['Trial_Document']).then(res => {
-        this.dictionaryList = { ...res.Result }
-      })
-    },
-    // 获取用户类型下拉数据
-    getUserType() {
-      getTrialUserTypeList().then(res => {
-        this.userTypeOptions = res.Result
-        if (this.form.Id) {
-          this.form.NeedConfirmedUserTypeIdList = this.data.NeedConfirmedUserTypeeIds
-        }
-      }).catch(() => { this.loading = false })
-    },
-    handleViewableUserTypeChange(valArr) {
-      this.form.NeedConfirmedUserTypeIdList = []
-      this.needConfirmedUserTypeOptions = []
-      valArr.forEach((val) => {
-        const i = this.userTypeOptions.findIndex(userType => { return userType.Id === val })
-        this.needConfirmedUserTypeOptions.push(this.userTypeOptions[i])
-      })
-    },
-    // 检测文件类型是否符合要求
-    beforeUpload(file) {
-      if (this.checkFileSuffix(file.name)) {
-        this.fileList = []
-        return true
-      } else {
-        this.$alert(this.$t('trials:attachment:message:pdf'))
-
-        return false
-      }
-    },
-    // 上传文件
-    async handleUploadFile(param) {
-      this.loading = true
-      var file = await this.fileToBlob(param.file)
-      const trialId = this.$route.query.trialId
-      const res = await this.OSSclient.put(`/${trialId}/DocumentToSign/${param.file.name}${new Date().getTime()}`, file)
-      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
-      this.form.Path = this.$getObjectName(res.url)
-      this.form.Name = param.file.name
-      this.loading = false
-    },
-    // 移除
-    handleRemoveFile() {
-      this.fileList = []
-      this.form.Path = ''
-      this.form.Name = ''
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(this.$t('trials:attachment:message:uploadFile'))
-    },
-    // 文件类型是否是pdf
-    checkFileSuffix(fileName) {
-      var typeArr = ['pdf', 'mp4']
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
-      if (typeArr.indexOf(extendName) !== -1) {
-        return true
-      } else {
-        return false
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.upload-temporary-file {
-  .upload-container .el-upload--text {
-    border: none;
-    width: 80px;
-    height: 40px;
-  }
-
-  .upload-container .el-input--small {
-    margin-bottom: 5px;
-  }
-
-  .upload-container .el-icon-circle-check {
-    color: #428bca;
-    font-size: 13px;
-  }
-
-  .account_item_clear {
-    .el-tag__close {
-      display: none !important;
-    }
-  }
-
-}
-</style>
@@ -5,8 +5,17 @@
      <el-form :inline="true" class="base-search-form">
        <!-- 文件类型 -->
        <el-form-item :label="$t('trials:attachment:table:fileType')">
-          <el-select v-model="searchData.FileTypeId" clearable style="width: 150px">
-            <el-option v-for="item of $d.Trial_Document" :key="item.id" :label="item.label" :value="item.id" />
+          <el-select
+            v-model="searchData.FileTypeId"
+            clearable
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of $d.Trial_Document"
+              :key="item.id"
+              :label="item.label"
+              :value="item.id"
+            />
          </el-select>
        </el-form-item>
        <!-- 文件名称 -->
@@ -15,20 +24,40 @@
        </el-form-item>
        <!-- 培训状态 -->
        <el-form-item :label="$t('trials:attachment:table:isDeleted')">
-          <el-select clearable v-model="searchData.IsDeleted" style="width: 150px">
-            <el-option v-for="item of $d.TrainingStatus" :key="item.value" :label="item.label" :value="item.value" />
+          <el-select
+            clearable
+            v-model="searchData.IsDeleted"
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of $d.TrainingStatus"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
        <!-- 培训角色 -->
        <el-form-item :label="$t('trials:attachment:table:userType')">
-          <el-select v-model="searchData.UserTypeId" clearable style="width: 100%">
-            <el-option v-for="item of userTypeOptions" v-show="item.UserTypeEnum !== 1 &&
-              item.UserTypeEnum !== 8 &&
-              item.UserTypeEnum !== 20 &&
-              item.UserTypeEnum !== 26 &&
-              item.UserTypeEnum !== 27 &&
-              item.UserTypeEnum !== 31
-              " :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
+          <el-select
+            v-model="searchData.UserTypeId"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item of userTypeOptions"
+              v-show="
+                item.UserTypeEnum !== 1 &&
+                item.UserTypeEnum !== 8 &&
+                item.UserTypeEnum !== 20 &&
+                item.UserTypeEnum !== 26 &&
+                item.UserTypeEnum !== 27 &&
+                item.UserTypeEnum !== 31
+              "
+              :key="item.Id"
+              :label="item.UserTypeShortName"
+              :value="item.Id"
+            >
              <span>{{ item.UserType }}</span>
            </el-option>
          </el-select>
@@ -40,52 +69,71 @@
            {{ $t('common:button:search') }}
          </el-button>
          <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
            {{ $t('common:button:reset') }}
          </el-button>
        </el-form-item>
      </el-form>
      <span style="margin-left: auto">
        <!-- 新增 -->
-        <el-button v-hasPermi="['trials:trials-panel:setting:attachment:add']" type="primary" icon="el-icon-plus"
-          @click="handleAdd">
+        <el-button
+          v-hasPermi="['trials:trials-panel:setting:attachment:add']"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleAdd"
+        >
          {{ $t('common:button:add') }}
        </el-button>
      </span>
    </div>

    <!-- 系统文件列表 -->
-    <el-table ref="attachmentList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe
-      height="100" @sort-change="handleSortByColumn">
+    <el-table
+      ref="attachmentList"
+      v-loading="loading"
+      v-adaptive="{ bottomOffset: 60 }"
+      :data="list"
+      stripe
+      height="100"
+      @sort-change="handleSortByColumn"
+    >
      <el-table-column type="index" width="40" />
      <!-- 文件类型 -->
-      <el-table-column prop="FileType" :label="$t('trials:attachment:table:fileType')" show-overflow-tooltip
-        sortable="custom" min-width="160" />
+      <el-table-column
+        prop="FileType"
+        :label="$t('trials:attachment:table:fileType')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="160"
+      />
      <!-- 文件名称 -->
-      <el-table-column prop="Name" :label="$t('trials:attachment:table:fileName')" show-overflow-tooltip
-        sortable="custom" min-width="160" />
-      <!--附件-->
-      <el-table-column prop="AttachmentCount" :label="$t('trials:attachment:table:AttachmentCount')"
-        show-overflow-tooltip sortable="custom" min-width="150px">
-        <template slot-scope="scope">
-          <el-button type="text" @click.stop="openAttachment(scope.row, true)">
-            {{ scope.row.AttachmentCount }}
-            <i class="el-icon-upload2" />
-          </el-button>
-        </template>
-      </el-table-column>
+      <el-table-column
+        prop="Name"
+        :label="$t('trials:attachment:table:fileName')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="160"
+      />
      <!-- 查看最短时间(分钟) -->
-      <el-table-column prop="SignViewMinimumMinutes" :label="$t('trials:attachment:table:min')" show-overflow-tooltip
-        sortable="custom" min-width="150" />
-      <!-- 已有成员(分钟) -->
-      <el-table-column prop="CurrentStaffTrainDays" :label="$t('trials:attachment:table:CurrentStaffTrainDays')"
-        show-overflow-tooltip sortable="custom" min-width="150" />
-      <!-- 新加入成员(分钟) -->
-      <el-table-column prop="NewStaffTrainDays" :label="$t('trials:attachment:table:NewStaffTrainDays')"
-        show-overflow-tooltip sortable="custom" min-width="150" />
+      <el-table-column
+        prop="SignViewMinimumMinutes"
+        :label="$t('trials:attachment:table:min')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="150"
+      />
      <!-- 是否废除 -->
-      <el-table-column prop="IsDeleted" :label="$t('trials:attachment:table:isDeleted')" show-overflow-tooltip
-        sortable="custom" min-width="100">
+      <el-table-column
+        prop="IsDeleted"
+        :label="$t('trials:attachment:table:isDeleted')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="100"
+      >
        <template slot-scope="scope">
          <el-tag v-if="scope.row.IsDeleted" type="danger">{{
            $fd('TrainingStatus', scope.row.IsDeleted)
@@ -95,18 +143,13 @@
          }}</el-tag>
        </template>
      </el-table-column>
-      <!--发布状态-->
-      <el-table-column prop="IsPublish" :label="$t('trials:attachment:table:IsPublish')" show-overflow-tooltip
-        sortable="custom" min-width="120px">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.IsPublish ? 'primary' : 'danger'">{{
-            $fd('AttachmentPublishStatus', scope.row.IsPublish)
-          }}</el-tag>
-        </template>
-      </el-table-column>
      <!-- 需要签署的用户类型 -->
-      <el-table-column prop="NeedConfirmedUserTypes" :label="$t('trials:attachment:table:userType')"
-        show-overflow-tooltip min-width="100">
+      <el-table-column
+        prop="NeedConfirmedUserTypes"
+        :label="$t('trials:attachment:table:userType')"
+        show-overflow-tooltip
+        min-width="100"
+      >
        <template slot-scope="scope">
          {{
            scope.row.NeedConfirmedUserTypes
@@ -131,52 +174,91 @@
        min-width="160"
      /> -->
      <!--创建时间-->
-      <el-table-column prop="CreateTime" :label="$t('trials:attachment:table:CreateTime')" show-overflow-tooltip
-        sortable="custom" min-width="160" />
-      <el-table-column :label="$t('common:action:action')" min-width="200" fixed="right">
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:attachment:table:CreateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+        min-width="160"
+      />
+      <el-table-column
+        :label="$t('common:action:action')"
+        min-width="140"
+        fixed="right"
+      >
        <template slot-scope="scope">
          <!-- 预览 -->
-          <el-button icon="el-icon-view" circle :title="$t('trials:attachment:action:preview')"
-            @click="handlePreview(scope.row)" />
+          <el-button
+            icon="el-icon-view"
+            circle
+            :title="$t('trials:attachment:action:preview')"
+            @click="handlePreview(scope.row)"
+          />
          <!-- 编辑 -->
-          <el-button v-hasPermi="['trials:trials-panel:setting:attachment:edit']" circle
-            :title="$t('trials:attachment:action:edit')" icon="el-icon-edit-outline"
-            :disabled="scope.row.IsSomeUserSigned || scope.row.IsDeleted" @click="handleEdit(scope.row)" />
-          <el-button :disabled="scope.row.IsPublish" circle icon="el-icon-position"
-            :title="$t('dictionary:signature:button:publish')" @click="publishTrialDocument([scope.row])">
-          </el-button>
+          <el-button
+            v-hasPermi="['trials:trials-panel:setting:attachment:edit']"
+            circle
+            :title="$t('trials:attachment:action:edit')"
+            icon="el-icon-edit-outline"
+            :disabled="scope.row.IsSomeUserSigned || scope.row.IsDeleted"
+            @click="handleEdit(scope.row)"
+          />
          <!-- 废除 -->
-          <el-button v-hasPermi="['trials:trials-panel:setting:attachment:abolish']" :disabled="scope.row.IsDeleted"
-            circle :title="$t('trials:attachment:action:apolish')" icon="el-icon-delete"
-            @click="handleRepeal(scope.row)" />
+          <el-button
+            v-hasPermi="['trials:trials-panel:setting:attachment:abolish']"
+            :disabled="scope.row.IsDeleted"
+            circle
+            :title="$t('trials:attachment:action:apolish')"
+            icon="el-icon-delete"
+            @click="handleRepeal(scope.row)"
+          />
        </template>
      </el-table-column>
    </el-table>

    <!-- 分页组件 -->
-    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      @pagination="getList" />
+    <pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />

    <!-- 新增/编辑 -->
-    <el-dialog v-if="editVisible" :visible.sync="editVisible" :close-on-click-modal="false" :title="title" width="800px"
-      custom-class="base-dialog-wrapper">
-      <templateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+    <el-dialog
+      v-if="editVisible"
+      :visible.sync="editVisible"
+      :close-on-click-modal="false"
+      :title="title"
+      width="800px"
+      custom-class="base-dialog-wrapper"
+    >
+      <AttachmentForm
+        :data="currentRow"
+        @closeDialog="closeDialog"
+        @getList="getList"
+      />
    </el-dialog>
-    <!--附件列表-->
-    <attachmentList v-if="config.visible" :config="config" :rowData="currentRow" :TrialDocumentId="TrialDocumentId"
-      @getList="getList" />
+
    <!-- 预览文件 -->
-    <attachmentPreview :SystemDocumentId="TrialDocumentId" :isTrial="true" :visible.sync="perview_visible"
-      :isView="true" v-if="perview_visible" />
-    <!-- 预览文件 -->
-    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('trials:attachment:dialogTitle:preview')"
-      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-      <span style="position: fixed; left: 16px; top: 45px;cursor: pointer;font-size: 18px;color:#409EFF"
-        @click.stop="openAttachment(currentRow)" v-if="currentRow.AttachmentCount">{{
-          $t('trials:attachment:table:AttachmentCount') }} ({{
-          currentRow.AttachmentCount }})</span>
-      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
+    <el-dialog
+      v-if="previewVisible"
+      :visible.sync="previewVisible"
+      :title="$t('trials:attachment:dialogTitle:preview')"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewVisible"
+          :file-path="currentPath"
+          :file-type="currentType"
+        />
      </div>
    </el-dialog>
  </box-content>
@@ -186,14 +268,11 @@ import {
  getTrialDocumentList,
  userAbandonDoc,
  getTrialUserTypeList,
-  publishTrialDocument
 } from '@/api/trials'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
-import templateForm from './components/templateForm'
+import AttachmentForm from './components/attachmentForm'
 import PreviewFile from './components/previewFile'
-import attachmentList from './components/attachmentList'
-import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
 const searchDataDefault = () => {
  return {
    FileTypeId: '',
@@ -208,7 +287,7 @@ const searchDataDefault = () => {
 }
 export default {
  name: 'TrialAttachmentList',
-  components: { BoxContent, Pagination, templateForm, PreviewFile, attachmentList, attachmentPreview },
+  components: { BoxContent, Pagination, AttachmentForm, PreviewFile },
  dicts: ['Trial_Document'],
  data() {
    return {
@@ -224,13 +303,6 @@ export default {
      currentType: '',
      trialId: '',
      userTypeOptions: [],
-      TrialDocumentId: null,
-      perview_visible: false,
-      config: {
-        visible: false,
-        title: this.$t('dictionary:signature:attachmentList:title'),
-        width: '800px',
-      },
    }
  },
  mounted() {
@@ -239,39 +311,6 @@ export default {
    this.getUserType()
  },
  methods: {
-    openAttachment(row, isList = false) {
-      this.TrialDocumentId = row.Id
-      this.currentRow = { ...row }
-      if (!isList) {
-        this.perview_visible = true
-      } else {
-        this.config.visible = true
-      }
-    },
-    // 发布
-    async publishTrialDocument(list) {
-      try {
-        let confirm = await this.$confirm(this.$t('trials:attachment:confirm:publishFile'), {
-          type: 'warning',
-          distinguishCancelAndClose: true,
-        })
-        if (!confirm) return false
-        let arr = list.filter(item => !item.IsPublish)
-        if (arr.length <= 0) return this.getList()
-        let data = {
-          ids: arr.map(item => item.Id)
-        }
-        this.loading = true
-        let res = await publishTrialDocument(data)
-        this.loading = false
-        if (res.IsSuccess) {
-          this.getList()
-        }
-      } catch (err) {
-        this.loading = false
-        console.log(err)
-      }
-    },
    // 获取系统文件数据
    getList() {
      this.loading = true
@@ -322,7 +361,6 @@ export default {
      this.currentType = row.Name
        ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase()
        : ''
-      this.currentRow = Object.assign({}, row)
      this.previewVisible = true
    },
    // 编辑
@@ -353,7 +391,7 @@ export default {
              this.loading = false
            })
        })
-        .catch(() => { })
+        .catch(() => {})
    },
    // 关闭编辑弹窗
    closeDialog() {
@@ -5,34 +5,81 @@
    <div class="search">
      <el-form :inline="true" size="mini" class="base-search-form">
        <!-- 审核问题 -->
-        <el-form-item :label="$t('trials:emailManageCfg:title:businessScenario')">
-          <el-select v-model="searchData.BusinessScenarioEnum" style="width: 150px">
-            <el-option v-for="item of $d.Email_BusinessScenario" :key="item.value" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:businessScenario')"
+        >
+          <el-select
+            v-model="searchData.BusinessScenarioEnum"
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
-        <el-form-item style="margin-bottom: 10px" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')">
-          <el-select v-model="searchData.BusinessModuleEnum" clearable style="width: 120px">
-            <el-option v-for="item of $d.BusinessModule" :key="item.id" :label="item.label" :value="item.value" />
+        <el-form-item
+          style="margin-bottom: 10px"
+          :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
+        >
+          <el-select
+            v-model="searchData.BusinessModuleEnum"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.BusinessModule"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
-        <el-form-item v-if="isDistinguishCriteria" style="margin-bottom: 10px"
-          :label="$t('trials:reviewTrack:table:criterionName')">
-          <el-select v-model="searchData.CriterionTypeEnum" clearable style="width: 120px">
-            <el-option v-for="item of $d.CriterionType" :key="item.id" :label="item.label" :value="item.value" />
+        <el-form-item
+          v-if="isDistinguishCriteria"
+          style="margin-bottom: 10px"
+          :label="$t('trials:reviewTrack:table:criterionName')"
+        >
+          <el-select
+            v-model="searchData.CriterionTypeEnum"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of $d.CriterionType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+          prop="ToUserTypeList"
+        >
          <el-select v-model="searchData.ToUserType" clearable class="mr">
-            <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of UserTypeList"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" prop="EmailUrgentEnum"
-          v-if="!isDistinguishCriteria">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+          prop="EmailUrgentEnum"
+          v-if="!isDistinguishCriteria"
+        >
          <el-select v-model="searchData.EmailUrgentEnum" clearable class="mr">
-            <el-option v-for="item of $d.EmailUrgent" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of $d.EmailUrgent"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
        <el-form-item>
@@ -42,19 +89,40 @@
          <el-button type="primary" @click="handleReset">{{
            $t('common:button:reset')
          }}</el-button>
-          <el-button type="primary" @click="handleAdd" class="el-icon-plus" v-if="!isDistinguishCriteria && isShow">{{
-            $t('trials:reviewTrack:button:addDefault') }}</el-button>
+          <el-button
+            type="primary"
+            @click="handleAdd"
+            class="el-icon-plus"
+            v-if="!isDistinguishCriteria && isShow"
+            >{{ $t('trials:reviewTrack:button:addDefault') }}</el-button
+          >
        </el-form-item>
      </el-form>
      <span style="margin-left: auto">
-        <el-button type="primary" size="mini" :disabled="selectArr.length <= 0" @click="handleSubmit">
+        <el-button
+          type="primary"
+          size="mini"
+          :disabled="selectArr.length <= 0"
+          @click="handleSubmit"
+        >
          {{ $t('common:button:submit') }}
        </el-button>
      </span>
    </div>

-    <el-table :data="list" stripe size="small" height="400" @selection-change="handleSelectChange">
-      <el-table-column type="selection" align="left" :selectable="selectable" width="45" />
+    <el-table
+      :data="list"
+      stripe
+      size="small"
+      height="400"
+      @selection-change="handleSelectChange"
+    >
+      <el-table-column
+        type="selection"
+        align="left"
+        :selectable="selectable"
+        width="45"
+      />
      <el-table-column type="index" width="40" />
      <!-- Code -->
      <!-- <el-table-column
@@ -64,89 +132,155 @@
        show-overflow-tooltip
        width="100"
      /> -->
-      <el-table-column v-if="isDistinguishCriteria" prop="CriterionTypeList"
-        :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" width="120">
+      <el-table-column
+        v-if="isDistinguishCriteria"
+        prop="TrialReadingCriterionId"
+        :label="$t('trials:reviewTrack:table:criterionName')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="120"
+      >
        <template slot-scope="scope">
-          {{scope.row.CriterionTypeList && scope.row.CriterionTypeList.length > 0 ?
-            scope.row.CriterionTypeList.map(item => { return $fd('CriterionType', item) }
-            ).join(', ') : ''}}
+          {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
        </template>
      </el-table-column>
-      <el-table-column v-if="$i18n.locale === 'zh'" prop="EmailTopicCN"
-        :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom" show-overflow-tooltip width="160" />
-      <el-table-column v-else prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')" sortable="custom"
-        show-overflow-tooltip width="160" />
-      <el-table-column prop="BusinessModuleEnum" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
-        sortable="custom" show-overflow-tooltip width="100">
+      <el-table-column
+        v-if="$i18n.locale === 'zh'"
+        prop="EmailTopicCN"
+        :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="160"
+      />
+      <el-table-column
+        v-else
+        prop="EmailTopic"
+        :label="$t('trials:emailManageCfg:table:EmailTopic')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="160"
+      />
+      <el-table-column
+        prop="BusinessModuleEnum"
+        :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="100"
+      >
        <template slot-scope="scope">
          {{ $fd('BusinessModule', scope.row.BusinessModuleEnum) }}
        </template>
      </el-table-column>
-      <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
-        sortable="custom" show-overflow-tooltip width="130">
+      <el-table-column
+        prop="BusinessScenarioEnum"
+        :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="130"
+      >
        <template slot-scope="scope">
          {{ $fd('Email_BusinessScenario', scope.row.BusinessScenarioEnum) }}
        </template>
      </el-table-column>
      <!-- 收件人 -->
-      <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-        show-overflow-tooltip width="100">
+      <el-table-column
+        prop="ToUserTypeList"
+        :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+        show-overflow-tooltip
+        width="100"
+      >
        <template slot-scope="scope">
          {{
            scope.row.ToUserTypeList.length > 0
              ? scope.row.ToUserTypeList.map((v) => $fd('UserType', v)).join(
-                '、'
-              )
+                  '、'
+                )
              : ''
          }}
        </template>
      </el-table-column>
      <!-- 抄送人 -->
-      <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-        show-overflow-tooltip width="100">
+      <el-table-column
+        prop="CopyUserTypeList"
+        :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
+        show-overflow-tooltip
+        width="100"
+      >
        <template slot-scope="scope">
          {{
            scope.row.CopyUserTypeList.length > 0
              ? scope.row.CopyUserTypeList.map((v) => $fd('UserType', v)).join(
-                '、'
-              )
+                  '、'
+                )
              : ''
          }}
        </template>
      </el-table-column>
-      <el-table-column :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" sortable="custom"
-        show-overflow-tooltip width="100">
+      <el-table-column
+        :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="100"
+      >
        <template slot-scope="scope">
          {{ $fd('EmailUrgent', scope.row.EmailUrgentEnum) }}
        </template>
      </el-table-column>
-      <el-table-column prop="EmailCron" :label="$t('trials:emailManageCfg:table:EmailCron')" sortable="custom"
-        show-overflow-tooltip width="160">
+      <el-table-column
+        prop="EmailCron"
+        :label="$t('trials:emailManageCfg:table:EmailCron')"
+        sortable="custom"
+        show-overflow-tooltip
+        width="160"
+      >
        <template slot-scope="scope">
          <span>{{ getEmailCron(scope.row.EmailCron) }}</span>
        </template>
      </el-table-column>
      <!-- 附件 -->
-      <el-table-column v-if="$i18n.locale === 'zh'" prop="AttachNameCN"
-        :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip width="100">
+      <el-table-column
+        v-if="$i18n.locale === 'zh'"
+        prop="AttachNameCN"
+        :label="$t('trials:emailManageCfg:title:fileName')"
+        show-overflow-tooltip
+        width="100"
+      >
        <template slot-scope="scope">
-          <el-button v-if="scope.row.AttachCNPath" type="text" @click="handlePreview(scope.row.AttachCNPath)">
+          <el-button
+            v-if="scope.row.AttachCNPath"
+            type="text"
+            @click="handlePreview(scope.row.AttachCNPath)"
+          >
            {{ scope.row.AttachNameCN }}
          </el-button>
        </template>
      </el-table-column>
      <!-- 附件 -->
-      <el-table-column v-else prop="AttachName" :label="$t('trials:emailManageCfg:title:fileName')"
-        show-overflow-tooltip width="100">
+      <el-table-column
+        v-else
+        prop="AttachName"
+        :label="$t('trials:emailManageCfg:title:fileName')"
+        show-overflow-tooltip
+        width="100"
+      >
        <template slot-scope="scope">
-          <el-button v-if="scope.row.AttachPath" type="text" @click="handlePreview(scope.row.AttachPath)">
+          <el-button
+            v-if="scope.row.AttachPath"
+            type="text"
+            @click="handlePreview(scope.row.AttachPath)"
+          >
            {{ scope.row.AttachName }}
          </el-button>
        </template>
      </el-table-column>
      <!-- 是否需要回执 -->
-      <el-table-column prop="IsReturnRequired" :label="$t('trials:emailManageCfg:title:isReturnRequired')"
-        show-overflow-tooltip sortable="custom" width="140">
+      <el-table-column
+        prop="IsReturnRequired"
+        :label="$t('trials:emailManageCfg:title:isReturnRequired')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="140"
+      >
        <template slot-scope="scope">
          <el-tag v-if="scope.row.IsReturnRequired" type="danger">
            {{ $fd('YesOrNo', scope.row.IsReturnRequired) }}
@@ -157,8 +291,13 @@
        </template>
      </el-table-column>
      <!-- 是否自动发送 -->
-      <el-table-column prop="IsAutoSend" :label="$t('trials:emailManageCfg:title:isAutoSend')" show-overflow-tooltip
-        sortable="custom" width="160">
+      <el-table-column
+        prop="IsAutoSend"
+        :label="$t('trials:emailManageCfg:title:isAutoSend')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="160"
+      >
        <template slot-scope="scope">
          <el-tag v-if="scope.row.IsAutoSend" type="danger">
            {{ $fd('YesOrNo', scope.row.IsAutoSend) }}
@@ -168,8 +307,13 @@
          }}</el-tag>
        </template>
      </el-table-column>
-      <el-table-column prop="IsEnable" :label="$t('trials:emailManageCfg:table:IsEnable')" show-overflow-tooltip
-        sortable="custom" width="160">
+      <el-table-column
+        prop="IsEnable"
+        :label="$t('trials:emailManageCfg:table:IsEnable')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="160"
+      >
        <template slot-scope="scope">
          <el-tag v-if="scope.row.IsEnable" type="danger">
            {{ $fd('YesOrNo', scope.row.IsEnable) }}
@@ -180,14 +324,29 @@
        </template>
      </el-table-column>
      <!-- 更新时间 -->
-      <el-table-column prop="UpdateTime" :label="$t('trials:emailManageCfg:title:updateTime')" show-overflow-tooltip
-        sortable="custom" width="160" />
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:emailManageCfg:title:updateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="160"
+      />
      <!-- 创建时间 -->
-      <el-table-column prop="CreateTime" :label="$t('trials:emailManageCfg:title:createTime')" show-overflow-tooltip
-        sortable="custom" width="160" />
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:emailManageCfg:title:createTime')"
+        show-overflow-tooltip
+        sortable="custom"
+        width="160"
+      />
    </el-table>
-    <Pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      @pagination="getList" />
+    <Pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />
  </box-content>
 </template>
 <script>
@@ -1,5 +1,12 @@
 <template>
-  <el-form ref="emailForm" v-loading="loading" :model="form" label-width="180px" size="small" :rules="rules">
+  <el-form
+    ref="emailForm"
+    v-loading="loading"
+    :model="form"
+    label-width="180px"
+    size="small"
+    :rules="rules"
+  >
    <el-row>
      <el-col :span="24">
        <el-form-item label="Code" prop="Code">
@@ -7,111 +14,242 @@
        </el-form-item>
      </el-col>
      <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopicCN')" prop="EmailTopicCN">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+          prop="EmailTopicCN"
+        >
          <el-input style="width: 300px" disabled v-model="form.EmailTopicCN" />
        </el-form-item>
      </el-col>
      <el-col :span="12" v-else>
-        <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopic')" prop="EmailTopic">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:EmailTopic')"
+          prop="EmailTopic"
+        >
          <el-input style="width: 300px" disabled v-model="form.EmailTopic" />
        </el-form-item>
      </el-col>
      <el-col :span="24">
-        <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
-          <el-select v-model="form.BusinessScenarioEnum" disabled clearable class="mr">
-            <el-option v-for="item of $d.Email_BusinessScenario" :key="`BusinessScenarioEnum${item.label}`"
-              :label="item.label" :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+          prop="BusinessScenarioEnum"
+        >
+          <el-select
+            v-model="form.BusinessScenarioEnum"
+            disabled
+            clearable
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :key="`BusinessScenarioEnum${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:ToUserTypeList')" prop="ToUserTypeList">
-          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
-            <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:ToUserTypeList')"
+          prop="ToUserTypeList"
+        >
+          <el-select
+            v-model="form.ToUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of UserTypeList"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:CopyUserTypeList')" prop="CopyUserTypeList">
-          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
-            <el-option v-for="item of UserTypeList" :key="`CopyUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:CopyUserTypeList')"
+          prop="CopyUserTypeList"
+        >
+          <el-select
+            v-model="form.CopyUserTypeList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of UserTypeList"
+              :key="`CopyUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:blackUserIdList')" prop="blackUserIdList">
-          <el-select v-model="form.blackUserIdList" clearable multiple class="mr">
-            <el-option v-for="item of UserList" :key="`blackUserIdList${item.UserName}`"
-              :label="`${item.UserName}(${item.RealName})`" :value="item.UserId" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:blackUserIdList')"
+          prop="blackUserIdList"
+        >
+          <el-select
+            v-model="form.blackUserIdList"
+            clearable
+            multiple
+            class="mr"
+          >
+            <el-option
+              v-for="item of UserList"
+              :key="`blackUserIdList${item.UserName}`"
+              :label="`${item.UserName}(${item.RealName})`"
+              :value="item.UserId"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="24">
        <el-col :span="12">
-          <el-form-item :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" prop="EmailUrgentEnum">
-            <el-select v-model="form.EmailUrgentEnum" disabled clearable class="mr">
-              <el-option v-for="item of $d.EmailUrgent" :key="`EmailUrgent${item.label}`" :label="item.label"
-                :value="item.value" />
+          <el-form-item
+            :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+            prop="EmailUrgentEnum"
+          >
+            <el-select
+              v-model="form.EmailUrgentEnum"
+              disabled
+              clearable
+              class="mr"
+            >
+              <el-option
+                v-for="item of $d.EmailUrgent"
+                :key="`EmailUrgent${item.label}`"
+                :label="item.label"
+                :value="item.value"
+              />
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="12">
-          <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')"
-            v-if="form.EmailUrgentEnum !== 1 && IntervalShow" prop="EmailCron">
-            <el-input-number v-model="Interval" @change="handleIntervalChange" :min="1" :max="365"></el-input-number>
+          <el-form-item
+            :label="$t('trials:emailManageCfg:table:EmailCron')"
+            v-if="form.EmailUrgentEnum !== 1 && IntervalShow"
+            prop="EmailCron"
+          >
+            <el-input-number
+              v-model="Interval"
+              @change="handleIntervalChange"
+              :min="1"
+              :max="365"
+            ></el-input-number>
            <!--            <el-input style="width: 300px" readonly v-model="form.EmailCron" />-->
            <!--            <el-button type="primary" @click="showDialog">生成 cron</el-button>-->
          </el-form-item>
        </el-col>
      </el-col>
      <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:isReturnRequired')"
+          prop="IsReturnRequired"
+        >
          <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{
-              item.label }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsReturnRequired${item.value}`"
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
      </el-col>
      <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:IsAutoSend')"
+          prop="IsAutoSend"
+        >
          <el-radio-group v-model="form.IsAutoSend">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label
-            }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsAutoSend${item.value}`"
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
      </el-col>
      <el-col :span="12">
-        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:IsEnable')"
+          prop="IsEnable"
+        >
          <el-radio-group v-model="form.IsEnable">
-            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label
-            }}</el-radio>
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :label="item.value"
+              :key="`IsEnable${item.value}`"
+              >{{ item.label }}</el-radio
+            >
          </el-radio-group>
        </el-form-item>
      </el-col>
      <el-col :span="24">
-        <el-form-item :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
-          v-if="form.CriterionTypeList && form.CriterionTypeList.length > 0" prop="CriterionTypeList">
-          <el-select disabled v-model="form.CriterionTypeList" clearable class="mr" multiple>
-            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
+          v-if="form.CriterionTypeEnum && form.CriterionTypeEnum.length > 0"
+          prop="CriterionTypeEnum"
+        >
+          <el-select
+            disabled
+            v-model="form.CriterionTypeEnum"
+            clearable
+            class="mr"
+          >
+            <el-option
+              v-for="item of $d.CriterionType"
+              :key="`CriterionType${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
      </el-col>
      <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
-          <el-upload class="upload-demo" action :before-upload="beforeUploadCN" :http-request="handleUploadFileCN"
-            :on-preview="handlePreviewCN" :on-remove="handleRemoveFileCN" :show-file-list="true" :disabled="true"
-            :limit="1" :file-list="fileListCN">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:fileListCN')"
+          prop="IsEnable"
+        >
+          <el-upload
+            class="upload-demo"
+            action
+            :before-upload="beforeUploadCN"
+            :http-request="handleUploadFileCN"
+            :on-preview="handlePreviewCN"
+            :on-remove="handleRemoveFileCN"
+            :show-file-list="true"
+            :disabled="true"
+            :limit="1"
+            :file-list="fileListCN"
+          >
          </el-upload>
        </el-form-item>
      </el-col>
      <el-col :span="12" v-else>
-        <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
-          <el-upload class="upload-demo" action :before-upload="beforeUploadEN" :http-request="handleUploadFileEN"
-            :on-preview="handlePreviewEN" :on-remove="handleRemoveFileEN" :show-file-list="true" :disabled="true"
-            :limit="1" :file-list="fileListEN">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:fileListEN')"
+          prop="IsEnable"
+        >
+          <el-upload
+            class="upload-demo"
+            action
+            :before-upload="beforeUploadEN"
+            :http-request="handleUploadFileEN"
+            :on-preview="handlePreviewEN"
+            :on-remove="handleRemoveFileEN"
+            :show-file-list="true"
+            :disabled="true"
+            :limit="1"
+            :file-list="fileListEN"
+          >
          </el-upload>
        </el-form-item>
      </el-col>
@@ -132,14 +270,26 @@
    <!--        :autosize="{ minRows: 8, maxRows: 8}"-->
    <!--      />-->
    <!--    </el-form-item>-->
-    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px; padding-bottom: 10px">
+    <div
+      class="base-dialog-footer"
+      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
+    >
      <el-form-item style="text-align: right">
        <el-button size="small" type="primary" @click="handleSave">
-          {{ $t('common:button:save') }}</el-button>
+          {{ $t('common:button:save') }}</el-button
+        >
      </el-form-item>
    </div>
-    <el-dialog append-to-body :title="$t('trials:emailManageCfg:button:generate')" :visible.sync="showCron">
-      <vcrontab @hide="showCron = false" @fill="crontabFill" :expression="expression"></vcrontab>
+    <el-dialog
+      append-to-body
+      :title="$t('trials:emailManageCfg:button:generate')"
+      :visible.sync="showCron"
+    >
+      <vcrontab
+        @hide="showCron = false"
+        @fill="crontabFill"
+        :expression="expression"
+      ></vcrontab>
    </el-dialog>
  </el-form>
 </template>
@@ -195,7 +345,6 @@ export default {
        IsEnable: true,
        IsAutoSend: true,
        CriterionTypeEnum: null,
-        CriterionTypeList: [],
        FromEmail: '',
        FromName: '',
        AuthorizationCode: '',
@@ -3,30 +3,63 @@
    <template slot="search-container">
      <el-form :inline="true" size="small">
        <!-- 业务场景 -->
-        <el-form-item :label="$t('trials:emailManageCfg:title:businessScenario')">
-          <el-select v-model="searchData.BusinessScenarioEnum" style="width: 150px">
-            <el-option v-for="item of $d.Email_BusinessScenario" :key="item.value" :label="item.label"
-              :value="item.value" />
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:businessScenario')"
+        >
+          <el-select
+            v-model="searchData.BusinessScenarioEnum"
+            style="width: 150px"
+          >
+            <el-option
+              v-for="item of $d.Email_BusinessScenario"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
-        <el-form-item v-if="isDistinguishCriteria" style="margin-bottom: 10px"
-          :label="$t('trials:reviewTrack:table:criterionName')">
-          <el-select v-model="searchData.TrialReadingCriterionId" clearable style="width: 120px">
-            <el-option v-for="item of trialCriterionList"
-              :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.TrialReadingCriterionId"
-              :label="item.TrialReadingCriterionName" />
+        <el-form-item
+          v-if="isDistinguishCriteria"
+          style="margin-bottom: 10px"
+          :label="$t('trials:reviewTrack:table:criterionName')"
+        >
+          <el-select
+            v-model="searchData.TrialReadingCriterionId"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of trialCriterionList"
+              :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId"
+              :value="item.TrialReadingCriterionId"
+              :label="item.TrialReadingCriterionName"
+            />
          </el-select>
        </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+          prop="ToUserTypeList"
+        >
          <el-select v-model="searchData.ToUserType" clearable class="mr">
-            <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of UserTypeList"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
-        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
+        <el-form-item
+          :label="$t('trials:emailManageCfg:table:IsEnable')"
+          prop="IsEnable"
+        >
          <el-select v-model="searchData.IsEnable" clearable class="mr">
-            <el-option v-for="item of $d.YesOrNo" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              :value="item.value" />
+            <el-option
+              v-for="item of $d.YesOrNo"
+              :key="`ToUserTypeList${item.label}`"
+              :label="item.label"
+              :value="item.value"
+            />
          </el-select>
        </el-form-item>
        <el-form-item>
@@ -35,11 +68,21 @@
            {{ $t('common:button:search') }}
          </el-button>
          <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
            {{ $t('common:button:reset') }}
          </el-button>
-          <el-button v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])" type="primary"
-            icon="el-icon-plus" size="small" :disabled="isEdit" @click="handleAddDefault">
+          <el-button
+            v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])"
+            type="primary"
+            icon="el-icon-plus"
+            size="small"
+            :disabled="isEdit"
+            @click="handleAddDefault"
+          >
            {{ $t('trials:emailManageCfg:button:Default') }}
          </el-button>
        </el-form-item>
@@ -47,7 +90,13 @@
      <!-- 自定义标准允许添加 -->
    </template>
    <template slot="main-container">
-      <el-table ref="emailList" v-loading="loading" :data="list" stripe @sort-change="handleSortChange">
+      <el-table
+        ref="emailList"
+        v-loading="loading"
+        :data="list"
+        stripe
+        @sort-change="handleSortChange"
+      >
        <el-table-column type="index" width="40" />
        <!-- Code -->
        <!-- <el-table-column
@@ -57,34 +106,63 @@
          show-overflow-tooltip
          width="100"
        /> -->
-        <el-table-column v-if="isDistinguishCriteria" prop="CriterionTypeList"
-          :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" width="120">
+        <el-table-column
+          v-if="isDistinguishCriteria"
+          prop="TrialReadingCriterionId"
+          :label="$t('trials:reviewTrack:table:criterionName')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="120"
+        >
          <template slot-scope="scope">
-            {{scope.row.CriterionTypeList && scope.row.CriterionTypeList.length > 0 ?
-              scope.row.CriterionTypeList.map(item => { return $fd('CriterionType', item) }
-              ).join(', ') : ''}}
+            {{ scope.row.TrialCriterionName }}
          </template>
        </el-table-column>
-        <el-table-column v-if="$i18n.locale === 'zh'" prop="EmailTopicCN"
-          :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom" show-overflow-tooltip
-          min-width="140" />
-        <el-table-column v-else prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')"
-          sortable="custom" show-overflow-tooltip min-width="140" />
-        <el-table-column prop="BusinessModuleEnum" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
-          sortable="custom" show-overflow-tooltip min-width="100">
+        <el-table-column
+          v-if="$i18n.locale === 'zh'"
+          prop="EmailTopicCN"
+          :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+          sortable="custom"
+          show-overflow-tooltip
+          min-width="140"
+        />
+        <el-table-column
+          v-else
+          prop="EmailTopic"
+          :label="$t('trials:emailManageCfg:table:EmailTopic')"
+          sortable="custom"
+          show-overflow-tooltip
+          min-width="140"
+        />
+        <el-table-column
+          prop="BusinessModuleEnum"
+          :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
+          sortable="custom"
+          show-overflow-tooltip
+          min-width="100"
+        >
          <template slot-scope="scope">
            {{ $fd('BusinessModule', scope.row.BusinessModuleEnum) }}
          </template>
        </el-table-column>
-        <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
-          sortable="custom" show-overflow-tooltip min-width="100">
+        <el-table-column
+          prop="BusinessScenarioEnum"
+          :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+          sortable="custom"
+          show-overflow-tooltip
+          min-width="100"
+        >
          <template slot-scope="scope">
            {{ $fd('Email_BusinessScenario', scope.row.BusinessScenarioEnum) }}
          </template>
        </el-table-column>
        <!-- 收件人 -->
-        <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          show-overflow-tooltip min-width="100">
+        <el-table-column
+          prop="ToUserTypeList"
+          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
+          show-overflow-tooltip
+          min-width="100"
+        >
          <template slot-scope="scope">
            {{
              scope.row.ToUserTypeNameList.length > 0
@@ -94,8 +172,12 @@
          </template>
        </el-table-column>
        <!-- 抄送人 -->
-        <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-          show-overflow-tooltip min-width="100">
+        <el-table-column
+          prop="CopyUserTypeList"
+          :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
+          show-overflow-tooltip
+          min-width="100"
+        >
          <template slot-scope="scope">
            {{
              scope.row.CopyUserTypeNameList.length > 0
@@ -122,18 +204,36 @@
        <!--          width="160"-->
        <!--        />-->
        <!-- 附件 -->
-        <el-table-column v-if="$i18n.locale === 'zh' && isDistinguishCriteria" prop="AttachNameCN"
-          :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
+        <el-table-column
+          v-if="$i18n.locale === 'zh' && isDistinguishCriteria"
+          prop="AttachNameCN"
+          :label="$t('trials:emailManageCfg:title:fileName')"
+          show-overflow-tooltip
+          min-width="140"
+        >
          <template slot-scope="scope">
-            <span v-if="scope.row.AttachCNPath" @click="handlePreview(scope.row.AttachCNPath)"
-              style="cursor: pointer; color: #428bca">{{ scope.row.AttachNameCN }}</span>
+            <span
+              v-if="scope.row.AttachCNPath"
+              @click="handlePreview(scope.row.AttachCNPath)"
+              style="cursor: pointer; color: #428bca"
+              >{{ scope.row.AttachNameCN }}</span
+            >
          </template>
        </el-table-column>
-        <el-table-column v-if="$i18n.locale === 'en' && isDistinguishCriteria" prop="AttachName"
-          :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
+        <el-table-column
+          v-if="$i18n.locale === 'en' && isDistinguishCriteria"
+          prop="AttachName"
+          :label="$t('trials:emailManageCfg:title:fileName')"
+          show-overflow-tooltip
+          min-width="140"
+        >
          <template slot-scope="scope">
-            <span v-if="scope.row.AttachPath" @click="handlePreview(scope.row.AttachPath)"
-              style="cursor: pointer; color: #428bca">{{ scope.row.AttachName }}</span>
+            <span
+              v-if="scope.row.AttachPath"
+              @click="handlePreview(scope.row.AttachPath)"
+              style="cursor: pointer; color: #428bca"
+              >{{ scope.row.AttachName }}</span
+            >
          </template>
        </el-table-column>
        <!-- 是否需要回执 -->
@@ -167,8 +267,13 @@
          </template>
        </el-table-column> -->
        <!-- 是否启用 -->
-        <el-table-column prop="IsEnable" :label="$t('trials:emailManageCfg:table:IsEnable')" show-overflow-tooltip
-          sortable="custom" min-width="90">
+        <el-table-column
+          prop="IsEnable"
+          :label="$t('trials:emailManageCfg:table:IsEnable')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="90"
+        >
          <template slot-scope="scope">
            <el-tag v-if="scope.row.IsEnable" type="danger">
              {{ $fd('YesOrNo', scope.row.IsEnable) }}
@@ -179,37 +284,84 @@
          </template>
        </el-table-column>
        <!-- 更新时间 -->
-        <el-table-column prop="UpdateTime" :label="$t('trials:emailManageCfg:title:updateTime')" show-overflow-tooltip
-          sortable="custom" min-width="100" />
+        <el-table-column
+          prop="UpdateTime"
+          :label="$t('trials:emailManageCfg:title:updateTime')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        />
        <!-- 创建时间 -->
-        <el-table-column prop="CreateTime" :label="$t('trials:emailManageCfg:title:createTime')" show-overflow-tooltip
-          sortable="custom" min-width="100" />
+        <el-table-column
+          prop="CreateTime"
+          :label="$t('trials:emailManageCfg:title:createTime')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        />

-        <el-table-column v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])" width="120"
-          :label="$t('common:action:action')" fixed="right">
+        <el-table-column
+          v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])"
+          width="120"
+          :label="$t('common:action:action')"
+          fixed="right"
+        >
          <template slot-scope="scope">
            <!-- 编辑 -->
-            <el-button icon="el-icon-edit-outline" circle :disabled="isEdit" :title="$t('common:button:edit')"
-              @click="handleEdit(scope.row)" />
+            <el-button
+              icon="el-icon-edit-outline"
+              circle
+              :disabled="isEdit"
+              :title="$t('common:button:edit')"
+              @click="handleEdit(scope.row)"
+            />
            <!-- 编辑 -->
-            <el-button icon="el-icon-delete" circle :disabled="isEdit" :title="$t('common:button:delete')"
-              @click="deleteTrialEmailNoticeConfig(scope.row)" />
+            <el-button
+              icon="el-icon-delete"
+              circle
+              :disabled="isEdit"
+              :title="$t('common:button:delete')"
+              @click="deleteTrialEmailNoticeConfig(scope.row)"
+            />
          </template>
        </el-table-column>
      </el-table>

      <!-- 新增/编辑 -->
-      <el-dialog v-if="editDialog.visible" :visible.sync="editDialog.visible" :close-on-click-modal="false"
-        :title="editDialog.title" fullscreen custom-class="base-dialog-wrapper">
-        <EmailForm :data="currentRow" :criterion-type="criterionType" :is-distinguish-criteria="isDistinguishCriteria"
-          :UserTypeList="UserTypeList" @closeDialog="closeDialog" @getList="getList" />
+      <el-dialog
+        v-if="editDialog.visible"
+        :visible.sync="editDialog.visible"
+        :close-on-click-modal="false"
+        :title="editDialog.title"
+        fullscreen
+        custom-class="base-dialog-wrapper"
+      >
+        <EmailForm
+          :data="currentRow"
+          :criterion-type="criterionType"
+          :is-distinguish-criteria="isDistinguishCriteria"
+          :UserTypeList="UserTypeList"
+          @closeDialog="closeDialog"
+          @getList="getList"
+        />
      </el-dialog>
      <!-- 新增默认问题 -->
-      <el-dialog v-if="addVisible" :visible.sync="addVisible" width="1300px" :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper" :title="$t('trials:emailManageCfg:button:Default')">
+      <el-dialog
+        v-if="addVisible"
+        :visible.sync="addVisible"
+        width="1300px"
+        :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper"
+        :title="$t('trials:emailManageCfg:button:Default')"
+      >
        <div class="base-dialog-body">
-          <DefaultQS @getList="getList" :is-distinguish-criteria="isDistinguishCriteria" :isShow="isBtnShow"
-            :UserTypeList="UserTypeList" @close="addVisible = false" />
+          <DefaultQS
+            @getList="getList"
+            :is-distinguish-criteria="isDistinguishCriteria"
+            :isShow="isBtnShow"
+            :UserTypeList="UserTypeList"
+            @close="addVisible = false"
+          />
        </div>
      </el-dialog>
    </template>
@@ -1,191 +0,0 @@
-<template>
-    <BoxContent style="min-height: 100%; background: #fff">
-        <div class="inspection-content" v-loading="loading">
-            <!-- <div class="top">
-                <span class="title">{{ this.$t("trials:setting:inspection:module") }}</span>
-                <span>{{ this.$t("trials:setting:inspection:optName") }}</span>
-            </div> -->
-            <el-tree :data="tree" show-checkbox node-key="id" :expand-on-click-node="false" ref="tree">
-                <span class="custom-tree-node" slot-scope="{ node }">
-                    <span>{{ node.label }}</span>
-                    <!-- <span>
-                        {{ node.data.optName }}
-                    </span> -->
-                </span>
-            </el-tree>
-        </div>
-        <div class="btnBox">
-            <el-button @click.stop="getCheckedNodes" type="primary"
-                v-if="hasPermi(['trials:setting:inspection:update'])" class="btn">
-                {{ $t('common:button:save') }}
-            </el-button>
-        </div>
-    </BoxContent>
-</template>
-<script>
-import BoxContent from '@/components/BoxContent'
-import {
-    getTrialShowInspection,
-    setTrialShowInspection
-} from '@/api/trials'
-export default {
-    components: { BoxContent },
-    data() {
-        return {
-            loading: false,
-            tree: [
-                {
-                    id: 1,
-                    label: this.$t("trials:setting:inspection:module"),
-                    optName: this.$t("trials:setting:inspection:optName"),
-                }
-            ],
-            list: []
-        }
-    },
-    created() {
-        this.getTree()
-    },
-    computed: {
-        isEN() {
-            return this.$i18n.locale !== 'zh'
-        }
-    },
-    methods: {
-        async getCheckedNodes() {
-            try {
-                this.loading = true
-                let ids = this.$refs.tree.getCheckedKeys()
-                let list = []
-                this.list.forEach(item => {
-                    let obj = {
-                        FrontAuditConfigId: item.FrontAuditConfigId,
-                        isShow: false
-                    }
-                    if (ids.includes(item.FrontAuditConfigId)) {
-                        obj.isShow = true
-                    }
-                    list.push(obj)
-                })
-                let data = {
-                    TrialId: this.$route.query.trialId,
-                    TrialShowInspectionList: list
-                }
-                let res = await setTrialShowInspection(data)
-                if (res.IsSuccess) {
-                    this.getTree()
-                }
-            } catch (err) {
-                console.log(err)
-            }
-        },
-        async getTree() {
-            try {
-                let data = {
-                    TrialId: this.$route.query.trialId
-                }
-                this.loading = true
-                let res = await getTrialShowInspection(data);
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = this.formatList(res.Result)
-                    let { tree, ids } = this.formatTree(res.Result);
-                    this.tree = tree
-                    this.$nextTick(() => {
-                        this.$refs.tree.setCheckedKeys(ids)
-                    })
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        formatTree(list) {
-            let tree = [], ids = []
-            list.forEach(item => {
-                let obj = {
-                    id: item.FrontAuditConfigId,
-                    label: this.isEN ? item.Description : item.DescriptionCN
-                }
-                if (item.IsShow) {
-                    ids.push(item.FrontAuditConfigId)
-                }
-                if (item.Children && item.Children.length > 0) {
-                    obj.children = []
-                    item.Children.forEach(it => {
-                        let o = {
-                            id: it.FrontAuditConfigId,
-                            label: this.isEN ? it.Description : it.DescriptionCN
-                        }
-                        if (it.IsShow) {
-                            ids.push(it.FrontAuditConfigId)
-                        }
-                        obj.children.push(o)
-                    })
-                }
-                tree.push(obj)
-            })
-            return { tree, ids }
-        },
-        formatList(list) {
-            let arr = []
-            list.forEach(item => {
-                let obj = {
-                    FrontAuditConfigId: item.FrontAuditConfigId,
-                    ParentId: item.ParentId
-                }
-                arr.push(obj)
-                if (item.Children && item.Children.length > 0) {
-                    item.Children.forEach(it => {
-                        let o = {
-                            FrontAuditConfigId: it.FrontAuditConfigId,
-                            ParentId: it.ParentId
-                        }
-                        arr.push(o)
-                    })
-                }
-            })
-            return arr;
-        }
-    }
-
-}
-</script>
-<style lang="scss" scoped>
-.inspection-content {
-    width: 40%;
-    min-height: 500px;
-
-    .top {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 20px;
-        padding-top: 20px;
-
-        .title {
-            width: 70%;
-        }
-
-        span {
-            display: inline-block;
-        }
-    }
-
-    .custom-tree-node {
-        width: 100%;
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        padding: 0 20px 0 0;
-    }
-}
-
-.btnBox {
-    width: 40%;
-    padding: 0 20px 20px;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-}
-</style>
@@ -738,7 +738,7 @@ export default {
    },
    handleIsDeletedChanged(val) {
      if (val) {
-        // this.statusForm.joinTime = ''
+        this.statusForm.joinTime = ''
      } else {
        this.statusForm.removeTime = ''
      }
@@ -21,14 +21,7 @@
      </div>
      <el-table :data="question.TableQuestions.Answers">
        <el-table-column v-for="item of question.TableQuestions.Questions" :key="item.Id" :prop="item.Id"
-          :label="item.QuestionName" min-width="100" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="item.Unit">{{ scope.row[item.Id] }}{{ item.Unit !== 4 ? $fd('ValueUnit', item.Unit)
-              : item.ValueType === 2 ? '%' :
-                item.CustomUnit }}</span>
-            <span v-else>{{ scope.row[item.Id] }}</span>
-          </template>
-        </el-table-column>
+          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
      </el-table>
    </div>
    <template v-else>
@@ -149,22 +142,12 @@
        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
          @change="(val) => { formItemNumberChange(val, question) }">
          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
        </el-select>
        <el-input v-else-if="question.Type === 'number' && question.DataSource !== 1"
-          v-model="questionForm[question.Id]" type="number" @change="(val) => { formItemNumberChange(val, question) }">
-          <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="append">%</template>
-        </el-input>
+          v-model="questionForm[question.Id]" type="number"
+          @change="(val) => { formItemNumberChange(val, question) }" />
        <el-input v-else-if="question.Type === 'number' && question.DataSource === 1"
-          v-model="questionForm[question.Id]" :disabled="question.DataSource === 1">
-          <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-            question.CustomUnit }}</template>
-          <template v-else-if="question.ValueType === 2" slot="append">%</template>
-        </el-input>
+          v-model="questionForm[question.Id]" :disabled="question.DataSource === 1" />
        <!-- 上传图像 -->
        <el-upload v-if="question.Type === 'upload'" action :accept="question.FileType"
          :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100" :on-preview="handlePictureCardPreview"
@@ -406,9 +389,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  });
                  break;
                case 6:
@@ -424,9 +404,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  });
                  break;
                case 7:
@@ -442,9 +419,6 @@ export default {
                    if (q[o.TableQuestionId] === 'NE') {
                      isNE = true
                    }
-                    if (q[o.TableQuestionId] === 'NE') {
-                      isNE = true
-                    }
                  });
                  num =
                    this.questionForm[o.QuestionId].length === 0
@@ -488,9 +462,6 @@ export default {

            }
          } else {
-            if (this.questionForm[o.TableQuestionId] === 'NE') {
-              isNE = true
-            }
            switch (rules.CustomCalculateMark) {
              case 1:
                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -604,6 +575,7 @@ export default {
            arr = [];
          let isNE = false
          CalculateQuestions.forEach((o, i) => {
+            console.log(this.QuestionsForm[o.TableQuestionId], 'this.QuestionsForm[o.TableQuestionId]')
            if (this.QuestionsForm[o.TableQuestionId] === 'NE') {
              isNE = true
            }
@@ -921,16 +893,6 @@ export default {
  }
 }

-::v-deep .el-select .el-input__prefix {
-  left: calc(100% - 50px);
-  cursor: pointer;
-}
-
-::v-deep .el-select .el-input__inner {
-  padding-left: 15px;
-  padding-right: 50px;
-}
-
 .criterion-form-item {
  .el-form-item {
    display: flex;
@@ -2,88 +2,167 @@
  <div class="criterion-form-item">

    <el-form-item
-      v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-      :label="`${question.QuestionName}`" :prop="questionForm[question.Id]" :rules="[
-        {
-          required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(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' : '']">
+      v-if="(question.ShowQuestion===1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion===0"
+      :label="`${question.QuestionName}`"
+      :prop="questionForm[question.Id]"
+      :rules="[
+        { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(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==='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-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
+      <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) })">
+        @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]" />
+          <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" />
+          <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 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" />
+          <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">
+      <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">
+      <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>

      <!-- 自动计算 -->
      <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]" disabled />
+      <el-input
+        v-if="question.Type==='calculation'"
+        v-model="questionForm[question.Id]"
+        disabled
+      />
      <!-- 自动计算 -->
-      <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType" />
-      <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType" @change="(val) => { formItemChange(val, question) }">
-        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
+      <el-input
+        v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+        v-model="questionForm[question.Id]"
+        :disabled="!question.ClassifyEditType"
+      />
+      <el-select
+        v-if="question.Type === 'class' && question.ClassifyShowType === 2"
+        v-model="questionForm[question.Id]"
+        :disabled="!question.ClassifyEditType"
+        @change="(val) => { formItemChange(val, question) }"
+      >
+        <el-option
+          v-for="val in question.TypeValue.split('|')"
+          :key="val"
+          :label="val.trim()"
+          :value="val.trim()"
+        />
      </el-select>
-      <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType"
-        @change="(val) => { formItemChange(val, question) }">
-        <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
+      <el-radio-group
+        v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+        v-model="questionForm[question.Id]"
+        :disabled="!question.ClassifyEditType"
+        @change="(val) => { formItemChange(val, question) }"
+      >
+        <el-radio
+          v-for="item of question.TypeValue.split('|')"
+          :key="item.trim()"
+          :label="item.trim()"
+        >
          {{ item.trim() }}
        </el-radio>
      </el-radio-group>
-
+      
      <!-- 自增 -->
-      <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
+      <el-input
+        v-if="question.Type==='increment'"
+        v-model="questionForm[question.Id]"
+        disabled
+      />
      <!-- 数值 -->
      <!-- :precision="2" :step="0.1" :max="10" -->
-      <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-        @change="((val) => { formItemChange(val, question) })">
-        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-        <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
-        <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
+      <el-select
+        v-if="question.Type === 'number' && question.TypeValue"
+        v-model="questionForm[question.Id]"
+        clearable
+        @change="((val)=>{formItemNumberChange(val, question)})"
+      >
+        <el-option
+          v-for="val in question.TypeValue.split('|')"
+          :key="val"
+          :label="val"
+          :value="val"
+        />
      </el-select>
-      <el-input v-else-if="question.Type === 'number' && question.DataSource !== 1" v-model="questionForm[question.Id]"
-        type="number" @change="((val) => { formItemNumberChange(val, question) })">
-        <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          question.CustomUnit }}</template>
+      <el-input
+        v-else-if="question.Type === 'number' && question.DataSource !== 1"
+        v-model="questionForm[question.Id]"
+        type="number"
+        @change="((val)=>{formItemNumberChange(val, question)})"
+      >
+        <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}</template>
        <template v-else-if="question.ValueType === 2" slot="append">%</template>
      </el-input>
      <el-input
@@ -95,26 +174,51 @@
        <template v-else-if="question.ValueType === 2" slot="append">%</template>
      </el-input>
      <!-- 上传图像 -->
-      <el-upload v-if="question.Type === 'upload'" action :accept="question.FileType"
-        :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100" :on-preview="handlePictureCardPreview"
-        :before-upload="handleBeforeUpload" :http-request="uploadScreenshot" list-type="picture-card"
-        :on-remove="handleRemove" :file-list="fileList" :class="{ disabled: fileList.length >= question.ImageCount }">
+      <el-upload
+        v-if="question.Type==='upload'"
+        action
+        :accept="question.FileType"
+        :limit="question.ImageCount > 0 ? parseInt(question.ImageCount) : 100"
+        :on-preview="handlePictureCardPreview"
+        :before-upload="handleBeforeUpload"
+        :http-request="uploadScreenshot"
+        list-type="picture-card"
+        :on-remove="handleRemove"
+        :file-list="fileList"
+        :class="{disabled:fileList.length >= question.ImageCount}"
+      >
        <i slot="default" class="el-icon-plus" />
        <div slot="file" slot-scope="{file}">
-          <img class="el-upload-list__item-thumbnail" crossorigin="anonymous" :src="OSSclientConfig.basePath + file.url"
-            alt="">
+          <img
+            class="el-upload-list__item-thumbnail"
+            crossorigin="anonymous"
+            :src="OSSclientConfig.basePath + file.url"
+            alt=""
+          >
          <span class="el-upload-list__item-actions">
-            <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+            <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)">
+            <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-dialog
+        v-if="question.Type==='upload'"
+        append-to-body
+        :visible.sync="imgVisible"
+        width="600px"
+      >
        <el-image :src="imageUrl" crossorigin="anonymous" width="100%">
          <div slot="placeholder" class="image-slot">
            加载中<span class="dot">...</span>
@@ -192,7 +296,7 @@ export default {
        this.question.ClassifyAlgorithms
      );
    }
-
+    
    if (this.question.Type === 'upload') {
      if (this.questionForm[this.question.Id]) {
        this.urls = this.questionForm[this.question.Id].split('|')
@@ -248,9 +352,7 @@ export default {
      }
    },
    formItemNumberChange(v, question) {
-      // this.$emit('formItemTableNumberChange', v, question)
-      this.$emit('formItemTableNumberChange')
-      this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
+      this.$emit('formItemTableNumberChange', v, question)
    },
    resetChild(obj) {
      obj.forEach(i => {
@@ -267,7 +369,7 @@ export default {
      this.$emit('setFormItemData', obj)
    },
    uploadScreenshot(param) {
-
+      
    },
    handleBeforeUpload(file) {
      // 检测文件类型是否符合要求
@@ -304,50 +406,34 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog {
-  .criterion-form-item {
-    ::v-deep .el-form-item__content {
+.my_dialog{
+  .criterion-form-item{
+    ::v-deep .el-form-item__content{
      width: auto;
    }
  }
 }
-
-::v-deep .el-select .el-input__prefix {
-  left: calc(100% - 50px);
-  cursor: pointer;
-}
-
-::v-deep .el-select .el-input__inner {
-  padding-left: 15px;
-  padding-right: 50px;
-}
-
-.criterion-form-item {
-  .el-form-item {
+.criterion-form-item{
+  .el-form-item{
    display: flex;
    flex-direction: row;
    align-items: flex-start;
  }
-
-  ::v-deep .el-form-item__content {
+  ::v-deep .el-form-item__content{
    width: 500px;
  }
-
-  .el-input {
-    width: 100%;
+  .el-input{
+    width:100%;
  }
-
-  .mb {
+  .mb{
    margin-bottom: 0px;
  }
-
-  .disabled {
+  .disabled{
    ::v-deep .el-upload--picture-card {
      display: none;
    }
  }
-
-  .uploadWrapper {
+  .uploadWrapper{
    display: flex;
    flex-direction: column;
    align-items: flex-start;
@@ -28,7 +28,7 @@
            <template v-else>
              <el-option
                v-for="item of $d.Criterion_Question_Type"
-                v-show="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table' && item.value !== 'fixedTable'"
+                v-show="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table'"
                :key="item.value"
                :value="item.value"
                :label="item.label"
@@ -727,63 +727,6 @@
          }}
        </div>
      </div>
-      <!-- 影像标记:disabled="form.IsRequired === 0" -->
-      <el-form-item
-        v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
-        :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')"
-        prop="ImageMarkEnum"
-      >
-        <el-radio-group
-          v-model="form.ImageMarkEnum"
-          
-          @change="imageMarkEnumChange"
-        >
-          <el-radio v-for="item of $d.ImageMark" :key="item.id" :label="item.value" :disabled="form.IsRequired === 2 && item.value === 1">{{ item.label }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 测量工具 ImageTool -->
-      <el-form-item
-        v-if="form.ImageMarkEnum === 1 || form.ImageMarkEnum === 2"
-        :label="$t('trials:readingUnit:qsList:title:ImageTool')"
-        prop="ImageTool"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select')}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ImageTool"
-          @change="imageToolChange"
-        >
-          <el-radio 
-            v-for="tool of readingTools" 
-            :key="tool.toolName" 
-            :label="tool.toolName" 
-          >
-            {{ $t(tool.i18nKey) }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 测量值 ImageToolAttribute -->
-      <el-form-item
-        v-if="form.ImageTool && imageToolAttributes.length > 0"
-        :label="$t('trials:readingUnit:qsList:title:ImageToolAttribute')"
-        prop="ImageToolAttribute"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select')}
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ImageToolAttribute"
-        >
-          <el-radio 
-            v-for="i of imageToolAttributes" 
-            :key="i" 
-            :label="i" 
-          >
-            {{ i }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
      <!-- 最大上传个数 -->
      <el-form-item 
        v-if="form.Type === 'upload'" 
@@ -1075,16 +1018,6 @@ export default {
    isLook: {
      type: Boolean,
      default: true
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingVersionEnum: {
-      type: Number,
-      default: 0
    }
  },

@@ -1138,14 +1071,9 @@ export default {
        ExportResult: [],
        ClassifyType: null,
        ClassifyEditType: null,
-        ClassifyShowType: null,
-        ImageMarkEnum: 0,
-        ImageTool: '',
-        ImageToolAttribute: '',
-        
+        ClassifyShowType: null
        // IsEnable: true
      },
-      imageToolAttributes: [],
      rules: {
        Type: [
          {required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change']}
@@ -1421,9 +1349,6 @@ export default {
            }
          }
        }
-        if (this.form.ImageTool) {
-          this.imageToolChange(this.form.ImageTool)
-        }
      }
      if (!this.data.ShowOrder && this.data.ShowOrder !== 0) {
        if (this.list.length > 0) {
@@ -1531,27 +1456,9 @@ export default {
        form.RelevanceId = ''
        form.RelevanceValueList = []
      }
-      // if (val === 0 && form.Type === 'number' && !this.isFromSystem) {
-      //   form.ImageMarkEnum = 1
-      // }
-      if (val === 2 && form.Type === 'number' && !this.isFromSystem) {
-        form.ImageMarkEnum = 0
-      }
-    },
-    imageMarkEnumChange(val) {
-      if (val === 0) {
-        this.form.ImageTool = ''
-        this.form.ImageToolAttribute = ''
-        this.imageToolAttributes = []
-      }
-    },
-    imageToolChange(v) {
-      let i = this.readingTools.findIndex(tool=>tool.toolName === v)
-      if (i > -1) {
-        this.imageToolAttributes = this.readingTools[i].props
-      }
    },
    parentQuestionChange(val, form) {
+      console.log(val)
      this.isParentExistGroup = false
      if (val) {
        var index = this.parentOptions.findIndex(item => {
@@ -1643,10 +1550,6 @@ export default {
      form.ExportResult = []
      form.ClassifyType = null
      form.ClassifyShowType = null
-      form.ImageMarkEnum = 0
-      form.ImageTool = ''
-      form.ImageToolAttribute = ''
-      this.imageToolAttributes = []
    },
    getLesionType() {
      return new Promise((resolve, reject) => {
@@ -210,14 +210,12 @@
      append-to-body
      custom-class="base-dialog-wrapper"
    >
-      <questions-form
+      <QuestionsForm
        ref="addOrEdit"
        :data="rowData"
        :trial-criterion-id="trialCriterionId"
        :is-from-system="isFromSystem"
        :digit-places="digitPlaces"
-        :readingTools="readingTools"
-        :readingVersionEnum="readingVersionEnum"
        :list="tblList"
        :is-look="isLook"
        :is-system-criterion="isSystemCriterion"
@@ -233,7 +231,7 @@
      :title="preview.title"
      :fullscreen="true"
    >
-      <questions-preview :criterion-id="trialCriterionId" :is-system-criterion="isSystemCriterion" :form-type="1" />
+      <QuestionsPreview :criterion-id="trialCriterionId" :is-system-criterion="isSystemCriterion" :form-type="1" />
    </el-dialog>

    <el-dialog
@@ -243,14 +241,12 @@
      :title="config.title"
      :fullscreen="true"
    >
-      <table-qs-list
+      <TableQsList
        :digit-places="digitPlaces"
        :reading-question-id="rowData.Id"
        :is-from-system="isFromSystem"
        :is-confirm="isConfirm"
        :criterion-id="trialCriterionId"
-        :readingTools="readingTools"
-        :readingVersionEnum="readingVersionEnum"
        @close="config.visible = false"
      />
    </el-dialog>
@@ -303,16 +299,6 @@ export default {
    isFromSystem: {
      type: Boolean,
      default: true
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingVersionEnum: {
-      type: Number,
-      default: 0
    }

  },
@@ -335,6 +321,7 @@ export default {
  },
  mounted() {
    this.tblList = this.list
+    console.log('ql', this.isSystemCriterion)
  },
  methods: {
    getList() {
@@ -10,7 +10,7 @@
    >
      <!-- '表单问题' -->
      <el-form-item :label="$t('trials:readingUnit:readingCriterion:title:formQs')">
-        <questions-list
+        <QuestionsList
          :ref="`questionList${trialReadingCriterionId}`"
          v-if="form.FormType===1"
          :trial-reading-criterion-id="trialReadingCriterionId"
@@ -20,8 +20,6 @@
          :is-system-criterion="isSystemCriterion"
          :is-from-system="readingInfo.IsFromSystem"
          :digit-places="digitPlaces"
-          :readingTools="readingTools"
-          :readingVersionEnum="readingVersionEnum"
          @reloadArbitrationRules="reloadArbitrationRules"
        />
      </el-form-item>
@@ -79,12 +77,6 @@ export default {
    isAdditionalAssessment: {
      type: Boolean,
      default: false
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
    }
  },
  data() {
@@ -107,8 +99,7 @@ export default {
      readingInfo: {},
      isConfirm: true,
      configBaseDataVisible: false,
-      additionalAssessmentOptionList: null,
-      readingVersionEnum: 0
+      additionalAssessmentOptionList: null
    }
  },
  mounted() {
@@ -127,7 +118,6 @@ export default {
        }
        getTrialReadingCriterionInfo({ trialId, TrialReadingCriterionId: this.trialReadingCriterionId }).then(res => {
          this.loading = false
-          this.readingVersionEnum = res.OtherInfo.ReadingVersionEnum
          this.readingInfo = res.Result
          for (const k in this.form) {
            if (res.Result.hasOwnProperty(k)) {
@@ -136,6 +126,7 @@ export default {
          }
          this.isConfirm = res.Result.IsSign
          this.isSystemCriterion = res.Result.IsSystemCriterion
+          console.log(this.isSystemCriterion)
        }).catch(() => {
          this.loading = false
        })
@@ -146,6 +137,7 @@ export default {
    // 配置信息保存
    handleSave(isPrompt = true) {
      return new Promise((resolve, reject) => {
+        console.log(this.form)
        this.$refs['readingCriterionsForm'].validate((valid) => {
          if (!valid) {
            resolve(false)
@@ -1,182 +1,350 @@
 <template>
  <div class="reading-rule-config-form">
    <!-- 配置信息表单 -->
-    <el-form ref="readingRulesForm" v-loading="loading" :model="form" style="width: 800px" :rules="rules"
-      label-width="340px" size="small">
+    <el-form
+      ref="readingRulesForm"
+      v-loading="loading"
+      :model="form"
+      style="width: 800px"
+      :rules="rules"
+      label-width="340px"
+      size="small"
+    >
      <!-- 阅片平台 -->
-      <el-form-item :label="$t('trials:processCfg:form:imagePlatform')" prop="ImagePlatform">
-        <el-radio-group v-model="form.ImagePlatform" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
+      <el-form-item
+        :label="$t('trials:processCfg:form:imagePlatform')"
+        prop="ImagePlatform"
+      >
+        <el-radio-group
+          v-model="form.ImagePlatform"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
          <template v-if="isUSA">
-            <el-radio v-for="item of $d.ImagePlatformUSA" :key="item.id" :label="item.value">
+            <el-radio
+              v-for="item of $d.ImagePlatformUSA"
+              :key="item.id"
+              :label="item.value"
+            >
              {{ item.label }}
            </el-radio>
          </template>
          <template v-else>
-            <el-radio v-for="item of $d.ImagePlatform" :key="item.id" :label="item.value">
+            <el-radio
+              v-for="item of $d.ImagePlatform"
+              :key="item.id"
+              :label="item.value"
+            >
              {{ item.label }}
            </el-radio>
          </template>
        </el-radio-group>
      </el-form-item>
      <!-- 阅片工具 -->
-      <el-form-item v-if="form.ImagePlatform === 3" :label="$t('trials:readingUnit:readingRules:title:readingTool')"
-        prop="ReadingTool">
-        <el-radio-group v-model="form.ReadingTool" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])" @input="handleReadingToolInput">
-          <el-radio v-for="item of $d.ReadingTool" :key="item.id" :label="item.value">
+      <el-form-item
+        v-if="form.ImagePlatform === 3"
+        :label="$t('trials:readingUnit:readingRules:title:readingTool')"
+        prop="ReadingTool"
+      >
+        <el-radio-group
+          v-model="form.ReadingTool"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.ReadingTool"
+            :key="item.id"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- 测量工具 -->
      <el-form-item
-        v-if="CriterionType === 0 && (form.ReadingTool === 0 || form.ReadingTool === 1 || form.ReadingTool === 2) && form.ReadingVersionEnum === 1"
-        :label="$t('trials:readingUnit:readingRules:title:measureTool')">
-        <el-checkbox-group v-model="form.ReadingToolList" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-checkbox v-for="tool in tools" :key="tool.toolName" :label="tool.toolName" name="ReadingToolList">
+        v-if="CriterionType === 0 && (form.ReadingTool === 0 || form.ReadingTool === 2 ) && form.ReadingVersionEnum === 1"
+        :label="$t('trials:readingUnit:readingRules:title:measureTool')"
+      >
+        <el-checkbox-group 
+          v-model="form.ReadingToolList"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-checkbox 
+            v-for="tool in tools" 
+            :key="tool.toolName" 
+            :label="tool.toolName" 
+            name="ReadingToolList"
+          >
            {{ $t(`${tool.i18nKey}`) }}
          </el-checkbox>
        </el-checkbox-group>
      </el-form-item>
      <!--检查类型筛选-->
-      <el-form-item :label="$t('trials:processCfg:form:IsImageFilter')" prop="IsImageFilter">
-        <el-radio-group v-model="form.IsImageFilter" @input="IsImageFilterChange" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio :label="item.value" v-for="item in $d.YesOrNoModality" :key="item.id">
+      <el-form-item
+        :label="$t('trials:processCfg:form:IsImageFilter')"
+        prop="IsImageFilter"
+      >
+        <el-radio-group
+          v-model="form.IsImageFilter"
+          @input="IsImageFilterChange"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            :label="item.value"
+            v-for="item in $d.YesOrNoModality"
+            :key="item.id"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- 影像模态 -->
-      <el-form-item :label="$t('trials:readingUnit:readingRules:title:CriterionModalitys')" prop="CriterionModalitys"
-        style="position: relative" v-if="form.IsImageFilter">
-        <el-checkbox-group v-model="CriterionModalitys" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
+      <el-form-item
+        :label="$t('trials:readingUnit:readingRules:title:CriterionModalitys')"
+        prop="CriterionModalitys"
+        style="position: relative"
+        v-if="form.IsImageFilter"
+      >
+        <el-checkbox-group
+          v-model="CriterionModalitys"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
          <el-checkbox v-for="item in modalityList" :label="item" :key="item">{{
            item
          }}</el-checkbox>
        </el-checkbox-group>
-        <el-button v-if="
-          !isConfirm &&
-          hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-        " size="mini" style="position: absolute; top: 0; right: -40px" @click.stop="handleCheckAllChange"
-          type="success">{{
+        <el-button
+          v-if="
+            !isConfirm &&
+            hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+          size="mini"
+          style="position: absolute; top: 0; right: -40px"
+          @click.stop="handleCheckAllChange"
+          type="success"
+          >{{
            CriterionModalitys.length === modalityList.length
              ? $t(
-                'trials:readingUnit:readingRules:title:CriterionModalitysCancel'
-              )
+                  'trials:readingUnit:readingRules:title:CriterionModalitysCancel'
+                )
              : $t(
-                'trials:readingUnit:readingRules:title:CriterionModalitysAll'
-              )
-          }}</el-button>
+                  'trials:readingUnit:readingRules:title:CriterionModalitysAll'
+                )
+          }}</el-button
+        >
      </el-form-item>
-      <el-form-item :label="$t('trials:consistencyAnalysis:table:isUrgent')" prop="DigitPlaces">
-        <el-radio-group v-model="form.IsUrgent" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="item.id" :label="item.value">
+      <el-form-item
+        :label="$t('trials:consistencyAnalysis:table:isUrgent')"
+        prop="DigitPlaces"
+      >
+        <el-radio-group
+          v-model="form.IsUrgent"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="item.id"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- 存在附加评估 -->
-      <el-form-item :label="$t('trials:processCfg:form:IsAdditionalAssessment')" prop="IsAdditionalAssessment"
-        v-if="CriterionType === 1">
-        <el-radio-group v-model="form.IsAdditionalAssessment" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="`IsAdditionalAssessment${item.value}`" :label="item.value">
+      <el-form-item
+        :label="$t('trials:processCfg:form:IsAdditionalAssessment')"
+        prop="IsAdditionalAssessment"
+        v-if="CriterionType === 1"
+      >
+        <el-radio-group
+          v-model="form.IsAdditionalAssessment"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`IsAdditionalAssessment${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- 阅片任务生成方式 -->
-      <el-form-item :label="$t('trials:processCfg:form:IsAutoCreate')" prop="IsAutoCreate">
-        <el-radio-group v-model="form.IsAutoCreate" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.YesOrNoAuto" :key="`IsAutoCreate${item.value}`" :label="item.value">
+      <el-form-item
+        :label="$t('trials:processCfg:form:IsAutoCreate')"
+        prop="IsAutoCreate"
+      >
+        <el-radio-group
+          v-model="form.IsAutoCreate"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNoAuto"
+            :key="`IsAutoCreate${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!--阅片模式-->
-      <el-form-item :label="$t('trials:processCfg:form:readingType')" prop="ReadingType">
-        <el-radio-group v-model="form.ReadingType" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          " @change="
+      <el-form-item
+        :label="$t('trials:processCfg:form:readingType')"
+        prop="ReadingType"
+      >
+        <el-radio-group
+          v-model="form.ReadingType"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+          @change="
            () => {
              form.IsArbitrationReading = false
            }
-          ">
-          <el-radio v-for="item of $d.ReadingMethod" :key="item.id" :label="item.value">
+          "
+        >
+          <el-radio
+            v-for="item of $d.ReadingMethod"
+            :key="item.id"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!--仲裁阅片-->
-      <el-form-item :label="$t('trials:processCfg:form:ad')" prop="IsArbitrationReading">
-        <el-radio-group v-model="form.IsArbitrationReading" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-          form.ReadingType !== 2
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="`IsArbitrationReading${item.value}`" :label="item.value">
+      <el-form-item
+        :label="$t('trials:processCfg:form:ad')"
+        prop="IsArbitrationReading"
+      >
+        <el-radio-group
+          v-model="form.IsArbitrationReading"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
+            form.ReadingType !== 2
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`IsArbitrationReading${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- 是否阅片期 -->
-      <el-form-item :label="$t('trials:readingUnit:readingRules:title:isReadingPeriod')" prop="IsReadingPeriod">
-        <el-radio-group v-model="form.IsReadingPeriod" :disabled="isConfirm ||
-          IsMustGlobalReading ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          " @change="
+      <el-form-item
+        :label="$t('trials:readingUnit:readingRules:title:isReadingPeriod')"
+        prop="IsReadingPeriod"
+      >
+        <el-radio-group
+          v-model="form.IsReadingPeriod"
+          :disabled="
+            isConfirm ||
+            IsMustGlobalReading ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+          @change="
            (v) => {
              if (!v) {
                form.IsGlobalReading = v
                form.IsOncologyReading = v
              }
            }
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="`IsReadingPeriod${item.value}`" :label="item.value">
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`IsReadingPeriod${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
-      <el-form-item :label="$t('trials:processCfg:form:global')" prop="IsGlobalReading">
-        <el-radio-group v-model="form.IsGlobalReading" :disabled="!form.IsReadingPeriod ||
-          IsMustGlobalReading ||
-          isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="`IsGlobalReading${item.value}`" :label="item.value">
+      <el-form-item
+        :label="$t('trials:processCfg:form:global')"
+        prop="IsGlobalReading"
+      >
+        <el-radio-group
+          v-model="form.IsGlobalReading"
+          :disabled="
+            !form.IsReadingPeriod ||
+            IsMustGlobalReading ||
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`IsGlobalReading${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
-      <el-form-item :label="$t('trials:processCfg:form:clinical')" prop="IsOncologyReading">
-        <el-radio-group v-model="form.IsOncologyReading" :disabled="!form.IsReadingPeriod ||
-          !form.IsSystemSetOncology ||
-          isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="`IsOncologyReading${item.value}`" :label="item.value">
+      <el-form-item
+        :label="$t('trials:processCfg:form:clinical')"
+        prop="IsOncologyReading"
+      >
+        <el-radio-group
+          v-model="form.IsOncologyReading"
+          :disabled="
+            !form.IsReadingPeriod ||
+            !form.IsSystemSetOncology ||
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`IsOncologyReading${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- 任务展示方式 -->
-      <el-form-item :label="$t('trials:readingUnit:readingRules:title:readingTaskViewInOrder')
-        " prop="IsReadingTaskViewInOrder">
-        <el-radio-group v-model="form.IsReadingTaskViewInOrder" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          " @change="
+      <el-form-item
+        :label="
+          $t('trials:readingUnit:readingRules:title:readingTaskViewInOrder')
+        "
+        prop="IsReadingTaskViewInOrder"
+      >
+        <el-radio-group
+          v-model="form.IsReadingTaskViewInOrder"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+          @change="
            (v) => {
              form.ImageDownloadEnum = 0
              form.ImageUploadEnum = 0
@@ -189,143 +357,254 @@
                form.ReadingTaskViewEnum = 2
              }
            }
-          ">
-          <el-radio v-for="item of $d.IsReadingTaskViewInOrder" :key="'IsReadingTaskViewInOrder' + item.value"
-            :label="item.value">
+          "
+        >
+          <el-radio
+            v-for="item of $d.IsReadingTaskViewInOrder"
+            :key="'IsReadingTaskViewInOrder' + item.value"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- 任务组织级别 -->
-      <el-form-item :label="$t('trials:readingUnit:readingRules:title:readingTaskViewEnum')" prop="ReadingTaskViewEnum">
-        <el-radio-group v-model="form.ReadingTaskViewEnum" :disabled="isConfirm ||
-          !!!isReadingTaskViewInOrder ||
-          !!isReadingTaskViewInOrder ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.ReadingTaskViewEnum" :key="item.id" :label="item.value">
+      <el-form-item
+        :label="$t('trials:readingUnit:readingRules:title:readingTaskViewEnum')"
+        prop="ReadingTaskViewEnum"
+      >
+        <el-radio-group
+          v-model="form.ReadingTaskViewEnum"
+          :disabled="
+            isConfirm ||
+            !!!isReadingTaskViewInOrder ||
+            !!isReadingTaskViewInOrder ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.ReadingTaskViewEnum"
+            :key="item.id"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!--支持影像下载v-if="CriterionType === 0"-->
-      <el-form-item :label="$t('trials:processCfg:form:ImageDownloadEnum')" prop="ImageDownloadEnum">
-        <el-radio-group v-model="form.ImageDownloadEnum" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.ImageDownloadEnum" :key="item.id" :label="item.value" :disabled="(form.IsReadingTaskViewInOrder === 1 ||
-            form.IsReadingTaskViewInOrder === 0) &&
-            item.value === 1
-            ">
+      <el-form-item
+        :label="$t('trials:processCfg:form:ImageDownloadEnum')"
+        prop="ImageDownloadEnum"
+      >
+        <el-radio-group
+          v-model="form.ImageDownloadEnum"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.ImageDownloadEnum"
+            :key="item.id"
+            :label="item.value"
+            :disabled="
+              (form.IsReadingTaskViewInOrder === 1 ||
+                form.IsReadingTaskViewInOrder === 0) &&
+              item.value === 1
+            "
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!--支持上传DICOM影像-->
-      <el-form-item :label="$t('trials:processCfg:form:ImageUploadEnum')" prop="ImageUploadEnum">
-        <el-radio-group v-model="form.ImageUploadEnum" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.ImageUploadEnum" :key="item.id" :label="item.value" :disabled="(form.IsReadingTaskViewInOrder === 1 ||
-            form.IsReadingTaskViewInOrder === 0) &&
-            item.value === 1
-            ">
+      <el-form-item
+        :label="$t('trials:processCfg:form:ImageUploadEnum')"
+        prop="ImageUploadEnum"
+      >
+        <el-radio-group
+          v-model="form.ImageUploadEnum"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.ImageUploadEnum"
+            :key="item.id"
+            :label="item.value"
+            :disabled="
+              (form.IsReadingTaskViewInOrder === 1 ||
+                form.IsReadingTaskViewInOrder === 0) &&
+              item.value === 1
+            "
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- IR阅片页面是否显示受试者信息 -->
-      <el-form-item :label="$t('trials:readingUnit:readingRules:title:isReadingShowSubjectInfo')
-        " prop="IsReadingShowSubjectInfo">
-        <el-radio-group v-model="form.IsReadingShowSubjectInfo" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-          !!form.IsReadingTaskViewInOrder
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="'IsReadingShowSubjectInfo' + item.value" :label="item.value">
+      <el-form-item
+        :label="
+          $t('trials:readingUnit:readingRules:title:isReadingShowSubjectInfo')
+        "
+        prop="IsReadingShowSubjectInfo"
+      >
+        <el-radio-group
+          v-model="form.IsReadingShowSubjectInfo"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
+            !!form.IsReadingTaskViewInOrder
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'IsReadingShowSubjectInfo' + item.value"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- IR阅片页面是否可以查看既往任务结果 -->
-      <el-form-item :label="$t(
-        'trials:readingUnit:readingRules:title:isReadingShowPreviousResults'
-      )
-        " prop="IsReadingShowPreviousResults">
-        <el-radio-group v-model="form.IsReadingShowPreviousResults" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-          !!form.IsReadingTaskViewInOrder
-          " @change="
+      <el-form-item
+        :label="
+          $t(
+            'trials:readingUnit:readingRules:title:isReadingShowPreviousResults'
+          )
+        "
+        prop="IsReadingShowPreviousResults"
+      >
+        <el-radio-group
+          v-model="form.IsReadingShowPreviousResults"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
+            !!form.IsReadingTaskViewInOrder
+          "
+          @change="
            (v) => {
              if (!v) {
                form.IseCRFShowInDicomReading = true
              }
            }
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="'IsReadingShowPreviousResults' + item.value" :label="item.value">
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="'IsReadingShowPreviousResults' + item.value"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- eCRF是否显示在影像阅片页面 -->
-      <el-form-item :label="$t('trials:readingUnit:readingRules:title:isECRFShowInDicomReading')
-        " prop="IseCRFShowInDicomReading">
-        <el-radio-group v-model="form.IseCRFShowInDicomReading" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-          !form.IsReadingShowPreviousResults
-          ">
-          <el-radio v-for="item of $d.YesOrNo" :key="item.label" :label="item.value">
+      <el-form-item
+        :label="
+          $t('trials:readingUnit:readingRules:title:isECRFShowInDicomReading')
+        "
+        prop="IseCRFShowInDicomReading"
+      >
+        <el-radio-group
+          v-model="form.IseCRFShowInDicomReading"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
+            !form.IsReadingShowPreviousResults
+          "
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="item.label"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <!-- 修约小数位数 -->
-      <el-form-item :label="$t('trials:processCfg:form:digitPlaces')" prop="DigitPlaces">
-        <el-radio-group v-model="form.DigitPlaces" :disabled="isConfirm ||
-          !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-          ">
-          <el-radio v-for="item of $d.DigitPlaces" :key="item.id" :label="item.value">
+      <el-form-item
+        :label="$t('trials:processCfg:form:digitPlaces')"
+        prop="DigitPlaces"
+      >
+        <el-radio-group
+          v-model="form.DigitPlaces"
+          :disabled="
+            isConfirm ||
+            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+          "
+        >
+          <el-radio
+            v-for="item of $d.DigitPlaces"
+            :key="item.id"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
-      <el-form-item :label="$t(
-        'trials:trials-panel:setting:reading-unit:TrialCriterionAdditionalAssessmentTypeList'
-      )
-        " v-if="
+      <el-form-item
+        :label="
+          $t(
+            'trials:trials-panel:setting:reading-unit:TrialCriterionAdditionalAssessmentTypeList'
+          )
+        "
+        v-if="
          form.IsAdditionalAssessment &&
          form.TrialCriterionAdditionalAssessmentTypeList &&
          form.TrialCriterionAdditionalAssessmentTypeList.length > 0
-        ">
+        "
+      >
      </el-form-item>
      <template v-for="item of form.TrialCriterionAdditionalAssessmentTypeList">
-        <el-form-item :key="item.Id" :prop="`AdditionalAssessmentType${item.Id}`" :rules="[
-          {
-            required: true,
-            message: $t('common:ruleMessage:select'),
-            trigger: ['blur'],
-          },
-        ]" :label="$fd('AdditionalAssessmentType', item.AdditionalAssessmentType)
-          " v-if="
+        <el-form-item
+          :key="item.Id"
+          :prop="`AdditionalAssessmentType${item.Id}`"
+          :rules="[
+            {
+              required: true,
+              message: $t('common:ruleMessage:select'),
+              trigger: ['blur'],
+            },
+          ]"
+          :label="
+            $fd('AdditionalAssessmentType', item.AdditionalAssessmentType)
+          "
+          v-if="
            form.IsAdditionalAssessment &&
            form.TrialCriterionAdditionalAssessmentTypeList
-          ">
-          <el-radio-group v-model="item.IsSelected" :disabled="isConfirm ||
-            !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-            " @change="
+          "
+        >
+          <el-radio-group
+            v-model="item.IsSelected"
+            :disabled="
+              isConfirm ||
+              !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+            "
+            @change="
              (v) => {
                $set(form, 'AdditionalAssessmentType' + item.Id, v)
              }
-            ">
-            <el-radio v-for="item of $d.YesOrNo" :key="`AdditionalAssessmentType${item.value}`" :label="item.value">
+            "
+          >
+            <el-radio
+              v-for="item of $d.YesOrNo"
+              :key="`AdditionalAssessmentType${item.value}`"
+              :label="item.value"
+            >
              {{ item.label }}
            </el-radio>
          </el-radio-group>
        </el-form-item>
      </template>
-      <el-form-item v-if="
-        !isConfirm &&
-        hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-      ">
+      <el-form-item
+        v-if="
+          !isConfirm &&
+          hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
+        "
+      >
        <!-- 保存 -->
        <el-button type="primary" @click="handleSave(true)">
          {{ $t('common:button:save') }}
@@ -560,7 +839,7 @@ export default {
    if (this.CriterionType === 0) {
      this.tools = [...config.customizeStandards]
    }
-
+    
    this.initPage()
  },
  computed: {
@@ -577,17 +856,6 @@ export default {
    },
  },
  methods: {
-    // 阅片工具选择
-    handleReadingToolInput(val) {
-      this.form.ReadingToolList = []
-      if (this.CriterionType !== 0) return this.tools = []
-      if (val === 0 || val === 2) {
-        this.tools = [...config.customizeStandards]
-      }
-      if (val === 1) {
-        this.tools = [...config.customizeStandardsNoneDicom]
-      }
-    },
    // 检查类型筛选值变更
    IsImageFilterChange(data) {
      if (data) {
@@ -625,14 +893,6 @@ export default {
              this.form[k] = res.Result[k]
            }
          }
-          if (this.CriterionType === 0) {
-            if (this.form.ReadingTool === 0 || this.form.ReadingTool === 2) {
-              this.tools = [...config.customizeStandards]
-            }
-            if (this.form.ReadingTool === 1) {
-              this.tools = [...config.customizeStandardsNoneDicom]
-            }
-          }
          this.CriterionModalitys = this.form.CriterionModalitys
            ? this.form.CriterionModalitys.split('|')
            : []
@@ -657,8 +917,6 @@ export default {
          this.$emit('setGlobalReading', res.Result.IsGlobalReading)
          this.$emit('setOncologyReading', res.Result.IsOncologyReading)
          this.$emit('setDigitPlaces', res.Result.DigitPlaces)
-          this.$emit('setReadingTools', res.Result.ReadingToolList)
-
          if (res.Result.ReadingType === 1) {
            this.$emit('setArbitrationReading', false)
          }
@@ -699,7 +957,6 @@ export default {
                this.$emit('setGlobalReading', this.form.IsGlobalReading)
                this.$emit('setOncologyReading', this.form.IsOncologyReading)
                this.$emit('setDigitPlaces', this.form.DigitPlaces)
-                this.$emit('setReadingTools', this.form.ReadingToolList)
                if (this.form.ReadingType === 1) {
                  this.$emit('setArbitrationReading', false)
                }
@@ -19,7 +19,7 @@
          >
            <template v-for="item of $d.Criterion_Question_Type">
              <el-option
-                v-if="item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group' && item.value !== 'fixedTable' && item.value !== 'calculation' "
+                v-if="item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group'"
                :key="item.value"
                :value="item.value"
                :label="item.label"
@@ -429,64 +429,6 @@
            <i class="el-icon-info" />{{ [1, 2, 3, 4].includes(form.CustomCalculateMark) ? $t('trials:readingUnit:qsList:message:msg1') : $t('trials:readingUnit:qsList:message:msg2') }}
          </div>
        </div>
-        <!-- 影像标记:disabled="form.IsRequired === 0" -->
-        <el-form-item
-          v-if="form.Type === 'number' && !isFromSystem && readingVersionEnum"
-          :label="$t('trials:readingUnit:qsList:title:imageMarkEnum')"
-          prop="ImageMarkEnum"
-        >
-          <el-radio-group
-            v-model="form.ImageMarkEnum"
-            
-            @change="imageMarkEnumChange"
-          >
-            <el-radio v-for="item of $d.ImageMark" :key="item.id" :label="item.value" :disabled="form.IsRequired === 2 && item.value === 1">{{ item.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 测量工具 ImageTool -->
-        <el-form-item
-          v-if="form.ImageMarkEnum === 1 || form.ImageMarkEnum === 2"
-          :label="$t('trials:readingUnit:qsList:title:ImageTool')"
-          prop="ImageTool"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ImageTool"
-            @change="imageToolChange"
-          >
-            <el-radio 
-              v-for="tool of readingTools" 
-              :key="tool.toolName" 
-              :label="tool.toolName" 
-            >
-              {{ $t(tool.i18nKey) }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <!-- 测量值 ImageToolAttribute -->
-        <el-form-item
-          v-if="form.ImageTool && imageToolAttributes.length > 0"
-          :label="$t('trials:readingUnit:qsList:title:ImageToolAttribute')"
-          prop="ImageToolAttribute"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select')}
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ImageToolAttribute"
-          >
-            <el-radio 
-              v-for="i of imageToolAttributes" 
-              :key="i" 
-              :label="i" 
-            >
-              {{ i }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
-
        <el-form-item
          v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'input') && isFromSystem"
          :label="$t('trials:readingUnit:label:QuestionGenre')"
@@ -905,16 +847,6 @@ export default {
    type: {
      type: String,
      required: true
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingVersionEnum: {
-      type: Number,
-      default: 0
    }
  },

@@ -964,12 +896,8 @@ export default {
        ClassifyType: null,
        ClassifyEditType: null,
        ClassifyShowType: null,
-        ImageMarkEnum: 0,
-        ImageTool: '',
-        ImageToolAttribute: '',
        // IsEnable: true
      },
-      imageToolAttributes: [],
      rules: {
        Type: [
          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -1243,9 +1171,6 @@ export default {
            }
          }
        }
-        if (this.form.ImageTool) {
-          this.imageToolChange(this.form.ImageTool)
-        }
      }
      if (this.form.ClassifyTableQuestionId) {
          this.classifyQuestionChange(this.form.ClassifyTableQuestionId)
@@ -1257,12 +1182,6 @@ export default {
        }
      }
    },
-    classifyQuestionChange (v){
-      let obj = this.selectQuestions.find(i=>i.Id === v)
-      let arr = obj && obj.TypeValue ? obj.TypeValue.split('|') : []
-      arr = arr.length > 0 ? arr.map(i=>i.trim()) : []
-      this.classifyQuestionOptions = arr
-    },
    getBasicConfigSelect() {
      getCriterionDictionaryList({
        CriterionId: this.criterionId,
@@ -1344,25 +1263,6 @@ export default {
        form.RelevanceId = ''
        form.RelevanceValueList = []
      }
-      // if (val === 0 && form.Type === 'number' && !this.isFromSystem) {
-      //   form.ImageMarkEnum = 1
-      // }
-      if (val === 2 && form.Type === 'number' && !this.isFromSystem) {
-        form.ImageMarkEnum = 0
-      }
-    },
-    imageMarkEnumChange(val) {
-      if (val === 0) {
-        this.form.ImageTool = ''
-        this.form.ImageToolAttribute = ''
-        this.imageToolAttributes = []
-      }
-    },
-    imageToolChange(v) {
-      let i = this.readingTools.findIndex(tool=>tool.toolName === v)
-      if (i > -1) {
-        this.imageToolAttributes = this.readingTools[i].props
-      }
    },
    async parentQuestionChange(val, form) {
      if (val) {
@@ -1472,10 +1372,6 @@ export default {
      form.ImageCount = 0
      form.ClassifyType = null
      form.ClassifyShowType = null
-      form.ImageMarkEnum = 0
-      form.ImageTool = ''
-      form.ImageToolAttribute = ''
-      this.imageToolAttributes = []
    },
    close() {
      this.$emit('close')
@@ -202,8 +202,6 @@
        :digit-places="digitPlaces"
        :reading-question-id="readingQuestionId"
        :criterion-id="criterionId"
-        :readingTools="readingTools"
-        :readingVersionEnum="readingVersionEnum"
        @close="addOrEdit.visible = false"
        @getList="getList"
      />
@@ -243,16 +241,6 @@ export default {
    criterionId: {
      type: String,
      required: true
-    },
-    readingTools: {
-      type: Array,
-      default() {
-        return []
-      }
-    },
-    readingVersionEnum: {
-      type: Number,
-      default: 0
    }

  },
@@ -46,7 +46,6 @@
                  @setGlobalReading="setGlobalReading"
                  @setOncologyReading="setOncologyReading"
                  @setDigitPlaces="setDigitPlaces"
-                  @setReadingTools="setReadingTools"
                />
              </el-collapse-item>
              <!-- 阅片标准 -->
@@ -58,7 +57,6 @@
                  :ref="`readingCriterions${item.TrialReadingCriterionId}`"
                  :trial-reading-criterion-id="TrialReadingCriterionId"
                  :digit-places="digitPlaces"
-                  :readingTools="readingTools"
                  :is-additional-assessment="isAdditionalAssessment"
                  @reloadArbitrationRules="reloadArbitrationRules"
                />
@@ -176,7 +174,7 @@ import GlobalReading from "./components/GlobalReading";
 import OncologyForm from "./components/OncologyForm";
 import SignForm from "@/views/trials/components/newSignForm";
 import const_ from "@/const/sign-code";
-import { getCustomizeStandardsTools } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
+
 export default {
  name: "ReadingUnit",
  components: {
@@ -210,7 +208,6 @@ export default {
      isGlobalReading: false,
      digitPlaces: 0,
      isAdditionalAssessment: false,
-      readingTools: []
    };
  },
  watch: {
@@ -298,9 +295,6 @@ export default {
    setDigitPlaces(digitPlaces) {
      this.digitPlaces = digitPlaces;
    },
-    setReadingTools(readingTools) {
-      this.readingTools = getCustomizeStandardsTools(readingTools)
-    },
    setIsClinicalReading(isClinicalReading) {
      this.isClinicalReading = isClinicalReading;
    },
@@ -10,89 +10,190 @@
          <el-button type="primary" @click="handleSearch">{{ $t('common:button:search') }}</el-button>
        </el-form-item>
      </el-form>
-      <div>
-        <el-button :disabled="list.length === 0" size="mini" type="primary" @click="handlePreview">
+      <div >
+        <el-button
+          :disabled="list.length === 0"
+          size="mini"
+          type="primary"
+          @click="handlePreview"
+        >
          {{ $t('common:button:preview') }}
        </el-button>

-        <el-button v-if="!data.IsFromSystemData && !data.IsCompleteConfig" size="mini" type="primary"
-          @click="handleAdd">
+        <el-button
+          v-if="!data.IsFromSystemData && !data.IsCompleteConfig"
+          size="mini"
+          type="primary"
+          @click="handleAdd"
+        >
          {{ $t('common:button:add') }}
        </el-button>

-        <el-button v-if="!data.IsFromSystemData && !data.IsCompleteConfig" size="mini" type="primary"
-          @click="handleApply">
+        <el-button
+          v-if="!data.IsFromSystemData && !data.IsCompleteConfig"
+          size="mini"
+          type="primary"
+          @click="handleApply"
+        >
          {{ $t('trials:readingUnit:qsList:button:apply') }}
        </el-button>
      </div>

    </div>
-    <el-table ref="criterionQSList" v-loading="loading" v-adaptive="{ bottomOffset: 80 }" height="100" :data="list"
-      stripe @sort-change="handleSortByColumn">
-      <el-table-column prop="ShowOrder" label="" width="50" />
-      <el-table-column prop="QuestionName" :label="$t('trials:readingUnit:qsList:title:qName')" show-overflow-tooltip />
-      <el-table-column prop="QuestionEnName" :label="$t('trials:readingUnit:qsList:title:qNameEn')"
-        show-overflow-tooltip />
-      <el-table-column prop="Type" :label="$t('trials:readingUnit:qsList:title:type')" show-overflow-tooltip>
+    <el-table
+      ref="criterionQSList"
+      v-loading="loading"
+      v-adaptive="{bottomOffset:80}"
+      height="100"
+      :data="list"
+      stripe
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column
+        prop="ShowOrder"
+        label=""
+        width="50"
+      />
+      <el-table-column
+        prop="QuestionName"
+        :label="$t('trials:readingUnit:qsList:title:qName')"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="QuestionEnName"
+        :label="$t('trials:readingUnit:qsList:title:qNameEn')"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Type"
+        :label="$t('trials:readingUnit:qsList:title:type')"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
-          {{ $fd('ClinicalQuestionType', scope.row.ClinicalQuestionType) }}
+          {{ $fd('ClinicalQuestionType',scope.row.ClinicalQuestionType) }}
        </template>
      </el-table-column>
-      <el-table-column prop="TypeValue" :label="$t('trials:readingUnit:qsList:title:type')" show-overflow-tooltip>
+      <el-table-column
+        prop="TypeValue"
+        :label="$t('trials:readingUnit:qsList:title:type')"
+        show-overflow-tooltip
+      >
      </el-table-column>
-      <el-table-column prop="GroupName" :label="$t('trials:readingUnit:qsList:title:groupName')" show-overflow-tooltip>
-      </el-table-column>
-      <el-table-column prop="ClinicalQuestionShowEnum" :label="$t('trials:readingUnit:qsList:title:isShow')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="ClinicalQuestionShowEnum"
+        :label="$t('trials:readingUnit:qsList:title:isShow')"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
-          {{ $fd('ShowQuestion', scope.row.ClinicalQuestionShowEnum) }}
+          {{ $fd('ShowQuestion',scope.row.ClinicalQuestionShowEnum) }}
        </template>
      </el-table-column>
-      <el-table-column prop="IsRequired" :label="$t('trials:qcCfg:table:isRequired')" show-overflow-tooltip>
+      <el-table-column
+        prop="IsRequired"
+        :label="$t('trials:qcCfg:table:isRequired')"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
-          {{ $fd('YesOrNo', scope.row.IsRequired) }}
+          {{ $fd('YesOrNo',scope.row.IsRequired) }}
        </template>
      </el-table-column>
-      <el-table-column prop="" :label="$t('common:action:action')" min-width="250" show-overflow-tooltip fixed="right">
+      <el-table-column
+        prop=""
+        :label="$t('common:action:action')"
+        min-width="250"
+        show-overflow-tooltip
+        fixed="right"
+      >
        <template slot-scope="scope">
-          <el-button v-if="!data.IsFromSystemData && !data.IsCompleteConfig" type="primary" size="mini"
-            @click="handleEdit(scope.row)">
+          <el-button
+            v-if="!data.IsFromSystemData && !data.IsCompleteConfig"
+            type="primary"
+            size="mini"
+            @click="handleEdit(scope.row)"
+          >
            {{ $t('trials:readingUnit:qsList:title:edit') }}
          </el-button>
-          <el-button v-else type="primary" size="mini" @click="handleLook(scope.row)">
+          <el-button
+            v-else
+            type="primary"
+            size="mini"
+            @click="handleLook(scope.row)"
+          >
            {{ $t('trials:enrolledReviews:button:view') }}
          </el-button>
-          <el-button type="primary" size="mini" :disabled="scope.row.ClinicalQuestionType !== 'table'"
-            @click="handleConfig(scope.row)">
+          <el-button
+            type="primary"
+            size="mini"
+            :disabled="scope.row.ClinicalQuestionType !== 'table'"
+            @click="handleConfig(scope.row)"
+          >
            {{ $t('trials:readingUnit:qsList:title:tableQs') }}
          </el-button>
-          <el-button v-if="!data.IsFromSystemData && !data.IsCompleteConfig" type="danger" size="mini"
-            :disabled="scope.row.IsEnable" @click="handleDelete(scope.row)">
+          <el-button
+            v-if="!data.IsFromSystemData && !data.IsCompleteConfig"
+            type="danger"
+            size="mini"
+            :disabled="scope.row.IsEnable"
+            @click="handleDelete(scope.row)"
+          >
            {{ $t('common:button:delete') }}
          </el-button>
        </template>
      </el-table-column>
    </el-table>
-    <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total"
-      :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
-    <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
-      :title="addOrEdit.title" width="600px" append-to-body custom-class="base-dialog-wrapper">
-      <ClinicalQuestionForm ref="addOrEdit" :clinical-id="clinicalId" :list="list" :clinical-info="data" :data="rowData"
-        :type="type" @close="addOrEdit.visible = false" @getList="getList" />
+    <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+    <el-dialog
+      v-if="addOrEdit.visible"
+      :visible.sync="addOrEdit.visible"
+      :close-on-click-modal="false"
+      :title="addOrEdit.title"
+      width="600px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <ClinicalQuestionForm
+        ref="addOrEdit"
+        :clinical-id="clinicalId"
+        :list="list"
+        :clinical-info="data"
+        :data="rowData"
+        :type="type"
+        @close="addOrEdit.visible = false"
+        @getList="getList"
+      />
    </el-dialog>

    <!-- 预览 -->
-    <el-dialog v-if="preview.visible" v-dialogDrag :visible.sync="preview.visible" :close-on-click-modal="false"
-      :title="preview.title" fullscreen append-to-body>
+    <el-dialog
+      v-if="preview.visible"
+      v-dialogDrag
+      :visible.sync="preview.visible"
+      :close-on-click-modal="false"
+      :title="preview.title"
+      fullscreen
+      append-to-body
+    >
      <div>
      </div>
    </el-dialog>

-    <el-dialog v-if="config.visible" :visible.sync="config.visible" :close-on-click-modal="false" :title="config.title"
-      width="90%" append-to-body>
-      <ClinicalQuestionTableQsList :clinical-id="clinicalId" :clinical-info="data" :data="rowData"
-        :is-from-system-data="data.IsFromSystemData" :reading-question-id="rowData.Id"
-        :is-complete-config="data.IsCompleteConfig" :lesion-type="rowData.LesionType" />
+    <el-dialog
+      v-if="config.visible"
+      :visible.sync="config.visible"
+      :close-on-click-modal="false"
+      :title="config.title"
+      width="90%"
+      append-to-body
+    >
+      <ClinicalQuestionTableQsList
+        :clinical-id="clinicalId"
+        :clinical-info="data"
+        :data="rowData"
+        :is-from-system-data="data.IsFromSystemData"
+        :reading-question-id="rowData.Id"
+        :is-complete-config="data.IsCompleteConfig"
+        :lesion-type="rowData.LesionType"
+      />
    </el-dialog>
  </div>
 </template>
@@ -230,4 +331,6 @@ export default {
  }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
+
@@ -1,201 +1,338 @@
 <template>
-  <el-form ref="clinicalDataForm" v-loading="loading" :model="form" size="small" :rules="rules"
-    :disabled="type === 'look'" label-width="130px">
+  <el-form
+    ref="clinicalDataForm"
+    v-loading="loading"
+    :model="form"
+    size="small"
+    :rules="rules"
+    :disabled="type === 'look'"
+    label-width="130px"
+  >
    <div class="base-dialog-body">
      <el-form-item :label="$t('trials:readingUnit:qsList:title:type')" prop="ClinicalQuestionType">
-        <el-select v-model="form.ClinicalQuestionType" clearable @change="((val) => { typeChange(val, form) })">
-          <el-option v-for="item of $d.ClinicalQuestionType" :key="item.value" :value="item.value"
-            :label="item.label" />
+        <el-select v-model="form.ClinicalQuestionType" clearable @change="((val)=>{typeChange(val, form)})">
+          <el-option
+            v-for="item of $d.ClinicalQuestionType"
+            :key="item.value"
+            :value="item.value"
+            :label="item.label"
+          />
        </el-select>
      </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:qName')" prop="QuestionName">
+      <el-form-item
+        :label="$t('trials:readingUnit:qsList:title:qName')"
+        prop="QuestionName"
+      >
        <el-input v-model="form.QuestionName" />
      </el-form-item>
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:qNameEn')" prop="QuestionEnName">
+      <el-form-item
+        :label="$t('trials:readingUnit:qsList:title:qNameEn')"
+        prop="QuestionEnName"
+      >
        <el-input v-model="form.QuestionEnName" />
      </el-form-item>
-      <!--默认值-->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:defaultValue')" prop="DefaultValue"
-        v-if="form.ClinicalQuestionType === 'number'">
-        <el-input v-model="form.DefaultValue" />
-      </el-form-item>
      <el-form-item
        v-if="form.ClinicalQuestionType === 'select' || form.ClinicalQuestionType === 'radio' || form.ClinicalQuestionType === 'checkbox'"
-        :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
-        <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')" />
+        :label="$t('trials:qcCfg:table:typeValue')"
+        prop="TypeValue"
+      >
+        <el-input
+          v-model="form.TypeValue"
+          :placeholder="$t('trials:qcCfg:message:typeValue')"
+        />
      </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType === 'number'" :label="$t('trials:processCfg:form:digitPlaces')"
-        prop="DigitPlaces">
-        <el-radio-group v-model="form.DigitPlaces" style="line-height: 40px;">
-          <el-radio v-for="item of $d.DigitPlaces" :key="`DigitPlaces${item.value}`" :label="item.value">
-            {{ item.label }}
-          </el-radio>
+      <el-form-item
+        v-if="form.ClinicalQuestionType === 'number'"
+        :label="$t('trials:processCfg:form:digitPlaces')"
+        prop="DigitPlaces"
+      >
+        <el-radio-group
+          v-model="form.DigitPlaces"
+          style="line-height: 40px;"
+        >
+            <el-radio
+              v-for="item of $d.DigitPlaces"
+              :key="`DigitPlaces${item.value}`"
+              :label="item.value"
+            >
+              {{ item.label }}
+            </el-radio>
        </el-radio-group>
      </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType === 'number'" :label="$t('trials:readingUnit:qsList:title:unit')"
-        prop="Unit">
-        <el-input v-model="form.Unit" />
+      <el-form-item
+        v-if="form.ClinicalQuestionType === 'number'"
+        :label="$t('trials:readingUnit:qsList:title:unit')"
+        prop="Unit"
+      >
+        <el-input
+          v-model="form.Unit"
+        />
      </el-form-item>
-      <div v-if="form.ClinicalQuestionType === 'number'"
-        style="background: #f8f8f8;padding: 10px 0px;border-radius: 10px;position: relative;margin-bottom: 10px;">
+      <div v-if="form.ClinicalQuestionType === 'number'" style="background: #f8f8f8;padding: 10px 0px;border-radius: 10px;position: relative;margin-bottom: 10px;">
        <!-- 运算类型 -->
-        <el-form-item :label="$t('trials:readingUnit:qsList:title:customCalculateMark')" prop="CustomCalculateMark">
-          <el-radio-group v-model="form.CustomCalculateMark" style="line-height: 40px;"
-            @change="(v) => CustomCalculateMarkChange(v)">
+        <el-form-item
+          :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
+          prop="CustomCalculateMark"
+        >
+          <el-radio-group
+            v-model="form.CustomCalculateMark"
+            style="line-height: 40px;"
+            @change="(v) => CustomCalculateMarkChange(v)"
+          >
            <div>
-              <el-radio v-for="item of $d.ClinicalCustomCalculateMark" v-show="item.value <= 4"
-                :key="`CustomCalculateMark${item.value}`" :label="item.value">
+              <el-radio
+                v-for="item of $d.ClinicalCustomCalculateMark"
+                v-show="item.value <= 4"
+                :key="`CustomCalculateMark${item.value}`"
+                :label="item.value"
+              >
                {{ item.label }}
              </el-radio>
            </div>
            <div>
-              <el-radio v-for="item of $d.ClinicalCustomCalculateMark" v-show="item.value > 4"
-                :key="`CustomCalculateMark${item.value}`" :label="item.value">
+              <el-radio
+                v-for="item of $d.ClinicalCustomCalculateMark"
+                v-show="item.value > 4"
+                :key="`CustomCalculateMark${item.value}`"
+                :label="item.value"
+              >
                {{ item.label }}
              </el-radio>
            </div>
          </el-radio-group>
        </el-form-item>
-        <el-table v-if="isShow" ref="CalculateTable" :data="form.CalculateQuestions"
-          style="margin: 10px;width: calc(100% - 20px)" size="small">
+        <el-table
+          v-if="isShow"
+          ref="CalculateTable"
+          :data="form.CalculateQuestions"
+          style="margin: 10px;width: calc(100% - 20px)"
+          size="small"
+        >
          <!-- 序号 -->
-          <el-table-column :label="$t('trials:readingUnit:qsList:title:order')" min-width="70">
+          <el-table-column
+            :label="$t('trials:readingUnit:qsList:title:order')"
+            min-width="70"
+          >
            <template slot-scope="scope">
              {{ scope.$index + 1 }}
            </template>
          </el-table-column>
          <!-- 运算类型 -->
-          <el-table-column :label="$t('trials:readingUnit:qsList:title:customCalculateMark')" show-overflow-tooltip
-            min-width="70">
-            <template>
+          <el-table-column
+            :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
+            show-overflow-tooltip
+            min-width="70"
+          >
+            <template slot-scope="scope">
              {{ $fd('ClinicalCustomCalculateMark', form.CustomCalculateMark) }}
            </template>
          </el-table-column>
          <!-- 问题名称 -->
          <el-table-column
            :label="form.CustomCalculateMark >= 10 ? $t('trials:readingUnit:qsList:title:birthday') : $t('trials:readingUnit:qsList:title:qsName')"
-            prop="TableQuestionId" show-overflow-tooltip min-width="180">
+            prop="TableQuestionId"
+            show-overflow-tooltip
+            min-width="180"
+          >
            <template slot-scope="scope">
              <el-select v-model="scope.row.TableQuestionId" clearable>
-                <el-option v-for="item of Questions" :key="item.QuestionId"
-                  :disabled="item.QuestionId === scope.row.QuestionId" :label="item.QuestionName"
-                  :value="item.QuestionId" />
+                <el-option v-for="item of Questions" :key="item.QuestionId" :disabled="item.QuestionId === scope.row.QuestionId" :label="item.QuestionName" :value="item.QuestionId" />
              </el-select>
            </template>
          </el-table-column>
-          <el-table-column v-if="form.CustomCalculateMark === 11" :label="$t('trials:rpManage:table:expirationDate')"
-            prop="TableQuestionId" show-overflow-tooltip min-width="180">
+          <el-table-column
+            v-if="form.CustomCalculateMark === 11"
+            :label="$t('trials:rpManage:table:expirationDate')"
+            prop="TableQuestionId"
+            show-overflow-tooltip
+            min-width="180"
+          >
            <template slot-scope="scope">
              <el-select v-model="scope.row.QuestionId" clearable>
-                <el-option v-for="item of Questions" :key="item.QuestionId"
-                  :disabled="item.QuestionId === scope.row.TableQuestionId" :label="item.QuestionName"
-                  :value="item.QuestionId" />
+                <el-option v-for="item of Questions" :key="item.QuestionId" :disabled="item.QuestionId === scope.row.TableQuestionId" :label="item.QuestionName" :value="item.QuestionId" />
              </el-select>
            </template>
          </el-table-column>
-          <el-table-column v-if="form.CustomCalculateMark <= 4" :label="$t('common:action:action')"
-            prop="TableQuestionId" show-overflow-tooltip>
+          <el-table-column
+            v-if="form.CustomCalculateMark <= 4"
+            :label="$t('common:action:action')"
+            prop="TableQuestionId"
+            show-overflow-tooltip
+          >
            <template slot-scope="scope">
              <!-- 添加 -->
-              <el-button icon="el-icon-plus" size="mini" circle :title="$t('trials:readingUnit:qsList:title:add')"
-                @click="addCustomCalculateMark(scope.$index)" />
+              <el-button
+                icon="el-icon-plus"
+                size="mini"
+                circle
+                :title="$t('trials:readingUnit:qsList:title:add')"
+                @click="addCustomCalculateMark(scope.$index)"
+              />
              <!-- 删除 -->
-              <el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
+              <el-button
+                icon="el-icon-minus"
+                size="mini"
+                circle
+                :disabled="form.CalculateQuestions.length <= 2"
                :title="$t('trials:readingUnit:qsList:title:delete')"
-                @click="deleteCustomCalculateMark(scope.$index)" />
+                @click="deleteCustomCalculateMark(scope.$index)"
+              />
            </template>
          </el-table-column>
        </el-table>
      </div>
-      <el-form-item v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary'"
-        :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ClinicalQuestionShowEnum">
-        <el-radio-group v-model="form.ClinicalQuestionShowEnum"
-          @change="((val) => { isShowQuestionChange(val, form) })">
-          <el-radio v-for="item of $d.ClinicalQuestionShow" :key="`ClinicalQuestionShowEnum${item.value}`"
-            :label="item.value">
+      <el-form-item v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary'" :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ClinicalQuestionShowEnum">
+        <el-radio-group
+          v-model="form.ClinicalQuestionShowEnum"
+          @change="((val)=>{isShowQuestionChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.ClinicalQuestionShow"
+            :key="`ClinicalQuestionShowEnum${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item
-        v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionShowEnum === 1"
-        :label="$t('trials:readingUnit:qsList:title:parentId')" prop="ParentId">
-        <el-select v-model="form.ParentId" clearable @change="((val) => { parentQuestionChange(val, form) })">
-          <el-option v-for="item of parentOptions" :key="`ParentId${item.QuestionId}`" :label="item.QuestionName"
-            :value="item.Id" />
+        v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionShowEnum===1"
+        :label="$t('trials:readingUnit:qsList:title:parentId')"
+        prop="ParentId"
+      >
+        <el-select
+          v-model="form.ParentId"
+          clearable
+          @change="((val)=>{parentQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`ParentId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.Id"
+          />
        </el-select>
      </el-form-item>
      <!-- 显示时依赖父问题触发值 -->
-      <el-form-item v-if="form.ParentId && form.ClinicalQuestionShowEnum === 1"
-        :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValue">
+      <el-form-item v-if="form.ParentId && form.ClinicalQuestionShowEnum===1" :label="$t('trials:qcCfg:table:parentTriggerValue')" prop="ParentTriggerValue">
        <el-select v-model="form.ParentTriggerValue" clearable>
-          <el-option v-for="item of parentTriggerValOptions" :key="item.id" :label="item.label"
-            :value="item.value.toString()" />
+          <el-option
+            v-for="item of parentTriggerValOptions"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value.toString()"
+          />
        </el-select>
      </el-form-item>
-      <el-form-item
-        v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionType !== 'table'"
-        :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
-        <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
-          @change="((val) => { isRequiredChange(val, form) })">
-          <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
+      <el-form-item v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionType !== 'table'" :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
+        <el-radio-group
+          v-model="form.IsRequired"
+          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
+          @change="((val)=>{isRequiredChange(val, form)})"
+        >
+          <el-radio
+            v-for="item of $d.QuestionRequired"
+            :key="`QuestionRequired${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item
        v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="RelevanceId">
-        <el-select v-model="form.RelevanceId" clearable @change="((val) => { relevanceQuestionChange(val, form) })">
-          <el-option v-for="item of parentOptions" :key="`RelevanceId${item.QuestionId}`" :label="item.QuestionName"
-            :value="item.Id" />
+        :label="$t('trials:readingUnit:qsList:title:relevanceId')"
+        prop="RelevanceId"
+      >
+        <el-select
+          v-model="form.RelevanceId"
+          clearable
+          @change="((val)=>{relevanceQuestionChange(val, form)})"
+        >
+          <el-option
+            v-for="item of parentOptions"
+            :key="`RelevanceId${item.QuestionId}`"
+            :label="item.QuestionName"
+            :value="item.Id"
+          />
        </el-select>
      </el-form-item>
      <!-- 必填触发值 -->
-      <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
-        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValue">
+      <el-form-item
+        v-if="form.RelevanceId && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
+        prop="RelevanceValue"
+      >
        <el-select v-model="form.RelevanceValue" clearable>
-          <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label" :value="item.value" />
+          <el-option
+            v-for="item of reParentTriggerValOptions"
+            :key="item.id"
+            :label="item.label"
+            :value="item.value"
+          />
        </el-select>
      </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType !== 'group'" prop="GroupId"
-        :label="$t('trials:readingUnit:qsList:title:groupNameEn')">
+      <el-form-item v-if="form.ClinicalQuestionType !== 'group'" prop="GroupId" :label="$t('trials:readingUnit:qsList:title:groupNameEn')">
        <el-select v-model="form.GroupId" clearable :disabled="isParentExistGroup">
-          <el-option v-for="group of groupOptions" :key="group.Id"
-            :label="language === 'zh' ? group.QuestionName : group.QuestionEnName" :value="group.Id" />
+          <el-option
+            v-for="group of groupOptions"
+            :key="group.Id"
+            :label="language === 'zh' ? group.QuestionName : group.QuestionEnName"
+            :value="group.Id"
+          />
        </el-select>

      </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType === 'time' && [2, 3].includes(clinicalInfo.ClinicalDataLevel)"
-        :label="$t('trials:readingUnit:qsList:title:IsStudyDate')" prop="IsCheckDate">
-        <el-radio-group v-model="form.IsCheckDate">
-          <el-radio v-for="item of $d.YesOrNo" :key="`IsCheckDate${item.value}`" :label="item.value">
+      <el-form-item v-if="form.ClinicalQuestionType === 'time' && [2, 3].includes(clinicalInfo.ClinicalDataLevel)" :label="$t('trials:readingUnit:qsList:title:IsStudyDate')" prop="IsCheckDate">
+        <el-radio-group
+          v-model="form.IsCheckDate"
+        >
+          <el-radio
+            v-for="item of $d.YesOrNo"
+            :key="`IsCheckDate${item.value}`"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
-      <el-form-item
-        v-if="form.ClinicalQuestionType !== 'table' && form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionType !== 'number' && form.ClinicalQuestionType !== 'select'"
-        :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')">
-        <el-input-number v-model="form.MaxAnswerLength" controls-position="right" :min="0" :max="2000" />
+      <el-form-item v-if="form.ClinicalQuestionType !== 'table' && form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionType !== 'number' && form.ClinicalQuestionType !== 'select'" :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')">
+        <el-input-number
+          v-model="form.MaxAnswerLength"
+          controls-position="right"
+          :min="0"
+          :max="2000"
+        />
      </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType === 'table'"
-        :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
-        <el-input-number v-model="form.MaxQuestionCount" controls-position="right" :min="0" :max="10" />
+      <el-form-item v-if="form.ClinicalQuestionType === 'table'" :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
+        <el-input-number
+          v-model="form.MaxQuestionCount"
+          controls-position="right"
+          :min="0"
+          :max="10"
+        />
      </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType === 'upload'"
-        :label="$t('trials:readingUnit:qsList:title:imageCount')">
+      <el-form-item v-if="form.ClinicalQuestionType === 'upload'" :label="$t('trials:readingUnit:qsList:title:imageCount')">
        <el-input-number v-model="form.ImageCount" controls-position="right" :min="1" :max="10" />
      </el-form-item>
      <el-form-item :label="$t('trials:readingUnit:qsList:title:order')" prop="ShowOrder">
-        <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
+        <el-input-number
+          v-model="form.ShowOrder"
+          controls-position="right"
+          :min="0"
+        />
      </el-form-item>
    </div>

    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
      <el-form-item>
        <!-- 取消 -->
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="close">
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="close"
+        >
          {{ $t('common:button:cancel') }}
        </el-button>
        <!-- 保存 -->
@@ -208,7 +345,7 @@
 </template>
 <script>
 import { addOrUpdateTrialClinicalQuestion, getTrialClinicalOtherQuestionList, getTrialClinicalGroupQuestionList, getClinicalCalculateQuestions } from '@/api/dictionary'
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 export default {
  name: 'AddOrUpdateClinicalData',
  props: {
@@ -279,8 +416,7 @@ export default {
        GroupId: null,
        CustomCalculateMark: -1,
        RelevanceId: '',
-        RelevanceValue: '',
-        DefaultValue: ''
+        RelevanceValue: ''
      },
      rules: {
        ClinicalQuestionType: [
@@ -293,11 +429,11 @@ export default {
          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
        ],
        QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-        { max: 300, message: this.$t('common:ruleMessage:maxLength') + ' 300' }],
+          { max: 300, message: this.$t('common:ruleMessage:maxLength') + ' 300' }],
        QuestionGenre: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
        TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-        { validator: validateTypeVal, trigger: 'blur' },
-        { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' }],
+          { validator: validateTypeVal, trigger: 'blur' },
+          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' }],
        DictionaryCode: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
        IsCheckDate: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
        ClinicalQuestionShowEnum: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@@ -310,7 +446,7 @@ export default {
        RelevanceId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
        RelevanceValue: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
        GroupName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
-        { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }]
+          { max: 50, message: this.$t('common:ruleMessage:maxLength') + ' 50' }]
      },
      Questions: [],
      loading: false,
@@ -327,24 +463,13 @@ export default {
  },
  mounted() {
    this.initForm()
-
-  },
-  watch: {
-    data: {
-      handler() {
-        if (this.data.CustomCalculateMark) {
-          this.getClinicalCalculateQuestions(this.data.CustomCalculateMark)
-        }
-      },
-      deep: true,
-      immediate: true
-    }
+    this.getClinicalCalculateQuestions()
  },
  methods: {
-    getClinicalCalculateQuestions(CustomCalculateMark = null) {
+    getClinicalCalculateQuestions() {
      getClinicalCalculateQuestions({
        TrialClinicalId: this.clinicalId,
-        ClinicalQuestionType: [1, 2, 3, 4].includes(CustomCalculateMark) ? 'number' : 'time'
+        ClinicalQuestionType: 'time'
      }).then(res => {
        this.Questions = res.Result
      })
@@ -362,7 +487,6 @@ export default {
    CustomCalculateMarkChange() {
      this.isShow = false
      console.log(this.form.CustomCalculateMark)
-      this.getClinicalCalculateQuestions(this.form.CustomCalculateMark)
      if (this.form.CustomCalculateMark < 0) {
        this.form.CalculateQuestions = []
        return
@@ -455,7 +579,7 @@ export default {
      }
      if (!this.form.Id) {
        if (this.list.length > 0) {
-          let max = Math.max(...this.list.map(item => item.ShowOrder))
+          let max = Math.max(...this.list.map(item=>item.ShowOrder))
          this.form.ShowOrder = max + 1
        }
      }
@@ -539,7 +663,6 @@ export default {
      } else {
        data.LesionType = null
      }
-      // this.getClinicalCalculateQuestions(val)
      data.TypeValue = ''
      data.ValueType = ''
      data.Unit = ''
@@ -595,4 +718,5 @@ export default {
  }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+</style>
@@ -1,19 +1,39 @@
 <template>
  <div>
-    <el-form ref="dicomConfigForm" v-loading="loading" :model="form" label-width="300px" style="width: 800px"
-      :rules="rules" size="small">
+    <el-form
+      ref="dicomConfigForm"
+      v-loading="loading"
+      :model="form"
+      label-width="300px"
+      style="width: 800px"
+      :rules="rules"
+      size="small"
+    >
      <!-- pacs直连 -->
-      <el-form-item :label="$t('trials:dicomCfg:form:pacsLine')" prop="IsPACSConnect">
-        <el-radio-group v-model="form.IsPACSConnect" :disabled="form.IsTrialPACSConfirmed && !isEdit"
-          @change="changeConnect">
-          <el-radio v-for="item of $d.PACSConnectMode" :key="item.id" :label="item.value">
+      <el-form-item
+        :label="$t('trials:dicomCfg:form:pacsLine')"
+        prop="IsPACSConnect"
+      >
+        <el-radio-group
+          v-model="form.IsPACSConnect"
+          :disabled="form.IsTrialPACSConfirmed && !isEdit"
+          @change="changeConnect"
+        >
+          <el-radio
+            v-for="item of $d.PACSConnectMode"
+            :key="item.id"
+            :label="item.value"
+          >
            {{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <template v-if="form.IsPACSConnect">
        <!--AE名称-->
-        <el-form-item :label="$t('trials:dicomCfg:form:CalledAE')" prop="CalledAE">
+        <el-form-item
+          :label="$t('trials:dicomCfg:form:CalledAE')"
+          prop="CalledAE"
+        >
          <p class="form_p copyBox">
            {{ form.CalledAE }}
            <el-tooltip placement="right" effect="light" v-if="form.CalledAE">
@@ -31,83 +51,143 @@
          <p class="form_p">{{ form.Port }}</p>
        </el-form-item>
        <!--状态-->
-        <el-form-item :label="$t('trials:dicomCfg:form:IsTestOK')" prop="IsTestOK" style="position: relative">
-          <el-tag :type="form.IsTestOK ? 'success' : 'danger'" effect="plain" v-if="form.IsTestOK !== null">
+        <el-form-item
+          :label="$t('trials:dicomCfg:form:IsTestOK')"
+          prop="IsTestOK"
+          style="position: relative"
+        >
+          <el-tag
+            :type="form.IsTestOK ? 'success' : 'danger'"
+            effect="plain"
+            v-if="form.IsTestOK !== null"
+          >
            {{ $fd('DicomTest', form.IsTestOK) }}
          </el-tag>
          <!-- 测试DICOM AE style="position: absolute; right: 100px; top: 0"-->
-          <el-button v-if="
-            hasPermi(['trials:trials-panel:setting:trial-config:save']) &&
-            form.IsPACSConnect
-          " style="margin-left: 10px" type="primary" size="mini" @click.stop="testSCPServerConnect">
+          <el-button
+            v-if="
+              hasPermi(['trials:trials-panel:setting:trial-config:save']) &&
+              form.IsPACSConnect
+            "
+            style="margin-left: 10px"
+            type="primary"
+            size="mini"
+            @click.stop="testSCPServerConnect"
+          >
            {{ $t('common:button:DicomTest') }}
          </el-button>
        </el-form-item>
      </template>
      <el-form-item>
        <!-- 保存 -->
-        <el-button v-if="
-          form.IsTrialPACSConfirmed === false &&
-          hasPermi(['trials:trials-panel:setting:trial-config:save'])
-        " type="primary" @click="addOrUpdateDicomAE">
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === false &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click="addOrUpdateDicomAE"
+        >
          {{ $t('common:button:save') }}
        </el-button>
        <!-- 配置确认:disabled="!form.IsTestOK" -->
-        <el-button v-if="
-          form.IsTrialPACSConfirmed === false &&
-          hasPermi(['trials:trials-panel:setting:trial-config:save'])
-        " type="primary" @click="handleConfirm">
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === false &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click="handleConfirm"
+        >
          {{ $t('trials:trialCfg:button:confirm') }}
        </el-button>
        <!-- 配置更新 -->
-        <el-button v-if="
-          form.IsTrialPACSConfirmed === true &&
-          !isEdit &&
-          hasPermi(['trials:trials-panel:setting:trial-config:save'])
-        " type="primary" @click="isEdit = true">
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === true &&
+            !isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click="isEdit = true"
+        >
          {{ $t('trials:trialCfg:button:update') }}
        </el-button>
        <!-- 配置更新确认:disabled="!form.IsTestOK" -->
-        <el-button v-if="
-          form.IsTrialPACSConfirmed === true &&
-          isEdit &&
-          hasPermi(['trials:trials-panel:setting:trial-config:save'])
-        " type="primary" @click="handleUpdate">
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === true &&
+            isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click="handleUpdate"
+        >
          {{ $t('trials:trialCfg:button:updateAndConfirm') }}
        </el-button>
        <!-- 取消 -->
-        <el-button v-if="
-          form.IsTrialPACSConfirmed === true &&
-          isEdit &&
-          hasPermi(['trials:trials-panel:setting:trial-config:save'])
-        " type="primary" @click.stop="confirmCancel">
+        <el-button
+          v-if="
+            form.IsTrialPACSConfirmed === true &&
+            isEdit &&
+            hasPermi(['trials:trials-panel:setting:trial-config:save'])
+          "
+          type="primary"
+          @click.stop="confirmCancel"
+        >
          {{ $t('common:button:cancel') }}
        </el-button>
      </el-form-item>
    </el-form>
    <!-- 配置信息签名框 -->
-    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-      custom-class="base-dialog-wrapper">
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
      <div slot="title">
        <span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
        <span style="font-size: 12px; margin-left: 5px">{{
          `(${$t('common:label:sign')}${currentUser})`
        }}</span>
      </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
+      <SignForm
+        ref="signForm"
+        :sign-code-enum="signCode"
+        @closeDialog="closeSignDialog"
+      />
    </el-dialog>
    <!-- 配置信息确认框 -->
-    <el-dialog v-if="confirmVisible" :visible.sync="confirmVisible" :close-on-click-modal="false" width="600px"
-      :title="$t('trials:trialCfg:dialogTitle:cfgConfirm')" custom-class="base-dialog-wrapper">
+    <el-dialog
+      v-if="confirmVisible"
+      :visible.sync="confirmVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      :title="$t('trials:trialCfg:dialogTitle:cfgConfirm')"
+      custom-class="base-dialog-wrapper"
+    >
      <div class="base-dialog-body">
        <el-table :data="confirmData" border style="width: 100%" size="small">
          <!-- 配置项 -->
-          <el-table-column prop="Name" :label="$t('trials:trialCfg:table:cfgItem')" show-overflow-tooltip />
+          <el-table-column
+            prop="Name"
+            :label="$t('trials:trialCfg:table:cfgItem')"
+            show-overflow-tooltip
+          />
          <!-- 配置值 -->
-          <el-table-column prop="NewVal" :label="$t('trials:trialCfg:table:cfgVal')" show-overflow-tooltip />
+          <el-table-column
+            prop="NewVal"
+            :label="$t('trials:trialCfg:table:cfgVal')"
+            show-overflow-tooltip
+          />
        </el-table>
      </div>
-      <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
        <!-- 确认 -->
        <el-button size="small" type="primary" @click="handleConfirmConfigData">
          {{ $t('trials:trialCfg:button:confirmCfg') }}
@@ -116,27 +196,51 @@
    </el-dialog>

    <!-- 配置信息更新框 -->
-    <el-dialog v-if="updateVisible" :visible.sync="updateVisible" :close-on-click-modal="false" width="600px"
-      :title="$t('trials:trialCfg:dialogTitle:cfgConfirm')" custom-class="base-dialog-wrapper">
+    <el-dialog
+      v-if="updateVisible"
+      :visible.sync="updateVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      :title="$t('trials:trialCfg:dialogTitle:cfgConfirm')"
+      custom-class="base-dialog-wrapper"
+    >
      <div class="base-dialog-body">
        <el-table :data="confirmData" border style="width: 100%" size="small">
          <!-- 配置项 -->
-          <el-table-column prop="Name" :label="$t('trials:trialCfg:table:cfgItem')" show-overflow-tooltip />
+          <el-table-column
+            prop="Name"
+            :label="$t('trials:trialCfg:table:cfgItem')"
+            show-overflow-tooltip
+          />
          <!-- 配置值（更改前） -->
-          <el-table-column prop="OldVal" :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
-            'trials:trialCfg:table:beforeChange'
-          )}）`" show-overflow-tooltip />
+          <el-table-column
+            prop="OldVal"
+            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
+              'trials:trialCfg:table:beforeChange'
+            )}）`"
+            show-overflow-tooltip
+          />
          <!-- 配置值（更改后） -->
-          <el-table-column prop="NewVal" :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
-            'trials:trialCfg:table:updated'
-          )}）`" show-overflow-tooltip>
+          <el-table-column
+            prop="NewVal"
+            :label="`${$t('trials:trialCfg:table:cfgVal')} （${$t(
+              'trials:trialCfg:table:updated'
+            )}）`"
+            show-overflow-tooltip
+          >
            <template slot-scope="scope">
-              <span :class="{ fontColor: scope.row.NewVal !== scope.row.OldVal }">{{ scope.row.NewVal }}</span>
+              <span
+                :class="{ fontColor: scope.row.NewVal !== scope.row.OldVal }"
+                >{{ scope.row.NewVal }}</span
+              >
            </template>
          </el-table-column>
        </el-table>
      </div>
-      <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <div
+        class="base-dialog-footer"
+        style="text-align: right; margin-top: 10px"
+      >
        <!-- 确认 -->
        <el-button size="small" type="primary" @click="handleUpdateConfigData">
          {{ $t('trials:trialCfg:button:confirmCfg') }}
@@ -277,7 +381,8 @@ export default {
  methods: {
    copyLink() {
      this.$copyText(
-        `${this.$t('trials:dicomCfg:form:CalledAE')}: ${this.form.CalledAE
+        `${this.$t('trials:dicomCfg:form:CalledAE')}: ${
+          this.form.CalledAE
        }\n${this.$t('trials:dicomCfg:form:Ip')}: ${this.form.Ip}\n${this.$t(
          'trials:dicomCfg:form:Port'
        )}: ${this.form.Port}\n${this.$t(
@@ -396,10 +501,8 @@ export default {
      try {
        let validate = await this.$refs.dicomConfigForm.validate()
        if (!validate) return
-        if (this.Id && !this.form.IsPACSConnect) {
+        if (this.Id) {
          this.form.Id = this.Id
-        } else {
-          this.form.Id = null
        }
        this.form.TrialId = this.$route.query.trialId
        this.loading = true
@@ -522,11 +625,9 @@ export default {
 .fontColor {
  color: red;
 }
-
 .form_p {
  margin: 0;
 }
-
 .copyBox {
  cursor: pointer;
 }
@@ -99,9 +99,9 @@
            <template slot-scope="scope">
              <span>{{
                scope.row.size && scope.row.size > 0
-                  ? $FormatSize(scope.row.size)
+                  ? `${(scope.row.size / 1024 / 1024).toFixed(3)}MB`
                  : scope.row.Size && scope.row.Size > 0
-                  ? $FormatSize(scope.row.Size)
+                  ? `${(scope.row.Size / 1024 / 1024).toFixed(3)}MB`
                  : ''
              }}</span>
            </template>
@@ -119,7 +119,6 @@
          <template slot-scope="scope">
            <el-tag v-if="scope.row.Status === 1" type="primary">{{ $fd('Subject_Visit_Status', scope.row.Status) }}</el-tag>
            <el-tag v-if="scope.row.Status === 2" type="danger">{{ $fd('Subject_Visit_Status', scope.row.Status) }}</el-tag>
-            <el-tag v-if="scope.row.Status === 3" type="danger">{{ $fd('Subject_Visit_Status', scope.row.Status) }}</el-tag>
          </template>
        </el-table-column>
        <!-- 总访视量 -->
@@ -1,367 +0,0 @@
-<template>
-    <BaseContainer class="image-summary-wrapper">
-        <template slot="search-container">
-            <el-form :inline="true">
-                <!-- 中心 -->
-                <el-form-item :label="$t('trials:imageSummary:table:siteNo')">
-                    <el-select v-model="searchData.TrialSiteId" clearable filterable>
-                        <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
-                            :value="item.TrialSiteId" />
-                    </el-select>
-                </el-form-item>
-                <!-- 受试者 -->
-                <el-form-item :label="$t('trials:imageSummary:table:subject')">
-                    <el-input v-model="searchData.SubjectCode" />
-                </el-form-item>
-                <!-- 拍片时间 -->
-                <el-form-item :label="$t('trials:imageSummary:table:operateTime')">
-                    <el-date-picker v-model="timeList" @change="changeTimeList" value-format="yyyy-MM-dd HH:mm:ss"
-                        :default-time="['00:00:00', '23:59:59']" type="datetimerange">
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item>
-                    <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-                        {{ $t('common:button:search') }}
-                    </el-button>
-                    <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-                        {{ $t('common:button:reset') }}
-                    </el-button>
-                    <el-button type="primary" @click="handleExport">
-                        {{ $t('common:button:export') }}
-                    </el-button>
-                    <el-button type="primary" @click="handleExportImage(false)" :disabled="selectArr.length <= 0"
-                        v-if="hasPermi(['trials:trials-panel:trial-summary:image-summary:exportImage'])">
-                        {{ $t('trials:imageSummary:button:export_dicom') }}
-                    </el-button>
-                    <el-button type="primary" @click="handleExportImage(true)" :disabled="selectArr.length <= 0"
-                        v-if="hasPermi(['trials:trials-panel:trial-summary:image-summary:exportKeyImage'])">
-                        {{ $t('trials:imageSummary:button:export_image') }}
-                    </el-button>
-                    <el-button type="primary" @click="statistics">
-                        {{ $t('trials:imageSummary:button:statistics') }}
-                    </el-button>
-                </el-form-item>
-            </el-form>
-        </template>
-        <template slot="main-container">
-            <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" @sort-change="handleSortChange"
-                @selection-change="handleSelectionChange" stripe height="100"
-                :default-sort="{ prop: 'CreateTime', order: 'descending' }">
-                <el-table-column type="selection" width="55" />
-                <!-- 中心编号 -->
-                <el-table-column prop="TrialSiteCode" min-width="100" :label="$t('trials:imageSummary:table:siteNo')"
-                    show-overflow-tooltip sortable="custom" />
-                <!-- 受试者 -->
-                <el-table-column prop="SubjectCode" min-width="100" :label="$t('trials:imageSummary:table:subject')"
-                    show-overflow-tooltip sortable="custom" />
-                <!-- 访视 -->
-                <el-table-column prop="VisitName" min-width="120" :label="$t('trials:imageSummary:table:visit')"
-                    show-overflow-tooltip sortable="custom" />
-                <!-- 检查数量 -->
-                <el-table-column prop="TotalStudyCount" min-width="120"
-                    :label="$t('trials:imageSummary:table:TotalStudyCount')" show-overflow-tooltip sortable="custom" />
-                <!-- 影像类型 -->
-                <el-table-column prop="VisitName" min-width="120" :label="$t('trials:imageSummary:table:imageType')"
-                    show-overflow-tooltip sortable="custom">
-                    <template slot-scope="scope">
-                        <el-tag v-if="scope.row.IsHaveDicom" type="primary">{{
-                            $fd('IsDicom', true)
-                            }}</el-tag>
-                        <el-tag v-if="scope.row.IsHaveNoneDicom" type="primary">{{
-                            $fd('IsDicom', false)
-                            }}</el-tag>
-                    </template>
-                </el-table-column>
-                <!-- 影像数量 -->
-                <el-table-column prop="TotalImageCount" min-width="120"
-                    :label="$t('trials:imageSummary:table:TotalImageCount')" show-overflow-tooltip sortable="custom" />
-                <!-- 影像大小 -->
-                <el-table-column prop="TotalImageSizeStr" min-width="120"
-                    :label="$t('trials:imageSummary:table:TotalImageSizeStr')" show-overflow-tooltip
-                    sortable="custom" />
-                <!-- 最早拍片日期 -->
-                <el-table-column prop="EarliestScanDate" min-width="120"
-                    :label="$t('trials:imageSummary:table:EarliestScanDate')" show-overflow-tooltip sortable="custom" />
-                <!-- 最晚拍片日期 -->
-                <el-table-column prop="LatestScanDate" min-width="120"
-                    :label="$t('trials:imageSummary:table:LatestScanDate')" show-overflow-tooltip sortable="custom" />
-                <el-table-column prop="" fixed="right" :label="$t('common:action:action')" show-overflow-tooltip
-                    v-if="hasPermi(['trials:trials-panel:trial-summary:image-summary:toUpload', 'trials:tab:uploadMonitor'])">
-                    <template slot-scope="scope">
-                        <!-- 详情 -->
-                        <el-button icon="el-icon-position" circle @click="toUpload(scope.row)"
-                            :title="$t('trials:imageSummary:action:toUpload')" />
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-                @pagination="getList" />
-            <div class="remark">
-                <span>{{ $t('trials:imageSummary:remark:TotalImageSizeStr') }}</span>
-                <span class="size">{{ image_size.TotalImageSizeStr }}</span>,
-                <span>{{ $t('trials:imageSummary:remark:SubjectImageAVGSizeStr') }}</span>
-                <span class="size">{{ image_size.SubjectImageAVGSizeStr }} </span>,
-                <span>{{ $t('trials:imageSummary:remark:SubjectVisitImageAVGSizeStr') }}</span>
-                <span class="size">{{ image_size.SubjectVisitImageAVGSizeStr }}</span>,
-                <span>{{ $t('trials:imageSummary:remark:CheckImageSize') }}</span>
-                <span class="size">{{ image_size.CheckImageSize }} </span>
-            </div>
-        </template>
-    </BaseContainer>
-</template>
-<script>
-import Pagination from '@/components/Pagination'
-import BaseContainer from '@/components/BaseContainer'
-import { getTrialSiteSelect, getTrialVisitImageStatList, getTrialVisitImageStatInfo, getExportSubjectVisitImageList } from '@/api/trials'
-import { downLoadFile } from '@/utils/stream.js'
-import { getTrialVisitImageStatList_Export } from '@/api/export'
-const searchDataDefault = () => {
-    return {
-        SortField: '',
-        Asc: false,
-        PageIndex: 1,
-        PageSize: 20,
-        TrialSiteId: null,
-        SubjectCode: null,
-        BeginScanDate: null,
-        EndScanDate: null
-    }
-}
-export default {
-    name: "imageSummary",
-    components: { Pagination, BaseContainer },
-    data() {
-        return {
-            total: 0,
-            loading: false,
-            searchData: searchDataDefault(),
-            ResearchProgramNo: null,
-            list: [],
-            siteOptions: [],
-            timeList: [],
-            selectArr: [],
-            image_size: {
-                TotalImageSizeStr: null,
-                SubjectImageAVGSizeStr: null,
-                SubjectVisitImageAVGSizeStr: null,
-                CheckImageSize: null
-            }
-        }
-    },
-    created() {
-        this.getSite()
-        this.getList()
-    },
-    methods: {
-        async getList() {
-            try {
-                this.searchData.TrialId = this.$route.query.trialId
-                this.loading = true
-                let res = await getTrialVisitImageStatList(this.searchData)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = res.Result.CurrentPageData
-                    this.total = res.Result.TotalCount
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        // 导出表格
-        async handleExport() {
-            this.loading = true
-            try {
-                await getTrialVisitImageStatList_Export(this.searchData)
-                this.loading = false
-            } catch (e) {
-                this.loading = false
-            }
-        },
-        // 导出影像或关键图
-        async handleExportImage(IsKeyImage = false) {
-            try {
-                let data = {
-                    TrialId: this.$route.query.trialId,
-                    IsKeyImage
-                }
-                data.SubjectVisitIdList = this.selectArr.map(item => item.SubjectVisitId)
-                if (!IsKeyImage) {
-                    let confirm = await this.$confirm(this.$t('trials:imageSummary:confirm:space').replace('xxx', this.image_size.CheckImageSize))
-                    if (!confirm) return false
-                }
-                let res = await getExportSubjectVisitImageList(data)
-                if (res.IsSuccess) {
-                    this.downLoad(IsKeyImage, res.Result)
-                }
-            } catch (err) {
-                console.log(err)
-            }
-        },
-        // 下载
-        async downLoad(IsKeyImage = false, row) {
-            try {
-                let { files, name } = this.formatDownloadFile(IsKeyImage, row)
-                let res = await downLoadFile(files, name, 'zip')
-                // }
-            } catch (err) {
-                console.log(err)
-            }
-        },
-        // 格式化下载文件路径
-        formatDownloadFile(IsKeyImage = false, row) {
-            let files = [],
-                name = `${this.$route.query.researchProgramNo}_${this.$t('trials:imageSummary:downloadname:dicom')}_${Date.now()}.zip`;
-            if (!IsKeyImage) {
-                //中心ID/受试者ID/访视名/Study ID_Study Date_Modality/文件  
-                row.VisitList.forEach(visit => {
-                    if (visit.StudyList && visit.StudyList.length > 0) {
-                        visit.StudyList.forEach(study => {
-                            if (study.SeriesList && study.SeriesList.length > 0) {
-                                study.SeriesList.forEach(serie => {
-                                    if (serie.InstancePathList && serie.InstancePathList.length > 0) {
-                                        serie.InstancePathList.forEach(instance => {
-                                            let instanceArr = instance.Path.split("/")
-                                            let fileName = instanceArr[instanceArr.length - 1]
-                                            let obj = {
-                                                name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${study.StudyTime}_${serie.Modality}/${fileName}`,
-                                                url: this.OSSclientConfig.basePath + instance.Path,
-                                            }
-                                            files.push(obj)
-                                        })
-                                    }
-                                })
-                            }
-                        })
-                    }
-                    if (visit.NoneDicomStudyList && visit.NoneDicomStudyList.length > 0) {
-                        visit.NoneDicomStudyList.forEach(noneDicomStudy => {
-                            if (noneDicomStudy.FileList && noneDicomStudy.FileList.length > 0) {
-                                noneDicomStudy.FileList.forEach(file => {
-                                    let obj = {
-                                        name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${noneDicomStudy.StudyCode}_${noneDicomStudy.ImageDate}_${noneDicomStudy.Modality}/${file.FileName}`,
-                                        url: this.OSSclientConfig.basePath + file.Path,
-                                    }
-                                    files.push(obj)
-                                })
-                            }
-                        })
-                    }
-                })
-            } else {
-                //项目研究方案号(评估标准)/中心ID/受试者ID/访视名/阅片人角色-裁判选择标记/文件名
-                name = `${this.$route.query.researchProgramNo}_${this.$t('trials:imageSummary:downloadname:keyImage')}_${Date.now()}.zip`
-                row.forEach(item => {
-                    ['QuestionMarkPictureList', 'TableQuestionRowPictureList', 'ReadingNoneDicomMarkPathList'].forEach(key => {
-                        if (item[key] && item[key].length > 0) {
-                            item[key].forEach(data => {
-                                ['PicturePath', 'otherPicturePath'].forEach(imgKey => {
-                                    if (data[imgKey]) {
-                                        let arr = data[imgKey].split("/")
-                                        let fileName = arr[arr.length - 1]
-                                        let obj = {
-                                            name: `${item.CriterionName}/${item.TrialSiteCode}/${item.SubjectCode}/${item.VisitName}/${this.$fd('ArmEnum', item.ArmEnum)}_${this.$fd('IsJudgeSelect', String(item.IsJudgeSelect))}/${fileName}`,
-                                            url: this.OSSclientConfig.basePath + data[imgKey],
-                                        }
-                                        files.push(obj)
-                                    }
-                                })
-                            })
-                        }
-                    })
-                })
-            }
-
-            return { files, name }
-        },
-        // 获取统计数据
-        async statistics() {
-            try {
-                let params = {
-                    TrialId: this.$route.query.trialId
-                }
-                this.loading = true
-                let res = await getTrialVisitImageStatInfo(params)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.image_size.TotalImageSizeStr = res.Result.TotalImageSizeStr;
-                    this.image_size.SubjectImageAVGSizeStr = res.Result.SubjectImageAVGSizeStr;
-                    this.image_size.SubjectVisitImageAVGSizeStr = res.Result.SubjectVisitImageAVGSizeStr;
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        // 跳转至上传记录页
-        toUpload(row) {
-            let query = this.$route.query
-            query.siteId = row.TrialSiteId
-            query.subjectCode = row.SubjectCode
-            query.visitNum = row.VisitNum
-            this.$router.push({
-                path: '/trials/trials-panel/trial-summary/upload-monitor',
-                query
-            })
-        },
-        handleSelectionChange(selection) {
-            this.selectArr = selection
-            let num = this.selectArr.reduce((sum, item) => sum + item.TotalImageSize, 0)
-            if (num <= 0) return this.image_size.CheckImageSize = null
-            this.image_size.CheckImageSize = this.$FormatSize(num)
-        },
-        // 获取site下拉框数据
-        getSite() {
-            getTrialSiteSelect(this.$route.query.trialId).then(res => {
-                this.siteOptions = res.Result
-            })
-        },
-        changeTimeList() {
-            if (this.timeList) {
-                this.searchData.BeginScanDate = this.timeList[0]
-                this.searchData.EndScanDate = this.timeList[1]
-            } else {
-                this.searchData.BeginScanDate = null
-                this.searchData.EndScanDate = null
-            }
-
-        },
-        handleReset() {
-            this.searchData = searchDataDefault()
-            this.timeList = []
-            this.getList()
-        },
-        handleSearch() {
-            this.searchData.PageIndex = 1
-            this.getList()
-        },
-        handleSortChange(column) {
-            if (column.order === 'ascending') {
-                this.searchData.Asc = true
-            } else {
-                this.searchData.Asc = false
-            }
-            this.searchData.SortField = column.prop
-            this.searchData.PageIndex = 1
-            this.getList()
-        },
-    }
-}
-</script>
-<style lang="scss" scoped>
-.image-summary-wrapper {
-    position: relative;
-
-    .remark {
-        position: absolute;
-        left: 5px;
-        bottom: 7px;
-        font-size: 12px;
-
-        .size {
-            display: inline-block;
-            min-width: 50px;
-        }
-    }
-}
-</style>
@@ -3,100 +3,212 @@
    <template slot="search-container">
      <el-form :inline="true">
        <!--所在中心-->
-        <el-form-item :label="$t('trials:pushRecord:table:trialSiteKeyInfo')" prop="TrialSiteKeyInfo">
-          <el-input v-model="searchData.TrialSiteKeyInfo" size="small" clearable style="width: 150px"
-            :placeholder="$t('trials:pushRecord:placeholder:trialSiteKeyInfo')" />
+        <el-form-item
+          :label="$t('trials:pushRecord:table:trialSiteKeyInfo')"
+          prop="TrialSiteKeyInfo"
+        >
+          <el-input
+            v-model="searchData.TrialSiteKeyInfo"
+            size="small"
+            clearable
+            style="width: 150px"
+            :placeholder="$t('trials:pushRecord:placeholder:trialSiteKeyInfo')"
+          />
        </el-form-item>
        <!--接收端AE-->
-        <el-form-item :label="$t('trials:pushRecord:table:calledAE')" prop="CalledAE">
-          <el-select v-model="searchData.CalledAE" clearable style="width: 120px">
-            <el-option v-for="item of calledAEList" :key="item" :value="item" :label="item" />
+        <el-form-item
+          :label="$t('trials:pushRecord:table:calledAE')"
+          prop="CalledAE"
+        >
+          <el-select
+            v-model="searchData.CalledAE"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of calledAEList"
+              :key="item"
+              :value="item"
+              :label="item"
+            />
          </el-select>
        </el-form-item>
        <!--发送端AE-->
-        <el-form-item :label="$t('trials:pushRecord:table:callingAE')" prop="CallingAE">
-          <el-select v-model="searchData.CallingAE" clearable style="width: 120px">
-            <el-option v-for="item of callingAEList" :key="item" :value="item" :label="item" />
+        <el-form-item
+          :label="$t('trials:pushRecord:table:callingAE')"
+          prop="CallingAE"
+        >
+          <el-select
+            v-model="searchData.CallingAE"
+            clearable
+            style="width: 120px"
+          >
+            <el-option
+              v-for="item of callingAEList"
+              :key="item"
+              :value="item"
+              :label="item"
+            />
          </el-select>
        </el-form-item>
        <!--最新接受日期-->
        <el-form-item :label="$t('trials:pushRecord:table:createTime')">
-          <el-date-picker v-model="datetimerange" type="datetimerange" :default-time="['00:00:00', '23:59:59']"
+          <el-date-picker
+            v-model="datetimerange"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
            :start-placeholder="$t('trials:loginLog:table:beginTime')"
-            :end-placeholder="$t('trials:loginLog:table:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
-            @change="handleDatetimeChange" />
+            :end-placeholder="$t('trials:loginLog:table:endTime')"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleDatetimeChange"
+          />
        </el-form-item>
        <el-form-item>
          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
            {{ $t('common:button:search') }}
          </el-button>
          <!-- 重置 -->
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
            {{ $t('common:button:reset') }}
          </el-button>
          <!--导出-->
-          <el-button type="primary" icon="el-icon-download" :disabled="list.length <= 0" @click="handleExport">
+          <el-button
+            type="primary"
+            icon="el-icon-download"
+            :disabled="list.length <= 0"
+            @click="handleExport"
+          >
            {{ $t('common:button:export') }}
          </el-button>
        </el-form-item>
      </el-form>
    </template>
    <template slot="main-container">
-      <el-table v-loading="loading" v-adaptive="{ bottomOffset: 60 }" height="100" :data="list" class="table"
-        @sort-change="handleSortByColumn" :default-sort="{ prop: 'StartTime', order: 'descending' }">
+      <el-table
+        v-loading="loading"
+        v-adaptive="{ bottomOffset: 60 }"
+        height="100"
+        :data="list"
+        class="table"
+        @sort-change="handleSortByColumn"
+        :default-sort="{ prop: 'StartTime', order: 'descending' }"
+      >
        <el-table-column type="index" width="50" />
        <!--中心编号-->
-        <el-table-column :label="$t('trials:pushRecord:table:trialSiteCode')" prop="TrialSiteCode" min-width="160"
-          show-overflow-tooltip sortable="custom" />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:trialSiteCode')"
+          prop="TrialSiteCode"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
        <!--中心名称-->
-        <el-table-column :label="$t('trials:pushRecord:table:trialSiteAliasName')" prop="TrialSiteAliasName"
-          min-width="160" show-overflow-tooltip sortable="custom" />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:trialSiteAliasName')"
+          prop="TrialSiteAliasName"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
        <!--发送端AE-->
-        <el-table-column :label="$t('trials:pushRecord:table:callingAEList')" prop="CallingAE" min-width="90"
-          show-overflow-tooltip />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:callingAEList')"
+          prop="CallingAE"
+          min-width="90"
+          show-overflow-tooltip
+        />
        <!--发送端IP-->
-        <el-table-column :label="$t('trials:pushRecord:table:callingAEIP')" prop="CallingAEIP" min-width="160"
-          show-overflow-tooltip sortable="custom" />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:callingAEIP')"
+          prop="CallingAEIP"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
        <!--接收端AE-->
-        <el-table-column :label="$t('trials:pushRecord:table:calledAEList')" prop="CalledAE" min-width="90"
-          show-overflow-tooltip />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:calledAEList')"
+          prop="CalledAE"
+          min-width="90"
+          show-overflow-tooltip
+        />

        <!--检查数-->
-        <el-table-column :label="$t('trials:pushRecord:table:studyCount')" prop="StudyCount" min-width="160"
-          show-overflow-tooltip sortable="custom" />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:studyCount')"
+          prop="StudyCount"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
        <!--图像数量-->
-        <el-table-column :label="$t('trials:pushRecord:table:fileCount')" prop="FileCount" min-width="160"
-          show-overflow-tooltip sortable="custom" />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:fileCount')"
+          prop="FileCount"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
        <!--图像大小-->
-        <el-table-column :label="$t('trials:pushRecord:table:fileSize')" prop="FileSize" min-width="160"
-          show-overflow-tooltip sortable="custom">
+        <el-table-column
+          :label="$t('trials:pushRecord:table:fileSize')"
+          prop="FileSize"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        >
          <template slot-scope="scope">
            <span>{{
-              $FormatSize(scope.row.FileSize)
+              scope.row.FileSize && scope.row.FileSize > 0
+                ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
+                : ''
            }}</span>
          </template>
        </el-table-column>
        <!--推送开始时间-->
-        <el-table-column :label="$t('trials:pushRecord:table:startTime')" prop="StartTime" min-width="160"
-          show-overflow-tooltip sortable="custom" />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:startTime')"
+          prop="StartTime"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
        <!--推送结束时间-->
-        <el-table-column :label="$t('trials:pushRecord:table:endTime')" prop="EndTime" min-width="160"
-          show-overflow-tooltip sortable="custom" />
+        <el-table-column
+          :label="$t('trials:pushRecord:table:endTime')"
+          prop="EndTime"
+          min-width="160"
+          show-overflow-tooltip
+          sortable="custom"
+        />
        <!-- 总共用时 -->
-        <el-table-column prop="UploadIntervalStr" min-width="100" :label="$t('trials:pushRecord:table:totalTime')"
-          show-overflow-tooltip>
+        <el-table-column
+          prop="UploadIntervalStr"
+          min-width="100"
+          :label="$t('trials:pushRecord:table:totalTime')"
+          show-overflow-tooltip
+        >
          <template slot-scope="scope">
            {{ scope.row.UploadIntervalStr }}
          </template>
        </el-table-column>
      </el-table>
      <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-        @pagination="getList" />
+      <pagination
+        class="page"
+        :total="total"
+        :page.sync="searchData.PageIndex"
+        :limit.sync="searchData.PageSize"
+        @pagination="getList"
+      />
    </template>
  </BaseContainer>
 </template>
-<script>
+    <script>
 import {
  getSCPImageUploadList,
  getDicomCalledAEList,
@@ -223,4 +335,5 @@ export default {
    },
  },
 }
-</script>
+</script>
+    
@@ -4,25 +4,52 @@
      {{ TITLE }}
    </div>
    <el-form :inline="true" class="base-search-form topForm">
-      <el-form-item :label="$t('trials:trialDocument:fileRecord:form:isConfirmRecord')"
-        v-if="isManage && hasEdit && !viewStatus">
-        <el-radio-group v-model="DATA.IsConfirmRecord" :disabled="rowBtnStatus === 'edit'">
-          <el-radio :label="item.value" v-for="item in $d.YesOrNo" :key="item.id">{{ item.label }}
+      <el-form-item
+        :label="$t('trials:trialDocument:fileRecord:form:isConfirmRecord')"
+        v-if="isManage && hasEdit && !viewStatus"
+      >
+        <el-radio-group
+          v-model="DATA.IsConfirmRecord"
+          :disabled="rowBtnStatus === 'edit'"
+        >
+          <el-radio
+            :label="item.value"
+            v-for="item in $d.YesOrNo"
+            :key="item.id"
+            >{{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
-      <el-form-item :label="$t('trials:trialDocument:fileRecord:form:isEnable')"
-        v-if="isManage && hasEdit && !viewStatus">
-        <el-radio-group v-model="DATA.IsEnable" :disabled="rowBtnStatus === 'edit'">
-          <el-radio :label="item.value" v-for="item in $d.YesOrNo" :key="item.id">{{ item.label }}
+      <el-form-item
+        :label="$t('trials:trialDocument:fileRecord:form:isEnable')"
+        v-if="isManage && hasEdit && !viewStatus"
+      >
+        <el-radio-group
+          v-model="DATA.IsEnable"
+          :disabled="rowBtnStatus === 'edit'"
+        >
+          <el-radio
+            :label="item.value"
+            v-for="item in $d.YesOrNo"
+            :key="item.id"
+            >{{ item.label }}
          </el-radio>
        </el-radio-group>
      </el-form-item>
      <el-form-item v-if="isManage && hasEdit && !viewStatus">
-        <el-button type="primary" @click="rowBtnStatus = 'save'" v-if="rowBtnStatus === 'edit'">
+        <el-button
+          type="primary"
+          @click="rowBtnStatus = 'save'"
+          v-if="rowBtnStatus === 'edit'"
+        >
          {{ $t('common:button:edit') }}
        </el-button>
-        <el-button type="primary" :loading="rowBtnLoading" @click="saveRowData" v-if="rowBtnStatus === 'save'">
+        <el-button
+          type="primary"
+          :loading="rowBtnLoading"
+          @click="saveRowData"
+          v-if="rowBtnStatus === 'save'"
+        >
          {{ $t('common:button:save') }}
        </el-button>
      </el-form-item>
@@ -31,14 +58,32 @@
    <!-- 搜索框 -->
    <div class="search" style="position: relative">
      <el-form :inline="true" class="base-search-form">
-        <el-form-item :label="$t('trials:trialDocument:fileRecord:search:name')">
-          <el-input v-model="searchData.FileName" style="width: 100px" clearable />
+        <el-form-item
+          :label="$t('trials:trialDocument:fileRecord:search:name')"
+        >
+          <el-input
+            v-model="searchData.FileName"
+            style="width: 100px"
+            clearable
+          />
        </el-form-item>
-        <el-form-item :label="$t('trials:trialDocument:fileRecord:search:isAuthorizedView')"
-          v-if="isManage && !viewStatus">
-          <el-select v-if="!viewStatus" v-model="searchData.IsAuthorizedView" style="width: 100px" placeholder=""
-            clearable>
-            <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
+        <el-form-item
+          :label="$t('trials:trialDocument:fileRecord:search:isAuthorizedView')"
+          v-if="isManage && !viewStatus"
+        >
+          <el-select
+            v-if="!viewStatus"
+            v-model="searchData.IsAuthorizedView"
+            style="width: 100px"
+            placeholder=""
+            clearable
+          >
+            <el-option
+              v-for="item in $d.YesOrNo"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            >
            </el-option>
          </el-select>
        </el-form-item>
@@ -46,70 +91,134 @@
          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
            {{ $t('common:button:search') }}
          </el-button>
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          <el-button
+            type="primary"
+            icon="el-icon-refresh-left"
+            @click="handleReset"
+          >
            {{ $t('common:button:reset') }}
          </el-button>
        </el-form-item>
        <el-form-item v-if="isManage && !viewStatus">
-          <el-button type="primary" :disabled="selectTable.length <= 0" v-if="hasAccredit && isManage && !viewStatus"
-            @click.stop="auth">
+          <el-button
+            type="primary"
+            :disabled="selectTable.length <= 0"
+            v-if="hasAccredit && isManage && !viewStatus"
+            @click.stop="auth"
+          >
            {{ $t('trials:trialDocument:fileRecord:button:accredit') }}
          </el-button>
-          <el-button type="primary" v-if="hasEdit && isManage && !viewStatus" @click.stop="openFile(false)">
+          <el-button
+            type="primary"
+            v-if="hasEdit && isManage && !viewStatus"
+            @click.stop="openFile(false)"
+          >
            {{ $t('trials:trialDocument:fileRecord:button:uploadFile') }}
          </el-button>
-          <el-button type="primary" v-if="hasEdit && isManage && !viewStatus" @click.stop="openFile(true)">
+          <el-button
+            type="primary"
+            v-if="hasEdit && isManage && !viewStatus"
+            @click.stop="openFile(true)"
+          >
            {{ $t('trials:trialDocument:fileRecord:button:uploadFolder') }}
          </el-button>
-          <el-button type="primary" icon="el-icon-bottom" :disabled="selectTable.length <= 0"
-            v-if="hasDownLoad && isManage && !viewStatus" @click.stop="downLoad">
+          <el-button
+            type="primary"
+            icon="el-icon-bottom"
+            :disabled="selectTable.length <= 0"
+            v-if="hasDownLoad && isManage && !viewStatus"
+            @click.stop="downLoad"
+          >
            {{ $t('trials:trialDocument:fileRecord:button:downLoadFile') }}
          </el-button>
-          <el-button type="primary" v-if="hasDel && isManage && !viewStatus" :disabled="selectTable.length <= 0"
-            @click.stop="delList">
+          <el-button
+            type="primary"
+            v-if="hasDel && isManage && !viewStatus"
+            :disabled="selectTable.length <= 0"
+            @click.stop="delList"
+          >
            {{ $t('trials:trialDocument:fileRecord:button:del') }}
          </el-button>
        </el-form-item>
      </el-form>
    </div>

-    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" style="width: 100%"
-      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" v-if="isManage && !viewStatus" />
+    <el-table
+      v-loading="loading"
+      v-adaptive="{ bottomOffset: 75 }"
+      :data="list"
+      stripe
+      height="100"
+      style="width: 100%"
+      @sort-change="handleSortByColumn"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+        v-if="isManage && !viewStatus"
+      />
      <el-table-column type="index" v-else />

      <!--名称-->
-      <el-table-column prop="FileName" :label="$t('trials:trialDocument:fileRecord:table:name')" show-overflow-tooltip
-        sortable="custom">
+      <el-table-column
+        prop="FileName"
+        :label="$t('trials:trialDocument:fileRecord:table:name')"
+        show-overflow-tooltip
+        sortable="custom"
+      >
        <template slot-scope="scope">
-          <div v-if="
-            scope.row.TrialFileRecord &&
-            scope.row.TrialFileRecord.TrialFileTypeId
-          " style="display: flex; align-items: center">
+          <div
+            v-if="
+              scope.row.TrialFileRecord &&
+              scope.row.TrialFileRecord.TrialFileTypeId
+            "
+            style="display: flex; align-items: center"
+          >
            <span class="fileName">{{
              scope.row.TrialFileRecord.FileName
            }}</span>
            <div v-if="isManage && !viewStatus" class="fileBtnBox">
-              <i class="el-icon-view" @click.stop="preview(scope.row.TrialFileRecord)" />
-              <i class="el-icon-download" v-if="hasDownLoad"
-                @click.stop="downLoad(false, scope.row.TrialFileRecord, 'file')" />
-              <i class="el-icon-delete" v-if="hasDel" @click.stop="delFile(scope.row, 'Trial')" />
+              <i
+                class="el-icon-view"
+                @click.stop="preview(scope.row.TrialFileRecord)"
+              />
+              <i
+                class="el-icon-download"
+                v-if="hasDownLoad"
+                @click.stop="downLoad(false, scope.row.TrialFileRecord, 'file')"
+              />
+              <i
+                class="el-icon-delete"
+                v-if="hasDel"
+                @click.stop="delFile(scope.row, 'Trial')"
+              />
            </div>
          </div>
-          <i v-else-if="isManage && !viewStatus && hasEdit" class="el-icon-upload2"
-            style="cursor: pointer; color: #409eff" @click.stop="upload(scope.row, 'Trial', ['.pdf'])" />
+          <i
+            v-else-if="isManage && !viewStatus && hasEdit"
+            class="el-icon-upload2"
+            style="cursor: pointer; color: #409eff"
+            @click.stop="upload(scope.row, 'Trial', ['.pdf'])"
+          />
        </template>
      </el-table-column>
-      <el-table-column prop="fileType" :label="$t('trials:trialDocument:fileRecord:table:fileType')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="fileType"
+        :label="$t('trials:trialDocument:fileRecord:table:fileType')"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
          <span v-if="scope.row.TrialFileRecord">{{
            scope.row.TrialFileRecord.FileFormat
          }}</span>
        </template>
      </el-table-column>
-      <el-table-column prop="fileType" :label="$t('trials:trialDocument:fileRecord:table:fileSize')"
-        show-overflow-tooltip>
+      <el-table-column
+        prop="fileType"
+        :label="$t('trials:trialDocument:fileRecord:table:fileSize')"
+        show-overflow-tooltip
+      >
        <template slot-scope="scope">
          <span v-if="scope.row.TrialFileRecord">{{
            scope.row.TrialFileRecord.FileSize
@@ -119,52 +228,133 @@
        </template>
      </el-table-column>
      <!--历史记录-->
-      <el-table-column prop="HistoryFileRecord" :label="$t('trials:trialDocument:fileRecord:table:historyFileRecord')"
-        show-overflow-tooltip v-if="isManage && !viewStatus">
+      <el-table-column
+        prop="HistoryFileRecord"
+        :label="$t('trials:trialDocument:fileRecord:table:historyFileRecord')"
+        show-overflow-tooltip
+        v-if="isManage && !viewStatus"
+      >
        <template slot-scope="scope">
-          <el-button type="text" @click.stop="openHistory(scope.row)">
-            {{ scope.row.HistoryCount }}
-            <i class="el-icon-upload2" />
-          </el-button>
+          <div
+            v-if="
+              scope.row.HistoryFileRecord &&
+              scope.row.HistoryFileRecord.TrialFileTypeId
+            "
+            style="display: flex; align-items: center"
+          >
+            <span class="fileName">{{
+              scope.row.HistoryFileRecord.FileName
+            }}</span>
+            <div v-if="isManage && !viewStatus" class="fileBtnBox">
+              <i
+                class="el-icon-download"
+                v-if="hasDownLoad"
+                @click.stop="
+                  downLoad(false, scope.row.HistoryFileRecord, 'file')
+                "
+              />
+              <i
+                class="el-icon-delete"
+                v-if="hasDel"
+                @click.stop="delFile(scope.row, 'History')"
+              />
+            </div>
+          </div>
+          <i
+            v-else-if="isManage && !viewStatus"
+            class="el-icon-upload2"
+            style="cursor: pointer; color: #409eff"
+            @click.stop="upload(scope.row, 'History', ['.zip'])"
+          />
        </template>
      </el-table-column>

-      <el-table-column prop="IsAuthorizedView" :label="$t('trials:trialDocument:fileRecord:table:isAuthorizedView')"
-        show-overflow-tooltip sortable="custom" v-if="isManage && !viewStatus">
+      <el-table-column
+        prop="IsAuthorizedView"
+        :label="$t('trials:trialDocument:fileRecord:table:isAuthorizedView')"
+        show-overflow-tooltip
+        sortable="custom"
+        v-if="isManage && !viewStatus"
+      >
        <template slot-scope="scope">
-          <el-switch :disabled="!scope.row.TrialFileRecord" v-if="isManage && !viewStatus && hasEdit"
-            v-model="scope.row.IsAuthorizedView" @change="(val) => auth(false, scope.row, val)" :active-value="true"
-            :inactive-value="false" :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
+          <el-switch
+            :disabled="!scope.row.TrialFileRecord"
+            v-if="isManage && !viewStatus && hasEdit"
+            v-model="scope.row.IsAuthorizedView"
+            @change="(val) => auth(false, scope.row, val)"
+            :active-value="true"
+            :inactive-value="false"
+            :active-text="$fd('YesOrNo', true)"
+            :inactive-text="$fd('YesOrNo', false)"
+          >
          </el-switch>
          <span v-else>{{ $fd('YesOrNo', scope.row.IsAuthorizedView) }}</span>
        </template>
      </el-table-column>
-      <el-table-column prop="UpdateTime" :label="$t('trials:trialDocument:fileRecord:table:updateTime')"
-        show-overflow-tooltip sortable="custom" />
-      <el-table-column prop="CreateTime" :label="$t('trials:trialDocument:fileRecord:table:createTime')"
-        show-overflow-tooltip sortable="custom" />
+      <el-table-column
+        prop="UpdateTime"
+        :label="$t('trials:trialDocument:fileRecord:table:updateTime')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:trialDocument:fileRecord:table:createTime')"
+        show-overflow-tooltip
+        sortable="custom"
+      />
      <el-table-column :label="$t('common:action:action')" width="200">
        <template slot-scope="scope">
-          <el-button icon="el-icon-view" :title="$t('common:button:view')" circle :disabled="!scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
-            " @click.stop="preview(scope.row.TrialFileRecord)" />
-          <el-button v-if="hasDownLoad && isManage && !viewStatus" icon="el-icon-download"
-            :title="$t('trials:trialDocument:fileRecord:button:downLoadFile')" circle :disabled="!scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
-              " @click.stop="downLoad(false, scope.row.TrialFileRecord, 'file')" />
-          <el-button v-if="hasDel && isManage && !viewStatus" icon="el-icon-delete"
-            :title="$t('trials:trialDocument:fileRecord:button:delete')" circle @click.stop="handleDel(scope.row)" />
+          <el-button
+            icon="el-icon-view"
+            :title="$t('common:button:view')"
+            circle
+            :disabled="
+              !scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
+            "
+            @click.stop="preview(scope.row.TrialFileRecord)"
+          />
+          <el-button
+            v-if="hasDownLoad && isManage && !viewStatus"
+            icon="el-icon-download"
+            :title="$t('trials:trialDocument:fileRecord:button:downLoadFile')"
+            circle
+            :disabled="
+              !scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
+            "
+            @click.stop="downLoad(false, scope.row.TrialFileRecord, 'file')"
+          />
+          <el-button
+            v-if="hasDel && isManage && !viewStatus"
+            icon="el-icon-delete"
+            :title="$t('trials:trialDocument:fileRecord:button:delete')"
+            circle
+            @click.stop="handleDel(scope.row)"
+          />
        </template>
      </el-table-column>
    </el-table>

    <!-- 分页组件 -->
-    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      @pagination="getList" />
-    <upload-files :config="config" :faccept="faccept" :uploadPath="uploadPath" :limitLength="limitLength"
-      v-if="config.visible" @close="close" @uplaodFile="uplaodFile" />
-    <history-file-list :config="file_config" :rowData="fileData" :uploadPath="uploadPath" @getList="getList" />
+    <pagination
+      class="page"
+      :total="total"
+      :page.sync="searchData.PageIndex"
+      :limit.sync="searchData.PageSize"
+      @pagination="getList"
+    />
+    <upload-files
+      :config="config"
+      :faccept="faccept"
+      :uploadPath="uploadPath"
+      :limitLength="limitLength"
+      v-if="config.visible"
+      @close="close"
+      @uplaodFile="uplaodFile"
+    />
  </box-content>
 </template>
-<script>
+  <script>
 import {
  addOrUpdateTrialFileType,
  getTrialNormalRecordList,
@@ -179,7 +369,6 @@ import { deepClone } from '@/utils/index.js'
 import Pagination from '@/components/Pagination'
 import BoxContent from '@/components/BoxContent'
 import uploadFiles from '../uploadFiles.vue'
-import historyFileList from '../historyFileList.vue'
 const searchDataDefault = () => {
  return {
    IsAuthorizedView: null,
@@ -192,7 +381,7 @@ const searchDataDefault = () => {
 }
 export default {
  name: 'fileRecord',
-  components: { BoxContent, Pagination, uploadFiles, historyFileList },
+  components: { BoxContent, Pagination, uploadFiles },
  props: {
    viewStatus: {
      type: Boolean,
@@ -237,25 +426,9 @@ export default {
      limitLength: 0,

      DATA: {},
-
-      fileData: {},
-      file_config: {
-        visible: false,
-        title: this.$t('trials:trialDocument:historyFileList:title'),
-        width: '800px',
-      }
-
    }
  },
  methods: {
-    openHistory(row) {
-      this.fileData = {
-        Name: row.TrialFileRecord ? row.TrialFileRecord.FileName : '',
-        Id: row.Id,
-        TrialFileTypeId: this.rowData.Id
-      }
-      this.file_config.visible = true
-    },
    // 新增列表数据
    async uplaodFile(list) {
      console.log(list, 'list')
@@ -602,7 +775,7 @@ export default {
        this.DATA = Object.assign({}, this.rowData)
      },
      immediate: true,
-      deep: true
+      deep:true
    },
  },
  created() {
@@ -650,39 +823,34 @@ export default {
      ])
    },
    TITLE() {
-      return `${this.$fd('ArchiveType', this.ArchiveTypeEnum)} — ${this.isEN ? this.rowData.Name : this.rowData.NameCN
-        }`
+      return `${this.$fd('ArchiveType', this.ArchiveTypeEnum)} — ${
+        this.isEN ? this.rowData.Name : this.rowData.NameCN
+      }`
    },
  },
 }
 </script>
-<style lang="scss" scoped>
+  <style lang="scss" scoped>
 .title {
  line-height: 40px;
  font-weight: bold;
  margin-bottom: 10px;
 }
-
 .fileName {
  display: inline-block;
  max-width: calc(100% - 60px);
-  white-space: nowrap;
-  /* 文本不换行 */
-  overflow: hidden;
-  /* 超出部分隐藏 */
+  white-space: nowrap; /* 文本不换行 */
+  overflow: hidden; /* 超出部分隐藏 */
  text-overflow: ellipsis;
  margin-right: 3px;
 }
-
 .fileBtnBox {
  display: inline-block;
  width: 50px;
-
  i {
    cursor: pointer;
    color: #409eff;
    margin-right: 3px;
-
    &:last-child {
      margin: 0;
    }
@@ -1,349 +0,0 @@
-<template>
-    <div v-if="config.visible">
-        <base-model :config="config">
-            <template slot="dialog-body">
-                <el-form ref="form" :model="rowData" label-width="80px" style="width: 80%;display: inline-block;">
-                    <el-form-item :label="`${$t('trials:trialDocument:table:Name')}: `">
-                        <span class="name text-ellipsis" :title="rowData.Name">{{ rowData.Name }}</span>
-                    </el-form-item>
-                </el-form>
-                <el-button size="mini" type="primary" style="float:right" @click.stop="openFile(true)">
-                    {{ $t('trials:trialDocument:historyFileList:button:addFolder') }}</el-button>
-                <div style="float:right;padding: 0 5px;width: 10px;height: 10px;"></div>
-                <el-button size="mini" type="primary" style="float:right" @click.stop="openFile(false)">
-                    {{ $t('trials:trialDocument:historyFileList:button:addFile') }}</el-button>
-                <el-table :data="list" style="width: 100%" max-height="300px" v-loading="loading"
-                    @sort-change="handleSortByColumn" @cell-mouse-enter="handleCellMouseEnter">
-                    <el-table-column type="index" width="60" />
-                    <el-table-column prop="FileName" :label="$t('trials:trialDocument:historyFileList:FileName')"
-                        sortable="custom" width="200px">
-                        <template slot-scope="scope">
-                            <div v-if="renameId !== scope.row.Id" class="name_box">
-                                <span class="name" :title="scope.row.FileName">{{ scope.row.FileName }}</span>
-                                <i class="el-icon-edit icon_edit" @click="addRenameId(scope.row)"
-                                    :title="$t('trials:trialDocument:historyFileList:icon:rename')" />
-                            </div>
-
-
-                            <el-input v-model="scope.row.FileName" :ref="`renameInp_${scope.row.Id}`" :autofocus="true"
-                                class="renameInp" @blur="save(scope.row)" v-else />
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="FileFormat" :label="$t('trials:trialDocument:historyFileList:FileType')"
-                        sortable="custom" />
-                    <el-table-column prop="FileSize" :label="$t('trials:trialDocument:historyFileList:FileSize')"
-                        sortable="custom">
-                        <template slot-scope="scope">
-                            <span>{{
-                                $FormatSize(scope.row.FileSize)
-                                }}</span>
-                        </template>
-                    </el-table-column>
-                    <el-table-column prop="CreateTime" :label="$t('trials:trialDocument:historyFileList:CreateTime')"
-                        sortable="custom" />
-                    <el-table-column :label="$t('common:action:action')" min-width="120px">
-                        <template slot-scope="scope">
-                            <el-button size="mini" type="text" @click.stop="preview(scope.row)">
-                                {{ $t('common:button:preview') }}
-                            </el-button>
-                            <el-button size="mini" type="text" @click.stop="del(scope.row)">
-                                {{ $t('common:button:delete') }}
-                            </el-button>
-                        </template>
-                    </el-table-column>
-                </el-table>
-            </template>
-        </base-model>
-        <viewer ref="picture_perview4" style="margin: 0 10px"
-            v-if="rowDATA.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowDATA.FileFormat.toLowerCase())"
-            :images="[`${OSSclientConfig.basePath}${rowDATA.FilePath}`]" :options="viewerOptions">
-
-            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowDATA.FilePath}`" alt="Image" />
-        </viewer>
-        <upload-files :config="upload_config" :faccept="faccept" :uploadPath="uploadPath" v-if="upload_config.visible"
-            @close="close" @uplaodFile="uplaodFile" />
-    </div>
-</template>
-<script>
-import BaseModel from '@/components/BaseModel'
-import uploadFiles from './uploadFiles.vue'
-import { addOrUpdateTrialHistoryRecordFile, batchAddTrialHistoryRecordFile, getTrialHistoryRecordFileList, deleteTrialHistoryRecordFile } from '@/api/dictionary'
-const defaultSearchData = () => {
-    return {
-        PageIndex: 1,
-        PageSize: 1000,
-        Asc: false,
-        OffLine: null,
-        SortField: null
-    }
-}
-export default {
-    components: {
-        BaseModel,
-        uploadFiles
-    },
-    props: {
-        config: {
-            type: Object,
-            default: () => {
-                return {
-                    visible: false,
-                    title: this.$t('trials:trialDocument:historyFileList:title'),
-                    width: '800px',
-                }
-            }
-        },
-        rowData: {
-            type: Object,
-            default: () => {
-                return {}
-            }
-        },
-        uploadPath: {
-            type: String,
-            default: ''
-        }
-    },
-    data() {
-        return {
-            searchData: defaultSearchData(),
-            visible: false,
-            title: null,
-            list: [],
-            rowDATA: {},
-            loading: false,
-            viewerOptions: {
-                toolbar: {
-                    zoomIn: true,
-                    zoomOut: true,
-                    reset: true,
-                    prev: false,
-                    next: false,
-                    rotateLeft: true,
-                    rotateRight: true,
-                    flipHorizontal: true,
-                    flipVertical: true,
-                }
-            },
-            upload_config: {
-                visible: false,
-                showClose: true,
-                width: '800px',
-                title: '',
-                appendToBody: false,
-                isFolder: false,
-            },
-            faccept: ['.jpg',
-                '.jpeg',
-                '.png',
-                '.pdf',
-                '.ppt',
-                '.pptx',
-                '.doc',
-                '.docx',
-                '.xls',
-                '.xlsx',
-                ".mp4",
-                ".zip"],
-            renameId: null
-        }
-    },
-    watch: {
-        'rowData.Id': {
-            handler() {
-                if (this.rowData.Id) {
-                    console.log(this.rowData)
-                    this.getList()
-                }
-            },
-            deep: true,
-            immediate: true
-        }
-    },
-    methods: {
-        // 单行hover移入
-        handleCellMouseEnter(row) {
-            this.hoverId = row.Id
-        },
-        addRenameId(row) {
-            this.renameId = row.Id
-            this.$nextTick(() => {
-                if (this.$refs[`renameInp_${row.Id}`]) {
-                    this.$refs[`renameInp_${row.Id}`].focus()
-                }
-            })
-        },
-        close() {
-            this.upload_config.visible = false
-        },
-        getAllList() {
-            this.getList()
-            this.$emit("getList")
-        },
-        openAudit(row) {
-            this.form = Object.assign({}, row)
-            this.visible = true
-        },
-        async save(row) {
-            try {
-                if (!row.FileName) {
-                    this.$message.warning(this.$t("trials:trialDocument:historyFileList:message:fileNameMust"))
-                    return this.addRenameId(row)
-                }
-
-                this.renameId = null
-                let res = await addOrUpdateTrialHistoryRecordFile(row)
-                if (res.IsSuccess) {
-                    this.getList()
-                }
-            } catch (err) {
-                console.log(err)
-            }
-        },
-        async del(row) {
-            try {
-                let confirm = await this.$confirm(this.$t("trials:trialDocument:historyFileList:message:del"))
-                if (!confirm) return false
-                this.loading = true
-                let res = await deleteTrialHistoryRecordFile(row.Id)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.getAllList()
-                }
-            } catch (err) {
-                console.log(err)
-                this.loading = false
-            }
-        },
-        async uplaodFile(list) {
-            console.log(list, 'list')
-            try {
-                let arr = []
-                list.forEach(item => {
-                    let obj = Object.assign({}, item)
-                    obj.TrialFileTypeId = this.rowData.TrialFileTypeId
-                    obj.TrialRecordId = this.rowData.Id
-                    arr.push(obj)
-                });
-                this.loading = true
-                let res = await batchAddTrialHistoryRecordFile(arr)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.getAllList()
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        openFile(isFolder = false) {
-            this.upload_config.title = this.$t(
-                'trials:trialDocument:fileRecord:form:title:uploadFile'
-            )
-            this.upload_config.visible = true
-            this.upload_config.isFolder = isFolder
-        },
-        async getList() {
-            try {
-                if (!this.rowData.Id) return false
-                this.searchData.TrialRecordId = this.rowData.Id
-                let res = await getTrialHistoryRecordFileList(this.searchData)
-                this.loading = false
-                if (res.IsSuccess) {
-                    this.list = res.Result.CurrentPageData
-                }
-            } catch (err) {
-                this.loading = false
-                console.log(err)
-            }
-        },
-        preview(data) {
-            // return this.perview_visible = true
-            this.rowDATA = Object.assign({}, data)
-            if (['.ppt',
-                '.pptx',
-                '.doc',
-                '.docx',
-                '.xls',
-                '.xlsx'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$onlyOffice({
-                    path: data.FilePath,
-                    type: data.FileFormat,
-                    title: data.Name
-                })
-            }
-            if (['.jpg',
-                '.jpeg',
-                '.png'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$nextTick(() => {
-                    this.$refs['picture_perview4'].$viewer.show()
-                })
-            }
-            if (['.pdf'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$preview({
-                    path: data.Path || data.FilePath,
-                    type: 'pdf',
-                    title: data.Name,
-                })
-            }
-            if (['.mp4'].includes(`.${data.FileFormat.toLowerCase()}`)) {
-                this.$video({
-                    path: data.Path || data.FilePath,
-                    type: 'mp4',
-                    title: data.Name,
-                })
-            }
-        },
-        // 排序
-        handleSortByColumn(column) {
-            if (column.order === 'ascending') {
-                this.searchData.Asc = true
-            } else {
-                this.searchData.Asc = false
-            }
-            this.searchData.SortField = column.prop
-            this.searchData.PageIndex = 1
-            this.getList()
-        },
-    }
-
-}
-</script>
-<style lang="scss" scoped>
-.name {
-    display: block;
-    width: 90%;
-}
-
-.name_box {
-    display: flex;
-    align-items: center;
-    width: calc(100% - 20px);
-
-    .name {
-        max-width: calc(100% - 60px);
-        white-space: nowrap;
-        /* 文本不换行 */
-        overflow: hidden;
-        /* 超出部分隐藏 */
-        text-overflow: ellipsis;
-    }
-}
-
-.icon_edit {
-    cursor: pointer;
-    color: rgba(0, 0, 0, 0.3);
-    margin-left: 2px;
-
-    &:hover {
-        color: rgba(0, 0, 0, 0.5);
-    }
-}
-
-.renameInp {
-    ::v-deep .el-input__inner {
-        line-height: 23px;
-        height: 23px;
-    }
-}
-</style>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
wangxiaoshuang	cc788b9833	1 continuous-integration/drone/push Build encountered an error Details	2025-07-24 17:48:00 +08:00
wangxiaoshuang	0aaf2f3edb	tableQuestionId为空时增加判断 continuous-integration/drone/push Build encountered an error Details	2025-07-24 16:41:00 +08:00
wangxiaoshuang	ef489552ea	1 continuous-integration/drone/push Build encountered an error Details	2025-07-23 17:41:18 +08:00
wangxiaoshuang	0c040719b0	复核按钮添加置灰条件 continuous-integration/drone/push Build encountered an error Details	2025-07-23 13:48:45 +08:00
wangxiaoshuang	bdfef06b5f	复核图标变更 continuous-integration/drone/push Build encountered an error Details	2025-07-22 17:20:19 +08:00
wangxiaoshuang	c03e85ff22	复核时也可以指派 continuous-integration/drone/push Build encountered an error Details	2025-07-22 15:36:35 +08:00
				`@@ -1 +0,0 @@`
				<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751350116150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20392" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M870.4 819.2a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4zM512 179.2a332.8 332.8 0 1 1 0 665.6 332.8 332.8 0 0 1 0-665.6z m0 51.2a281.6 281.6 0 1 0 0 563.2 281.6 281.6 0 0 0 0-563.2zM153.6 102.4a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4z" fill="#ADAEB8" p-id="20393"></path></svg>