影像浏览问题修复

# Conflicts:
#	src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue

package-lock.json

@@ -48,6 +48,7 @@
         "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",
@@ -62,6 +63,7 @@
         "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",
@@ -18044,6 +18046,15 @@
         "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",
@@ -22997,6 +23008,18 @@
         "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",

package.json

@@ -54,6 +54,7 @@
     "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",
@@ -68,6 +69,7 @@
     "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",

src/api/dictionary.js

@@ -418,10 +418,11 @@ export function addOrUpdateBasicDic(param) {
   })
 }
 
-export function getDictionaryChildList(id) {
+export function getDictionaryChildList(data) {
   return request({
-    url: `/Dictionary/getChildList/${id}`,
+    url: `/Dictionary/getChildList`,
-    method: 'get'
+    method: 'post',
+    data
   })
 }
 
@@ -1357,3 +1358,42 @@ 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
+  })
+}

src/api/dictionary/checkConfig.js

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

src/api/export.js

@@ -72,7 +72,14 @@ 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',

src/api/trials.js

@@ -4124,3 +4124,77 @@ export function addFolder(data) {
     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
+  })
+}

src/api/trials/reading.js

@@ -459,9 +459,9 @@ export function setMedicalReviewInvalid(params) {
   })
 }
 
-export function getTrialCriterionList(trialId) {
+export function getTrialCriterionList(trialId, isRandom = false) {
   return request({
-    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}`,
+    url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}&isRandom=${isRandom}`,
     method: 'get'
   })
 }

src/components/Dicom/DicomCanvas.vue

@@ -1,15 +1,7 @@
 <template>
-  <div
+  <div id="canvas" ref="canvas" v-loading="loading" element-loading-text="Loading..."
-    id="canvas"
+    element-loading-background="rgba(0, 0, 0, 0.8)" style="width:100%;height:100%;position:relative;"
-    ref="canvas"
+    class="cornerstone-element" @contextmenu.prevent="onContextmenu" @mouseup="sliderMouseup">
-    v-loading="loading"
-    element-loading-text="Loading..."
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    style="width:100%;height:100%;position:relative;"
-    class="cornerstone-element"
-    @contextmenu.prevent="onContextmenu"
-    @mouseup="sliderMouseup"
-  >
     <div v-show="dicomInfo.series" class="info-series">
       <div>Series #{{ dicomInfo.series }}</div>
       <div>Image #{{ dicomInfo.frame }}</div>
@@ -26,9 +18,11 @@
       <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)">
@@ -53,8 +47,12 @@
       <!-- <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 ref="sliderBox" class="my_slider_box"
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown="sliderMousedown($event)" />
+      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 }}
@@ -81,15 +79,8 @@
     <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
       Loading Series #{{ stack.seriesNumber }}...
     </div>-->
-    <el-dialog
+    <el-dialog v-if="dcmTag.visible" :visible.sync="dcmTag.visible" :close-on-click-modal="false" :title="dcmTag.title"
-      v-if="dcmTag.visible"
+      width="1000px" custom-class="base-dialog-wrapper" append-to-body>
-      :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>
@@ -263,9 +254,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)
               }
@@ -368,9 +359,8 @@ export default {
         data.string('x00080030')
       )
       this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
-        this.stack.imageIds.length
+        }`
-      }`
       this.dicomInfo.size = `${data.uint16('x00280011')}x${data.uint16(
         'x00280010'
       )}`
@@ -388,6 +378,7 @@ 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
@@ -678,7 +669,7 @@ export default {
       cornerstoneTools.getToolState(
         this.canvas,
         'playClip'
-      ).data[0].loop = false
+      ).data[0].loop = true
     },
     setFps(fps) {
       this.dicomInfo.fps = fps
@@ -1136,6 +1127,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-image {
   position: absolute;
   left: 10px;
@@ -1155,6 +1147,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-instance {
   position: absolute;
   right: 15px;
@@ -1187,6 +1180,7 @@ export default {
   margin: 10px;
   cursor: default;
 }
+
 .menu__item:hover {
   color: #ff0000;
 }
@@ -1206,7 +1200,8 @@ li:hover {
   background-color: #e0e0e2;
   color: white;
 }
-.my_slider_box:after{
+
+.my_slider_box:after {
   content: '';
   position: absolute;
   bottom: -20px;

src/components/PreviewFile/index.vue

@@ -11,6 +11,8 @@
     <!--      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" />
@@ -51,7 +53,6 @@ export default {
   },
   computed: {
     documentType() {
-      console.log(DOCUMENTTYPE[`.${this.fileType}`], 'documentType')
       return DOCUMENTTYPE[`.${this.fileType}`]
     }
   },

src/components/Preview_video/fun.js

@@ -0,0 +1,23 @@
+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;

src/components/Preview_video/index.js

@@ -0,0 +1,7 @@
+import Video from "./index.vue";
+import video from "./fun";
+
+export default Vue => {
+    Vue.component(Video.name, Video);
+    Vue.prototype.$video = video;
+};

src/components/Preview_video/index.vue

@@ -0,0 +1,38 @@
+<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>

src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -1,21 +1,16 @@
 <template>
   <div class="criterion-form-item">
-    <div
+    <div v-if="!!question.QuestionName && question.ClinicalQuestionType === 'group'"
-      v-if="!!question.QuestionName && question.ClinicalQuestionType==='group'"
+      style="font-weight: bold;font-size: 16px;margin: 5px 0px;margin-bottom: 10px">
-      style="font-weight: bold;font-size: 16px;margin: 5px 0px;margin-bottom: 10px"
+      {{ language === 'en' ? question.QuestionEnName : question.QuestionName }}
-    >
+    </div>
-      {{ language==='en'?question.QuestionEnName:question.QuestionName }}
+    <div v-else-if="question.ClinicalQuestionType === 'summary'"
+      style="background:#f3f3f3;border-radius:4px;font-size: 12px;margin: 5px 0px;margin-bottom: 10px;font-size: 12px;padding: 10px">
+      {{ language === 'en' ? question.QuestionEnName : question.QuestionName }}
     </div>
     <div
-      v-else-if="question.ClinicalQuestionType==='summary'"
+      v-else-if="question.ClinicalQuestionType === 'table' && ((question.ClinicalQuestionShowEnum === 1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum === 0)"
-      style="background:#f3f3f3;border-radius:4px;font-size: 12px;margin: 5px 0px;margin-bottom: 10px;font-size: 12px;padding: 10px"
+      style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
-    >
-      {{ language==='en'?question.QuestionEnName:question.QuestionName }}
-    </div>
-    <div
-      v-else-if="question.ClinicalQuestionType==='table' && ((question.ClinicalQuestionShowEnum===1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum===0)"
-      style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
-    >
       <div style="display: flex;justify-content: space-between;">
         <span>
           {{ question.QuestionName }}
@@ -25,27 +20,17 @@
           {{ $t('trials:readingUnit:qsList:title:add') }}
         </el-button>
       </div>
-      <el-table
+      <el-table :data="questionForm[question.Id]">
-        :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 />
-        <el-table-column
+        <el-table-column :label="$t('common:action:action')" min-width="100" show-overflow-tooltip>
-          v-for="item of question.TableQuestions"
-          :key="item.Id"
-          :prop="item.Id"
-          :label="item.QuestionName"
-          min-width="100"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          :label="$t('common:action:action')"
-          min-width="100"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">
               {{ $t('common:button:edit') }}
             </el-button>
-            <el-button type="text" size="mini" v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || IsBaseline" @click="deleteTableCol(question, scope.$index)">
+            <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>
@@ -54,187 +39,109 @@
     </div>
     <el-col v-else :span="12">
       <el-form-item
-        v-if="(question.ClinicalQuestionShowEnum===1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum===0"
+        v-if="(question.ClinicalQuestionShowEnum === 1 && question.ParentTriggerValue === questionForm[question.ParentId].toString()) || question.ClinicalQuestionShowEnum === 0"
-        :label="`${question.QuestionName}`"
+        :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
-        :prop="question.Id"
+          {
-        :rules="[
+            required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (question.RelevanceValue === questionForm[question.RelevanceId].toString()))) && question.ClinicalQuestionType !== 'summary' && question.ClinicalQuestionType !== 'group' && question.ClinicalQuestionType !== 'table',
-          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (question.RelevanceValue === questionForm[question.RelevanceId].toString()))) && question.ClinicalQuestionType !== 'summary' && question.ClinicalQuestionType!=='group' && question.ClinicalQuestionType!=='table',
+            message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-            message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']}
+          }
-        ]"
+        ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
-        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
-      >
         <!-- 输入框 -->
-        <el-input
+        <el-input v-if="question.ClinicalQuestionType === 'input'" v-model="questionForm[question.Id]"
-          v-if="question.ClinicalQuestionType==='input'"
-          v-model="questionForm[question.Id]"
           :disabled="question.TableQuestionType === 2"
-          :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200"
+          :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200" />
-        />
         <!-- 多行文本输入框 -->
-        <el-input
+        <el-input v-if="question.ClinicalQuestionType === 'textarea'" v-model="questionForm[question.Id]"
-          v-if="question.ClinicalQuestionType==='textarea'"
+          type="textarea" :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200"
-          v-model="questionForm[question.Id]"
+          :autosize="{ minRows: 2, maxRows: 4 }" />
-          type="textarea"
-          :max-length="question.MaxAnswerLength ? question.MaxAnswerLength : 200"
-          :autosize="{ minRows: 2, maxRows: 4}"
-        />
         <!-- 下拉框 -->
-        <el-select
+        <el-select v-if="question.ClinicalQuestionType === 'select'" v-model="questionForm[question.Id]" clearable
-          v-if="question.ClinicalQuestionType==='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
+            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-              v-for="item in organList"
+              :value="item[question.DataTableColumn]" />
-              :key="item.Id"
-              :label="item[question.DataTableColumn]"
-              :value="item[question.DataTableColumn]"
-            />
           </template>
           <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              v-for="item of $d[question.DictionaryCode]"
+              :label="item.label" />
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
           </template>
-          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+          <template
-            <el-option
+            v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-              v-for="item of $d[question.DictionaryCode]"
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              :key="item.id"
+              :label="item.label" />
-              :value="item.value"
-              :label="item.label"
-            />
           </template>
           <template v-else>
-            <el-option
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val.trim()" />
-              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" />
         <!-- 单选 -->
-        <el-date-picker
+        <el-radio-group v-if="question.ClinicalQuestionType === 'radio'" v-model="questionForm[question.Id]"
-          v-if="question.ClinicalQuestionType === 'time'"
+          @change="((val) => { formItemChange(val, question) })">
-          v-model="questionForm[question.Id]"
-          style="width: 200px"
-          align="right"
-          type="date"
-          format="yyyy-MM-dd"
-          value-format="yyyy-MM-dd"
-        />
-        <!-- 单选 -->
-        <el-radio-group
-          v-if="question.ClinicalQuestionType==='radio'"
-          v-model="questionForm[question.Id]"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
           <template v-if="question.DictionaryCode">
-            <el-radio
+            <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="item.value">
-              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
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-            >
               {{ val }}
             </el-radio>
           </template>
         </el-radio-group>
         <!-- 复选框 -->
-        <el-checkbox-group
+        <el-checkbox-group v-if="question.ClinicalQuestionType === 'checkbox' && questionForm[question.Id] !== ''"
-          v-if="question.ClinicalQuestionType==='checkbox' && questionForm[question.Id] !== ''"
+          v-model="questionForm[question.Id]">
-          v-model="questionForm[question.Id]"
+          <el-checkbox v-for="val of question.TypeValue.split('|')" :key="val" :label="val" :value="val">
-        >
-          <el-checkbox
-            v-for="val of question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-            :value="val"
-          >
             {{ val }}
           </el-checkbox>
         </el-checkbox-group>
-        <el-input
+        <el-input v-if="question.ClinicalQuestionType === 'number'" :ref="question.Id"
-          v-if="question.ClinicalQuestionType === 'number'"
+          v-model="questionForm[question.Id]" type="number" style="width: 200px"
-          :ref="question.Id"
+          :disabled="question.CustomCalculateMark > 0" @input="limitInput($event, questionForm, question)">
-          v-model="questionForm[question.Id]"
-          type="number"
-          style="width: 200px"
-          :disabled="question.CustomCalculateMark > 0"
-          @input="limitInput($event, questionForm, question)"
-        >
           <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
         </el-input>
-        <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'" v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] <= questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]" style="margin-left: 10px">
+        <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'"
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
+          v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] <= questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]"
+          style="margin-left: 10px">
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{
+            questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId] }}
         </span>
-        <span v-if="question.CustomCalculateMark === 10 && question.ClinicalQuestionType === 'number' && questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId]" style="margin-left: 10px">
+        <span
-          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ? questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
+          v-if="question.CustomCalculateMark === 10 && question.ClinicalQuestionType === 'number' && questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId]"
+          style="margin-left: 10px">
+          {{ questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] }}~{{ questionForm.CreateTime ?
+            questionForm.CreateTime : parseTime(new Date(), '{y}-{m}-{d}') }}
         </span>
         <!-- 生日不能大于截止日期 -->
-        <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'" v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] > questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]" style="margin-left: 10px;font-size: 12px;color:#f66">
+        <span v-if="question.CustomCalculateMark === 11 && question.ClinicalQuestionType === 'number'"
+          v-show="questionForm[JSON.parse(question.CalculateQuestions)[0].TableQuestionId] > questionForm[JSON.parse(question.CalculateQuestions)[0].QuestionId]"
+          style="margin-left: 10px;font-size: 12px;color:#f66">
           {{ $t('trials:components:clinicalDataQS:msg:birthDay') }}
         </span>
       </el-form-item>
     </el-col>
     <!-- eslint-disable vue/no-use-v-if-with-v-for -->
     <!-- eslint-disable vue/valid-v-for -->
-    <el-col v-for="(item) in question.Childrens" :key="item.Id" v-if="question.Childrens && question.Childrens.length>0 && question.ClinicalQuestionType !== 'table'" :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
+    <el-col v-for="(item) in question.Childrens" :key="item.Id"
-      <QuestionFormItem
+      v-if="question.Childrens && question.Childrens.length > 0 && question.ClinicalQuestionType !== 'table'"
-        :key="item.Id"
+      :span="['group', 'summary', 'table'].includes(item.ClinicalQuestionType) || item.Childrens.length > 0 ? 24 : 12">
-        :question="item"
+      <QuestionFormItem :key="item.Id" :question="item" :question-form="questionForm"
-        :question-form="questionForm"
+        :trial-clinical-id="trialClinicalId" @formItemNumberChange="formItemNumberChange"
-        :trial-clinical-id="trialClinicalId"
+        @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
-        @formItemNumberChange="formItemNumberChange"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
     </el-col>
-    <el-dialog
+    <el-dialog v-if="addOrEdit.visible" class="my_dialog" :visible.sync="addOrEdit.visible"
-      v-if="addOrEdit.visible"
+      :close-on-click-modal="false" :title="addOrEdit.title" width="400px" append-to-body>
-      class="my_dialog"
+      <el-form ref="tableQsForm" v-loading="loading" size="small" :model="QuestionsForm">
-      :visible.sync="addOrEdit.visible"
+        <QuestionTableFormItem v-for="(item) in QuestionsList" :key="item.Id" :question="item"
-      :close-on-click-modal="false"
+          :question-form="QuestionsForm" @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
-      :title="addOrEdit.title"
-      width="400px"
-      append-to-body
-    >
-      <el-form
-        ref="tableQsForm"
-        v-loading="loading"
-        size="small"
-        :model="QuestionsForm"
-      >
-        <QuestionTableFormItem
-          v-for="(item) in QuestionsList"
-          :key="item.Id"
-          :question="item"
-          :question-form="QuestionsForm"
-          @setFormItemData="setFormItemData"
-          @resetFormItemData="resetFormItemData"
-        />
         <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
           <el-form-item>
             <!-- 取消 -->
-            <el-button
+            <el-button size="small" type="primary" @click="addOrEdit.visible = false">
-              size="small"
-              type="primary"
-              @click="addOrEdit.visible = false"
-            >
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -282,7 +189,7 @@ export default {
   },
   data() {
     return {
-      addOrEdit: { visible: false, title: '', id: null, index: 0},
+      addOrEdit: { visible: false, title: '', id: null, index: 0 },
       fileList: [],
       accept: '.png,.jpg,.jpeg',
       imgVisible: false,
@@ -406,8 +313,6 @@ 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])
@@ -450,11 +355,16 @@ export default {
                   }
                   break
                 case 11:
-                  if (parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId])) > 0) {
+                  if (parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId])) > 0) {
-                    num = parseFloat(this.getCurrentAgeByBirthDate2(this.questionForm[o.TableQuestionId], this.questionForm[o.QuestionId]))
+                    num = parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId]))
                   } 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 {
@@ -501,12 +411,10 @@ export default {
       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) {
@@ -520,7 +428,6 @@ export default {
               return o.TableQuestionId === questionId
             })
             // find的自动计算值number
-            console.log('find', find)
             // find的自动计算值number
             if (find) {
               var num = this.logic(v)
@@ -591,40 +498,47 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.my_dialog{
+.my_dialog {
-  .criterion-form-item{
+  .criterion-form-item {
-    ::v-deep .el-form-item__content{
+    ::v-deep .el-form-item__content {
       width: auto;
     }
   }
 }
-.el-col-12 .el-col-12{
+
+.el-col-12 .el-col-12 {
   width: 100%;
 }
-.criterion-form-item{
+
-  .el-form-item{
+.criterion-form-item {
+  .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
-  .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;
   }
 }
-.clearfix:after{
+
+.clearfix:after {
   content: '';
   display: table;
   clear: both;

src/components/clinicalDataQuestions/index.vue

@@ -1,42 +1,28 @@
 <template>
   <div v-loading="loading">
-    <QuestionsForm
+    <QuestionsForm v-if="clinicalUploadType === 2" :data="data" :trial-clinical-id="trialClinicalId"
-      v-if="clinicalUploadType === 2"
+      :is-viewer="isViewer" :visit-id="visitId" :subject-id="subjectId" :open-type="openType"
-      :data="data"
+      :system-clinical-id="systemClinicalId" :trial-id="trialId" :reading-id="readingId"
-      :trial-clinical-id="trialClinicalId"
+      :clinical-form-id="clinicalFormId" :clinical-data-level="clinicalDataLevel" @close="close"></QuestionsForm>
-      :is-viewer="isViewer"
+    <uploadClinicalData v-else :subject-visit-id="subjectVisitId" :data="data" :enum-type="0" :allow-add-or-edit="true"
-      :visit-id="visitId"
+      @getList="() => { }">
-      :subject-id="subjectId"
-      :open-type="openType"
-      :system-clinical-id="systemClinicalId"
-      :trial-id="trialId"
-      :reading-id="readingId"
-      :clinical-form-id="clinicalFormId"
-      :clinical-data-level="clinicalDataLevel"
-      @close="close"
-    ></QuestionsForm>
-    <uploadClinicalData v-else :subject-visit-id="subjectVisitId" :data="data" :enum-type="0" :allow-add-or-edit="true" @getList="() => {}">
     </uploadClinicalData>
-    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [0, 1].includes(clinicalDataLevel)" style="text-align:right;margin-top:10px;">
+    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [0, 1].includes(clinicalDataLevel)"
+      style="text-align:right;margin-top:10px;">
       <!-- 保存 -->
       <el-button size="small" type="primary" @click="submitClinicalForm">
         {{ $t('common:button:submit') }}
       </el-button>
     </div>
     <!-- 临床数据签名框 -->
-    <el-dialog
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px" append-to-body
-      v-if="signVisible"
+      custom-class="base-dialog-wrapper">
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      append-to-body
-      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" :subject-visit-id="subjectVisitId" @closeDialog="closeSignDialog" />
+      <SignForm ref="signForm" :sign-code-enum="signCode" :subject-visit-id="subjectVisitId"
+        @closeDialog="closeSignDialog" />
     </el-dialog>
   </div>
 </template>
@@ -49,7 +35,7 @@ import uploadClinicalData from './components/uploadClinicalData'
 import const_ from '@/const/sign-code'
 
 export default {
-name: "index",
+  name: "index",
   components: { QuestionsForm, uploadClinicalData, SignForm },
   methods: {
     submitClinicalForm() {
@@ -83,7 +69,7 @@ name: "index",
           this.close()
         }).catch((res) => {
           this.$refs['signForm'].btnLoading = false
-      })
+        })
     },
   },
   data() {
@@ -148,7 +134,7 @@ name: "index",
     },
     data: {
       type: Object,
-      default: () => {}
+      default: () => { }
     },
     trialClinicalId: {
       type: String,
@@ -166,6 +152,4 @@ name: "index",
 }
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -4,123 +4,63 @@
       <span>{{ $t('upload:dicom:title') }}</span>
       <div class="tip">
         <i class="el-icon-warning-outline"></i>
-        <div
+        <div v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"></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
+      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
-        prop="SubjectCode"
-        :label="$t('upload:dicom:table:subjectCode')"
-      />
       <!--任务名称-->
-      <el-table-column
+      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
-        prop="TaskBlindName"
-        :label="$t('upload:dicom:table:taskBlindName')"
-      />
       <!--原始检查数-->
-      <el-table-column
+      <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
-        prop="OrginalStudyList"
-        :label="$t('upload:dicom:table:orginalStudyListNum')"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="
-            v-if="
+            scope.row.OrginalStudyList &&
-              scope.row.OrginalStudyList &&
+            scope.row.OrginalStudyList.length >= 1
-              scope.row.OrginalStudyList.length >= 1
+          " type="text" @click="handleOpenDialog(scope.row, 'OrginalStudyList')">
-            "
-            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
+      <el-table-column prop="UploadStudyList" :label="$t('upload:dicom:table:uploadStudyListNum')">
-        prop="UploadStudyList"
-        :label="$t('upload:dicom:table:uploadStudyListNum')"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="
-            v-if="
+            scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
-              scope.row.UploadStudyList && scope.row.UploadStudyList.length >= 1
+          " type="text" @click="handleOpenDialog(scope.row, 'UploadStudyList', true)">
-            "
-            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
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="180">
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="180"
-      >
         <template slot-scope="scope">
           <div class="btnBox">
             <!--上传--->
-            <form
+            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data">
-              id="inputForm"
-              :ref="`uploadForm_${scope.row.Id}`"
-              enctype="multipart/form-data"
-            >
               <div class="form-group" style="margin-right: 10px">
-                <div
+                <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
-                  :id="`directoryInputWrapper_${scope.row.Id}`"
+                  <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
-                  class="btn btn-link file-input"
+                    :title="$t('upload:dicom:button:upload')" />
-                >
+                  <input :title="$t('upload:dicom:button:upload')" type="file" :name="`file_${scope.row.VisitTaskId}`"
-                  <el-button
+                    :ref="`pathClear_${scope.row.VisitTaskId}`" :disabled="btnLoading" webkitdirectory multiple @change="
-                    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
+            <el-button circle icon="el-icon-view" :disabled="!scope.row.UploadStudyList ||
-              circle
+              scope.row.UploadStudyList.length <= 0
-              icon="el-icon-view"
+              " @click.stop="handleViewReadingImages(scope.row)" :title="$t('upload:dicom:button:preview')" />
-              :disabled="
-                !scope.row.UploadStudyList ||
-                scope.row.UploadStudyList.length <= 0
-              "
-              @click.stop="handleViewReadingImages(scope.row)"
-              :title="$t('upload:dicom:button:preview')"
-            />
             <!--删除--->
-            <el-button
+            <el-button circle :disabled="!scope.row.UploadStudyList ||
-              circle
+              scope.row.UploadStudyList.length <= 0 ||
-              :disabled="
+              scope.row.ReadingTaskState === 2
-                !scope.row.UploadStudyList ||
+              " icon="el-icon-delete" :title="$t('upload:dicom:button:delete')" @click.stop="remove(scope.row)" />
-                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>
@@ -134,38 +74,19 @@
         <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
           <div class="form-group">
             <div id="directoryInputWrapper" class="btn btn-link file-input">
-              <el-button
+              <el-button type="primary" :disabled="btnLoading" :loading="btnLoading" size="mini">
-                type="primary"
-                :disabled="btnLoading"
-                :loading="btnLoading"
-                size="mini"
-              >
                 {{ $t('upload:dicom:button:batchUpload') }}
               </el-button>
-              <input
+              <input type="file" name="file" ref="pathClear" :disabled="btnLoading" webkitdirectory multiple title=""
-                type="file"
+                @change="beginScanFiles($event)" />
-                name="file"
-                ref="pathClear"
-                :disabled="btnLoading"
-                webkitdirectory
-                multiple
-                title=""
-                @change="beginScanFiles($event)"
-              />
             </div>
           </div>
         </form>
       </div>
     </div>
     <!--上传列表-->
-    <el-table
+    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 80 }" height="100" :data="uploadQueues"
-      ref="dicomFilesTable"
+      class="dicomFiles-table" @selection-change="handleSelectionChange">
-      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">
@@ -182,28 +103,21 @@
           <div style="line-height: 15px">
             <div>
               <div>
-                <span v-if="scope.row.dicomInfo.accNumber"
+                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight: 500">Acc:</span>
-                  ><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</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"
+                <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
-                  >{{ 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"
+                <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
-                  >{{ scope.row.fileList.length }} Instances</span
-                >
                 <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
@@ -217,8 +131,7 @@
               </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>
@@ -242,16 +155,12 @@
         <template slot-scope="scope">
           <div style="line-height: 15px">
             <div>
-              <span v-if="scope.row.dicomInfo.patientId"
+              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight: 500">PID: </span>{{
-                ><span style="font-weight: 500">PID: </span
+                scope.row.dicomInfo.patientId }}</span>
-                >{{ scope.row.dicomInfo.patientId }}</span
-              >
               <span v-else style="color: #f44336">N/A</span>
             </div>
             <div>
-              <span
+              <span :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']">
-                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
-              >
                 {{
                   scope.row.dicomInfo.patientName
                     ? scope.row.dicomInfo.patientName
@@ -260,9 +169,7 @@
               </span>
             </div>
             <div>
-              <span
+              <span :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']">
-                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
-              >
                 {{
                   scope.row.dicomInfo.patientSex
                     ? scope.row.dicomInfo.patientSex
@@ -270,9 +177,7 @@
                 }},
               </span>
 
-              <span
+              <span :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']">
-                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
-              >
                 {{
                   scope.row.dicomInfo.patientAge
                     ? scope.row.dicomInfo.patientAge
@@ -280,11 +185,9 @@
                 }},
               </span>
 
-              <span
+              <span :class="[
-                :class="[
+                scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
-                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+              ]">
-                ]"
-              >
                 {{
                   scope.row.dicomInfo.patientBirthDate
                     ? scope.row.dicomInfo.patientBirthDate
@@ -295,21 +198,14 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="150"
-        :label="$t('trials:uploadDicomList:table:failedFileCount')"
+        show-overflow-tooltip>
-        min-width="150"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <el-progress
+          <el-progress color="#409eff" :percentage="(
-            color="#409eff"
+            (scope.row.dicomInfo.uploadFileSize * 100) /
-            :percentage="
+            (scope.row.dicomInfo.fileSize ? scope.row.dicomInfo.fileSize : 1)
-              (
+          ).toFixed(2) * 1
-                (scope.row.dicomInfo.uploadFileSize * 100) /
+            " />
-                scope.row.dicomInfo.fileSize
-              ).toFixed(2) * 1
-            "
-          />
           <span>
             {{ $t('trials:uploadDicomList:table:uploadNow')
             }}{{ scope.row.dicomInfo.failedFileCount }}/{{
@@ -324,85 +220,52 @@
         </template>
       </el-table-column>
 
-      <el-table-column
+      <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="140" show-overflow-tooltip>
-        :label="$t('trials:uploadDicomList:table:status')"
-        min-width="140"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <span
+          <span v-if="
-            v-if="
+            !scope.row.dicomInfo.failedFileCount &&
-              !scope.row.dicomInfo.failedFileCount &&
+            !scope.row.dicomInfo.isInit
-              !scope.row.dicomInfo.isInit
+          ">
-            "
+            {{ $t('trials:uploadDicomList:table:status1') }}</span>
-          >
+          <span style="color: #409eff" v-else-if="
-            {{ $t('trials:uploadDicomList:table:status1') }}</span
+            !scope.row.dicomInfo.failedFileCount &&
-          >
+            scope.row.dicomInfo.isInit &&
-          <span
+            btnLoading
-            style="color: #409eff"
+          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-            v-else-if="
+          <span style="color: #409eff" v-else-if="
-              !scope.row.dicomInfo.failedFileCount &&
+            scope.row.dicomInfo.failedFileCount <
-              scope.row.dicomInfo.isInit &&
+            scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
-              btnLoading
+          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
-            "
+          <span style="color: #2cc368" v-else-if="
-            >{{ $t('trials:uploadDicomList:table:status2') }}</span
+            scope.row.dicomInfo.failedFileCount ===
-          >
+            scope.row.dicomInfo.fileCount
-          <span
+          ">{{ $t('trials:uploadDicomList:table:status3') }}</span>
-            style="color: #409eff"
+          <span style="color: #f66" v-else-if="
-            v-else-if="
+            scope.row.uploadState.record &&
-              scope.row.dicomInfo.failedFileCount <
+            scope.row.uploadState.record.fileCount === 0
-                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
+          ">{{ $t('trials:uploadDicomList:table:status5') }}</span>
-            "
-            >{{ $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
+      <el-table-column :label="$t('trials:uploadDicomList:table:record')" min-width="140" show-overflow-tooltip>
-        :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
+                  <div v-for="item of scope.row.uploadState.record.Existed" :key="item"
-                    v-for="item of scope.row.uploadState.record.Existed"
+                    style="font-size: 12px; color: #baa72a">
-                    :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
+                  <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item"
-                    v-for="item of scope.row.uploadState.record.Uploaded"
+                    style="font-size: 12px; color: #24b837">
-                    :key="item"
-                    style="font-size: 12px; color: #24b837"
-                  >
                     {{ item }}
                   </div>
                 </div>
@@ -410,11 +273,8 @@
                 <br />
                 {{ $t('trials:uploadDicomList:table:Failed') }}:
                 <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div
+                  <div v-for="item of scope.row.uploadState.record.Failed" :key="item"
-                    v-for="item of scope.row.uploadState.record.Failed"
+                    style="font-size: 12px; color: #f66">
-                    :key="item"
-                    style="font-size: 12px; color: #f66"
-                  >
                     {{ item }}
                   </div>
                 </div>
@@ -438,16 +298,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <study-view
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
-      v-if="model_cfg.visible"
+      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
-      :model_cfg="model_cfg"
-      :IsDicom="true"
-      :bodyPart="bodyPart"
-      :modelList="modelList"
-      :isUpload="openIsUpload"
-      :TrialModality="TrialModality"
-      @getList="getList"
-    />
   </div>
 </template>
 <script>
@@ -795,7 +647,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
@@ -834,6 +686,7 @@ 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 &&
@@ -1279,16 +1132,14 @@ export default {
                             dicomInfo.failedFileCount++
                             Record.FileCount++
                           } else {
-                            let path = `/${params.trialId}/Image/${
+                            let path = `/${params.trialId}/Image/${params.subjectId
-                              params.subjectId
+                              }/${params.subjectVisitId}/${dicomInfo.visitTaskId
-                            }/${params.subjectVisitId}/${
+                              }/${scope.getGuid(
-                              dicomInfo.visitTaskId
+                                dicomInfo.studyUid +
-                            }/${scope.getGuid(
-                              dicomInfo.studyUid +
                                 v.seriesUid +
                                 o.instanceUid +
                                 params.trialId
-                            )}`
+                              )}`
                             if (scope.isClose) return
                             let res = await dcmUpload(
                               {
@@ -1559,16 +1410,19 @@ 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;
@@ -1578,10 +1432,12 @@ export default {
   opacity: 0;
   cursor: pointer;
 }
+
 .tip {
   display: flex;
   align-items: flex-start;
   margin-top: 5px;
+
   i {
     margin: 3px 5px 0 0;
   }

src/main.js

@@ -56,6 +56,8 @@ 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'
@@ -311,9 +313,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;

src/store/getters.js

@@ -50,6 +50,8 @@ const getters = {
   IsFirstSysDocNeedSign: state => state.user.IsFirstSysDocNeedSign,
   TrialStatusStr: state => state.user.TrialStatusStr,
   lastViewportTaskId: state => state.noneDicomReview.lastViewportTaskId,
-  currentTaskState: state => state.noneDicomReview.currentTaskState
+  currentTaskState: state => state.noneDicomReview.currentTaskState,
+  operateInfo: state => state.dicom3d.operateInfo,
+  deleteAnnotationIds: state => state.dicom3d.deleteAnnotationIds
 }
 export default getters

src/store/index.js

@@ -13,6 +13,7 @@ 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({
@@ -28,7 +29,8 @@ const store = new Vuex.Store({
     financials,
     reading,
     lang,
-    noneDicomReview
+    noneDicomReview,
+    dicom3d
   },
   getters
 })

src/store/modules/dicom3d.js

@@ -0,0 +1,28 @@
+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
+}
+

src/utils/request-download.js

@@ -50,7 +50,8 @@ 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: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8' }))
+        const href = URL.createObjectURL(new Blob([res], { type: response.headers['content-type'] }))
         a.download = fileName
         a.href = href
         a.click()

src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue

@@ -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" :before-upload="beforeUpload"
+          <el-upload class="upload-demo" action accept=".pdf,.mp4" :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']
+      var typeArr = ['pdf', 'mp4']
       var extendName = fileName
         .substring(fileName.lastIndexOf('.') + 1)
         .toLocaleLowerCase()

src/views/dictionary/attachment/components/SignatureTemplate/attachmentForm.vue

@@ -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,7 +82,8 @@ export default {
                 '.doc',
                 '.docx',
                 '.xls',
-                '.xlsx']
+                '.xlsx',
+                '.mp4']
         }
     },
     mounted() {
@@ -172,18 +173,7 @@ export default {
             this.$message.warning(this.$t('upload:rule:maxFile1'))
         },
         checkFileSuffix(fileName) {
-            var typeArr = [
+            var typeArr = this.accept.map(item => item.split('.')[1])
-                'jpg',
-                'jpeg',
-                'png',
-                'pdf',
-                'ppt',
-                'pptx',
-                'doc',
-                'docx',
-                'xls',
-                'xlsx',
-            ]
             var extendName = fileName
                 .substring(fileName.lastIndexOf('.') + 1)
                 .toLocaleLowerCase()

src/views/dictionary/attachment/components/SignatureTemplate/attachmentList.vue

@@ -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())"
+            v-if="rowDATA.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowDATA.FileFormat.toLowerCase())"
-            :images="[`${OSSclientConfig.basePath}${rowData.FilePath}`]" :options="viewerOptions">
+            :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,6 +234,13 @@ 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) {

src/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview.vue

@@ -73,6 +73,7 @@ import xlsx 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,
@@ -100,6 +101,10 @@ export default {
         isView: {
             type: Boolean,
             default: false
+        },
+        isTrial: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -140,11 +145,20 @@ export default {
             try {
                 if (!this.SystemDocumentId) return false
                 this.loading = true
-                this.searchData.SystemDocumentId = this.SystemDocumentId
+                if (!this.isTrial) {
+                    this.searchData.SystemDocumentId = this.SystemDocumentId
+                } else {
+                    this.searchData.TrialDocumentId = this.SystemDocumentId
+                }
                 if (this.isView) {
                     this.searchData.OffLine = false
                 }
-                let res = await getSystemDocumentAttachmentList(this.searchData)
+                let res = null
+                if (!this.isTrial) {
+                    res = await getSystemDocumentAttachmentList(this.searchData)
+                } else {
+                    res = await getTrialDocumentAttachmentList(this.searchData)
+                }
                 this.loading = false
                 if (res.IsSuccess) {
                     this.list = res.Result.CurrentPageData

src/views/dictionary/checkConfig/index.vue

@@ -614,6 +614,18 @@
                 />
               </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>
@@ -1130,6 +1142,7 @@ export default {
         DescriptionCN: null,
         InterfaceName: null,
         IsEnable: true,
+        IsDefaultChoice: true,
         ModuleTypeId: null,
         OptTypeId: null,
         ChildrenTypeId: null,

src/views/dictionary/newdictionary/components/DictionaryChild.vue

@@ -7,74 +7,28 @@
         <el-button type="primary" size="mini" @click="handleAdd">新建</el-button>
       </span>
     </div>
-    <el-table
+    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe size="small" height="100"
-      v-loading="loading"
+      @sort-change="handleSortByColumn">
-      v-adaptive="{bottomOffset:45}"
-      :data="list"
-      stripe
-      size="small"
-      height="100"
-    >
       <el-table-column type="index" width="60" />
-      <el-table-column
+      <el-table-column v-if="!~$route.path.indexOf('select')" prop="Code" label="字典键值" min-width="180"
-        v-if="!~$route.path.indexOf('select')"
+        show-overflow-tooltip sortable='custom' />
-        prop="Code"
+      <el-table-column prop="ValueCN" label="中文值" min-width="180" show-overflow-tooltip sortable='custom' />
-        label="字典键值"
+      <el-table-column prop="Value" label="英文值" min-width="180" show-overflow-tooltip sortable='custom' />
-        min-width="180"
+      <el-table-column prop="ChildGroup" label="分组" min-width="180" show-overflow-tooltip sortable='custom' />
-        show-overflow-tooltip
+      <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
-        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
+          <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
-            v-model="scope.row.IsEnable"
+            @change="(event) => { return switchChange(event, scope.row) }" />
-            :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
+          <el-button type="text" @click="handleEdit(scope.row)">
-            type="text"
-            @click="handleEdit(scope.row)"
-          >
             编辑
           </el-button>
-          <el-button
+          <el-button type="text" @click="handleDelete(scope.row)">
-            type="text"
-            @click="handleDelete(scope.row)"
-          >
             删除
           </el-button>
         </template>
@@ -91,7 +45,8 @@ import DictionaryChildAddOrUpdateForm from './DictionaryChildAddOrUpdateForm'
 
 const searchDataDefault = () => {
   return {
-    parentId: ''
+    Asc: true,
+    SortField: 'ShowOrder',
   }
 }
 export default {
@@ -121,6 +76,17 @@ 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)
@@ -172,7 +138,8 @@ export default {
     // 获取匿名化配置信息
     getList() {
       this.loading = true
-      getDictionaryChildList(this.parent.Id).then(res => {
+      this.searchData.ParentId = this.parent.Id
+      getDictionaryChildList(this.searchData).then(res => {
         this.loading = false
         this.list = res.Result
       }).catch(() => { this.loading = false })
@@ -190,6 +157,4 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

src/views/dictionary/template/components/CriterionDictionary.vue

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

src/views/dictionary/template/components/CriterionDictionaryConfig.vue

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

src/views/dictionary/template/email/components/EmailForm.vue

@@ -1,12 +1,5 @@
 <template>
-  <el-form
+  <el-form ref="emailForm" v-loading="loading" :model="form" label-width="180px" size="small" :rules="rules">
-    ref="emailForm"
-    v-loading="loading"
-    :model="form"
-    label-width="180px"
-    size="small"
-    :rules="rules"
-  >
     <el-row>
       <el-col :span="24">
         <!-- Code -->
@@ -29,12 +22,7 @@
       <el-col :span="12">
         <!-- 邮件延时发送s数 -->
         <el-form-item :label="$t('dictionary:email:label:emailDelaySeconds')" prop="EmailDelaySeconds">
-          <el-input
+          <el-input v-model.number="form.EmailDelaySeconds" style="width: 300px" type="number" clearable>
-            v-model.number="form.EmailDelaySeconds"
-            style="width: 300px"
-            type="number"
-            clearable
-          >
           </el-input>
         </el-form-item>
       </el-col>
@@ -42,12 +30,8 @@
         <!-- 业务层级 -->
         <el-form-item :label="$t('dictionary:email:label:businessLevel')" prop="BusinessLevelEnum">
           <el-select v-model="form.BusinessLevelEnum" clearable class="mr">
-            <el-option
+            <el-option v-for="item of $d.BusinessLevel" :key="`BusinessLevel${item.label}`" :label="item.label"
-              v-for="item of $d.BusinessLevel"
+              :value="item.value" />
-              :key="`BusinessLevel${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
@@ -55,12 +39,8 @@
         <!-- 业务模块 -->
         <el-form-item :label="$t('dictionary:email:label:businessModule')" prop="BusinessModuleEnum">
           <el-select v-model="form.BusinessModuleEnum" clearable class="mr">
-            <el-option
+            <el-option v-for="item of $d.BusinessModule" :key="`BusinessModule${item.label}`" :label="item.label"
-              v-for="item of $d.BusinessModule"
+              :value="item.value" />
-              :key="`BusinessModule${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
       </el-col>
@@ -68,80 +48,46 @@
         <!-- 业务场景 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
           <el-select v-model="form.BusinessScenarioEnum" clearable class="mr">
-            <el-option
+            <el-option v-for="item of $d.Email_BusinessScenario" :key="`BusinessScenarioEnum${item.label}`"
-              v-for="item of $d.Email_BusinessScenario"
+              :label="item.label" :value="item.value" />
-              :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
+          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
-            v-model="form.ToUserTypeList"
+            <el-option v-for="item of $d.UserType" :key="`ToUserTypeList${item.label}`" :label="item.label"
-            clearable
+              :value="item.value" />
-            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
+          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
-            v-model="form.CopyUserTypeList"
+            <el-option v-for="item of $d.UserType" :key="`CopyUserTypeList${item.label}`" :label="item.label"
-            clearable
+              :value="item.value" />
-            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
+          <el-select v-model="form.EmailUrgentEnum" @change="
-            v-model="form.EmailUrgentEnum"
+            (v) => {
-            @change="
+              v === 1 ? (form.EmailCron = null) : null
-              (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" />
-            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
+        <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')" v-if="form.EmailUrgentEnum !== 1"
-          :label="$t('trials:emailManageCfg:table:EmailCron')"
+          prop="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>
@@ -151,12 +97,8 @@
         <!-- 是否需要回执 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
           <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{
-              v-for="item of $d.YesOrNo"
+              item.label }}</el-radio>
-              :label="item.value"
-              :key="`IsReturnRequired${item.value}`"
-              >{{ item.label }}</el-radio
-            >
           </el-radio-group>
         </el-form-item>
       </el-col>
@@ -164,48 +106,30 @@
         <!-- 是否自动发送 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
           <el-radio-group v-model="form.IsAutoSend">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label
-              v-for="item of $d.YesOrNo"
+            }}</el-radio>
-              :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
+          <el-radio-group v-model="form.IsDistinguishCriteria" @change="
-            v-model="form.IsDistinguishCriteria"
+            () => {
-            @change="
+              form.CriterionTypeEnum = null
-              () => {
+            }
-                form.CriterionTypeEnum = null
+          ">
-              }
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsDistinguishCriteria${item.value}`">{{
-            "
+              item.label }}</el-radio>
-          >
-            <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
+        <el-form-item :label="$t('trials:auditRecord:table:criterion')" v-if="form.IsDistinguishCriteria"
-          :label="$t('trials:auditRecord:table:criterion')"
+          prop="CriterionTypeList">
-          v-if="form.IsDistinguishCriteria"
+          <el-select v-model="form.CriterionTypeList" clearable class="mr" multiple>
-          prop="CriterionTypeEnum"
+            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
-        >
+              :value="item.value" />
-          <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>
@@ -213,106 +137,65 @@
         <!-- 是否启用 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
           <el-radio-group v-model="form.IsEnable">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label
-              v-for="item of $d.YesOrNo"
+            }}</el-radio>
-              :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
+          <el-upload class="upload-demo" action :before-upload="beforeUploadCN" :http-request="handleUploadFileCN"
-            class="upload-demo"
+            :on-preview="handlePreviewCN" :on-remove="handleRemoveFileCN" :show-file-list="true" :limit="1"
-            action
+            :file-list="fileListCN">
-            :before-upload="beforeUploadCN"
+            <el-button size="small" type="primary" :disabled="fileListCN.length > 0">{{ $t('common:button:upload')
-            :http-request="handleUploadFileCN"
+            }}</el-button>
-            :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
+          <el-upload class="upload-demo" action :before-upload="beforeUploadEN" :http-request="handleUploadFileEN"
-            class="upload-demo"
+            :on-preview="handlePreviewEN" :on-remove="handleRemoveFileEN" :show-file-list="true" :limit="1"
-            action
+            :file-list="fileListEN">
-            :before-upload="beforeUploadEN"
+            <el-button size="small" type="primary" :disabled="fileListEN.length > 0">{{ $t('common:button:upload')
-            :http-request="handleUploadFileEN"
+            }}</el-button>
-            :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
+    <el-form-item :label="$t('dictionary:email:label:emailHtmlContentCN')" prop="EmailHtmlContentCN"
-      :label="$t('dictionary:email:label:emailHtmlContentCN')"
+      style="position: relative">
-      prop="EmailHtmlContentCN"
+      <div class="html_temp">
-      style="position: relative"
+        <prism-editor class="my-editor" v-model="form.EmailHtmlContentCN" :highlight="highlighter" :line-numbers="true"
-    >
+          style="width: 50%;max-height: 500px;"></prism-editor>
-      <el-input
+        <div v-html="form.EmailHtmlContentCN" style="width: 50%;"></div>
-        v-model="form.EmailHtmlContentCN"
+      </div>
-        type="textarea"
+      <!-- <el-input v-model="form.EmailHtmlContentCN" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
-        :autosize="{ minRows: 8, maxRows: 8 }"
+      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
-      />
-      <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
+    <el-form-item :label="$t('dictionary:email:label:emailHtmlContent')" prop="EmailHtmlContent"
-      :label="$t('dictionary:email:label:emailHtmlContent')"
+      style="position: relative">
-      prop="EmailHtmlContent"
+      <div class="html_temp">
-      style="position: relative"
+        <prism-editor class="my-editor" v-model="form.EmailHtmlContent" :highlight="highlighter" :line-numbers="true"
-    >
+          style="width: 50%;max-height: 500px;"></prism-editor>
-      <el-input
+        <div v-html="form.EmailHtmlContent" style="width: 50%;"></div>
-        v-model="form.EmailHtmlContent"
+      </div>
-        type="textarea"
+      <!-- <el-input v-model="form.EmailHtmlContent" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
-        :autosize="{ minRows: 8, maxRows: 8 }"
+      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
-      />
-      <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
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px; padding-bottom: 10px">
-      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') }}
@@ -321,12 +204,7 @@
     </div>
     <!-- 生成 cron -->
     <el-dialog append-to-body :title="$t('dictionary:email:button:cron')" :visible.sync="showCron">
-      <vcrontab
+      <vcrontab :hideComponent="['year']" @hide="showCron = false" @fill="crontabFill" :expression="expression">
-        :hideComponent="['year']"
-        @hide="showCron = false"
-        @fill="crontabFill"
-        :expression="expression"
-      >
       </vcrontab>
     </el-dialog>
   </el-form>
@@ -334,6 +212,14 @@
 <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: {
@@ -355,7 +241,7 @@ export default {
       },
     },
   },
-  components: { vcrontab },
+  components: { vcrontab, PrismEditor },
   data() {
     return {
       expression: '',
@@ -385,6 +271,7 @@ export default {
         IsAutoSend: true,
         CriterionTypeEnum: null,
         EmailDelaySeconds: null,
+        CriterionTypeList: []
       },
       rules: {
         Code: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
@@ -415,8 +302,8 @@ export default {
         EmailHtmlContent: [
           { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
         ],
-        CriterionTypeEnum: [
+        CriterionTypeList: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+          { required: true, type: 'array', message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
         ],
       },
       scenarioOption: [],
@@ -440,6 +327,9 @@ export default {
     }
   },
   methods: {
+    highlighter(code) {
+      return highlight(code, languages.js);
+    },
     showDialog() {
       this.expression = this.form.EmailCron //传入的 cron 表达式，可以反解析到 UI 上
       this.showCron = true
@@ -563,3 +453,13 @@ export default {
   },
 }
 </script>
+<style lang="scss" scoped>
+.html_temp {
+  display: flex;
+
+  .my-editor {
+    border: 1px solid #333;
+  }
+
+}
+</style>

src/views/dictionary/template/email/components/EmailList.vue

@@ -67,20 +67,26 @@
           <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">
+      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-      <el-table-column type="index" width="40" />
+      <!-- <el-table-column type="index" width="40" /> -->
+      <el-table-column type="selection" width="55">
+      </el-table-column>
       <!-- 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) }}
+          {{scope.row.CriterionTypeList ? scope.row.CriterionTypeList.map(item => $fd('CriterionType', item)).join(', ')
+          : ''}}
         </template>
       </el-table-column>
       <!-- 邮件主题（中文） -->
@@ -249,12 +255,76 @@
         </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'
@@ -308,6 +378,9 @@ export default {
       previewVisible: false,
       previewHTML: null,
       previewHTMLEN: null,
+      multipleSelection: [],
+      drawer: false,
+      tableData: []
     }
   },
   computed: {
@@ -325,6 +398,50 @@ 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

src/views/trials/trials-panel/attachments/attachment-management/index.vue

@@ -62,8 +62,9 @@
         <!-- 用户类型 -->
         <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="item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27"
+            <el-option v-for="item of userTypeOptions"
-              :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
+              v-show="isSystem || (item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27)" :key="item.Id"
+              :label="item.UserTypeShortName" :value="item.Id">
               <span>{{ item.UserType }}</span>
             </el-option>
           </el-select>

src/views/trials/trials-panel/attachments/reReading-tracking/index.vue

@@ -6,12 +6,8 @@
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:reviewAssign:readingTask:table:siteCode')">
           <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
-            <el-option
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
-              v-for="(item,index) of siteOptions"
+              :value="item.TrialSiteId" />
-              :key="index"
-              :label="item.TrialSiteCode"
-              :value="item.TrialSiteId"
-            />
           </el-select>
         </el-form-item>
         <!-- 受试者编号 -->
@@ -20,51 +16,47 @@
         </el-form-item>
         <!-- 访视/阅片期名称 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:visitName')">
-          <el-input
+          <el-input v-model="searchData.TaskName" style="width:100px;" clearable />
-            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
+          <el-date-picker v-model="timeList" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
-            v-model="timeList"
+            :default-time="['00:00:00', '23:59:59']" @change="changeTimeList" />
-            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">
@@ -77,180 +69,117 @@
       </el-form>
     </template>
     <template slot="main-container">
-      <el-table
+      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
-        v-adaptive="{bottomOffset:60}"
+        @sort-change="handleSortChange">
-        v-loading="loading"
+        <el-table-column prop="OriginalReReadingTask.IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
-        :data="list"
+          show-overflow-tooltip min-width="100" sortable="custom">
-        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
+        <el-table-column prop="OriginalReReadingTask.TaskCode" :label="$t('trials:readTask:table:taskCode')"
-          prop="OriginalReReadingTask.TaskCode"
+          min-width="100" sortable="custom" show-overflow-tooltip />
-          :label="$t('trials:readTask:table:taskCode')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 中心编号 -->
-        <el-table-column
+        <el-table-column prop="OriginalReReadingTask.TrialSiteCode" :label="$t('trials:readTask:table:siteCode')"
-          prop="OriginalReReadingTask.TrialSiteCode"
+          min-width="100" sortable="custom" show-overflow-tooltip />
-          :label="$t('trials:readTask:table:siteCode')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 受试者编号 -->
-        <el-table-column
+        <el-table-column prop="OriginalReReadingTask.SubjectCode" :label="$t('trials:readTask:table:subjectCode')"
-          prop="OriginalReReadingTask.SubjectCode"
+          min-width="120" sortable="custom" show-overflow-tooltip />
-          :label="$t('trials:readTask:table:subjectCode')"
-          min-width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 访视/阅片期名称 -->
-        <el-table-column
+        <el-table-column prop="OriginalReReadingTask.TaskName"
-          prop="OriginalReReadingTask.TaskName"
+          :label="$t('trials:reviewAssign:readingTask:table:visitName')" min-width="160" sortable="custom"
-          :label="$t('trials:reviewAssign:readingTask:table:visitName')"
+          show-overflow-tooltip />
-          min-width="160"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 盲态任务标识 -->
-        <el-table-column
+        <el-table-column prop="OriginalReReadingTask.TaskBlindName"
-          prop="OriginalReReadingTask.TaskBlindName"
+          :label="$t('trials:reviewAssign:readingTask:table:blindName')" min-width="140" sortable="custom"
-          :label="$t('trials:reviewAssign:readingTask:table:blindName')"
+          show-overflow-tooltip />
-          min-width="140"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 任务创建时间 -->
-        <el-table-column
+        <el-table-column prop="OriginalReReadingTask.CreateTime"
-          prop="OriginalReReadingTask.CreateTime"
+          :label="$t('trials:reviewAssign:readingTask:table:createTime')" min-width="140" sortable="custom"
-          :label="$t('trials:reviewAssign:readingTask:table:createTime')"
+          show-overflow-tooltip />
-          min-width="140"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 任务状态 -->
-        <el-table-column
+        <el-table-column prop="OriginalReReadingTask.TaskState"
-          prop="OriginalReReadingTask.TaskState"
+          :label="$t('trials:reviewAssign:readingTask:table:taskStatus')" min-width="100" sortable="custom"
-          :label="$t('trials:reviewAssign:readingTask:table:taskStatus')"
+          show-overflow-tooltip>
-          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 === 0" type="primary">{{ $fd('TaskState',
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+              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 === 1" type="info">{{ $fd('TaskState',
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+              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 === 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
+        <el-table-column prop="OriginalReReadingTask.ReadingCategory"
-          prop="OriginalReReadingTask.ReadingCategory"
+          :label="$t('trials:reviewAssign:readingTask:table:taskType')" min-width="100" sortable="custom"
-          :label="$t('trials:reviewAssign:readingTask:table:taskType')"
+          show-overflow-tooltip>
-          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 === 1" type="primary">{{
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+              $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 === 2" type="info">{{ $fd('ReadingCategory',
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+              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
+        <el-table-column prop="OriginalReReadingTask.ArmEnum" :label="$t('trials:reviewAssign:readingTask:table:role')"
-          prop="OriginalReReadingTask.ArmEnum"
+          min-width="80" sortable="custom" show-overflow-tooltip>
-          :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 === 1" type="primary">{{ $fd('ArmEnum',
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 2" type="success">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+              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 === 2" type="success">{{ $fd('ArmEnum',
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 4" type="danger">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+              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 === 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
+        <el-table-column prop="OriginalReReadingTask.UserName"
-          prop="OriginalReReadingTask.UserName"
+          :label="$t('trials:reviewAssign:readingTask:table:reader')" min-width="100" sortable="custom"
-          :label="$t('trials:reviewAssign:readingTask:table:reader')"
+          show-overflow-tooltip>
-          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
+        <el-table-column prop="OriginalReReadingTask.SignTime" :label="$t('trials:reviewTrack:table:signTime')"
-          prop="OriginalReReadingTask.SignTime"
+          min-width="180" sortable="custom" show-overflow-tooltip />
-          :label="$t('trials:reviewTrack:table:signTime')"
-          min-width="180"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 重阅申请类型 -->
-        <el-table-column
+        <el-table-column prop="OriginalReReadingTask.RequestReReadingType"
-          prop="OriginalReReadingTask.RequestReReadingType"
+          :label="$t('trials:rereadTask:table:requestReReadingType')" min-width="140" sortable="custom"
-          :label="$t('trials:rereadTask:table:requestReReadingType')"
+          show-overflow-tooltip>
-          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
+        <el-table-column prop="RequestReReadingTime" :label="$t('trials:rereadTask:table:requestReReadingTime')"
-          prop="RequestReReadingTime"
+          min-width="100" sortable="custom" show-overflow-tooltip />
-          :label="$t('trials:rereadTask:table:requestReReadingTime')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 申请原因 -->
-        <el-table-column
+        <el-table-column prop="RequestReReadingReason" :label="$t('trials:rereadTask:table:requestReReadingReason')"
-          prop="RequestReReadingReason"
+          min-width="100" sortable="custom" show-overflow-tooltip />
-          :label="$t('trials:rereadTask:table:requestReReadingReason')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 审批结果 -->
-        <el-table-column
+        <el-table-column prop="AllocateTime" :label="$t('trials:rereadTask:table:requestReReadingResultEnum')"
-          prop="AllocateTime"
+          min-width="100" sortable="custom" show-overflow-tooltip>
-          :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">
@@ -259,90 +188,217 @@
                 </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 === 1" type="primary">{{ $fd('RequestReReadingResult',
-              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+                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
+        <el-table-column prop="ReReadingNewTaskCode" :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
-          prop="ReReadingNewTaskCode"
+          min-width="120" sortable="custom" show-overflow-tooltip />
-          :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
+        <el-table-column v-if="hasPermi(['role:spm'])" fixed="right" :label="$t('common:action:action')" width="210">
-          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
+            <!-- <el-button :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
-              :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
+              icon="el-icon-check" circle :title="$t('trials:spmAudit:button:agree')"
-              icon="el-icon-check"
+              @click="openReReadingOrBackList(scope.row, 1)" /> -->
-              circle
-              :title="$t('trials:spmAudit:button:agree')"
-              @click="openReReadingOrBackList(scope.row,1)"
-            />
             <!-- 拒绝 -->
-            <el-button
+            <!-- <el-button :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
-              :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
+              icon="el-icon-close" circle :title="$t('trials:spmAudit:button:reject')"
-              icon="el-icon-close"
+              @click="confirmReReading(scope.row, 2, true)" /> -->
-              circle
+            <el-button :disabled="!!scope.row.RequestReReadingResultEnum ||
-              :title="$t('trials:spmAudit:button:reject')"
+              scope.row.RequestReReadingType === 1
-              @click="confirmReReading(scope.row,2, true)"
+              " icon="el-icon-edit-outline" circle :title="$t('trials:spmAudit:table:Approval')"
-            />
+              @click="audit(scope.row)" />
             <!-- 已影响任务列表 -->
-            <el-button
+            <el-button :disabled="scope.row.RequestReReadingResultEnum !== 1" icon="el-icon-document-copy" circle
-              :disabled="scope.row.RequestReReadingResultEnum !== 1"
+              :title="$t('trials:spmAudit:button:influenceList')" @click="getInfluencedTaskList(scope.row)" />
-              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" />
+      <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>
       <!-- 驳回  +++-->
-      <el-dialog
+      <el-dialog v-if="ConfirmReReadingVisible" :title="$t('trials:spmAudit:title:rejected')"
-        v-if="ConfirmReReadingVisible"
+        :visible.sync="ConfirmReReadingVisible" width="600px" append-to-body :close-on-click-modal="false"
-        :title="$t('trials:spmAudit:title:rejected')"
+        custom-class="base-dialog-wrapper">
-        :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
+          <el-form ref="reasonForm" :rules="rules" :model="ConfirmReReadingForm" class="demo-ruleForm" size="small"
-            ref="reasonForm"
+            label-width="120px">
-            :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
+              <el-input v-model="ConfirmReReadingForm.RequestReReadingRejectReason" type="textarea"
-                v-model="ConfirmReReadingForm.RequestReReadingRejectReason"
+                :autosize="{ minRows: 2, maxRows: 4 }" :placeholder="$t('common:ruleMessage:specify')" maxlength="500"
-                type="textarea"
+                show-word-limit />
-                :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>
           <!-- 保存 -->
@@ -352,137 +408,95 @@
         </div>
       </el-dialog>
       <!-- '重阅影响任务列表' : '已影响任务列表'" +++-->
-      <el-dialog
+      <el-dialog v-if="ReReadingOrBackVisible"
-        v-if="ReReadingOrBackVisible"
+        :title="opentype === 'read' ? this.$t('trials:spmAudit:title:title1') : this.$t('trials:spmAudit:title:title2')"
-        :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"
-        :visible.sync="ReReadingOrBackVisible"
+        custom-class="base-dialog-wrapper">
-        width="1460px"
-        append-to-body
-        :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper"
-      >
         <div class="base-dialog-body">
-          <el-table
+          <el-table v-loading="loading" :data="InfluenceTaskList" stripe height="100" style="min-height: 400px;">
-            v-loading="loading"
-            :data="InfluenceTaskList"
-            stripe
-            height="100"
-            style="min-height: 400px;"
-          >
             <!-- 任务编号 -->
-            <el-table-column
+            <el-table-column prop="TaskCode" :label="$t('trials:readTask:table:taskCode')" min-width="100"
-              prop="TaskCode"
+              show-overflow-tooltip />
-              :label="$t('trials:readTask:table:taskCode')"
-              min-width="100"
-              show-overflow-tooltip
-            />
             <!-- 中心编号 -->
-            <el-table-column
+            <el-table-column prop="TrialSiteCode" :label="$t('trials:readTask:table:siteCode')" min-width="100"
-              prop="TrialSiteCode"
+              show-overflow-tooltip />
-              :label="$t('trials:readTask:table:siteCode')"
-              min-width="100"
-              show-overflow-tooltip
-            />
             <!-- 受试者编号 -->
-            <el-table-column
+            <el-table-column prop="SubjectCode" :label="$t('trials:readTask:table:subjectCode')" min-width="120"
-              prop="SubjectCode"
+              show-overflow-tooltip />
-              :label="$t('trials:readTask:table:subjectCode')"
-              min-width="120"
-              show-overflow-tooltip
-            />
             <!-- 访视/阅片期名称 -->
-            <el-table-column
+            <el-table-column prop="VisitTaskNum" :label="$t('trials:consistencyCheck:table:visitName')" min-width="140"
-              prop="VisitTaskNum"
+              show-overflow-tooltip>
-              :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
+            <el-table-column prop="TaskBlindName" :label="$t('trials:readTask:table:blindName')" min-width="120"
-              prop="TaskBlindName"
+              show-overflow-tooltip />
-              :label="$t('trials:readTask:table:blindName')"
-              min-width="120"
-              show-overflow-tooltip
-            />
             <!-- 阅片标准 -->
-            <el-table-column
+            <el-table-column prop="TrialReadingCriterionName" :label="$t('trials:readTask:table:criterionName')"
-              prop="TrialReadingCriterionName"
+              min-width="100" show-overflow-tooltip />
-              :label="$t('trials:readTask:table:criterionName')"
-              min-width="100"
-              show-overflow-tooltip
-            />
             <!-- 任务状态 -->
-            <el-table-column
+            <el-table-column prop="TaskState" :label="$t('trials:readTask:table:taskState')" min-width="100"
-              prop="TaskState"
+              show-overflow-tooltip>
-              :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 === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState)
-                <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                }}</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 === 1" type="info">{{ $fd('TaskState', scope.row.TaskState)
-                <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                }}</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 === 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
+            <el-table-column prop="ReadingCategory" min-width="100" :label="$t('trials:readTask:table:readingCategory')"
-              prop="ReadingCategory"
+              show-overflow-tooltip>
-              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 === 1" type="primary">{{ $fd('ReadingCategory',
-                <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                  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 === 2" type="info">{{ $fd('ReadingCategory',
-                <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                  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
+            <el-table-column prop="ReadingTaskState" :label="$t('trials:readTask:table:readingTaskState')"
-              prop="ReadingTaskState"
+              min-width="100" show-overflow-tooltip>
-              :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
+            <el-table-column prop="OptType" :label="$t('trials:readTask:table:optType')" min-width="100"
-              prop="OptType"
+              show-overflow-tooltip>
-              :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 === 0" type="primary">{{ $fd('ReReadingOrBackOptType',
-                <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
+                  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 === 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
+            <el-table-column prop="UserName" :label="$t('trials:readTask:table:reader')" min-width="160"
-              prop="UserName"
+              show-overflow-tooltip>
-              :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') }}
@@ -493,16 +507,11 @@
           </el-button>
         </div>
       </el-dialog>
-      <el-dialog
+      <el-dialog :destroy-on-close="true" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-        :destroy-on-close="true"
+        custom-class="base-dialog-wrapper">
-        :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>
@@ -518,7 +527,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,
@@ -542,7 +551,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialsNotice',
-  components: { BaseContainer, Pagination, SignForm },
+  components: { BaseContainer, Pagination, SignForm, baseModel },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -593,9 +602,40 @@ export default {
       readVisible: false,
       TaskOptType: null,
       OtherInfo: null,
-      ReadingType: 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'],
+          },
+        ]
+      }
     }
   },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
   mounted() {
     if (this.$route.query.SiteId) {
       this.searchData.TrialSiteId = this.$route.query.SiteId
@@ -612,6 +652,39 @@ 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'
@@ -663,7 +736,7 @@ export default {
         return
       }
       if (type === 2) {
-        this.$refs.reasonForm.validate((valid) => {
+        this.$refs.imageBackform.validate((valid) => {
           if (!valid) return
           var params = {
             data: {
@@ -675,7 +748,7 @@ export default {
                   NewReReadingTaskId: row.NewReReadingTaskId
                 }
               ],
-              RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason,
+              RequestReReadingRejectReason: this.form.RequestReReadingRejectReason,
               TrialId: this.$route.query.trialId,
               RequestReReadingResultEnum: type
             },
@@ -688,7 +761,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.ConfirmReReadingVisible = false
+            this.config.visible = false
             this.$refs['signForm'].btnLoading = false
             this.signVisible = false
           }).catch(() => {
@@ -720,7 +793,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.ReReadingOrBackVisible = false
+        this.config.visible = false
         this.$refs['signForm'].btnLoading = false
         this.signVisible = false
         this.getList()
@@ -787,22 +860,25 @@ 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>

src/views/trials/trials-panel/attachments/self-attachment/index.vue

@@ -130,10 +130,12 @@
       <SignForm :is-system-doc="currentRow.IsSystemDoc" :document-id="currentRow.Id" :file-name="fileName"
         :trial-id="trialId" @closeDialog="closeSignDialog" />
     </el-dialog>
-    <attachmentList v-if="config.visible" :config="config" :rowData="currentRow" :SystemDocumentId="SystemDocumentId"
+    <attachmentList2 v-if="config.visible && !currentRow.IsSystemDoc" :config="config" :rowData="currentRow"
-      :isView="true" @getList="getList" />
+      :TrialDocumentId="TrialDocumentId" :isView="true" @getList="getList" />
-    <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible" :isView="true"
+    <attachmentList v-if="config.visible && currentRow.IsSystemDoc" :config="config" :rowData="currentRow"
-      v-if="perview_visible" />
+      :SystemDocumentId="TrialDocumentId" :isView="true" @getList="getList" />
+    <attachmentPreview :SystemDocumentId="TrialDocumentId" :isTrial="!currentRow.IsSystemDoc"
+      :visible.sync="perview_visible" :isView="true" v-if="perview_visible" />
   </BaseContainer>
 </template>
 <script>
@@ -145,6 +147,7 @@ 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: '',
@@ -158,7 +161,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialAttachments',
-  components: { BaseContainer, Pagination, PreviewFile, SignForm, attachmentPreview, attachmentList },
+  components: { BaseContainer, Pagination, PreviewFile, SignForm, attachmentPreview, attachmentList, attachmentList2 },
   data() {
     return {
       searchData: searchDataDefault(),
@@ -180,7 +183,7 @@ export default {
       currentUser: zzSessionStorage.getItem('userName'),
       typeOptions: [],
       trialId: this.$route.query.trialId,
-      SystemDocumentId: null,
+      TrialDocumentId: null,
       perview_visible: null,
       config: {
         visible: false,
@@ -205,7 +208,7 @@ export default {
   methods: {
     openAttachment(row, isList = false) {
       if (!row.AttachmentCount) return false
-      this.SystemDocumentId = row.Id
+      this.TrialDocumentId = row.Id
       this.currentRow = { ...row }
       if (!isList) {
         this.perview_visible = true

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -1694,7 +1694,7 @@ export default {
         cornerstoneTools.getToolState(
           this.canvas,
           'playClip'
-        ).data[0].loop = false
+        ).data[0].loop = true
       } else {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false

src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue

@@ -8,39 +8,27 @@
           <span style="margin-left:5px;">{{ taskBlindName }}</span>
         </h3>
         <div v-if="readingTaskState < 2">
-          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
-            <i
+            placement="bottom">
-              class="el-icon-refresh-left"
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
-              @click="resetMeasuredData"
-            />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 影像质量问题 -->
       <div class="lesions">
-        <Questions
+        <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-          ref="ecrf"
+          :group-classify="1" />
-          :question-form-change-state="true"
-          :question-form-change-num="0"
-          :is-qulity-issues="false"
-          :group-classify="1"
-        />
       </div>
-
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper"
+          style="margin-bottom: 10px">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <el-form
+            <el-form v-if="questions.length > 0" :ref="`questions${index}`" size="small" :model="questionForm">
-              v-if="questions.length > 0"
-              :ref="`questions${index}`"
-              size="small"
-              :model="questionForm"
-            >
               <div class="table-wrapper">
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
@@ -52,34 +40,25 @@
                       <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add',item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
                         <i class="el-icon-plus" />
                       </div>
                     </div>
 
                   </div>
-                  <el-table
+                  <el-table v-if="item.Type === 'basicTable' && item.TableQuestions" :ref="item.Id"
-                    v-if="item.Type === 'basicTable' && item.TableQuestions"
+                    :data="item.TableQuestions.Answers">
-                    :ref="item.Id"
-                    :data="item.TableQuestions.Answers"
-                  >
                     <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
                       <template slot-scope="scope">
                         {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
                       </template>
-                    </el-table-column> -->
+</el-table-column> -->
                     <!-- <el-table-column
                       type="index"
                       width="40px"
                     /> -->
-                    <el-table-column
+                    <el-table-column v-for="q of item.TableQuestions.Questions" :key="q.Id" :prop="q.Id"
-                      v-for="q of item.TableQuestions.Questions"
+                      :label="q.QuestionName" show-overflow-tooltip :render-header="renderHeader">
-                      :key="q.Id"
-                      :prop="q.Id"
-                      :label="q.QuestionName"
-                      show-overflow-tooltip
-                      :render-header="renderHeader"
-                    >
                       <template slot-scope="scope">
                         <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
                           {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
@@ -92,14 +71,10 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column
+                    <el-table-column v-if="readingTaskState < 2 && item.LesionType === 102"
-                      v-if="readingTaskState < 2 && item.LesionType === 102"
+                      :label="$t('common:action:action')" width="90px" fixed="right">
-                      :label="$t('common:action:action')"
-                      width="90px"
-                      fixed="right"
-                    >
                       <template slot-scope="scope">
-                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit',item, scope.$index)">
+                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
                         <el-button type="text" size="mini" @click="handleDelete(item, scope.$index)">
@@ -111,41 +86,57 @@
 
                   <template v-else>
                     <!-- 数值 -->
-                    <el-form-item
+                    <el-form-item v-if="item.ShowQuestion !== 2" :key="item.Id" :label="`${item.QuestionName}`"
-                      v-if="item.ShowQuestion!==2"
+                      :prop="item.Id" :rules="[
-                      :key="item.Id"
+                        {
-                      :label="`${item.QuestionName}`"
+                          required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
-                      :prop="item.Id"
+                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-                      :rules="[
+                        },
-                        { required: (item.IsRequired === 0 || (item.IsRequired ===1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type!=='group' && item.Type!=='summary',
+                      ]">
-                          message:['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
-                      ]"
-                    >
                       <!-- 数值类型 -->
-                      <template v-if="item.Type==='textarea'">
+                      <template v-if="item.Type === 'textarea'">
-                        <el-input
+                        <el-input v-model="questionForm[item.Id]" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-                          v-model="questionForm[qs.Id]"
+                          :disabled="!isCurrentTask || readingTaskState >= 2"
-                          type="textarea"
+                          @change="((val) => { formItemChange(val, item) })" />
-                          :autosize="{ minRows: 2, maxRows: 4}"
+                      </template>
-                          :disabled="!isCurrentTask || readingTaskState>=2"
+                      <template v-if="item.Type === 'number'">
-                          @change="((val)=>{formItemChange(val, qs)})"
+                        <el-input-number v-model="questionForm[item.Id]"
-                        />
+                          :disabled="!isCurrentTask || readingTaskState >= 2" :precision="0"
+                          @change="((val) => { formItemChange(val, item) })" />
+                      </template>
+                      <template v-if="item.Type === 'select'">
+                        <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
+                          @change="((val) => { formItemChange(val, item) })">
+                          <el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
+                            :label="dict.label" />
+                        </el-select>
                       </template>
                     </el-form-item>
+                    <template v-if="item.Childrens && item.Childrens.length > 0">
+                      <template v-for="child in item.Childrens">
+                        <el-form-item :key="child.Id"
+                          v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
+                          :label="`${child.QuestionName}`" :prop="child.Id" :rules="[
+                            {
+                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
+                              message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                            },
+                          ]">
+                          <template v-if="child.Type === 'input'">
+                            <el-input v-model="questionForm[child.Id]"
+                              :disabled="!isCurrentTask || readingTaskState >= 2"
+                              @change="((val) => { formItemChange(val, child) })" />
+                          </template>
+                        </el-form-item>
+                      </template>
+
+                    </template>
                   </template>
                 </div>
-                <div
+                <div v-if="isCurrentTask && readingTaskState < 2 && (qs.GroupClassify === 5 || qs.GroupClassify === 6)"
-                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
+                  class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-                  class="base-dialog-footer"
-                  style="text-align:right;margin-top:10px;"
-                >
                   <!-- 保存 -->
-                  <el-button
+                  <el-button type="primary" size="mini" :disabled="!formChanged" @click="handleSave(index)">
-                    type="primary"
-                    size="mini"
-                    :disabled="!formChanged"
-                    @click="handleSave(index)"
-                  >
                     {{ $t('common:button:save') }}
                   </el-button>
                 </div>
@@ -156,51 +147,21 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf2"
+        :group-classify="4" style="margin-top:20px" />
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="4"
-        style="margin-top:20px"
-      />
 
       <!-- 评估结果 -->
-      <Questions
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf3"
+        :group-classify="5" />
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="5"
-      />
       <!-- 新增、编辑弹窗 -->
-      <el-dialog
+      <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
-        v-if="addOrEdit.visible"
+        :title="addOrEdit.title" width="500px">
-        :visible.sync="addOrEdit.visible"
+        <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
-        :close-on-click-modal="false"
+          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
-        :title="addOrEdit.title"
+            :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
-        width="500px"
+            @resetFormItemData="resetFormItemData" />
-      >
-        <el-form
-          ref="tableQsForm"
-          v-loading="loading"
-          :model="qsForm"
-          size="small"
-        >
-          <QuestionTableFormItem
-            v-for="item in qsList"
-            :key="item.Id"
-            :question="item"
-            :question-form="qsForm"
-            :reading-task-state="readingTaskState"
-            @setFormItemData="setFormItemData"
-            @resetFormItemData="resetFormItemData"
-          />
           <el-form-item style="text-align: right">
-            <el-button
+            <el-button size="small" @click="addOrEdit.visible = false">
-              size="small"
-              @click="addOrEdit.visible = false"
-            >
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -211,17 +172,9 @@
         </el-form>
       </el-dialog>
       <!-- 导入 -->
-      <el-dialog
+      <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
-        v-if="upload.visible"
+        :title="upload.title" width="500px">
-        :visible.sync="upload.visible"
+        <UploadExcel :visit-task-id="visitTaskId" @close="uploadDlgClose" />
-        :close-on-click-modal="false"
-        :title="upload.title"
-        width="500px"
-      >
-        <UploadExcel
-          :visit-task-id="visitTaskId"
-          @close="uploadDlgClose"
-        />
       </el-dialog>
     </div>
   </div>
@@ -485,8 +438,22 @@ export default {
     setMeasuredData(measureData) {
 
     },
-    formItemChange() {
+    formItemChange(val, item) {
       this.formChanged = true
+      if (item.Type === 'number') {
+        this.limitBlur(item.Id, item.ValueType)
+      }
+      if (question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.resetData(i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
     },
     limitBlur(qId, valueType) {
       const value = this.questionForm[qId]
@@ -523,7 +490,7 @@ export default {
         answers: answers
       }
       try {
-        await saveTaskQuestion(8, params)
+        await saveTaskQuestion(12, params)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         loading.close()
         DicomEvent.$emit('getReportInfo', true)
@@ -578,6 +545,9 @@ export default {
     },
     receiveMsg(event) {
     },
+    resetData(v) {
+      this.questionForm[v] = null
+    },
     resetFormItemData(v) {
       this.qsForm[v] = null
     },
@@ -730,21 +700,25 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-wrapper {
   height: 100%;
   overflow-y: auto;
-  .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;
@@ -752,14 +726,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     display: inline-block;
     padding: 5px;
     font-weight: bold;
@@ -769,103 +745,123 @@ 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;
-    ::v-deep .el-form-item__label{
+
+    ::v-deep .el-form-item__label {
       color: #c3c3c3;
       text-align: left;
     }
-    ::v-deep .el-input .el-input__inner{
+
+    ::v-deep .el-input .el-input__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-textarea__inner{
+
+    ::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: column;
       justify-content: flex-start;
     }
-    ::v-deep .el-form-item__content{
+
+    ::v-deep .el-form-item__content {
       flex: 1;
     }
-    ::v-deep .el-input.is-disabled .el-input__inner{
+
-      background-color: #646464a1;
+    ::v-deep .el-input.is-disabled .el-input__inner {
-    }
-    ::v-deep .el-select.is-disabled .el-input__inner{
       background-color: #646464a1;
     }
 
-    .el-form-item__content
+    ::v-deep .el-select.is-disabled .el-input__inner {
-    .el-select{
+      background-color: #646464a1;
+    }
+
+    .el-form-item__content .el-select {
       width: 100%;
     }
   }
+
   .table-wrapper {
     ::-webkit-scrollbar {
       width: 5px;
       height: 8px;
     }
+
     ::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: #d0d0d0;
     }
+
     ::v-deep .el-table,
     .el-table__expanded-cell {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table th,
     .el-table tr {
       background-color: #000;
       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-table__fixed-right {
       height: 100% !important;
     }
+
     // ::v-deep .el-table .cell {
     //   line-height: 20px;
     // }
     ::v-deep .el-table__cell {
       padding: 5px 0;
     }
+
     ::v-deep.el-table__fixed-right-patch {
       background-color: #000 !important;
       border-color: #444444;
     }
-    ::v-deep.el-table__fixed-body-wrapper tr:hover > td {
+
+    ::v-deep.el-table__fixed-body-wrapper tr:hover>td {
       background-color: #000 !important;
     }
+
     ::v-deep.el-table--scrollable-x .el-table__body-wrapper {
       z-index: 2;
     }

src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue

@@ -7,39 +7,28 @@
           <span style="margin-left:5px;">{{ taskBlindName }}</span>
         </h3>
         <div v-if="readingTaskState < 2">
-          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
-            <i
+            placement="bottom">
-              class="el-icon-refresh-left"
+            <i class="el-icon-refresh-left" @click="resetMeasuredData" />
-              @click="resetMeasuredData"
-            />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 影像质量问题 -->
       <div class="lesions">
-        <Questions
+        <Questions ref="ecrf" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-          ref="ecrf"
+          :group-classify="1" />
-          :question-form-change-state="true"
-          :question-form-change-num="0"
-          :is-qulity-issues="false"
-          :group-classify="1"
-        />
       </div>
 
       <!-- 测量问题 -->
       <template v-if="questions.length > 0">
-        <div v-for="(qs,index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper" style="margin-bottom: 10px">
+        <div v-for="(qs, index) in questions" :key="index" v-loading="loading" class="lesions lesions_wrapper"
+          style="margin-bottom: 10px">
           <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
-            {{ language==='en'?qs.GroupEnName:qs.GroupName }}
+            {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <el-form
+            <el-form v-if="questions.length > 0" :ref="`questions${index}`" size="small" :model="questionForm">
-              v-if="questions.length > 0"
-              :ref="`questions${index}`"
-              size="small"
-              :model="questionForm"
-            >
               <div class="table-wrapper">
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
@@ -51,35 +40,25 @@
                       <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add',item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
                         <i class="el-icon-plus" />
                       </div>
                     </div>
 
                   </div>
-                  <el-table
+                  <el-table v-if="item.Type === 'basicTable' && item.TableQuestions" :ref="item.Id"
-                    v-if="item.Type === 'basicTable' && item.TableQuestions"
+                    :data="item.TableQuestions.Answers" max-height="600">
-                    :ref="item.Id"
-                    :data="item.TableQuestions.Answers"
-                    max-height="600"
-                  >
                     <!-- <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
                       <template slot-scope="scope">
                         {{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
                       </template>
-                    </el-table-column> -->
+</el-table-column> -->
                     <!-- <el-table-column
                       type="index"
                       width="40px"
                     /> -->
-                    <el-table-column
+                    <el-table-column v-for="q of item.TableQuestions.Questions" :key="q.Id" :prop="q.Id"
-                      v-for="q of item.TableQuestions.Questions"
+                      :label="q.QuestionName" show-overflow-tooltip :render-header="renderHeader">
-                      :key="q.Id"
-                      :prop="q.Id"
-                      :label="q.QuestionName"
-                      show-overflow-tooltip
-                      :render-header="renderHeader"
-                    >
                       <template slot-scope="scope">
                         <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
                           {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
@@ -92,17 +71,14 @@
                         </span>
                       </template>
                     </el-table-column>
-                    <el-table-column
+                    <el-table-column v-if="readingTaskState < 2" :label="$t('common:action:action')" width="90px"
-                      v-if="readingTaskState < 2"
+                      fixed="right">
-                      :label="$t('common:action:action')"
-                      width="90px"
-                      fixed="right"
-                    >
                       <template slot-scope="scope">
-                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit',item, scope.$index)">
+                        <el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
                           {{ $t('common:button:edit') }}
                         </el-button>
-                        <el-button v-if="item.LesionType === 112 || item.LesionType === 111" type="text" size="mini" @click="handleDelete(item, scope.$index)">
+                        <el-button v-if="item.LesionType === 112 || item.LesionType === 111" type="text" size="mini"
+                          @click="handleDelete(item, scope.$index)">
                           {{ $t('common:button:delete') }}
                         </el-button>
                       </template>
@@ -111,41 +87,52 @@
 
                   <template v-else>
                     <!-- 数值 -->
-                    <el-form-item
+                    <el-form-item v-if="item.ShowQuestion !== 2" :key="item.Id" :label="`${item.QuestionName}`"
-                      v-if="item.ShowQuestion!==2"
+                      :prop="item.Id" :rules="[
-                      :key="item.Id"
+                        {
-                      :label="`${item.QuestionName}`"
+                          required: (item.IsRequired === 0 || (item.IsRequired === 1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type !== 'group' && item.Type !== 'summary',
-                      :prop="item.Id"
+                          message: ['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-                      :rules="[
+                        },
-                        { required: (item.IsRequired === 0 || (item.IsRequired ===1 && item.RelevanceId && (item.RelevanceValue.includes(questionForm[item.RelevanceId])))) && item.Type!=='group' && item.Type!=='summary',
+                      ]">
-                          message:['radio', 'select', 'checkbox'].includes(item.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
-                      ]"
-                    >
                       <!-- 数值类型 -->
-                      <template v-if="item.Type==='textarea'">
+                      <template v-if="item.Type === 'textarea'">
-                        <el-input
+                        <el-input v-model="questionForm[item.Id]" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-                          v-model="questionForm[qs.Id]"
+                          :disabled="!isCurrentTask || readingTaskState >= 2"
-                          type="textarea"
+                          @change="((val) => { formItemChange(val, item) })" />
-                          :autosize="{ minRows: 2, maxRows: 4}"
+                      </template>
-                          :disabled="!isCurrentTask || readingTaskState>=2"
+                      <template v-if="item.Type === 'select'">
-                          @change="((val)=>{formItemChange(val, qs)})"
+                        <el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
-                        />
+                          @change="((val) => { formItemChange(val, item) })">
+                          <el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
+                            :label="dict.label" />
+                        </el-select>
                       </template>
                     </el-form-item>
+                    <template v-if="item.Childrens && item.Childrens.length > 0">
+                      <template v-for="child in item.Childrens">
+                        <el-form-item :key="child.Id"
+                          v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
+                          :label="`${child.QuestionName}`" :prop="child.Id" :rules="[
+                            {
+                              required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
+                              message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+                            },
+                          ]">
+                          <template v-if="child.Type === 'input'">
+                            <el-input v-model="questionForm[child.Id]"
+                              :disabled="!isCurrentTask || readingTaskState >= 2"
+                              @change="((val) => { formItemChange(val, child) })" />
+                          </template>
+                        </el-form-item>
+                      </template>
+
+                    </template>
                   </template>
                 </div>
-                <div
+                <div v-if="isCurrentTask && readingTaskState < 2 && (qs.GroupClassify === 5 || qs.GroupClassify === 6)"
-                  v-if="isCurrentTask && readingTaskState<2 && qs.GroupClassify === 5"
+                  class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-                  class="base-dialog-footer"
-                  style="text-align:right;margin-top:10px;"
-                >
                   <!-- 保存 -->
-                  <el-button
+                  <el-button type="primary" size="mini" :disabled="!formChanged" @click="handleSave(index)">
-                    type="primary"
-                    size="mini"
-                    :disabled="!formChanged"
-                    @click="handleSave(index)"
-                  >
                     {{ $t('common:button:save') }}
                   </el-button>
                 </div>
@@ -156,50 +143,20 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions
+      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf2"
+        :group-classify="4" style="margin-top:20px" />
-        :question-form-change-state="true"
-        :question-form-change-num="0"
-        :is-qulity-issues="false"
-        :group-classify="4"
-        style="margin-top:20px"
-      />
 
       <!-- 评估结果 -->
-      <Questions
+      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        ref="ecrf3"
+        :group-classify="5" />
-        :question-form-change-state="true"
+      <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
-        :question-form-change-num="0"
+        :title="addOrEdit.title" width="500px">
-        :is-qulity-issues="false"
+        <el-form ref="tableQsForm" v-loading="loading" :model="qsForm" size="small">
-        :group-classify="5"
+          <QuestionTableFormItem v-for="item in qsList" :key="item.Id" :question="item" :question-form="qsForm"
-      />
+            :reading-task-state="readingTaskState" @setFormItemData="setFormItemData"
-      <el-dialog
+            @resetFormItemData="resetFormItemData" />
-        v-if="addOrEdit.visible"
-        :visible.sync="addOrEdit.visible"
-        :close-on-click-modal="false"
-        :title="addOrEdit.title"
-        width="500px"
-      >
-        <el-form
-          ref="tableQsForm"
-          v-loading="loading"
-          :model="qsForm"
-          size="small"
-        >
-          <QuestionTableFormItem
-            v-for="item in qsList"
-            :key="item.Id"
-            :question="item"
-            :question-form="qsForm"
-            :reading-task-state="readingTaskState"
-            @setFormItemData="setFormItemData"
-            @resetFormItemData="resetFormItemData"
-          />
           <el-form-item style="text-align: right">
-            <el-button
+            <el-button size="small" @click="addOrEdit.visible = false">
-              size="small"
-              @click="addOrEdit.visible = false"
-            >
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
@@ -210,18 +167,9 @@
         </el-form>
       </el-dialog>
       <!-- 导入 -->
-      <el-dialog
+      <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
-        v-if="upload.visible"
+        :title="upload.title" width="500px">
-        :visible.sync="upload.visible"
+        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" @close="uploadDlgClose" />
-        :close-on-click-modal="false"
-        :title="upload.title"
-        width="500px"
-      >
-        <UploadExcel
-          :visit-task-id="visitTaskId"
-          :lesion-type="upload.lesionType"
-          @close="uploadDlgClose"
-        />
       </el-dialog>
     </div>
   </div>
@@ -486,8 +434,22 @@ export default {
     setMeasuredData(measureData) {
 
     },
-    formItemChange() {
+    formItemChange(val, question) {
       this.formChanged = true
+      if (item.Type === 'number') {
+        this.limitBlur(item.Id, item.ValueType)
+      }
+      if (question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.resetData(i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
     },
     limitBlur(qId, valueType) {
       const value = this.questionForm[qId]
@@ -521,7 +483,7 @@ export default {
         answers: answers
       }
       try {
-        await saveTaskQuestion(8, params)
+        await saveTaskQuestion(12, params)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         loading.close()
         DicomEvent.$emit('getReportInfo', true)
@@ -576,6 +538,9 @@ export default {
     },
     receiveMsg(event) {
     },
+    resetData(v) {
+      this.questionForm[v] = null
+    },
     resetFormItemData(v) {
       this.qsForm[v] = null
     },
@@ -741,23 +706,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.measurement-wrapper{
+.measurement-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;
@@ -765,14 +733,16 @@ export default {
       }
     }
   }
-  .title{
+
+  .title {
     padding: 5px;
     font-weight: bold;
     color: #ddd;
     font-size: 15px;
 
   }
-  .add-icon{
+
+  .add-icon {
     display: inline-block;
     padding: 5px;
     font-weight: bold;
@@ -782,103 +752,123 @@ 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;
-    ::v-deep .el-form-item__label{
+
+    ::v-deep .el-form-item__label {
       color: #c3c3c3;
       text-align: left;
     }
-    ::v-deep .el-input .el-input__inner{
+
+    ::v-deep .el-input .el-input__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
-    ::v-deep .el-textarea__inner{
+
+    ::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: column;
       justify-content: flex-start;
     }
-    ::v-deep .el-form-item__content{
+
+    ::v-deep .el-form-item__content {
       flex: 1;
     }
-    ::v-deep .el-input.is-disabled .el-input__inner{
+
-      background-color: #646464a1;
+    ::v-deep .el-input.is-disabled .el-input__inner {
-    }
-    ::v-deep .el-select.is-disabled .el-input__inner{
       background-color: #646464a1;
     }
 
-    .el-form-item__content
+    ::v-deep .el-select.is-disabled .el-input__inner {
-    .el-select{
+      background-color: #646464a1;
+    }
+
+    .el-form-item__content .el-select {
       width: 100%;
     }
   }
+
   .table-wrapper {
     ::-webkit-scrollbar {
       width: 5px;
       height: 8px;
     }
+
     ::-webkit-scrollbar-thumb {
       border-radius: 10px;
       background: #d0d0d0;
     }
+
     ::v-deep .el-table,
     .el-table__expanded-cell {
       background-color: #000;
       color: #fff;
       border-color: #444444;
     }
+
     ::v-deep .el-table th,
     .el-table tr {
       background-color: #000;
       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-table__fixed-right {
       height: 100% !important;
     }
+
     // ::v-deep .el-table .cell {
     //   line-height: 20px;
     // }
     ::v-deep .el-table__cell {
       padding: 5px 0;
     }
+
     ::v-deep.el-table__fixed-right-patch {
       background-color: #000 !important;
       border-color: #444444;
     }
-    ::v-deep.el-table__fixed-body-wrapper tr:hover > td {
+
+    ::v-deep.el-table__fixed-body-wrapper tr:hover>td {
       background-color: #000 !important;
     }
+
     ::v-deep.el-table--scrollable-x .el-table__body-wrapper {
       z-index: 2;
     }

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -1624,7 +1624,7 @@ export default {
         cornerstoneTools.getToolState(
           this.canvas,
           'playClip'
-        ).data[0].loop = false
+        ).data[0].loop = true
       } else {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue

@@ -488,7 +488,8 @@ export default {
       return num.toFixed(this.digitPlaces)
     },
     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) {

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionsPreview.vue

@@ -233,9 +233,7 @@ 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

src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue

@@ -1,6 +1,11 @@
 <template>
-  <div v-loading="loading" :element-loading-text="loadingText" element-loading-spinner="el-icon-loading"
+  <div
-  element-loading-background="rgba(0, 0, 0, 0.8)" class="read-page-container">
+    v-loading="loading"
+    :element-loading-text="loadingText"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(0, 0, 0, 0.8)"
+    class="read-page-container"
+  >
     <!-- 检查列表 -->
     <div class="left-panel">
       <div class="task-container">
@@ -200,7 +205,7 @@
               <svg-icon v-else icon-class="fitToImage" class="svg-icon" />
             </div>
             <!--融合-->
-            <div class="tool-item" :title="$t('trials:lugano:button:fusion')" @click.prevent="openFusion" v-if="readingTool === 2">
+            <div v-if="readingTool === 2" class="tool-item" :title="$t('trials:lugano:button:fusion')" @click.prevent="openFusion">
               <svg-icon icon-class="fusion" class="svg-icon" />
             </div>
             <div
@@ -279,9 +284,9 @@
             <div
               v-if="criterionType === 0"
               :title="$t('trials:reading:button:more')"
+              :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']"
               @click.stop="showPanel($event)"
               @mouseleave="toolMouseout"
-              :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']"
             >
               <div class="dropdown">
                 <div
@@ -292,10 +297,10 @@
                   <i class="el-icon-arrow-down" style="color:#fff;" />
                 </div>
                 <div class="dropdown-content">
-                  <ul style="width:100px;" v-if="readingTaskState < 2">
+                  <ul v-if="readingTaskState < 2" style="width:100px;">
                     <li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;">
                       <a href="#" @click.prevent="setMoreToolActive(i.toolName)">
-                        <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;"/>
+                        <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
                         {{ $t(i.i18nKey) }}
                       </a>
                     </li>
@@ -336,9 +341,9 @@
               </div>
             </div>
             <!-- 伪彩 -->
-             <template v-if="readingTool === 2">
+            <template v-if="readingTool === 2">
-                <colorMap v-show="isFusion" ref="colorMap" @setColorMap="setColorMap" @voiChange="voiChange" />
+              <colorMap v-show="isFusion" ref="colorMap" @setColorMap="setColorMap" @voiChange="voiChange" />
-             </template>
+            </template>
           </div>
 
           <div>
@@ -370,7 +375,7 @@
         <div class="content-wrapper">
           <!-- viewports -->
           <div class="viewports-wrapper">
-            <div ref="container" class="grid-container" >
+            <div ref="container" class="grid-container">
               <div :class="[ 'viewports-box', isFusion ? 'viewports-box-down' : '' ]" :style="gridStyle">
                 <div
                   v-for="(v, index) in cellsMax"
@@ -394,7 +399,7 @@
                   />
                 </div>
               </div>
-              <div :class="[ 'viewports-box', !isFusion ? 'viewports-box-down' : '' ]" v-if="readingTool === 2" :style="gridStyle">
+              <div v-if="readingTool === 2" :class="[ 'viewports-box', !isFusion ? 'viewports-box-down' : '' ]" :style="gridStyle">
                 <div
                   v-for="(v, index) in cellsMax"
                   v-show="index < cells.length"
@@ -464,6 +469,10 @@
                 :visit-info="s"
                 @resetAnnotations="resetAnnotations"
                 @setReadingTaskState="setReadingTaskState"
+                @viewCustomAnnotationSeries="viewCustomAnnotationSeries"
+                @getCustomScreenshots="getCustomScreenshots"
+                @setReadingToolActive="setReadingToolActive"
+                @setReadingToolPassive="setReadingToolPassive"
               />
             </div>
           </div>
@@ -554,9 +563,13 @@
       </div>
 
     </el-dialog>
-    <el-dialog :visible.sync="fusionVisible" :close-on-click-modal="false" :title="$t('trials:lugano:button:record')"
+    <el-dialog
-      width="850px" >
+      :visible.sync="fusionVisible"
-      <FusionForm v-if="fusionVisible" :activeTaskIndex="activeTaskIndex" :taskList="visitTaskList" @close="closeFusion" @fusion="handleFusion" />
+      :close-on-click-modal="false"
+      :title="$t('trials:lugano:button:record')"
+      width="850px"
+    >
+      <FusionForm v-if="fusionVisible" :active-task-index="activeTaskIndex" :task-list="visitTaskList" @close="closeFusion" @fusion="handleFusion" />
     </el-dialog>
 
     <upload-dicom-and-nonedicom
@@ -600,6 +613,8 @@ import * as cornerstoneTools from '@cornerstonejs/tools'
 import initLibraries from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initLibraries'
 import html2canvas from 'html2canvas'
 import { getTools, getCustomizeStandardsTools, config } from './toolConfig'
+import { mapGetters } from 'vuex'
+import store from '@/store'
 import StudyList from './StudyList'
 import Viewport from './Viewport'
 import PetCtViewport from './PetCtViewport'
@@ -636,17 +651,19 @@ const {
   // RectangleROITool,
   PlanarFreehandROITool,
   CircleROITool,
+  AngleTool,
+  CobbAngleTool,
   EraserTool,
   MIPJumpToClickTool,
   VolumeRotateTool,
   synchronizers
   // cursors
 } = cornerstoneTools
-const { createCameraPositionSynchronizer, createVOISynchronizer } = synchronizers;
+const { createCameraPositionSynchronizer, createVOISynchronizer } = synchronizers
 const newStyles = {
   global: {
     color: 'rgb(255, 0, 0)',
-    colorHighlighted: 'rgb(255, 0, 0)',
+    colorHighlighted: 'rgb(0, 255, 0)',
     colorSelected: 'rgb(255, 0, 0)',
     colorLocked: 'rgb(255, 0, 0)',
     lineWidth: '1',
@@ -656,7 +673,7 @@ const newStyles = {
     textBoxFontFamily: 'Helvetica Neue, Helvetica, Arial, sans-serif',
     textBoxFontSize: '14px',
     textBoxColor: 'rgb(255, 0, 0)',
-    textBoxColorHighlighted: 'rgb(255, 0, 0)',
+    textBoxColorHighlighted: 'rgb(0, 255, 0)',
     textBoxColorSelected: 'rgb(255, 0, 0)',
     textBoxColorLocked: 'rgb(255, 0, 0)',
     textBoxBackground: '',
@@ -670,12 +687,6 @@ annotation.config.style.setDefaultToolStyles(newStyles)
 const { MouseBindings, Events: toolsEvents } = csToolsEnums
 export default {
   name: 'ReadPage',
-  props: {
-    readingTool: {
-      type: Number,
-      default: 2
-    }
-  },
   components: {
     StudyList,
     Viewport,
@@ -694,6 +705,12 @@ export default {
     downloadDicomAndNonedicom,
     uploadDicomAndNonedicom,
   },
+  props: {
+    readingTool: {
+      type: Number,
+      default: 2
+    }
+  },
   data() {
     return {
       loading: false,
@@ -764,6 +781,7 @@ export default {
       volumeData: {},
       fusionSerieId: {},
       loadingText: null,
+      toolNames: ['Length', 'Bidirectional', 'RectangleROI', 'ArrowAnnotate', 'CircleROI', 'Eraser'],
       // resetAnnotation: false , // 是否初始化标记 （融合时使用）
 
          // 上传
@@ -801,7 +819,7 @@ export default {
     },
     viewportKey() {
       return this.isFusion ? 'viewport-fusion' : 'viewport'
-    }
+    },
   },
   watch: {
     currentReadingTaskState(){console.log(this.currentReadingTaskState,'currentReadingTaskState')},
@@ -860,7 +878,7 @@ export default {
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     if (this.criterionType === 0) {
       this.tools = getCustomizeStandardsTools(this.taskInfo.ReadingToolList)
-      let toolNames = this.tools.map(i=>i.toolName)
+      const toolNames = this.tools.map(i => i.toolName)
       this.customizeStandards = config.customizeStandards.filter(item => !toolNames.includes(item.toolName))
     } else {
       this.tools = getTools(this.criterionType)
@@ -1130,13 +1148,13 @@ export default {
         }
       ]
       let viewportIds = ['viewport-0', 'viewport-1', 'viewport-2', 'viewport-3']
-      let fusionViewportIds = ["viewport-fusion-0", "viewport-fusion-1", "viewport-fusion-2", "viewport-fusion-3"]
+      const fusionViewportIds = ['viewport-fusion-0', 'viewport-fusion-1', 'viewport-fusion-2', 'viewport-fusion-3']
-      if(this.readingTool === 2){
+      if (this.readingTool === 2) {
         const fusionElement1 = this.$refs['viewport-fusion-0'][0].$el
         const fusionElement2 = this.$refs['viewport-fusion-1'][0].$el
         const fusionElement3 = this.$refs['viewport-fusion-2'][0].$el
         const fusionElement4 = this.$refs['viewport-fusion-3'][0].$el
-        let arr = [
+        const arr = [
           {
             viewportId: 'viewport-fusion-0',
             type: ViewportType.ORTHOGRAPHIC,
@@ -1172,7 +1190,7 @@ export default {
             }
           }
         ]
-        viewportInputArray = [ ...viewportInputArray, ...arr ]
+        viewportInputArray = [...viewportInputArray, ...arr]
         viewportIds = viewportIds.concat(fusionViewportIds)
       }
       renderingEngine.setViewports(viewportInputArray)
@@ -1191,6 +1209,8 @@ export default {
       cornerstoneTools.addTool(BidirectionalTool)
       cornerstoneTools.addTool(ScaleOverlayTool)
       cornerstoneTools.addTool(CircleROITool)
+      cornerstoneTools.addTool(AngleTool)
+      cornerstoneTools.addTool(CobbAngleTool)
       cornerstoneTools.addTool(MIPJumpToClickTool)
       cornerstoneTools.addTool(VolumeRotateTool)
 
@@ -1218,7 +1238,7 @@ export default {
         })
         toolGroup.addTool(RectangleROITool.toolName, {
           cachedStats: false,
-          getTextLines: this.getRectangleROIToolTextLines
+          getTextLines: this.criterionType === 0 ? this.getCustomRectangleROIToolTextLines : this.getRectangleROIToolTextLines
         })
         toolGroup.addTool(PlanarFreehandROITool.toolName, {
           allowOpenContours: false,
@@ -1238,28 +1258,34 @@ export default {
         toolGroup.addTool(CircleROITool.toolName, {
           getTextLines: this.getCircleROIToolTextLines
         })
-        if(toolGroupId === 'viewport-fusion-3'){
+        toolGroup.addTool(AngleTool.toolName, {
-          toolGroup.addTool(VolumeRotateTool.toolName);
+          getTextLines: this.getAngleToolTextLines
+        })
+        toolGroup.addTool(CobbAngleTool.toolName, {
+          getTextLines: this.getCobbAngleToolTextLines
+        })
+        if (toolGroupId === 'viewport-fusion-3') {
+          toolGroup.addTool(VolumeRotateTool.toolName)
           toolGroup.setToolActive(VolumeRotateTool.toolName, {
-              bindings: [
+            bindings: [
-                  {
+              {
-                      mouseButton: MouseBindings.Wheel, // mouse wheel
+                mouseButton: MouseBindings.Wheel // mouse wheel
-                  },
+              }
-              ],
+            ]
-          });
+          })
           toolGroup.addTool(MIPJumpToClickTool.toolName, {
-              targetViewportIds: fusionViewportIds,
+            targetViewportIds: fusionViewportIds
-          });
+          })
 
           // Set the initial state of the tools, here we set one tool active on left click.
           // This means left click will draw that tool.
           toolGroup.setToolActive(MIPJumpToClickTool.toolName, {
-              bindings: [
+            bindings: [
-                  {
+              {
-                      mouseButton: MouseBindings.Primary, // Left Click
+                mouseButton: MouseBindings.Primary // Left Click
-                  },
+              }
-              ],
+            ]
-          });
+          })
         }
         toolGroup.setToolActive(StackScrollTool.toolName, {
           bindings: [{ mouseButton: MouseBindings.Wheel }]
@@ -1284,6 +1310,8 @@ export default {
           toolGroup.setToolPassive(LengthTool.toolName)
           toolGroup.setToolPassive(BidirectionalTool.toolName)
           toolGroup.setToolPassive(CircleROITool.toolName)
+          toolGroup.setToolPassive(AngleTool.toolName)
+          toolGroup.setToolPassive(CobbAngleTool.toolName)
         } else {
           toolGroup.setToolEnabled(ArrowAnnotateTool.toolName)
           toolGroup.setToolEnabled(RectangleROITool.toolName)
@@ -1291,13 +1319,15 @@ export default {
           toolGroup.setToolEnabled(LengthTool.toolName)
           toolGroup.setToolEnabled(BidirectionalTool.toolName)
           toolGroup.setToolEnabled(CircleROITool.toolName)
+          toolGroup.setToolEnabled(AngleTool.toolName)
+          toolGroup.setToolEnabled(CobbAngleTool.toolName)
         }
         toolGroup.setToolPassive(EraserTool.toolName)
       })
 
       eventTarget.addEventListener('cornerstoneimageloadprogress', this.imageLoadProgress)
       console.log(Events, toolsEvents)
-      if ( this.readingTool === 2 ) {
+      if (this.readingTool === 2) {
         this.setUpSynchronizers()
       }
     },
@@ -1395,6 +1425,11 @@ export default {
         toolsEvents.ANNOTATION_REMOVED,
         this.criterionType === 0 ? this.customAnnotationRemovedListener : this.annotationRemovedListener
       )
+      eventTarget.addEventListener(
+        toolsEvents.ANNOTATION_SELECTION_CHANGE,
+        this.criterionType === 0 ? this.customAnnotationSelectionChangeListener : this.annotationSelectionChangeListener
+      )
+
       // eventTarget.addEventListener(
       //   toolsEvents.ANNOTATION_ADDED,
       //   this.annotationAddedListener
@@ -1486,14 +1521,19 @@ export default {
         annotation.numberOfFrames = isNaN(parseInt(params.frame)) ? null : parseInt(params.frame)
         annotation.markTool = annotation.metadata.toolName
         this.markedSeriesIds.push(series.Id)
-        const markName = await this.customPrompt()
+        const operateStateEnum = this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].operateStateEnum
+        const markName = await this.customPrompt(!this.isNumber(operateStateEnum))
 
         if (markName) {
           annotation.data.label = markName
           if (annotation.metadata.toolName === 'ArrowAnnotate') {
             annotation.data.text = markName
           }
-          this.saveCustomAnnotation(annotation)
+          if (this.isNumber(operateStateEnum)) {
+            this.$refs[`ecrf_${series.TaskInfo.VisitTaskId}`][0].bindAnnotationToQuestion(annotation)
+          } else {
+            this.saveCustomAnnotation(annotation)
+          }
         }
       }
 
@@ -1535,16 +1575,39 @@ export default {
       if (annotation.metadata.toolName === 'PlanarFreehandROI' && !annotation.data.contour.closed) return
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
-        this.saveCustomAnnotation(annotation)
+        const operateStateEnum = this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].operateStateEnum
+        const isBound = this.$refs[`ecrf_${annotation.visitTaskId}`][0].verifyAnnotationIsBound(annotation)
+        if (isBound || this.isNumber(operateStateEnum)) {
+          this.$refs[`ecrf_${series.TaskInfo.VisitTaskId}`][0].updateAnnotationToQuestion(annotation)
+        } else {
+          this.saveCustomAnnotation(annotation)
+        }
       }
       this.setToolsPassive()
     },
     async customAnnotationRemovedListener(e) {
       const { annotation } = e.detail
-      try{
+      try {
         // if ( this.resetAnnotation && this.isFusion ) return false
         if (!annotation) return false
-        if (this.readingTaskState === 2) throw 'annotation Not allowed to operate'
+        if (this.readingTaskState === 2) {
+          const errorMsg = { message: 'annotation Not allowed to operate' }
+          throw errorMsg
+        }
+        const i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
+        if (i === -1) {
+          // 临时标记
+          return
+        }
+        if (annotation.visitTaskId === this.taskInfo.VisitTaskId) {
+          const isBound = this.$refs[`ecrf_${annotation.visitTaskId}`][0].verifyAnnotationIsBound(annotation)
+          if (isBound && this.activeTool === 'Eraser') {
+            this.$alert('该标记已与问题进行绑定，不允许删除！')
+            const errorMsg = { message: 'annotation Not allowed to operate' }
+            throw errorMsg
+          }
+        }
+
         if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) {
           if (this.activeTool === 'Eraser') {
             await this.$confirm(
@@ -1567,9 +1630,10 @@ export default {
             viewport.render()
           }
         } else {
-          throw 'annotation Not allowed to operate'
+          const errorMsg = { message: 'annotation Not allowed to operate' }
+          throw errorMsg
         }
-      }catch(e){
+      } catch (e) {
         cornerstoneTools.annotation.state.addAnnotation(annotation)
         const renderingEngine = getRenderingEngine(renderingEngineId)
         for (let i = 0; i < this.cells.length; i++) {
@@ -1589,6 +1653,20 @@ export default {
         viewport.render()
       }
     },
+    customAnnotationSelectionChangeListener(e) {
+      if (this.readingTaskState === 2) return
+      const { detail } = e
+      const annotations = cornerstoneTools.annotation.state.getAllAnnotations()
+      const i = annotations.findIndex(i => i.annotationUID === detail.selection[0])
+      if (i > -1) {
+        if (annotations[i].visitTaskId !== this.taskInfo.VisitTaskId) {
+          return
+        } else {
+          this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].bindAnnotationToQuestion(annotations[i])
+        }
+      }
+    },
+    annotationSelectionChangeListener(e) {},
     async getAnnotations(visitTaskId) {
       if (this.readingTaskState === 2) return
       const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
@@ -1682,7 +1760,6 @@ export default {
       }
       const textLines = []
       if (data.label) {
-        // textLines.push(data.label)
         textLines.push(data.status ? `${data.label}(${data.status})` : data.label)
       }
       textLines.push(`${parseFloat(length).toFixed(this.digitPlaces)} ${unit}`)
@@ -1704,7 +1781,9 @@ export default {
       } = cachedVolumeStats || {}
 
       const textLines = []
-
+      if (data.label) {
+        textLines.push(data.label)
+      }
       if (area) {
         const areaLine = isEmptyArea
           ? `Area: Oblique not supported`
@@ -1747,11 +1826,26 @@ export default {
       if (data.label) {
         textLines.push(data.status ? `${data.label}(${data.status})` : data.label)
       }
-      // textLines.push(`Area: ${parseFloat(area).toFixed(this.digitPlaces)} ${areaUnit}`)
 
-      // textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`)
+      return textLines
-      // textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
+    },
-      // textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
+    getCustomRectangleROIToolTextLines(data, targetId) {
+      const cachedVolumeStats = data.cachedStats[targetId]
+      const { area, mean, max, stdDev, areaUnit, modalityUnit } = cachedVolumeStats
+
+      if (mean === undefined) {
+        return
+      }
+
+      const textLines = []
+      if (data.label) {
+        textLines.push(data.label)
+      }
+      textLines.push(`Area: ${this.reRound(area, this.digitPlaces)} ${areaUnit}`)
+
+      textLines.push(`Mean: ${this.reRound(mean, this.digitPlaces)} ${modalityUnit}`)
+      textLines.push(`Max: ${this.reRound(max, this.digitPlaces)} ${modalityUnit}`)
+      textLines.push(`Std Dev: ${this.reRound(stdDev, this.digitPlaces)} ${modalityUnit}`)
 
       return textLines
     },
@@ -1760,22 +1854,17 @@ export default {
       const { length, width, unit } = cachedStats[targetId]
 
       const textLines = []
-      // if (label) {
+
-      //   textLines.push(label);
-      // }
       if (label) {
-        // textLines.push(label)
         textLines.push(data.status ? `${label}(${data.status})` : label)
       }
       if (length === undefined) {
         return textLines
       }
       
-      // spaceBetweenSlices & pixelSpacing &
-      // magnitude in each direction? Otherwise, this is "px"?
       textLines.push(
-        `L: ${csUtils.roundNumber(length)} ${unit || unit}`,
+        `L: ${parseFloat(length).toFixed(this.digitPlaces)} ${unit || unit}`,
-        `S: ${csUtils.roundNumber(width)} ${unit}`
+        `S: ${parseFloat(width).toFixed(this.digitPlaces)} ${unit}`
       )
 
       return textLines
@@ -1796,37 +1885,86 @@ export default {
       const textLines = []
       if (data.label) {
         // textLines.push(data.label)
-        textLines.push(data.status ? `${data.label}(${data.status})` : data.label)
+        textLines.push(data.label)
       }
 
       if (radius) {
         const radiusLine = isEmptyArea
           ? `Radius: Oblique not supported`
-          : `Radius: ${csUtils.roundNumber(radius)} ${radiusUnit}`
+          : `Radius: ${this.reRound(radius, this.digitPlaces)} ${radiusUnit}`
         textLines.push(radiusLine)
       }
 
       if (area) {
         const areaLine = isEmptyArea
           ? `Area: Oblique not supported`
-          : `Area: ${csUtils.roundNumber(area)} ${areaUnit}`
+          : `Area: ${parseFloat(area)} ${areaUnit}`
         textLines.push(areaLine)
       }
 
       if (mean) {
-        textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`)
+        textLines.push(`Mean: ${this.reRound(mean, this.digitPlaces)} ${modalityUnit}`)
       }
 
       if (max) {
-        textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
+        textLines.push(`Max: ${this.reRound(max, this.digitPlaces)} ${modalityUnit}`)
       }
 
       if (stdDev) {
-        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
+        textLines.push(`Std Dev: ${this.reRound(stdDev, this.digitPlaces)} ${modalityUnit}`)
       }
 
       return textLines
     },
+    getAngleToolTextLines(data, targetId) {
+      const cachedVolumeStats = data.cachedStats[targetId]
+      const { angle } = cachedVolumeStats
+      if (angle === undefined) {
+        return
+      }
+
+      if (isNaN(angle)) {
+        return [`${angle}`]
+      }
+      const textLines = []
+      if (label) {
+        textLines.push(label)
+      }
+      textLines.push(`${angle.toFixed(this.digitPlaces)} ${String.fromCharCode(176)}`)
+      return textLines
+    },
+    getCobbAngleToolTextLines(data, targetId) {
+      const cachedVolumeStats = data.cachedStats[targetId]
+      const { angle } = cachedVolumeStats
+
+      if (angle === undefined) {
+        return
+      }
+      const textLines = []
+      if (label) {
+        textLines.push(label)
+      }
+      textLines.push(`${angle.toFixed(this.digitPlaces)} ${String.fromCharCode(176)}`)
+
+      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)
+    },
     // 激活工具
     setToolActive(toolName) {
       const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
@@ -1866,6 +2004,37 @@ export default {
           this.activeTool = toolName
         }
       }
+      if (this.criterionType === 0 && this.readingTaskState < 2) {
+        this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].resetOperateState()
+      }
+    },
+    setReadingToolActive(toolName) {
+      if (this.readingTaskState === 2) return
+      if (this.activeTool === toolName) return
+      const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
+      if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
+        const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        if (this.activeTool) {
+          toolGroup.setToolPassive(this.activeTool)
+        }
+        toolGroup.setToolActive(toolName, {
+          bindings: [{ mouseButton: MouseBindings.Primary }]
+        })
+        this.activeTool = toolName
+      }
+    },
+    setReadingToolPassive() {
+      if (this.readingTaskState === 2) return
+      if (this.activeTool && this.toolNames.includes(this.activeTool)) {
+        const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
+        if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
+          const toolGroupId = `${this.viewportKey}-${this.activeViewportIndex}`
+          const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+          toolGroup.setToolPassive(this.activeTool)
+          this.activeTool = ''
+        }
+      }
     },
     setMoreToolActive(toolName) {
       if (this.readingTaskState === 2) return
@@ -1940,8 +2109,10 @@ export default {
       const type = parseInt(value)
       // 1：默认值；2：垂直翻转；3：水平翻转；4：左转90度；5：右转90度；
       if (type === 1) {
-        viewport.resetCamera()
+        // viewport.resetCamera()
-        viewport.resetProperties()
+        // viewport.resetProperties()
+        // viewport.render()
+        viewport.setViewPresentation({ rotation: 0 })
         viewport.render()
       } else if (type === 2) {
         const { flipVertical } = viewport.getCamera()
@@ -2103,8 +2274,8 @@ export default {
       const renderingEngine = getRenderingEngine(renderingEngineId)
       const viewport = renderingEngine.getViewport(`${this.viewportKey}-${this.activeViewportIndex}`)
       const { invert } = viewport.getProperties()
-      if ( this.isFusion ) {
+      if (this.isFusion) {
-        viewport.setProperties({ invert: !invert }, this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].volumeId )
+        viewport.setProperties({ invert: !invert }, this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].volumeId)
       }
       viewport.setProperties({ invert: !invert })
       viewport.render()
@@ -2248,18 +2419,18 @@ export default {
     toggleFullScreen(e, index) {
       this.fullScreenIndex = this.fullScreenIndex === index ? null : index
       this.activeViewportIndex = index
-      if ( this.isFusion ) {
+      if (this.isFusion) {
-        let viewportIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
+        const viewportIds = [`${this.viewportKey}-0`, `${this.viewportKey}-1`, `${this.viewportKey}-2`]
-        viewportIds.forEach(id=>{
+        viewportIds.forEach(id => {
-          let index = this.$refs[id][0].series.SliceIndex
+          const index = this.$refs[id][0].series.SliceIndex
           this.$refs[id][0].setFullScreen(index)
         })
       }
     },
     async toggleTask(taskInfo, taskIndex) {
-      if(this.isFusion){
+      if (this.isFusion) {
-        let confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
+        const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
-        if(!confirm) return false
+        if (!confirm) return false
         this.isFusion = false
         this.fullScreenIndex = null
         this.setToolsPassive()
@@ -2329,9 +2500,9 @@ export default {
       this.setToolsPassive()
     },
     async activeSeries(obj) {
-      if(this.isFusion){
+      if (this.isFusion) {
-        let confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
+        const confirm = await this.$confirm(this.$t('trials:reading:confirm:changeStack'))
-        if(!confirm) return false
+        if (!confirm) return false
         this.isFusion = false
         this.setToolsPassive()
         this.rows = 1
@@ -2487,6 +2658,34 @@ export default {
       }
       return obj
     },
+    viewCustomAnnotationSeries(obj) {
+      const i = this.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
+      if (i === -1) return
+      const studyList = this.visitTaskList[i].StudyList
+      const series = this.getMarkedSeries(studyList, obj.annotation)
+      if (series) {
+        this.$refs[`${this.viewportKey}-${this.cells.length - 1}`][0].setSeriesInfo(series, true)
+        this.activeViewportIndex = i
+        this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
+      }
+    },
+    async getCustomScreenshots(obj, callback) {
+      const i = this.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
+      if (i === -1) return
+      const studyList = this.visitTaskList[i].StudyList
+      const series = this.getMarkedSeries(studyList, obj.annotation)
+      if (series) {
+        this.$refs[`${this.viewportKey}-${this.cells.length - 1}`][0].setSeriesInfo(series, true)
+        this.activeViewportIndex = i
+        this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
+        const divForDownloadViewport = document.querySelector(
+          `div[data-viewport-uid="${this.viewportKey}-${this.activeViewportIndex}"]`
+        )
+        const canvas = await html2canvas(divForDownloadViewport)
+        const base64Str = canvas.toDataURL('image/png', 1)
+        callback(base64Str)
+      }
+    },
     async getScreenshots(measureData, callback) {
       if (measureData) {
         await this.imageLocation(measureData)
@@ -2685,12 +2884,13 @@ export default {
       return params
     },
     // 输入标记名称自定义弹窗
-    async customPrompt() {
+    async customPrompt(isShowCancelButton = true) {
       try {
         const that = this
         // 请输入标记名称
         const { value } = await this.$prompt(this.$t('trials:noneDicom:message:msg1'), '', {
           showClose: false,
+          showCancelButton: isShowCancelButton,
           beforeClose: (action, instance, done) => {
             if (action === 'confirm') {
               const value = instance.inputValue
@@ -2711,8 +2911,11 @@ export default {
         return null
       }
     },
+    isNumber(value) {
+      return typeof value === 'number' && value !== null && !isNaN(value)
+    },
     showPanel(e, toolName) {
-      if(toolName === 'layout' && this.isFusion) return false
+      if (toolName === 'layout' && this.isFusion) return false
       e.currentTarget.firstChild.lastChild.style.display = 'block'
     },
     toolMouseout(e) {
@@ -2729,67 +2932,67 @@ export default {
     },
     // 融合视口相机同步
     setUpSynchronizers() {
-      let axialCameraPositionSynchronizer = createCameraPositionSynchronizer(
+      const axialCameraPositionSynchronizer = createCameraPositionSynchronizer(
         'AXIAL_CAMERA_SYNCHRONIZER_ID'
-      );
+      )
-      let ctVoiSynchronizer = createVOISynchronizer('CT_VOI_SYNCHRONIZER_ID', {
+      const ctVoiSynchronizer = createVOISynchronizer('CT_VOI_SYNCHRONIZER_ID', {
         syncInvertState: false,
-        syncColormap: false,
+        syncColormap: false
-      });
+      })
-      let ptVoiSynchronizer = createVOISynchronizer('PT_VOI_SYNCHRONIZER_ID', {
+      const ptVoiSynchronizer = createVOISynchronizer('PT_VOI_SYNCHRONIZER_ID', {
         syncInvertState: false,
-        syncColormap: false,
+        syncColormap: false
-      });
+      })
-      let fusionVoiSynchronizer = createVOISynchronizer('FUSION_VOI_SYNCHRONIZER_ID', {
+      const fusionVoiSynchronizer = createVOISynchronizer('FUSION_VOI_SYNCHRONIZER_ID', {
         syncInvertState: false,
-        syncColormap: false,
+        syncColormap: false
       });
       [
         `viewport-fusion-0`,
         `viewport-fusion-1`,
-        `viewport-fusion-2`,
+        `viewport-fusion-2`
       ].forEach((viewportId) => {
         axialCameraPositionSynchronizer.add({
           renderingEngineId: this.renderingEngineId,
-          viewportId,
+          viewportId
-        });
+        })
       });
       [
-       `viewport-fusion-0`,
+        `viewport-fusion-0`
       ].forEach((viewportId) => {
         ctVoiSynchronizer.add({
           renderingEngineId: this.renderingEngineId,
-          viewportId,
+          viewportId
-        });
+        })
       });
       [
         `viewport-fusion-3`,
-        `viewport-fusion-1`,
+        `viewport-fusion-1`
       ].forEach((viewportId) => {
         ptVoiSynchronizer.add({
           renderingEngineId: this.renderingEngineId,
-          viewportId,
+          viewportId
-        });
+        })
       });
       [
-        `viewport-fusion-2`,
+        `viewport-fusion-2`
       ].forEach((viewportId) => {
         fusionVoiSynchronizer.add({
           renderingEngineId,
-          viewportId,
+          viewportId
-        });
+        })
         ctVoiSynchronizer.addTarget({
           renderingEngineId,
-          viewportId,
+          viewportId
-        });
+        })
         ptVoiSynchronizer.addTarget({
           renderingEngineId,
-          viewportId,
+          viewportId
-        });
+        })
-      });
+      })
     },
     setColorMap(rgbPresetName) {
-      let fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
+      const fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
       fusionViewportIds.forEach(id => {
         this.$refs[id][0].setPreset(rgbPresetName)
         this.$refs[id][0].renderColorBar(rgbPresetName)
@@ -2797,25 +3000,25 @@ export default {
       })
     },
     voiChange(v) {
-      let fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
+      const fusionViewportIds = [`viewport-fusion-1`, `viewport-fusion-2`, `viewport-fusion-3`]
       fusionViewportIds.forEach(id => {
         this.$refs[id][0].voiChange(v)
       })
     },
     async handleFusion(data) {
-      try{
+      try {
         this.fusionVisible = false
         this.isFusion = true
-        this.rows = 2;
+        this.rows = 2
         this.cols = 2
-        let { ct, pt } = data
+        const { ct, pt } = data
         this.loading = true
         this.loadingText = this.$t('trials:lugano:message:loadVolumes')
         // this.resetAnnotation = true
         // console.log(cornerstoneTools.annotation.state.getAllAnnotations(),'cornerstoneTools.annotation.state')
         // cornerstoneTools.annotation.state.removeAllAnnotations()
         this.renderedTaskIds = []
-        if ( this.verifyFusionData(ct, pt) ) {
+        if (this.verifyFusionData(ct, pt)) {
           this.loading = false
           this.loadingText = null
           this.$refs[`viewport-0`][0].setSeriesInfo(ct)
@@ -2825,10 +3028,10 @@ export default {
           // this.resetAnnotation = false
           return true
         }
-        if (!this.fusionSerieId.ct || this.fusionSerieId.ct !== ct.SeriesInstanceUid ) {
+        if (!this.fusionSerieId.ct || this.fusionSerieId.ct !== ct.SeriesInstanceUid) {
           this.fusionSerieId.ct = ct.SeriesInstanceUid
         }
-        if (!this.fusionSerieId.pt || this.fusionSerieId.pt !== pt.SeriesInstanceUid ) {
+        if (!this.fusionSerieId.pt || this.fusionSerieId.pt !== pt.SeriesInstanceUid) {
           this.fusionSerieId.pt = pt.SeriesInstanceUid
         }
         await this.getVolume(pt)
@@ -2836,22 +3039,22 @@ export default {
         await this.getVolume(pt, true)
         this.loading = false
         this.loadingText = null
-        let ctData = {
+        const ctData = {
           data: ct,
-          volumeId: this.volumeData[ct.SeriesInstanceUid].volumeId,
+          volumeId: this.volumeData[ct.SeriesInstanceUid].volumeId
         }
-        let ptData = {
+        const ptData = {
           data: pt,
           volumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
-          volume: this.volumeData[pt.SeriesInstanceUid].volume,
+          volume: this.volumeData[pt.SeriesInstanceUid].volume
         }
-        let fusionData = {
+        const fusionData = {
           ct,
           data: pt,
           volumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
           ctVolumeId: this.volumeData[ct.SeriesInstanceUid].volumeId,
           ptVolumeId: this.volumeData[pt.SeriesInstanceUid].volumeId,
-          fusionVolumeId: this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId,
+          fusionVolumeId: this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId
         }
         this.$refs[`viewport-0`][0].setSeriesInfo(ct)
         this.$refs[`viewport-1`][0].setSeriesInfo(pt)
@@ -2859,36 +3062,36 @@ export default {
         this.$refs[`viewport-3`][0].setSeriesInfo(pt)
 
         this.$refs[`viewport-fusion-0`][0].setSeriesInfo(ctData)
-        this.$refs[`viewport-fusion-1`][0].setSeriesInfo(ptData, { colorMap: true})
+        this.$refs[`viewport-fusion-1`][0].setSeriesInfo(ptData, { colorMap: true })
         this.$refs[`viewport-fusion-2`][0].setSeriesInfo(fusionData, { isFusion: true, colorMap: true })
         this.$refs[`viewport-fusion-3`][0].setSeriesInfo(ptData, { isMip: true, colorMap: true })
         // this.resetAnnotation = false
         this.$nextTick(() => {
           this.$refs[`colorMap`].init()
         })
-      }catch(err){
+      } catch (err) {
         console.log(err)
         this.loading = false
         this.loadingText = null
       }
     },
     verifyFusionData(ct, pt) {
-      if (this.fusionSerieId.ct === ct.SeriesInstanceUid && this.fusionSerieId.pt === pt.SeriesInstanceUid && cache.getVolume(this.volumeData[ct.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[pt.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId) ) {
+      if (this.fusionSerieId.ct === ct.SeriesInstanceUid && this.fusionSerieId.pt === pt.SeriesInstanceUid && cache.getVolume(this.volumeData[ct.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[pt.SeriesInstanceUid].volumeId) && cache.getVolume(this.volumeData[`fusion_${pt.SeriesInstanceUid}`].volumeId)) {
         return true
       }
       return false
     },
-    async getVolume(serie, isFusion = false ) {
+    async getVolume(serie, isFusion = false) {
       return new Promise(async res => {
-        let volumeId = null, volume = null
+        let volumeId = null; let volume = null
-        let key = isFusion ? `fusion_${serie.SeriesInstanceUid}` : serie.SeriesInstanceUid
+        const key = isFusion ? `fusion_${serie.SeriesInstanceUid}` : serie.SeriesInstanceUid
-        if(!this.volumeData[key] || !cache.getVolume(this.volumeData[key].volumeId)) {
+        if (!this.volumeData[key] || !cache.getVolume(this.volumeData[key].volumeId)) {
-          if ( serie.Modality === 'PT' && !isFusion ) {
+          if (serie.Modality === 'PT' && !isFusion) {
             serie.ImageIds.forEach(async id => {
-              const imageLoadObject = cache.getImage(id);
+              const imageLoadObject = cache.getImage(id)
               if (imageLoadObject) {
                 await new Promise(res => {
-                  cache.removeImageLoadObject(id, {force:true}); // 从缓存中删除
+                  cache.removeImageLoadObject(id, { force: true }) // 从缓存中删除
                   res()
                 })
               }

src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue

@@ -319,7 +319,7 @@ export default {
       const viewport = renderingEngine.getViewport(this.viewportId)
 
       if (isPlay) {
-        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: false })
+        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: true })
       } else {
         cornerstoneTools.utilities.cine.stopClip(viewport.element)
       }
@@ -399,15 +399,18 @@ 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)
-        const image = await cornerstoneDICOMImageLoader.wadouri.loadImage(obj.ImageIds[obj.SliceIndex]).promise
+        let imageId = obj.ImageIds[obj.SliceIndex] ? obj.ImageIds[obj.SliceIndex] : obj.ImageIds[0]
+        const image = await cornerstoneDICOMImageLoader.wadouri.loadImage(imageId).promise
         if (obj.Modality === 'PT') {
           this.cachePTMetadata([image])
         }
         this.prefetchMetadataInformation(obj.ImageIds, obj.Modality)
         await viewport.setStack(this.series.Stack, obj.SliceIndex)
+        
         viewport.render()
       } catch (e) {
         console.log(e)

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue

@@ -32,9 +32,14 @@
             :reading-task-state="readingTaskState"
             :criterion-id="criterionId"
             :calculation-list="calculationList"
+            :question-mark-info-list="questionMarkInfoList"
+            :questions-mark-status="questionsMarkStatus"
             :is-baseline="isBaseLineTask"
             @resetFormItemData="resetFormItemData"
             @setFormItemData="setFormItemData"
+            @getQuestions="getQuestions"
+            @operateImageMarker="operateImageMarker"
+            @unBindAnnotationToQuestion="unBindAnnotationToQuestion"
           />
         </template>
 
@@ -74,11 +79,12 @@
 
 <script>
 
-import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, getQuestionCalculateRelation } from '@/api/trials'
+import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, getQuestionCalculateRelation, saveTaskQuestion } from '@/api/trials'
-import { setSkipReadingCache, resetReadingTask } from '@/api/reading'
+import { setSkipReadingCache, resetReadingTask, saveTableQuestionMark } from '@/api/reading'
 import const_ from '@/const/sign-code'
-import QuestionFormItem from '@/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem'
+import QuestionFormItem from './QuestionFormItem'
 import SignForm from '@/views/trials/components/newSignForm'
+import store from '@/store'
 export default {
   name: 'EcrfList',
   components: {
@@ -93,7 +99,7 @@ export default {
     readingTaskState: {
       type: Number,
       required: true
-    },
+    }
   },
   data() {
     return {
@@ -112,7 +118,18 @@ export default {
       calculationList: [],
       taskInfo: null,
       isBaseLineTask: false,
-      rerender: true
+      rerender: true,
+      questionMarkInfoList: [],
+      operateStateEnum: null, // 0：绑定；1：标记；2：查看；3：更改；4：移除；5：保存；6：更改数值内容；
+      operateQuestionId: '',
+      operateRowId: '',
+      operateParentQsId: '',
+      isTableQuestion: false,
+      imageTool: '',
+      imageToolAttribute: '',
+      questionsMarkStatus: {},
+      digitPlaces: 2,
+      questionImageToolAttributeInfo: {}
     }
   },
   mounted() {
@@ -120,12 +137,14 @@ export default {
     this.visitTaskId = this.visitInfo.VisitTaskId
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
     this.isBaseLineTask = this.taskInfo.IsBaseLine
-    this.criterionType = this.taskInfo.CriterionType
+    this.criterionId = this.taskInfo.TrialReadingCriterionId
+    const digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.getQuestionCalculateRelation()
-    this.getQuestions()
+    this.getQuestions(true)
   },
   methods: {
-    async getQuestions() {
+    async getQuestions(isInit) {
       this.loading = true
       try {
         const param = {
@@ -147,12 +166,30 @@ export default {
             }
             if (v.Type === 'number') {
               this.$set(this.questionForm, v.Id, v.Answer === '' ? '' : parseFloat(v.Answer).toFixed(this.digitPlaces))
+              if (v.ImageToolAttribute) {
+                this.$set(this.questionImageToolAttributeInfo, v.Id, v.ImageToolAttribute)
+              }
             }
             if (v.Childrens.length > 0) {
               this.setChild(v.Childrens)
             }
           })
           this.questions = res.Result.SinglePage
+          this.questionsMarkStatus = {}
+          this.questionMarkInfoList = res.OtherInfo.QuestionMarkInfoList.map(i => {
+            if (i.RowId) {
+              this.$set(this.questionsMarkStatus, `${i.RowId}_${i.TableQuestionId}`, {isMarked: i.MeasureData !== '', isSaved: true})
+            } else if (i.QuestionId) {
+              this.$set(this.questionsMarkStatus, i.QuestionId, {isMarked: i.MeasureData !== '', isSaved: true})
+            }
+            if (typeof i.MeasureData === 'string' && i.MeasureData) {
+              i.MeasureData = JSON.parse(i.MeasureData)
+            }
+            return i
+          })
+          if (!isInit) {
+            this.$emit('resetAnnotations', this.visitTaskId)
+          }
           this.loading = false
         }
       } catch (e) {
@@ -180,6 +217,9 @@ export default {
         }
         if (i.Type === 'number') {
           this.$set(this.questionForm, i.Id, i.Answer === '' ? '' : parseFloat(i.Answer).toFixed(this.digitPlaces))
+          if (i.ImageToolAttribute) {
+            this.$set(this.questionImageToolAttributeInfo, i.Id, i.ImageToolAttribute)
+          }
         }
         if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)
@@ -325,6 +365,604 @@ export default {
         }
       })
     },
+    
+    verifyAnnotationIsBound(annotation) {
+      const i = this.questionMarkInfoList.findIndex(i => i.MeasureData && i.MeasureData.annotationUID === annotation.annotationUID)
+      return i > -1
+    },
+    // async operateImageMarker(obj) {
+    //   this.operateStateEnum = obj.operateStateEnum
+    //   this.isTableQuestion = obj.question.IsTableQuestion ? true : false
+    //   this.imageTool = obj.question.ImageTool
+    //   this.imageToolAttribute = obj.question.ImageToolAttribute
+    //   this.operateQuestionId = obj.question.Id
+    //   this.operateRowId = obj.question.RowId
+    //   this.operateParentQsId = obj.question.ParentQsId
+    //   if (obj.operateStateEnum === 0) { 
+    //     // 绑定标记
+    //     this.$emit('setReadingToolPassive')
+    //   } else if (obj.operateStateEnum === 1) {
+    //     // 添加标记
+    //     this.$emit('setReadingToolActive', obj.question.ImageTool)
+    //   } else if (obj.operateStateEnum === 2) {
+    //     // 查看标记
+    //     let i = -1
+    //     if (this.isTableQuestion) {
+    //       if (this.operateRowId) {
+    //         i = this.questionMarkInfoList.findIndex(i => i.TableQuestionId === obj.question.Id && i.RowId === this.operateRowId)
+    //       } else {
+    //         i = this.questionMarkInfoList.findIndex(i => i.TableQuestionId === obj.question.Id && !i.RowId)
+    //       }
+    //     } else {
+    //       i = this.questionMarkInfoList.findIndex(i => i.QuestionId === obj.question.Id)
+    //     }
+    //     if (i > -1) {
+    //       const annotation = this.questionMarkInfoList[i].MeasureData
+    //       this.$emit('viewCustomAnnotationSeries', { visitTaskId: this.visitTaskId, annotation })
+    //     }
+    //   } else if (obj.operateStateEnum === 3) {
+    //     // 更改标记
+    //     this.$emit('setReadingToolPassive')
+    //   } else if (obj.operateStateEnum === 4) {
+    //     this.$emit('setReadingToolPassive')
+    //     // 移除标记
+    //     let i = -1
+    //     let questionMarkInfo = {}
+    //     if (this.isTableQuestion) {
+    //       if (this.operateRowId) {
+    //         i = this.questionMarkInfoList.findIndex(i => i.TableQuestionId === obj.question.Id && i.RowId === this.operateRowId)
+    //       } else {
+    //         i = this.questionMarkInfoList.findIndex(i => i.TableQuestionId === obj.question.Id && !i.RowId)
+    //       }
+    //     } else {
+    //       this.$set(this.questionForm, obj.question.Id, '')
+    //       i = this.questionMarkInfoList.findIndex(i => i.QuestionId === obj.question.Id)
+    //     }
+    //     if (i === -1) return
+    //     this.questionMarkInfoList[i].MeasureData = ''
+    //     this.questionMarkInfoList[i].StudyId = ''
+    //     this.questionMarkInfoList[i].SeriesId = ''
+    //     this.questionMarkInfoList[i].InstanceId = ''
+    //     questionMarkInfo = this.questionMarkInfoList[i]
+    //     questionMarkInfo.isMarked = false
+    //     questionMarkInfo.isSaved = false
+    //     this.$set(this.questionsMarkStatus, this.operateRowId ? `${this.operateRowId}_${obj.question.Id}` : obj.question.Id, questionMarkInfo)
+    //   } else if (obj.operateStateEnum === 5) {
+    //     // 保存外层标记
+    //     this.loading = true
+    //     try {
+    //       const answers = []
+    //       answers.push({ id: obj.question.Id, answer: this.questionForm[obj.question.Id] })
+    //       const markInfo = []
+    //       const i = this.questionMarkInfoList.findIndex(i => i.QuestionId === this.operateQuestionId)
+    //       if (i > -1) {
+    //         const obj = Object.assign({}, this.questionMarkInfoList[i])
+    //         obj.MeasureData = obj.MeasureData ? JSON.stringify(obj.MeasureData) : ''
+    //         markInfo.push(obj)
+    //       }
+    //       // 上传截图
+    //       const params = {
+    //         visitTaskId: this.visitTaskId,
+    //         answers: answers,
+    //         questionMarkInfoList: markInfo
+    //       }
+    //       await saveTaskQuestion(-10, params)
+
+    //       this.$set(this.questionsMarkStatus, obj.question.Id, {isMarked: this.questionMarkInfoList[i].MeasureData ? true : false, isSaved: true})
+    //       this.loading = false
+    //     } catch (e) {
+    //       console.log(e)
+    //       this.loading = false
+    //     }
+    //   } else if (obj.operateStateEnum === 6) {
+    //     // 更改数值内容
+    //     let questionMarkInfo = {}
+    //     if (this.isTableQuestion) {
+    //       questionMarkInfo.isMarked = false
+    //       questionMarkInfo.isSaved = false
+    //     } else {
+    //       questionMarkInfo.isMarked = false
+    //       questionMarkInfo.isSaved = false
+    //     }
+    //     this.$set(this.questionsMarkStatus, this.operateRowId ? `${this.operateRowId}_obj.question.Id` : obj.question.Id, questionMarkInfo)
+    //   } else if (obj.operateStateEnum === 7) {
+    //     // 保存表格问题标记
+    //     const loading = this.$loading({ fullscreen: true })
+    //     try {
+    //       let annotation = null
+    //       if (!this.operateRowId && obj.rowId && obj.question.ParentQsId) {
+    //         this.operateRowId = obj.rowId
+    //         this.questionMarkInfoList.forEach(item => {
+    //           if (item.QuestionId === obj.question.ParentQsId && !item.RowId) {
+    //             item.RowId = obj.rowId
+    //             let questionMarkStatus = Object.assign({}, this.questionsMarkStatus[item.TableQuestionId])
+    //             delete this.questionsMarkStatus[item.TableQuestionId]
+    //             if (item.TableQuestionId === this.operateQuestionId) {
+    //               annotation = item.MeasureData
+    //               this.$set(this.questionsMarkStatus, `${obj.rowId}_${item.TableQuestionId}`, questionMarkStatus)
+    //             } else {
+    //               this.$set(this.questionsMarkStatus, `${obj.rowId}_${item.TableQuestionId}`, {isMarked: item.MeasureData ? true : false, isSaved: false})
+    //             }
+                
+    //           }
+    //         })
+    //       } else if (this.operateRowId && this.operateQuestionId) {
+    //         const i = this.questionMarkInfoList.findIndex(i => i.RowId === this.operateRowId && i.TableQuestionId === this.operateQuestionId)
+    //         if (i === -1) return
+    //         annotation = this.questionMarkInfoList[i].MeasureData
+    //       }
+    //       let picturePath = ''
+    //       if (annotation) {
+    //         // 上传截图
+    //         const base64Str = await this.getScreenshots({ visitTaskId: this.visitTaskId, annotation })
+    //         const pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, base64Str)
+    //         picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+    //       }
+    //       let params = {
+    //         Answer: obj.answer,
+    //         VisitTaskId: this.visitTaskId,
+    //         QuestionId: obj.question.ParentQsId,
+    //         InstanceId: annotation ? annotation.instanceId : '',
+    //         SeriesId: annotation ? annotation.seriesId : '',
+    //         StudyId: annotation ? annotation.studyId : '',
+    //         MarkTool: annotation ? annotation.markTool : '',
+    //         PicturePath: picturePath,
+    //         NumberOfFrames: annotation ? annotation.numberOfFrames : null,
+    //         MeasureData: annotation ? JSON.stringify(annotation) : '',
+    //         QuestionType: 0,
+    //         OrderMarkName: annotation ? annotation.data.label : '',
+    //         RowId: this.operateRowId,
+    //         TableQuestionId: this.operateQuestionId,
+    //         RowIndex: obj.rowIndex
+    //       }
+    //       // 保存标记
+    //       await saveTableQuestionMark(params, -10)
+    //       this.$set(this.questionsMarkStatus, `${this.operateRowId}_${this.operateQuestionId}`, {isMarked: annotation ? true : false, isSaved: true})
+    //       this.resetOperateState()
+    //       loading.close()
+    //     } catch(e) {
+    //       console.log(e)
+    //       loading.close()
+    //     }
+    //   }
+    // },
+    async operateImageMarker(obj) {
+      const STATE = {
+        BIND: 0,       // 绑定标记
+        ADD: 1,        // 添加标记
+        VIEW: 2,       // 查看标记
+        CHANGE: 3,     // 更改标记
+        REMOVE: 4,     // 移除标记
+        SAVE_OUTER: 5, // 保存外层标记
+        UPDATE: 6,     // 更改数值内容
+        SAVE_TABLE: 7  // 保存表格标记
+      }
+      const { question, operateStateEnum, rowId, answer } = obj
+      const { Id, IsTableQuestion, ImageTool, ImageToolAttribute, ParentQsId, RowId } = question
+    
+      Object.assign(this, {
+          operateStateEnum,
+          isTableQuestion: !!IsTableQuestion,
+          imageTool: ImageTool,
+          imageToolAttribute: ImageToolAttribute,
+          operateQuestionId: Id,
+          operateRowId: RowId,
+          operateParentQsId: ParentQsId
+      })
+      const stateHandlers = {
+        [STATE.BIND]: () => this.$emit('setReadingToolPassive'),
+        [STATE.ADD]: () => this.$emit('setReadingToolActive', ImageTool),
+        [STATE.VIEW]: this.handleViewAnnotation,
+        [STATE.CHANGE]: () => this.$emit('setReadingToolPassive'),
+        [STATE.REMOVE]: this.handleRemoveAnnotation,
+        [STATE.SAVE_OUTER]: this.handleSaveOuterQuestions,
+        [STATE.UPDATE]: this.handleUpdateValue,
+        [STATE.SAVE_TABLE]: this.handleSaveTableQuestions
+      }
+
+      const handler = stateHandlers[operateStateEnum]
+      handler && await handler.call(this, obj)
+    },
+    async handleViewAnnotation(obj) {
+      const index = this.findMarkIndex(obj.question)
+      if (index === -1) return
+      const annotation = this.questionMarkInfoList[index].MeasureData
+      this.$emit('viewCustomAnnotationSeries', {
+          visitTaskId: this.visitTaskId,
+          annotation
+      })
+    },
+    handleRemoveAnnotation(obj) {
+      const index = this.findMarkIndex(obj.question)
+      if (index === -1) return
+      Object.assign(this.questionMarkInfoList[index], {
+        MeasureData: '',
+        StudyId: '',
+        SeriesId: '',
+        InstanceId: ''
+      })
+      const key = this.operateRowId 
+        ? `${this.operateRowId}_${obj.question.Id}` 
+        : obj.question.Id
+      this.$set(this.questionsMarkStatus, key, {
+        isMarked: false,
+        isSaved: false
+      })
+    },
+    async handleSaveOuterQuestions(obj) {
+      this.loading = true;
+      try {
+        const answers = [{ id: obj.question.Id, answer: this.questionForm[obj.question.Id] }]
+        const markInfo = []
+        
+        const index = this.questionMarkInfoList.findIndex(
+          item => item.QuestionId === this.operateQuestionId
+        )
+        
+        if (index > -1) {
+          const item = { ...this.questionMarkInfoList[index] }
+          item.MeasureData = item.MeasureData ? JSON.stringify(item.MeasureData) : ''
+          markInfo.push(item)
+        }
+
+        await saveTaskQuestion(-10, {
+          visitTaskId: this.visitTaskId,
+          answers,
+          questionMarkInfoList: markInfo
+        })
+        this.$set(this.questionsMarkStatus, obj.question.Id, {
+          isMarked: !!this.questionMarkInfoList[index]?.MeasureData,
+          isSaved: true
+        })
+      } catch (e) {
+        console.error('保存失败:', e)
+      } finally {
+        this.loading = false
+      }
+    },
+    handleUpdateValue(obj) {
+      const key = this.operateRowId 
+        ? `${this.operateRowId}_${obj.question.Id}` 
+        : obj.question.Id
+      this.$set(this.questionsMarkStatus, key, {
+        isMarked: false,
+        isSaved: false
+      })
+    },
+    async handleSaveTableQuestions(obj) {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        let annotation = null
+        if (!this.operateRowId && obj.rowId && obj.question.ParentQsId) {
+          this.operateRowId = obj.rowId
+          this.updateQuestionsMarkStatus(obj)
+        }
+        annotation = this.getAnnotationByRow(this.operateRowId)
+        // 截图上传
+        let picturePath = ''
+        if (annotation) {
+          const base64Str = await this.getScreenshots({
+            visitTaskId: this.visitTaskId,
+            annotation
+          })
+          const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
+          picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+        }
+        await saveTableQuestionMark({
+          Answer: obj.answer,
+          VisitTaskId: this.visitTaskId,
+          QuestionId: obj.question.ParentQsId,
+          ...(annotation ? {
+            InstanceId: annotation.instanceId,
+            SeriesId: annotation.seriesId,
+            StudyId: annotation.studyId,
+            MarkTool: annotation.markTool,
+            NumberOfFrames: annotation.numberOfFrames,
+            MeasureData: JSON.stringify(annotation),
+            OrderMarkName: annotation.data.label
+          } : {}),
+          PicturePath: picturePath,
+          QuestionType: 0,
+          RowId: this.operateRowId,
+          TableQuestionId: this.operateQuestionId,
+          RowIndex: obj.rowIndex
+        }, -10)
+        this.$set(this.questionsMarkStatus, 
+          `${this.operateRowId}_${this.operateQuestionId}`, 
+          { isMarked: !!annotation, isSaved: true }
+        )
+        this.resetOperateState()
+      } catch(e) {
+        console.error('表格保存失败:', e)
+      } finally {
+        loading.close()
+      }
+    },
+    findMarkIndex(question) {
+      const { Id, RowId } = question
+      if (this.isTableQuestion) {
+        return RowId 
+          ? this.questionMarkInfoList.findIndex(i => 
+              i.TableQuestionId === Id && i.RowId === RowId)
+          : this.questionMarkInfoList.findIndex(i => 
+              i.TableQuestionId === Id && !i.RowId)
+      }
+      return this.questionMarkInfoList.findIndex(i => i.QuestionId === Id)
+    },
+    updateQuestionsMarkStatus(obj) {
+      this.questionMarkInfoList.forEach(item => {
+        if (item.QuestionId === obj.question.ParentQsId && !item.RowId) {
+          item.RowId = obj.rowId
+          const oldKey = item.TableQuestionId
+          const newKey = `${obj.rowId}_${item.TableQuestionId}`
+          
+          if (this.questionsMarkStatus[oldKey]) {
+            const status = { ...this.questionsMarkStatus[oldKey] }
+            delete this.questionsMarkStatus[oldKey]
+            this.$set(this.questionsMarkStatus, newKey, status)
+          }
+        }
+      })
+    },
+    getAnnotationByRow(rowId) {
+      const index = this.questionMarkInfoList.findIndex(
+        i => i.RowId === rowId && i.TableQuestionId === this.operateQuestionId
+      )
+      return index > -1 ? this.questionMarkInfoList[index].MeasureData : null
+    },
+    async bindAnnotationToQuestion(annotation) {
+      try {
+        const VALID_STATES = [null, 0, 1, 3]
+        const currentState = this.operateStateEnum
+        if (!VALID_STATES.includes(currentState)) return
+        const isInvalidAnnotation = currentState === 1 && annotation.markTool !== this.imageTool
+        if (isInvalidAnnotation) return
+        if (currentState === null) {
+          return this.handleNullState(annotation)
+        }
+        if (!this.operateQuestionId) return
+        if ([0, 3].includes(currentState)) {
+          if (!annotation.data.label || annotation.markTool !== this.imageTool) {
+            this.$alert('该标记不能与问题绑定！')
+            return
+          }
+          if (currentState === 3) {
+            const conflictIndex = this.questionMarkInfoList.findIndex(
+              item => item.MeasureData.annotationUID === annotation.annotationUID 
+              && item.RowId !== this.operateRowId
+            )
+            if (conflictIndex > -1) {
+              this.$alert('该标记已绑定到其他行，不能更改绑定！')
+              return
+            }
+          }
+          const message = currentState === 0 ? '是否确认绑定？' : '是否确认更改？'
+          const result = await this.$confirm(message, {
+              type: 'warning',
+              distinguishCancelAndClose: true
+          })
+          const isConfirmed = result === 'confirm'
+          if (!isConfirmed) return
+        }
+        const targetIndex = this.findTargetIndex()
+        if (targetIndex === -1) {
+          this.questionMarkInfoList.push({
+            InstanceId: annotation.instanceId,
+            SeriesId: annotation.seriesId,
+            StudyId: annotation.studyId,
+            MarkTool: annotation.metadata.toolName,
+            PicturePath: '',
+            NumberOfFrames: annotation.numberOfFrames,
+            MeasureData: annotation,
+            RowId: this.operateRowId || '',
+            QuestionId: this.isTableQuestion 
+              ? this.operateParentQsId 
+              : this.operateQuestionId,
+            TableQuestionId: this.isTableQuestion 
+              ? this.operateQuestionId 
+              : ''
+          })
+        } else {
+          const target = this.questionMarkInfoList[targetIndex]
+          Object.assign(target, {
+            InstanceId: annotation.instanceId,
+            SeriesId: annotation.seriesId,
+            StudyId: annotation.studyId,
+            MarkTool: annotation.metadata.toolName,
+            PicturePath: '',
+            NumberOfFrames: annotation.numberOfFrames,
+            MeasureData: annotation
+          })
+        }
+        this.updateMarkStatus(targetIndex, annotation)
+        this.operateStateEnum = null
+      } catch (e) {
+        console.error('绑定失败:', e); // 增强错误信息
+      }
+    },
+    handleNullState(annotation) {
+      const qsArr = []
+      const markList = this.questionMarkInfoList
+      for (let i = 0; i < markList.length; i++) {
+        const item = markList[i];
+        if (item.MeasureData?.annotationUID !== annotation.annotationUID) continue
+        item.MeasureData = annotation
+        
+        if (item.TableQuestionId) {
+          qsArr.push({ ...item, ImageToolAttribute: this.imageToolAttribute })
+          
+          const keyId = item.RowId 
+              ? `${item.RowId}_${item.TableQuestionId}` 
+              : item.TableQuestionId
+              
+          this.$set(this.questionsMarkStatus, keyId, { 
+              isMarked: true, 
+              isSaved: false 
+          })
+        } else {
+          this.setAnswerToQuestion(annotation, item.QuestionId)
+          this.$set(this.questionsMarkStatus, item.QuestionId, {
+              isMarked: true,
+              isSaved: false
+          })
+        }
+      }
+      if (qsArr.length) {
+        store.dispatch('dicom3d/setOperateInfo', qsArr)
+      }
+    },
+    findTargetIndex() {
+      if (this.isTableQuestion && this.operateRowId) {
+        return this.questionMarkInfoList.findIndex(
+          item => item.TableQuestionId === this.operateQuestionId 
+              && item.RowId === this.operateRowId
+      )
+      } else if (this.isTableQuestion) {
+        return this.questionMarkInfoList.findIndex(
+          item => item.TableQuestionId === this.operateQuestionId 
+              && !item.RowId
+        )
+      }
+      return this.questionMarkInfoList.findIndex(
+        item => item.QuestionId === this.operateQuestionId
+      )
+    },
+
+    updateMarkStatus(index, annotation) {
+      const status = { isMarked: true, isSaved: false }
+      if (this.isTableQuestion) {
+        const keyId = index > -1 && this.questionMarkInfoList[index].RowId
+          ? `${this.questionMarkInfoList[index].RowId}_${this.questionMarkInfoList[index].TableQuestionId}`
+          : this.operateRowId
+              ? `${this.operateRowId}_${this.operateQuestionId}`
+              : this.operateQuestionId
+                
+        this.$set(this.questionsMarkStatus, keyId, status)
+        store.dispatch('dicom3d/setOperateInfo', [{
+          MeasureData: annotation,
+          QuestionId: this.operateParentQsId,
+          TableQuestionId: this.operateQuestionId,
+          RowId: this.operateRowId,
+          ImageToolAttribute: this.imageToolAttribute
+        }])
+      } else {
+        this.setAnswerToQuestion(annotation, this.operateQuestionId)
+        this.$set(this.questionsMarkStatus, this.operateQuestionId, status)
+      }
+    },
+
+    updateAnnotationToQuestion(annotation) {
+      const questionMarkInfo = { isMarked: true, isSaved: false }
+      const qsArr = []
+      for (let i = 0; i < this.questionMarkInfoList.length; i++) {
+        const item = this.questionMarkInfoList[i]
+        if (!item.MeasureData || item.MeasureData.annotationUID !== annotation.annotationUID) continue
+        item.MeasureData = annotation
+        const isTableMode = this.isTableQuestion || item.TableQuestionId
+        if (!isTableMode) {
+          this.setAnswerToQuestion(annotation, item.QuestionId)
+          this.$set(this.questionsMarkStatus, item.QuestionId, questionMarkInfo)
+          continue
+        }
+        this.operateParentQsId = item.QuestionId
+        this.operateQuestionId = item.TableQuestionId
+        this.operateRowId ||= item.RowId
+        qsArr.push({ ...item })
+        const keyId = item.RowId ? `${item.RowId}_${item.TableQuestionId}` : item.TableQuestionId;
+        this.$set(this.questionsMarkStatus, keyId, questionMarkInfo);
+      }
+      if (qsArr.length > 0) {
+        store.dispatch('dicom3d/setOperateInfo', qsArr);
+      }
+    },
+    setAnswerToQuestion(annotation, questionId) {
+      if (!questionId || !annotation) return
+      let prop = ''
+      if (!this.imageToolAttribute) {
+        prop = this.questionImageToolAttributeInfo[questionId]
+      } else {
+        prop = this.imageToolAttribute
+      }
+      let val = this.getAnnotationProp(annotation, prop)
+      this.$set(this.questionForm, questionId, val)
+    },
+    getAnnotationProp(annotation, prop) {
+      if (!annotation || !prop) return
+      const referencedImageId = annotation?.metadata?.referencedImageId
+      if (!referencedImageId) return null
+      const cacheKey = `imageId:${referencedImageId}`
+      const cachedStats = annotation.data?.cachedStats?.[cacheKey]
+      const hasProp = cachedStats 
+          && Object.prototype.hasOwnProperty.call(cachedStats, prop)
+      if (!hasProp) return null
+      const value = cachedStats[prop]
+      return value !== null 
+          ? parseFloat(value).toFixed(this.digitPlaces) 
+          : value
+    },
+    unBindAnnotationToQuestion(obj) {
+      const { markTableQuestions = [], questionId } = obj || {}
+      const { questionMarkInfoList, questionsMarkStatus } = this
+      if (!Array.isArray(markTableQuestions) || !questionId || !Array.isArray(questionMarkInfoList)) {
+        return
+      }
+      this.questionMarkInfoList = questionMarkInfoList.filter(item => {
+        const { TableQuestionId, QuestionId } = item || {}
+        if ((TableQuestionId && QuestionId === questionId && markTableQuestions.includes(TableQuestionId))) {
+          if (questionsMarkStatus && questionsMarkStatus[TableQuestionId]) {
+            delete questionsMarkStatus[TableQuestionId]
+          }
+        } else {
+          return
+        }
+      })
+    },
+    // 获取截图
+    getScreenshots(obj) {
+      return new Promise((resolve, reject) => {
+        this.$emit('getCustomScreenshots', obj, resolve) // 将resolve传递给父组件
+      })
+    },
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        const trialId = this.$route.query.trialId
+        const taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+        const subjectId = taskInfo.SubjectId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        return { isSuccess: true, result: result }
+      } catch (e) {
+        console.log(e)
+        return { isSuccess: false, result: e }
+      }
+    },
+    convertBase64ToBlob(imageEditorBase64) {
+      const base64Arr = imageEditorBase64.split(',')
+      let imgtype = ''
+      let base64String = ''
+      if (base64Arr.length > 1) {
+        base64String = base64Arr[1]
+        imgtype = base64Arr[0].substring(
+          base64Arr[0].indexOf(':') + 1,
+          base64Arr[0].indexOf(';')
+        )
+      }
+      const bytes = atob(base64String)
+      const bytesCode = new ArrayBuffer(bytes.length)
+      const byteArray = new Uint8Array(bytesCode)
+      for (let i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+      return new Blob([bytesCode], { type: imgtype })
+    },
+    resetOperateState() {
+      console.log('resetOperateState')
+      this.operateStateEnum = null
+      this.operateQuestionId = ''
+      this.operateRowId = ''
+      this.imageTool = ''
+      this.imageToolAttribute = ''
+    },
     async resetForm() {
       const confirm = await this.$confirm(
         this.$t('trials:dicomReading:message:confirmReset1'),
@@ -335,15 +973,16 @@ export default {
         }
       )
       if (confirm !== 'confirm') return
+      this.$emit('setReadingToolPassive')
       const loading = this.$loading({ fullscreen: true })
       try {
         const res = await resetReadingTask({ visitTaskId: this.visitTaskId })
         if (res.IsSuccess) {
           this.rerender = false
           await this.getQuestionCalculateRelation()
-          await this.getQuestions()
+          await this.getQuestions(true)
           this.$emit('resetAnnotations', this.visitTaskId)
-          this.$nextTick(()=>{
+          this.$nextTick(() => {
             this.rerender = true
           })
         }
@@ -352,7 +991,7 @@ export default {
         loading.close()
         console.log(e)
       }
-    },
+    }
   }
 }
 </script>

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue

@@ -0,0 +1,704 @@
+<template>
+  <div class="criterion-table-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"
+      :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']},
+      ]"
+      :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 || (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="number"
+            @change="(val) => { formItemNumberChange(val, question) }"
+            @blur="questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked ? ()=>{} : handleMarkedQsBlur(questionForm[question.Id], questionForm, question.Id, question) "
+            v-model="questionForm[question.Id]"
+            :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1"
+            style="width: 150px;"
+          >
+            <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})"
+          >
+            测量
+          </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})"
+          >
+            绑定
+          </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})"
+          >
+            查看
+          </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})"
+          >
+            更改
+          </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})"
+          > 
+            移除
+          </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>
+            保存
+          </el-button>
+        </div>
+      </template>
+      <template v-else-if="question.Type === 'number'">
+        <el-input
+          type="number"
+          v-if="question.Type === 'number' && question.DataSource !== 1"
+          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+          @change="((val)=>{formItemNumberChange(val, question)})"
+          @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="number"
+          v-if="question.Type === 'number' && question.DataSource === 1"
+          :disabled="question.DataSource === 1"
+          @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'"
+        action
+        :accept="question.FileType"
+        :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
+        :on-preview="handlePictureCardPreview"
+        :before-upload="handleBeforeUpload"
+        :http-request="uploadScreenshot"
+        list-type="picture-card"
+        :on-remove="handleRemove"
+        :file-list="fileList"
+        :class="{disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
+      >
+        <i slot="default" class="el-icon-plus" />
+        <div slot="file" slot-scope="{file}">
+          <viewer
+            :ref="file.url"
+            :images="[imageUrl]"
+            style="
+              display: flex;
+              align-items: center;
+              justify-content: center;
+              width: 100%;
+              height: 100%;
+            "
+          >
+            <img
+              class="el-upload-list__item-thumbnail"
+              :src="OSSclientConfig.basePath + file.url"
+              crossOrigin="anonymous"
+              alt=""
+              style="max-width: 100%; max-height: 100%"
+            />
+            <span class="el-upload-list__item-actions">
+              <span
+                class="el-upload-list__item-preview"
+                @click="handlePictureCardPreview(file)"
+              >
+                <i class="el-icon-zoom-in" />
+              </span>
+
+              <span
+                v-if="readingTaskState < 2"
+                class="el-upload-list__item-delete"
+                @click="handleRemove(file)"
+              >
+                <i class="el-icon-delete" />
+              </span>
+            </span>
+          </viewer>
+        </div>
+      </el-upload>
+      <el-dialog
+        v-if="question.Type==='upload'"
+        append-to-body
+        :visible.sync="imgVisible"
+        width="600px"
+      >
+        <el-image :src="imageUrl" width="100%">
+          <div slot="placeholder" class="image-slot">
+            {{$t('trials:readingUnit:qsList:message:loading')}}<span class="dot">...</span>
+          </div>
+        </el-image>
+      </el-dialog>
+    </el-form-item>
+  </div>
+</template>
+<script>
+import { submitTableQuestion } from '@/api/trials'
+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') {
+      if (this.questionForm[this.question.Id]) {
+        this.urls = this.questionForm[this.question.Id].split('|')
+        this.fileList = []
+        this.urls.map(url => {
+          this.fileList.push({ name: '', url: `${url}` })
+        })
+      }
+    }
+    if (this.type === 'edit') return
+  },
+  methods: {
+    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) {
+      this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
+    },
+    handleMarkedQsBlur(value, a, b, question) {
+      this.$set(a, b, parseFloat(value).toFixed(this.digitPlaces))
+      question.IsTableQuestion = true
+      // this.$emit('operateImageMarker', {operateStateEnum: 6, question})
+    },
+    handleCalculationBlur(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) {
+      try {
+        if (rules.CalculateQuestionList.length === 0) {
+          return false
+        }
+        let dataArr = []
+        var count = 0
+        var maxList = [], minList = []
+        rules.CalculateQuestionList.forEach((o, i) => {
+          if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
+            if (i !== 0) {
+              switch (rules.CustomCalculateMark) {
+                case 7:
+                  count += parseFloat(this.questionForm[o.TableQuestionId])
+                  if (i === rules.CalculateQuestionList.length - 1) {
+                    num = count / rules.CalculateQuestionList.length
+                  }
+                  break;
+                case 8:
+                  maxList.push(this.questionForm[o.TableQuestionId])
+                  if (i === rules.CalculateQuestionList.length - 1) {
+                    num = Math.max(...maxList)
+                  }
+                  break;
+                case 9:
+                  minList.push(this.questionForm[o.TableQuestionId])
+                  if (i === rules.CalculateQuestionList.length - 1) {
+                    num = Math.min(...minList)
+                  }
+                  break;
+              }
+            } else {
+              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:
+                  num += parseFloat(this.questionForm[o.TableQuestionId])
+                  break;
+                case 2:
+                  num -= parseFloat(this.questionForm[o.TableQuestionId])
+                  break;
+                case 3:
+                  num *= parseFloat(this.questionForm[o.TableQuestionId])
+                  break;
+                case 4:
+                  if (parseFloat(this.questionForm[o.TableQuestionId]) === 0) {
+                    num = 0
+                  } else {
+                    num /= parseFloat(this.questionForm[o.TableQuestionId])
+                  }
+                  break;
+                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 {
+              num = parseFloat(this.questionForm[o.TableQuestionId])
+            }
+          }
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      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) {
+        // 保存表格问题标记
+        // 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 trialId = this.$route.query.trialId
+      var subjectId = this.$route.query.trialId
+      var file = await this.fileToBlob(param.file)
+      const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${param.file.name}`, file)
+      this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), 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) {
+      // 检测文件类型是否符合要求
+      if (this.checkFileSuffix(file.name)) {
+        // this.fileList = []
+        return true
+      } else {
+        let msg = this.$t(
+          "trials:readingUnit:qsList:message:imageFormat"
+        ).replace("xxx", this.question.FileType)
+        this.$alert(msg)
+        return false
+      }
+    },
+    checkFileSuffix(fileName) {
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
+      if (this.question.FileType.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+        return false
+      } else {
+        return true
+      }
+    },
+    // 预览图片
+    handlePictureCardPreview(file) {
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
+      suffix = suffix ? suffix.toLowerCase() : ''
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
+        window.open(this.OSSclientConfig.basePath + file.url,'_blank')
+      }else{
+        this.imageUrl = this.OSSclientConfig.basePath + file.url
+        // this.imgVisible = true
+        this.$refs[file.url].$viewer.show()
+      }
+      
+    },
+    // 删除图片
+    handleRemove(file, fileList) {
+      this.imageUrl = ''
+      this.fileList.splice(this.fileList.findIndex(f => f.url === file.url), 1)
+      this.urls.splice(this.fileList.findIndex(f => f === file.url), 1)
+      this.$emit('setFormItemData', { key:this.question.Id, val: this.urls.length > 0 ? this.urls.join('|') : '', question: this.question })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+
+.criterion-table-form-item{
+  .el-form-item{
+    display: flex;
+    flex-direction: row;
+    align-items: flex-start;
+  }
+  .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>

src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue

@@ -4,56 +4,33 @@
       <div slot="header" class="clearfix report-header">
         <h3 style="margin:0;padding:0;">{{ $t('trials:readingReport:title:eicrf') }}</h3>
         <div style="margin-left:auto">
-          <el-button
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="skipTask">
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
             <!-- 跳过 -->
             {{ $t('trials:readingReport:button:skip') }}
           </el-button>
-          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="getReportInfo">{{ $t('trials:readingReport:button:refresh') }}</el-button>
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="getReportInfo">{{
-          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleSave(true)">{{ $t('common:button:save') }}</el-button>
+            $t('trials:readingReport:button:refresh') }}</el-button>
-          <el-button v-if="readingTaskState<2" type="primary" size="small" @click="handleConfirm">{{ $t('common:button:submit') }}</el-button>
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="handleSave(true)">{{
+            $t('common:button:save') }}</el-button>
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="handleConfirm">{{
+            $t('common:button:submit') }}</el-button>
         </div>
       </div>
       <div style="flex: 1">
-        <el-table
+        <el-table v-if="taskQuestions.length > 0" ref="reportList" v-adaptive="{ bottomOffset: 0 }"
-          v-if="taskQuestions.length > 0"
+          :data="taskQuestions" row-key="Id" border default-expand-all height="100"
-          ref="reportList"
+          :tree-props="{ children: 'Childrens', hasChildren: 'hasChildren' }" size="mini">
-          v-adaptive="{bottomOffset:0}"
+          <el-table-column prop="" label="" show-overflow-tooltip width="350px">
-          :data="taskQuestions"
-          row-key="Id"
-          border
-          default-expand-all
-          height="100"
-          :tree-props="{children: 'Childrens', hasChildren: 'hasChildren'}"
-          size="mini"
-        >
-          <el-table-column
-            prop=""
-            label=""
-            show-overflow-tooltip
-            width="350px"
-          >
             <template slot-scope="scope">
-              <span v-if="scope.row.QuestionName">{{ scope.row.BlindName ? scope.row.QuestionName : scope.row.QuestionName }}</span>
+              <span v-if="scope.row.QuestionName">{{ scope.row.BlindName ? scope.row.QuestionName :
-              <span
+                scope.row.QuestionName }}</span>
-                v-else
+              <span v-else style="font-weight: bold;font-size: 16px;color: #f44336;">
-                style="font-weight: bold;font-size: 16px;color: #f44336;"
-              >
                 {{ scope.row.GroupName }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column v-for="task in visitTaskList" :key="task.VisitTaskId" prop="date" show-overflow-tooltip
-            v-for="task in visitTaskList"
+            width="200px">
-            :key="task.VisitTaskId"
-            prop="date"
-            show-overflow-tooltip
-            width="200px"
-          >
             <template slot="header">
               <div v-if="task.IsCurrentTask">
                 {{ task.BlindName }}
@@ -68,110 +45,115 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <template v-if="readingTaskState<2 && task.VisitTaskId === visitTaskId && (scope.row.Type==='input' || scope.row.Type==='number' || scope.row.Type==='select' || scope.row.Type==='textarea' || scope.row.Type==='radio')">
+              <template
+                v-if="readingTaskState < 2 && task.VisitTaskId === visitTaskId && (scope.row.Type === 'input' || scope.row.Type === 'number' || scope.row.Type === 'select' || scope.row.Type === 'textarea' || scope.row.Type === 'radio')">
                 <!-- 输入框 -->
                 <div>
-                  <template v-if="!((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)" />
+                  <template
+                    v-if="!((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)" />
                   <el-input
-                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type==='input' || scope.row.Type==='textarea') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'input' || scope.row.Type === 'textarea') && !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][scope.row.xfIndex][scope.row.TableQuestionId]"
-                    size="mini"
+                    size="mini" />
-                  />
+                  <span
-                  <span v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type==='input' || scope.row.Type==='textarea')">
+                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'input' || scope.row.Type === 'textarea')">
                     {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
                   </span>
                   <el-input
-                    v-else-if="(scope.row.Type==='input' || scope.row.Type==='textarea') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                    v-else-if="(scope.row.Type === 'input' || scope.row.Type === 'textarea') && !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]"
+                    v-model="questionForm[scope.row.QuestionId]" size="mini" />
-                    size="mini"
+                  <span v-else-if="scope.row.Type === 'input' || scope.row.Type === 'textarea'">
-                  />
-                  <span v-else-if="scope.row.Type==='input' || scope.row.Type==='textarea'">
                     {{ questionForm[scope.row.QuestionId] }}
                   </span>
                   <el-select
-                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (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-else-if="questionForm[scope.row.QuestionId] instanceof Array && (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][scope.row.xfIndex][scope.row.TableQuestionId]"
-                    size="mini"
+                    size="mini" clearable>
-                    clearable
-                  >
                     <template>
-                      <el-option
+                      <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-                        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'">
+                  <span
+                    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
-                    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-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]"
+                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable>
-                    size="mini"
-                    clearable
-                  >
                     <template>
-                      <el-option
+                      <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-                        v-for="val in scope.row.TypeValue.split('|')"
-                        :key="val"
-                        :label="val"
-                        :value="val"
-                      />
                     </template>
                   </el-select>
-                  <span v-else-if="scope.row.Type==='select' || scope.row.Type==='radio'">
+                  <span v-else-if="scope.row.Type === 'select' || scope.row.Type === 'radio'">
                     {{ questionForm[scope.row.QuestionId] }}
                   </span>
                   <el-input
-                    v-else-if="scope.row.DataSource !== 1 && questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type==='number' && (scope.row.xfIndex || scope.row.xfIndex === 0) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                    v-else-if="scope.row.DataSource !== 1 && questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'number' && (scope.row.xfIndex || scope.row.xfIndex === 0) && !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][scope.row.xfIndex][scope.row.TableQuestionId]"
-                    :disabled="scope.row.DataSource === 1"
+                    :disabled="scope.row.DataSource === 1" size="mini"
-                    size="mini"
                     @blur="limitBlur(questionForm[scope.row.QuestionId][scope.row.xfIndex], scope.row.TableQuestionId, scope.row.ValueType)"
-                    @focus="() => {questionId = scope.row.QuestionId}"
+                    @focus="() => { questionId = scope.row.QuestionId }">
-                  >
+                    <template v-if="scope.row.Unit !== 0" slot="append">{{ scope.row.Unit !== 4 ? $fd('ValueUnit',
-                    <template v-if="scope.row.Unit !== 0" slot="append">{{ scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit }}</template>
+                      scope.row.Unit) : scope.row.CustomUnit }}</template>
                     <template v-else-if="scope.row.ValueType === 2" slot="append">%</template>
                   </el-input>
-                  <span v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type==='number' && (scope.row.xfIndex || scope.row.xfIndex === 0)">
+                  <span
+                    v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'number' && (scope.row.xfIndex || scope.row.xfIndex === 0)">
                     <template v-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
-                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]))? questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]:`${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]} ${scope.row.Unit !== 4 ? $fd('ValueUnit',scope.row.Unit) : scope.row.CustomUnit}` }}
+                      {{
+                        isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]))
+                          ?
+                          questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] :
+                          `${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]}
+                      ${scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit}` }}
                     </template>
                     <template v-else-if="scope.row.ValueType === 2">
-                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId])) ? questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]:`${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]} %` }}
+                      {{
+                        isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]))
+                          ?
+                          questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] :
+                          `${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]}
+                      %` }}
                     </template>
                     <template v-else>
-                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId])) ? questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]:`${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]}` }}
+                      {{
+                        isNaN(parseInt(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]))
+                          ?
+                          questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] :
+                          `${questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]}`
+                      }}
                     </template>
                   </span>
                   <el-input
-                    v-else-if="scope.row.DataSource !== 1 && scope.row.Type==='number' && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                    v-else-if="scope.row.DataSource !== 1 && scope.row.Type === 'number' && !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]"
+                    v-model="questionForm[scope.row.QuestionId]" :disabled="scope.row.DataSource === 1" size="mini"
-                    :disabled="scope.row.DataSource === 1"
-                    size="mini"
                     @blur="limitBlur(questionForm, scope.row.QuestionId, scope.row.ValueType)"
-                    @focus="() => {questionId = scope.row.QuestionId}"
+                    @focus="() => { questionId = scope.row.QuestionId }">
-                  >
+                    <template v-if="scope.row.Unit !== 0" slot="append">{{ scope.row.Unit !== 4 ? $fd('ValueUnit',
-                    <template v-if="scope.row.Unit !== 0" slot="append">{{ scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit }}</template>
+                      scope.row.Unit) : scope.row.CustomUnit }}</template>
                     <template v-else-if="scope.row.ValueType === 2" slot="append">%</template>
                   </el-input>
-                  <span v-else-if="scope.row.Type==='number'">
+                  <span v-else-if="scope.row.Type === 'number'">
                     <template v-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
-                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId]))? questionForm[scope.row.QuestionId]:`${questionForm[scope.row.QuestionId]} ${scope.row.Unit !== 4 ? $fd('ValueUnit',scope.row.Unit) : scope.row.CustomUnit}` }}
+                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId])) ?
+                        questionForm[scope.row.QuestionId] : `${questionForm[scope.row.QuestionId]} ${scope.row.Unit !== 4
+                          ?
+                          $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit}` }}
                     </template>
                     <template v-else-if="scope.row.ValueType === 2">
-                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId])) ? questionForm[scope.row.QuestionId]:`${questionForm[scope.row.QuestionId]} %` }}
+                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId])) ?
+                        questionForm[scope.row.QuestionId] : `${questionForm[scope.row.QuestionId]} %` }}
                     </template>
                     <template v-else>
-                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId])) ? questionForm[scope.row.QuestionId] : questionForm[scope.row.QuestionId] }}
+                      {{ isNaN(parseInt(questionForm[scope.row.QuestionId])) ? questionForm[scope.row.QuestionId] :
+                        questionForm[scope.row.QuestionId] }}
                     </template>
                   </span>
                 </div>
               </template>
-              <template v-else-if="scope.row.Type==='upload' && scope.row.Answers[task.VisitTaskId]">
+              <template v-else-if="scope.row.Type === 'upload' && scope.row.Answers[task.VisitTaskId]">
-                <span v-for="(url,index) in scope.row.Answers[task.VisitTaskId].split('|')" :key="url" style="margin-left: 5px;">
+                <span v-for="(url, index) in scope.row.Answers[task.VisitTaskId].split('|')" :key="url"
+                  style="margin-left: 5px;">
                   <el-button v-if="scope.row.Answers[task.VisitTaskId]" type="text" @click="preview(url)">
                     {{ `${$t('trials:noneDicom:title:attachment')}${index + 1}` }}
                   </el-button>
@@ -181,14 +163,22 @@
                 {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
               </template>
               <template v-else-if="criterionType === 10">
-                {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]}` }}
+                {{
+                  isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ? scope.row.Answers[task.VisitTaskId] :
+                    `${scope.row.Answers[task.VisitTaskId]}`
+                }}
               </template>
-              <template v-else-if="!((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)" />
+              <template
+                v-else-if="!((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)" />
               <template v-else-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
-                {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]} ${scope.row.Unit !== 4 ? $fd('ValueUnit',scope.row.Unit) : scope.row.CustomUnit}` }}
+                {{
+                  isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ? scope.row.Answers[task.VisitTaskId] :
+                    `${scope.row.Answers[task.VisitTaskId]}
+                ${scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit}` }}
               </template>
               <template v-else-if="scope.row.ValueType === 2">
-                {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ? scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]} %` }}
+                {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ?
+                  scope.row.Answers[task.VisitTaskId] : `${scope.row.Answers[task.VisitTaskId]} %` }}
               </template>
               <template v-else-if="scope.row.Answers && scope.row.Answers.hasOwnProperty(task.VisitTaskId)">
                 {{ scope.row.Answers[task.VisitTaskId] }}
@@ -200,38 +190,20 @@
     </el-card>
 
     <!-- 签名框 -->
-    <el-dialog
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-      v-if="signVisible"
+      custom-class="base-dialog-wrapper">
-      :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>
 
     <!-- 预览文件 -->
-    <el-dialog
+    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
-      v-if="previewVisible"
+      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-      :visible.sync="previewVisible"
+      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-      :title="$t('common:button:preview')"
+        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
-      :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>
@@ -655,7 +627,7 @@ export default {
                 window.location.reload()
               })
               .catch(action => {
-              // changeURLStatic('visitTaskId', this.visitTaskId)
+                // changeURLStatic('visitTaskId', this.visitTaskId)
               })
           }
         }
@@ -760,94 +732,116 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.report-wrapper{
+.report-wrapper {
 
   height: 100%;
   // background-color: #fff;
   background-color: #000;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     // background: #d0d0d0;
   }
-  .report-header{
+
+  .report-header {
     display: flex;
   }
-  .el-card{
+
+  .el-card {
     background-color: #000;
     color: #ffffff;
-    border:none;
-  }
-  ::v-deep .el-table--border th.gutter:last-of-type{
     border: none;
   }
-  ::v-deep .el-table, .el-table__expanded-cell {
-    background-color: #000;
-    color: #fff;
-    border-color:#444444;
-  }
 
-  ::v-deep .el-table th, .el-table tr {
+  ::v-deep .el-table--border th.gutter:last-of-type {
-    background-color: #000;
-    color: #fff;
-    border-color:#444444;
-  }
-  ::v-deep .el-table__body tr > td{
-    background-color:#000 !important;
-    color: #fff;
-    border-color:#444444;
-  }
-  ::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-card__header{
+
+  ::v-deep .el-table,
+  .el-table__expanded-cell {
+    background-color: #000;
+    color: #fff;
+    border-color: #444444;
+  }
+
+  ::v-deep .el-table th,
+  .el-table tr {
+    background-color: #000;
+    color: #fff;
+    border-color: #444444;
+  }
+
+  ::v-deep .el-table__body tr>td {
+    background-color: #000 !important;
+    color: #fff;
+    border-color: #444444;
+  }
+
+  ::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-card__header {
     border: none;
     padding: 10px;
   }
-  ::v-deep .el-upload-list--picture-card .el-upload-list__item{
+
+  ::v-deep .el-upload-list--picture-card .el-upload-list__item {
     width: 30px;
     height: 30px;
   }
-  ::v-deep .el-upload--picture-card{
+
+  ::v-deep .el-upload--picture-card {
     width: 30px;
     height: 30px;
     line-height: 40px;
   }
-  ::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
     }
   }
 }
-::v-deep .el-switch__label{
+
-  color:#fff;
+::v-deep .el-switch__label {
+  color: #fff;
 }
-::v-deep .el-switch__label.is-active{
+
+::v-deep .el-switch__label.is-active {
   color: #428bca;
 }
-.uploadWrapper{
+
+.uploadWrapper {
   display: flex;
   flex-direction: column;
   align-items: flex-start;

src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js

@@ -234,6 +234,7 @@ const config = {
       'name': '直径测量工具',
       'icon': 'length',
       'toolName': 'Length',
+      'props': ['length'],
       'i18nKey': 'trials:reading:button:length',
       'isDisabled': false,
       'disabledReason': ''
@@ -242,6 +243,7 @@ const config = {
       'name': '长短径测量工具',
       'icon': 'bidirection',
       'toolName': 'Bidirectional',
+      'props': ['length', 'width'],
       'i18nKey': 'trials:reading:button:bidirectional',
       'isDisabled': false,
       'disabledReason': ''
@@ -250,6 +252,7 @@ const config = {
       'name': '矩形工具',
       'icon': 'rectangle',
       'toolName': 'RectangleROI',
+      'props': ['area', 'mean', 'max', 'stdDev'],
       'i18nKey': 'trials:reading:button:rectangle',
       'isDisabled': false,
       'disabledReason': ''
@@ -258,6 +261,7 @@ const config = {
       'name': '箭头工具',
       'icon': 'arrow',
       'toolName': 'ArrowAnnotate',
+      'props': [],
       'i18nKey': 'trials:reading:button:arrowAnnotate',
       'isDisabled': false,
       'disabledReason': ''
@@ -266,9 +270,28 @@ 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': ''
     }
   ]
 }

src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue

@@ -45,7 +45,7 @@
           <el-input 
             v-model="scope.row.CDISCCode"
             size="mini"
-            :disabled="scope.row.HasChildren || scope.row.IsTableQuestion"
+            :disabled="scope.row.HasChildren || (scope.row.IsTableQuestion && exportInfo.CriterionType !== 0)"
             v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-input>
@@ -68,7 +68,7 @@ export default {
   data() {
     return {
       loading: false,
-      exportInfo: []
+      exportInfo: {}
     }
   },
   mounted() {
@@ -152,7 +152,8 @@ 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)) {
+      } else if (item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0))) {
+        // else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion))
         // CDISC导出不能配置表格问题
         return true
       } else if (item.Code === 2 && row.HasChildren) {

src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue

@@ -1038,26 +1038,26 @@ export default {
       if (area) {
         const areaLine = isEmptyArea
           ? `Area: Oblique not supported`
-          : `Area: ${ps ? parseFloat(area * ps * ps).toFixed(this.digitPlaces) : parseFloat(area).toFixed(this.digitPlaces)} ${ps ? 'mm' + '\xb2' : areaUnit}`
+          : `Area: ${ps ? this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces) : this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${ps ? 'mm' + '\xb2' : areaUnit}`
         textLines.push(areaLine)
       }
       if (mean) {
-        textLines.push(`Mean: ${parseFloat(mean).toFixed(this.digitPlaces)} ${modalityUnit}`)
+        textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
       }
       
-      if (Number.isFinite(max)) {
+      if (max) {
-        textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
+        textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
       }
 
       if (stdDev) {
-        textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
+        textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
       }
 
       if (perimeter) {
         if (ps) {
-          textLines.push(`Perimeter: ${parseFloat(perimeter * ps).toFixed(this.digitPlaces)} mm`)
+          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter * ps), this.digitPlaces)} mm`)
         } else {
-          textLines.push(`Perimeter: ${parseFloat(perimeter).toFixed(this.digitPlaces)} ${unit}`)
+          textLines.push(`Perimeter: ${this.reRound(csUtils.roundNumber(perimeter), this.digitPlaces)} ${unit}`)
         }
       }
 
@@ -1084,17 +1084,33 @@ export default {
         ps = parseFloat(this.psArr[i].PS).toFixed(3)
       }
       if (ps) {
-        textLines.push(`Area: ${parseFloat(area * ps * ps).toFixed(this.digitPlaces)} ${'mm' + '\xb2'}`)
+        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area * ps * ps), this.digitPlaces)} ${'mm' + '\xb2'}`)
       } else {
-        textLines.push(`Area: ${parseFloat(area).toFixed(this.digitPlaces)} ${areaUnit}`)
+        textLines.push(`Area: ${this.reRound(csUtils.roundNumber(area), this.digitPlaces)} ${areaUnit}`)
       }
-
+      textLines.push(`Mean: ${this.reRound(csUtils.roundNumber(mean), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Mean: ${csUtils.roundNumber(mean)} ${modalityUnit}`)
+      textLines.push(`Max: ${this.reRound(csUtils.roundNumber(max), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Max: ${csUtils.roundNumber(max)} ${modalityUnit}`)
+      textLines.push(`Std Dev: ${this.reRound(csUtils.roundNumber(stdDev), this.digitPlaces)} ${modalityUnit}`)
-      textLines.push(`Std Dev: ${csUtils.roundNumber(stdDev)} ${modalityUnit}`)
 
       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() {

src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue

@@ -1,288 +1,213 @@
 <template>
-  <el-form
+    <el-form ref="attachmentFrom" v-loading="loading" :model="form" label-width="190px" size="small" :rules="rules"
-    ref="trialAttachmentFrom"
+        class="upload-temporary-file">
-    v-loading="loading"
+        <div class="base-dialog-body">
-    :model="form"
+            <el-form-item :label="$t('trials:attachment:form:FileName')" prop="Name">
-    label-width="240px"
+                <el-input v-model="form.Name" clearable></el-input>
-    size="small"
+            </el-form-item>
-    :rules="rules"
+            <el-form-item :label="$t('trials:attachment:form:OffLine')" prop="OffLine">
-    class="upload-temporary-file"
+                <el-switch v-model="form.OffLine" :active-value="true" :inactive-value="false"
-  >
+                    :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
-    <div class="base-dialog-body">
+                </el-switch>
-      <!-- 文件类型 -->
+            </el-form-item>
-      <el-form-item :label="$t('trials:attachment:table:fileType')" prop="FileTypeId">
+            <el-form-item :label="$t('trials:attachment:form:File')">
-        <el-select
+                <div class="upload-container">
-          v-model="form.FileTypeId"
+                    <el-upload class="upload-demo" action :accept="this.accept.join(',')" :before-upload="beforeUpload"
-          style="width:100%;"
+                        :http-request="handleUploadFile" :on-preview="handlePreview" :on-remove="handleRemoveFile"
-          size="small"
+                        :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-option
+                            }}</el-button>
-            v-for="item of dictionaryList.Trial_Document"
+                        <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
-            :key="item.Id"
+                            ({{ $t('trials:signature:label:type').replace("xxx", this.accept.join(", ")) }})
-            :label="item.Value"
+                        </span>
-            :value="item.Id"
+                    </el-upload>
-          />
+                </div>
-        </el-select>
+            </el-form-item>
-      </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>
-      </el-form-item>
+        <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
-      <!-- 需要签署的用户类型 -->
+            <el-form-item style="text-align: right">
-      <el-form-item :label="$t('trials:attachment:table:userType')" prop="NeedConfirmedUserTypeIdList">
+                <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || form.Name === ''"
-        <el-select
+                    :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
-          v-model="form.NeedConfirmedUserTypeIdList"
+            </el-form-item>
-          style="width:100%;"
+        </div>
-          multiple
+    </el-form>
-        >
-          <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 { addOrUpdateTrialDocument, uploadTrialDoc, getTrialUserTypeList } from '@/api/trials'
+import { addOrUpdateTrialDocumentAttachment } from '@/api/trials'
-import { getBasicDataSelects } from '@/api/dictionary/dictionary'
 export default {
-  name: 'TrialAttachmentFrom',
+    props: {
-  props: {
+        data: {
-    data: {
+            type: Object,
-      type: Object,
+            default() {
-      default() { return {} }
+                return {}
-    }
+            },
-  },
+        },
-
+        TrialDocumentId: {
-  data() {
+            type: String,
-    return {
+            default: ''
-      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
-        })
-      })
     },
-    async initForm() {
+
-      this.loading = true
+    data() {
-      await this.getDicData()
+        return {
-      await this.getUserType()
+            form: {
-      if (Object.keys(this.data).length > 0) {
+                Id: '',
-        if (this.data.Path) {
+                Name: null,
-          this.fileList = [
+                FileFormat: null,
-            {
+                FileName: null,
-              name: this.data.Name,
+                FilePath: null,
-              path: this.data.Path,
+                FileSize: null,
-              url: this.data.Path,
+                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"]
+        }
+    },
+    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,
+                    },
+                ]
             }
-          ]
+            this.loading = false
-        }
+        },
-        this.form.Id = this.data.Id
+        beforeUpload(file) {
-        this.form.FileTypeId = this.data.FileTypeId
+            // 检测文件类型是否符合要求
-        this.form.Name = this.data.Name
+            if (this.checkFileSuffix(file.name)) {
-        this.form.Path = this.data.Path
+                this.fileList = []
-        this.form.IsDeleted = this.data.IsDeleted
+                return true
-        this.form.Description = this.data.Description
+            } else {
-        this.form.SignViewMinimumMinutes = this.data.SignViewMinimumMinutes
+                this.$alert(this.$t('trials:signature:label:type').replace("xxx", this.accept.join(", ")))
-      }
-      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
+                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
+            }
+        },
     },
-    // 上传文件
-    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-temporary-file {
-  .upload-container .el-upload--text {
+    .upload-container .el-upload--text {
-    border: none;
+        border: none;
-    width: 80px;
+        width: 80px;
-    height: 40px;
+        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>

src/views/trials/trials-panel/setting/attachment/components/attachmentList.vue

@@ -0,0 +1,265 @@
+<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>

src/views/trials/trials-panel/setting/attachment/components/templateForm.vue

@@ -0,0 +1,257 @@
+<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>

src/views/trials/trials-panel/setting/attachment/index.vue

@@ -5,17 +5,8 @@
       <el-form :inline="true" class="base-search-form">
         <!-- 文件类型 -->
         <el-form-item :label="$t('trials:attachment:table:fileType')">
-          <el-select
+          <el-select v-model="searchData.FileTypeId" clearable style="width: 150px">
-            v-model="searchData.FileTypeId"
+            <el-option v-for="item of $d.Trial_Document" :key="item.id" :label="item.label" :value="item.id" />
-            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>
         <!-- 文件名称 -->
@@ -24,40 +15,20 @@
         </el-form-item>
         <!-- 培训状态 -->
         <el-form-item :label="$t('trials:attachment:table:isDeleted')">
-          <el-select
+          <el-select clearable v-model="searchData.IsDeleted" style="width: 150px">
-            clearable
+            <el-option v-for="item of $d.TrainingStatus" :key="item.value" :label="item.label" :value="item.value" />
-            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
+          <el-select v-model="searchData.UserTypeId" clearable style="width: 100%">
-            v-model="searchData.UserTypeId"
+            <el-option v-for="item of userTypeOptions" v-show="item.UserTypeEnum !== 1 &&
-            clearable
+              item.UserTypeEnum !== 8 &&
-            style="width: 100%"
+              item.UserTypeEnum !== 20 &&
-          >
+              item.UserTypeEnum !== 26 &&
-            <el-option
+              item.UserTypeEnum !== 27 &&
-              v-for="item of userTypeOptions"
+              item.UserTypeEnum !== 31
-              v-show="
+              " :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
-                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>
@@ -69,71 +40,52 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            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
+        <el-button v-hasPermi="['trials:trials-panel:setting:attachment:add']" type="primary" icon="el-icon-plus"
-          v-hasPermi="['trials:trials-panel:setting:attachment:add']"
+          @click="handleAdd">
-          type="primary"
-          icon="el-icon-plus"
-          @click="handleAdd"
-        >
           {{ $t('common:button:add') }}
         </el-button>
       </span>
     </div>
 
     <!-- 系统文件列表 -->
-    <el-table
+    <el-table ref="attachmentList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe
-      ref="attachmentList"
+      height="100" @sort-change="handleSortByColumn">
-      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
+      <el-table-column prop="FileType" :label="$t('trials:attachment:table:fileType')" show-overflow-tooltip
-        prop="FileType"
+        sortable="custom" min-width="160" />
-        :label="$t('trials:attachment:table:fileType')"
-        show-overflow-tooltip
-        sortable="custom"
-        min-width="160"
-      />
       <!-- 文件名称 -->
-      <el-table-column
+      <el-table-column prop="Name" :label="$t('trials:attachment:table:fileName')" show-overflow-tooltip
-        prop="Name"
+        sortable="custom" min-width="160" />
-        :label="$t('trials:attachment:table:fileName')"
+      <!--附件-->
-        show-overflow-tooltip
+      <el-table-column prop="AttachmentCount" :label="$t('trials:attachment:table:AttachmentCount')"
-        sortable="custom"
+        show-overflow-tooltip sortable="custom" min-width="150px">
-        min-width="160"
+        <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
+      <el-table-column prop="SignViewMinimumMinutes" :label="$t('trials:attachment:table:min')" show-overflow-tooltip
-        prop="SignViewMinimumMinutes"
+        sortable="custom" min-width="150" />
-        :label="$t('trials:attachment:table:min')"
+      <!-- 已有成员(分钟) -->
-        show-overflow-tooltip
+      <el-table-column prop="CurrentStaffTrainDays" :label="$t('trials:attachment:table:CurrentStaffTrainDays')"
-        sortable="custom"
+        show-overflow-tooltip sortable="custom" min-width="150" />
-        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
+      <el-table-column prop="IsDeleted" :label="$t('trials:attachment:table:isDeleted')" show-overflow-tooltip
-        prop="IsDeleted"
+        sortable="custom" min-width="100">
-        :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)
@@ -143,13 +95,18 @@
           }}</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
+      <el-table-column prop="NeedConfirmedUserTypes" :label="$t('trials:attachment:table:userType')"
-        prop="NeedConfirmedUserTypes"
+        show-overflow-tooltip min-width="100">
-        :label="$t('trials:attachment:table:userType')"
-        show-overflow-tooltip
-        min-width="100"
-      >
         <template slot-scope="scope">
           {{
             scope.row.NeedConfirmedUserTypes
@@ -174,91 +131,52 @@
         min-width="160"
       /> -->
       <!--创建时间-->
-      <el-table-column
+      <el-table-column prop="CreateTime" :label="$t('trials:attachment:table:CreateTime')" show-overflow-tooltip
-        prop="CreateTime"
+        sortable="custom" min-width="160" />
-        :label="$t('trials:attachment:table:CreateTime')"
+      <el-table-column :label="$t('common:action:action')" min-width="200" fixed="right">
-        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
+          <el-button icon="el-icon-view" circle :title="$t('trials:attachment:action:preview')"
-            icon="el-icon-view"
+            @click="handlePreview(scope.row)" />
-            circle
-            :title="$t('trials:attachment:action:preview')"
-            @click="handlePreview(scope.row)"
-          />
           <!-- 编辑 -->
-          <el-button
+          <el-button v-hasPermi="['trials:trials-panel:setting:attachment:edit']" circle
-            v-hasPermi="['trials:trials-panel:setting:attachment:edit']"
+            :title="$t('trials:attachment:action:edit')" icon="el-icon-edit-outline"
-            circle
+            :disabled="scope.row.IsSomeUserSigned || scope.row.IsDeleted" @click="handleEdit(scope.row)" />
-            :title="$t('trials:attachment:action:edit')"
+          <el-button :disabled="scope.row.IsPublish" circle icon="el-icon-position"
-            icon="el-icon-edit-outline"
+            :title="$t('dictionary:signature:button:publish')" @click="publishTrialDocument([scope.row])">
-            :disabled="scope.row.IsSomeUserSigned || scope.row.IsDeleted"
+          </el-button>
-            @click="handleEdit(scope.row)"
-          />
           <!-- 废除 -->
-          <el-button
+          <el-button v-hasPermi="['trials:trials-panel:setting:attachment:abolish']" :disabled="scope.row.IsDeleted"
-            v-hasPermi="['trials:trials-panel:setting:attachment:abolish']"
+            circle :title="$t('trials:attachment:action:apolish')" icon="el-icon-delete"
-            :disabled="scope.row.IsDeleted"
+            @click="handleRepeal(scope.row)" />
-            circle
-            :title="$t('trials:attachment:action:apolish')"
-            icon="el-icon-delete"
-            @click="handleRepeal(scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页组件 -->
-    <pagination
+    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      class="page"
+      @pagination="getList" />
-      :total="total"
-      :page.sync="searchData.PageIndex"
-      :limit.sync="searchData.PageSize"
-      @pagination="getList"
-    />
 
     <!-- 新增/编辑 -->
-    <el-dialog
+    <el-dialog v-if="editVisible" :visible.sync="editVisible" :close-on-click-modal="false" :title="title" width="800px"
-      v-if="editVisible"
+      custom-class="base-dialog-wrapper">
-      :visible.sync="editVisible"
+      <templateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
-      :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" />
     <!-- 预览文件 -->
-    <el-dialog
+    <attachmentPreview :SystemDocumentId="TrialDocumentId" :isTrial="true" :visible.sync="perview_visible"
-      v-if="previewVisible"
+      :isView="true" v-if="perview_visible" />
-      :visible.sync="previewVisible"
+    <!-- 预览文件 -->
-      :title="$t('trials:attachment:dialogTitle:preview')"
+    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('trials:attachment:dialogTitle:preview')"
-      :fullscreen="true"
+      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-      append-to-body
+      <span style="position: fixed; left: 16px; top: 45px;cursor: pointer;font-size: 18px;color:#409EFF"
-      custom-class="base-dialog-wrapper"
+        @click.stop="openAttachment(currentRow)" v-if="currentRow.AttachmentCount">{{
-    >
+          $t('trials:attachment:table:AttachmentCount') }} ({{
-      <div
+          currentRow.AttachmentCount }})</span>
-        class="base-modal-body"
+      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-        style="border: 2px solid #ccc; padding: 10px"
+        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
-      >
-        <PreviewFile
-          v-if="previewVisible"
-          :file-path="currentPath"
-          :file-type="currentType"
-        />
       </div>
     </el-dialog>
   </box-content>
@@ -268,11 +186,14 @@ import {
   getTrialDocumentList,
   userAbandonDoc,
   getTrialUserTypeList,
+  publishTrialDocument
 } from '@/api/trials'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
-import AttachmentForm from './components/attachmentForm'
+import templateForm from './components/templateForm'
 import PreviewFile from './components/previewFile'
+import attachmentList from './components/attachmentList'
+import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
 const searchDataDefault = () => {
   return {
     FileTypeId: '',
@@ -287,7 +208,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialAttachmentList',
-  components: { BoxContent, Pagination, AttachmentForm, PreviewFile },
+  components: { BoxContent, Pagination, templateForm, PreviewFile, attachmentList, attachmentPreview },
   dicts: ['Trial_Document'],
   data() {
     return {
@@ -303,6 +224,13 @@ export default {
       currentType: '',
       trialId: '',
       userTypeOptions: [],
+      TrialDocumentId: null,
+      perview_visible: false,
+      config: {
+        visible: false,
+        title: this.$t('dictionary:signature:attachmentList:title'),
+        width: '800px',
+      },
     }
   },
   mounted() {
@@ -311,6 +239,39 @@ 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
@@ -361,6 +322,7 @@ export default {
       this.currentType = row.Name
         ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase()
         : ''
+      this.currentRow = Object.assign({}, row)
       this.previewVisible = true
     },
     // 编辑
@@ -391,7 +353,7 @@ export default {
               this.loading = false
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 关闭编辑弹窗
     closeDialog() {

src/views/trials/trials-panel/setting/email-manage/components/DefaultQS.vue

@@ -5,81 +5,34 @@
     <div class="search">
       <el-form :inline="true" size="mini" class="base-search-form">
         <!-- 审核问题 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:emailManageCfg:title:businessScenario')">
-          :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"
-          <el-select
+              :value="item.value" />
-            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
+        <el-form-item style="margin-bottom: 10px" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')">
-          style="margin-bottom: 10px"
+          <el-select v-model="searchData.BusinessModuleEnum" clearable style="width: 120px">
-          :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
+            <el-option v-for="item of $d.BusinessModule" :key="item.id" :label="item.label" :value="item.value" />
-        >
-          <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
+        <el-form-item v-if="isDistinguishCriteria" style="margin-bottom: 10px"
-          v-if="isDistinguishCriteria"
+          :label="$t('trials:reviewTrack:table:criterionName')">
-          style="margin-bottom: 10px"
+          <el-select v-model="searchData.CriterionTypeEnum" clearable style="width: 120px">
-          :label="$t('trials:reviewTrack:table:criterionName')"
+            <el-option v-for="item of $d.CriterionType" :key="item.id" :label="item.label" :value="item.value" />
-        >
-          <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
+        <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
-          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          prop="ToUserTypeList"
-        >
           <el-select v-model="searchData.ToUserType" clearable class="mr">
-            <el-option
+            <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              v-for="item of UserTypeList"
+              :value="item.value" />
-              :key="`ToUserTypeList${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" prop="EmailUrgentEnum"
-          :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+          v-if="!isDistinguishCriteria">
-          prop="EmailUrgentEnum"
-          v-if="!isDistinguishCriteria"
-        >
           <el-select v-model="searchData.EmailUrgentEnum" clearable class="mr">
-            <el-option
+            <el-option v-for="item of $d.EmailUrgent" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              v-for="item of $d.EmailUrgent"
+              :value="item.value" />
-              :key="`ToUserTypeList${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -89,40 +42,19 @@
           <el-button type="primary" @click="handleReset">{{
             $t('common:button:reset')
           }}</el-button>
-          <el-button
+          <el-button type="primary" @click="handleAdd" class="el-icon-plus" v-if="!isDistinguishCriteria && isShow">{{
-            type="primary"
+            $t('trials:reviewTrack:button:addDefault') }}</el-button>
-            @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
+        <el-button type="primary" size="mini" :disabled="selectArr.length <= 0" @click="handleSubmit">
-          type="primary"
-          size="mini"
-          :disabled="selectArr.length <= 0"
-          @click="handleSubmit"
-        >
           {{ $t('common:button:submit') }}
         </el-button>
       </span>
     </div>
 
-    <el-table
+    <el-table :data="list" stripe size="small" height="400" @selection-change="handleSelectChange">
-      :data="list"
+      <el-table-column type="selection" align="left" :selectable="selectable" width="45" />
-      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
@@ -132,155 +64,89 @@
         show-overflow-tooltip
         width="100"
       /> -->
-      <el-table-column
+      <el-table-column v-if="isDistinguishCriteria" prop="CriterionTypeList"
-        v-if="isDistinguishCriteria"
+        :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" width="120">
-        prop="TrialReadingCriterionId"
-        :label="$t('trials:reviewTrack:table:criterionName')"
-        show-overflow-tooltip
-        sortable="custom"
-        width="120"
-      >
         <template slot-scope="scope">
-          {{ $fd('CriterionType', scope.row.CriterionTypeEnum) }}
+          {{scope.row.CriterionTypeList && scope.row.CriterionTypeList.length > 0 ?
+            scope.row.CriterionTypeList.map(item => { return $fd('CriterionType', item) }
+            ).join(', ') : ''}}
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column v-if="$i18n.locale === 'zh'" prop="EmailTopicCN"
-        v-if="$i18n.locale === 'zh'"
+        :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom" show-overflow-tooltip width="160" />
-        prop="EmailTopicCN"
+      <el-table-column v-else prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')" sortable="custom"
-        :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+        show-overflow-tooltip width="160" />
-        sortable="custom"
+      <el-table-column prop="BusinessModuleEnum" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
-        show-overflow-tooltip
+        sortable="custom" show-overflow-tooltip width="100">
-        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
+      <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
-        prop="BusinessScenarioEnum"
+        sortable="custom" show-overflow-tooltip width="130">
-        :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
+      <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-        prop="ToUserTypeList"
+        show-overflow-tooltip width="100">
-        :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
+      <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-        prop="CopyUserTypeList"
+        show-overflow-tooltip width="100">
-        :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
+      <el-table-column :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" sortable="custom"
-        :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+        show-overflow-tooltip width="100">
-        sortable="custom"
-        show-overflow-tooltip
-        width="100"
-      >
         <template slot-scope="scope">
           {{ $fd('EmailUrgent', scope.row.EmailUrgentEnum) }}
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column prop="EmailCron" :label="$t('trials:emailManageCfg:table:EmailCron')" sortable="custom"
-        prop="EmailCron"
+        show-overflow-tooltip width="160">
-        :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
+      <el-table-column v-if="$i18n.locale === 'zh'" prop="AttachNameCN"
-        v-if="$i18n.locale === 'zh'"
+        :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip width="100">
-        prop="AttachNameCN"
-        :label="$t('trials:emailManageCfg:title:fileName')"
-        show-overflow-tooltip
-        width="100"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="scope.row.AttachCNPath" type="text" @click="handlePreview(scope.row.AttachCNPath)">
-            v-if="scope.row.AttachCNPath"
-            type="text"
-            @click="handlePreview(scope.row.AttachCNPath)"
-          >
             {{ scope.row.AttachNameCN }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 附件 -->
-      <el-table-column
+      <el-table-column v-else prop="AttachName" :label="$t('trials:emailManageCfg:title:fileName')"
-        v-else
+        show-overflow-tooltip width="100">
-        prop="AttachName"
-        :label="$t('trials:emailManageCfg:title:fileName')"
-        show-overflow-tooltip
-        width="100"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="scope.row.AttachPath" type="text" @click="handlePreview(scope.row.AttachPath)">
-            v-if="scope.row.AttachPath"
-            type="text"
-            @click="handlePreview(scope.row.AttachPath)"
-          >
             {{ scope.row.AttachName }}
           </el-button>
         </template>
       </el-table-column>
       <!-- 是否需要回执 -->
-      <el-table-column
+      <el-table-column prop="IsReturnRequired" :label="$t('trials:emailManageCfg:title:isReturnRequired')"
-        prop="IsReturnRequired"
+        show-overflow-tooltip sortable="custom" width="140">
-        :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) }}
@@ -291,13 +157,8 @@
         </template>
       </el-table-column>
       <!-- 是否自动发送 -->
-      <el-table-column
+      <el-table-column prop="IsAutoSend" :label="$t('trials:emailManageCfg:title:isAutoSend')" show-overflow-tooltip
-        prop="IsAutoSend"
+        sortable="custom" width="160">
-        :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) }}
@@ -307,13 +168,8 @@
           }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column prop="IsEnable" :label="$t('trials:emailManageCfg:table:IsEnable')" show-overflow-tooltip
-        prop="IsEnable"
+        sortable="custom" width="160">
-        :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) }}
@@ -324,29 +180,14 @@
         </template>
       </el-table-column>
       <!-- 更新时间 -->
-      <el-table-column
+      <el-table-column prop="UpdateTime" :label="$t('trials:emailManageCfg:title:updateTime')" show-overflow-tooltip
-        prop="UpdateTime"
+        sortable="custom" width="160" />
-        :label="$t('trials:emailManageCfg:title:updateTime')"
-        show-overflow-tooltip
-        sortable="custom"
-        width="160"
-      />
       <!-- 创建时间 -->
-      <el-table-column
+      <el-table-column prop="CreateTime" :label="$t('trials:emailManageCfg:title:createTime')" show-overflow-tooltip
-        prop="CreateTime"
+        sortable="custom" width="160" />
-        :label="$t('trials:emailManageCfg:title:createTime')"
-        show-overflow-tooltip
-        sortable="custom"
-        width="160"
-      />
     </el-table>
-    <Pagination
+    <Pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      class="page"
+      @pagination="getList" />
-      :total="total"
-      :page.sync="searchData.PageIndex"
-      :limit.sync="searchData.PageSize"
-      @pagination="getList"
-    />
   </box-content>
 </template>
 <script>

src/views/trials/trials-panel/setting/email-manage/components/EmailForm.vue

@@ -1,12 +1,5 @@
 <template>
-  <el-form
+  <el-form ref="emailForm" v-loading="loading" :model="form" label-width="180px" size="small" :rules="rules">
-    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">
@@ -14,242 +7,111 @@
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="$i18n.locale === 'zh'">
-        <el-form-item
+        <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopicCN')" prop="EmailTopicCN">
-          :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
+        <el-form-item :label="$t('trials:emailManageCfg:table:EmailTopic')" prop="EmailTopic">
-          :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
+        <el-form-item :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')" prop="BusinessScenarioEnum">
-          :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
+          <el-select v-model="form.BusinessScenarioEnum" disabled clearable class="mr">
-          prop="BusinessScenarioEnum"
+            <el-option v-for="item of $d.Email_BusinessScenario" :key="`BusinessScenarioEnum${item.label}`"
-        >
+              :label="item.label" :value="item.value" />
-          <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
+        <el-form-item :label="$t('trials:emailManageCfg:table:ToUserTypeList')" prop="ToUserTypeList">
-          :label="$t('trials:emailManageCfg:table:ToUserTypeList')"
+          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
-          prop="ToUserTypeList"
+            <el-option v-for="item of UserTypeList" :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 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
+        <el-form-item :label="$t('trials:emailManageCfg:table:CopyUserTypeList')" prop="CopyUserTypeList">
-          :label="$t('trials:emailManageCfg:table:CopyUserTypeList')"
+          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
-          prop="CopyUserTypeList"
+            <el-option v-for="item of UserTypeList" :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 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
+        <el-form-item :label="$t('trials:emailManageCfg:table:blackUserIdList')" prop="blackUserIdList">
-          :label="$t('trials:emailManageCfg:table:blackUserIdList')"
+          <el-select v-model="form.blackUserIdList" clearable multiple class="mr">
-          prop="blackUserIdList"
+            <el-option v-for="item of UserList" :key="`blackUserIdList${item.UserName}`"
-        >
+              :label="`${item.UserName}(${item.RealName})`" :value="item.UserId" />
-          <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
+          <el-form-item :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')" prop="EmailUrgentEnum">
-            :label="$t('trials:emailManageCfg:table:EmailUrgentEnum')"
+            <el-select v-model="form.EmailUrgentEnum" disabled clearable class="mr">
-            prop="EmailUrgentEnum"
+              <el-option v-for="item of $d.EmailUrgent" :key="`EmailUrgent${item.label}`" :label="item.label"
-          >
+                :value="item.value" />
-            <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
+          <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')"
-            :label="$t('trials:emailManageCfg:table:EmailCron')"
+            v-if="form.EmailUrgentEnum !== 1 && IntervalShow" prop="EmailCron">
-            v-if="form.EmailUrgentEnum !== 1 && IntervalShow"
+            <el-input-number v-model="Interval" @change="handleIntervalChange" :min="1" :max="365"></el-input-number>
-            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
+        <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
-          :label="$t('trials:emailManageCfg:title:isReturnRequired')"
-          prop="IsReturnRequired"
-        >
           <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{
-              v-for="item of $d.YesOrNo"
+              item.label }}</el-radio>
-              :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
+        <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
-          :label="$t('trials:emailManageCfg:table:IsAutoSend')"
-          prop="IsAutoSend"
-        >
           <el-radio-group v-model="form.IsAutoSend">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label
-              v-for="item of $d.YesOrNo"
+            }}</el-radio>
-              :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
+        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
-          :label="$t('trials:emailManageCfg:table:IsEnable')"
-          prop="IsEnable"
-        >
           <el-radio-group v-model="form.IsEnable">
-            <el-radio
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label
-              v-for="item of $d.YesOrNo"
+            }}</el-radio>
-              :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
+        <el-form-item :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
-          :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
+          v-if="form.CriterionTypeList && form.CriterionTypeList.length > 0" prop="CriterionTypeList">
-          v-if="form.CriterionTypeEnum && form.CriterionTypeEnum.length > 0"
+          <el-select disabled v-model="form.CriterionTypeList" clearable class="mr" multiple>
-          prop="CriterionTypeEnum"
+            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
-        >
+              :value="item.value" />
-          <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
+        <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
-          :label="$t('trials:emailManageCfg:table:fileListCN')"
+          <el-upload class="upload-demo" action :before-upload="beforeUploadCN" :http-request="handleUploadFileCN"
-          prop="IsEnable"
+            :on-preview="handlePreviewCN" :on-remove="handleRemoveFileCN" :show-file-list="true" :disabled="true"
-        >
+            :limit="1" :file-list="fileListCN">
-          <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
+        <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
-          :label="$t('trials:emailManageCfg:table:fileListEN')"
+          <el-upload class="upload-demo" action :before-upload="beforeUploadEN" :http-request="handleUploadFileEN"
-          prop="IsEnable"
+            :on-preview="handlePreviewEN" :on-remove="handleRemoveFileEN" :show-file-list="true" :disabled="true"
-        >
+            :limit="1" :file-list="fileListEN">
-          <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>
@@ -270,26 +132,14 @@
     <!--        :autosize="{ minRows: 8, maxRows: 8}"-->
     <!--      />-->
     <!--    </el-form-item>-->
-    <div
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px; padding-bottom: 10px">
-      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
+    <el-dialog append-to-body :title="$t('trials:emailManageCfg:button:generate')" :visible.sync="showCron">
-      append-to-body
+      <vcrontab @hide="showCron = false" @fill="crontabFill" :expression="expression"></vcrontab>
-      :title="$t('trials:emailManageCfg:button:generate')"
-      :visible.sync="showCron"
-    >
-      <vcrontab
-        @hide="showCron = false"
-        @fill="crontabFill"
-        :expression="expression"
-      ></vcrontab>
     </el-dialog>
   </el-form>
 </template>
@@ -345,6 +195,7 @@ export default {
         IsEnable: true,
         IsAutoSend: true,
         CriterionTypeEnum: null,
+        CriterionTypeList: [],
         FromEmail: '',
         FromName: '',
         AuthorizationCode: '',

src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue

@@ -3,63 +3,30 @@
     <template slot="search-container">
       <el-form :inline="true" size="small">
         <!-- 业务场景 -->
-        <el-form-item
+        <el-form-item :label="$t('trials:emailManageCfg:title:businessScenario')">
-          :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"
-          <el-select
+              :value="item.value" />
-            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
+        <el-form-item v-if="isDistinguishCriteria" style="margin-bottom: 10px"
-          v-if="isDistinguishCriteria"
+          :label="$t('trials:reviewTrack:table:criterionName')">
-          style="margin-bottom: 10px"
+          <el-select v-model="searchData.TrialReadingCriterionId" clearable style="width: 120px">
-          :label="$t('trials:reviewTrack:table:criterionName')"
+            <el-option v-for="item of trialCriterionList"
-        >
+              :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.TrialReadingCriterionId"
-          <el-select
+              :label="item.TrialReadingCriterionName" />
-            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
+        <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
-          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          prop="ToUserTypeList"
-        >
           <el-select v-model="searchData.ToUserType" clearable class="mr">
-            <el-option
+            <el-option v-for="item of UserTypeList" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              v-for="item of UserTypeList"
+              :value="item.value" />
-              :key="`ToUserTypeList${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('trials:emailManageCfg:table:IsEnable')" prop="IsEnable">
-          :label="$t('trials:emailManageCfg:table:IsEnable')"
-          prop="IsEnable"
-        >
           <el-select v-model="searchData.IsEnable" clearable class="mr">
-            <el-option
+            <el-option v-for="item of $d.YesOrNo" :key="`ToUserTypeList${item.label}`" :label="item.label"
-              v-for="item of $d.YesOrNo"
+              :value="item.value" />
-              :key="`ToUserTypeList${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -68,21 +35,11 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
             {{ $t('common:button:reset') }}
           </el-button>
-          <el-button
+          <el-button v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])" type="primary"
-            v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])"
+            icon="el-icon-plus" size="small" :disabled="isEdit" @click="handleAddDefault">
-            type="primary"
-            icon="el-icon-plus"
-            size="small"
-            :disabled="isEdit"
-            @click="handleAddDefault"
-          >
             {{ $t('trials:emailManageCfg:button:Default') }}
           </el-button>
         </el-form-item>
@@ -90,13 +47,7 @@
       <!-- 自定义标准允许添加 -->
     </template>
     <template slot="main-container">
-      <el-table
+      <el-table ref="emailList" v-loading="loading" :data="list" stripe @sort-change="handleSortChange">
-        ref="emailList"
-        v-loading="loading"
-        :data="list"
-        stripe
-        @sort-change="handleSortChange"
-      >
         <el-table-column type="index" width="40" />
         <!-- Code -->
         <!-- <el-table-column
@@ -106,63 +57,34 @@
           show-overflow-tooltip
           width="100"
         /> -->
-        <el-table-column
+        <el-table-column v-if="isDistinguishCriteria" prop="CriterionTypeList"
-          v-if="isDistinguishCriteria"
+          :label="$t('trials:reviewTrack:table:criterionName')" show-overflow-tooltip sortable="custom" width="120">
-          prop="TrialReadingCriterionId"
-          :label="$t('trials:reviewTrack:table:criterionName')"
-          show-overflow-tooltip
-          sortable="custom"
-          width="120"
-        >
           <template slot-scope="scope">
-            {{ scope.row.TrialCriterionName }}
+            {{scope.row.CriterionTypeList && scope.row.CriterionTypeList.length > 0 ?
+              scope.row.CriterionTypeList.map(item => { return $fd('CriterionType', item) }
+              ).join(', ') : ''}}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column v-if="$i18n.locale === 'zh'" prop="EmailTopicCN"
-          v-if="$i18n.locale === 'zh'"
+          :label="$t('trials:emailManageCfg:table:EmailTopicCN')" sortable="custom" show-overflow-tooltip
-          prop="EmailTopicCN"
+          min-width="140" />
-          :label="$t('trials:emailManageCfg:table:EmailTopicCN')"
+        <el-table-column v-else prop="EmailTopic" :label="$t('trials:emailManageCfg:table:EmailTopic')"
-          sortable="custom"
+          sortable="custom" show-overflow-tooltip min-width="140" />
-          show-overflow-tooltip
+        <el-table-column prop="BusinessModuleEnum" :label="$t('trials:emailManageCfg:table:BusinessModuleEnum')"
-          min-width="140"
+          sortable="custom" show-overflow-tooltip min-width="100">
-        />
-        <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
+        <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:table:BusinessScenarioEnum')"
-          prop="BusinessScenarioEnum"
+          sortable="custom" show-overflow-tooltip min-width="100">
-          :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
+        <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          prop="ToUserTypeList"
+          show-overflow-tooltip min-width="100">
-          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          show-overflow-tooltip
-          min-width="100"
-        >
           <template slot-scope="scope">
             {{
               scope.row.ToUserTypeNameList.length > 0
@@ -172,12 +94,8 @@
           </template>
         </el-table-column>
         <!-- 抄送人 -->
-        <el-table-column
+        <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-          prop="CopyUserTypeList"
+          show-overflow-tooltip min-width="100">
-          :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-          show-overflow-tooltip
-          min-width="100"
-        >
           <template slot-scope="scope">
             {{
               scope.row.CopyUserTypeNameList.length > 0
@@ -204,36 +122,18 @@
         <!--          width="160"-->
         <!--        />-->
         <!-- 附件 -->
-        <el-table-column
+        <el-table-column v-if="$i18n.locale === 'zh' && isDistinguishCriteria" prop="AttachNameCN"
-          v-if="$i18n.locale === 'zh' && isDistinguishCriteria"
+          :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
-          prop="AttachNameCN"
-          :label="$t('trials:emailManageCfg:title:fileName')"
-          show-overflow-tooltip
-          min-width="140"
-        >
           <template slot-scope="scope">
-            <span
+            <span v-if="scope.row.AttachCNPath" @click="handlePreview(scope.row.AttachCNPath)"
-              v-if="scope.row.AttachCNPath"
+              style="cursor: pointer; color: #428bca">{{ scope.row.AttachNameCN }}</span>
-              @click="handlePreview(scope.row.AttachCNPath)"
-              style="cursor: pointer; color: #428bca"
-              >{{ scope.row.AttachNameCN }}</span
-            >
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column v-if="$i18n.locale === 'en' && isDistinguishCriteria" prop="AttachName"
-          v-if="$i18n.locale === 'en' && isDistinguishCriteria"
+          :label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
-          prop="AttachName"
-          :label="$t('trials:emailManageCfg:title:fileName')"
-          show-overflow-tooltip
-          min-width="140"
-        >
           <template slot-scope="scope">
-            <span
+            <span v-if="scope.row.AttachPath" @click="handlePreview(scope.row.AttachPath)"
-              v-if="scope.row.AttachPath"
+              style="cursor: pointer; color: #428bca">{{ scope.row.AttachName }}</span>
-              @click="handlePreview(scope.row.AttachPath)"
-              style="cursor: pointer; color: #428bca"
-              >{{ scope.row.AttachName }}</span
-            >
           </template>
         </el-table-column>
         <!-- 是否需要回执 -->
@@ -267,13 +167,8 @@
           </template>
         </el-table-column> -->
         <!-- 是否启用 -->
-        <el-table-column
+        <el-table-column prop="IsEnable" :label="$t('trials:emailManageCfg:table:IsEnable')" show-overflow-tooltip
-          prop="IsEnable"
+          sortable="custom" min-width="90">
-          :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) }}
@@ -284,84 +179,37 @@
           </template>
         </el-table-column>
         <!-- 更新时间 -->
-        <el-table-column
+        <el-table-column prop="UpdateTime" :label="$t('trials:emailManageCfg:title:updateTime')" show-overflow-tooltip
-          prop="UpdateTime"
+          sortable="custom" min-width="100" />
-          :label="$t('trials:emailManageCfg:title:updateTime')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        />
         <!-- 创建时间 -->
-        <el-table-column
+        <el-table-column prop="CreateTime" :label="$t('trials:emailManageCfg:title:createTime')" show-overflow-tooltip
-          prop="CreateTime"
+          sortable="custom" min-width="100" />
-          :label="$t('trials:emailManageCfg:title:createTime')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        />
 
-        <el-table-column
+        <el-table-column v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])" width="120"
-          v-if="hasPermi(['trials:trials-panel:setting:email-manage:edit'])"
+          :label="$t('common:action:action')" fixed="right">
-          width="120"
-          :label="$t('common:action:action')"
-          fixed="right"
-        >
           <template slot-scope="scope">
             <!-- 编辑 -->
-            <el-button
+            <el-button icon="el-icon-edit-outline" circle :disabled="isEdit" :title="$t('common:button:edit')"
-              icon="el-icon-edit-outline"
+              @click="handleEdit(scope.row)" />
-              circle
-              :disabled="isEdit"
-              :title="$t('common:button:edit')"
-              @click="handleEdit(scope.row)"
-            />
             <!-- 编辑 -->
-            <el-button
+            <el-button icon="el-icon-delete" circle :disabled="isEdit" :title="$t('common:button:delete')"
-              icon="el-icon-delete"
+              @click="deleteTrialEmailNoticeConfig(scope.row)" />
-              circle
-              :disabled="isEdit"
-              :title="$t('common:button:delete')"
-              @click="deleteTrialEmailNoticeConfig(scope.row)"
-            />
           </template>
         </el-table-column>
       </el-table>
 
       <!-- 新增/编辑 -->
-      <el-dialog
+      <el-dialog v-if="editDialog.visible" :visible.sync="editDialog.visible" :close-on-click-modal="false"
-        v-if="editDialog.visible"
+        :title="editDialog.title" fullscreen custom-class="base-dialog-wrapper">
-        :visible.sync="editDialog.visible"
+        <EmailForm :data="currentRow" :criterion-type="criterionType" :is-distinguish-criteria="isDistinguishCriteria"
-        :close-on-click-modal="false"
+          :UserTypeList="UserTypeList" @closeDialog="closeDialog" @getList="getList" />
-        :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
+      <el-dialog v-if="addVisible" :visible.sync="addVisible" width="1300px" :close-on-click-modal="false"
-        v-if="addVisible"
+        custom-class="base-dialog-wrapper" :title="$t('trials:emailManageCfg:button:Default')">
-        :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
+          <DefaultQS @getList="getList" :is-distinguish-criteria="isDistinguishCriteria" :isShow="isBtnShow"
-            @getList="getList"
+            :UserTypeList="UserTypeList" @close="addVisible = false" />
-            :is-distinguish-criteria="isDistinguishCriteria"
-            :isShow="isBtnShow"
-            :UserTypeList="UserTypeList"
-            @close="addVisible = false"
-          />
         </div>
       </el-dialog>
     </template>

src/views/trials/trials-panel/setting/inspection/index.vue

@@ -0,0 +1,191 @@
+<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>

src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue

@@ -738,7 +738,7 @@ export default {
     },
     handleIsDeletedChanged(val) {
       if (val) {
-        this.statusForm.joinTime = ''
+        // this.statusForm.joinTime = ''
       } else {
         this.statusForm.removeTime = ''
       }

src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue

@@ -353,7 +353,9 @@ export default {
       }
     },
     formItemNumberChange(v, question) {
-      this.$emit('formItemTableNumberChange', v, question)
+      // this.$emit('formItemTableNumberChange', v, question)
+      this.$emit('formItemTableNumberChange')
+      this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
     },
     resetChild(obj) {
       obj.forEach(i => {

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue

@@ -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'"
+                v-show="item.value !== 'calculation' && item.value !== 'increment' && item.value !== 'table' && item.value !== 'fixedTable'"
                 :key="item.value"
                 :value="item.value"
                 :label="item.label"
@@ -727,6 +727,63 @@
           }}
         </div>
       </div>
+      <!-- 影像标记 -->
+      <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"
+          :disabled="form.IsRequired === 0"
+          @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"
+        :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'" 
@@ -1018,6 +1075,16 @@ export default {
     isLook: {
       type: Boolean,
       default: true
+    },
+    readingTools: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    readingVersionEnum: {
+      type: Number,
+      default: 0
     }
   },
 
@@ -1071,9 +1138,14 @@ export default {
         ExportResult: [],
         ClassifyType: null,
         ClassifyEditType: null,
-        ClassifyShowType: null
+        ClassifyShowType: null,
+        ImageMarkEnum: 0,
+        ImageTool: '',
+        ImageToolAttribute: '',
+        
         // IsEnable: true
       },
+      imageToolAttributes: [],
       rules: {
         Type: [
           {required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change']}
@@ -1349,6 +1421,9 @@ export default {
             }
           }
         }
+        if (this.form.ImageTool) {
+          this.imageToolChange(this.form.ImageTool)
+        }
       }
       if (!this.data.ShowOrder && this.data.ShowOrder !== 0) {
         if (this.list.length > 0) {
@@ -1456,9 +1531,27 @@ 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 => {
@@ -1550,6 +1643,10 @@ 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) => {

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue

@@ -210,12 +210,14 @@
       append-to-body
       custom-class="base-dialog-wrapper"
     >
-      <QuestionsForm
+      <questions-form
         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"
@@ -231,7 +233,7 @@
       :title="preview.title"
       :fullscreen="true"
     >
-      <QuestionsPreview :criterion-id="trialCriterionId" :is-system-criterion="isSystemCriterion" :form-type="1" />
+      <questions-preview :criterion-id="trialCriterionId" :is-system-criterion="isSystemCriterion" :form-type="1" />
     </el-dialog>
 
     <el-dialog
@@ -241,12 +243,14 @@
       :title="config.title"
       :fullscreen="true"
     >
-      <TableQsList
+      <table-qs-list
         :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>
@@ -299,6 +303,16 @@ export default {
     isFromSystem: {
       type: Boolean,
       default: true
+    },
+    readingTools: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    readingVersionEnum: {
+      type: Number,
+      default: 0
     }
 
   },
@@ -321,7 +335,6 @@ export default {
   },
   mounted() {
     this.tblList = this.list
-    console.log('ql', this.isSystemCriterion)
   },
   methods: {
     getList() {

src/views/trials/trials-panel/setting/reading-unit/components/ReadingCriterions.vue

@@ -10,7 +10,7 @@
     >
       <!-- '表单问题' -->
       <el-form-item :label="$t('trials:readingUnit:readingCriterion:title:formQs')">
-        <QuestionsList
+        <questions-list
           :ref="`questionList${trialReadingCriterionId}`"
           v-if="form.FormType===1"
           :trial-reading-criterion-id="trialReadingCriterionId"
@@ -20,6 +20,8 @@
           :is-system-criterion="isSystemCriterion"
           :is-from-system="readingInfo.IsFromSystem"
           :digit-places="digitPlaces"
+          :readingTools="readingTools"
+          :readingVersionEnum="readingVersionEnum"
           @reloadArbitrationRules="reloadArbitrationRules"
         />
       </el-form-item>
@@ -77,6 +79,12 @@ export default {
     isAdditionalAssessment: {
       type: Boolean,
       default: false
+    },
+    readingTools: {
+      type: Array,
+      default() {
+        return []
+      }
     }
   },
   data() {
@@ -99,7 +107,8 @@ export default {
       readingInfo: {},
       isConfirm: true,
       configBaseDataVisible: false,
-      additionalAssessmentOptionList: null
+      additionalAssessmentOptionList: null,
+      readingVersionEnum: 0
     }
   },
   mounted() {
@@ -118,6 +127,7 @@ 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)) {
@@ -126,7 +136,6 @@ export default {
           }
           this.isConfirm = res.Result.IsSign
           this.isSystemCriterion = res.Result.IsSystemCriterion
-          console.log(this.isSystemCriterion)
         }).catch(() => {
           this.loading = false
         })
@@ -137,7 +146,6 @@ export default {
     // 配置信息保存
     handleSave(isPrompt = true) {
       return new Promise((resolve, reject) => {
-        console.log(this.form)
         this.$refs['readingCriterionsForm'].validate((valid) => {
           if (!valid) {
             resolve(false)

src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue

@@ -917,6 +917,8 @@ 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)
           }
@@ -957,6 +959,7 @@ 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)
                 }

src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue

@@ -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'"
+                v-if="item.value !== 'increment' && item.value !== 'table' && item.value !== 'basicTable' && item.value !== 'group' && item.value !== 'fixedTable' && item.value !== 'calculation' "
                 :key="item.value"
                 :value="item.value"
                 :label="item.label"
@@ -429,6 +429,64 @@
             <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>
+        <!-- 影像标记 -->
+        <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"
+            :disabled="form.IsRequired === 0"
+            @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"
+          :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')"
@@ -847,6 +905,16 @@ export default {
     type: {
       type: String,
       required: true
+    },
+    readingTools: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    readingVersionEnum: {
+      type: Number,
+      default: 0
     }
   },
 
@@ -896,8 +964,12 @@ 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' }
@@ -1171,6 +1243,9 @@ export default {
             }
           }
         }
+        if (this.form.ImageTool) {
+          this.imageToolChange(this.form.ImageTool)
+        }
       }
       if (this.form.ClassifyTableQuestionId) {
           this.classifyQuestionChange(this.form.ClassifyTableQuestionId)
@@ -1182,6 +1257,12 @@ 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,
@@ -1263,6 +1344,25 @@ 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) {
@@ -1372,6 +1472,10 @@ export default {
       form.ImageCount = 0
       form.ClassifyType = null
       form.ClassifyShowType = null
+      form.ImageMarkEnum = 0
+      form.ImageTool = ''
+      form.ImageToolAttribute = ''
+      this.imageToolAttributes = []
     },
     close() {
       this.$emit('close')

src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue

@@ -202,6 +202,8 @@
         :digit-places="digitPlaces"
         :reading-question-id="readingQuestionId"
         :criterion-id="criterionId"
+        :readingTools="readingTools"
+        :readingVersionEnum="readingVersionEnum"
         @close="addOrEdit.visible = false"
         @getList="getList"
       />
@@ -241,6 +243,16 @@ export default {
     criterionId: {
       type: String,
       required: true
+    },
+    readingTools: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    readingVersionEnum: {
+      type: Number,
+      default: 0
     }
 
   },

src/views/trials/trials-panel/setting/reading-unit/index.vue

@@ -46,6 +46,7 @@
                   @setGlobalReading="setGlobalReading"
                   @setOncologyReading="setOncologyReading"
                   @setDigitPlaces="setDigitPlaces"
+                  @setReadingTools="setReadingTools"
                 />
               </el-collapse-item>
               <!-- 阅片标准 -->
@@ -57,6 +58,7 @@
                   :ref="`readingCriterions${item.TrialReadingCriterionId}`"
                   :trial-reading-criterion-id="TrialReadingCriterionId"
                   :digit-places="digitPlaces"
+                  :readingTools="readingTools"
                   :is-additional-assessment="isAdditionalAssessment"
                   @reloadArbitrationRules="reloadArbitrationRules"
                 />
@@ -174,7 +176,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: {
@@ -208,6 +210,7 @@ export default {
       isGlobalReading: false,
       digitPlaces: 0,
       isAdditionalAssessment: false,
+      readingTools: []
     };
   },
   watch: {
@@ -295,6 +298,9 @@ export default {
     setDigitPlaces(digitPlaces) {
       this.digitPlaces = digitPlaces;
     },
+    setReadingTools(readingTools) {
+      this.readingTools = getCustomizeStandardsTools(readingTools)
+    },
     setIsClinicalReading(isClinicalReading) {
       this.isClinicalReading = isClinicalReading;
     },

src/views/trials/trials-panel/setting/trial-config/components/ClinicalQuestionConfig.vue

@@ -10,190 +10,89 @@
           <el-button type="primary" @click="handleSearch">{{ $t('common:button:search') }}</el-button>
         </el-form-item>
       </el-form>
-      <div >
+      <div>
-        <el-button
+        <el-button :disabled="list.length === 0" size="mini" type="primary" @click="handlePreview">
-          :disabled="list.length === 0"
-          size="mini"
-          type="primary"
-          @click="handlePreview"
-        >
           {{ $t('common:button:preview') }}
         </el-button>
 
-        <el-button
+        <el-button v-if="!data.IsFromSystemData && !data.IsCompleteConfig" size="mini" type="primary"
-          v-if="!data.IsFromSystemData && !data.IsCompleteConfig"
+          @click="handleAdd">
-          size="mini"
-          type="primary"
-          @click="handleAdd"
-        >
           {{ $t('common:button:add') }}
         </el-button>
 
-        <el-button
+        <el-button v-if="!data.IsFromSystemData && !data.IsCompleteConfig" size="mini" type="primary"
-          v-if="!data.IsFromSystemData && !data.IsCompleteConfig"
+          @click="handleApply">
-          size="mini"
-          type="primary"
-          @click="handleApply"
-        >
           {{ $t('trials:readingUnit:qsList:button:apply') }}
         </el-button>
       </div>
 
     </div>
-    <el-table
+    <el-table ref="criterionQSList" v-loading="loading" v-adaptive="{ bottomOffset: 80 }" height="100" :data="list"
-      ref="criterionQSList"
+      stripe @sort-change="handleSortByColumn">
-      v-loading="loading"
+      <el-table-column prop="ShowOrder" label="" width="50" />
-      v-adaptive="{bottomOffset:80}"
+      <el-table-column prop="QuestionName" :label="$t('trials:readingUnit:qsList:title:qName')" show-overflow-tooltip />
-      height="100"
+      <el-table-column prop="QuestionEnName" :label="$t('trials:readingUnit:qsList:title:qNameEn')"
-      :data="list"
+        show-overflow-tooltip />
-      stripe
+      <el-table-column prop="Type" :label="$t('trials:readingUnit:qsList:title:type')" show-overflow-tooltip>
-      @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
+      <el-table-column prop="TypeValue" :label="$t('trials:readingUnit:qsList:title:type')" show-overflow-tooltip>
-        prop="TypeValue"
-        :label="$t('trials:readingUnit:qsList:title:type')"
-        show-overflow-tooltip
-      >
       </el-table-column>
-      <el-table-column
+      <el-table-column prop="GroupName" :label="$t('trials:readingUnit:qsList:title:groupName')" show-overflow-tooltip>
-        prop="ClinicalQuestionShowEnum"
+      </el-table-column>
-        :label="$t('trials:readingUnit:qsList:title:isShow')"
+      <el-table-column prop="ClinicalQuestionShowEnum" :label="$t('trials:readingUnit:qsList:title:isShow')"
-        show-overflow-tooltip
+        show-overflow-tooltip>
-      >
         <template slot-scope="scope">
-          {{ $fd('ShowQuestion',scope.row.ClinicalQuestionShowEnum) }}
+          {{ $fd('ShowQuestion', scope.row.ClinicalQuestionShowEnum) }}
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column prop="IsRequired" :label="$t('trials:qcCfg:table:isRequired')" show-overflow-tooltip>
-        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
+      <el-table-column prop="" :label="$t('common:action:action')" min-width="250" show-overflow-tooltip fixed="right">
-        prop=""
-        :label="$t('common:action:action')"
-        min-width="250"
-        show-overflow-tooltip
-        fixed="right"
-      >
         <template slot-scope="scope">
-          <el-button
+          <el-button v-if="!data.IsFromSystemData && !data.IsCompleteConfig" type="primary" size="mini"
-            v-if="!data.IsFromSystemData && !data.IsCompleteConfig"
+            @click="handleEdit(scope.row)">
-            type="primary"
-            size="mini"
-            @click="handleEdit(scope.row)"
-          >
             {{ $t('trials:readingUnit:qsList:title:edit') }}
           </el-button>
-          <el-button
+          <el-button v-else type="primary" size="mini" @click="handleLook(scope.row)">
-            v-else
-            type="primary"
-            size="mini"
-            @click="handleLook(scope.row)"
-          >
             {{ $t('trials:enrolledReviews:button:view') }}
           </el-button>
-          <el-button
+          <el-button type="primary" size="mini" :disabled="scope.row.ClinicalQuestionType !== 'table'"
-            type="primary"
+            @click="handleConfig(scope.row)">
-            size="mini"
-            :disabled="scope.row.ClinicalQuestionType !== 'table'"
-            @click="handleConfig(scope.row)"
-          >
             {{ $t('trials:readingUnit:qsList:title:tableQs') }}
           </el-button>
-          <el-button
+          <el-button v-if="!data.IsFromSystemData && !data.IsCompleteConfig" type="danger" size="mini"
-            v-if="!data.IsFromSystemData && !data.IsCompleteConfig"
+            :disabled="scope.row.IsEnable" @click="handleDelete(scope.row)">
-            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" />
+    <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total"
-    <el-dialog
+      :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
-      v-if="addOrEdit.visible"
+    <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
-      :visible.sync="addOrEdit.visible"
+      :title="addOrEdit.title" width="600px" append-to-body custom-class="base-dialog-wrapper">
-      :close-on-click-modal="false"
+      <ClinicalQuestionForm ref="addOrEdit" :clinical-id="clinicalId" :list="list" :clinical-info="data" :data="rowData"
-      :title="addOrEdit.title"
+        :type="type" @close="addOrEdit.visible = false" @getList="getList" />
-      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
+    <el-dialog v-if="preview.visible" v-dialogDrag :visible.sync="preview.visible" :close-on-click-modal="false"
-      v-if="preview.visible"
+      :title="preview.title" fullscreen append-to-body>
-      v-dialogDrag
-      :visible.sync="preview.visible"
-      :close-on-click-modal="false"
-      :title="preview.title"
-      fullscreen
-      append-to-body
-    >
       <div>
       </div>
     </el-dialog>
 
-    <el-dialog
+    <el-dialog v-if="config.visible" :visible.sync="config.visible" :close-on-click-modal="false" :title="config.title"
-      v-if="config.visible"
+      width="90%" append-to-body>
-      :visible.sync="config.visible"
+      <ClinicalQuestionTableQsList :clinical-id="clinicalId" :clinical-info="data" :data="rowData"
-      :close-on-click-modal="false"
+        :is-from-system-data="data.IsFromSystemData" :reading-question-id="rowData.Id"
-      :title="config.title"
+        :is-complete-config="data.IsCompleteConfig" :lesion-type="rowData.LesionType" />
-      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>
@@ -331,6 +230,4 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>
-

src/views/trials/trials-panel/setting/trial-config/components/ClinicalQuestionForm.vue

@@ -1,338 +1,196 @@
 <template>
-  <el-form
+  <el-form ref="clinicalDataForm" v-loading="loading" :model="form" size="small" :rules="rules"
-    ref="clinicalDataForm"
+    :disabled="type === 'look'" label-width="130px">
-    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-select v-model="form.ClinicalQuestionType" clearable @change="((val) => { typeChange(val, form) })">
-          <el-option
+          <el-option v-for="item of $d.ClinicalQuestionType" :key="item.value" :value="item.value"
-            v-for="item of $d.ClinicalQuestionType"
+            :label="item.label" />
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
         </el-select>
       </el-form-item>
-      <el-form-item
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:qName')" prop="QuestionName">
-        :label="$t('trials:readingUnit:qsList:title:qName')"
-        prop="QuestionName"
-      >
         <el-input v-model="form.QuestionName" />
       </el-form-item>
-      <el-form-item
+      <el-form-item :label="$t('trials:readingUnit:qsList:title:qNameEn')" prop="QuestionEnName">
-        :label="$t('trials:readingUnit:qsList:title:qNameEn')"
-        prop="QuestionEnName"
-      >
         <el-input v-model="form.QuestionEnName" />
       </el-form-item>
       <el-form-item
         v-if="form.ClinicalQuestionType === 'select' || form.ClinicalQuestionType === 'radio' || form.ClinicalQuestionType === 'checkbox'"
-        :label="$t('trials:qcCfg:table:typeValue')"
+        :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
-        prop="TypeValue"
+        <el-input v-model="form.TypeValue" :placeholder="$t('trials:qcCfg:message:typeValue')" />
-      >
-        <el-input
-          v-model="form.TypeValue"
-          :placeholder="$t('trials:qcCfg:message:typeValue')"
-        />
       </el-form-item>
-      <el-form-item
+      <el-form-item v-if="form.ClinicalQuestionType === 'number'" :label="$t('trials:processCfg:form:digitPlaces')"
-        v-if="form.ClinicalQuestionType === 'number'"
+        prop="DigitPlaces">
-        :label="$t('trials:processCfg:form:digitPlaces')"
+        <el-radio-group v-model="form.DigitPlaces" style="line-height: 40px;">
-        prop="DigitPlaces"
+          <el-radio v-for="item of $d.DigitPlaces" :key="`DigitPlaces${item.value}`" :label="item.value">
-      >
+            {{ item.label }}
-        <el-radio-group
+          </el-radio>
-          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
+      <el-form-item v-if="form.ClinicalQuestionType === 'number'" :label="$t('trials:readingUnit:qsList:title:unit')"
-        v-if="form.ClinicalQuestionType === 'number'"
+        prop="Unit">
-        :label="$t('trials:readingUnit:qsList:title:unit')"
+        <el-input v-model="form.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
+        <el-form-item :label="$t('trials:readingUnit:qsList:title:customCalculateMark')" prop="CustomCalculateMark">
-          :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
+          <el-radio-group v-model="form.CustomCalculateMark" style="line-height: 40px;"
-          prop="CustomCalculateMark"
+            @change="(v) => CustomCalculateMarkChange(v)">
-        >
-          <el-radio-group
-            v-model="form.CustomCalculateMark"
-            style="line-height: 40px;"
-            @change="(v) => CustomCalculateMarkChange(v)"
-          >
             <div>
-              <el-radio
+              <el-radio v-for="item of $d.ClinicalCustomCalculateMark" v-show="item.value <= 4"
-                v-for="item of $d.ClinicalCustomCalculateMark"
+                :key="`CustomCalculateMark${item.value}`" :label="item.value">
-                v-show="item.value <= 4"
-                :key="`CustomCalculateMark${item.value}`"
-                :label="item.value"
-              >
                 {{ item.label }}
               </el-radio>
             </div>
             <div>
-              <el-radio
+              <el-radio v-for="item of $d.ClinicalCustomCalculateMark" v-show="item.value > 4"
-                v-for="item of $d.ClinicalCustomCalculateMark"
+                :key="`CustomCalculateMark${item.value}`" :label="item.value">
-                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
+        <el-table v-if="isShow" ref="CalculateTable" :data="form.CalculateQuestions"
-          v-if="isShow"
+          style="margin: 10px;width: calc(100% - 20px)" size="small">
-          ref="CalculateTable"
-          :data="form.CalculateQuestions"
-          style="margin: 10px;width: calc(100% - 20px)"
-          size="small"
-        >
           <!-- 序号 -->
-          <el-table-column
+          <el-table-column :label="$t('trials:readingUnit:qsList:title:order')" min-width="70">
-            :label="$t('trials:readingUnit:qsList:title:order')"
-            min-width="70"
-          >
             <template slot-scope="scope">
               {{ scope.$index + 1 }}
             </template>
           </el-table-column>
           <!-- 运算类型 -->
-          <el-table-column
+          <el-table-column :label="$t('trials:readingUnit:qsList:title:customCalculateMark')" show-overflow-tooltip
-            :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
+            min-width="70">
-            show-overflow-tooltip
+            <template>
-            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"
+            prop="TableQuestionId" show-overflow-tooltip min-width="180">
-            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
+          <el-table-column v-if="form.CustomCalculateMark === 11" :label="$t('trials:rpManage:table:expirationDate')"
-            v-if="form.CustomCalculateMark === 11"
+            prop="TableQuestionId" show-overflow-tooltip min-width="180">
-            :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
+          <el-table-column v-if="form.CustomCalculateMark <= 4" :label="$t('common:action:action')"
-            v-if="form.CustomCalculateMark <= 4"
+            prop="TableQuestionId" show-overflow-tooltip>
-            :label="$t('common:action:action')"
-            prop="TableQuestionId"
-            show-overflow-tooltip
-          >
             <template slot-scope="scope">
               <!-- 添加 -->
-              <el-button
+              <el-button icon="el-icon-plus" size="mini" circle :title="$t('trials:readingUnit:qsList:title:add')"
-                icon="el-icon-plus"
+                @click="addCustomCalculateMark(scope.$index)" />
-                size="mini"
-                circle
-                :title="$t('trials:readingUnit:qsList:title:add')"
-                @click="addCustomCalculateMark(scope.$index)"
-              />
               <!-- 删除 -->
-              <el-button
+              <el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
-                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-form-item v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary'"
-        <el-radio-group
+        :label="$t('trials:readingUnit:qsList:title:isShow')" prop="ClinicalQuestionShowEnum">
-          v-model="form.ClinicalQuestionShowEnum"
+        <el-radio-group v-model="form.ClinicalQuestionShowEnum"
-          @change="((val)=>{isShowQuestionChange(val, form)})"
+          @change="((val) => { isShowQuestionChange(val, form) })">
-        >
+          <el-radio v-for="item of $d.ClinicalQuestionShow" :key="`ClinicalQuestionShowEnum${item.value}`"
-          <el-radio
+            :label="item.value">
-            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"
+        v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionShowEnum === 1"
-        :label="$t('trials:readingUnit:qsList:title:parentId')"
+        :label="$t('trials:readingUnit:qsList:title:parentId')" prop="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"
-        <el-select
+            :value="item.Id" />
-          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
+          <el-option v-for="item of parentTriggerValOptions" :key="item.id" :label="item.label"
-            v-for="item of parentTriggerValOptions"
+            :value="item.value.toString()" />
-            :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-form-item
-        <el-radio-group
+        v-if="form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionType !== 'table'"
-          v-model="form.IsRequired"
+        :label="$t('trials:readingUnit:qsList:title:isRequired')" prop="IsRequired">
-          :disabled="form.IsJudgeQuestion===true || form.ShowQuestion===2"
+        <el-radio-group v-model="form.IsRequired" :disabled="form.IsJudgeQuestion === true || form.ShowQuestion === 2"
-          @change="((val)=>{isRequiredChange(val, form)})"
+          @change="((val) => { isRequiredChange(val, form) })">
-        >
+          <el-radio v-for="item of $d.QuestionRequired" :key="`QuestionRequired${item.value}`" :label="item.value">
-          <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')"
+        :label="$t('trials:readingUnit:qsList:title:relevanceId')" prop="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"
-        <el-select
+            :value="item.Id" />
-          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
+      <el-form-item v-if="form.RelevanceId && form.IsRequired === 1"
-        v-if="form.RelevanceId && form.IsRequired === 1"
+        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')" prop="RelevanceValue">
-        :label="$t('trials:readingUnit:qsList:title:relevanceValueList')"
-        prop="RelevanceValue"
-      >
         <el-select v-model="form.RelevanceValue" clearable>
-          <el-option
+          <el-option v-for="item of reParentTriggerValOptions" :key="item.id" :label="item.label" :value="item.value" />
-            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
+          <el-option v-for="group of groupOptions" :key="group.Id"
-            v-for="group of groupOptions"
+            :label="language === 'zh' ? group.QuestionName : group.QuestionEnName" :value="group.Id" />
-            :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-form-item v-if="form.ClinicalQuestionType === 'time' && [2, 3].includes(clinicalInfo.ClinicalDataLevel)"
-        <el-radio-group
+        :label="$t('trials:readingUnit:qsList:title:IsStudyDate')" prop="IsCheckDate">
-          v-model="form.IsCheckDate"
+        <el-radio-group v-model="form.IsCheckDate">
-        >
+          <el-radio v-for="item of $d.YesOrNo" :key="`IsCheckDate${item.value}`" :label="item.value">
-          <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-form-item
-        <el-input-number
+        v-if="form.ClinicalQuestionType !== 'table' && form.ClinicalQuestionType !== 'group' && form.ClinicalQuestionType !== 'summary' && form.ClinicalQuestionType !== 'number' && form.ClinicalQuestionType !== 'select'"
-          v-model="form.MaxAnswerLength"
+        :label="$t('trials:readingUnit:qsList:title:MaxAnswerLength')">
-          controls-position="right"
+        <el-input-number v-model="form.MaxAnswerLength" controls-position="right" :min="0" :max="2000" />
-          :min="0"
-          :max="2000"
-        />
       </el-form-item>
-      <el-form-item v-if="form.ClinicalQuestionType === 'table'" :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
+      <el-form-item v-if="form.ClinicalQuestionType === 'table'"
-        <el-input-number
+        :label="$t('trials:readingUnit:qsList:title:maxQuestionCount')">
-          v-model="form.MaxQuestionCount"
+        <el-input-number v-model="form.MaxQuestionCount" controls-position="right" :min="0" :max="10" />
-          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
+        <el-input-number v-model="form.ShowOrder" controls-position="right" :min="0" />
-          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
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="close">
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="close"
-        >
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -345,7 +203,7 @@
 </template>
 <script>
 import { addOrUpdateTrialClinicalQuestion, getTrialClinicalOtherQuestionList, getTrialClinicalGroupQuestionList, getClinicalCalculateQuestions } from '@/api/dictionary'
-import {mapGetters} from "vuex";
+import { mapGetters } from "vuex";
 export default {
   name: 'AddOrUpdateClinicalData',
   props: {
@@ -429,11 +287,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' },
+        { validator: validateTypeVal, trigger: 'blur' },
-          { max: 500, message: this.$t('common:ruleMessage:maxLength') + ' 500' }],
+        { 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' }],
@@ -446,7 +304,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,
@@ -463,13 +321,24 @@ export default {
   },
   mounted() {
     this.initForm()
-    this.getClinicalCalculateQuestions()
+
+  },
+  watch: {
+    data: {
+      handler() {
+        if (this.data.ClinicalQuestionType) {
+          this.getClinicalCalculateQuestions(this.data.ClinicalQuestionType)
+        }
+      },
+      deep: true,
+      immediate: true
+    }
   },
   methods: {
-    getClinicalCalculateQuestions() {
+    getClinicalCalculateQuestions(type = null) {
       getClinicalCalculateQuestions({
         TrialClinicalId: this.clinicalId,
-        ClinicalQuestionType: 'time'
+        ClinicalQuestionType: type || 'time'
       }).then(res => {
         this.Questions = res.Result
       })
@@ -579,7 +448,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
         }
       }
@@ -663,6 +532,7 @@ export default {
       } else {
         data.LesionType = null
       }
+      this.getClinicalCalculateQuestions(val)
       data.TypeValue = ''
       data.ValueType = ''
       data.Unit = ''
@@ -718,5 +588,4 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>

src/views/trials/trials-panel/trial-summary/image-summary/index.vue

@@ -0,0 +1,366 @@
+<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:export'])">
+                        {{ $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:export'])">
+                        {{ $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}.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/访视名/阅片人角色-裁判选择标记/文件名
+                row.forEach(item => {
+                    ['QuestionMarkPictureList', 'TableQuestionRowPictureList'].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('YesOrNo', 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 = (num / 1024 / 1024).toFixed(3) + 'MB'
+        },
+        // 获取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: 100px;
+        }
+    }
+}
+</style>

src/views/trials/trials-panel/trial-summary/trial-document/components/fileRecord/index.vue

@@ -4,52 +4,25 @@
       {{ TITLE }}
     </div>
     <el-form :inline="true" class="base-search-form topForm">
-      <el-form-item
+      <el-form-item :label="$t('trials:trialDocument:fileRecord:form:isConfirmRecord')"
-        :label="$t('trials:trialDocument:fileRecord:form:isConfirmRecord')"
+        v-if="isManage && hasEdit && !viewStatus">
-        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-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
+      <el-form-item :label="$t('trials:trialDocument:fileRecord:form:isEnable')"
-        :label="$t('trials:trialDocument:fileRecord:form:isEnable')"
+        v-if="isManage && hasEdit && !viewStatus">
-        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-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
+        <el-button type="primary" @click="rowBtnStatus = 'save'" v-if="rowBtnStatus === 'edit'">
-          type="primary"
-          @click="rowBtnStatus = 'save'"
-          v-if="rowBtnStatus === 'edit'"
-        >
           {{ $t('common:button:edit') }}
         </el-button>
-        <el-button
+        <el-button type="primary" :loading="rowBtnLoading" @click="saveRowData" v-if="rowBtnStatus === 'save'">
-          type="primary"
-          :loading="rowBtnLoading"
-          @click="saveRowData"
-          v-if="rowBtnStatus === 'save'"
-        >
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -58,32 +31,14 @@
     <!-- 搜索框 -->
     <div class="search" style="position: relative">
       <el-form :inline="true" class="base-search-form">
-        <el-form-item
+        <el-form-item :label="$t('trials:trialDocument:fileRecord:search:name')">
-          :label="$t('trials:trialDocument:fileRecord:search:name')"
+          <el-input v-model="searchData.FileName" style="width: 100px" clearable />
-        >
-          <el-input
-            v-model="searchData.FileName"
-            style="width: 100px"
-            clearable
-          />
         </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('trials:trialDocument:fileRecord:search:isAuthorizedView')"
-          :label="$t('trials:trialDocument:fileRecord:search:isAuthorizedView')"
+          v-if="isManage && !viewStatus">
-          v-if="isManage && !viewStatus"
+          <el-select v-if="!viewStatus" v-model="searchData.IsAuthorizedView" style="width: 100px" placeholder=""
-        >
+            clearable>
-          <el-select
+            <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
-            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>
@@ -91,134 +46,70 @@
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
-          <el-button
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            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
+          <el-button type="primary" :disabled="selectTable.length <= 0" v-if="hasAccredit && isManage && !viewStatus"
-            type="primary"
+            @click.stop="auth">
-            :disabled="selectTable.length <= 0"
-            v-if="hasAccredit && isManage && !viewStatus"
-            @click.stop="auth"
-          >
             {{ $t('trials:trialDocument:fileRecord:button:accredit') }}
           </el-button>
-          <el-button
+          <el-button type="primary" v-if="hasEdit && isManage && !viewStatus" @click.stop="openFile(false)">
-            type="primary"
-            v-if="hasEdit && isManage && !viewStatus"
-            @click.stop="openFile(false)"
-          >
             {{ $t('trials:trialDocument:fileRecord:button:uploadFile') }}
           </el-button>
-          <el-button
+          <el-button type="primary" v-if="hasEdit && isManage && !viewStatus" @click.stop="openFile(true)">
-            type="primary"
-            v-if="hasEdit && isManage && !viewStatus"
-            @click.stop="openFile(true)"
-          >
             {{ $t('trials:trialDocument:fileRecord:button:uploadFolder') }}
           </el-button>
-          <el-button
+          <el-button type="primary" icon="el-icon-bottom" :disabled="selectTable.length <= 0"
-            type="primary"
+            v-if="hasDownLoad && isManage && !viewStatus" @click.stop="downLoad">
-            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
+          <el-button type="primary" v-if="hasDel && isManage && !viewStatus" :disabled="selectTable.length <= 0"
-            type="primary"
+            @click.stop="delList">
-            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
+    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" style="width: 100%"
-      v-loading="loading"
+      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-      v-adaptive="{ bottomOffset: 75 }"
+      <el-table-column type="selection" width="55" v-if="isManage && !viewStatus" />
-      :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
+      <el-table-column prop="FileName" :label="$t('trials:trialDocument:fileRecord:table:name')" show-overflow-tooltip
-        prop="FileName"
+        sortable="custom">
-        :label="$t('trials:trialDocument:fileRecord:table:name')"
-        show-overflow-tooltip
-        sortable="custom"
-      >
         <template slot-scope="scope">
-          <div
+          <div v-if="
-            v-if="
+            scope.row.TrialFileRecord &&
-              scope.row.TrialFileRecord &&
+            scope.row.TrialFileRecord.TrialFileTypeId
-              scope.row.TrialFileRecord.TrialFileTypeId
+          " style="display: flex; align-items: center">
-            "
-            style="display: flex; align-items: center"
-          >
             <span class="fileName">{{
               scope.row.TrialFileRecord.FileName
             }}</span>
             <div v-if="isManage && !viewStatus" class="fileBtnBox">
-              <i
+              <i class="el-icon-view" @click.stop="preview(scope.row.TrialFileRecord)" />
-                class="el-icon-view"
+              <i class="el-icon-download" v-if="hasDownLoad"
-                @click.stop="preview(scope.row.TrialFileRecord)"
+                @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-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
+          <i v-else-if="isManage && !viewStatus && hasEdit" class="el-icon-upload2"
-            v-else-if="isManage && !viewStatus && hasEdit"
+            style="cursor: pointer; color: #409eff" @click.stop="upload(scope.row, 'Trial', ['.pdf'])" />
-            class="el-icon-upload2"
-            style="cursor: pointer; color: #409eff"
-            @click.stop="upload(scope.row, 'Trial', ['.pdf'])"
-          />
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column prop="fileType" :label="$t('trials:trialDocument:fileRecord:table:fileType')"
-        prop="fileType"
+        show-overflow-tooltip>
-        :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
+      <el-table-column prop="fileType" :label="$t('trials:trialDocument:fileRecord:table:fileSize')"
-        prop="fileType"
+        show-overflow-tooltip>
-        :label="$t('trials:trialDocument:fileRecord:table:fileSize')"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
           <span v-if="scope.row.TrialFileRecord">{{
             scope.row.TrialFileRecord.FileSize
@@ -228,133 +119,52 @@
         </template>
       </el-table-column>
       <!--历史记录-->
-      <el-table-column
+      <el-table-column prop="HistoryFileRecord" :label="$t('trials:trialDocument:fileRecord:table:historyFileRecord')"
-        prop="HistoryFileRecord"
+        show-overflow-tooltip v-if="isManage && !viewStatus">
-        :label="$t('trials:trialDocument:fileRecord:table:historyFileRecord')"
-        show-overflow-tooltip
-        v-if="isManage && !viewStatus"
-      >
         <template slot-scope="scope">
-          <div
+          <el-button type="text" @click.stop="openHistory(scope.row)">
-            v-if="
+            {{ scope.row.HistoryCount }}
-              scope.row.HistoryFileRecord &&
+            <i class="el-icon-upload2" />
-              scope.row.HistoryFileRecord.TrialFileTypeId
+          </el-button>
-            "
-            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
+      <el-table-column prop="IsAuthorizedView" :label="$t('trials:trialDocument:fileRecord:table:isAuthorizedView')"
-        prop="IsAuthorizedView"
+        show-overflow-tooltip sortable="custom" v-if="isManage && !viewStatus">
-        :label="$t('trials:trialDocument:fileRecord:table:isAuthorizedView')"
-        show-overflow-tooltip
-        sortable="custom"
-        v-if="isManage && !viewStatus"
-      >
         <template slot-scope="scope">
-          <el-switch
+          <el-switch :disabled="!scope.row.TrialFileRecord" v-if="isManage && !viewStatus && hasEdit"
-            :disabled="!scope.row.TrialFileRecord"
+            v-model="scope.row.IsAuthorizedView" @change="(val) => auth(false, scope.row, val)" :active-value="true"
-            v-if="isManage && !viewStatus && hasEdit"
+            :inactive-value="false" :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
-            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
+      <el-table-column prop="UpdateTime" :label="$t('trials:trialDocument:fileRecord:table:updateTime')"
-        prop="UpdateTime"
+        show-overflow-tooltip sortable="custom" />
-        :label="$t('trials:trialDocument:fileRecord:table:updateTime')"
+      <el-table-column prop="CreateTime" :label="$t('trials:trialDocument:fileRecord:table:createTime')"
-        show-overflow-tooltip
+        show-overflow-tooltip sortable="custom" />
-        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
+          <el-button icon="el-icon-view" :title="$t('common:button:view')" circle :disabled="!scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
-            icon="el-icon-view"
+            " @click.stop="preview(scope.row.TrialFileRecord)" />
-            :title="$t('common:button:view')"
+          <el-button v-if="hasDownLoad && isManage && !viewStatus" icon="el-icon-download"
-            circle
+            :title="$t('trials:trialDocument:fileRecord:button:downLoadFile')" circle :disabled="!scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
-            :disabled="
+              " @click.stop="downLoad(false, scope.row.TrialFileRecord, 'file')" />
-              !scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
+          <el-button v-if="hasDel && isManage && !viewStatus" icon="el-icon-delete"
-            "
+            :title="$t('trials:trialDocument:fileRecord:button:delete')" circle @click.stop="handleDel(scope.row)" />
-            @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
+    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      class="page"
+      @pagination="getList" />
-      :total="total"
+    <upload-files :config="config" :faccept="faccept" :uploadPath="uploadPath" :limitLength="limitLength"
-      :page.sync="searchData.PageIndex"
+      v-if="config.visible" @close="close" @uplaodFile="uplaodFile" />
-      :limit.sync="searchData.PageSize"
+    <history-file-list :config="file_config" :rowData="fileData" :uploadPath="uploadPath" @getList="getList" />
-      @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,
@@ -369,6 +179,7 @@ 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,
@@ -381,7 +192,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'fileRecord',
-  components: { BoxContent, Pagination, uploadFiles },
+  components: { BoxContent, Pagination, uploadFiles, historyFileList },
   props: {
     viewStatus: {
       type: Boolean,
@@ -426,9 +237,25 @@ 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')
@@ -775,7 +602,7 @@ export default {
         this.DATA = Object.assign({}, this.rowData)
       },
       immediate: true,
-      deep:true
+      deep: true
     },
   },
   created() {
@@ -823,34 +650,39 @@ export default {
       ])
     },
     TITLE() {
-      return `${this.$fd('ArchiveType', this.ArchiveTypeEnum)} — ${
+      return `${this.$fd('ArchiveType', this.ArchiveTypeEnum)} — ${this.isEN ? this.rowData.Name : this.rowData.NameCN
-        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; /* 文本不换行 */
+  white-space: nowrap;
-  overflow: hidden; /* 超出部分隐藏 */
+  /* 文本不换行 */
+  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;
     }

src/views/trials/trials-panel/trial-summary/trial-document/components/historyFileList.vue

@@ -0,0 +1,351 @@
+<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>{{
+                                scope.row.FileSize && scope.row.FileSize > 0
+                                    ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
+                                    : ''
+                            }}</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>

src/views/trials/trials-panel/trial-summary/trial-document/components/report_doc/form.vue

@@ -1,131 +1,64 @@
 <template>
   <base-model :config="config">
     <div slot="dialog-body">
-      <el-form
+      <el-form ref="reportDocForm" :model="form" label-width="140px" size="small" :rules="rules">
-        ref="reportDocForm"
-        :model="form"
-        label-width="140px"
-        size="small"
-        :rules="rules"
-      >
         <div class="base-dialog-body">
-          <el-form-item
+          <el-form-item v-if="!config.upload" :label="$t('trials:trialDocument:reportDoc:form:name')" prop="Name">
-            v-if="!config.upload"
-            :label="$t('trials:trialDocument:reportDoc:form:name')"
-            prop="Name"
-          >
             <el-input v-model="form.Name" />
           </el-form-item>
-          <el-form-item
+          <el-form-item v-if="!config.upload" :label="$t('trials:trialDocument:reportDoc:form:version')" prop="Version">
-            v-if="!config.upload"
-            :label="$t('trials:trialDocument:reportDoc:form:version')"
-            prop="Version"
-          >
             <el-input v-model="form.Version" />
           </el-form-item>
-          <el-form-item
+          <el-form-item v-if="!config.upload" :label="$t('trials:trialDocument:reportDoc:form:isAuthorizedView')"
-            v-if="!config.upload"
+            prop="IsAuthorizedView">
-            :label="$t('trials:trialDocument:reportDoc:form:isAuthorizedView')"
+            <el-switch v-model="form.IsAuthorizedView" :active-value="true" :inactive-value="false"
-            prop="IsAuthorizedView"
+              :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
-          >
-            <el-switch
-              v-model="form.IsAuthorizedView"
-              :active-value="true"
-              :inactive-value="false"
-              :active-text="$fd('YesOrNo', true)"
-              :inactive-text="$fd('YesOrNo', false)"
-            >
             </el-switch>
           </el-form-item>
-          <el-form-item
+          <el-form-item v-if="!config.upload || config.upload === 'PDF'"
-            v-if="!config.upload || config.upload === 'PDF'"
+            :label="$t('trials:trialDocument:reportDoc:form:pdfFileRecord')" prop="PDFFileRecord">
-            :label="$t('trials:trialDocument:reportDoc:form:pdfFileRecord')"
+            <el-upload class="upload-demo" action :before-upload="(param) => beforeUpload(param, 'PDF', '.pdf')"
-            prop="PDFFileRecord"
+              :http-request="(param) => handleUploadFile(param, 'PDF')" :on-remove="() => handleRemoveFile('PDF')"
-          >
+              :limit="1" accept=".pdf" :file-list="PDFFile">
-            <el-upload
+              <el-button size="small" type="primary" :disabled="!!form.PDFFileRecord && !!form.PDFFileRecord.FilePath
-              class="upload-demo"
+                ">{{ $t('common:button:upload') }}
-              action
-              :before-upload="(param) => beforeUpload(param, 'PDF', '.pdf')"
-              :http-request="(param) => handleUploadFile(param, 'PDF')"
-              :on-remove="() => handleRemoveFile('PDF')"
-              :limit="1"
-              accept=".pdf"
-              :file-list="PDFFile"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                :disabled="
-                  !!form.PDFFileRecord && !!form.PDFFileRecord.FilePath
-                "
-                >{{ $t('common:button:upload') }}
               </el-button>
               <span slot="tip" class="el-upload__tip">
                 {{ $t('trials:trialDocument:reportDoc:rule:mustPDF') }}
               </span>
             </el-upload>
           </el-form-item>
-          <el-form-item
+          <el-form-item v-if="!config.upload || config.upload === 'Word'"
-            v-if="!config.upload || config.upload === 'Word'"
+            :label="$t('trials:trialDocument:reportDoc:form:wordFileRecord')">
-            :label="$t('trials:trialDocument:reportDoc:form:wordFileRecord')"
+            <el-upload class="upload-demo" action :before-upload="(param) => beforeUpload(param, 'Word', '.docx')"
-          >
+              :http-request="(param) => handleUploadFile(param, 'Word')" :on-remove="() => handleRemoveFile('Word')"
-            <el-upload
+              :limit="1" accept=".docx" :file-list="WordFile">
-              class="upload-demo"
+              <el-button size="small" type="primary" :disabled="!!form.WordFileRecord && !!form.WordFileRecord.FilePath
-              action
+                ">{{ $t('common:button:upload') }}
-              :before-upload="(param) => beforeUpload(param, 'Word', '.docx')"
-              :http-request="(param) => handleUploadFile(param, 'Word')"
-              :on-remove="() => handleRemoveFile('Word')"
-              :limit="1"
-              accept=".docx"
-              :file-list="WordFile"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                :disabled="
-                  !!form.WordFileRecord && !!form.WordFileRecord.FilePath
-                "
-                >{{ $t('common:button:upload') }}
               </el-button>
               <span slot="tip" class="el-upload__tip">
                 {{ $t('trials:trialDocument:reportDoc:rule:mustDOCX') }}
               </span>
             </el-upload>
           </el-form-item>
-          <el-form-item
+          <el-form-item v-if="!config.upload || config.upload === 'Sign'"
-            v-if="!config.upload || config.upload === 'Sign'"
+            :label="$t('trials:trialDocument:reportDoc:form:signFileRecord')" :prop="rowData.IsConfirmRecord &&
-            :label="$t('trials:trialDocument:reportDoc:form:signFileRecord')"
+                (!config.upload || config.upload === 'Sign')
-            :prop="
-              rowData.IsConfirmRecord &&
-              (!config.upload || config.upload === 'Sign')
                 ? 'SignFileRecord'
                 : ''
-            "
+              ">
-          >
+            <el-upload class="upload-demo" action :before-upload="(param) => beforeUpload(param, 'Sign', '.pdf')"
-            <el-upload
+              :http-request="(param) => handleUploadFile(param, 'Sign')" :on-remove="() => handleRemoveFile('Sign')"
-              class="upload-demo"
+              :limit="1" accept=".pdf" :file-list="SignFile">
-              action
+              <el-button size="small" type="primary" :disabled="!!form.SignFileRecord && !!form.SignFileRecord.FilePath
-              :before-upload="(param) => beforeUpload(param, 'Sign', '.pdf')"
+                ">{{ $t('common:button:upload') }}
-              :http-request="(param) => handleUploadFile(param, 'Sign')"
-              :on-remove="() => handleRemoveFile('Sign')"
-              :limit="1"
-              accept=".pdf"
-              :file-list="SignFile"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                :disabled="
-                  !!form.SignFileRecord && !!form.SignFileRecord.FilePath
-                "
-                >{{ $t('common:button:upload') }}
               </el-button>
               <span slot="tip" class="el-upload__tip">
                 {{ $t('trials:trialDocument:reportDoc:rule:mustPDF') }}
               </span>
             </el-upload>
           </el-form-item>
-          <el-form-item
+          <!-- <el-form-item
             v-if="!config.upload || config.upload === 'History'"
             :label="$t('trials:trialDocument:reportDoc:form:historyFileRecord')"
           >
@@ -151,7 +84,7 @@
                 {{ $t('trials:trialDocument:reportDoc:rule:mustZIP') }}
               </span>
             </el-upload>
-          </el-form-item>
+          </el-form-item> -->
         </div>
       </el-form>
     </div>
@@ -165,7 +98,7 @@
     </div>
   </base-model>
 </template>
-  <script>
+<script>
 import baseModel from '@/components/BaseModel'
 import { addOrUpdateTrialFinalRecord } from '@/api/dictionary'
 export default {

src/views/trials/trials-panel/trial-summary/trial-document/components/report_doc/index.vue

@@ -4,65 +4,30 @@
       {{ TITLE }}
     </div>
     <el-form :inline="true" class="base-search-form topForm">
-      <el-form-item
+      <el-form-item :label="$t('trials:trialDocument:reportDoc:form:firstFinalDate')">
-        :label="$t('trials:trialDocument:reportDoc:form:firstFinalDate')"
+        <el-date-picker :disabled="!isManage || rowBtnStatus === 'edit'" v-model="DATA.FirstFinalDate" type="date"
-      >
+          value-format="yyyy-MM-dd" format="yyyy-MM-dd" placeholder="">
-        <el-date-picker
-          :disabled="!isManage || rowBtnStatus === 'edit'"
-          v-model="DATA.FirstFinalDate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
-          placeholder=""
-        >
         </el-date-picker>
       </el-form-item>
-      <el-form-item
+      <el-form-item :label="$t('trials:trialDocument:reportDoc:form:isConfirmRecord')"
-        :label="$t('trials:trialDocument:reportDoc:form:isConfirmRecord')"
+        v-if="isManage && hasEdit && !viewStatus">
-        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-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
+      <el-form-item :label="$t('trials:trialDocument:reportDoc:form:isEnable')"
-        :label="$t('trials:trialDocument:reportDoc:form:isEnable')"
+        v-if="isManage && hasEdit && !viewStatus">
-        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-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
+        <el-button type="primary" @click="rowBtnStatus = 'save'" v-if="rowBtnStatus === 'edit'">
-          type="primary"
-          @click="rowBtnStatus = 'save'"
-          v-if="rowBtnStatus === 'edit'"
-        >
           {{ $t('common:button:edit') }}
         </el-button>
-        <el-button
+        <el-button type="primary" :loading="rowBtnLoading" @click="saveRowData" v-if="rowBtnStatus === 'save'">
-          type="primary"
-          :loading="rowBtnLoading"
-          @click="saveRowData"
-          v-if="rowBtnStatus === 'save'"
-        >
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -74,32 +39,14 @@
         <el-form-item :label="$t('trials:trialDocument:reportDoc:search:name')">
           <el-input v-model="searchData.Name" style="width: 100px" clearable />
         </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('trials:trialDocument:reportDoc:search:version')">
-          :label="$t('trials:trialDocument:reportDoc:search:version')"
+          <el-input v-model="searchData.Version" style="width: 100px" clearable />
-        >
-          <el-input
-            v-model="searchData.Version"
-            style="width: 100px"
-            clearable
-          />
         </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('trials:trialDocument:reportDoc:search:isAuthorizedView')"
-          :label="$t('trials:trialDocument:reportDoc:search:isAuthorizedView')"
+          v-if="isManage && !viewStatus">
-          v-if="isManage && !viewStatus"
+          <el-select v-if="!viewStatus" v-model="searchData.IsAuthorizedView" style="width: 100px" placeholder=""
-        >
+            clearable>
-          <el-select
+            <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
-            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>
@@ -107,321 +54,143 @@
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
           </el-button>
-          <el-button
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            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
+          <el-button type="primary" :disabled="selectTable.length <= 0" v-if="hasAccredit && isManage && !viewStatus"
-            type="primary"
+            @click.stop="auth">
-            :disabled="selectTable.length <= 0"
-            v-if="hasAccredit && isManage && !viewStatus"
-            @click.stop="auth"
-          >
             {{ $t('trials:trialDocument:reportDoc:button:accredit') }}
           </el-button>
-          <el-button
+          <el-button type="primary" v-if="hasAdd && isManage && !viewStatus" @click.stop="handleAdd">
-            type="primary"
-            v-if="hasAdd && isManage && !viewStatus"
-            @click.stop="handleAdd"
-          >
             {{ $t('trials:trialDocument:reportDoc:button:add') }}
           </el-button>
-          <el-button
+          <el-button type="primary" icon="el-icon-bottom" :disabled="selectTable.length <= 0"
-            type="primary"
+            v-if="hasDownLoad && isManage && !viewStatus" @click.stop="downLoad">
-            icon="el-icon-bottom"
-            :disabled="selectTable.length <= 0"
-            v-if="hasDownLoad && isManage && !viewStatus"
-            @click.stop="downLoad"
-          >
             {{ $t('trials:trialDocument:reportDoc:button:downLoadFile') }}
           </el-button>
         </el-form-item>
       </el-form>
     </div>
 
-    <el-table
+    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" style="width: 100%"
-      v-loading="loading"
+      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-      v-adaptive="{ bottomOffset: 75 }"
+      <el-table-column type="selection" width="55" v-if="isManage && !viewStatus" />
-      :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
+      <el-table-column prop="Name" :label="$t('trials:trialDocument:reportDoc:table:name')" sortable="custom"
-        prop="Name"
+        show-overflow-tooltip />
-        :label="$t('trials:trialDocument:reportDoc:table:name')"
+      <el-table-column prop="Version" :label="$t('trials:trialDocument:reportDoc:table:version')" show-overflow-tooltip
-        sortable="custom"
+        sortable="custom" />
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="Version"
-        :label="$t('trials:trialDocument:reportDoc:table:version')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
       <!--定稿PDF-->
-      <el-table-column
+      <el-table-column prop="PDFFileRecord" :label="$t('trials:trialDocument:reportDoc:table:pdfFileRecord')"
-        prop="PDFFileRecord"
+        show-overflow-tooltip>
-        :label="$t('trials:trialDocument:reportDoc:table:pdfFileRecord')"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          <div
+          <div v-if="
-            v-if="
+            scope.row.PDFFileRecord && scope.row.PDFFileRecord.TrialFileTypeId
-              scope.row.PDFFileRecord && scope.row.PDFFileRecord.TrialFileTypeId
+          " style="display: flex; align-items: center">
-            "
-            style="display: flex; align-items: center"
-          >
             <span class="fileName">{{ scope.row.PDFFileRecord.FileName }}</span>
             <div v-if="isManage && !viewStatus" class="fileBtnBox">
-              <i
+              <i class="el-icon-view" @click.stop="preview(scope.row.PDFFileRecord)" />
-                class="el-icon-view"
+              <i class="el-icon-download" v-if="hasDownLoad"
-                @click.stop="preview(scope.row.PDFFileRecord)"
+                @click.stop="downLoad(false, scope.row.PDFFileRecord, 'file')" />
-              />
+              <i class="el-icon-delete" v-if="hasDel" @click.stop="delFile(scope.row, 'PDF')" />
-              <i
-                class="el-icon-download"
-                v-if="hasDownLoad"
-                @click.stop="downLoad(false, scope.row.PDFFileRecord, 'file')"
-              />
-              <i
-                class="el-icon-delete"
-                v-if="hasDel"
-                @click.stop="delFile(scope.row, 'PDF')"
-              />
             </div>
           </div>
-          <i
+          <i v-else-if="isManage && !viewStatus && hasEdit" class="el-icon-upload2"
-            v-else-if="isManage && !viewStatus && hasEdit"
+            style="cursor: pointer; color: #409eff" @click.stop="upload(scope.row, 'PDF')" />
-            class="el-icon-upload2"
-            style="cursor: pointer; color: #409eff"
-            @click.stop="upload(scope.row, 'PDF')"
-          />
         </template>
       </el-table-column>
       <!--定稿WORD-->
-      <el-table-column
+      <el-table-column prop="WordFileRecord" :label="$t('trials:trialDocument:reportDoc:table:wordFileRecord')"
-        prop="WordFileRecord"
+        show-overflow-tooltip v-if="isManage && !viewStatus">
-        :label="$t('trials:trialDocument:reportDoc:table:wordFileRecord')"
-        show-overflow-tooltip
-        v-if="isManage && !viewStatus"
-      >
         <template slot-scope="scope">
-          <div
+          <div v-if="
-            v-if="
+            scope.row.WordFileRecord &&
-              scope.row.WordFileRecord &&
+            scope.row.WordFileRecord.TrialFileTypeId
-              scope.row.WordFileRecord.TrialFileTypeId
+          " style="display: flex; align-items: center">
-            "
-            style="display: flex; align-items: center"
-          >
             <span class="fileName">{{
               scope.row.WordFileRecord.FileName
             }}</span>
             <div v-if="isManage && !viewStatus" class="fileBtnBox">
-              <i
+              <i class="el-icon-download" v-if="hasDownLoad"
-                class="el-icon-download"
+                @click.stop="downLoad(false, scope.row.WordFileRecord, 'file')" />
-                v-if="hasDownLoad"
+              <i class="el-icon-delete" v-if="hasDel" @click.stop="delFile(scope.row, 'Word')" />
-                @click.stop="downLoad(false, scope.row.WordFileRecord, 'file')"
-              />
-              <i
-                class="el-icon-delete"
-                v-if="hasDel"
-                @click.stop="delFile(scope.row, 'Word')"
-              />
             </div>
           </div>
-          <i
+          <i v-else-if="isManage && !viewStatus && hasEdit" class="el-icon-upload2"
-            v-else-if="isManage && !viewStatus && hasEdit"
+            style="cursor: pointer; color: #409eff" @click.stop="upload(scope.row, 'Word')" />
-            class="el-icon-upload2"
-            style="cursor: pointer; color: #409eff"
-            @click.stop="upload(scope.row, 'Word')"
-          />
         </template>
       </el-table-column>
       <!--签字页-->
-      <el-table-column
+      <el-table-column prop="SignFileRecord" :label="$t('trials:trialDocument:reportDoc:table:signFileRecord')"
-        prop="SignFileRecord"
+        show-overflow-tooltip v-if="isManage && !viewStatus">
-        :label="$t('trials:trialDocument:reportDoc:table:signFileRecord')"
-        show-overflow-tooltip
-        v-if="isManage && !viewStatus"
-      >
         <template slot-scope="scope">
-          <div
+          <div v-if="
-            v-if="
+            scope.row.SignFileRecord &&
-              scope.row.SignFileRecord &&
+            scope.row.SignFileRecord.TrialFileTypeId
-              scope.row.SignFileRecord.TrialFileTypeId
+          " style="display: flex; align-items: center">
-            "
-            style="display: flex; align-items: center"
-          >
             <span class="fileName">{{
               scope.row.SignFileRecord.FileName
             }}</span>
             <div v-if="isManage && !viewStatus" class="fileBtnBox">
-              <i
+              <i class="el-icon-view" @click.stop="preview(scope.row.SignFileRecord)" />
-                class="el-icon-view"
+              <i class="el-icon-download" v-if="hasDownLoad"
-                @click.stop="preview(scope.row.SignFileRecord)"
+                @click.stop="downLoad(false, scope.row.SignFileRecord, 'file')" />
-              />
+              <i class="el-icon-delete" v-if="hasDel" @click.stop="delFile(scope.row, 'Sign')" />
-              <i
-                class="el-icon-download"
-                v-if="hasDownLoad"
-                @click.stop="downLoad(false, scope.row.SignFileRecord, 'file')"
-              />
-              <i
-                class="el-icon-delete"
-                v-if="hasDel"
-                @click.stop="delFile(scope.row, 'Sign')"
-              />
             </div>
           </div>
-          <i
+          <i v-else-if="isManage && !viewStatus && hasEdit" class="el-icon-upload2"
-            v-else-if="isManage && !viewStatus && hasEdit"
+            style="cursor: pointer; color: #409eff" @click.stop="upload(scope.row, 'Sign')" />
-            class="el-icon-upload2"
-            style="cursor: pointer; color: #409eff"
-            @click.stop="upload(scope.row, 'Sign')"
-          />
         </template>
       </el-table-column>
       <!--历史记录-->
-      <el-table-column
+      <el-table-column prop="HistoryFileRecord" :label="$t('trials:trialDocument:reportDoc:table:historyFileRecord')"
-        prop="HistoryFileRecord"
+        show-overflow-tooltip v-if="isManage && !viewStatus">
-        :label="$t('trials:trialDocument:reportDoc:table:historyFileRecord')"
-        show-overflow-tooltip
-        v-if="isManage && !viewStatus"
-      >
         <template slot-scope="scope">
-          <div
+          <el-button type="text" @click.stop="openHistory(scope.row)">
-            v-if="
+            {{ scope.row.HistoryCount }}
-              scope.row.HistoryFileRecord &&
+            <i class="el-icon-upload2" />
-              scope.row.HistoryFileRecord.TrialFileTypeId
+          </el-button>
-            "
-            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 && hasEdit"
-            class="el-icon-upload2"
-            style="cursor: pointer; color: #409eff"
-            @click.stop="upload(scope.row, 'History')"
-          />
         </template>
       </el-table-column>
 
-      <el-table-column
+      <el-table-column prop="IsAuthorizedView" :label="$t('trials:trialDocument:reportDoc:table:isAuthorizedView')"
-        prop="IsAuthorizedView"
+        show-overflow-tooltip sortable="custom" v-if="isManage && !viewStatus">
-        :label="$t('trials:trialDocument:reportDoc:table:isAuthorizedView')"
-        show-overflow-tooltip
-        sortable="custom"
-        v-if="isManage && !viewStatus"
-      >
         <template slot-scope="scope">
-          <el-switch
+          <el-switch v-if="isManage && !viewStatus && hasEdit" v-model="scope.row.IsAuthorizedView"
-            v-if="isManage && !viewStatus && hasEdit"
+            @change="(val) => auth(false, scope.row, val)" :active-value="true" :inactive-value="false"
-            v-model="scope.row.IsAuthorizedView"
+            :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
-            @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
+      <el-table-column prop="UpdateTime" :label="$t('trials:trialDocument:reportDoc:table:updateTime')"
-        prop="UpdateTime"
+        show-overflow-tooltip sortable="custom" />
-        :label="$t('trials:trialDocument:reportDoc:table:updateTime')"
+      <el-table-column prop="CreateTime" :label="$t('trials:trialDocument:reportDoc:table:createTime')"
-        show-overflow-tooltip
+        show-overflow-tooltip sortable="custom" />
-        sortable="custom"
-      />
-      <el-table-column
-        prop="CreateTime"
-        :label="$t('trials:trialDocument:reportDoc:table:createTime')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
       <el-table-column :label="$t('common:action:action')" width="200">
         <template slot-scope="scope">
-          <el-button
+          <el-button icon="el-icon-view" :title="$t('common:button:view')" circle :disabled="!scope.row.PDFFileRecord || !scope.row.PDFFileRecord.FilePath
-            icon="el-icon-view"
+            " @click.stop="preview(scope.row.PDFFileRecord)" />
-            :title="$t('common:button:view')"
+          <el-button v-if="hasEdit && isManage && !viewStatus" icon="el-icon-edit-outline"
-            circle
+            :title="$t('common:button:edit')" circle @click.stop="handleEdit(scope.row)" />
-            :disabled="
+          <el-button v-if="hasDownLoad && isManage && !viewStatus" icon="el-icon-download"
-              !scope.row.PDFFileRecord || !scope.row.PDFFileRecord.FilePath
+            :title="$t('trials:trialDocument:reportDoc:button:download')" circle
-            "
+            @click.stop="downLoad(false, scope.row)" />
-            @click.stop="preview(scope.row.PDFFileRecord)"
+          <el-button v-if="hasDel && isManage && !viewStatus" icon="el-icon-delete"
-          />
+            :title="$t('trials:trialDocument:reportDoc:button:delete')" circle @click.stop="handleDel(scope.row)" />
-          <el-button
-            v-if="hasEdit && isManage && !viewStatus"
-            icon="el-icon-edit-outline"
-            :title="$t('common:button:edit')"
-            circle
-            @click.stop="handleEdit(scope.row)"
-          />
-          <el-button
-            v-if="hasDownLoad && isManage && !viewStatus"
-            icon="el-icon-download"
-            :title="$t('trials:trialDocument:reportDoc:button:download')"
-            circle
-            @click.stop="downLoad(false, scope.row)"
-          />
-          <el-button
-            v-if="hasDel && isManage && !viewStatus"
-            icon="el-icon-delete"
-            :title="$t('trials:trialDocument:reportDoc:button:delete')"
-            circle
-            @click.stop="handleDel(scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页组件 -->
-    <pagination
+    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      class="page"
+      @pagination="getList" />
-      :total="total"
+    <reportDoc-form :ArchiveTypeEnum="ArchiveTypeEnum" :rowData="rowData" :config="config" :data="selectData"
-      :page.sync="searchData.PageIndex"
+      v-if="config.visible" @close="close" @getList="getList" />
-      :limit.sync="searchData.PageSize"
+    <history-file-list :config="file_config" :rowData="fileData" :uploadPath="uploadPath" @getList="getList" />
-      @pagination="getList"
-    />
-    <reportDoc-form
-      :ArchiveTypeEnum="ArchiveTypeEnum"
-      :rowData="rowData"
-      :config="config"
-      :data="selectData"
-      v-if="config.visible"
-      @close="close"
-      @getList="getList"
-    />
   </box-content>
 </template>
 <script>
@@ -437,6 +206,7 @@ import { deepClone } from '@/utils/index.js'
 import Pagination from '@/components/Pagination'
 import BoxContent from '@/components/BoxContent'
 import reportDocForm from './form.vue'
+import historyFileList from '../historyFileList.vue'
 const searchDataDefault = () => {
   return {
     IsAuthorizedView: null,
@@ -450,7 +220,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'reportDoc',
-  components: { BoxContent, Pagination, reportDocForm },
+  components: { BoxContent, Pagination, reportDocForm, historyFileList },
   props: {
     viewStatus: {
       type: Boolean,
@@ -491,9 +261,30 @@ export default {
       },
       selectData: {},
       DATA: {},
+
+      fileData: {},
+      file_config: {
+        visible: false,
+        title: this.$t('trials:trialDocument:historyFileList:title'),
+        width: '800px',
+      },
+      uploadPath: null
     }
   },
+  created() {
+    let typeArr = ['', 'Report', 'Doc', 'Record', 'Reviewer', 'Template']
+    let types = typeArr[this.ArchiveTypeEnum]
+    this.uploadPath = `/${this.$route.query.trialId}/Document/${types}`
+  },
   methods: {
+    openHistory(row) {
+      this.fileData = {
+        Name: row.Name,
+        Id: row.Id,
+        TrialFileTypeId: this.rowData.Id
+      }
+      this.file_config.visible = true
+    },
     // 上传单个文件
     upload(row, key) {
       this.selectData = deepClone(row)
@@ -771,7 +562,7 @@ export default {
         this.DATA = Object.assign({}, this.rowData)
       },
       immediate: true,
-      deep:true
+      deep: true
     },
   },
   computed: {
@@ -814,9 +605,8 @@ export default {
       ])
     },
     TITLE() {
-      return `${this.$fd('ArchiveType', this.ArchiveTypeEnum)} — ${
+      return `${this.$fd('ArchiveType', this.ArchiveTypeEnum)} — ${this.isEN ? this.rowData.Name : this.rowData.NameCN
-        this.isEN ? this.rowData.Name : this.rowData.NameCN
+        }`
-      }`
     },
   },
 }
@@ -827,21 +617,27 @@ export default {
   font-weight: bold;
   margin-bottom: 10px;
 }
+
 .fileName {
   display: inline-block;
   max-width: calc(100% - 60px);
-  white-space: nowrap; /* 文本不换行 */
+  white-space: nowrap;
-  overflow: hidden; /* 超出部分隐藏 */
+  /* 文本不换行 */
+  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;
     }

src/views/trials/trials-panel/trial-summary/trial-document/components/trainRecord/form.vue

@@ -33,7 +33,7 @@
               </span>
             </el-upload>
           </el-form-item>
-          <el-form-item v-if="!config.upload || config.upload === 'History'" :label="$t('trials:trialDocument:trainRecord:form:historyFileRecord')
+          <!-- <el-form-item v-if="!config.upload || config.upload === 'History'" :label="$t('trials:trialDocument:trainRecord:form:historyFileRecord')
             ">
             <el-upload class="upload-demo" action :before-upload="(param) => beforeUpload(param, 'History', '.zip')"
               :http-request="(param) => handleUploadFile(param, 'History')"
@@ -45,7 +45,7 @@
                 {{ $t('trials:trialDocument:trainRecord:rule:mustZIP') }}
               </span>
             </el-upload>
-          </el-form-item>
+          </el-form-item> -->
         </div>
       </el-form>
     </div>

src/views/trials/trials-panel/trial-summary/trial-document/components/trainRecord/index.vue

@@ -4,52 +4,25 @@
       {{ TITLE }}
     </div>
     <el-form :inline="true" class="base-search-form topForm">
-      <el-form-item
+      <el-form-item :label="$t('trials:trialDocument:trainRecord:form:isConfirmRecord')"
-        :label="$t('trials:trialDocument:trainRecord:form:isConfirmRecord')"
+        v-if="isManage && hasEdit && !viewStatus">
-        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-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
+      <el-form-item :label="$t('trials:trialDocument:trainRecord:form:isEnable')"
-        :label="$t('trials:trialDocument:trainRecord:form:isEnable')"
+        v-if="isManage && hasEdit && !viewStatus">
-        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-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
+        <el-button type="primary" @click="rowBtnStatus = 'save'" v-if="rowBtnStatus === 'edit'">
-          type="primary"
-          @click="rowBtnStatus = 'save'"
-          v-if="rowBtnStatus === 'edit'"
-        >
           {{ $t('common:button:edit') }}
         </el-button>
-        <el-button
+        <el-button type="primary" :loading="rowBtnLoading" @click="saveRowData" v-if="rowBtnStatus === 'save'">
-          type="primary"
-          :loading="rowBtnLoading"
-          @click="saveRowData"
-          v-if="rowBtnStatus === 'save'"
-        >
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -59,371 +32,155 @@
     <div class="search" style="position: relative">
       <el-form :inline="true" class="base-search-form">
         <!--培训日期-->
-        <el-form-item
+        <el-form-item :label="$t('trials:trialDocument:trainRecord:search:TrianingDate')">
-          :label="$t('trials:trialDocument:trainRecord:search:TrianingDate')"
+          <el-date-picker style="width: 240px" v-model="TrianingDate" type="daterange"
-        >
+            :range-separator="$t('baseForm:daterange:rangeSeparator')" start-placeholder="" end-placeholder=""
-          <el-date-picker
+            format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-            style="width: 240px"
-            v-model="TrianingDate"
-            type="daterange"
-            :range-separator="$t('baseForm:daterange:rangeSeparator')"
-            start-placeholder=""
-            end-placeholder=""
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-          >
           </el-date-picker>
         </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('trials:trialDocument:trainRecord:search:name')">
-          :label="$t('trials:trialDocument:trainRecord:search:name')"
+          <el-input v-model="searchData.FileName" style="width: 100px" clearable />
-        >
-          <el-input
-            v-model="searchData.FileName"
-            style="width: 100px"
-            clearable
-          />
         </el-form-item>
-        <el-form-item
+        <el-form-item :label="$t('trials:trialDocument:trainRecord:search:isAuthorizedView')
-          :label="
+          " v-if="isManage && !viewStatus">
-            $t('trials:trialDocument:trainRecord:search:isAuthorizedView')
+          <el-select v-if="!viewStatus" v-model="searchData.IsAuthorizedView" style="width: 100px" placeholder=""
-          "
+            clearable>
-          v-if="isManage && !viewStatus"
+            <el-option v-for="item in $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value">
-        >
-          <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>
         <!--更新时间-->
-        <el-form-item
+        <el-form-item :label="$t('trials:trialDocument:trainRecord:search:UpdateTime')" style="margin-bottom: 10px">
-          :label="$t('trials:trialDocument:trainRecord:search:UpdateTime')"
+          <el-date-picker style="width: 240px" v-model="UpdateTime" type="daterange"
-          style="margin-bottom: 10px"
+            :range-separator="$t('baseForm:daterange:rangeSeparator')" start-placeholder="" end-placeholder=""
-        >
+            format="yyyy-MM-dd" value-format="yyyy-MM-dd">
-          <el-date-picker
-            style="width: 240px"
-            v-model="UpdateTime"
-            type="daterange"
-            :range-separator="$t('baseForm:daterange:rangeSeparator')"
-            start-placeholder=""
-            end-placeholder=""
-            format="yyyy-MM-dd"
-            value-format="yyyy-MM-dd"
-          >
           </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
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            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
+          <el-button type="primary" :disabled="selectTable.length <= 0" v-if="hasAccredit && isManage && !viewStatus"
-            type="primary"
+            @click.stop="auth">
-            :disabled="selectTable.length <= 0"
-            v-if="hasAccredit && isManage && !viewStatus"
-            @click.stop="auth"
-          >
             {{ $t('trials:trialDocument:trainRecord:button:accredit') }}
           </el-button>
-          <el-button
+          <el-button type="primary" v-if="hasEdit && isManage && !viewStatus" @click.stop="openFile(false)">
-            type="primary"
-            v-if="hasEdit && isManage && !viewStatus"
-            @click.stop="openFile(false)"
-          >
             {{ $t('trials:trialDocument:trainRecord:button:uploadFile') }}
           </el-button>
-          <el-button
+          <el-button type="primary" v-if="hasEdit && isManage && !viewStatus" @click.stop="openFile(true)">
-            type="primary"
-            v-if="hasEdit && isManage && !viewStatus"
-            @click.stop="openFile(true)"
-          >
             {{ $t('trials:trialDocument:trainRecord:button:uploadFolder') }}
           </el-button>
-          <el-button
+          <el-button type="primary" v-if="hasAdd && isManage && !viewStatus" @click.stop="handleAdd">
-            type="primary"
-            v-if="hasAdd && isManage && !viewStatus"
-            @click.stop="handleAdd"
-          >
             {{ $t('trials:trialDocument:trainRecord:button:add') }}
           </el-button>
-          <el-button
+          <el-button type="primary" icon="el-icon-bottom" :disabled="selectTable.length <= 0"
-            type="primary"
+            v-if="hasDownLoad && isManage && !viewStatus" @click.stop="downLoad">
-            icon="el-icon-bottom"
-            :disabled="selectTable.length <= 0"
-            v-if="hasDownLoad && isManage && !viewStatus"
-            @click.stop="downLoad"
-          >
             {{ $t('trials:trialDocument:trainRecord:button:downLoadFile') }}
           </el-button>
         </el-form-item>
       </el-form>
     </div>
 
-    <el-table
+    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" style="width: 100%"
-      v-loading="loading"
+      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
-      v-adaptive="{ bottomOffset: 75 }"
+      <el-table-column type="selection" width="55" v-if="isManage && !viewStatus" />
-      :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
+      <el-table-column prop="TrianingDate" :label="$t('trials:trialDocument:trainRecord:table:TrianingDate')"
-        prop="TrianingDate"
+        show-overflow-tooltip sortable="custom">
-        :label="$t('trials:trialDocument:trainRecord:table:TrianingDate')"
-        show-overflow-tooltip
-        sortable="custom"
-      >
         <template slot-scope="scope">
-          <el-tooltip
+          <el-tooltip v-if="!scope.row.TrianingDate" class="item" effect="dark"
-            v-if="!scope.row.TrianingDate"
+            :content="$t('trials:trialDocument:trainRecord:tip:noTrianingDate')" placement="top">
-            class="item"
+            <i class="el-icon-warning" style="cursor: pointer; color: #f56c6c"></i>
-            effect="dark"
-            :content="$t('trials:trialDocument:trainRecord:tip:noTrianingDate')"
-            placement="top"
-          >
-            <i
-              class="el-icon-warning"
-              style="cursor: pointer; color: #f56c6c"
-            ></i>
           </el-tooltip>
           <span v-else>{{ scope.row.TrianingDate }}</span>
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column prop="TrianingCount" :label="$t('trials:trialDocument:trainRecord:table:TrianingCount')"
-        prop="TrianingCount"
+        show-overflow-tooltip sortable="custom" />
-        :label="$t('trials:trialDocument:trainRecord:table:TrianingCount')"
+      <el-table-column prop="TrianingState" :label="$t('trials:trialDocument:trainRecord:table:TrianingState')"
-        show-overflow-tooltip
+        show-overflow-tooltip sortable="custom" />
-        sortable="custom"
+      <el-table-column prop="Note" :label="$t('trials:trialDocument:trainRecord:table:Note')" show-overflow-tooltip
-      />
+        sortable="custom" />
-      <el-table-column
-        prop="TrianingState"
-        :label="$t('trials:trialDocument:trainRecord:table:TrianingState')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="Note"
-        :label="$t('trials:trialDocument:trainRecord:table:Note')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
       <!--文件名称-->
-      <el-table-column
+      <el-table-column prop="FileName" :label="$t('trials:trialDocument:trainRecord:table:name')" show-overflow-tooltip
-        prop="FileName"
+        sortable="custom">
-        :label="$t('trials:trialDocument:trainRecord:table:name')"
-        show-overflow-tooltip
-        sortable="custom"
-      >
         <template slot-scope="scope">
-          <div
+          <div v-if="
-            v-if="
+            scope.row.TrialFileRecord &&
-              scope.row.TrialFileRecord &&
+            scope.row.TrialFileRecord.TrialFileTypeId
-              scope.row.TrialFileRecord.TrialFileTypeId
+          " style="display: flex; align-items: center">
-            "
-            style="display: flex; align-items: center"
-          >
             <span class="fileName">{{
               scope.row.TrialFileRecord.FileName
             }}</span>
             <div v-if="isManage && !viewStatus" class="fileBtnBox">
-              <i
+              <i class="el-icon-view" @click.stop="preview(scope.row.TrialFileRecord)" />
-                class="el-icon-view"
+              <i class="el-icon-download" v-if="hasDownLoad"
-                @click.stop="preview(scope.row.TrialFileRecord)"
+                @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-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
+          <i v-else-if="isManage && !viewStatus && hasEdit" class="el-icon-upload2"
-            v-else-if="isManage && !viewStatus && hasEdit"
+            style="cursor: pointer; color: #409eff" @click.stop="upload(scope.row, 'Trial')" />
-            class="el-icon-upload2"
-            style="cursor: pointer; color: #409eff"
-            @click.stop="upload(scope.row, 'Trial')"
-          />
         </template>
       </el-table-column>
 
       <!--历史记录-->
-      <el-table-column
+      <el-table-column prop="HistoryFileRecord" :label="$t('trials:trialDocument:trainRecord:table:historyFileRecord')"
-        prop="HistoryFileRecord"
+        show-overflow-tooltip v-if="isManage && !viewStatus">
-        :label="$t('trials:trialDocument:trainRecord:table:historyFileRecord')"
-        show-overflow-tooltip
-        v-if="isManage && !viewStatus"
-      >
         <template slot-scope="scope">
-          <div
+          <el-button type="text" @click.stop="openHistory(scope.row)">
-            v-if="
+            {{ scope.row.HistoryCount }}
-              scope.row.HistoryFileRecord &&
+            <i class="el-icon-upload2" />
-              scope.row.HistoryFileRecord.TrialFileTypeId
+          </el-button>
-            "
-            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')"
-          />
         </template>
       </el-table-column>
 
-      <el-table-column
+      <el-table-column prop="IsAuthorizedView" :label="$t('trials:trialDocument:trainRecord:table:isAuthorizedView')"
-        prop="IsAuthorizedView"
+        show-overflow-tooltip sortable="custom" v-if="isManage && !viewStatus">
-        :label="$t('trials:trialDocument:trainRecord:table:isAuthorizedView')"
-        show-overflow-tooltip
-        sortable="custom"
-        v-if="isManage && !viewStatus"
-      >
         <template slot-scope="scope">
-          <el-switch
+          <el-switch :disabled="!scope.row.TrianingDate" v-if="isManage && !viewStatus && hasEdit"
-            :disabled="!scope.row.TrianingDate"
+            v-model="scope.row.IsAuthorizedView" @change="(val) => auth(false, scope.row, val)" :active-value="true"
-            v-if="isManage && !viewStatus && hasEdit"
+            :inactive-value="false" :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)">
-            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
+      <el-table-column prop="UpdateTime" :label="$t('trials:trialDocument:trainRecord:table:updateTime')"
-        prop="UpdateTime"
+        show-overflow-tooltip sortable="custom" />
-        :label="$t('trials:trialDocument:trainRecord:table:updateTime')"
+      <el-table-column prop="CreateTime" :label="$t('trials:trialDocument:trainRecord:table:createTime')"
-        show-overflow-tooltip
+        show-overflow-tooltip sortable="custom" />
-        sortable="custom"
-      />
-      <el-table-column
-        prop="CreateTime"
-        :label="$t('trials:trialDocument:trainRecord:table:createTime')"
-        show-overflow-tooltip
-        sortable="custom"
-      />
       <el-table-column :label="$t('common:action:action')" width="200">
         <template slot-scope="scope">
-          <el-button
+          <el-button icon="el-icon-view" :title="$t('common:button:view')" circle :disabled="!scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
-            icon="el-icon-view"
+            " @click.stop="preview(scope.row.TrialFileRecord)" />
-            :title="$t('common:button:view')"
+          <el-button v-if="hasEdit && isManage && !viewStatus" icon="el-icon-edit-outline"
-            circle
+            :title="$t('common:button:edit')" circle @click.stop="handleEdit(scope.row)" />
-            :disabled="
+          <el-button v-if="hasDownLoad && isManage && !viewStatus" icon="el-icon-download" :title="$t('trials:trialDocument:trainRecord:button:downLoadFile')
-              !scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
+            " circle :disabled="!scope.row.TrialFileRecord || !scope.row.TrialFileRecord.FilePath
-            "
+              " @click.stop="downLoad(false, scope.row.TrialFileRecord, 'file')" />
-            @click.stop="preview(scope.row.TrialFileRecord)"
+          <el-button v-if="hasDel && isManage && !viewStatus" icon="el-icon-delete"
-          />
+            :title="$t('trials:trialDocument:trainRecord:button:delete')" circle @click.stop="handleDel(scope.row)" />
-          <el-button
-            v-if="hasEdit && isManage && !viewStatus"
-            icon="el-icon-edit-outline"
-            :title="$t('common:button:edit')"
-            circle
-            @click.stop="handleEdit(scope.row)"
-          />
-          <el-button
-            v-if="hasDownLoad && isManage && !viewStatus"
-            icon="el-icon-download"
-            :title="
-              $t('trials:trialDocument:trainRecord: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:trainRecord:button:delete')"
-            circle
-            @click.stop="handleDel(scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 分页组件 -->
-    <pagination
+    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-      class="page"
+      @pagination="getList" />
-      :total="total"
+    <upload-files :config="config" :faccept="faccept" :uploadPath="uploadPath" :limitLength="limitLength"
-      :page.sync="searchData.PageIndex"
+      v-if="config.visible" @close="close" @uplaodFile="uplaodFile" />
-      :limit.sync="searchData.PageSize"
+    <trainRecord-form :ArchiveTypeEnum="ArchiveTypeEnum" :rowData="rowData" :config="update_config" :data="selectData"
-      @pagination="getList"
+      v-if="update_config.visible" @close="updateClose" @getList="getList" />
-    />
+    <history-file-list :config="file_config" :rowData="fileData" :uploadPath="uploadPath" @getList="getList" />
-    <upload-files
-      :config="config"
-      :faccept="faccept"
-      :uploadPath="uploadPath"
-      :limitLength="limitLength"
-      v-if="config.visible"
-      @close="close"
-      @uplaodFile="uplaodFile"
-    />
-    <trainRecord-form
-      :ArchiveTypeEnum="ArchiveTypeEnum"
-      :rowData="rowData"
-      :config="update_config"
-      :data="selectData"
-      v-if="update_config.visible"
-      @close="updateClose"
-      @getList="getList"
-    />
   </box-content>
 </template>
-    <script>
+<script>
 import {
   addOrUpdateTrialFileType,
   getTrialTrianingRecordList,
@@ -438,6 +195,7 @@ import Pagination from '@/components/Pagination'
 import BoxContent from '@/components/BoxContent'
 import uploadFiles from '../uploadFiles.vue'
 import trainRecordForm from './form.vue'
+import historyFileList from '../historyFileList.vue'
 const searchDataDefault = () => {
   return {
     IsAuthorizedView: null,
@@ -454,7 +212,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'trainRecord',
-  components: { BoxContent, Pagination, uploadFiles, trainRecordForm },
+  components: { BoxContent, Pagination, uploadFiles, trainRecordForm, historyFileList },
   props: {
     viewStatus: {
       type: Boolean,
@@ -509,9 +267,24 @@ export default {
         upload: null,
       },
       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')
@@ -870,7 +643,7 @@ export default {
         this.DATA = Object.assign({}, this.rowData)
       },
       immediate: true,
-      deep:true
+      deep: true
     },
   },
   created() {
@@ -918,9 +691,8 @@ export default {
       ])
     },
     TITLE() {
-      return `${this.$fd('ArchiveType', this.ArchiveTypeEnum)} — ${
+      return `${this.$fd('ArchiveType', this.ArchiveTypeEnum)} — ${this.isEN ? this.rowData.Name : this.rowData.NameCN
-        this.isEN ? this.rowData.Name : this.rowData.NameCN
+        }`
-      }`
     },
   },
 }
@@ -931,21 +703,27 @@ export default {
   font-weight: bold;
   margin-bottom: 10px;
 }
+
 .fileName {
   display: inline-block;
   max-width: calc(100% - 60px);
-  white-space: nowrap; /* 文本不换行 */
+  white-space: nowrap;
-  overflow: hidden; /* 超出部分隐藏 */
+  /* 文本不换行 */
+  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;
     }

src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue

@@ -5,45 +5,20 @@
       <el-form :inline="true">
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:uploadMonitor:table:siteId')">
-          <el-select
+          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width: 120px">
-            v-model="searchData.TrialSiteId"
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
-            clearable
+              :value="item.TrialSiteId" />
-            filterable
-            style="width: 120px"
-          >
-            <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:uploadMonitor:table:subjectId')">
-          <el-input
+          <el-input v-model="searchData.SubjectInfo" style="width: 120px" clearable />
-            v-model="searchData.SubjectInfo"
-            style="width: 120px"
-            clearable
-          />
         </el-form-item>
         <!-- 访视名称 -->
-        <el-form-item
+        <el-form-item class="my_multiple" :label="$t('trials:uploadMonitor:table:visitName')">
-          class="my_multiple"
+          <el-select v-model="searchData.VisitPlanArray" style="width: 140px" clearable multiple>
-          :label="$t('trials:uploadMonitor:table:visitName')"
+            <el-option v-for="(item, index) of visitPlanOptions" :key="index" :label="item.VisitName"
-        >
+              :value="item.VisitNum">
-          <el-select
-            v-model="searchData.VisitPlanArray"
-            style="width: 140px"
-            clearable
-            multiple
-          >
-            <el-option
-              v-for="(item, index) of visitPlanOptions"
-              :key="index"
-              :label="item.VisitName"
-              :value="item.VisitNum"
-            >
               <span style="float: left">{{ item.VisitName }}</span>
             </el-option>
             <el-option key="Other" label="Out of Plan" value="1.11" />
@@ -54,50 +29,25 @@
           <el-input v-model="searchData.StudyCode" />
         </el-form-item>
         <el-form-item :label="$t('trials:uploadMonitor:table:imageType')">
-          <el-select
+          <el-select v-model="searchData.IsDicom" style="width: 120px" clearable>
-            v-model="searchData.IsDicom"
+            <el-option v-for="item of $d.IsDicom" :label="item.label" :value="item.value"
-            style="width: 120px"
+              :key="`RoleName${item.value}`" />
-            clearable
-          >
-            <el-option
-              v-for="item of $d.IsDicom"
-              :label="item.label"
-              :value="item.value"
-              :key="`RoleName${item.value}`"
-            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:uploadMonitor:table:uploader')">
-          <el-input
+          <el-input v-model="searchData.Uploader" style="width: 120px" clearable />
-            v-model="searchData.Uploader"
-            style="width: 120px"
-            clearable
-          />
         </el-form-item>
         <el-form-item :label="$t('trials:uploadMonitor:table:uploadStatus')">
-          <el-select
+          <el-select v-model="searchData.IsSuccess" style="width: 120px" clearable>
-            v-model="searchData.IsSuccess"
+            <el-option v-for="item of $d.YesOrNo" :label="item.label" :value="item.value"
-            style="width: 120px"
+              :key="`RoleName${item.value}`" />
-            clearable
-          >
-            <el-option
-              v-for="item of $d.YesOrNo"
-              :label="item.label"
-              :value="item.value"
-              :key="`RoleName${item.value}`"
-            />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:uploadMonitor:table:uploadTime')">
-          <el-date-picker
+          <el-date-picker v-model="datetimerange" type="datetimerange" :default-time="['00:00:00', '23:59:59']"
-            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')"
+            :end-placeholder="$t('trials:loginLog:table:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
-            value-format="yyyy-MM-dd HH:mm:ss"
+            @change="handleDatetimeChange" />
-            @change="handleDatetimeChange"
-          />
         </el-form-item>
         <el-form-item>
           <!-- 查询 -->
@@ -105,234 +55,119 @@
             {{ $t('common:button:search') }}
           </el-button>
           <!-- 重置 -->
-          <el-button
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
             {{ $t('common:button:reset') }}
           </el-button>
           <!--导出-->
-          <el-button
+          <el-button type="primary" icon="el-icon-download" @click="handleExport">
-            type="primary"
-            icon="el-icon-download"
-            @click="handleExport"
-          >
             {{ $t('common:button:export') }}
           </el-button>
         </el-form-item>
       </el-form>
     </template>
     <template slot="main-container">
-      <el-table
+      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
-        v-adaptive="{ bottomOffset: 60 }"
+        @sort-change="handleSortByColumn" :default-sort="{ prop: 'ArchiveFinishedTime', order: 'descending' }">
-        v-loading="loading"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'ArchiveFinishedTime', order: 'descending' }"
-      >
         <el-table-column type="index" width="40" align="left" />
         <!-- 中心编号 -->
-        <el-table-column
+        <el-table-column prop="TrialSiteCode" min-width="100" :label="$t('trials:uploadMonitor:table:siteId')"
-          prop="TrialSiteCode"
+          show-overflow-tooltip sortable="custom" />
-          min-width="100"
-          :label="$t('trials:uploadMonitor:table:siteId')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
         <!-- 受试者编号 -->
-        <el-table-column
+        <el-table-column prop="SubjectCode" min-width="130" :label="$t('trials:uploadMonitor:table:subjectId')"
-          prop="SubjectCode"
+          show-overflow-tooltip sortable="custom" />
-          min-width="130"
-          :label="$t('trials:uploadMonitor:table:subjectId')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
         <!-- 访视名 -->
-        <el-table-column
+        <el-table-column prop="VisitName" min-width="130" :label="$t('trials:uploadMonitor:table:visitName')"
-          prop="VisitName"
+          show-overflow-tooltip sortable="custom" />
-          min-width="130"
-          :label="$t('trials:uploadMonitor:table:visitName')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
         <!-- 检查编号 -->
-        <el-table-column
+        <el-table-column prop="StudyCode" min-width="130" :label="$t('trials:uploadMonitor:table:studyId')"
-          prop="StudyCode"
+          show-overflow-tooltip sortable="custom" />
-          min-width="130"
-          :label="$t('trials:uploadMonitor:table:studyId')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
         <!-- 影像类型 -->
-        <el-table-column
+        <el-table-column prop="IsDicom" min-width="130" :label="$t('trials:uploadMonitor:table:imageType')"
-          prop="IsDicom"
+          show-overflow-tooltip sortable="custom">
-          min-width="130"
-          :label="$t('trials:uploadMonitor:table:imageType')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
           <template slot-scope="scope">
-            {{ $fd('IsDicom', scope.row.IsDicom) }}
+            <el-tag type="primary">{{ $fd('IsDicom', scope.row.IsDicom) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 上传人 -->
-        <el-table-column
+        <el-table-column prop="Uploader" min-width="130" :label="$t('trials:uploadMonitor:table:uploader')"
-          prop="Uploader"
+          show-overflow-tooltip sortable="custom" />
-          min-width="130"
-          :label="$t('trials:uploadMonitor:table:uploader')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
         <!-- IP -->
-        <el-table-column
+        <el-table-column prop="IP" min-width="100" :label="$t('trials:uploadMonitor:table:ip')" show-overflow-tooltip
-          prop="IP"
+          sortable="custom" />
-          min-width="100"
-          :label="$t('trials:uploadMonitor:table:ip')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
         <!-- 文件数 -->
-        <el-table-column
+        <el-table-column prop="FileCount" min-width="120" :label="$t('trials:uploadMonitor:table:fileCount')"
-          prop="FileCount"
+          show-overflow-tooltip sortable="custom" />
-          min-width="120"
-          :label="$t('trials:uploadMonitor:table:fileCount')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
         <!-- 文件大小 -->
-        <el-table-column
+        <el-table-column prop="FileSize" min-width="130" :label="$t('trials:uploadMonitor:table:fileSize')"
-          prop="FileSize"
+          show-overflow-tooltip sortable="custom">
-          min-width="130"
-          :label="$t('trials:uploadMonitor:table:fileSize')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
           <template slot-scope="scope">
             {{ fileSizeFormatter(scope.row.FileSize) }}
           </template>
         </el-table-column>
         <!-- 是否有重复文件 -->
-        <el-table-column
+        <el-table-column prop="IsDicomReUpload" min-width="150" :label="$t('trials:uploadMonitor:table:isRepetition')"
-          prop="IsDicomReUpload"
+          show-overflow-tooltip sortable="custom">
-          min-width="150"
-          :label="$t('trials:uploadMonitor:table:isRepetition')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
           <template slot-scope="scope">
             {{ $fd('YesOrNo', scope.row.IsDicomReUpload) }}
           </template>
         </el-table-column>
         <!-- 是否上传成功 -->
-        <el-table-column
+        <el-table-column prop="IsSuccess" min-width="150" :label="$t('trials:uploadMonitor:table:uploadStatus')"
-          prop="IsSuccess"
+          show-overflow-tooltip sortable="custom">
-          min-width="150"
-          :label="$t('trials:uploadMonitor:table:uploadStatus')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsSuccess" type="primary">
-              {{ $fd('YesOrNo', scope.row.IsSuccess) }}</el-tag
+              {{ $fd('YesOrNo', scope.row.IsSuccess) }}</el-tag>
-            >
             <el-tag v-else type="danger">
-              {{ $fd('YesOrNo', scope.row.IsSuccess) }}</el-tag
+              {{ $fd('YesOrNo', scope.row.IsSuccess) }}</el-tag>
-            >
           </template>
         </el-table-column>
         <!-- 开始时间 -->
-        <el-table-column
+        <el-table-column prop="UploadStartTime" min-width="140" :label="$t('trials:uploadMonitor:table:beginTime')"
-          prop="UploadStartTime"
+          show-overflow-tooltip sortable="custom">
-          min-width="140"
-          :label="$t('trials:uploadMonitor:table:beginTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
           <template slot-scope="scope">
             {{ scope.row.UploadStartTimeStr }}
           </template>
         </el-table-column>
         <!-- 结束时间 -->
-        <el-table-column
+        <el-table-column prop="ArchiveFinishedTime" min-width="140" :label="$t('trials:uploadMonitor:table:endTime')"
-          prop="ArchiveFinishedTime"
+          show-overflow-tooltip sortable="custom">
-          min-width="140"
-          :label="$t('trials:uploadMonitor:table:endTime')"
-          show-overflow-tooltip
-          sortable="custom"
-        >
           <template slot-scope="scope">
             {{ scope.row.ArchiveFinishedTime }}
           </template>
         </el-table-column>
         <!-- 总共用时 -->
-        <el-table-column
+        <el-table-column prop="TotalMillisecondsInterval" min-width="100"
-          prop="TotalMillisecondsInterval"
+          :label="$t('trials:uploadMonitor:table:totalTime')" show-overflow-tooltip>
-          min-width="100"
-          :label="$t('trials:uploadMonitor:table:totalTime')"
-          show-overflow-tooltip
-        >
           <template slot-scope="scope">
             {{ scope.row.TimeInterval }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column :label="$t('common:action:action')" width="80" fixed="right">
-          :label="$t('common:action:action')"
-          width="80"
-          fixed="right"
-        >
           <template slot-scope="scope">
             <!-- 查看 -->
-            <el-button
+            <el-button circle :title="$t('trials:readTask:button:view')" :disabled="!scope.row.RecordPath"
-              circle
+              icon="el-icon-view" @click="handleLook(scope.row)" />
-              :title="$t('trials:readTask:button:view')"
-              :disabled="!scope.row.RecordPath"
-              icon="el-icon-view"
-              @click="handleLook(scope.row)"
-            />
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-        class="page"
+        @pagination="getList" />
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
     </template>
-    <el-dialog
+    <el-dialog v-if="lookVisible" :title="$t('trials:uploadMonitor:dagTitle:look')" :visible.sync="lookVisible"
-      v-if="lookVisible"
+      width="800px" append-to-body :close-on-click-modal="false" custom-class="base-dialog-wrapper">
-      :title="$t('trials:uploadMonitor:dagTitle:look')"
-      :visible.sync="lookVisible"
-      width="800px"
-      append-to-body
-      :close-on-click-modal="false"
-      custom-class="base-dialog-wrapper"
-    >
       <div style="max-height: 500px; overflow-y: auto; padding: 0 20px">
-        <div
+        <div style="
-          style="
             display: flex;
             justify-content: space-around;
             margin-bottom: 20px;
-          "
+          ">
-        >
+          <span>{{ $t('trials:uploadDicomList:table:FailedNumber') }}:
-          <span
+            {{ lookText.Failed.length }}</span>
-            >{{ $t('trials:uploadDicomList:table:FailedNumber') }}:
+          <span>{{ $t('trials:uploadDicomList:table:ExistedNumber') }}:
-            {{ lookText.Failed.length }}</span
+            {{ lookText.Existed.length }}</span>
-          >
+          <span>{{ $t('trials:uploadDicomList:table:UploadedNumber') }}:
-          <span
+            {{ lookText.Uploaded.length }}</span>
-            >{{ $t('trials:uploadDicomList:table:ExistedNumber') }}:
-            {{ lookText.Existed.length }}</span
-          >
-          <span
-            >{{ $t('trials:uploadDicomList:table:UploadedNumber') }}:
-            {{ lookText.Uploaded.length }}</span
-          >
         </div>
         <div style="margin-bottom: 10px; font-size: 12px">
           <div style="font-size: 14px; margin-bottom: 5px">
@@ -379,6 +214,7 @@ import { getStudyUploadMonitor_Export } from '@/api/export'
 import Pagination from '@/components/Pagination'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
+import { changeURLStatic } from '@/utils/history.js'
 import axios from 'axios'
 const searchDataDefault = () => {
   return {
@@ -421,10 +257,26 @@ export default {
     if (this.$route.query.studyCode) {
       this.searchData.StudyCode = this.$route.query.studyCode
     }
+    if (this.$route.query.siteId) {
+      this.searchData.TrialSiteId = this.$route.query.siteId
+    }
+    if (this.$route.query.subjectCode) {
+      this.searchData.SubjectInfo = this.$route.query.subjectCode
+    }
+    if (this.$route.query.visitNum || this.$route.query.visitNum === 0) {
+      this.searchData.VisitPlanArray = [Number(this.$route.query.visitNum)]
+    }
     this.getList()
     this.getVisitPlanOptions()
+    this.clearnUrl()
   },
   methods: {
+    clearnUrl() {
+      changeURLStatic('siteId', '')
+      changeURLStatic('subjectCode', '')
+      changeURLStatic('visitNum', '')
+
+    },
     async handleLook(row) {
       this.lookVisible = true
       var htmlUrl = this.OSSclientConfig.basePath + row.RecordPath
@@ -482,8 +334,8 @@ export default {
     },
     handleExport() {
       getStudyUploadMonitor_Export(this.searchData)
-        .then((res) => {})
+        .then((res) => { })
-        .catch(() => {})
+        .catch(() => { })
     },
     handleDatetimeChange(val) {
       if (val) {

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -276,7 +276,7 @@
             <template slot-scope="scope">
               <el-progress color="#409eff" :percentage="(
                 (scope.row.dicomInfo.uploadFileSize * 100) /
-                scope.row.dicomInfo.fileSize
+                (scope.row.dicomInfo.fileSize ? scope.row.dicomInfo.fileSize : 1)
               ).toFixed(2) * 1
                 " />
               <span>
@@ -851,6 +851,7 @@ 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 &&