项目邮件配置开放系统标准修改

# Conflicts:
#	src/components/clinicalDataQuestions/components/QuestionFormItem.vue
#	src/components/clinicalDataQuestions/components/QuestionsForm.vue
#	src/components/clinicalDataQuestions/index.vue
#	src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
#	src/views/trials/trials-panel/visit/qc-check/components/questions.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}`,
-    method: 'get'
+    url: `/Dictionary/getChildList`,
+    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}`,
-    method: 'get'
+    url: `/FrontAuditConfig/getModuleTypeDescriptionList`,
+    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/reading.js

@@ -45,10 +45,11 @@ export function saveImageLabelList(param) {
   })
 }
 
-export function getStudyInfo(studyId) {
+export function getStudyInfo(studyId, params) {
   return request({
     url: `/Study/item/${studyId}`,
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 export function getSeriesList(url) {

src/api/trials.js

@@ -4131,3 +4131,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
-    id="canvas"
-    ref="canvas"
-    v-loading="loading"
-    :element-loading-text="NSTip"
-    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 id="canvas" ref="canvas" v-loading="loading" :element-loading-text="NSTip"
+    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)">
@@ -45,6 +39,8 @@
     </div>
 
     <div class="info-subject">
+      <div v-if="series.subjectCode">{{ series.subjectCode }}</div>
+      <div v-if="series.visitName">{{ series.visitName }}</div>
       <div>{{ stack.description }}</div>
       <!-- <div>{{ dicomInfo.hospital }}</div> -->
       <!-- <div v-show="dicomInfo.pid">{{ dicomInfo.pid }}</div> -->
@@ -53,8 +49,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 :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown="sliderMousedown($event)" />
+    <div ref="sliderBox" class="my_slider_box"
+      style="position: absolute;right: 1px;height: calc(100% - 100px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer"
+      @click.stop="goViewer($event)">
+      <div :style="{ top: height + '%' }"
+        style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move"
+        @mousedown="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 15px;color: #f44336;">
       {{ markers.top }}
@@ -81,15 +81,8 @@
     <!-- <div v-show="stack.firstImageLoading" class="load-indicator">
       Loading Series #{{ stack.seriesNumber }}...
     </div>-->
-    <el-dialog
-      v-if="dcmTag.visible"
-      :visible.sync="dcmTag.visible"
-      :close-on-click-modal="false"
-      :title="dcmTag.title"
-      width="1000px"
-      custom-class="base-dialog-wrapper"
-      append-to-body
-    >
+    <el-dialog v-if="dcmTag.visible" :visible.sync="dcmTag.visible" :close-on-click-modal="false" :title="dcmTag.title"
+      width="1000px" custom-class="base-dialog-wrapper" append-to-body>
       <dicom-tags :image-id="stack.imageIds[stack.currentImageIdIndex]" @close="dcmTag.visible = false" />
     </el-dialog>
   </div>
@@ -373,8 +366,7 @@ export default {
         data.string('x00080030')
       )
       this.dicomInfo.series = data.string('x00200011')
-      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${
-        this.stack.imageIds.length
+      this.dicomInfo.frame = `${this.stack.currentImageIdIndex + 1}/${this.stack.imageIds.length
         }`
       this.dicomInfo.size = `${data.uint16('x00280011')}x${data.uint16(
         'x00280010'
@@ -393,6 +385,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
@@ -683,7 +676,7 @@ export default {
       cornerstoneTools.getToolState(
         this.canvas,
         'playClip'
-      ).data[0].loop = false
+      ).data[0].loop = true
     },
     setFps(fps) {
       this.dicomInfo.fps = fps
@@ -1141,6 +1134,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-image {
   position: absolute;
   left: 10px;
@@ -1160,6 +1154,7 @@ export default {
   font-size: 12px;
   /* z-index: 1; */
 }
+
 .info-instance {
   position: absolute;
   right: 15px;
@@ -1192,6 +1187,7 @@ export default {
   margin: 10px;
   cursor: default;
 }
+
 .menu__item:hover {
   color: #ff0000;
 }
@@ -1211,6 +1207,7 @@ li:hover {
   background-color: #e0e0e2;
   color: white;
 }
+
 .my_slider_box:after {
   content: '';
   position: absolute;

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

@@ -22,7 +22,13 @@
       </div>
       <el-table :data="questionForm[question.Id]">
         <el-table-column v-for="item of question.TableQuestions" :key="item.Id" :prop="item.Id"
-          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
+          :label="item.QuestionName" min-width="100" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row[item.Id] && Array.isArray(scope.row[item.Id]) ?
+              scope.row[item.Id].join(" | ")
+              : scope.row[item.Id] }}
+          </template>
+        </el-table-column>
         <el-table-column :label="$t('common:action:action')" min-width="100" show-overflow-tooltip
           v-if="SecondReviewState <= 0">
           <template slot-scope="scope">
@@ -76,7 +82,7 @@
             <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val.trim()" />
           </template>
         </el-select>
-        <!-- 单选 -->
+        <!-- 日期 -->
         <el-date-picker v-if="question.ClinicalQuestionType === 'time'" v-model="questionForm[question.Id]"
           style="width: 200px" align="right" type="date" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
         <!-- 单选 -->
@@ -317,8 +323,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])
@@ -361,11 +365,16 @@ export default {
                   }
                   break
                 case 11:
-                  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]))
+                  if (parseFloat(this.getCurrentAgeByBirthDate(this.questionForm[o.TableQuestionId])) > 0) {
+                    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 {
@@ -405,19 +414,19 @@ export default {
       } catch (e) {
         console.log(e)
       }
-      console.log(num)
+      if (rules.DigitPlaces) {
+        num = num.toFixed(rules.DigitPlaces)
+      }
       return num
     },
     formItemNumberChange(questionId, isTable) {
       try {
         if (isTable) {
           this.calculationList.forEach((v, i) => {
-            console.log(v, i)
             var find = v.CalculateQuestionList.filter(o => {
               return o.QuestionId === questionId
             })
             // find的自动计算值number
-            console.log('find', find)
             if (find) {
               var num = this.logic(v)
               if (num !== false) {
@@ -431,7 +440,6 @@ export default {
               return o.TableQuestionId === questionId
             })
             // find的自动计算值number
-            console.log('find', find)
             // find的自动计算值number
             if (find) {
               var num = this.logic(v)
@@ -502,6 +510,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+::v-deep .el-form-item__label{
+  color: #606266 !important;
+}
 .my_dialog {
   .criterion-form-item {
     ::v-deep .el-form-item__content {

src/components/clinicalDataQuestions/components/QuestionTableFormItem.vue

@@ -1,125 +1,65 @@
 <template>
   <div class="criterion-form-item">
 
-    <el-form-item
-      :label="`${question.QuestionName}`"
-      :prop="question.Id"
-      :rules="[
-        { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
+    <el-form-item :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
+      {
+        required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))),
         message: $t('common:ruleMessage:specify'), trigger: ['blur'],
-          type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''},
+        type: question.ClinicalTableQuestionType === 'checkbox' ? 'array' : ''
+      },
     ]"
-      :class="[question.ClinicalTableQuestionType==='group'?'mb':question.ClinicalTableQuestionType==='upload'?'uploadWrapper':'']"
-    >
-      <el-input
-        v-if="question.ClinicalTableQuestionType==='input'"
-        v-model="questionForm[question.Id]"
-        :max-length="200"
-        :disabled="question.TableQuestionType === 2"
-      />
+      :class="[question.ClinicalTableQuestionType === 'group' ? 'mb' : question.ClinicalTableQuestionType === 'upload' ? 'uploadWrapper' : '']">
+      <el-input v-if="question.ClinicalTableQuestionType === 'input'" v-model="questionForm[question.Id]"
+        :max-length="200" :disabled="question.TableQuestionType === 2" />
       <!-- 多行文本输入框 -->
-      <el-input
-        v-if="question.ClinicalTableQuestionType==='textarea'"
-        v-model="questionForm[question.Id]"
-        :max-length="200"
-        type="textarea"
-        :autosize="{ minRows: 2, maxRows: 4}"
-      />
+      <el-input v-if="question.ClinicalTableQuestionType === 'textarea'" v-model="questionForm[question.Id]"
+        :max-length="200" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
       <!-- 下拉框 -->
-      <el-select
-        v-if="question.ClinicalTableQuestionType==='select'"
-        v-model="questionForm[question.Id]"
-        clearable
-        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode"
-      >
+      <el-select v-if="question.ClinicalTableQuestionType === 'select'" v-model="questionForm[question.Id]" clearable
+        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode">
         <template v-if="question.TableQuestionType === 1">
-          <el-option
-            v-for="item in organList"
-            :key="item.Id"
-            :label="item[question.DataTableColumn]"
-            :value="item[question.DataTableColumn]"
-          />
+          <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
+            :value="item[question.DataTableColumn]" />
         </template>
         <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-          <el-option
-            v-for="item of $d[question.DictionaryCode]"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          />
+          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+            :label="item.label" />
         </template>
-        <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-          <el-option
-            v-for="item of $d[question.DictionaryCode]"
-            :key="item.id"
-            :value="item.value"
-            :label="item.label"
-          />
+        <template
+          v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+            :label="item.label" />
         </template>
         <template v-else>
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-            :value="val"
-          />
+          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
         </template>
 
       </el-select>
       <!-- 单选 -->
-      <el-date-picker
-        v-if="question.ClinicalTableQuestionType === 'time'"
-        v-model="questionForm[question.Id]"
-        format="yyyy-MM-dd"
-        value-format="yyyy-MM-dd"
-        style="width: 200px"
-        align="right"
-        type="date"
-      />
+      <el-date-picker v-if="question.ClinicalTableQuestionType === 'time'" v-model="questionForm[question.Id]"
+        format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px" align="right" type="date" />
       <!-- 单选 -->
-      <el-radio-group
-        v-if="question.ClinicalTableQuestionType==='radio'"
-        v-model="questionForm[question.Id]"
-        @change="((val)=>{formItemChange(val, question)})"
-      >
+      <el-radio-group v-if="question.ClinicalTableQuestionType === 'radio'" v-model="questionForm[question.Id]"
+        @change="((val) => { formItemChange(val, question) })">
         <template v-if="question.DictionaryCode">
-          <el-radio
-            v-for="item of $d[question.DictionaryCode]"
-            :key="item.id"
-            :label="item.value"
-          >
+          <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="item.value">
             {{ item.label }}
           </el-radio>
         </template>
         <template v-if="question.TypeValue">
-          <el-radio
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
+          <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
             {{ val }}
           </el-radio>
         </template>
       </el-radio-group>
       <!-- 复选框 -->
-      <el-checkbox-group
-        v-if="question.ClinicalTableQuestionType==='checkbox'"
-        v-model="questionForm[question.Id]"
-      >
-        <el-checkbox
-          v-for="val in question.TypeValue.split('|')"
-          :key="val"
-          :label="val"
-        >
+      <el-checkbox-group v-if="question.ClinicalTableQuestionType === 'checkbox'" v-model="questionForm[question.Id]">
+        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
           {{ val }}
         </el-checkbox>
       </el-checkbox-group>
-      <el-input
-        v-if="question.ClinicalTableQuestionType === 'number'"
-        v-model="questionForm[question.Id]"
-        type="number"
-        style="width: 200px"
-      >
+      <el-input v-if="question.ClinicalTableQuestionType === 'number'" v-model="questionForm[question.Id]" type="number"
+        @input="limitInput($event, questionForm, question)" style="width: 200px">
         <template v-if="question.Unit" slot="append">{{ question.Unit }}</template>
       </el-input>
     </el-form-item>
@@ -187,6 +127,14 @@ export default {
     }
   },
   methods: {
+    limitInput(value, form, row) {
+      if (value.indexOf('.') > -1) {
+        if (value.split('.')[1].length >= row.DigitPlaces) {
+          this.$set(form, row.Id, parseFloat(value).toFixed(row.DigitPlaces))
+        }
+      }
+      this.$forceUpdate()
+    },
     save() {
     },
     openAddTableCol(row) {
@@ -227,26 +175,32 @@ export default {
     }
   }
 }
+
 .criterion-form-item {
   .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
+
   ::v-deep .el-form-item__content {
     width: 500px;
   }
+
   .el-input {
     width: 100%;
   }
+
   .mb {
     margin-bottom: 0px;
   }
+
   .disabled {
     ::v-deep .el-upload--picture-card {
       display: none;
     }
   }
+
   .uploadWrapper {
     display: flex;
     flex-direction: column;

src/components/clinicalDataQuestions/components/QuestionsForm.vue

@@ -375,7 +375,7 @@ export default {
           console.log(i.Answer ? i.Answer.split(',') : [])
           console.log(this.questionForm)
         } else if (i.ClinicalQuestionType === 'number') {
-          this.$set(this.questionForm, i.Id, i.Answer)
+          this.$set(this.questionForm, i.Id, i.Answer || i.DefaultValue)
         } else if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)
         }

src/components/downloadDicomAndNonedicom/index.vue

@@ -22,7 +22,7 @@
       <i class="el-icon-warning-outline"></i>
       <div v-html="$t('download:tip:message')"></div>
     </div>
-    <!--上传列表@selection-change="handleSelectionChange"-->
+    <!--上传列表@selection-change="handleSelectionChange" @sort-change="handleSortByColumn"-->
     <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 85 }" height="100" :data="list" :loading="loading"
       class="dicomFiles-table" 
       :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">

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
-          v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"
-        ></div>
+        <div v-html="$t(`upload:dicom:tip:message${isReadingTaskViewInOrder}`)"></div>
       </div>
     </div>
     <!--检查列表-->
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
-      <el-table-column
-        prop="SubjectCode"
-        :label="$t('upload:dicom:table:subjectCode')"
-      />
+      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
       <!--任务名称-->
-      <el-table-column
-        prop="TaskBlindName"
-        :label="$t('upload:dicom:table:taskBlindName')"
-      />
+      <el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
       <!--原始检查数-->
-      <el-table-column
-        prop="OrginalStudyList"
-        :label="$t('upload:dicom:table:orginalStudyListNum')"
-      >
+      <el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
         <template slot-scope="scope">
-          <el-button
-            v-if="
+          <el-button v-if="
             scope.row.OrginalStudyList &&
             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
-        prop="UploadStudyList"
-        :label="$t('upload:dicom:table:uploadStudyListNum')"
-      >
+      <el-table-column prop="UploadStudyList" :label="$t('upload:dicom:table:uploadStudyListNum')">
         <template slot-scope="scope">
-          <el-button
-            v-if="
+          <el-button v-if="
             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
-        :label="$t('common:action:action')"
-        fixed="right"
-        width="180"
-      >
+      <el-table-column :label="$t('common:action:action')" fixed="right" width="180">
         <template slot-scope="scope">
           <div class="btnBox">
             <!--上传--->
-            <form
-              id="inputForm"
-              :ref="`uploadForm_${scope.row.Id}`"
-              enctype="multipart/form-data"
-            >
+            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data">
               <div class="form-group" style="margin-right: 10px">
-                <div
-                  :id="`directoryInputWrapper_${scope.row.Id}`"
-                  class="btn btn-link file-input"
-                >
-                  <el-button
-                    circle
-                    icon="el-icon-upload2"
-                    :disabled="btnLoading"
-                    :loading="btnLoading"
-                    :title="$t('upload:dicom:button:upload')"
-                  />
-                  <input
-                    :title="$t('upload:dicom:button:upload')"
-                    type="file"
-                    :name="`file_${scope.row.VisitTaskId}`"
-                    :ref="`pathClear_${scope.row.VisitTaskId}`"
-                    :disabled="btnLoading"
-                    webkitdirectory
-                    multiple
-                    @change="
+                <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
+                  <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
+                    :title="$t('upload:dicom:button:upload')" />
+                  <input :title="$t('upload:dicom:button:upload')" type="file" :name="`file_${scope.row.VisitTaskId}`"
+                    :ref="`pathClear_${scope.row.VisitTaskId}`" :disabled="btnLoading" webkitdirectory multiple @change="
                       ($event) => beginScanFiles($event, scope.row.VisitTaskId)
-                    "
-                  />
+                    " />
                 </div>
               </div>
             </form>
             <!--预览--->
-            <el-button
-              circle
-              icon="el-icon-view"
-              :disabled="
-                !scope.row.UploadStudyList ||
+            <el-button circle icon="el-icon-view" :disabled="!scope.row.UploadStudyList ||
               scope.row.UploadStudyList.length <= 0
-              "
-              @click.stop="handleViewReadingImages(scope.row)"
-              :title="$t('upload:dicom:button:preview')"
-            />
+              " @click.stop="handleViewReadingImages(scope.row)" :title="$t('upload:dicom:button:preview')" />
             <!--删除--->
-            <el-button
-              circle
-              :disabled="
-                !scope.row.UploadStudyList ||
+            <el-button circle :disabled="!scope.row.UploadStudyList ||
               scope.row.UploadStudyList.length <= 0 ||
               scope.row.ReadingTaskState === 2
-              "
-              icon="el-icon-delete"
-              :title="$t('upload:dicom:button:delete')"
-              @click.stop="remove(scope.row)"
-            />
+              " 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
-                type="primary"
-                :disabled="btnLoading"
-                :loading="btnLoading"
-                size="mini"
-              >
+              <el-button type="primary" :disabled="btnLoading" :loading="btnLoading" size="mini">
                 {{ $t('upload:dicom:button:batchUpload') }}
               </el-button>
-              <input
-                type="file"
-                name="file"
-                ref="pathClear"
-                :disabled="btnLoading"
-                webkitdirectory
-                multiple
-                title=""
-                @change="beginScanFiles($event)"
-              />
+              <input type="file" name="file" ref="pathClear" :disabled="btnLoading" webkitdirectory multiple title=""
+                @change="beginScanFiles($event)" />
             </div>
           </div>
         </form>
       </div>
     </div>
     <!--上传列表-->
-    <el-table
-      ref="dicomFilesTable"
-      v-adaptive="{ bottomOffset: 80 }"
-      height="100"
-      :data="uploadQueues"
-      class="dicomFiles-table"
-      @selection-change="handleSelectionChange"
-    >
+    <el-table ref="dicomFilesTable" v-adaptive="{ bottomOffset: 80 }" height="100" :data="uploadQueues"
+      class="dicomFiles-table" @selection-change="handleSelectionChange">
       <el-table-column type="index" width="40" />
       <el-table-column min-width="200" show-overflow-tooltip>
         <template slot="header">
@@ -182,28 +103,21 @@
           <div style="line-height: 15px">
             <div>
               <div>
-                <span v-if="scope.row.dicomInfo.accNumber"
-                  ><span style="font-weight: 500">Acc:</span>
-                  {{ scope.row.dicomInfo.accNumber }}</span
-                >
+                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</span>
                 <span v-else style="color: #f44336">N/A</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
                 <span v-if="scope.row.dicomInfo.modality.length > 0">
-                  {{ scope.row.dicomInfo.modality.join('、') }},</span
-                >
+                  {{ scope.row.dicomInfo.modality.join('、') }},</span>
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block; margin-right: 2px">
-                <span v-if="scope.row.seriesList.length"
-                  >{{ scope.row.seriesList.length }} Series,</span
-                >
+                <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
                 <span v-else style="color: #f44336">N/A,</span>
               </div>
               <div style="display: inline-block">
-                <span v-if="scope.row.fileList.length"
-                  >{{ scope.row.fileList.length }} Instances</span
-                >
+                <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
                 <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
@@ -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 style="font-weight: 500">PID: </span
-                >{{ scope.row.dicomInfo.patientId }}</span
-              >
+              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight: 500">PID: </span>{{
+                scope.row.dicomInfo.patientId }}</span>
               <span v-else style="color: #f44336">N/A</span>
             </div>
             <div>
-              <span
-                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
-              >
+              <span :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']">
                 {{
                   scope.row.dicomInfo.patientName
                     ? scope.row.dicomInfo.patientName
@@ -260,9 +169,7 @@
               </span>
             </div>
             <div>
-              <span
-                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
-              >
+              <span :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']">
                 {{
                   scope.row.dicomInfo.patientSex
                     ? scope.row.dicomInfo.patientSex
@@ -270,9 +177,7 @@
                 }},
               </span>
 
-              <span
-                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
-              >
+              <span :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']">
                 {{
                   scope.row.dicomInfo.patientAge
                     ? scope.row.dicomInfo.patientAge
@@ -280,11 +185,9 @@
                 }},
               </span>
 
-              <span
-                :class="[
+              <span :class="[
                 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
-        :label="$t('trials:uploadDicomList:table:failedFileCount')"
-        min-width="150"
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="150"
+        show-overflow-tooltip>
         <template slot-scope="scope">
-          <el-progress
-            color="#409eff"
-            :percentage="
-              (
+          <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>
             {{ $t('trials:uploadDicomList:table:uploadNow')
             }}{{ scope.row.dicomInfo.failedFileCount }}/{{
@@ -324,85 +220,52 @@
         </template>
       </el-table-column>
 
-      <el-table-column
-        :label="$t('trials:uploadDicomList:table:status')"
-        min-width="140"
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="140" show-overflow-tooltip>
         <template slot-scope="scope">
-          <span
-            v-if="
+          <span v-if="
             !scope.row.dicomInfo.failedFileCount &&
             !scope.row.dicomInfo.isInit
-            "
-          >
-            {{ $t('trials:uploadDicomList:table:status1') }}</span
-          >
-          <span
-            style="color: #409eff"
-            v-else-if="
+          ">
+            {{ $t('trials:uploadDicomList:table:status1') }}</span>
+          <span style="color: #409eff" v-else-if="
             !scope.row.dicomInfo.failedFileCount &&
             scope.row.dicomInfo.isInit &&
             btnLoading
-            "
-            >{{ $t('trials:uploadDicomList:table:status2') }}</span
-          >
-          <span
-            style="color: #409eff"
-            v-else-if="
+          ">{{ $t('trials:uploadDicomList:table:status2') }}</span>
+          <span style="color: #409eff" v-else-if="
             scope.row.dicomInfo.failedFileCount <
             scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
-            "
-            >{{ $t('trials:uploadDicomList:table:status2') }}</span
-          >
-          <span
-            style="color: #2cc368"
-            v-else-if="
+          ">{{ $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="
+          ">{{ $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
-          >
+          ">{{ $t('trials:uploadDicomList:table:status5') }}</span>
           <span style="color: #f66" v-else>{{
             $t('trials:uploadDicomList:table:Failed')
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        :label="$t('trials:uploadDicomList:table:record')"
-        min-width="140"
-        show-overflow-tooltip
-      >
+      <el-table-column :label="$t('trials:uploadDicomList:table:record')" min-width="140" show-overflow-tooltip>
         <template slot-scope="scope">
           <el-tooltip placement="top" v-if="scope.row.uploadState.record">
             <div slot="content">
               <div style="max-height: 500px; overflow-y: auto">
                 {{ $t('trials:uploadDicomList:table:Existed') }}:
                 <div v-if="scope.row.uploadState.record.Existed.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Existed"
-                    :key="item"
-                    style="font-size: 12px; color: #baa72a"
-                  >
+                  <div v-for="item of scope.row.uploadState.record.Existed" :key="item"
+                    style="font-size: 12px; color: #baa72a">
                     {{ item }}
                   </div>
                 </div>
                 <div v-else>&nbsp;</div>
                 {{ $t('trials:uploadDicomList:table:Uploaded') }}:
                 <div v-if="scope.row.uploadState.record.Uploaded.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Uploaded"
-                    :key="item"
-                    style="font-size: 12px; color: #24b837"
-                  >
+                  <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item"
+                    style="font-size: 12px; color: #24b837">
                     {{ item }}
                   </div>
                 </div>
@@ -410,11 +273,8 @@
                 <br />
                 {{ $t('trials:uploadDicomList:table:Failed') }}:
                 <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div
-                    v-for="item of scope.row.uploadState.record.Failed"
-                    :key="item"
-                    style="font-size: 12px; color: #f66"
-                  >
+                  <div v-for="item of scope.row.uploadState.record.Failed" :key="item"
+                    style="font-size: 12px; color: #f66">
                     {{ item }}
                   </div>
                 </div>
@@ -438,16 +298,8 @@
         </template>
       </el-table-column>
     </el-table>
-    <study-view
-      v-if="model_cfg.visible"
-      :model_cfg="model_cfg"
-      :IsDicom="true"
-      :bodyPart="bodyPart"
-      :modelList="modelList"
-      :isUpload="openIsUpload"
-      :TrialModality="TrialModality"
-      @getList="getList"
-    />
+    <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
+      :modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
   </div>
 </template>
 <script>
@@ -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,10 +1132,8 @@ export default {
                             dicomInfo.failedFileCount++
                             Record.FileCount++
                           } else {
-                            let path = `/${params.trialId}/Image/${
-                              params.subjectId
-                            }/${params.subjectVisitId}/${
-                              dicomInfo.visitTaskId
+                            let path = `/${params.trialId}/Image/${params.subjectId
+                              }/${params.subjectVisitId}/${dicomInfo.visitTaskId
                               }/${scope.getGuid(
                                 dicomInfo.studyUid +
                                 v.seriesUid +
@@ -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/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -29,9 +29,7 @@
               <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
-                    scope.row.FileSize && scope.row.FileSize > 0
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
-                      : ''
+                    $FormatSize(scope.row.FileSize)
                   }}</span>
                 </template>
               </el-table-column>
@@ -68,9 +66,7 @@
               <el-table-column prop="FileSize" :label="$t('trials:audit:table:nonDicomsFileSize')" width="100">
                 <template slot-scope="scope">
                   <span>{{
-                    scope.row.FileSize && scope.row.FileSize > 0
-                      ? `${(scope.row.FileSize / 1024 / 1024).toFixed(3)}MB`
-                      : ''
+                    $FormatSize(scope.row.FileSize)
                   }}</span>
                 </template>
               </el-table-column>

src/components/uploadDicomAndNonedicom/study-view.vue

@@ -206,7 +206,6 @@ export default {
       default: true,
     },
     isUpload: {
-      required: true,
       type: Boolean,
       default: false,
     },

src/icons/svg/elliptical.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751350116150" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20392" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M870.4 819.2a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4zM512 179.2a332.8 332.8 0 1 1 0 665.6 332.8 332.8 0 0 1 0-665.6z m0 51.2a281.6 281.6 0 1 0 0 563.2 281.6 281.6 0 0 0 0-563.2zM153.6 102.4a51.2 51.2 0 1 1 0 102.4 51.2 51.2 0 0 1 0-102.4z" fill="#ADAEB8" p-id="20393"></path></svg>

src/icons/svg/lengthscale.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751349783728" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9505" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M838.4 279.466667zM802.133333 814.933333H279.466667c-38.4 0-70.4-32-70.4-70.4V219.733333c0-38.4 32-70.4 70.4-70.4h123.733333c38.4 0 70.4 32 70.4 70.4v339.2h347.733333c2.133333 0-2.133333 0 0 0 25.6-2.133333 51.2 21.333333 51.2 46.933334v136.533333c0 40.533333-32 72.533333-70.4 72.533333z m25.6-179.2c2.133333-29.866667-34.133333-27.733333-34.133333-27.733333H445.866667c-2.133333 0-2.133333-2.133333-4.266667-2.133333h-2.133333c-8.533333-4.266667-12.8-10.666667-12.8-21.333334v-362.666666c0-14.933333-12.8-27.733333-27.733334-27.733334h-117.333333c-14.933333 0-27.733333 12.8-27.733333 27.733334v64h115.2c12.8 0 23.466667 10.666667 23.466666 23.466666 0 12.8-10.666667 23.466667-23.466666 23.466667h-115.2v78.933333h78.933333c12.8 0 23.466667 10.666667 23.466667 23.466667 0 12.8-10.666667 23.466667-23.466667 23.466667h-78.933333v78.933333h115.2c12.8 0 23.466667 10.666667 23.466666 23.466667 0 12.8-10.666667 23.466667-23.466666 23.466666h-115.2v149.333334c0 14.933333 12.8 27.733333 27.733333 27.733333H426.666667v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h96v-68.266667c0-12.8 10.666667-25.6 23.466667-25.6 12.8 0 23.466667 10.666667 23.466666 25.6V768h78.933334v-85.333333c0-12.8 10.666667-25.6 23.466666-25.6 12.8 0 23.466667 10.666667 23.466667 25.6v85.333333h51.2c14.933333 0 27.733333-12.8 27.733333-27.733333l6.4-104.533334z" p-id="9506"></path></svg>

src/main.js

@@ -26,6 +26,9 @@ Vue.use(VueClipboard)
 import permission from './utils/permission'
 Vue.use(permission)
 
+import { formatSize } from "./utils"
+Vue.prototype.$FormatSize = formatSize
+
 import Viewer from 'v-viewer'
 import './assets/css/viewer.css'
 Viewer.setDefaults({
@@ -56,6 +59,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'
@@ -270,6 +275,13 @@ async function VueInit() {
     }
     return companyName;
   }
+  Vue.prototype.$reg = () => {
+    if (localStorage.getItem('CompanyInfo')) {
+      let { EmailRegexStr } = JSON.parse(localStorage.getItem('CompanyInfo'))
+      return { EmailRegexStr }
+    }
+    return { EmailRegexStr: '/^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/' };
+  }
   Vue.prototype.$updateDictionary = function () {
     Vue.prototype.$d = function (code) {
       var dictInfo = res.Result

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/dcmUpload/anonymization.js

@@ -15,6 +15,7 @@ export const anonymization = function (file, config) {
         let dataset = dcmjs.data.DicomMessage.readFile(buffer)
         for (var i = 0; i < AnonymizeFixedList.length; i++) {
           let AnonymizeFixed = AnonymizeFixedList[i]
+          if (!dataset.dict.hasOwnProperty(`${AnonymizeFixed.Group + AnonymizeFixed.Element}`)) continue
           if (dataset.dict[AnonymizeFixed.Group + AnonymizeFixed.Element]) {
             dataset.dict[AnonymizeFixed.Group + AnonymizeFixed.Element].Value[0] = AnonymizeFixed.ReplaceValue
           } else {
@@ -28,6 +29,7 @@ export const anonymization = function (file, config) {
         }
         for (var i = 0; i < AnonymizeNotFixedList.length; i++) {
           let AnonymizeNotFixed = AnonymizeNotFixedList[i]
+          // if (!dataset.dict.hasOwnProperty(`${AnonymizeNotFixed.Group + AnonymizeNotFixed.Element}`)) continue
           if (AnonymizeNotFixed.Group + AnonymizeNotFixed.Element === '00100020') {
             console.log(`${DicomStoreInfo.TrialCode}_${DicomStoreInfo.SubjectCode}`)
             if (dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element]) {
@@ -53,9 +55,9 @@ export const anonymization = function (file, config) {
             }
           }
         }
-        // console.log(dataset)
+
         try {
-          let newDicomFile = dataset.write()
+          let newDicomFile = dataset.write({ fragmentMultiframe: false }) // fragmentMultiframe 原始数据是否进行分割
           const bufferArray = new Uint8Array(newDicomFile)
           const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
           resolve({ blob, pixelDataElement })

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/admin/user/components/UserInfo.vue

@@ -179,7 +179,8 @@ export default {
             trigger: 'blur',
           },
           {
-            type: 'email',
+            // type: 'email',
+            pattern: new RegExp(this.$reg().EmailRegexStr),
             message: 'Please input the correct email address',
             trigger: ['blur'],
           },

src/views/dicom-show/dicom-study.vue

@@ -194,7 +194,8 @@ export default {
       currentLoadIns: [],
       isFromCRCUpload: false,
       isReading: null,
-      activeSeriesId: null
+      activeSeriesId: null,
+      isPacs: false
     }
   },
   created: function () {
@@ -211,6 +212,9 @@ export default {
     if (this.$router.currentRoute.query.isReading) {
       this.isReading = this.$router.currentRoute.query.isReading
     }
+    if (this.$router.currentRoute.query.isPacs) {
+      this.isPacs = Boolean(this.$router.currentRoute.query.isPacs)
+    }
     this.studyId = this.$router.currentRoute.query.studyId
     this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     if (this.type === 'Series') {
@@ -241,7 +245,11 @@ export default {
   },
   methods: {
     async loadStudy() {
-      const data = await getStudyInfo(this.studyId)
+      let params = {}
+      if (this.isPacs) {
+        params.IsPacs = true
+      }
+      const data = await getStudyInfo(this.studyId, params)
       if (data.IsSuccess) {
         if (data.Result) {
           this.studyCode = data.Result.StudyCode
@@ -250,6 +258,11 @@ export default {
           this.description = data.Result.Description
         }
         let isReading = !!this.isReading ? `?IsReading=true` : ''
+        if (isReading && this.isPacs) {
+          isReading += `&IsPacs=true`
+        } else if (!isReading && this.isPacs) {
+          isReading = `?IsPacs=true`
+        }
         const url = `/series/list/${this.studyId}${isReading}`
         this.getSeriesList(url)
       }
@@ -300,7 +313,9 @@ export default {
               loadStatus: false,
               imageloadedArr: [],
               isExistMutiFrames: item.IsExistMutiFrames,
-              isShowPopper: false
+              isShowPopper: false,
+              subjectCode: item.SubjectCode,
+              visitName: item.VisitName
             })
           })
           this.seriesList = seriesList
@@ -360,7 +375,9 @@ export default {
               loadStatus: false,
               imageloadedArr: [],
               isExistMutiFrames: item.IsExistMutiFrames,
-              isShowPopper: false
+              isShowPopper: false,
+              subjectCode: item.SubjectCode,
+              visitName: item.VisitName
             })
           })
           this.seriesList = seriesList
@@ -430,7 +447,9 @@ export default {
           loadStatus: false,
           imageloadedArr: [],
           isExistMutiFrames: isExistMutiFrames,
-          isShowPopper: false
+          isShowPopper: false,
+          subjectCode: res.OtherInfo.SubjectCode,
+          visitName: res.OtherInfo.VisitName
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {
@@ -516,7 +535,9 @@ export default {
         isReading: series.isReading,
         isDeleted: series.isDeleted,
         previewImageUrl: series.previewImageUrl,
-        instanceCount: series.instanceCount
+        instanceCount: series.instanceCount,
+        subjectCode: series.SubjectCode,
+        visitName: series.VisitName
       }
       this.$refs.dicomViewer.loadImageStack(seriesInfo)
       if (!series.loadStatus) {
@@ -582,7 +603,9 @@ export default {
           keySeries: seriesInfo.KeySeries,
           loadStatus: false,
           imageloadedArr: [],
-          isShowPopper: false
+          isShowPopper: false,
+          subjectCode: seriesInfo.SubjectCode,
+          visitName: seriesInfo.VisitName
         })
         this.seriesList = seriesList
         if (this.seriesList.length > 0) {

src/views/dicom-show/dicom-visit.vue

@@ -417,7 +417,9 @@ export default {
                 loadStatus: false,
                 imageloadedArr: [],
                 isExistMutiFrames: series.IsExistMutiFrames,
-                isShowPopper: false
+                isShowPopper: false,
+                subjectCode: series.SubjectCode,
+                visitName: series.VisitName
               })
             })
             data.SeriesList = seriesList
@@ -518,7 +520,9 @@ export default {
         isReading: series.isReading,
         isDeleted: series.isDeleted,
         previewImageUrl: series.previewImageUrl,
-        instanceCount: series.instanceCount
+        instanceCount: series.instanceCount,
+        subjectCode: series.SubjectCode,
+        visitName: series.VisitName
       }
       this.$refs.dicomViewer.loadImageStack(seriesInfo)
       if (!series.loadStatus) {
@@ -792,7 +796,9 @@ export default {
                 loadStatus: false,
                 imageloadedArr: [],
                 isExistMutiFrames: item.IsExistMutiFrames,
-                isShowPopper: false
+                isShowPopper: false,
+                subjectCode: item.SubjectCode,
+                visitName: item.VisitName
               })
             })
             // scope.relationStudyList[index].seriesCount = seriesList.length

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

@@ -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 = [
-                'jpg',
-                'jpeg',
-                'png',
-                'pdf',
-                'ppt',
-                'pptx',
-                'doc',
-                'docx',
-                'xls',
-                'xlsx',
-            ]
+            var typeArr = this.accept.map(item => item.split('.')[1])
             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())"
-            :images="[`${OSSclientConfig.basePath}${rowData.FilePath}`]" :options="viewerOptions">
+            v-if="rowDATA.FileFormat && ['png', 'jpg', 'jpeg'].includes(rowDATA.FileFormat.toLowerCase())"
+            :images="[`${OSSclientConfig.basePath}${rowDATA.FilePath}`]" :options="viewerOptions">
 
-            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowData.FilePath}`" alt="Image" />
+            <img v-show="false" :src="`${OSSclientConfig.basePath}${rowDATA.FilePath}`" alt="Image" />
         </viewer>
         <!-- <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible"
             v-if="perview_visible" /> -->
@@ -113,7 +113,7 @@ export default {
             visible: false,
             title: null,
             list: [],
-            rowData: {},
+            rowDATA: {},
             loading: false,
             viewerOptions: {
                 toolbar: {
@@ -167,7 +167,7 @@ export default {
             if (!row.Id) {
                 this.title = this.$t('dictionary:signature:attachmentForm:title:add')
             }
-            this.rowData = Object.assign({}, row)
+            this.rowDATA = Object.assign({}, row)
             this.visible = true
         },
         async getList() {
@@ -207,7 +207,7 @@ export default {
         },
         preview(data) {
             // return this.perview_visible = true
-            this.rowData = Object.assign({}, data)
+            this.rowDATA = Object.assign({}, data)
             if (['.ppt',
                 '.pptx',
                 '.doc',
@@ -234,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

@@ -70,10 +70,11 @@ import ppt from '@/assets/file_icon/ppt.png'
 import pptx from '@/assets/file_icon/pptx.png'
 import xls from '@/assets/file_icon/xls.png'
 import xlsx from '@/assets/file_icon/xlsx.png'
-import mp4 from '@/assets/file_icon/xlsx.png'
+import mp4 from '@/assets/file_icon/mp4.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,
@@ -101,6 +102,10 @@ export default {
         isView: {
             type: Boolean,
             default: false
+        },
+        isTrial: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -142,11 +147,20 @@ export default {
             try {
                 if (!this.SystemDocumentId) return false
                 this.loading = true
+                if (!this.isTrial) {
                     this.searchData.SystemDocumentId = this.SystemDocumentId
+                } else {
+                    this.searchData.TrialDocumentId = this.SystemDocumentId
+                }
                 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

@@ -3,7 +3,8 @@
     <el-form :inline="true">
       <el-form-item label="模块">
         <el-select v-model="queryParams.ModuleTypeId" placeholder="模块" clearable>
-          <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+          <el-option v-for="item of dict.type.ModuleType" :key="`ModuleTypeId${item.value}`" :value="item.value"
+            :label="item.raw.ValueCN" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -12,24 +13,10 @@
       </el-form-item>
     </el-form>
     <div>
-      <el-button
-        type="info"
-        plain
-        icon="el-icon-sort"
-        size="mini"
-        @click="toggleExpandAll"
-      >展开/折叠</el-button>
+      <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
     </div>
-    <el-table
-      v-if="refreshTable"
-      v-adaptive="{bottomOffset:45}"
-      v-loading="loading"
-      height="100"
-      :data="menuList"
-      :default-expand-all="isExpandAll"
-      row-key="Id"
-      :tree-props="{children: 'Children', hasChildren: 'hasChildren'}"
-    >
+    <el-table v-if="refreshTable" v-adaptive="{ bottomOffset: 45 }" v-loading="loading" height="100" :data="menuList"
+      :default-expand-all="isExpandAll" row-key="Id" :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }">
       <el-table-column prop="ModuleTypeValueCN" label="模块" show-overflow-tooltip align="left" min-width="230px" />
       <el-table-column prop="Description" label="操作名称" :show-overflow-tooltip="true" min-width="200px">
         <template slot-scope="scope">
@@ -38,11 +25,21 @@
       </el-table-column>
       <el-table-column prop="DescriptionCN" label="其他" :show-overflow-tooltip="true" min-width="140px">
         <template slot-scope="scope">
-          <span v-if="!scope.row.IsEnable" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: 	#DC143C;color: #fff;" title="被禁用">禁</span>
-          <span v-if="scope.row.IsHaveSign" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #428bca;color: #fff;" title="需要电签">签</span>
-          <span v-if="scope.row.IsHaveReason" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #fab6b6;color: #fff;" title="需要原因">因</span>
-          <span v-if="scope.row.IsFinish" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background:#3CB371;color: #fff;" title="已经记录">记</span>
-          <span v-if="scope.row.IsJoinPlan" style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #FFA500;color: #fff;" title="核对完">核</span>
+          <span v-if="!scope.row.IsEnable"
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: 	#DC143C;color: #fff;"
+            title="被禁用">禁</span>
+          <span v-if="scope.row.IsHaveSign"
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #428bca;color: #fff;"
+            title="需要电签">签</span>
+          <span v-if="scope.row.IsHaveReason"
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #fab6b6;color: #fff;"
+            title="需要原因">因</span>
+          <span v-if="scope.row.IsFinish"
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background:#3CB371;color: #fff;"
+            title="已经记录">记</span>
+          <span v-if="scope.row.IsJoinPlan"
+            style="cursor:pointer;line-height:20px;text-align:center;font-size: 12px;display: inline-block;width: 20px;height: 20px;border-radius: 50%;background: #FFA500;color: #fff;"
+            title="核对完">核</span>
 
         </template>
       </el-table-column>
@@ -50,12 +47,7 @@
       <el-table-column prop="OptTypeValueCN" label="操作类型" show-overflow-tooltip width="100px" />
       <el-table-column prop="ObjectTypeValueCN" label="对象类型" show-overflow-tooltip min-width="100px" />
       <el-table-column prop="ChildrenTypeValueCN" label="数据类型" show-overflow-tooltip min-width="100px" />
-      <el-table-column
-        prop="Sort"
-        label="显示顺序"
-        min-width="80"
-        show-overflow-tooltip
-      />
+      <el-table-column prop="Sort" label="显示顺序" min-width="80" show-overflow-tooltip />
       <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
@@ -66,38 +58,25 @@
         <template slot-scope="scope">
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text"
-            @click="handleUpMove(scope.row)"
-          >上移</el-button>
-          <el-button
-            type="text"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
+            type="text" @click="handleUpMove(scope.row)">上移</el-button>
+          <el-button type="text" @click="handleUpdate(scope.row)">修改</el-button>
           <el-button
             v-if="!(scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN)"
-            type="text"
-            @click="handleAdd(scope.row)"
-          >新增</el-button>
+            type="text" @click="handleAdd(scope.row)">新增</el-button>
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text"
-            @click="handleChildren(scope.row)"
-          >Children</el-button>
+            type="text" @click="handleChildren(scope.row)">Children</el-button>
           <el-button
             v-if="scope.row.ModuleTypeValueCN && scope.row.ObjectTypeValueCN && scope.row.OptTypeValueCN && scope.row.ChildrenTypeValueCN"
-            type="text"
-            @click="handleCopy(scope.row)"
-          >复制到</el-button>
-          <el-button
-            type="text"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
+            type="text" @click="handleCopy(scope.row)">复制到</el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" top="100px" :close-on-click-modal="false" id="check_config" :visible.sync="open" :width="form.DataType === 'Table' ? '1280px' : '680px'" append-to-body>
+    <el-dialog :title="title" top="100px" :close-on-click-modal="false" id="check_config" :visible.sync="open"
+      :width="form.DataType === 'Table' ? '1280px' : '680px'" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col v-show="title !== '复制'" :span="24">
@@ -105,14 +84,8 @@
           </el-col>
           <el-col :span="24">
             <el-form-item :label="form.ConfigType == 'M' ? title !== '复制' ? '选择父节点' : '复制到' : '操作名称'">
-                <treeselect
-                  :disabled="form.ConfigType === 'C'"
-                  v-model="form.ParentId"
-                  :options="menuOptions"
-                  :normalizer="normalizer"
-                  :show-count="true"
-                  placeholder="选择上级操作"
-                />
+              <treeselect :disabled="form.ConfigType === 'C'" v-model="form.ParentId" :options="menuOptions"
+                :normalizer="normalizer" :show-count="true" placeholder="选择上级操作" />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType == 'M' && title !== '复制'" :span="12">
@@ -157,28 +130,36 @@
           <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
             <el-form-item label="功能模块" prop="menuType">
               <el-select v-model="form.ModuleTypeId" placeholder="模块" clearable size="small" @change="changeModule">
-                  <el-option v-for="item of dict.type.ModuleType" :key="`ModuleType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+                <el-option v-for="item of dict.type.ModuleType" :key="`ModuleType${item.value}`" :value="item.value"
+                  :label="item.raw.ValueCN" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
             <el-form-item label="操作类型" prop="menuType">
               <el-select v-model="form.OptTypeId" placeholder="操作类型" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.OptType" :key="`OptTypeId${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+                <el-option v-for="item of dict.type.OptType" :key="`OptTypeId${item.value}`" :value="item.value"
+                  :label="item.raw.ValueCN" />
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
             <el-form-item label="对象类型" prop="menuType">
-                <el-select v-model="form.ObjectTypeId" placeholder="对象类型" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.ObjectType" :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup" :value="item.value" :label="item.raw.ValueCN" />
+              <el-select v-model="form.ObjectTypeId" placeholder="对象类型" clearable size="small"
+                @change="changeDescription">
+                <template v-for="item of dict.type.ObjectType">
+                  <el-option :key="`ObjectType${item.value}`" v-if="ChildGroup === item.raw.ChildGroup"
+                    :value="item.value" :label="item.raw.ValueCN" />
+                </template>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'M' && title !== '复制'" :span="12">
             <el-form-item label="数据类型" prop="menuType">
-                <el-select v-model="form.ChildrenTypeId" placeholder="操作子类" clearable size="small" @change="changeDescription">
-                  <el-option v-for="item of dict.type.ChildrenType" :key="`ChildrenType${item.value}`" :value="item.value" :label="item.raw.ValueCN" />
+              <el-select v-model="form.ChildrenTypeId" placeholder="操作子类" clearable size="small"
+                @change="changeDescription">
+                <el-option v-for="item of dict.type.ChildrenType" :key="`ChildrenType${item.value}`" :value="item.value"
+                  :label="item.raw.ValueCN" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -187,11 +168,7 @@
               <span slot="label">
                 是否电签
               </span>
-                <el-switch
-                  v-model="form.IsHaveSign"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
+              <el-switch v-model="form.IsHaveSign" :active-value="true" :inactive-value="false" />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType == 'M' && title !== '复制'" :span="12">
@@ -199,11 +176,7 @@
               <span slot="label">
                 是否有原因
               </span>
-                <el-switch
-                  v-model="form.IsHaveReason"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
+              <el-switch v-model="form.IsHaveReason" :active-value="true" :inactive-value="false" />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="24">
@@ -223,11 +196,7 @@
               <span slot="label">
                 依赖父数据
               </span>
-                <el-switch
-                  v-model="form.IsShowByTrialConfig"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
+              <el-switch v-model="form.IsShowByTrialConfig" :active-value="true" :inactive-value="false" />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.IsShowByTrialConfig" :span="12">
@@ -242,17 +211,11 @@
             <el-row style="background: #f8f8f8;padding: 0 20px;border-radius: 10px;">
               <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="24">
                 <el-form-item label="前端展示类型">
-                    <el-radio-group v-model="form.DataType" style="line-height: 30px;padding-top: 10px;" @change="(v) => {if (v === 'Table'){rowDrop2()}}">
+                  <el-radio-group v-model="form.DataType" style="line-height: 30px;padding-top: 10px;"
+                    @change="(v) => { if (v === 'Table') { rowDrop2() } }">
                     <el-radio :label="''">字符串</el-radio>
-                      <el-radio label="Array">数组(类似QC问题审核)</el-radio>
-                      <el-radio label="Dialog">对话</el-radio>
-                      <el-radio label="Link">外链</el-radio>
-                      <el-radio label="DialogTable">弹框列表</el-radio>
-                      <el-radio label="Table">表格</el-radio>
-                      <el-radio label="Router">路由</el-radio>
-                      <el-radio label="Image">图片</el-radio>
-                      <el-radio label="ImageList">图片数组</el-radio>
-                      <el-radio label="OSS">OSS</el-radio>
+                    <el-radio :label="item.value" v-for="item in $d.AuditDataType" :key="item.id">{{ item.label
+                    }}</el-radio>
                   </el-radio-group>
                 </el-form-item>
               </el-col>
@@ -271,25 +234,27 @@
                       <span slot="label">
                         是否有参数
                       </span>
-                        <el-switch
-                          v-model="form.UrlConfig.IsHaveParameters"
-                        >
+                      <el-switch v-model="form.UrlConfig.IsHaveParameters">
                       </el-switch>
                     </el-form-item>
                   </el-col>
-                    <el-col :span="4" v-if="form.UrlConfig.IsHaveParameters" style="display: flex;align-items: center;justify-content: flex-end;">
+                  <el-col :span="4" v-if="form.UrlConfig.IsHaveParameters"
+                    style="display: flex;align-items: center;justify-content: flex-end;">
                     <el-button type="primary" size="mini" style="position: relative;top: 5px;" @click="addParameter">
                       增加参数
                     </el-button>
                   </el-col>
                 </el-row>
-                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters" v-for="(item,index) of form.UrlConfig ? form.UrlConfig.ParameterList : []" :key="`Router${index}`">
+                <template v-for="(item, index) of form.UrlConfig ? form.UrlConfig.ParameterList : []">
+                  <el-row v-show="form.DataType === 'Router'" v-if="form.UrlConfig && form.UrlConfig.IsHaveParameters"
+                    :key="`Router${index}`">
                     <el-col :span="10">
                       <el-form-item>
                         <span slot="label">
                           参数名{{ index + 1 }}
                         </span>
-                        <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterName" placeholder="参数名" />
+                        <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterName"
+                          placeholder="参数名" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="10">
@@ -297,213 +262,127 @@
                         <span slot="label">
                           参数值{{ index + 1 }}
                         </span>
-                        <el-input style="width: 150px;" v-model="form.UrlConfig.ParameterList[index].UrlParameterValueName" placeholder="参数值" />
+                        <el-input style="width: 150px;"
+                          v-model="form.UrlConfig.ParameterList[index].UrlParameterValueName" placeholder="参数值" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="4">
-                      <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-delete"
-                        @click="handleParameterListDelete(index)"
-                      >删除</el-button>
+                      <el-button size="mini" type="text" icon="el-icon-delete"
+                        @click="handleParameterListDelete(index)">删除</el-button>
                     </el-col>
                   </el-row>
+                </template>
+
               </el-col>
-                <el-button v-show="form.DataType === 'Table'" type="primary" size="mini" style="position: relative;top: -15px" @click="addCol">
+              <el-button v-show="form.DataType === 'Table'" type="primary" size="mini"
+                style="position: relative;top: -15px" @click="addCol">
                 增加列
               </el-button>
               <el-row v-show="form.DataType === 'Table'" v-if="rowDrop2TableIsShow">
-                  <el-table
-                    :data="form.TableConfigList"
-                    stripe
-                    height="280"
-                  >
-                    <el-table-column
-                      prop="IsList"
-                      min-width="120"
-                      label="是否是数组"
-                      show-overflow-tooltip
-                    >
+                <el-table :data="form.TableConfigList" stripe height="280">
+                  <el-table-column prop="IsList" min-width="120" label="是否是数组" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-switch
-                          v-model="scope.row.IsList"
-                          >
+                      <el-switch v-model="scope.row.IsList">
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="ListName"
-                      min-width="120"
-                      label="数组"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="ListName" min-width="120" label="数组" show-overflow-tooltip>
                     <template slot-scope="scope">
                       <el-input :disabled="!scope.row.IsList" v-model="scope.row.ListName" placeholder="数组" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="IsFixedColumn"
-                      min-width="140"
-                      label="是否固定列名"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="IsFixedColumn" min-width="140" label="是否固定列名" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-switch
-                          v-model="scope.row.IsFixedColumn"
-                        >
+                      <el-switch v-model="scope.row.IsFixedColumn">
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="FixedColumnName"
-                      min-width="120"
-                      label="固定列名"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="FixedColumnName" min-width="120" label="固定列名" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnName" placeholder="固定列名"/>
+                      <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnName"
+                        placeholder="固定列名" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="FixedColumnEnName"
-                      min-width="120"
-                      label="固定列名EN"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="FixedColumnEnName" min-width="120" label="固定列名EN" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnEnName" placeholder="固定列名EN"/>
+                      <el-input :disabled="!scope.row.IsFixedColumn" v-model="scope.row.FixedColumnEnName"
+                        placeholder="固定列名EN" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="ColumnName"
-                      min-width="120"
-                      label="列字段名"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="ColumnName" min-width="120" label="列字段名" show-overflow-tooltip>
                     <template slot-scope="scope">
                       <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnName" placeholder="列字段名" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="ColumnEnName"
-                      min-width="120"
-                      label="列字段名En"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="ColumnEnName" min-width="120" label="列字段名En" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnEnName" placeholder="列字段名En"/>
+                      <el-input :disabled="scope.row.IsFixedColumn" v-model="scope.row.ColumnEnName"
+                        placeholder="列字段名En" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="ColumnValue"
-                      min-width="120"
-                      label="列显示值"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="ColumnValue" min-width="120" label="列显示值" show-overflow-tooltip>
                     <template slot-scope="scope">
                       <el-input v-model="scope.row.ColumnValue" placeholder="列显示值" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="IsMerge"
-                      min-width="80"
-                      label="是否合并"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="IsMerge" min-width="80" label="是否合并" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-switch
-                          v-model="scope.row.IsMerge"
-                        >
+                      <el-switch v-model="scope.row.IsMerge">
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="MergeColumnName"
-                      min-width="120"
-                      label="合并组"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="MergeColumnName" min-width="120" label="合并组" show-overflow-tooltip>
                     <template slot-scope="scope">
                       <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnName" placeholder="合并组" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="MergeColumnEnName"
-                      min-width="120"
-                      label="合并组EN"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="MergeColumnEnName" min-width="120" label="合并组EN" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnEnName" placeholder="合并组EN"/>
+                      <el-input :disabled="!scope.row.IsMerge" v-model="scope.row.MergeColumnEnName"
+                        placeholder="合并组EN" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="IsPicture"
-                      min-width="120"
-                      label="是否图片"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="IsPicture" min-width="120" label="是否图片" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-switch
-                          v-model="scope.row.IsPicture"
-                        >
+                      <el-switch v-model="scope.row.IsPicture">
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="IsDynamicTranslate"
-                      min-width="140"
-                      label="是否动态翻译"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="IsDynamicTranslate" min-width="140" label="是否动态翻译" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-switch
-                          v-model="scope.row.IsDynamicTranslate"
-                        >
+                      <el-switch v-model="scope.row.IsDynamicTranslate">
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="IsNeedTransalate"
-                      min-width="120"
-                      label="是否翻译"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="IsNeedTransalate" min-width="120" label="是否翻译" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-switch
-                          v-model="scope.row.IsNeedTransalate"
-                        >
+                      <el-switch v-model="scope.row.IsNeedTransalate">
                       </el-switch>
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="TranslateDictionaryName"
-                      min-width="120"
-                      label="翻译字典"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="TranslateDictionaryName" min-width="120" label="翻译字典" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-input :disabled="!scope.row.IsNeedTransalate" v-model="scope.row.TranslateDictionaryName" placeholder="合并组"/>
+                      <el-input :disabled="!scope.row.IsNeedTransalate" v-model="scope.row.TranslateDictionaryName"
+                        placeholder="合并组" />
                     </template>
                   </el-table-column>
-                    <el-table-column
-                      prop="MergeColumnName"
-                      min-width="80"
-                      label="操作"
-                      show-overflow-tooltip
-                    >
+                  <el-table-column prop="MergeColumnName" min-width="80" label="操作" show-overflow-tooltip>
                     <template slot-scope="scope">
-                        <el-button
-                          size="mini"
-                          type="text"
-                          icon="el-icon-delete"
-                          @click="handleTableConfigListDelete(scope.row, scope.$index)"
-                        >删除</el-button>
+                      <el-button size="mini" type="text" icon="el-icon-delete"
+                        @click="handleTableConfigListDelete(scope.row, scope.$index)">删除</el-button>
                     </template>
                   </el-table-column>
                 </el-table>
               </el-row>
+              <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === ''" :span="12">
+                <el-form-item>
+                  <span slot="label">
+                    是否修改前展示
+                  </span>
+                  <el-switch v-model="form.IsBeforeModifyView" :active-value="true" :inactive-value="false" />
+                </el-form-item>
+              </el-col>
+
               <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
                 <el-form-item>
                   <span slot="label">
@@ -520,7 +399,9 @@
                   <el-input v-model="form.ChildDataEnLabel" placeholder="请输入子数据LableEN" />
                 </el-form-item>
               </el-col>
-                <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.DataType === 'Array'" :span="12">
+              <el-col
+                v-show="form.ConfigType === 'C' && title !== '复制' && (form.DataType === 'Array' || form.DataType === 'ArrayImage')"
+                :span="12">
                 <el-form-item>
                   <span slot="label">
                     子数据Value
@@ -545,31 +426,23 @@
               <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Dictionary'" :span="12">
                 <el-form-item label="字典表名">
                   <!-- <el-input v-model="form.DictionaryCode" placeholder="请输入字典表名" /> -->
-                    <el-autocomplete
-                      clearable 
-                      class="inline-input"
-                      v-model="form.DictionaryCode"
-                      :fetch-suggestions="querySearch"
-                      placeholder="请输入字典表名"
-                    ></el-autocomplete>
+                  <el-autocomplete clearable class="inline-input" v-model="form.DictionaryCode"
+                    :fetch-suggestions="querySearch" placeholder="请输入字典表名"></el-autocomplete>
                 </el-form-item>
               </el-col>
               <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Dictionary'" :span="12">
                 <el-form-item label="翻译字段">
                   <!-- <el-input v-model="form.DictionaryType" placeholder="请输入翻译字段" /> -->
                   <el-select v-model="form.DictionaryType" clearable placeholder="请选择翻译字段">
-                      <el-option
-                        v-for="item in $d.DictionaryType"
-                        :key="item.id"
-                        :label="item.label"
-                        :value="item.label">
+                    <el-option v-for="item in $d.DictionaryType" :key="item.id" :label="item.label" :value="item.label">
                     </el-option>
                   </el-select>
                 </el-form-item>
               </el-col>
               <el-col v-show="form.ConfigType === 'C' && title !== '复制' && form.EnumType === 'Date'" :span="24">
                 <el-form-item label="时间格式化">
-                    <el-select v-model="form.DateType" placeholder="时间格式化" clearable size="small" @change="changeDescription">
+                  <el-select v-model="form.DateType" placeholder="时间格式化" clearable size="small"
+                    @change="changeDescription">
                     <el-option value="Date" label="日期" />
                     <el-option value="DateTime" label="日期时间" />
                   </el-select>
@@ -607,11 +480,15 @@
               <span slot="label">
                 是否启用
               </span>
-                <el-switch
-                  v-model="form.IsEnable"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
+              <el-switch v-model="form.IsEnable" :active-value="true" :inactive-value="false" />
+            </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>
           <!--分割线-->
@@ -623,11 +500,7 @@
               <span slot="label">
                 是否核对
               </span>
-                <el-switch
-                  v-model="form.IsJoinPlan"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
+              <el-switch v-model="form.IsJoinPlan" :active-value="true" :inactive-value="false" />
             </el-form-item>
           </el-col>
           <el-col v-show="form.ConfigType == 'M' && title !== '复制'" :span="12">
@@ -635,11 +508,7 @@
               <span slot="label">
                 是否记录
               </span>
-                <el-switch
-                  v-model="form.IsFinish"
-                  :active-value="true"
-                  :inactive-value="false"
-                />
+              <el-switch v-model="form.IsFinish" :active-value="true" :inactive-value="false" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -650,44 +519,38 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    <el-drawer
-      :title="drawer_cfg.title"
-      :visible.sync="drawer_cfg.drawerChild"
-      direction="rtl"
-      size="80%"
-    >
+    <el-drawer :title="drawer_cfg.title" :visible.sync="drawer_cfg.drawerChild" direction="rtl" size="80%">
       <div style="padding: 0 40px;display: flex;flex-direction: column">
         <div style="text-align: right;height: 50px;">
-          <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable size="small">
-            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+          <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable
+            size="small">
+            <template v-for="item of list">
+              <el-option :key="item.Id"
+                v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId"
+                :value="item.Id" :label="item.DescriptionCN" />
+            </template>
           </el-select>
-          <el-button type="primary" size="mini" style="margin-right: 10px" @click="handleOverCope(selectRow)">完全拷贝</el-button>
-          <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable size="small">
-            <el-option v-for="item of list" :key="item.Id" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
+          <el-button type="primary" size="mini" style="margin-right: 10px"
+            @click="handleOverCope(selectRow)">完全拷贝</el-button>
+          <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable
+            size="small">
+            <template v-for="item of list">
+              <el-option :key="item.Id"
+                v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId"
+                :value="item.Id" :label="item.DescriptionCN" />
+            </template>
           </el-select>
           <el-button type="primary" size="mini" @click="handleCope(selectRow)">拷贝</el-button>
           <el-button type="primary" size="mini" @click="handleAdd(selectRow)">新建</el-button>
         </div>
         <div style="flex: 1">
-          <el-table
-            v-if="tableShow"
-            v-adaptive="{bottomOffset:0}"
-            v-loading="loading"
-            :data="childrenList"
-            :row-key="selectRow ? selectRow.Id : '1'"
-            class="singleTable"
-            height="100"
-          >
+          <el-table v-if="tableShow" v-adaptive="{ bottomOffset: 0 }" v-loading="loading" :data="childrenList"
+            :row-key="selectRow ? selectRow.Id : '1'" class="singleTable" height="100">
             <el-table-column prop="Code" label="字段名" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="CodeEn" label="字段名英文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="Value" label="字段英文" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column prop="ValueCN" label="字段中文" min-width="120px" :show-overflow-tooltip="true" />
-            <el-table-column
-              prop="Sort"
-              label="显示顺序"
-              min-width="80"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="Sort" label="显示顺序" min-width="80" show-overflow-tooltip />
             <el-table-column label="启用" align="center" prop="CreateTime" min-width="80">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
@@ -717,27 +580,16 @@
                 </span>
               </template>
             </el-table-column>
-            <el-table-column prop="TrialConfigRelyFieldName" label="依赖字段" min-width="120px" :show-overflow-tooltip="true" />
-            <el-table-column label="操作" align="center" min-width="180" class-name="small-padding fixed-width">
+            <el-table-column prop="TrialConfigRelyFieldName" label="依赖字段" min-width="120px"
+              :show-overflow-tooltip="true" />
+            <el-table-column label="操作" align="center" min-width="260" class-name="small-padding fixed-width"
+              fixed="right">
               <template slot-scope="scope">
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleCopyData(scope.row)"
-                >复制</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-edit"
-                  @click="handleUpdate(scope.row)"
-                >修改</el-button>
-                <el-button
-                  size="mini"
-                  type="text"
-                  icon="el-icon-delete"
-                  @click="handleDelete(scope.row)"
-                >删除</el-button>
+                <el-button size="mini" type="text" @click="handleUpMove(scope.row, true, true)">上移</el-button>
+                <el-button size="mini" type="text" @click="handleUpMove(scope.row, true, false)">下移</el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleCopyData(scope.row)">复制</el-button>
+                <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
+                <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -894,24 +746,37 @@ export default {
         return pre - target > curr - target ? curr : pre
       })
     },
-    handleUpMove(row) {
+    handleUpMove(row, isChildren = false, isLast = true) {
       var index
       var target
       var list = this.list.filter((v, i) => {
         return row.ModuleTypeId === v.ModuleTypeId && v.ModuleTypeValueCN && v.ObjectTypeValueCN && v.OptTypeValueCN && v.ChildrenTypeValueCN
       })
+      if (isChildren) {
+        list = this.childrenList
+      }
       list.forEach((v, i) => {
         if (row.Id === v.Id) {
           index = i
         }
       })
       console.log(index)
+      if (isLast) {
         if (index === 0) {
           this.$alert('该行排序已是最高')
           return
         } else {
           target = list[index - 1]
         }
+      } else {
+        if (index === this.list.length) {
+          this.$alert('该行排序已是最底')
+          return
+        } else {
+          target = list[index + 1]
+        }
+      }
+
       console.log(list)
       var params = [
         { Id: target.Id, Sort: row.Sort },
@@ -1130,6 +995,7 @@ export default {
         DescriptionCN: null,
         InterfaceName: null,
         IsEnable: true,
+        IsDefaultChoice: true,
         ModuleTypeId: null,
         OptTypeId: null,
         ChildrenTypeId: null,
@@ -1152,6 +1018,7 @@ export default {
         IsSpecialType: false,
         DataType: '',
         ChildDataLabel: null,
+        IsBeforeModifyView: true,
         ChildDataEnLabel: null,
         ChildDataValue: null,
         DateType: null,
@@ -1282,6 +1149,7 @@ export default {
 .vue-treeselect div {
   line-height: 40px;
 }
+
 #check_config .el-dialog__body {
   padding: 0 20px;
 }

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
-      v-loading="loading"
-      v-adaptive="{bottomOffset:45}"
-      :data="list"
-      stripe
-      size="small"
-      height="100"
-    >
+    <el-table v-loading="loading" v-adaptive="{ bottomOffset: 45 }" :data="list" stripe size="small" height="100"
+      @sort-change="handleSortByColumn">
       <el-table-column type="index" width="60" />
-      <el-table-column
-        v-if="!~$route.path.indexOf('select')"
-        prop="Code"
-        label="字典键值"
-        min-width="180"
-        show-overflow-tooltip
-      />
-      <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 v-if="!~$route.path.indexOf('select')" prop="Code" label="字典键值" min-width="180"
+        show-overflow-tooltip sortable='custom' />
+      <el-table-column prop="ValueCN" label="中文值" min-width="180" show-overflow-tooltip sortable='custom' />
+      <el-table-column prop="Value" label="英文值" min-width="180" show-overflow-tooltip sortable='custom' />
+      <el-table-column prop="ChildGroup" label="分组" min-width="180" show-overflow-tooltip sortable='custom' />
+      <el-table-column prop="ShowOrder" label="显示顺序" min-width="180" show-overflow-tooltip sortable='custom' />
+      <el-table-column prop="Description" label="描述" min-width="180" show-overflow-tooltip sortable='custom' />
       <el-table-column label="是否可用" width="100" fixed="right">
         <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.IsEnable"
-            :active-value="true"
-            :inactive-value="false"
-            @change="(event) => {return switchChange(event, scope.row)}"
-          />
+          <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
+            @change="(event) => { return switchChange(event, scope.row) }" />
         </template>
       </el-table-column>
       <el-table-column label="操作" width="150" fixed="right">
         <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleEdit(scope.row)"
-          >
+          <el-button type="text" @click="handleEdit(scope.row)">
             编辑
           </el-button>
-          <el-button
-            type="text"
-            @click="handleDelete(scope.row)"
-          >
+          <el-button type="text" @click="handleDelete(scope.row)">
             删除
           </el-button>
         </template>
@@ -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>
+<style scoped></style>

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

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

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

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

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

@@ -1,12 +1,5 @@
 <template>
-  <el-form
-    ref="emailForm"
-    v-loading="loading"
-    :model="form"
-    label-width="180px"
-    size="small"
-    :rules="rules"
-  >
+  <el-form ref="emailForm" v-loading="loading" :model="form" label-width="180px" size="small" :rules="rules">
     <el-row>
       <el-col :span="24">
         <!-- Code -->
@@ -29,12 +22,7 @@
       <el-col :span="12">
         <!-- 邮件延时发送s数 -->
         <el-form-item :label="$t('dictionary:email:label:emailDelaySeconds')" prop="EmailDelaySeconds">
-          <el-input
-            v-model.number="form.EmailDelaySeconds"
-            style="width: 300px"
-            type="number"
-            clearable
-          >
+          <el-input v-model.number="form.EmailDelaySeconds" style="width: 300px" type="number" clearable>
           </el-input>
         </el-form-item>
       </el-col>
@@ -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
-              v-for="item of $d.BusinessLevel"
-              :key="`BusinessLevel${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.BusinessLevel" :key="`BusinessLevel${item.label}`" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
@@ -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
-              v-for="item of $d.BusinessModule"
-              :key="`BusinessModule${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.BusinessModule" :key="`BusinessModule${item.label}`" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
@@ -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
-              v-for="item of $d.Email_BusinessScenario"
-              :key="`BusinessScenarioEnum${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
+            <el-option v-for="item of $d.Email_BusinessScenario" :key="`BusinessScenarioEnum${item.label}`"
+              :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 收件人 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:toUserTypeList')" prop="ToUserTypeList">
-          <el-select
-            v-model="form.ToUserTypeList"
-            clearable
-            multiple
-            class="mr"
-          >
-            <el-option
-              v-for="item of $d.UserType"
-              :key="`ToUserTypeList${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
+          <el-select v-model="form.ToUserTypeList" clearable multiple class="mr">
+            <el-option v-for="item of $d.UserType" :key="`ToUserTypeList${item.label}`" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 抄送人 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:copyUserTypeList')" prop="CopyUserTypeList">
-          <el-select
-            v-model="form.CopyUserTypeList"
-            clearable
-            multiple
-            class="mr"
-          >
-            <el-option
-              v-for="item of $d.UserType"
-              :key="`CopyUserTypeList${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
+          <el-select v-model="form.CopyUserTypeList" clearable multiple class="mr">
+            <el-option v-for="item of $d.UserType" :key="`CopyUserTypeList${item.label}`" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 加急状态 -->
         <el-form-item :label="$t('dictionary:email:label:IsUrgent')" prop="EmailUrgentEnum">
-          <el-select
-            v-model="form.EmailUrgentEnum"
-            @change="
+          <el-select v-model="form.EmailUrgentEnum" @change="
             (v) => {
               v === 1 ? (form.EmailCron = null) : null
             }
-            "
-            clearable
-            class="mr"
-          >
-            <el-option
-              v-for="item of $d.EmailUrgent"
-              :key="`EmailUrgent${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
+          " clearable class="mr">
+            <el-option v-for="item of $d.EmailUrgent" :key="`EmailUrgent${item.label}`" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 发送周期和时间 -->
-        <el-form-item
-          :label="$t('trials:emailManageCfg:table:EmailCron')"
-          v-if="form.EmailUrgentEnum !== 1"
-          prop="EmailCron"
-        >
+        <el-form-item :label="$t('trials:emailManageCfg:table:EmailCron')" v-if="form.EmailUrgentEnum !== 1"
+          prop="EmailCron">
           <el-input style="width: 300px" readonly v-model="form.EmailCron" />
           <!-- 生成 cron -->
           <el-button type="primary" @click="showDialog"> {{ $t('dictionary:email:button:cron') }} </el-button>
@@ -151,12 +97,8 @@
         <!-- 是否需要回执 -->
         <el-form-item :label="$t('trials:emailManageCfg:title:isReturnRequired')" prop="IsReturnRequired">
           <el-radio-group v-model="form.IsReturnRequired">
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :label="item.value"
-              :key="`IsReturnRequired${item.value}`"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsReturnRequired${item.value}`">{{
+              item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
@@ -164,48 +106,30 @@
         <!-- 是否自动发送 -->
         <el-form-item :label="$t('trials:emailManageCfg:table:IsAutoSend')" prop="IsAutoSend">
           <el-radio-group v-model="form.IsAutoSend">
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :label="item.value"
-              :key="`IsAutoSend${item.value}`"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsAutoSend${item.value}`">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12" v-if="systemLevel">
         <!-- 是否区分标准 -->
         <el-form-item :label="$t('dictionary:email:button:isDistinguishCriteria')" prop="IsDistinguishCriteria">
-          <el-radio-group
-            v-model="form.IsDistinguishCriteria"
-            @change="
+          <el-radio-group v-model="form.IsDistinguishCriteria" @change="
             () => {
               form.CriterionTypeEnum = null
             }
-            "
-          >
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :label="item.value"
-              :key="`IsDistinguishCriteria${item.value}`"
-              >{{ item.label }}</el-radio
-            >
+          ">
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsDistinguishCriteria${item.value}`">{{
+              item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
-        <el-form-item
-          :label="$t('trials:auditRecord:table:criterion')"
-          v-if="form.IsDistinguishCriteria"
-          prop="CriterionTypeEnum"
-        >
-          <el-select v-model="form.CriterionTypeEnum" clearable class="mr">
-            <el-option
-              v-for="item of $d.CriterionType"
-              :key="`CriterionType${item.label}`"
-              :label="item.label"
-              :value="item.value"
-            />
+        <el-form-item :label="$t('trials:auditRecord:table:criterion')" v-if="form.IsDistinguishCriteria"
+          prop="CriterionTypeList">
+          <el-select v-model="form.CriterionTypeList" clearable class="mr" multiple>
+            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
+              :value="item.value" />
           </el-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
-              v-for="item of $d.YesOrNo"
-              :label="item.value"
-              :key="`IsEnable${item.value}`"
-              >{{ item.label }}</el-radio
-            >
+            <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="`IsEnable${item.value}`">{{ item.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 附件（CN） -->
         <el-form-item :label="$t('trials:emailManageCfg:table:fileListCN')" prop="IsEnable">
-          <el-upload
-            class="upload-demo"
-            action
-            :before-upload="beforeUploadCN"
-            :http-request="handleUploadFileCN"
-            :on-preview="handlePreviewCN"
-            :on-remove="handleRemoveFileCN"
-            :show-file-list="true"
-            :limit="1"
-            :file-list="fileListCN"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              :disabled="fileListCN.length > 0"
-              >{{ $t('common:button:upload') }}</el-button
-            >
+          <el-upload class="upload-demo" action :before-upload="beforeUploadCN" :http-request="handleUploadFileCN"
+            :on-preview="handlePreviewCN" :on-remove="handleRemoveFileCN" :show-file-list="true" :limit="1"
+            :file-list="fileListCN">
+            <el-button size="small" type="primary" :disabled="fileListCN.length > 0">{{ $t('common:button:upload')
+            }}</el-button>
           </el-upload>
         </el-form-item>
       </el-col>
       <el-col :span="12">
         <!-- 附件（EN） -->
         <el-form-item :label="$t('trials:emailManageCfg:table:fileListEN')" prop="IsEnable">
-          <el-upload
-            class="upload-demo"
-            action
-            :before-upload="beforeUploadEN"
-            :http-request="handleUploadFileEN"
-            :on-preview="handlePreviewEN"
-            :on-remove="handleRemoveFileEN"
-            :show-file-list="true"
-            :limit="1"
-            :file-list="fileListEN"
-          >
-            <el-button
-              size="small"
-              type="primary"
-              :disabled="fileListEN.length > 0"
-              >{{ $t('common:button:upload') }}</el-button
-            >
+          <el-upload class="upload-demo" action :before-upload="beforeUploadEN" :http-request="handleUploadFileEN"
+            :on-preview="handlePreviewEN" :on-remove="handleRemoveFileEN" :show-file-list="true" :limit="1"
+            :file-list="fileListEN">
+            <el-button size="small" type="primary" :disabled="fileListEN.length > 0">{{ $t('common:button:upload')
+            }}</el-button>
           </el-upload>
         </el-form-item>
       </el-col>
     </el-row>
     <!-- 邮件内容模版（CN） -->
-    <el-form-item
-      :label="$t('dictionary:email:label:emailHtmlContentCN')"
-      prop="EmailHtmlContentCN"
-      style="position: relative"
-    >
-      <el-input
-        v-model="form.EmailHtmlContentCN"
-        type="textarea"
-        :autosize="{ minRows: 8, maxRows: 8 }"
-      />
-      <el-button
-        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
-        type="text"
+    <el-form-item :label="$t('dictionary:email:label:emailHtmlContentCN')" prop="EmailHtmlContentCN"
+      style="position: relative">
+      <div class="html_temp">
+        <prism-editor class="my-editor" v-model="form.EmailHtmlContentCN" :highlight="highlighter" :line-numbers="true"
+          style="width: 50%;max-height: 500px;"></prism-editor>
+        <div v-html="form.EmailHtmlContentCN" style="width: 50%;"></div>
+      </div>
+      <!-- <el-input v-model="form.EmailHtmlContentCN" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
+      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
         @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
-        style="position: absolute; left: -50px; top: 30px"
-      >
+        style="position: absolute; left: -50px; top: 30px">
         {{ $t('common:button:preview') }}
-      </el-button>
+      </el-button> -->
     </el-form-item>
     <!-- 邮件内容模版（EN） -->
-    <el-form-item
-      :label="$t('dictionary:email:label:emailHtmlContent')"
-      prop="EmailHtmlContent"
-      style="position: relative"
-    >
-      <el-input
-        v-model="form.EmailHtmlContent"
-        type="textarea"
-        :autosize="{ minRows: 8, maxRows: 8 }"
-      />
-      <el-button
-        :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent"
-        type="text"
+    <el-form-item :label="$t('dictionary:email:label:emailHtmlContent')" prop="EmailHtmlContent"
+      style="position: relative">
+      <div class="html_temp">
+        <prism-editor class="my-editor" v-model="form.EmailHtmlContent" :highlight="highlighter" :line-numbers="true"
+          style="width: 50%;max-height: 500px;"></prism-editor>
+        <div v-html="form.EmailHtmlContent" style="width: 50%;"></div>
+      </div>
+      <!-- <el-input v-model="form.EmailHtmlContent" type="textarea" :autosize="{ minRows: 8, maxRows: 8 }" />
+      <el-button :disabled="!form.EmailHtmlContentCN && form.EmailHtmlContent" type="text"
         @click="PreviewHTML(form.EmailHtmlContentCN, form.EmailHtmlContent)"
-        style="position: absolute; left: -50px; top: 30px"
-      >
+        style="position: absolute; left: -50px; top: 30px">
         {{ $t('common:button:preview') }}
-      </el-button>
+      </el-button> -->
     </el-form-item>
-    <div
-      class="base-dialog-footer"
-      style="text-align: right; margin-top: 10px; padding-bottom: 10px"
-    >
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px; padding-bottom: 10px">
       <el-form-item style="text-align: right">
         <el-button size="small" type="primary" @click="handleSave">
           {{ $t('common:button:save') }}
@@ -321,12 +204,7 @@
     </div>
     <!-- 生成 cron -->
     <el-dialog append-to-body :title="$t('dictionary:email:button:cron')" :visible.sync="showCron">
-      <vcrontab
-        :hideComponent="['year']"
-        @hide="showCron = false"
-        @fill="crontabFill"
-        :expression="expression"
-      >
+      <vcrontab :hideComponent="['year']" @hide="showCron = false" @fill="crontabFill" :expression="expression">
       </vcrontab>
     </el-dialog>
   </el-form>
@@ -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: [
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] },
+        CriterionTypeList: [
+          { 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">
-      <el-table-column type="index" width="40" />
+      @sort-change="handleSortByColumn" @selection-change="handleSelectionChange">
+      <!-- <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/email-recompose/index.vue

@@ -164,6 +164,14 @@ export default {
             },
           },
         ],
+        Email: [
+          {
+            // type: 'email',
+            pattern: new RegExp(this.$reg().EmailRegexStr),
+            message: this.$t('rules:email'),
+            trigger: 'blur,change',
+          },
+        ]
       },
       userId: null,
       loading: false,

src/views/forgetpassword/index.vue

@@ -125,6 +125,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
           this.sendDisabled = false
           callback()

src/views/research-mobile/components/BasicInfo.vue

@@ -172,6 +172,13 @@ export default {
         ],
         Phone: [
           { required: true, validator: checkPhone, trigger: 'blur' }
+        ],
+        Email: [
+          {
+            pattern: new RegExp(this.$reg().EmailRegexStr),
+            message: 'Please input the correct email address',
+            trigger: 'blur,change',
+          }
         ]
       },
       siteOptions: [],

src/views/research-mobile/components/HistoricalParticipantForm.vue

@@ -117,6 +117,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

src/views/research-mobile/components/ParticipantForm.vue

@@ -136,6 +136,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

src/views/research-mobile/login.vue

@@ -158,6 +158,9 @@ export default {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
         var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
           callback()
         } else {
@@ -170,6 +173,9 @@ export default {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
         var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
           callback()
         } else {

src/views/research/components/BaseInfo.vue

@@ -49,7 +49,7 @@
       <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
     </el-form-item>
     <!-- 联系邮箱 -->
-    <el-form-item :label="$t('trials:researchForm:form:contactorEmail')">
+    <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="Email">
       <el-input v-model="form.Email" disabled />
     </el-form-item>
 
@@ -183,6 +183,13 @@ export default {
         ],
         Phone: [
           { required: true, validator: checkPhone, trigger: 'blur' }
+        ],
+        Email: [
+          {
+            pattern: new RegExp(this.$reg().EmailRegexStr),
+            message: 'Please input the correct email address',
+            trigger: 'blur,change',
+          }
         ]
       },
       siteOptions: [],

src/views/research/components/HistoricalParticipantForm.vue

@@ -108,6 +108,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

src/views/research/components/ParticipantForm.vue

@@ -139,6 +139,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

src/views/research/login.vue

@@ -131,6 +131,9 @@ export default {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
         var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
           // this.sendDisabled = false
           callback()
@@ -145,6 +148,9 @@ export default {
         callback(new Error(this.$t('trials:researchForm:formRule:specify')))
       } else {
         var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.ReplaceUserEmailOrPhone && reg.test(this.form.ReplaceUserEmailOrPhone)) {
           callback()
         } else {

src/views/reviewers/ReviewersResearch.vue

@@ -110,6 +110,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (this.form.EmailOrPhone && reg.test(this.form.EmailOrPhone)) {
           this.sendDisabled = false
           callback()
@@ -125,6 +128,9 @@ export default {
       } else {
         var reg =
           /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        if (this.$reg().EmailRegexStr) {
+          reg = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (
           this.form.ReplaceUserEmailOrPhone &&
           reg.test(this.form.ReplaceUserEmailOrPhone)

src/views/reviewers/components/BasicInfo.vue

@@ -285,7 +285,8 @@ export default {
             trigger: 'blur',
           },
           {
-            type: 'email',
+            // type: 'email',
+            pattern: new RegExp(this.$reg().EmailRegexStr),
             message: 'Please input the correct email address',
             trigger: 'blur,change',
           },

src/views/reviewers/curriculumVitae/components/info/info.vue

@@ -548,7 +548,8 @@ export default {
             trigger: 'blur',
           },
           {
-            type: 'email',
+            // type: 'email',
+            pattern: new RegExp(this.$reg().EmailRegexStr),
             message: this.$t('rules:email'),
             trigger: 'blur,change',
           },

src/views/reviewers/index.vue

@@ -530,6 +530,9 @@ export default {
       emailList.forEach((item) => {
         var pattern =
           /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
+        if (this.$reg().EmailRegexStr) {
+          pattern = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (!pattern.test(item)) {
           isError = true
         }

src/views/system/user/components/UserInfo.vue

@@ -439,7 +439,8 @@ export default {
             trigger: 'blur',
           },
           {
-            type: 'email',
+            // type: 'email',
+            pattern: new RegExp(this.$reg().EmailRegexStr),
             message: 'Please input the correct email address',
             trigger: ['blur'],
           },

src/views/trials/trials-myinfo/account.vue

@@ -289,7 +289,10 @@ export default {
     },
     handleEmailChange() {
       var reg =
-        /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+        /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/
+      if (this.$reg().EmailRegexStr) {
+        reg = new RegExp(this.$reg().EmailRegexStr)
+      }
       if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
         this.sendDisabled = false
       } else {

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

src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue

@@ -535,7 +535,8 @@ export default {
             trigger: 'blur',
           },
           {
-            type: 'email',
+            // type: 'email',
+            pattern: new RegExp(this.$reg().EmailRegexStr),
             message: this.$t('rules:email'),
             trigger: 'blur,change',
           },
@@ -610,6 +611,9 @@ export default {
       emailList.forEach((item) => {
         var pattern =
           /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/
+        if (this.$reg().EmailRegexStr) {
+          pattern = new RegExp(this.$reg().EmailRegexStr)
+        }
         if (!pattern.test(item)) {
           isError = true
         }

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
-              v-for="(item,index) of siteOptions"
-              :key="index"
-              :label="item.TrialSiteCode"
-              :value="item.TrialSiteId"
-            />
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
+              :value="item.TrialSiteId" />
           </el-select>
         </el-form-item>
         <!-- 受试者编号 -->
@@ -20,51 +16,47 @@
         </el-form-item>
         <!-- 访视/阅片期名称 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:visitName')">
-          <el-input
-            v-model="searchData.TaskName"
-            style="width:100px;"
-            clearable
-          />
+          <el-input v-model="searchData.TaskName" style="width:100px;" clearable />
         </el-form-item>
         <!-- 阅片人 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:reader')">
           <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
-            <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId" :value="item.DoctorUserId" :label="item.UserName" />
+            <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId"
+              :value="item.DoctorUserId" :label="item.UserName" />
           </el-select>
         </el-form-item>
         <!-- 是否加急 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:isUrgent')">
           <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value"
+              :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 任务状态 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:taskStatus')">
           <el-select v-model="searchData.TaskState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value"
+              :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 任务类型 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:taskType')">
           <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
-            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value"
+              :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 分配状态 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:assignStatus')">
           <el-select v-model="searchData.TaskAllocationState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label"
+              :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 分配时间 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:assignTime')">
-          <el-date-picker
-            v-model="timeList"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            type="datetimerange"
-            :default-time="['00:00:00', '23:59:59']"
-            @change="changeTimeList"
-          />
+          <el-date-picker v-model="timeList" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']" @change="changeTimeList" />
         </el-form-item>
         <el-form-item style="margin-bottom:10px">
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -77,180 +69,117 @@
       </el-form>
     </template>
     <template slot="main-container">
-      <el-table
-        v-adaptive="{bottomOffset:60}"
-        v-loading="loading"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortChange"
-      >
-        <el-table-column
-          prop="OriginalReReadingTask.IsUrgent"
-          :label="$t('trials:consistencyCheck:table:isUrgent')"
-          show-overflow-tooltip
-          min-width="100"
-          sortable="custom"
-        >
+      <el-table v-adaptive="{ bottomOffset: 60 }" v-loading="loading" :data="list" stripe height="100"
+        @sort-change="handleSortChange">
+        <el-table-column prop="OriginalReReadingTask.IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
+          show-overflow-tooltip min-width="100" sortable="custom">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.IsUrgent" type="danger">{{ $fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.IsUrgent" type="danger">{{ $fd('YesOrNo',
+              scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
             <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.OriginalReReadingTask.IsUrgent) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 任务编号 -->
-        <el-table-column
-          prop="OriginalReReadingTask.TaskCode"
-          :label="$t('trials:readTask:table:taskCode')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="OriginalReReadingTask.TaskCode" :label="$t('trials:readTask:table:taskCode')"
+          min-width="100" sortable="custom" show-overflow-tooltip />
         <!-- 中心编号 -->
-        <el-table-column
-          prop="OriginalReReadingTask.TrialSiteCode"
-          :label="$t('trials:readTask:table:siteCode')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="OriginalReReadingTask.TrialSiteCode" :label="$t('trials:readTask:table:siteCode')"
+          min-width="100" sortable="custom" show-overflow-tooltip />
         <!-- 受试者编号 -->
-        <el-table-column
-          prop="OriginalReReadingTask.SubjectCode"
-          :label="$t('trials:readTask:table:subjectCode')"
-          min-width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="OriginalReReadingTask.SubjectCode" :label="$t('trials:readTask:table:subjectCode')"
+          min-width="120" sortable="custom" show-overflow-tooltip />
         <!-- 访视/阅片期名称 -->
-        <el-table-column
-          prop="OriginalReReadingTask.TaskName"
-          :label="$t('trials:reviewAssign:readingTask:table:visitName')"
-          min-width="160"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="OriginalReReadingTask.TaskName"
+          :label="$t('trials:reviewAssign:readingTask:table:visitName')" min-width="160" sortable="custom"
+          show-overflow-tooltip />
         <!-- 盲态任务标识 -->
-        <el-table-column
-          prop="OriginalReReadingTask.TaskBlindName"
-          :label="$t('trials:reviewAssign:readingTask:table:blindName')"
-          min-width="140"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="OriginalReReadingTask.TaskBlindName"
+          :label="$t('trials:reviewAssign:readingTask:table:blindName')" min-width="140" sortable="custom"
+          show-overflow-tooltip />
         <!-- 任务创建时间 -->
-        <el-table-column
-          prop="OriginalReReadingTask.CreateTime"
-          :label="$t('trials:reviewAssign:readingTask:table:createTime')"
-          min-width="140"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="OriginalReReadingTask.CreateTime"
+          :label="$t('trials:reviewAssign:readingTask:table:createTime')" min-width="140" sortable="custom"
+          show-overflow-tooltip />
         <!-- 任务状态 -->
-        <el-table-column
-          prop="OriginalReReadingTask.TaskState"
-          :label="$t('trials:reviewAssign:readingTask:table:taskStatus')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="OriginalReReadingTask.TaskState"
+          :label="$t('trials:reviewAssign:readingTask:table:taskStatus')" min-width="100" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 0" type="primary">{{ $fd('TaskState',
+              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 1" type="info">{{ $fd('TaskState',
+              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 3" type="danger">{{ $fd('TaskState',
+              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 4" type="warning">{{ $fd('TaskState',
+              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 5" type="danger">{{ $fd('TaskState',
+              scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 任务类型 -->
-        <el-table-column
-          prop="OriginalReReadingTask.ReadingCategory"
-          :label="$t('trials:reviewAssign:readingTask:table:taskType')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="OriginalReReadingTask.ReadingCategory"
+          :label="$t('trials:reviewAssign:readingTask:table:taskType')" min-width="100" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 1" type="primary">{{
+              $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory',
+              scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory',
+              scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 5" type="warning">{{
+              $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 角色 -->
-        <el-table-column
-          prop="OriginalReReadingTask.ArmEnum"
-          :label="$t('trials:reviewAssign:readingTask:table:role')"
-          min-width="80"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="OriginalReReadingTask.ArmEnum" :label="$t('trials:reviewAssign:readingTask:table:role')"
+          min-width="80" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 1" type="primary">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 2" type="success">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 3" type="info">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 4" type="danger">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
-            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 5" type="warning">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 1" type="primary">{{ $fd('ArmEnum',
+              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 2" type="success">{{ $fd('ArmEnum',
+              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 3" type="info">{{ $fd('ArmEnum',
+              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 4" type="danger">{{ $fd('ArmEnum',
+              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 5" type="warning">{{ $fd('ArmEnum',
+              scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 阅片人 -->
-        <el-table-column
-          prop="OriginalReReadingTask.UserName"
-          :label="$t('trials:reviewAssign:readingTask:table:reader')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="OriginalReReadingTask.UserName"
+          :label="$t('trials:reviewAssign:readingTask:table:reader')" min-width="100" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.OriginalReReadingTask.UserName }}({{ scope.row.OriginalReReadingTask.FullName }})
           </template>
         </el-table-column>
         <!-- 阅片完成时间 -->
-        <el-table-column
-          prop="OriginalReReadingTask.SignTime"
-          :label="$t('trials:reviewTrack:table:signTime')"
-          min-width="180"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="OriginalReReadingTask.SignTime" :label="$t('trials:reviewTrack:table:signTime')"
+          min-width="180" sortable="custom" show-overflow-tooltip />
         <!-- 重阅申请类型 -->
-        <el-table-column
-          prop="OriginalReReadingTask.RequestReReadingType"
-          :label="$t('trials:rereadTask:table:requestReReadingType')"
-          min-width="140"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="OriginalReReadingTask.RequestReReadingType"
+          :label="$t('trials:rereadTask:table:requestReReadingType')" min-width="140" sortable="custom"
+          show-overflow-tooltip>
           <template slot-scope="scope">
             <div v-if="scope.row.RequestReReadingType">
-              <el-tag v-if="scope.row.RequestReReadingType === 2" type="danger">{{ $fd('RequestReReadingType', scope.row.RequestReReadingType) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingType === 2" type="danger">{{ $fd('RequestReReadingType',
+                scope.row.RequestReReadingType) }}</el-tag>
               <el-tag v-else type="primary">{{ $fd('RequestReReadingType', scope.row.RequestReReadingType) }}</el-tag>
             </div>
           </template>
         </el-table-column>
         <!-- 申请时间 -->
-        <el-table-column
-          prop="RequestReReadingTime"
-          :label="$t('trials:rereadTask:table:requestReReadingTime')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="RequestReReadingTime" :label="$t('trials:rereadTask:table:requestReReadingTime')"
+          min-width="100" sortable="custom" show-overflow-tooltip />
         <!-- 申请原因 -->
-        <el-table-column
-          prop="RequestReReadingReason"
-          :label="$t('trials:rereadTask:table:requestReReadingReason')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="RequestReReadingReason" :label="$t('trials:rereadTask:table:requestReReadingReason')"
+          min-width="100" sortable="custom" show-overflow-tooltip />
         <!-- 审批结果 -->
-        <el-table-column
-          prop="AllocateTime"
-          :label="$t('trials:rereadTask:table:requestReReadingResultEnum')"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="AllocateTime" :label="$t('trials:rereadTask:table:requestReReadingResultEnum')"
+          min-width="100" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             <div v-if="scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingResultEnum === 0">
               <el-tooltip v-if="scope.row.RequestReReadingResultEnum === 2" class="item" effect="dark" placement="top">
@@ -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 === 0" type="warning">{{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingResultEnum === 1" type="primary">{{ $fd('RequestReReadingResult',
+                scope.row.RequestReReadingResultEnum) }}</el-tag>
+              <el-tag v-if="scope.row.RequestReReadingResultEnum === 0" type="warning">{{ $fd('RequestReReadingResult',
+                scope.row.RequestReReadingResultEnum) }}</el-tag>
             </div>
           </template>
         </el-table-column>
         <!-- 新任务编号 -->
-        <el-table-column
-          prop="ReReadingNewTaskCode"
-          :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
-          min-width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          v-if="hasPermi(['role:spm'])"
-          fixed="right"
-          :label="$t('common:action:action')"
-          width="210"
-        >
+        <el-table-column prop="ReReadingNewTaskCode" :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
+          min-width="120" sortable="custom" show-overflow-tooltip />
+        <el-table-column v-if="hasPermi(['role:spm'])" fixed="right" :label="$t('common:action:action')" width="210">
           <template slot-scope="scope">
             <!-- 同意 -->
-            <el-button
-              :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
-              icon="el-icon-check"
-              circle
-              :title="$t('trials:spmAudit:button:agree')"
-              @click="openReReadingOrBackList(scope.row,1)"
-            />
+            <!-- <el-button :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
+              icon="el-icon-check" circle :title="$t('trials:spmAudit:button:agree')"
+              @click="openReReadingOrBackList(scope.row, 1)" /> -->
             <!-- 拒绝 -->
-            <el-button
-              :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
-              icon="el-icon-close"
-              circle
-              :title="$t('trials:spmAudit:button:reject')"
-              @click="confirmReReading(scope.row,2, true)"
-            />
+            <!-- <el-button :disabled="!!scope.row.RequestReReadingResultEnum || scope.row.RequestReReadingType === 1"
+              icon="el-icon-close" circle :title="$t('trials:spmAudit:button:reject')"
+              @click="confirmReReading(scope.row, 2, true)" /> -->
+            <el-button :disabled="!!scope.row.RequestReReadingResultEnum ||
+              scope.row.RequestReReadingType === 1
+              " icon="el-icon-edit-outline" circle :title="$t('trials:spmAudit:table:Approval')"
+              @click="audit(scope.row)" />
             <!-- 已影响任务列表 -->
-            <el-button
-              :disabled="scope.row.RequestReReadingResultEnum !== 1"
-              icon="el-icon-document-copy"
-              circle
-              :title="$t('trials:spmAudit:button:influenceList')"
-              @click="getInfluencedTaskList(scope.row)"
-            />
+            <el-button :disabled="scope.row.RequestReReadingResultEnum !== 1" icon="el-icon-document-copy" circle
+              :title="$t('trials:spmAudit:button:influenceList')" @click="getInfluencedTaskList(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+      <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
-        v-if="ConfirmReReadingVisible"
-        :title="$t('trials:spmAudit:title:rejected')"
-        :visible.sync="ConfirmReReadingVisible"
-        width="600px"
-        append-to-body
-        :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper"
-      >
+      <el-dialog v-if="ConfirmReReadingVisible" :title="$t('trials:spmAudit:title:rejected')"
+        :visible.sync="ConfirmReReadingVisible" width="600px" append-to-body :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper">
         <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
-          <el-form
-            ref="reasonForm"
-            :rules="rules"
-            :model="ConfirmReReadingForm"
-            class="demo-ruleForm"
-            size="small"
-            label-width="120px"
-          >
+          <el-form ref="reasonForm" :rules="rules" :model="ConfirmReReadingForm" class="demo-ruleForm" size="small"
+            label-width="120px">
             <!-- 驳回原因 -->
             <el-form-item :label="$t('trials:spmAudit:title:rejectedReason')" prop="RequestReReadingRejectReason">
-              <el-input
-                v-model="ConfirmReReadingForm.RequestReReadingRejectReason"
-                type="textarea"
-                :autosize="{ minRows: 2, maxRows: 4}"
-                :placeholder="$t('common:ruleMessage:specify')"
-                maxlength="500"
-                show-word-limit
-              />
+              <el-input v-model="ConfirmReReadingForm.RequestReReadingRejectReason" type="textarea"
+                :autosize="{ minRows: 2, maxRows: 4 }" :placeholder="$t('common:ruleMessage:specify')" maxlength="500"
+                show-word-limit />
             </el-form-item>
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
           <!-- 取消 -->
-          <el-button :disabled="btnLoading" size="small" type="primary" @click="ConfirmReReadingVisible = false;ConfirmReReadingForm = { RequestReReadingRejectReason: null }">
+          <el-button :disabled="btnLoading" size="small" type="primary"
+            @click="ConfirmReReadingVisible = false; ConfirmReReadingForm = { RequestReReadingRejectReason: null }">
             {{ $t('common:button:cancel') }}
           </el-button>
           <!-- 保存 -->
@@ -352,130 +408,88 @@
         </div>
       </el-dialog>
       <!-- '重阅影响任务列表' : '已影响任务列表'" +++-->
-      <el-dialog
-        v-if="ReReadingOrBackVisible"
+      <el-dialog v-if="ReReadingOrBackVisible"
         :title="opentype === 'read' ? this.$t('trials:spmAudit:title:title1') : this.$t('trials:spmAudit:title:title2')"
-        :visible.sync="ReReadingOrBackVisible"
-        width="1460px"
-        append-to-body
-        :close-on-click-modal="false"
-        custom-class="base-dialog-wrapper"
-      >
+        :visible.sync="ReReadingOrBackVisible" width="1460px" append-to-body :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper">
         <div class="base-dialog-body">
-          <el-table
-            v-loading="loading"
-            :data="InfluenceTaskList"
-            stripe
-            height="100"
-            style="min-height: 400px;"
-          >
+          <el-table v-loading="loading" :data="InfluenceTaskList" stripe height="100" style="min-height: 400px;">
             <!-- 任务编号 -->
-            <el-table-column
-              prop="TaskCode"
-              :label="$t('trials:readTask:table:taskCode')"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="TaskCode" :label="$t('trials:readTask:table:taskCode')" min-width="100"
+              show-overflow-tooltip />
             <!-- 中心编号 -->
-            <el-table-column
-              prop="TrialSiteCode"
-              :label="$t('trials:readTask:table:siteCode')"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="TrialSiteCode" :label="$t('trials:readTask:table:siteCode')" min-width="100"
+              show-overflow-tooltip />
             <!-- 受试者编号 -->
-            <el-table-column
-              prop="SubjectCode"
-              :label="$t('trials:readTask:table:subjectCode')"
-              min-width="120"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="SubjectCode" :label="$t('trials:readTask:table:subjectCode')" min-width="120"
+              show-overflow-tooltip />
             <!-- 访视/阅片期名称 -->
-            <el-table-column
-              prop="VisitTaskNum"
-              :label="$t('trials:consistencyCheck:table:visitName')"
-              min-width="140"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="VisitTaskNum" :label="$t('trials:consistencyCheck:table:visitName')" min-width="140"
+              show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.TaskName }}
               </template>
             </el-table-column>
             <!-- 盲态任务标识 -->
-            <el-table-column
-              prop="TaskBlindName"
-              :label="$t('trials:readTask:table:blindName')"
-              min-width="120"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="TaskBlindName" :label="$t('trials:readTask:table:blindName')" min-width="120"
+              show-overflow-tooltip />
             <!-- 阅片标准 -->
-            <el-table-column
-              prop="TrialReadingCriterionName"
-              :label="$t('trials:readTask:table:criterionName')"
-              min-width="100"
-              show-overflow-tooltip
-            />
+            <el-table-column prop="TrialReadingCriterionName" :label="$t('trials:readTask:table:criterionName')"
+              min-width="100" show-overflow-tooltip />
             <!-- 任务状态 -->
-            <el-table-column
-              prop="TaskState"
-              :label="$t('trials:readTask:table:taskState')"
-              min-width="100"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="TaskState" :label="$t('trials:readTask:table:taskState')" min-width="100"
+              show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-                <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState)
+                }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState)
+                }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState)
+                }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState)
+                }}</el-tag>
+                <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState)
+                }}</el-tag>
               </template>
             </el-table-column>
             <!-- 任务类型 -->
-            <el-table-column
-              prop="ReadingCategory"
-              min-width="100"
-              :label="$t('trials:readTask:table:readingCategory')"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="ReadingCategory" min-width="100" :label="$t('trials:readTask:table:readingCategory')"
+              show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
-                <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory',
+                  scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory',
+                  scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory',
+                  scope.row.ReadingCategory) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory',
+                  scope.row.ReadingCategory) }}</el-tag>
               </template>
             </el-table-column>
             <!-- 阅片状态 -->
-            <el-table-column
-              prop="ReadingTaskState"
-              :label="$t('trials:readTask:table:readingTaskState')"
-              min-width="100"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="ReadingTaskState" :label="$t('trials:readTask:table:readingTaskState')"
+              min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
+                <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState',
+                  scope.row.ReadingTaskState) }}</el-tag>
                 <el-tag v-else type="danger">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
               </template>
             </el-table-column>
             <!-- 生效后影响 -->
-            <el-table-column
-              prop="OptType"
-              :label="$t('trials:readTask:table:optType')"
-              min-width="100"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="OptType" :label="$t('trials:readTask:table:optType')" min-width="100"
+              show-overflow-tooltip>
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.OptType === 0" type="primary">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
-                <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
-                <el-tag v-if="scope.row.OptType === 2" type="warning">{{ $fd('ReReadingOrBackOptType', scope.row.OptType) }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 0" type="primary">{{ $fd('ReReadingOrBackOptType',
+                  scope.row.OptType) }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 1" type="danger">{{ $fd('ReReadingOrBackOptType', scope.row.OptType)
+                }}</el-tag>
+                <el-tag v-if="scope.row.OptType === 2" type="warning">{{ $fd('ReReadingOrBackOptType',
+                  scope.row.OptType) }}</el-tag>
               </template>
             </el-table-column>
             <!-- 阅片人 -->
-            <el-table-column
-              prop="UserName"
-              :label="$t('trials:readTask:table:reader')"
-              min-width="160"
-              show-overflow-tooltip
-            >
+            <el-table-column prop="UserName" :label="$t('trials:readTask:table:reader')" min-width="160"
+              show-overflow-tooltip>
               <template v-if="scope.row.DoctorUser" slot-scope="scope">
                 {{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
               </template>
@@ -493,13 +507,8 @@
           </el-button>
         </div>
       </el-dialog>
-      <el-dialog
-        :destroy-on-close="true"
-        :visible.sync="signVisible"
-        :close-on-click-modal="false"
-        width="600px"
-        custom-class="base-dialog-wrapper"
-      >
+      <el-dialog :destroy-on-close="true" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
+        custom-class="base-dialog-wrapper">
         <div slot="title">
           <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
           <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
@@ -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,8 +602,39 @@ 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) {
@@ -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()
@@ -790,6 +863,7 @@ export default {
 ::v-deep .hidden-row {
   display: none;
 }
+
 ::v-deep .el-dialog__body {
   padding: 15px 20px;
 }
@@ -799,9 +873,11 @@ export default {
   border-color: none !important;
   // color: #fff!important;
 }
+
 ::v-deep #TaskAllocationRuleList thead .el-checkbox__inner {
   display: none;
 }
+
 ::v-deep .el-descriptions-item__label.has-colon:after {
   display: none;
 }

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"
-      :isView="true" @getList="getList" />
-    <attachmentPreview :SystemDocumentId="SystemDocumentId" :visible.sync="perview_visible" :isView="true"
-      v-if="perview_visible" />
+    <attachmentList2 v-if="config.visible && !currentRow.IsSystemDoc" :config="config" :rowData="currentRow"
+      :TrialDocumentId="TrialDocumentId" :isView="true" @getList="getList" />
+    <attachmentList v-if="config.visible && currentRow.IsSystemDoc" :config="config" :rowData="currentRow"
+      :SystemDocumentId="TrialDocumentId" :isView="true" @getList="getList" />
+    <attachmentPreview :SystemDocumentId="TrialDocumentId" :isTrial="!currentRow.IsSystemDoc"
+      :visible.sync="perview_visible" :isView="true" v-if="perview_visible" />
   </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/enrolled-reviewers/list/index.vue

@@ -12,35 +12,18 @@
 
     <template slot="main-container">
       <!-- 入组医生列表 -->
-      <el-table
-        ref="myTable"
-        v-loading="listLoading"
-        v-adaptive="{ bottomOffset: 55 }"
-        :data="list"
-        stripe
-        height="100"
-        @sort-change="handleSortByColumn"
-      >
-        <el-table-column type="index" width="40" />
+      <el-table ref="myTable" v-loading="listLoading" v-adaptive="{ bottomOffset: 55 }" :data="list" stripe height="100"
+        @sort-change="handleSortByColumn">
+        <el-table-column type="index" width="40" fixed />
         <!-- Name -->
-        <el-table-column
-          :label="$t('trials:enrolledReviews:table:name')"
-          show-overflow-tooltip
-          width="150"
-          prop="FirstName"
-          sortable="custom"
-          v-if="!hasPermi(['role:ea'])"
-        >
+        <el-table-column :label="$t('trials:enrolledReviews:table:name')" show-overflow-tooltip fixed width="150"
+          prop="FirstName" sortable="custom" v-if="!hasPermi(['role:ea'])">
           <template slot-scope="scope">
-            <el-button
-              type="text"
-              @click="
+            <el-button type="text" @click="
               go(
                 `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`
               )
-              "
-              >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button
-            >
+              ">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
           </template>
         </el-table-column>
         <!-- Name CN -->
@@ -53,21 +36,11 @@
           show-overflow-tooltip
         /> -->
         <!-- 用户名 -->
-        <el-table-column
-          prop="UserName"
-          :label="$t('trials:enrolledReviews:table:userName')"
-          :width="hasPermi(['role:ea']) ? 300 : 150"
-          sortable="custom"
-          show-overflow-tooltip
-        />
+        <el-table-column prop="UserName" :label="$t('trials:enrolledReviews:table:userName')"
+          :width="hasPermi(['role:ea']) ? 300 : 150" sortable="custom" show-overflow-tooltip fixed />
         <!-- 入组时间 -->
-        <el-table-column
-          prop="EnrollTimeStr"
-          :label="$t('trials:enrolledReviews:table:enrollmentTime')"
-          :width="hasPermi(['role:ea']) ? 320 : 130"
-          sortable="custom"
-          show-overflow-tooltip
-        >
+        <el-table-column prop="EnrollTimeStr" :label="$t('trials:enrolledReviews:table:enrollmentTime')"
+          :width="hasPermi(['role:ea']) ? 320 : 130" sortable="custom" show-overflow-tooltip fixed>
           <template slot-scope="scope">
             {{
               scope.row.EnrollTime
@@ -76,50 +49,28 @@
             }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="EnrollTimeStr"
-          :label="$t('trials:enrolledReviews:table:status')"
-          width="200"
-          sortable="custom"
-        >
+        <el-table-column prop="EnrollTimeStr" :label="$t('trials:enrolledReviews:table:status')" width="200"
+          sortable="custom" fixed>
           <template slot-scope="scope">
             <div>
-              <el-switch
-                v-model="scope.row.IsEnable"
-                :active-value="true"
-                :inactive-value="false"
-                :active-text="$fd('IsEnable', true)"
-                :inactive-text="$fd('IsEnable', false)"
-                @change="
+              <el-switch v-model="scope.row.IsEnable" :active-value="true" :inactive-value="false"
+                :active-text="$fd('IsEnable', true)" :inactive-text="$fd('IsEnable', false)" @change="
                   (v) => {
                     return isEnableChange(scope.row, v)
                   }
-                "
-                :disabled="
-                  !hasPermi([
+                " :disabled="!hasPermi([
                   'trials:trials-panel:enrolled-reviewers:list:edit',
                 ])
-                "
-              />
+                  " />
               <!-- <span :style="{color:scope.row.IsEnable?'#409eff':'#dcdfe6'}"> {{$fd('IsEnable', scope.row.IsEnable)}}</span> -->
             </div>
           </template>
         </el-table-column>
-        <el-table-column
-          v-for="ite of TrialReadingCriterionList"
-          :key="ite.TrialReadingCriterionName"
-          :label="ite.TrialReadingCriterionName"
-          width="360"
-          header-align="center"
-          show-overflow-tooltip
-        >
-          <el-table-column
-            :label="$t('trials:enrolledReviews:table:readingType')"
-            width="300"
-          >
+        <el-table-column v-for="ite of TrialReadingCriterionList" :key="ite.TrialReadingCriterionName"
+          :label="ite.TrialReadingCriterionName" width="360" header-align="center" show-overflow-tooltip>
+          <el-table-column :label="$t('trials:enrolledReviews:table:readingType')" width="300">
             <template slot-scope="scope">
-              <span
-                v-for="item of scope.row.CriterionCategoryList.find((v) => {
+              <span v-for="item of scope.row.CriterionCategoryList.find((v) => {
                 return (
                   v.TrialReadingCriterionId === ite.TrialReadingCriterionId
                 )
@@ -130,10 +81,7 @@
                     ite.TrialReadingCriterionId
                   )
                 }).ReadingCategorys
-                  : []"
-                :key="item.TrialReadingCriterionId"
-                style="margin: 5px 5px 5px 0"
-              >
+                : []" :key="item.TrialReadingCriterionId" style="margin: 5px 5px 5px 0">
                 <el-tag v-if="item === 1" type="primary">{{
                   $fd('ReadingCategory', item) +
                   ' & ' +
@@ -147,152 +95,101 @@
                   $fd('ReadingCategory', item)
                 }}</el-tag>
               </span>
-              <el-button
-                v-hasPermi="[
+              <el-button v-hasPermi="[
                 'trials:trials-panel:enrolled-reviewers:list:edit',
-                ]"
-                type="text"
-                @click="
+              ]" type="text" @click="
                 openSetEnrollReadingCategory(
                   scope.row,
                   ite.TrialReadingCriterionId
                 )
-                "
-              >
+                ">
                 {{ $t('trials:enrolledReviews:button:config') }}
               </el-button>
             </template>
           </el-table-column>
-          <el-table-column
-            :label="$t('trials:enrolledReviews:table:consistency-analysis')"
-            width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column :label="$t('trials:enrolledReviews:table:consistency-analysis')" width="160"
+            show-overflow-tooltip>
             <template slot-scope="scope">
-              <el-switch
-                v-model="
-                  scope.row.CriterionCategoryList.find((v) => {
+              <el-switch v-model="scope.row.CriterionCategoryList.find((v) => {
                 return (
                   v.TrialReadingCriterionId === ite.TrialReadingCriterionId
                 )
               }).IsJoinAnalysis
-                "
-                :active-value="true"
-                :inactive-value="false"
-                :active-text="$fd('YesOrNo', true)"
-                :inactive-text="$fd('YesOrNo', false)"
-                @change="
+                " :active-value="true" :inactive-value="false" :active-text="$fd('YesOrNo', true)"
+                :inactive-text="$fd('YesOrNo', false)" @change="
                   (v) => {
                     return isConsistencyChange(scope.row, ite, v, true)
                   }
-                "
-                :disabled="
-                  !hasPermi([
+                " :disabled="!hasPermi([
                   'trials:trials-panel:enrolled-reviewers:list:edit',
                 ])
-                "
-              />
+                  " />
               <!-- <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
               <span v-else> {{$fd('YesOrNo',false)}}</span> -->
             </template>
           </el-table-column>
-          <el-table-column
-            :label="$t('trials:enrolledReviews:message:SOW')"
-            width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column :label="$t('trials:enrolledReviews:message:SOW')" width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <div
-                v-if="
+              <div v-if="
                 scope.row.CriterionCategoryList.find((v) => {
                   return (
                     v.TrialReadingCriterionId === ite.TrialReadingCriterionId
                   )
                 }).StatementCriterionFileList.length > 0
-                "
-              >
-                <el-button
-                  type="text"
-                  @click="preview(scope.row, ite.TrialReadingCriterionId)"
-                  >View</el-button
-                >
+              ">
+                <el-button type="text" @click="preview(scope.row, ite.TrialReadingCriterionId)">View</el-button>
                 <!-- <el-button type="text" @click="windowOpen(scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).StatementCriterionFileList[0].FilePath)">View</el-button> -->
               </div>
               <div v-else>
                 <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
                 <!-- 上传 -->
-                <el-button
-                  v-if="ite.CriterionType === 0"
-                  v-hasPermi="[
+                <el-button v-if="ite.CriterionType === 0" v-hasPermi="[
                   'trials:trials-panel:enrolled-reviewers:list:edit',
-                  ]"
-                  type="text"
-                  style="margin-left: 10px"
-                  @click="
+                ]" type="text" style="margin-left: 10px" @click="
                   addCol(
                     0,
                     scope.row,
                     ite,
                     $t('trials:enrolledReviews:message:SOW')
                   )
-                  "
-                >
+                  ">
                   {{ $t('trials:enrolledReviews:button:upload') }}
                 </el-button>
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            :label="$t('trials:enrolledReviews:message:EQC')"
-            width="160"
-            show-overflow-tooltip
-          >
+          <el-table-column :label="$t('trials:enrolledReviews:message:EQC')" width="160" show-overflow-tooltip>
             <template slot-scope="scope">
-              <div
-                v-if="
+              <div v-if="
                 scope.row.CriterionCategoryList.find((v) => {
                   return (
                     v.TrialReadingCriterionId === ite.TrialReadingCriterionId
                   )
                 }).AcknowledgementCriterionFileList.length > 0
-                "
-              >
-                <el-button
-                  type="text"
-                  @click="preview(scope.row, ite.TrialReadingCriterionId)"
-                >
+              ">
+                <el-button type="text" @click="preview(scope.row, ite.TrialReadingCriterionId)">
                   View
                 </el-button>
               </div>
               <div v-else>
                 <span>{{ $t('trials:enrolledReviews:label:notUpload') }}</span>
                 <!-- 上传 -->
-                <el-button
-                  v-if="ite.CriterionType === 0"
-                  v-hasPermi="[
+                <el-button v-if="ite.CriterionType === 0" v-hasPermi="[
                   'trials:trials-panel:enrolled-reviewers:list:edit',
-                  ]"
-                  type="text"
-                  style="margin-left: 10px"
-                  @click="
+                ]" type="text" style="margin-left: 10px" @click="
                   addCol(
                     1,
                     scope.row,
                     ite,
                     $t('trials:enrolledReviews:message:SOW')
                   )
-                  "
-                >
+                  ">
                   {{ $t('trials:enrolledReviews:button:upload') }}
                 </el-button>
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            :label="$t('trials:enrolledReviews:button:tackNum')"
-            width="300"
-            show-overflow-tooltip
-          >
+          <el-table-column :label="$t('trials:enrolledReviews:button:tackNum')" width="300" show-overflow-tooltip>
             <template slot-scope="scope">
               <div>
                 {{
@@ -342,31 +239,17 @@
       <template slot="dialog-body">
         <!-- Reading Type -->
         <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
-        <el-select
-          v-model="readingType"
-          filterable
-          allow-create
-          default-first-option
-          style="width: 70%"
-        >
+        <el-select v-model="readingType" filterable allow-create default-first-option style="width: 70%">
           <el-option :value="0" label="TP&GL&AD" />
           <el-option :value="1" label="TP&GL" />
           <el-option :value="2" label="AD" />
         </el-select>
       </template>
       <template slot="dialog-footer">
-        <el-button
-          :disabled="readingType_model.btnLoading"
-          type="primary"
-          @click="readingType_model.visible = false"
-        >
+        <el-button :disabled="readingType_model.btnLoading" type="primary" @click="readingType_model.visible = false">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
-          type="primary"
-          :loading="readingType_model.btnLoading"
-          @click="handleUpdateReadingType"
-        >
+        <el-button type="primary" :loading="readingType_model.btnLoading" @click="handleUpdateReadingType">
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -376,56 +259,28 @@
       <template slot="dialog-body">
         <!-- Reading Type -->
         <label>{{ $t('trials:enrolledReviews:table:readingType') }}: </label>
-        <el-select
-          v-model="ReadingCategorys"
-          filterable
-          allow-create
-          multiple
-          default-first-option
-          style="width: 50%"
-        >
+        <el-select v-model="ReadingCategorys" filterable allow-create multiple default-first-option style="width: 50%">
           <template v-for="item of $d.ReadingCategory">
-            <el-option
-              v-if="item.value === 1"
-              :key="item.id"
-              :value="1"
-              :label="
-                $fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)
-              "
-            />
+            <el-option v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)
+              " />
           </template>
           <template v-for="item of $d.ReadingCategory">
-            <el-option
-              v-if="item.value === 4 && IsArbitrationReading"
-              :key="item.id"
-              :value="item.value"
-              :label="$fd('ReadingCategory', 4)"
-            />
+            <el-option v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value"
+              :label="$fd('ReadingCategory', 4)" />
           </template>
           <template v-for="item of $d.ReadingCategory">
-            <el-option
-              v-if="item.value === 5 && IsOncologyReading"
-              :key="item.id"
-              :value="item.value"
-              :label="$fd('ReadingCategory', 5)"
-            />
+            <el-option v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value"
+              :label="$fd('ReadingCategory', 5)" />
           </template>
         </el-select>
       </template>
       <template slot="dialog-footer">
         <div style="margin-top: 30px">
-          <el-button
-            :disabled="readingCategory_model.btnLoading"
-            type="primary"
-            @click="readingCategory_model.visible = false"
-          >
+          <el-button :disabled="readingCategory_model.btnLoading" type="primary"
+            @click="readingCategory_model.visible = false">
             {{ $t('common:button:cancel') }}
           </el-button>
-          <el-button
-            type="primary"
-            :loading="readingCategory_model.btnLoading"
-            @click="handleUpdateReadingCategory"
-          >
+          <el-button type="primary" :loading="readingCategory_model.btnLoading" @click="handleUpdateReadingCategory">
             {{ $t('common:button:save') }}
           </el-button>
         </div>
@@ -434,112 +289,52 @@
     <!-- 修改医生状态 -->
     <base-model :config="reviewerStatus_model">
       <template slot="dialog-body">
-        <el-form
-          ref="updateStatusForm"
-          :model="updateStatusForm"
-          :rules="updateStatusFormrules"
-        >
-          <el-form-item
-            :label="$t('trials:enrolledReviews:label:enrollmentStatus')"
-            prop="Status"
-          >
+        <el-form ref="updateStatusForm" :model="updateStatusForm" :rules="updateStatusFormrules">
+          <el-form-item :label="$t('trials:enrolledReviews:label:enrollmentStatus')" prop="Status">
             <el-select v-model="updateStatusForm.Status" style="width: 60%">
               <!-- 0：回退；1：出组； -->
-              <el-option
-                v-for="item of $d.OutOrInEnrollment"
-                :key="`OutOrInEnrollment${item.value}`"
-                :value="item.value"
-                :label="item.label"
-                :disabled="item.value === 0 && currentWorkload > 0"
-              />
+              <el-option v-for="item of $d.OutOrInEnrollment" :key="`OutOrInEnrollment${item.value}`"
+                :value="item.value" :label="item.label" :disabled="item.value === 0 && currentWorkload > 0" />
             </el-select>
           </el-form-item>
-          <el-form-item
-            v-if="updateStatusForm.Status == 1"
-            :label="$t('trials:enrolledReviews:label:outOfEnrollmentTime')"
-            prop="OutEnrollmentTime"
-          >
-            <el-date-picker
-              v-model="updateStatusForm.OutEnrollmentTime"
-              type="date"
-              value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
-            />
+          <el-form-item v-if="updateStatusForm.Status == 1"
+            :label="$t('trials:enrolledReviews:label:outOfEnrollmentTime')" prop="OutEnrollmentTime">
+            <el-date-picker v-model="updateStatusForm.OutEnrollmentTime" type="date" value-format="yyyy-MM-dd"
+              format="yyyy-MM-dd" />
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
-          :disabled="reviewerStatus_model.btnLoading"
-          type="primary"
-          @click="reviewerStatus_model.visible = false"
-        >
+        <el-button :disabled="reviewerStatus_model.btnLoading" type="primary"
+          @click="reviewerStatus_model.visible = false">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
-          type="primary"
-          :loading="reviewerStatus_model.btnLoading"
-          @click="handleUpdateReviewerStatus"
-        >
+        <el-button type="primary" :loading="reviewerStatus_model.btnLoading" @click="handleUpdateReviewerStatus">
           {{ $t('common:button:save') }}
         </el-button>
       </template>
     </base-model>
     <BaseModel :config="model_cfg">
       <template slot="dialog-body">
-        <el-form
-          ref="DictionaryTypeConfigForm"
-          :model="form"
-          label-width="120px"
-          size="small"
-        >
-          <el-form-item
-            :label="$t('trials:enrolledReviews:table:criterionName')"
-            prop="CriterionType"
-          >
+        <el-form ref="DictionaryTypeConfigForm" :model="form" label-width="120px" size="small">
+          <el-form-item :label="$t('trials:enrolledReviews:table:criterionName')" prop="CriterionType">
             <el-input v-model="form.CriterionName" disabled />
           </el-form-item>
-          <el-form-item
-            :label="$t('trials:enrolledReviews:table:file')"
-            prop="FilePath"
-          >
-            <el-upload
-              class="upload-demo"
-              action
-              :before-upload="beforeUpload"
-              :http-request="handleUploadFile"
-              :on-preview="handlePreview2"
-              :on-remove="handleRemoveFile2"
-              :show-file-list="true"
-              accept=".pdf"
-              :limit="1"
-              :file-list="fileList"
-            >
-              <el-button
-                size="small"
-                type="primary"
-                :disabled="fileList.length > 0"
-                >{{ $t('common:button:upload') }}</el-button
-              >
+          <el-form-item :label="$t('trials:enrolledReviews:table:file')" prop="FilePath">
+            <el-upload class="upload-demo" action :before-upload="beforeUpload" :http-request="handleUploadFile"
+              :on-preview="handlePreview2" :on-remove="handleRemoveFile2" :show-file-list="true" accept=".pdf"
+              :limit="1" :file-list="fileList">
+              <el-button size="small" type="primary" :disabled="fileList.length > 0">{{ $t('common:button:upload')
+              }}</el-button>
             </el-upload>
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="handleCancle"
-        >
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
-          size="small"
-          type="primary"
-          :loading="btnLoading"
-          @click="handleSave"
-        >
+        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </template>
@@ -779,8 +574,7 @@ export default {
       var fileName = param.file.name
       let file = await this.fileToBlob(param.file)
       let res = await this.OSSclient.put(
-        `/SystemData/reviewer/${
-          this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
+        `/SystemData/reviewer/${this.form.FileType === 0 ? '既往阅片情况声明' : '入项资格确认书'
         }/${this.rowData.DoctorId}/${fileName}`,
         file
       )
@@ -1085,6 +879,7 @@ export default {
 <style lang="scss">
 .enroll-list {
   height: 100%;
+
   .readingCategory_model {
     .base-modal-body {
       min-height: 150px;

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -842,7 +842,7 @@ export default {
       var trialId = this.$route.query.trialId
       var file = await this.fileToBlob(param.file)
       const res = await this.OSSclient.put(
-        `/${trialId}/Read/${this.subjectId}/visit/${param.file.name}`,
+        `/${trialId}/Read/${this.subjectId}/${this.visitTaskId}/${param.file.name}`,
         file
       )
       console.log(res)

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

@@ -126,7 +126,7 @@ import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import metaDataProvider from '@/utils/metaDataProvider'
-cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
+
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
 const scroll = cornerstoneTools.import('util/scrollToIndex')
@@ -1126,6 +1126,7 @@ export default {
         //   resolve()
         // })
         this.loading = true
+        cornerstone.metaData.addProvider(metaDataProvider, 1);
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
           .then(async image => {
             if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
@@ -1685,7 +1686,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/Fusion/Questions.vue

@@ -721,7 +721,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue

@@ -739,7 +739,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue

@@ -872,7 +872,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue

@@ -1073,7 +1073,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue

@@ -715,7 +715,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

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

@@ -276,7 +276,7 @@ export default {
       window.opener.postMessage(data, window.location)
     },
     async receiveMsg(event) {
-      console.log('nonedicoms', event.data.type)
+      // console.log('nonedicoms', event.data.type)
       if (event.data.type === 'isCanActiveNoneDicomTool') {
         if (event.data.data.isCanActiveTool) {
           // this.model = 'ArrowAnnotate'
@@ -304,8 +304,12 @@ export default {
         //     this.canvasData.splice(i, 1)
         //   }
         // }
+        if (!event.data.data) {
+          this.canvasData = []
+        } else {
           var idx = this.canvasData.findIndex(item => item.data.uuid === event.data.data.data.uuid)
           this.canvasData.splice(idx, 1)
+        }
         ctx.clearRect(0, 0, this.canvasSize.width, this.canvasSize.height) // 清除画布后立刻重新绘制视觉上形成动画
         await ctx.drawImage(
           this.currentImg,
@@ -512,6 +516,11 @@ export default {
           this.canvasData.push(this.currentDrawData) // 添加当前绘图数据
         }
       }
+      // 向主窗体发送测量数据
+      if (this.model) {
+        var data = { type: 'setMeasurement', data: this.currentDrawData }
+        window.opener.postMessage(data, window.location)
+      }
       this.isMouseDown = false // 关闭鼠标状态
       this.model = ''
       this.lesionName = ''
@@ -519,9 +528,6 @@ export default {
         x: e.offsetX, // 更新位置
         y: e.offsetY
       }
-      // 向主窗体发送测量数据
-      var data = { type: 'setMeasurement', data: this.currentDrawData }
-      window.opener.postMessage(data, window.location)
     },
 
     // 画标注
@@ -570,7 +576,7 @@ export default {
             end: { x: e.offsetX, y: e.offsetY }
           },
           remark: this.lesionName,
-          uuid: `${this.imgId}-${this.lesionName}`,
+          uuid: `${this.imgId}-${this.lesionName ? this.lesionName : Date.now()}`,
           toolName: 'ArrowAnnotate',
           toolType: 'ArrowAnnotate'
         }
@@ -601,7 +607,7 @@ export default {
             end: { x: e.offsetX, y: e.offsetY }
           },
           remark: this.lesionName,
-          uuid: `${this.imgId}-${this.lesionName}`,
+          uuid: `${this.imgId}-${this.lesionName ? this.lesionName : Date.now()}`,
           toolName: 'RectangleRoi',
           toolType: 'RectangleRoi'
         }

src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue

@@ -590,7 +590,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

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

@@ -452,7 +452,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue

@@ -801,7 +801,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue

@@ -727,7 +727,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         var trialId = this.$route.query.trialId
         var subjectId = this.$route.query.trialId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

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

@@ -126,7 +126,7 @@ import Contextmenu from 'vue-contextmenujs'
 Vue.use(Contextmenu)
 import * as cornerstone from 'cornerstone-core'
 import metaDataProvider from '@/utils/metaDataProvider'
-cornerstone.metaData.addProvider(metaDataProvider, { priority: 10 });
+
 import * as cornerstoneMath from 'cornerstone-math'
 import * as cornerstoneTools from 'cornerstone-tools'
 const scroll = cornerstoneTools.import('util/scrollToIndex')
@@ -1080,6 +1080,7 @@ export default {
         //   resolve()
         // })
         this.loading = true
+        cornerstone.metaData.addProvider(metaDataProvider, 1);
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
           .then(async image => {
             if (this.stack.imageIds.indexOf(image.imageId) !== -1) {
@@ -1276,7 +1277,6 @@ export default {
         'imagePlaneModule',
         enabledElement.image.imageId
       )
-
       if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) {
         return
       }
@@ -1615,7 +1615,7 @@ export default {
         cornerstoneTools.getToolState(
           this.canvas,
           'playClip'
-        ).data[0].loop = false
+        ).data[0].loop = true
       } else {
         cornerstoneTools.stopClip(this.canvas)
         this.toolState.clipPlaying = false

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

@@ -91,7 +91,7 @@
   </div>
 </template>
 <script>
-import { submitDicomVisitTask } from '@/api/trials'
+import { submitDicomVisitTask, verifyVisitTaskQuestions } from '@/api/trials'
 import { getCustomTag, submitCustomTag, resetReadingTask } from '@/api/reading'
 import { setSkipReadingCache } from '@/api/reading'
 import DicomEvent from './../components/DicomEvent'
@@ -358,6 +358,7 @@ export default {
     async handleConfirm() {
       var res = await this.$refs['QuestionsPreview'].handleSave(false)
       if (res) {
+        await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
         const { ImageAssessmentReportConfirmation } = const_.processSignature
         this.signCode = ImageAssessmentReportConfirmation
         this.signVisible = true

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

@@ -1,60 +1,47 @@
 <template>
   <div class="criterion-form-item">
-    <div
-      v-if="!!question.GroupName && question.Type==='group'"
-      style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;"
-    >
+    <div v-if="!!question.GroupName && question.Type === 'group'"
+      style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;">
       {{ question.GroupName }}
     </div>
-    <div
-      v-if="question.Type==='table' || question.Type==='basicTable'"
-      style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
-    >
+    <div v-if="question.Type === 'table' || question.Type === 'basicTable'"
+      style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
       <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
-        <span>{{ question.QuestionName }}</span>
+        <span :title="question.Remark">{{ question.QuestionName }}</span>
         <el-button size="mini" v-if="readingTaskState < 2" @click="openAddTableCol(question)">
           {{ $t('common:button:add') }}
         </el-button>
       </div>
-      <el-table
-        :data="questionForm[question.Id]">
+      <el-table :data="questionForm[question.Id]">
         <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ question.OrderMark }}{{ scope.$index + 1 }}
           </template>
         </el-table-column>
-        <el-table-column
-          :prop="item.Id"
-          :label="item.QuestionName"
-          :key="item.Id"
-          v-for="item of question.TableQuestions.Questions"
-          show-overflow-tooltip
-          :render-header="renderHeader"
-        >
+        <el-table-column :prop="item.Id" :label="item.QuestionName" :key="item.Id"
+          v-for="item of question.TableQuestions.Questions" show-overflow-tooltip :render-header="renderHeader">
           <template slot-scope="scope">
             <span v-if="item.Type === 'upload'">
               {{ scope.row[item.Id] === '' ? '' : scope.row[item.Id] ? scope.row[item.Id].split('|').length : '' }}
             </span>
             <span v-else-if="item.Type === 'number'">
-              {{!isNaN(parseFloat(scope.row[item.Id])) ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) : scope.row[item.Id]}}
+              {{ !isNaN(parseFloat(scope.row[item.Id])) ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) :
+                scope.row[item.Id] }}
             </span>
             <span v-else>
               {{ scope.row[item.Id] }}
             </span>
           </template>
         </el-table-column>
-        <el-table-column
-            :label="$t('common:action:action')"
-            show-overflow-tooltip
-            width="100px"
-            v-if="readingTaskState < 2"
-            fixed="right"
-        >
+        <el-table-column :label="$t('common:action:action')" show-overflow-tooltip width="100px"
+          v-if="readingTaskState < 2" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">
               {{ $t('common:button:edit') }}
             </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>
@@ -64,283 +51,148 @@
     <template v-else>
       <el-form-item
         v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-        :label="`${question.QuestionName}`"
-        :prop="question.Id"
-        :rules="[
-          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type!=='group' && question.Type!=='summary',
-            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+        :label="`${question.QuestionName}`" :title="question.Remark" :prop="question.Id" :rules="[
+          {
+            required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type !== 'group' && question.Type !== 'summary',
+            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          },
           {
             validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput : (rule, value, callback) => { callback() },
             trigger: ['blur', 'change']
           }
-        ]"
-        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
-      >
+        ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
         <!-- 输入框 -->
-        <el-input
-          v-if="question.Type==='input'"
-          v-model="questionForm[question.Id]"
-          :disabled="question.TableQuestionType === 2 || readingTaskState === 2"
-        />
+        <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
+          :disabled="question.TableQuestionType === 2 || readingTaskState === 2" />
         <!-- 多行文本输入框 -->
-        <el-input
-          v-if="question.Type==='textarea'"
-          v-model="questionForm[question.Id]"
-          type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
-          :disabled="readingTaskState === 2"
-        />
+        <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
+          :autosize="{ minRows: 2, maxRows: 4 }" :disabled="readingTaskState === 2" />
         <!-- 下拉框 -->
-        <el-select
-          v-if="question.Type==='select'"
-          v-model="questionForm[question.Id]"
-          clearable
+        <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
           :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode || readingTaskState === 2"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
+          @change="((val) => { formItemChange(val, question) })">
           <template v-if="question.TableQuestionType === 1">
-            <el-option
-              v-for="item in organList"
-              :key="item.Id"
-              :label="item[question.DataTableColumn]"
-              :value="item[question.DataTableColumn]"
-            />
+            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
+              :value="item[question.DataTableColumn]" />
           </template>
           <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+              :label="item.label" />
           </template>
-          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-            <el-option
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
+          <template
+            v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+              :label="item.label" />
           </template>
           <template v-else>
-            <el-option
-              v-for="val in question.TypeValue.split('|')"
-              :key="val.trim()"
-              :label="val.trim()"
-              :value="val.trim()"
-            />
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()"
+              :value="val.trim()" />
           </template>
 
         </el-select>
         <!-- 单选 -->
-        <el-radio-group
-          v-if="question.Type==='radio'"
-          v-model="questionForm[question.Id]"
-          @change="((val)=>{formItemChange(val, question)})"
-          :disabled="readingTaskState === 2"
-        >
-          <el-radio
-            v-for="val in question.TypeValue.split('|')"
-            :key="val.trim()"
-            :label="val.trim()"
-          >
+        <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState === 2">
+          <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
             {{ val.trim() }}
           </el-radio>
         </el-radio-group>
         <!-- 复选框 -->
-        <el-checkbox-group
-          v-if="question.Type==='checkbox'"
-          v-model="questionForm[question.Id]"
-          :disabled="readingTaskState === 2"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-          >
+        <el-checkbox-group v-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
+          :disabled="readingTaskState === 2">
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()">
             {{ val.trim() }}
           </el-checkbox>
         </el-checkbox-group>
         <!-- 自动分类 -->
-        <el-input
-          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType || readingTaskState === 2"
-        />
-        <el-select
-          v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-            :value="val.trim()"
-          />
+        <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2" />
+        <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2"
+          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          @change="(val) => { formItemChange(val, question) }">
+          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
         </el-select>
-        <el-radio-group
-          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-radio
-            v-for="item of question.TypeValue.split('|')"
-            :key="item.trim()"
-            :label="item.trim()"
-          >
+        <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          @change="(val) => { formItemChange(val, question) }">
+          <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
             {{ item.trim() }}
           </el-radio>
         </el-radio-group>
-        <el-input
-          v-if="question.Type === 'class' && question.ClassifyShowType === 4"
-          type="number"
-          :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          v-model="questionForm[question.Id]"
-          @change="(val) => { formItemNumberChange(val, question) }"
-        />
+        <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 4" type="number"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2" v-model="questionForm[question.Id]"
+          @change="(val) => { formItemNumberChange(val, question) }" />
         <!-- 自动计算 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input
-          v-if="question.Type==='calculation'"
-          v-model="questionForm[question.Id]"
-          @input="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')"
-          disabled
-        />
+        <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
+          @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
         <!-- 自增 -->
-        <el-input
-          v-if="question.Type==='increment'"
-          v-model="questionForm[question.Id]"
-          disabled
-        />
+        <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
         <!-- 数值 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-select
-          v-if="question.Type === 'number' && question.TypeValue"
-          v-model="questionForm[question.Id]"
-          clearable
-          @change="(val) => { formItemNumberChange(val, question) }"
-          :disabled="readingTaskState === 2"
-        >
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-            :value="val.trim()"
-          />
+        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
+          @change="(val) => { formItemNumberChange(val, question) }" :disabled="readingTaskState === 2">
+          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
+          <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+            question.CustomUnit }}</template>
+          <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
         </el-select>
-        <el-input
-          type="text"
-          v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
-          @change="(val) => { formItemNumberChange(val, question) }"
-          @input="numberInput(question.Id)"
+        <el-input type="text" v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
+          @change="(val) => { formItemNumberChange(val, question) }" @input="numberInput(question.Id)"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model.trim="questionForm[question.Id]"
-          :disabled="readingTaskState === 2"
-        >
+          v-model.trim="questionForm[question.Id]" :disabled="readingTaskState === 2">
           <!-- <template slot="append">1</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
+          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+            question.CustomUnit }}</template>
           <template slot="append" v-else-if="question.ValueType === 2">%</template>
         </el-input>
-        <el-input
-          type="text"
-          @input="numberInput(question.Id)"
+        <el-input type="text" @input="numberInput(question.Id)"
           v-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          :disabled="question.DataSource === 1 || readingTaskState === 2"
-          v-model.trim="questionForm[question.Id]"
-        >
+          :disabled="question.DataSource === 1 || readingTaskState === 2" v-model.trim="questionForm[question.Id]">
           <!-- <template slot="append">2</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
+          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+            question.CustomUnit }}</template>
           <template slot="append" v-else-if="question.ValueType === 2">%</template>
         </el-input>
         <!-- 上传图像 -->
-        <el-upload
-          v-if="question.Type==='upload'"
-          :disabled="readingTaskState === 2"
-          action
-          :accept="question.FileType"
-          :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
+        <el-upload v-if="question.Type === 'upload'" :disabled="readingTaskState === 2" action
+          :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
           :on-preview="handlePictureCardPreview"
           :before-upload="(file) => { return handleBeforeUpload(file, question.FileType) }"
-          :http-request="uploadScreenshot"
-          :on-remove="handleRemove"
-          :file-list="fileList"
-          :class="{disabled:question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
-        >
+          :http-request="uploadScreenshot" :on-remove="handleRemove" :file-list="fileList"
+          :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
           <el-button slot="default" class="el-icon-plus" v-if="readingTaskState < 2">
             {{ this.$t('common:button:upload') }}
           </el-button>
         </el-upload>
-        <viewer
-          v-if="question.Type==='upload' && imgVisible"
-          :ref="imageUrl"
-          style="margin:0 10px;"
-          :images="[imageUrl]"
-        >
-          <img
-            v-show="false"
-            crossorigin="anonymous"
-            :src="imageUrl"
-            alt="Image"
-          >
+        <viewer v-if="question.Type === 'upload' && imgVisible" :ref="imageUrl" style="margin:0 10px;"
+          :images="[imageUrl]">
+          <img v-show="false" crossorigin="anonymous" :src="imageUrl" alt="Image">
         </viewer>
       </el-form-item>
     </template>
 
-    <template v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table' && question.Type !== 'basicTable'">
-      <CustomizeQuestionFormItem
-        v-for="(item) in question.Childrens"
-        :key="item.Id"
-        :question="item"
-        :IsBaseline="IsBaseline"
-        :reading-task-state="readingTaskState"
-        :question-form="questionForm"
-        :visit-task-id="visitTaskId"
-        :criterion-id="criterionId"
-        :CalculationList="CalculationList"
-        @formItemNumberChange="formItemNumberChange"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
+    <template
+      v-if="question.Childrens && question.Childrens.length > 0 && question.Type !== 'table' && question.Type !== 'basicTable'">
+      <CustomizeQuestionFormItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
+        :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="questionForm"
+        :visit-task-id="visitTaskId" :criterion-id="criterionId" :CalculationList="CalculationList"
+        @formItemNumberChange="formItemNumberChange" @setFormItemData="setFormItemData"
+        @resetFormItemData="resetFormItemData" />
     </template>
-    <base-model :config="addOrEdit"
-      class="my_dialog"
-      :close-on-click-modal="false"
-      width="400px"
-      append-to-body
-    >
+    <base-model :config="addOrEdit" class="my_dialog" :close-on-click-modal="false" width="400px" append-to-body>
       <template slot="dialog-body">
-        <el-form
-            ref="tableQsForm"
-            :model="QuestionsForm"
-            v-loading="loading"
-            size="small"
-        >
-          <QuestionTableFormItem
-              v-for="(item) in QuestionsList"
-              :key="item.Id"
-              :question="item"
-              :IsBaseline="IsBaseline"
-              :reading-task-state="readingTaskState"
-              :question-form="QuestionsForm"
-              :visit-task-id="visitTaskId"
-              :criterion-id="criterionId"
-              :type="addOrEdit.type"
-              :CalculationList="CalculationTabelList"
-              @formItemTableNumberChange="formItemTableNumberChange"
-              @resetFormItemData="resetTableFormItemData"
-              @setFormItemData="setFormTableItemData" 
-          />
+        <el-form ref="tableQsForm" :model="QuestionsForm" v-loading="loading" size="small">
+          <QuestionTableFormItem v-for="(item) in QuestionsList" :key="item.Id" :question="item"
+            :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="QuestionsForm"
+            :visit-task-id="visitTaskId" :criterion-id="criterionId" :type="addOrEdit.type"
+            :CalculationList="CalculationTabelList" @formItemTableNumberChange="formItemTableNumberChange"
+            @resetFormItemData="resetTableFormItemData" @setFormItemData="setFormTableItemData" />
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
-            size="small"
-            @click="addOrEdit.visible = false"
-        >
+        <el-button size="small" @click="addOrEdit.visible = false">
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -350,23 +202,10 @@
       </template>
     </base-model>
     <!-- 预览文件 -->
-    <el-dialog
-      v-if="previewVisible"
-      :visible.sync="previewVisible"
-      :title="$t('common:button:preview')"
-      :fullscreen="true"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <div
-        class="base-modal-body"
-        style="border: 2px solid #ccc; padding: 10px"
-      >
-        <PreviewFile
-          v-if="previewVisible"
-          :file-path="currentPath"
-          :file-type="currentType"
-        />
+    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
+      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
+      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
+        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
       </div>
     </el-dialog>
   </div>
@@ -712,6 +551,9 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   break;
                 case 6:
@@ -726,6 +568,9 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   break;
                 case 7:
@@ -740,6 +585,9 @@ export default {
                     if (q[o.TableQuestionId] === 'NE') {
                       isNE = true
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
                   break;
@@ -777,6 +625,9 @@ export default {
               }
             }
           } else {
+            if (this.questionForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
             switch (rules.CustomCalculateMark) {
               case 1:
                 if (isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
@@ -1139,9 +990,11 @@ export default {
 .my_dialog {
   .criterion-form-item {
     width: 100%;
+
     ::v-deep .el-form-item__content {
       width: auto;
     }
+
     //::v-deep .el-input-goup__append{
     //  background-color: transparent;
     //  color: #ddd;
@@ -1149,25 +1002,41 @@ export default {
     //}
   }
 }
+
+::v-deep .el-select .el-input__prefix {
+  left: calc(100% - 50px);
+  cursor: pointer;
+}
+
+::v-deep .el-select .el-input__inner {
+  padding-left: 15px;
+  padding-right: 50px;
+}
+
 ::v-deep .el-form-item__label {
   color: #c3c3c3;
 }
+
 ::v-deep .el-radio__label {
   color: #c3c3c3;
 }
+
 ::v-deep .el-input-group__append {
   background: #000;
   color: #ddd;
   border: 1px solid #5e5e5e;
 }
+
 ::v-deep .el-input .el-input__inner {
   background-color: transparent;
   color: #ddd;
   border: 1px solid #5e5e5e;
 }
+
 .criterion-form-item {
   ::v-deep .criterion-form-item .el-form-item {
     display: block;
+
     .el-form-item__label {
       display: block;
       color: #c8c8c8;
@@ -1175,36 +1044,45 @@ export default {
       text-align: left;
     }
   }
+
   .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
+
   .el-input {
     width: 100%;
   }
+
   .mb {
     margin-bottom: 0px;
   }
+
   .disabled {
     ::v-deep .el-upload--picture-card {
       display: none;
     }
   }
+
   .uploadWrapper {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
   }
 }
+
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar {
   height: 10px !important;
 }
+
 ::v-deep .el-table__fixed-right::before {
   display: none;
 }
+
 ::v-deep .el-upload-list__item-name {
   color: #0a84ff;
+
   .el-icon-document {
     color: #0a84ff;
   }

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

@@ -2,7 +2,7 @@
   <div class="criterion-form-item">
     <el-form-item
       v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-      :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
+      :label="`${question.QuestionName}`" :prop="question.Id" :title="question.Remark" :rules="[
         {
           required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type !== 'group' && question.Type !== 'summary',
           message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
@@ -83,6 +83,9 @@
         @change="(val) => { formItemNumberChange(val, question) }"
         :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')">
         <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
+        <template v-if="question.Unit !== 0" slot="prefix">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+          question.CustomUnit }}</template>
+        <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
       </el-select>
       <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
         :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
@@ -450,7 +453,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) {
@@ -479,7 +483,7 @@ export default {
       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)
+      const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${param.file.name}`, file)
       console.log(res)
       this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
       this.urls.push(this.$getObjectName(res.url))
@@ -540,6 +544,16 @@ export default {
   }
 }
 
+::v-deep .el-select .el-input__prefix {
+  left: calc(100% - 50px);
+  cursor: pointer;
+}
+
+::v-deep .el-select .el-input__inner {
+  padding-left: 15px;
+  padding-right: 50px;
+}
+
 .criterion-form-item {
   .el-form-item {
     display: flex;

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/dicoms/customize/CustomizeReportPageUpload.vue

@@ -120,7 +120,7 @@ name: "CustomizeReportPageUpload",
       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)
+      const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${param.file.name}`, file)
       console.log(res)
       this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)})
       this.urls.push(this.$getObjectName(res.url))

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

@@ -799,6 +799,7 @@ export default {
   width: 100%;
   height: 100%;
   position: relative;
+  cursor: default !important;
 
   .left-top-text {
     position: absolute;

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

@@ -8,35 +8,24 @@
           <span style="margin-left:5px;">{{ visitInfo.TaskBlindName }}</span>
         </h3>
         <div v-if="readingTaskState < 2">
-          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')" placement="bottom">
-            <i
-              class="el-icon-refresh-left"
-              @click="resetForm"
-            />
+          <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
+            placement="bottom">
+            <i class="el-icon-refresh-left" @click="resetForm" />
           </el-tooltip>
         </div>
       </div>
 
       <!-- 影像质量评估 -->
       <div v-if="outerQuestions.length > 0" class="outer_form_wrapper">
-        <el-form
-          ref="outerForm"
-          size="small"
-          :model="outerForm"
-        >
-          <question-form-item
-            v-for="outerQs in outerQuestions"
-            :key="outerQs.Id"
-            :question="outerQs"
-            :question-form="outerForm"
-            :reading-task-state="readingTaskState"
-            :visit-task-id="visitTaskId"
-            @resetFormItemData="resetOuterFormItemData"
-            @setFormItemData="setOuterFormItemData"
-          />
+        <el-form ref="outerForm" size="small" :model="outerForm">
+          <question-form-item v-for="outerQs in outerQuestions" :key="outerQs.Id" :question="outerQs"
+            :question-form="outerForm" :reading-task-state="readingTaskState" :visit-task-id="visitTaskId"
+            @resetFormItemData="resetOuterFormItemData" @setFormItemData="setOuterFormItemData" />
           <el-form-item v-if="readingTaskState < 2">
             <div class="outer_form-footer">
-              <i class="el-icon-warning feedback-icon" :style="{color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff'}" @click="openFeedBackTable" />
+              <i class="el-icon-warning feedback-icon"
+                :style="{ color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }"
+                @click="openFeedBackTable" />
               <el-button size="mini" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
             </div>
           </el-form-item>
@@ -44,146 +33,116 @@
       </div>
       <!-- 病灶评估 -->
       <template v-if="tableQuestions.length > 0 && criterionType !== 10">
-        <div
-          v-for="(qs,index) in tableQuestions"
-          :key="index"
-          class="lesions lesions_wrapper"
-        >
-          <h4
-            v-if="qs.Type === 'group'"
-            style="color: #ddd;padding: 5px 0px;margin: 0;"
-          >
+        <div v-for="(qs, index) in tableQuestions" :key="index" class="lesions lesions_wrapper">
+          <h4 v-if="qs.Type === 'group'" style="color: #ddd;padding: 5px 0px;margin: 0;">
             {{ language === 'en' ? qs.GroupEnName : qs.GroupName }}
           </h4>
           <div class="lesion_list">
-            <div
-              v-for="table in qs.Childrens"
-              v-show="!(isBaseLineTask && table.LesionType === 2)"
-              :key="table.Id"
-            >
-              <div
-                v-if="table.Type === 'table'"
-                class="flex-row"
-                style="margin:3px 0;"
-              >
+            <div v-for="table in qs.Childrens" v-show="!(isBaseLineTask && table.LesionType === 2)" :key="table.Id">
+              <div v-if="table.Type === 'table'" class="flex-row" style="margin:3px 0;">
                 <div class="title">{{ table.QuestionName }}</div>
-                <div
-                  v-if="readingTaskState<2 && (isBaseLineTask || table.LesionType === 2)"
-                  class="add-icon"
-                  @click.prevent="addTarget(table)"
-                >
+                <div v-if="readingTaskState < 2 && (isBaseLineTask || table.LesionType === 2)" class="add-icon"
+                  @click.prevent="addTarget(table)">
                   <i class="el-icon-plus" />
                 </div>
               </div>
-              <el-collapse
-                v-if="table.Type === 'table' && table.TableQuestions"
-                v-model="activeName"
-                accordion
-                @change="handleCollapseChange"
-              >
-                <el-collapse-item
-                  v-for="(answer,i) in table.TableQuestions.Answers"
-                  :key="`${table.Id}_${answer.RowIndex}`"
-                  :name="`${table.Id}_${answer.RowIndex}`"
-                  @contextmenu.prevent.native="collapseRightClick($event, table.Id, answer.RowIndex)"
-                >
+              <el-collapse v-if="table.Type === 'table' && table.TableQuestions" v-model="activeName" accordion
+                @change="handleCollapseChange">
+                <el-collapse-item v-for="(answer, i) in table.TableQuestions.Answers"
+                  :key="`${table.Id}_${answer.RowIndex}`" :name="`${table.Id}_${answer.RowIndex}`"
+                  @contextmenu.prevent.native="collapseRightClick($event, table.Id, answer.RowIndex)">
                   <template slot="title">
-                    <div
-                      style="width:340px;position: relative;"
-                      :style="{color:(activeName===table.Id+answer.RowIndex?'#ffeb3b':'#fff')}"
-                    >
+                    <div style="width:340px;position: relative;"
+                      :style="{ color: (activeName === table.Id + answer.RowIndex ? '#ffeb3b' : '#fff') }">
                       {{ getLesionName(table.OrderMark, answer.RowIndex) }}
                       <!-- 未保存 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 0" class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 0"
+                        class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                         <i class="el-icon-warning" style="color:red" />
                       </el-tooltip>
                       <!-- 信息不完整 -->
-                      <el-tooltip v-if="readingTaskState<2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
+                      <el-tooltip
+                        v-if="readingTaskState < 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].SaveTypeEnum) === 1"
+                        class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')"
+                        placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
                       <div style="position: absolute;left: 50px;top: 2px;">
                         <div style="font-size: 11px;width:220px;height: 30px;">
-                          <div
-                            v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
+                          <div v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
                             style="margin-left:10px;display: inline-block; white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:90px"
-                            :title="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart"
-                          >
+                            :title="innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart">
                             {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionPart }}
                           </div>
-                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:50px">
                             <span v-if="table.LesionType === 0">
-                              {{ $fd('TargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                              {{
+                                $fd('TargetState', parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
+                              }}
                             </span>
                             <span v-else-if="table.LesionType === 1">
-                              {{ $fd('NoTargetState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                              {{
+                                $fd('NoTargetState',
+                                  parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
+                              }}
                             </span>
                             <span v-else>
-                              {{ $fd('NewLesionState',parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState)) }}
+                              {{
+                                $fd('NewLesionState',
+                                  parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))
+                              }}
                             </span>
                           </div>
-                          <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
-                            <template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
+                          <div
+                            style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
+                            <template
+                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
                               {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
                             </template>
-                            <template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                            <template
+                              v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
                               {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
                             </template>
                           </div>
                         </div>
                       </div>
                       <!-- 分裂 -->
-                      <div v-if="((table.LesionType === 0 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0) || (table.LesionType === 1 && [0,1].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (table.LesionType === 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0)) && innerFormData[`${table.Id}_${answer.RowIndex}`].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
-                        <el-tooltip v-show="readingTaskState<2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false" class="table" :content="$t('trials:reading:button:split')" placement="left">
-                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="lesionSplit(table.Id, innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)" />
+                      <div
+                        v-if="((table.LesionType === 0 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0) || (table.LesionType === 1 && [0, 1].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))) || (table.LesionType === 2 && parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState) === 0)) && innerFormData[`${table.Id}_${answer.RowIndex}`].IsCurrentTaskAdd === 'False'"
+                        style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                        <el-tooltip
+                          v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && !isBaseLineTask && innerFormData[`${table.Id}_${answer.RowIndex}`].IsDicomReading !== false"
+                          class="table" :content="$t('trials:reading:button:split')" placement="left">
+                          <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
+                            @click.stop="lesionSplit(table.Id, innerFormData[`${table.Id}_${answer.RowIndex}`].RowId)" />
                         </el-tooltip>
                       </div>
 
                     </div>
 
                   </template>
-                  <el-form
-                    :ref="`${table.Id}_${answer.RowIndex}`"
-                    size="small"
-                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]"
-                  >
-                    <table-question-form-item
-                      :ref="`form_${table.Id}_${answer.RowIndex}`"
-                      :table-info="table"
-                      :answer="answer"
-                      :question-form="innerFormData[`${table.Id}_${answer.RowIndex}`]"
-                      :reading-task-state="readingTaskState"
-                      :organs="organs"
-                      :is-base-line-task="isBaseLineTask"
-                      :is-current-task="isCurrentTask"
-                      @update="innerFormDataUpdate"
-                      @close="closeInnerForm"
-                      @lesionTypeChange="lesionTypeChange"
-                    />
-                    <div
-                      v-if="readingTaskState<2"
-                      style="text-align:right;margin-top:10px;"
-                    >
+                  <el-form :ref="`${table.Id}_${answer.RowIndex}`" size="small"
+                    :model="innerFormData[`${table.Id}_${answer.RowIndex}`]">
+                    <table-question-form-item :ref="`form_${table.Id}_${answer.RowIndex}`" :table-info="table"
+                      :answer="answer" :question-form="innerFormData[`${table.Id}_${answer.RowIndex}`]"
+                      :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
+                      :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
+                      @lesionTypeChange="lesionTypeChange" />
+                    <div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;">
                       <!-- 清除标记 -->
-                      <el-button
-                        v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData"
-                        size="mini"
-                        @click="clearMeasureData(table, answer.RowIndex)"
-                      >
+                      <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
+                        @click="clearMeasureData(table, answer.RowIndex)">
                         {{ $t('trials:reading:button:removeMark') }}
                       </el-button>
                       <!-- 删除 -->
-                      <el-button
-                        v-if="table.TableQuestions.Answers[i].IsCurrentTaskAdd !== 'False'"
-                        size="mini"
-                        @click="deleteLesion(table, answer.RowIndex)"
-                      >
+                      <el-button v-if="table.TableQuestions.Answers[i].IsCurrentTaskAdd !== 'False'" size="mini"
+                        @click="deleteLesion(table, answer.RowIndex)">
                         {{ $t('common:button:delete') }}
                       </el-button>
                       <!-- 保存 -->
-                      <el-button
-                        size="mini"
-                        @click="saveLesion(table, answer.RowIndex)"
-                      >
+                      <el-button size="mini" @click="saveLesion(table, answer.RowIndex)">
                         {{ $t('common:button:save') }}
                       </el-button>
                     </div>
@@ -212,6 +171,7 @@ import { resetReadingTask, setSkipReadingCache } from '@/api/reading'
 import { mapGetters } from 'vuex'
 import QuestionFormItem from './QuestionFormItem'
 import TableQuestionFormItem from './TableQuestionFormItem'
+import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 export default {
   name: 'QuestionList',
   components: {
@@ -283,6 +243,7 @@ export default {
     this.getOrganList()
     this.getOuterQuestions()
     this.getTableQuestions()
+    window.addEventListener('message', this.receiveMsg)
   },
   methods: {
     // 获取器官信息
@@ -468,7 +429,7 @@ export default {
       }
     },
     setAnnotation(obj) {
-      const annotation = Object.assign({}, obj.annotation)
+      const annotation = Object.assign({}, !Object.hasOwn(obj, 'isDicomReading') ? obj.annotation : obj)
       if (this.activeName) {
         // 判断当前激活的病灶是否有标注信息
         const tableId = this.activeName.split('_')[0]
@@ -493,6 +454,13 @@ export default {
             child => child.Id === tableId
           )
           if (typeof targetTable !== 'object') return
+          if (Object.hasOwn(annotation, 'isDicomReading') && !annotation.isDicomReading) {
+            // 非dicom获取名称进行重绘
+            annotation.data.remark = innerForm.LesionName
+            annotation.markTool = annotation.data.toolName
+            DicomEvent.$emit('addNoneDicomMeasureData', annotation)
+            this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'IsDicomReading', false)
+          }
           this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'MeasureData', annotation)
           let length = null
           let short = null
@@ -676,10 +644,16 @@ export default {
       answer.RowId = ''
       const maxIndex = this.getMaxRowIndex(tableInfo.TableQuestions.Answers)
       answer.RowIndex = `${maxIndex + 1}.00`
-      answer.IsDicomReading = true
+      answer.IsDicomReading = annotation && Object.hasOwn(annotation, 'isDicomReading') ? annotation.isDicomReading : true
       answer.SaveTypeEnum = 0
       answer.LesionType = tableInfo.LesionType
       answer.LesionName = this.getLesionName(tableInfo.OrderMark, answer.RowIndex)
+      if (!answer.IsDicomReading) {
+        // 非dicom获取名称进行重绘
+        annotation.data.remark = answer.LesionName
+        annotation.markTool = annotation.data.toolName
+        DicomEvent.$emit('addNoneDicomMeasureData', annotation)
+      }
       let state = null
       if (this.isBaseLineTask && tableInfo.LesionType === 0) {
         state = 0
@@ -693,14 +667,14 @@ export default {
       tableInfo.TableQuestions.Answers.push(answer)
       if (typeof annotation === 'object') {
         answer.MeasureData = annotation
-        if (annotation.metadata.toolName === 'Length') {
+        if (annotation.metadata?.toolName === 'Length') {
           const referencedImageId = annotation.metadata.referencedImageId
           let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
           length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
           const lengthId = this.getQuestionId(0, tableInfo.TableQuestions.Questions)
           answer.LesionLength = length
           answer[lengthId] = length
-        } else if (annotation.metadata.toolName === 'Bidirectional') {
+        } else if (annotation.metadata?.toolName === 'Bidirectional') {
           const referencedImageId = annotation.metadata.referencedImageId
           let length = annotation.data.cachedStats[`imageId:${referencedImageId}`].length
           length = length ? parseFloat(length).toFixed(this.digitPlaces) : length
@@ -775,7 +749,11 @@ export default {
       this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionState', null)
       const obj = Object.assign({}, innerForm.MeasureData)
       // 移除标注信息
+      if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
         this.$emit('removeAnnotation', obj)
+      } else {
+        DicomEvent.$emit('removeNoneDicomMeasureData', obj)
+      }
       // 重置标注信息
       this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'MeasureData', null)
       // 重置保存标志
@@ -806,7 +784,11 @@ export default {
             if (innerForm.MeasureData) {
               // 移除标注信息
               const obj = Object.assign({}, innerForm.MeasureData)
+              if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
                 this.$emit('removeAnnotation', obj)
+              } else {
+                DicomEvent.$emit('removeNoneDicomMeasureData', obj)
+              }
             }
             // 刷新表格问题
             await this.getTableQuestions()
@@ -819,7 +801,11 @@ export default {
           if (innerForm.MeasureData) {
             // 移除标注信息
             const obj = Object.assign({}, innerForm.MeasureData)
+            if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
               this.$emit('removeAnnotation', obj)
+            } else {
+              DicomEvent.$emit('removeNoneDicomMeasureData', obj)
+            }
           }
           // 移除病灶
           this.removeAnswer(table.Id, rowIndex)
@@ -881,7 +867,7 @@ export default {
           if (lesionType === 1 && lesionState === 0) {
             if (lymphNodes === 1) {
               // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
                 this.$confirm(this.$t('trials:reading:warnning:msg21'), {
                   type: 'warning',
@@ -893,7 +879,8 @@ export default {
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具或箭头工具
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
+              console.log(measureData, 'measureData')
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg22'), {
                   type: 'warning',
@@ -1040,7 +1027,7 @@ export default {
           if (lesionType === 1 && lesionState === 0) {
             if (lymphNodes === 1) {
               // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg31'), {
                   type: 'warning',
@@ -1052,7 +1039,7 @@ export default {
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg32'), {
                   type: 'warning',
@@ -1069,7 +1056,7 @@ export default {
           if (lesionType === 1 && lesionState === 1) {
             if (lymphNodes === 1) {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
+              if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
                 this.$confirm(this.$t('trials:reading:warnning:msg33'), {
                   type: 'warning',
@@ -1081,7 +1068,7 @@ export default {
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
-              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
+              if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
                 this.$confirm(this.$t('trials:reading:warnning:msg34'), {
                   type: 'warning',
@@ -1338,7 +1325,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         const trialId = this.$route.query.trialId
         const subjectId = this.taskInfo.SubjectId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)
@@ -1502,6 +1489,7 @@ export default {
           this.getOuterQuestions()
           this.getTableQuestions()
           this.$emit('resetAnnotations', this.visitTaskId)
+          DicomEvent.$emit('removeNoneDicomMeasureData', null)
         }
         loading.close()
       } catch (e) {
@@ -1694,7 +1682,11 @@ export default {
         // 移除标注信息
         if (innerForm.MeasureData) {
           const obj = Object.assign({}, innerForm.MeasureData)
+          if (innerForm.IsDicomReading && innerForm.IsDicomReading !== 'False') {
             this.$emit('removeAnnotation', obj)
+          } else {
+            DicomEvent.$emit('removeNoneDicomMeasureData', obj)
+          }
         }
         // 关闭窗口
         this.activeName = ''
@@ -1754,9 +1746,9 @@ export default {
         if (this.activeName) {
           return this.checkToolCanActive(toolName)
         } else {
-          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleROI')) {
+          if (this.isBaseLineTask && (toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi' || toolName === 'RectangleROI')) {
             return { isCanActiveTool: true, reason: '' }
-          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleROI')) {
+          } else if (!this.isBaseLineTask && (toolName === 'ArrowAnnotate' || toolName === 'Bidirectional' || toolName === 'Length' || toolName === 'RectangleRoi' || toolName === 'RectangleROI')) {
             return { isCanActiveTool: true, reason: '' }
           } else if (this.isBaseLineTask && toolName === 'ArrowAnnotate') {
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg54') }
@@ -1779,10 +1771,10 @@ export default {
           } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length') {
             // '非淋巴结靶病灶需使用直径测量工具'
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg7') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleROI') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'RectangleRoi' && toolName !== 'RectangleROI') {
             // '淋巴结非靶病灶需使用长短径测量工具或矩形工具'
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg8') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleROI') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'RectangleRoi' && toolName !== 'RectangleROI') {
             // '非淋巴结非靶病灶需使用直径测量工具或矩形工具'
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg9') }
           } else if (toolName === 'ArrowAnnotate') {
@@ -1797,10 +1789,10 @@ export default {
           } else if (innerForm.LesionType === 0 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate') {
             // 非淋巴结靶病灶需使用直径测量工具或箭头工具
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg11') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleROI') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi' && toolName !== 'RectangleROI') {
             // 淋巴结非靶病灶需使用长短径测量工具或矩形工具或矩形工具或箭头工具
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg52') }
-          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleROI') {
+          } else if (innerForm.LesionType === 1 && isLymphNodes === 0 && toolName !== 'Length' && toolName !== 'ArrowAnnotate' && toolName !== 'RectangleRoi' && toolName !== 'RectangleROI') {
             // 非淋巴结非靶病灶需使用直径测量工具或矩形工具或矩形工具或箭头工具
             return { isCanActiveTool: false, reason: this.$t('trials:reading:warnning:msg53') }
           } else if (innerForm.LesionType === 2 && isLymphNodes === 1 && toolName !== 'Bidirectional' && toolName !== 'ArrowAnnotate') {
@@ -1819,6 +1811,19 @@ export default {
       } else {
         return { isCanActiveTool: true, reason: '' }
       }
+    },
+    receiveMsg(event) {
+      if (event.data.type === 'isCanActiveNoneDicomTool') {
+        let obj = { isCanActiveTool: true, lesionName: '', reason: '', toolName: event.data.toolName }
+        let { isCanActiveTool, reason } = this.validTool(event.data.toolName)
+        obj.isCanActiveTool = isCanActiveTool
+        obj.reason = reason
+        DicomEvent.$emit('isCanActiveNoneDicomTool', obj)
+      } else if (event.data.type === 'setMeasurement') {
+        if (JSON.stringify(event.data.data) !== "{}") {
+          this.setAnnotation(event.data.data)
+        }
+      }
     }
   }
 }
@@ -1831,15 +1836,18 @@ export default {
 
   .container {
     padding: 10px;
+
     .basic-info {
       display: flex;
       justify-content: space-between;
       align-items: center;
+
       h3 {
         color: #ddd;
         padding: 5px 0px;
         margin: 0;
       }
+
       i {
         color: #fff;
         font-size: 22px;
@@ -1848,16 +1856,19 @@ export default {
       }
     }
   }
+
   .outer_form_wrapper {
     ::v-deep .el-form-item__label {
       color: #c3c3c3;
       text-align: left;
     }
+
     ::v-deep .el-input__inner {
       background-color: transparent;
       color: #ddd;
       border: 1px solid #5e5e5e;
     }
+
     ::v-deep .el-textarea__inner {
       background-color: transparent;
       color: #ddd;
@@ -1870,27 +1881,33 @@ export default {
       justify-content: flex-start;
       flex-wrap: wrap;
     }
+
     ::v-deep .el-form-item__content {
       flex: 1;
     }
-    ::v-deep .el-button--mini, .el-button--mini.is-round {
+
+    ::v-deep .el-button--mini,
+    .el-button--mini.is-round {
       padding: 7px 10px;
     }
-    ::v-deep .el-form-item__content
-    .el-select{
+
+    ::v-deep .el-form-item__content .el-select {
       width: 100%;
     }
+
     .outer_form-footer {
       display: flex;
       flex-direction: row;
       justify-content: flex-end;
       align-items: center;
+
       .feedback-icon {
         padding: 0 10px;
         color: #fff;
         font-weight: 400;
         font-size: 22px;
         cursor: pointer;
+
         &:hover {
           color: #68a2d5;
         }
@@ -1898,6 +1915,7 @@ export default {
     }
 
   }
+
   .title {
     padding: 5px;
     font-weight: bold;
@@ -1905,6 +1923,7 @@ export default {
     font-size: 15px;
 
   }
+
   .add-icon {
     padding: 5px;
     font-weight: bold;
@@ -1914,6 +1933,7 @@ export default {
     margin-bottom: 2px;
     cursor: pointer;
   }
+
   .add-icon:hover {
     background-color: #607d8b;
   }
@@ -1925,17 +1945,21 @@ export default {
     background-color: #424242;
 
   }
+
   .lesion_list {
     position: relative;
   }
+
   .el-collapse {
     border-bottom: none;
     border-top: none;
+
     ::v-deep .el-collapse-item {
       background-color: #000 !important;
       color: #ddd;
 
     }
+
     ::v-deep .el-collapse-item__header {
       background-color: #000 !important;
       color: #ddd;
@@ -1944,10 +1968,12 @@ export default {
       height: 35px;
       line-height: 35px;
     }
+
     ::v-deep .el-collapse-item__wrap {
       background-color: #000 !important;
       color: #ddd;
     }
+
     ::v-deep .el-collapse-item__content {
       width: 260px;
       position: absolute;

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

@@ -59,7 +59,7 @@
                 <div class="series-image">
                   <el-image
                     style="width: 100%;height: 100%;"
-                    :src="`${OSSclientConfig.basePath}${series.ImageResizePath}`"
+                    :src="`${OSSclientConfig.basePath}${series.ImageResizePath || series.NoneDicomFileFirstFile}`"
                     fit="fill"
                     crossorigin="anonymous"
                   />

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

@@ -323,7 +323,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)
       }
@@ -403,6 +403,7 @@ 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)
@@ -415,6 +416,7 @@ export default {
         }
         this.prefetchMetadataInformation(obj.ImageIds, obj.Modality)
         await viewport.setStack(this.series.Stack, obj.SliceIndex)
+        
         viewport.render()
       } catch (e) {
         console.log(e)
@@ -550,6 +552,7 @@ export default {
   width:100%;
   height:100%;
   position: relative;
+  cursor: default !important;
   .left-top-text {
     position: absolute;
     left: 5px;

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

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

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

@@ -73,13 +73,13 @@
                       <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                     </template>
                   </el-select>
-                  <span v-else-if="questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'select'">
+                  <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.Type === 'number' && scope.row.TypeValue)) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
-                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable
-                    @focus="() => { questionId = scope.row.QuestionId }">
+                    v-else-if="(scope.row.Type === 'select' || scope.row.Type === 'radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                    v-model="questionForm[scope.row.QuestionId]" size="mini" clearable>
                     <template>
                       <el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
                     </template>
@@ -200,12 +200,12 @@
     </el-dialog>
 
     <!-- 预览文件 -->
-    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
-      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
-      </div>
-    </el-dialog>
+    <viewer ref="picture_perview_customizeReportPage" style="margin: 0 10px"
+      v-if="currentType && ['png', 'jpg', 'jpeg'].includes(currentType.toLowerCase())"
+      :images="[`${OSSclientConfig.basePath}${currentPath}`]" :options="viewerOptions">
+
+      <img v-show="false" :src="`${OSSclientConfig.basePath}${currentPath}`" alt="Image" />
+    </viewer>
   </div>
 </template>
 <script>
@@ -214,12 +214,10 @@ import { setSkipReadingCache } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import SignForm from '@/views/trials/components/newSignForm'
-import PreviewFile from '@/components/PreviewFile/index'
 import { getToken } from '@/utils/auth'
-import store from '@/store'
 export default {
   name: 'CustomizeReportPage',
-  components: { SignForm, PreviewFile },
+  components: { SignForm },
   data() {
     return {
       trialId: '',
@@ -244,9 +242,23 @@ export default {
       questionForm: {},
       questionId: null,
       taskInfo: null,
-      previewVisible: false,
       currentPath: '',
-      currentType: ''
+      currentType: '',
+
+
+      viewerOptions: {
+        toolbar: {
+          zoomIn: true,
+          zoomOut: true,
+          reset: true,
+          prev: false,
+          next: false,
+          rotateLeft: true,
+          rotateRight: true,
+          flipHorizontal: true,
+          flipVertical: true,
+        }
+      }
     }
   },
   watch: {
@@ -808,7 +820,33 @@ export default {
       this.currentPath = path
       const arr = path.split('.')
       this.currentType = arr[arr.length - 1]
-      this.previewVisible = true
+      // this.previewVisible = true
+      if (['.ppt',
+        '.pptx',
+        '.doc',
+        '.docx',
+        '.xls',
+        '.xlsx'].includes(`.${this.currentType.toLowerCase()}`)) {
+        this.$onlyOffice({
+          path: path,
+          type: this.currentType,
+          title: this.$t('trials:readingReport:title:preview')
+        })
+      }
+      if (['.jpg',
+        '.jpeg',
+        '.png'].includes(`.${this.currentType.toLowerCase()}`)) {
+        this.$nextTick(() => {
+          this.$refs['picture_perview_customizeReportPage'].$viewer.show()
+        })
+      }
+      if (['.pdf'].includes(`.${this.currentType.toLowerCase()}`)) {
+        this.$preview({
+          path: path,
+          type: 'pdf',
+          title: this.$t('trials:readingReport:title:preview')
+        })
+      }
     }
   }
 }

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

@@ -1428,7 +1428,7 @@ export default {
         file = this.convertBase64ToBlob(file)
         const trialId = this.$route.query.trialId
         const subjectId = this.taskInfo.SubjectId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)

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,11 +270,95 @@ const config = {
       'name': '椭圆工具',
       'icon': 'oval',
       'toolName': 'CircleROI',
+      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
       'i18nKey': 'trials:reading:button:Circle',
       'isDisabled': false,
       'disabledReason': ''
+    },
+    {
+      'name': '角度工具',
+      'icon': 'angle',
+      'toolName': 'Angle',
+      'props': ['angle'],
+      'i18nKey': 'trials:reading:button:Angle',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
+    {
+      'name': '角度工具',
+      'icon': 'cobb',
+      'toolName': 'CobbAngle',
+      'props': ['angle'],
+      'i18nKey': 'trials:reading:button:CobbAngle',
+      'isDisabled': false,
+      'disabledReason': ''
     }
-  ]
+  ],
+  'customizeStandardsNoneDicom': [
+    {
+      'name': '直径测量工具',
+      'icon': 'length',
+      'toolName': 'Length',
+      'props': ['length'],
+      'i18nKey': 'trials:reading:button:length',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
+    {
+      'name': '矩形工具',
+      'icon': 'rectangle',
+      'toolName': 'RectangleROI',
+      'props': ['area', 'mean', 'max', 'stdDev'],
+      'i18nKey': 'trials:reading:button:rectangle',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
+    {
+      'name': '箭头工具',
+      'icon': 'arrow',
+      'toolName': 'ArrowAnnotate',
+      'props': [],
+      'i18nKey': 'trials:reading:button:arrowAnnotate',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
+    {
+      'name': '圆形工具',
+      'icon': 'oval',
+      'toolName': 'CircleROI',
+      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
+      'i18nKey': 'trials:reading:button:Circle',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
+    {
+      'name': '椭圆工具',
+      'icon': 'elliptical',
+      'toolName': 'EllipticalROI',
+      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
+      'i18nKey': 'trials:reading:button:Elliptical',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
+    {
+      'name': '角度工具',
+      'icon': 'angle',
+      'toolName': 'Angle',
+      'props': ['angle'],
+      'i18nKey': 'trials:reading:button:Angle',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
+    {
+      'name': '自由曲线',
+      'icon': 'polygon',
+      'toolName': 'PlanarFreehandROI',
+      'props': [],
+      'i18nKey': 'trials:reading:button:planarFreehandROI',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
+  ],
 }
 const getTools = (criterionType) => {
   const standard = config.standards.find(s => s.type === criterionType)
@@ -280,4 +368,8 @@ const getCustomizeStandardsTools = (toolNames) => {
   const filteredTools = config.customizeStandards.filter(item => toolNames.includes(item.toolName))
   return filteredTools || []
 }
-export { config, getTools, getCustomizeStandardsTools }
+const getCustomizeStandardsNoneDicomTools = (toolNames) => {
+  const filteredTools = config.customizeStandardsNoneDicom.filter(item => toolNames.includes(item.toolName))
+  return filteredTools || []
+}
+export { config, getTools, getCustomizeStandardsTools, getCustomizeStandardsNoneDicomTools }

src/views/trials/trials-panel/reading/medical-feedback/index.vue

@@ -318,7 +318,7 @@
                     :disabled="!scope.row.IsHaveQuestion || scope.row.IsInvalid"
                     circle
                     :title="$t('trials:medicalFeedback:table:view')"
-                    icon="el-icon-edit-outline"
+                    icon="el-icon-view"
                     @click="handleReadMecialAudit(scope.row)"
                   />
                   <!-- 回复:disabled="!scope.row.IsHaveQuestion || scope.row.IsInvalid" -->

src/views/trials/trials-panel/reading/none-dicoms/components/UploadFile.vue

@@ -119,7 +119,7 @@ name: "UploadFile",
       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)
+      const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${param.file.name}`, file)
       console.log(res)
       this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)})
       this.urls.push(this.$getObjectName(res.url))

src/views/trials/trials-panel/reading/none-dicoms/index.vue

@@ -3,57 +3,37 @@
     <!-- 访视阅片 -->
     <visit-review v-if="taskInfo && taskInfo.ReadingCategory === 1" />
     <!-- 全局阅片 -->
-    <global-review
-      v-else-if="taskInfo && taskInfo.ReadingCategory=== 2"
-      :trial-id="trialId"
-      :subject-id="taskInfo.SubjectId"
-      :visit-task-id="taskInfo.VisitTaskId"
-      :reading-category="taskInfo.ReadingCategory"
-      :subject-code="taskInfo.SubjectCode"
-      :task-blind-name="taskInfo.TaskBlindName"
-      :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
+    <global-review v-else-if="taskInfo && taskInfo.ReadingCategory === 2" :trial-id="trialId"
+      :subject-id="taskInfo.SubjectId" :visit-task-id="taskInfo.VisitTaskId"
+      :reading-category="taskInfo.ReadingCategory" :subject-code="taskInfo.SubjectCode"
+      :task-blind-name="taskInfo.TaskBlindName" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
       :is-reading-show-previous-results="taskInfo.IsReadingShowPreviousResults"
-      :is-exists-clinical-data="taskInfo.IsExistsClinicalData"
-    />
+      :is-exists-clinical-data="taskInfo.IsExistsClinicalData" />
     <!-- 裁判阅片 -->
-    <ad-review
-      v-else-if="taskInfo && taskInfo.ReadingCategory=== 4"
-      :trial-id="trialId"
-      :subject-id="taskInfo.SubjectId"
-      :visit-task-id="taskInfo.VisitTaskId"
-      :reading-category="taskInfo.ReadingCategory"
-      :subject-code="taskInfo.SubjectCode"
-      :task-blind-name="taskInfo.TaskBlindName"
-      :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
+    <ad-review v-else-if="taskInfo && taskInfo.ReadingCategory === 4" :trial-id="trialId"
+      :subject-id="taskInfo.SubjectId" :visit-task-id="taskInfo.VisitTaskId"
+      :reading-category="taskInfo.ReadingCategory" :subject-code="taskInfo.SubjectCode"
+      :task-blind-name="taskInfo.TaskBlindName" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
       :is-reading-show-previous-results="taskInfo.IsReadingShowPreviousResults"
-      :is-exists-clinical-data="taskInfo.IsExistsClinicalData"
-    />
+      :is-exists-clinical-data="taskInfo.IsExistsClinicalData" />
     <!-- 肿瘤学阅片 -->
     <!-- <oncology-review v-else-if="taskInfo && taskInfo.ReadingCategory=== 5" /> -->
-    <el-dialog
-      :visible.sync="clinicalDataVisible"
-      :custom-class="isClinicalDataFullscreen?'full-dialog-container':'dialog-container'"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :fullscreen="isClinicalDataFullscreen"
-    >
+    <el-dialog :visible.sync="clinicalDataVisible"
+      :custom-class="isClinicalDataFullscreen ? 'full-dialog-container' : 'dialog-container'" :show-close="false"
+      :close-on-click-modal="false" :fullscreen="isClinicalDataFullscreen">
       <span slot="title" class="dialog-footer">
         <!-- 当前阅片任务存在临床数据，请查看。若已查看，请点击“确认” -->
         <span v-if="!closeCDVisible">{{ $t('trials:reading:dagTitle:msg1') }}</span>
         <div style="position: absolute;right: 20px;top: 10px;">
-          <svg-icon :icon-class="isClinicalDataFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen=!isClinicalDataFullscreen" />
-          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="clinicalDataVisible = false" />
+          <svg-icon :icon-class="isClinicalDataFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+            style="cursor: pointer;font-size: 20px;" @click="isClinicalDataFullscreen = !isClinicalDataFullscreen" />
+          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+            @click="clinicalDataVisible = false" />
         </div>
       </span>
       <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
-        <clinical-data
-          v-if="clinicalDataVisible"
-          style="flex: 1"
-          :trial-id="trialId"
-          :subject-id="taskInfo.SubjectId"
-          :visit-task-id="cdVisitTaskId"
-          :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo"
-        />
+        <clinical-data v-if="clinicalDataVisible" style="flex: 1" :trial-id="trialId" :subject-id="taskInfo.SubjectId"
+          :visit-task-id="cdVisitTaskId" :is-reading-show-subject-info="taskInfo.IsReadingShowSubjectInfo" />
         <div v-if="!closeCDVisible" style="text-align:right">
           <el-button type="primary" @click="handleConfirmCD">{{ $t('trials:reading:button:confirm') }}</el-button>
         </div>
@@ -65,6 +45,7 @@
 <script>
 import { getNextTask, readClinicalData } from '@/api/trials'
 import store from '@/store'
+import { changeURLStatic } from '@/utils/history.js'
 import VisitReview from '@/views/trials/trials-panel/reading/visit-review'
 import GlobalReview from '@/views/trials/trials-panel/reading/global-review'
 import AdReview from '@/views/trials/trials-panel/reading/ad-review'
@@ -92,6 +73,10 @@ export default {
   },
   mounted() {
     this.trialId = this.$route.query.trialId
+    if (this.$router.currentRoute.query.TokenKey) {
+      store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
+      changeURLStatic('TokenKey', '')
+    }
     this.getTaskInfo()
   },
   methods: {
@@ -142,18 +127,22 @@ export default {
 .reading-viewer-container {
   width: 100%;
   height: 100%;
+
   ::v-deep .dialog-container {
     margin-top: 50px !important;
     width: 75%;
     height: 80%;
   }
+
   ::v-deep .el-dialog__body {
     padding: 10px;
     height: calc(100% - 70px);
   }
+
   .el-dialog__header {
     position: relative;
   }
+
   .full-dialog-container {
     ::v-deep .is-fullscreen .el-dialog__body {
       height: calc(100% - 70px);

src/views/trials/trials-panel/reading/read-task-allocation/index.vue

@@ -2,18 +2,15 @@
 <template>
   <BaseContainer class="read-task-allocation">
     <el-tabs type="border-card" v-model="TrialReadingCriterionId">
-      <el-tab-pane :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId" v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId">
+      <el-tab-pane :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId"
+        v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId">
         <div v-if="TrialReadingCriterionId === i.TrialReadingCriterionId">
           <div slot="search-container">
             <el-form :inline="true">
               <el-form-item :label="$t('trials:reviewAssign:table:siteCode')">
                 <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:240px;">
-                  <el-option
-                    v-for="(item,index) of siteOptions"
-                    :key="'taskSearchData' + index"
-                    :label="item.TrialSiteCode"
-                    :value="item.TrialSiteId"
-                  />
+                  <el-option v-for="(item, index) of siteOptions" :key="'taskSearchData' + index"
+                    :label="item.TrialSiteCode" :value="item.TrialSiteId" />
                 </el-select>
               </el-form-item>
               <!-- 受试者编号 -->
@@ -23,13 +20,15 @@
               <!-- 阅片人 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:reader')">
                 <el-select v-model="searchData.DoctorUserId" clearable style="width:240px;">
-                  <el-option v-for="item of DoctorUserList" :key="'taskSearchData' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
+                  <el-option v-for="item of DoctorUserList" :key="'taskSearchData' + item.DoctorUserId"
+                    :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
                 </el-select>
               </el-form-item>
               <!-- 分配状态 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:status')">
                 <el-select v-model="searchData.SubjectAllocateState" clearable style="width:240px;">
-                  <el-option v-for="item of $d.SubjectAllocateState" :key=" item.id" :value="item.value" :label="item.label" />
+                  <el-option v-for="item of $d.SubjectAllocateState" :key="item.id" :value="item.value"
+                    :label="item.label" />
                 </el-select>
               </el-form-item>
               <!-- 分配角色 -->
@@ -50,11 +49,14 @@
                   {{ $t('common:button:reset') }}
                 </el-button>
                 <!-- 分配规则 -->
-                <el-button type="primary" icon="el-icon-edit-outline" v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="openAllocationConfigVisible">
+                <el-button type="primary" icon="el-icon-edit-outline"
+                  v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']"
+                  @click="openAllocationConfigVisible">
                   {{ $t('trials:reviewAssign:button:assignRules') }}
                 </el-button>
                 <!-- 手动分配 -->
-                <el-button type="primary" :loading="btnLoading" v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="manualAllocation()">
+                <el-button type="primary" :loading="btnLoading"
+                  v-hasPermi="['trials:trials-panel:reading:readTaskAllocation:edit']" @click="manualAllocation()">
                   {{ $t('trials:reviewAssign:button:manualAllocation') }}
                 </el-button>
                 <!-- 访视、全局、肿瘤学阅片任务 -->
@@ -69,300 +71,195 @@
             </el-form>
           </div>
           <div slot="main-container">
-            <el-table
-              :ref="TrialReadingCriterionId"
-              v-loading="loading"
-              v-adaptive="{bottomOffset:85}"
-              border
-              :data="list"
-              stripe
-              height="100"
-              @selection-change="handleSubjectAssignListSelectChange"
-              @sort-change="handleSortChange"
-            >
+            <el-table :ref="TrialReadingCriterionId" v-loading="loading" v-adaptive="{ bottomOffset: 85 }" border
+              :data="list" stripe height="100" @selection-change="handleSubjectAssignListSelectChange"
+              @sort-change="handleSortChange">
               <el-table-column type="selection" align="left" width="45" />
               <!-- 中心编号 -->
-              <el-table-column
-                prop="TrialSiteCode"
-                :label="$t('trials:reviewAssign:table:siteCode')"
-                width="140"
-                show-overflow-tooltip
-                sortable="custom"
-              />
+              <el-table-column prop="TrialSiteCode" :label="$t('trials:reviewAssign:table:siteCode')" width="140"
+                show-overflow-tooltip sortable="custom" />
               <!-- 受试者编号 -->
-              <el-table-column
-                prop="SubjectCode"
-                :label="$t('trials:reviewAssign:table:subjectCode')"
-                width="140"
-                show-overflow-tooltip
-                sortable="custom"
-              />
+              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:subjectCode')" width="140"
+                show-overflow-tooltip sortable="custom" />
               <!-- 访视 -->
-              <el-table-column
-                prop="VisitTaskTypeCount"
-                :label="$t('trials:reviewAssign:table:visit')"
-                width="140"
-                show-overflow-tooltip
-                sortable="custom"
-              >
+              <el-table-column prop="VisitTaskTypeCount" :label="$t('trials:reviewAssign:table:visit')" width="140"
+                show-overflow-tooltip sortable="custom">
                 <template slot-scope="scope">
-                  <span @click="openAllocation('task', 1, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.VisitTaskTypeCount}}</span>
+                  <span @click="openAllocation('task', 1, scope.row.SubjectCode)"
+                    style="color:#428bca;cursor: pointer">{{ scope.row.VisitTaskTypeCount }}</span>
                 </template>
               </el-table-column>
               <!-- 全局 -->
-              <el-table-column
-                prop="GlobalTaskTypeCount"
-                :label="$t('trials:reviewAssign:table:global')"
-                width="140"
-                show-overflow-tooltip
-                v-if="OtherInfo && OtherInfo.IsGlobalReading"
-                sortable="custom"
-              >
+              <el-table-column prop="GlobalTaskTypeCount" :label="$t('trials:reviewAssign:table:global')" width="140"
+                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsGlobalReading" sortable="custom">
                 <template slot-scope="scope">
-                  <span @click="openAllocation('task', 2, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.GlobalTaskTypeCount}}</span>
+                  <span @click="openAllocation('task', 2, scope.row.SubjectCode)"
+                    style="color:#428bca;cursor: pointer">{{ scope.row.GlobalTaskTypeCount }}</span>
                 </template>
               </el-table-column>
               <!-- 裁判 -->
-              <el-table-column
-                prop="JudgeTaskTypeCount"
-                :label="$t('trials:reviewAssign:table:ad')"
-                width="140"
-                show-overflow-tooltip
-                v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
-                sortable="custom"
-              >
+              <el-table-column prop="JudgeTaskTypeCount" :label="$t('trials:reviewAssign:table:ad')" width="140"
+                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
+                sortable="custom">
                 <template slot-scope="scope">
-                  <span @click="openAllocation('referee', 4, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.JudgeTaskTypeCount}}</span>
+                  <span @click="openAllocation('referee', 4, scope.row.SubjectCode)"
+                    style="color:#428bca;cursor: pointer">{{ scope.row.JudgeTaskTypeCount }}</span>
                 </template>
               </el-table-column>
               <!-- 肿瘤学 -->
-              <el-table-column
-                prop="OncologyTaskTypeCount"
-                :label="$t('trials:reviewAssign:table:oncology')"
-                width="140"
-                show-overflow-tooltip
-                v-if="OtherInfo && OtherInfo.IsOncologyReading"
-                sortable="custom"
-              >
+              <el-table-column prop="OncologyTaskTypeCount" :label="$t('trials:reviewAssign:table:oncology')"
+                width="140" show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsOncologyReading" sortable="custom">
                 <template slot-scope="scope">
-                  <span @click="openAllocation('task', 5, scope.row.SubjectCode)" style="color:#428bca;cursor: pointer">{{scope.row.OncologyTaskTypeCount}}</span>
+                  <span @click="openAllocation('task', 5, scope.row.SubjectCode)"
+                    style="color:#428bca;cursor: pointer">{{ scope.row.OncologyTaskTypeCount }}</span>
                 </template>
               </el-table-column>
               <!-- 阅片人（R1） -->
-              <el-table-column
-                prop="SubjectCode"
-                :label="$t('trials:reviewAssign:table:r1')"
-                min-width="100"
-                show-overflow-tooltip
-                v-if="ReadingType === 1"
-              >
+              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r1')" min-width="100"
+                show-overflow-tooltip v-if="ReadingType === 1">
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length"
+                    style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
+                        0).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 0).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
               <!-- 阅片人（R1） -->
-              <el-table-column
-                prop="SubjectCode"
-                :label="$t('trials:reviewAssign:table:r1')"
-                min-width="100"
-                show-overflow-tooltip
-                v-if="ReadingType === 2"
-              >
+              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r1')" min-width="100"
+                show-overflow-tooltip v-if="ReadingType === 2">
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length"
+                    style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
+                        1).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 1).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
               <!-- 阅片人（R2） -->
-              <el-table-column
-                prop="SubjectCode"
-                :label="$t('trials:reviewAssign:table:r2')"
-                min-width="100"
-                show-overflow-tooltip
-                v-if="ReadingType === 2"
-              >
+              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:r2')" min-width="100"
+                show-overflow-tooltip v-if="ReadingType === 2">
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length"
+                    style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
+                        2).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 2).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
               <!-- 裁判(AD) -->
-              <el-table-column
-                prop="SubjectCode"
-                :label="$t('trials:reviewAssign:table:ad')"
-                min-width="100"
-                show-overflow-tooltip
-                v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2"
-              >
+              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:ad')" min-width="100"
+                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsArbitrationReading && ReadingType === 2">
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length"
+                    style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
+                        3).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 3).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
               <!-- 肿瘤阅片人（O1） -->
-              <el-table-column
-                prop="SubjectCode"
-                :label="$t('trials:reviewAssign:table:o1')"
-                min-width="100"
-                show-overflow-tooltip
-                v-if="OtherInfo && OtherInfo.IsOncologyReading"
-              >
+              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:o1')" min-width="100"
+                show-overflow-tooltip v-if="OtherInfo && OtherInfo.IsOncologyReading">
                 <template slot-scope="scope">
-                  <div v-if="scope.row.NowDoctorUserList.length" style="display: flex;justify-content: left;align-items: center">
+                  <div v-if="scope.row.NowDoctorUserList.length"
+                    style="display: flex;justify-content: left;align-items: center">
                     <el-tag v-if="findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser">
-                      {{ `${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.FullName})` }}
+                      {{ `${findDoctorUser(scope.row.NowDoctorUserList,
+                        4).DoctorUser.UserName}(${findDoctorUser(scope.row.NowDoctorUserList, 4).DoctorUser.FullName})` }}
                     </el-tag>
                   </div>
                 </template>
               </el-table-column>
-              <el-table-column
-                prop=""
-                :label="$t('common:action:action')"
-                width="180"
-                show-overflow-tooltip
-                v-if="hasPermi(['trials:trials-panel:reading:readTaskAllocation:edit'])"
-              >
+              <el-table-column prop="" :label="$t('common:action:action')" width="180" show-overflow-tooltip
+                v-if="hasPermi(['trials:trials-panel:reading:readTaskAllocation:edit'])">
                 <template slot-scope="scope">
                   <!-- 手动分配 -->
-                  <el-button
-                    circle
-                    :disabled="scope.row.NowDoctorUserList.length === 4"
-                    icon="el-icon-thumb"
+                  <el-button circle :disabled="scope.row.NowDoctorUserList.length === 4" icon="el-icon-thumb"
                     :title="$t('trials:reviewAssign:tableAction:manualAssignment')"
-                    @click="manualAllocation(scope.row)"
-                  />
+                    @click="manualAllocation(scope.row)" />
                   <!-- 清除阅片人 -->
-                  <el-button
-                    circle
-                    :disabled="scope.row.NowDoctorUserList.length === 0"
-                    icon="el-icon-close"
-                    :title="$t('trials:reviewAssign:tableAction:clearReaders')"
-                    @click="openClearAudience(scope.row)"
-                  />
+                  <el-button circle :disabled="scope.row.NowDoctorUserList.length === 0" icon="el-icon-close"
+                    :title="$t('trials:reviewAssign:tableAction:clearReaders')" @click="openClearAudience(scope.row)" />
                   <!-- 查看取消历史 -->
-                  <el-button
-                    circle
-                    icon="el-icon-document-copy"
+                  <el-button circle icon="el-icon-document-copy"
                     :title="$t('trials:reviewAssign:tableAction:viewHistory')"
-                    @click="openSubjectCancelDoctorHistoryList(scope.row)"
-                  />
+                    @click="openSubjectCancelDoctorHistoryList(scope.row)" />
                 </template>
               </el-table-column>
             </el-table>
-            <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+            <pagination style="text-align: right;margin-top: 10px;" class="page" :total="total"
+              :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
             <!-- 分配规则 -->
-            <el-dialog
-              :title="$t('trials:reviewAssign:dialog:allocationRules')"
-              :visible.sync="AllocationConfigVisible"
-              width="1400px"
-              :close-on-click-modal="false"
-              custom-class="base-dialog-wrapper"
-            >
+            <el-dialog :title="$t('trials:reviewAssign:dialog:allocationRules')" :visible.sync="AllocationConfigVisible"
+              width="1400px" :close-on-click-modal="false" custom-class="base-dialog-wrapper">
               <div class="base-dialog-body" style="position: relative;">
                 <!-- 阅片人列表 -->
                 <el-divider content-position="left" style="margin-bottom: 40px;">
                   {{ $t('trials:reviewAssign:allocationRules:title:readersList') }}
                 </el-divider>
-                <el-form
-                  style="margin-top: 40px"
-                  ref="signForm"
-                  size="small"
-                  label-width="0px"
-                >
+                <el-form style="margin-top: 40px" ref="signForm" size="small" label-width="0px">
                   <el-form-item>
-                    <el-table
-                      v-loading="loading"
-                      border
-                      :data="TaskAllocationRuleList"
-                      stripe
-                    >
+                    <el-table v-loading="loading" border :data="TaskAllocationRuleList" stripe>
                       <!-- 阅片人 -->
-                      <el-table-column
-                        prop="DoctorUser.UserName"
-                        :label="$t('trials:reviewAssign:allocationRules:table:reader')"
-                        min-width="180"
-                        show-overflow-tooltip
-                      >
+                      <el-table-column prop="DoctorUser.UserName"
+                        :label="$t('trials:reviewAssign:allocationRules:table:reader')" min-width="180"
+                        show-overflow-tooltip>
                         <template slot-scope="scope">
                           {{ `${scope.row.DoctorUser.UserName}(${scope.row.DoctorUser.FullName})` }}
                         </template>
                       </el-table-column>
                       <!-- 计划受试者数量 -->
-                      <el-table-column
-                        prop="PlanSubjectCount"
-                        :label="$t('trials:reviewAssign:allocationRules:table:plannedCount')"
-                        min-width="130"
-                        show-overflow-tooltip
-                      />
+                      <el-table-column prop="PlanSubjectCount"
+                        :label="$t('trials:reviewAssign:allocationRules:table:plannedCount')" min-width="130"
+                        show-overflow-tooltip />
                       <!-- 阅片类型 -->
-                      <el-table-column
-                        prop="ReadingCategorys"
+                      <el-table-column prop="ReadingCategorys"
                         :label="$t('trials:reviewAssign:allocationRules:table:readingType')"
-                        :width="360 * TrialReadingCriterionList.length"
-                        show-overflow-tooltip
-                      >
-                        <el-table-column
-                          v-for="ite of TrialReadingCriterionList"
-                          :label="ite.TrialReadingCriterionName"
-                          :key="ite.TrialReadingCriterionId"
-                          width="260"
-                          show-overflow-tooltip
-                        >
+                        :width="360 * TrialReadingCriterionList.length" show-overflow-tooltip>
+                        <template v-for="ite of TrialReadingCriterionList">
+                          <el-table-column :label="ite.TrialReadingCriterionName" :key="ite.TrialReadingCriterionId"
+                            v-if="TrialReadingCriterionId === ite.TrialReadingCriterionId" width="260"
+                            show-overflow-tooltip>
                             <template slot-scope="scope">
-                        <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []"  :key="item">
-                          <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
+                              <span
+                                v-for="item of scope.row.CriterionCategoryList.find(v => { return v.TrialReadingCriterionId === ite.TrialReadingCriterionId }) ? scope.row.CriterionCategoryList.find(v => { return v.TrialReadingCriterionId === ite.TrialReadingCriterionId }).ReadingCategorys : []"
+                                :key="item">
+                                <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' +
+                                  $fd('ReadingCategory', 2) }}</el-tag>
                                 <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
                                 <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
                                 <el-tag v-if="item === 5" type="warning">{{ $fd('ReadingCategory', item) }}</el-tag>
                               </span>
                             </template>
                           </el-table-column>
+                        </template>
                       </el-table-column>
                       <!-- 状态 -->
-                      <el-table-column
-                        prop="IsEnable"
-                        :label="$t('trials:reviewAssign:allocationRules:table:status')"
-                        min-width="80"
-                        show-overflow-tooltip
-                      >
+                      <el-table-column prop="IsEnable" :label="$t('trials:reviewAssign:allocationRules:table:status')"
+                        min-width="80" show-overflow-tooltip>
                         <template slot-scope="scope">
-                          <el-tag v-if="!scope.row.IsEnable" type="danger">{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
+                          <el-tag v-if="!scope.row.IsEnable" type="danger">{{ $fd('IsEnable', scope.row.IsEnable)
+                          }}</el-tag>
                           <el-tag v-else>{{ $fd('IsEnable', scope.row.IsEnable) }}</el-tag>
                         </template>
                       </el-table-column>
                       <!-- 备注 -->
-                      <el-table-column
-                        prop="Note"
-                        :label="$t('trials:reviewAssign:allocationRules:table:remark')"
-                        min-width="100"
-                        show-overflow-tooltip
-                      />
-                      <el-table-column
-                        fixed="right"
-                        :label="$t('common:action:action')"
-                        width="80"
-                      >
+                      <el-table-column prop="Note" :label="$t('trials:reviewAssign:allocationRules:table:remark')"
+                        min-width="100" show-overflow-tooltip />
+                      <el-table-column fixed="right" :label="$t('common:action:action')" width="80">
                         <template slot-scope="scope">
                           <!-- 编辑 -->
-                          <el-button
-                            circle
-                            icon="el-icon-edit-outline"
-                            :title="$t('common:button:edit')"
-                            @click="addOrEdit(scope.row)"
-                          />
+                          <el-button circle icon="el-icon-edit-outline" :title="$t('common:button:edit')"
+                            @click="addOrEdit(scope.row)" />
                         </template>
                       </el-table-column>
                     </el-table>
@@ -376,7 +273,8 @@
                       <template slot="label">
                         <el-checkbox v-model="TrialTaskInfo.IsFollowVisitAutoAssign" disabled>
                           <!-- 同一病例随访阅片任务自动分配（在拟分配的阅片人未标记为退出项目状态时）默认状态 -->
-                          {{$t('trials:reviewAssign:allocationRules:message1')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowVisitAutoAssignDefaultState)}} </el-checkbox>
+                          {{ $t('trials:reviewAssign:allocationRules:message1') }} {{ $fd('AutoAssignDefaultState',
+                            TrialTaskInfo.FollowVisitAutoAssignDefaultState) }} </el-checkbox>
                       </template>
                       <div style="margin-left: 10px;">
                       </div>
@@ -386,7 +284,8 @@
                       <template slot="label">
                         <el-checkbox v-model="TrialTaskInfo.IsFollowGlobalVisitAutoAssign" disabled>
                           <!-- 同一病例全局任务自动分配（在拟分配的阅片人未标记为退出项目状态时 默认状态 -->
-                          {{$t('trials:reviewAssign:allocationRules:message3')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowGlobalVisitAutoAssignDefaultState)}} </el-checkbox>
+                          {{ $t('trials:reviewAssign:allocationRules:message3') }} {{ $fd('AutoAssignDefaultState',
+                            TrialTaskInfo.FollowGlobalVisitAutoAssignDefaultState) }} </el-checkbox>
                       </template>
                       <div style="margin-left: 10px;">
 
@@ -396,7 +295,8 @@
                       <template slot="label">
                         <el-checkbox v-model="TrialTaskInfo.IsFollowJudgeTaskAutoAssign" disabled>
                           <!-- 同一病例第二次裁判任务自动分配（在拟分配的阅片人未标记为退出项目状态时）默认状态 -->
-                          {{$t('trials:reviewAssign:allocationRules:message4')}} {{$fd('AutoAssignDefaultState', TrialTaskInfo.FollowJudgeTaskAutoAssignDefaultState)}} </el-checkbox>
+                          {{ $t('trials:reviewAssign:allocationRules:message4') }} {{ $fd('AutoAssignDefaultState',
+                            TrialTaskInfo.FollowJudgeTaskAutoAssignDefaultState) }} </el-checkbox>
                       </template>
                       <div style="margin-left: 10px;" />
                     </el-descriptions-item>
@@ -405,12 +305,7 @@
               </div>
               <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
                 <!-- 取消 -->
-                <el-button
-                  :disabled="btnLoading"
-                  size="small"
-                  type="primary"
-                  @click="handleCancel"
-                >
+                <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancel">
                   {{ $t('common:button:cancel') }}
                 </el-button>
                 <!-- 保存 -->
@@ -419,72 +314,47 @@
                 </el-button>
               </div>
             </el-dialog>
-            <el-dialog
-              v-if="taskAllocationRuleVisible"
-              :title="title"
-              :visible.sync="taskAllocationRuleVisible"
-              width="600px"
-              :close-on-click-modal="false"
-            >
-              <AddOrEditTaskAllocationRule :data="rowData" :TaskAllocationRuleList="TaskAllocationRuleList" :doctor-user-list="DoctorUserList" @close="() => {taskAllocationRuleVisible = false}" @getList="openAllocationConfigVisible" />
+            <el-dialog v-if="taskAllocationRuleVisible" :title="title" :visible.sync="taskAllocationRuleVisible"
+              width="600px" :close-on-click-modal="false">
+              <AddOrEditTaskAllocationRule :data="rowData" :TaskAllocationRuleList="TaskAllocationRuleList"
+                :doctor-user-list="DoctorUserList" @close="() => { taskAllocationRuleVisible = false }"
+                @getList="openAllocationConfigVisible" />
             </el-dialog>
             <!--分配阅片人  -->
-            <el-dialog
-              v-if="manualAllocationVisible"
-              :title="$t('trials:reviewAssign:dialog:assignReader')"
-              :visible.sync="manualAllocationVisible"
-              width="1320px"
-              :close-on-click-modal="false"
-            >
-              <ManualAllocationTable :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :reading-type="ReadingType" :SubjectAssignSelectList="SubjectAssignSelectList" @close="() => {manualAllocationVisible = false}" @getList="getList"></ManualAllocationTable>
+            <el-dialog v-if="manualAllocationVisible" :title="$t('trials:reviewAssign:dialog:assignReader')"
+              :visible.sync="manualAllocationVisible" width="1320px" :close-on-click-modal="false">
+              <ManualAllocationTable :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"
+                :reading-type="ReadingType" :SubjectAssignSelectList="SubjectAssignSelectList"
+                @close="() => { manualAllocationVisible = false }" @getList="getList"></ManualAllocationTable>
             </el-dialog>
             <!-- 清除阅片人 -->
-            <el-dialog
-              v-if="ClearAudienceVisible"
-              :title="$t('trials:reviewAssign:dialog:clearReader')"
-              :visible.sync="ClearAudienceVisible"
-              width="500px"
-              :close-on-click-modal="false"
-            >
-              <ClearAudienceList :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"  @close="() => {ClearAudienceVisible = false}" @getList="getList"></ClearAudienceList>
+            <el-dialog v-if="ClearAudienceVisible" :title="$t('trials:reviewAssign:dialog:clearReader')"
+              :visible.sync="ClearAudienceVisible" width="500px" :close-on-click-modal="false">
+              <ClearAudienceList :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData"
+                @close="() => { ClearAudienceVisible = false }" @getList="getList"></ClearAudienceList>
             </el-dialog>
             <!-- 访视/全局/肿瘤学阅片任务 : 裁判阅片任务 -->
-            <el-dialog
-              v-if="AllocationVisible"
+            <el-dialog v-if="AllocationVisible"
               :title="AllocationType === 'task' ? $t('trials:reviewAssign:button:visitReadingTasks') : $t('trials:reviewAssign:button:adReadingTasks')"
-              :visible.sync="AllocationVisible"
-              :fullscreen="true"
-              :close-on-click-modal="false"
-            >
-              <taskAllacation :trialReadingCriterionId="TrialReadingCriterionId" :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode" v-if="AllocationType === 'task'"></taskAllacation>
-              <refereeAllacation :trialReadingCriterionId="TrialReadingCriterionId" :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode" v-else></refereeAllacation>
+              :visible.sync="AllocationVisible" :fullscreen="true" :close-on-click-modal="false">
+              <taskAllacation :trialReadingCriterionId="TrialReadingCriterionId"
+                :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode"
+                v-if="AllocationType === 'task'"></taskAllacation>
+              <refereeAllacation :trialReadingCriterionId="TrialReadingCriterionId"
+                :allocationReadingCategory="AllocationReadingCategory" :allocationSubjectCode="AllocationSubjectCode"
+                v-else>
+              </refereeAllacation>
             </el-dialog>
             <!-- 取消历史 -->
-            <el-dialog
-              v-if="SubjectCancelDoctorHistoryVisible"
-              :title="$t('trials:reviewAssign:dialog:cancelHistory')"
-              :visible.sync="SubjectCancelDoctorHistoryVisible"
-              width="800px"
-              :close-on-click-modal="false"
-            >
-              <el-table
-                border
-                :data="SubjectCancelDoctorHistoryList"
-                stripe
-              >
+            <el-dialog v-if="SubjectCancelDoctorHistoryVisible" :title="$t('trials:reviewAssign:dialog:cancelHistory')"
+              :visible.sync="SubjectCancelDoctorHistoryVisible" width="800px" :close-on-click-modal="false">
+              <el-table border :data="SubjectCancelDoctorHistoryList" stripe>
                 <!-- 取消时间 -->
-                <el-table-column
-                  prop="CreateTime"
-                  :label="$t('trials:reviewAssign:cancelHistory:table:cancelTime')"
-                  width="180"
-                  show-overflow-tooltip
-                />
+                <el-table-column prop="CreateTime" :label="$t('trials:reviewAssign:cancelHistory:table:cancelTime')"
+                  width="180" show-overflow-tooltip />
                 <!-- 原因 -->
-                <el-table-column
-                  prop="Note"
-                  :label="$t('trials:reviewAssign:cancelHistory:table:cancelReason')"
-                  show-overflow-tooltip
-                />
+                <el-table-column prop="Note" :label="$t('trials:reviewAssign:cancelHistory:table:cancelReason')"
+                  show-overflow-tooltip />
               </el-table>
             </el-dialog>
           </div>
@@ -1018,9 +888,11 @@ export default {
     padding: 0px !important;
   }
 }
+
 ::v-deep .hidden-row {
   display: none;
 }
+
 ::v-deep .el-dialog__body {
   padding: 15px 20px;
 }
@@ -1030,12 +902,15 @@ export default {
   border-color: none !important;
   // color: #fff!important;
 }
+
 ::v-deep #TaskAllocationRuleList thead .el-checkbox__inner {
   display: none;
 }
+
 ::v-deep .el-descriptions-item__label.has-colon:after {
   display: none;
 }
+
 ::v-deep .base-dialog-wrapper .base-dialog-body {
   max-height: 1000px;
 }

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/reading-tracking/index.vue

@@ -205,6 +205,10 @@
               {{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
             </span>
             <span v-else>{{ scope.row.SubjectCode }}</span>
+            <!-- 终止 -->
+            <span v-if="scope.row.IsSubjectQuit" class="status-primary-circle">
+              {{ $t('trials:crcUpload:label:ISQ') }}
+            </span>
           </template>
         </el-table-column>
         <!-- 任务名称 -->
@@ -249,7 +253,7 @@
         <!-- 阅片人 -->
         <el-table-column prop="UserName" :label="$t('trials:reviewTrack:table:reader')" width="130" sortable="custom"
           show-overflow-tooltip>
-          <template v-if="scope.row.UserName" slot-scope="scope">
+          <template v-if="scope.row.TaskAllocationState" slot-scope="scope">
             <span v-if="viewStatus">{{ scope.row.UserName }}</span>
             <span v-else>{{ scope.row.UserName }}({{ scope.row.FullName }})</span>
           </template>
@@ -336,27 +340,29 @@
         <el-table-column fixed="right" :label="$t('common:action:action')" width="220">
           <template slot-scope="scope">
             <!-- 查看阅片结果 -->
-            <el-button :disabled="scope.row.ReadingTaskState !== 2" icon="el-icon-view" circle
-              :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
+            <el-button :disabled="scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit" icon="el-icon-view"
+              circle :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
             <!-- 申请重阅 -->
             <el-button :disabled="scope.row.ReadingCategory !== 1 ||
               (scope.row.TaskState !== 0 && scope.row.TaskState !== 5) ||
               scope.row.ReadingTaskState !== 2 ||
               scope.row.ReReadingApplyState === 2 ||
               scope.row.ReReadingApplyState === 4 ||
-              scope.row.ReReadingApplyState === 5
+              scope.row.ReReadingApplyState === 5 || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)
               " v-if="
                 hasPermi(['trials:trials-panel:readingTracking:edit']) && !isDoc
               " icon="el-icon-collection" circle :title="$t('trials:reviewTrack:action:applyReread')"
               @click="openApplyReReading(scope.row)" />
             <!-- 退回重阅历史 -->
-            <el-button :disabled="!scope.row.ReReadingApplyState" icon="el-icon-toilet-paper" v-if="!isDoc" circle
+            <el-button
+              :disabled="!scope.row.ReReadingApplyState || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)"
+              icon="el-icon-toilet-paper" v-if="!isDoc" circle
               :title="$t('trials:reviewTrack:action:backToRereadHistory')" @click="reReadingHistory(scope.row, 1)" />
             <!-- 退回 -->
             <el-button :disabled="scope.row.ReadingTaskState === 2 ||
               scope.row.ReadingCategory !== 1 ||
               scope.row.TaskState !== 0 ||
-              scope.row.IsManualGeneration
+              scope.row.IsManualGeneration || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)
               " v-if="
                 hasPermi(['trials:trials-panel:readingTracking:edit']) && !isDoc
               " icon="el-icon-back" circle :title="$t('trials:reviewTrack:action:back')"
@@ -375,6 +381,12 @@
       <!-- 分页组件 -->
       <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
         @pagination="getList" />
+      <div class="remark">
+        <span class="status-primary-circle">
+          {{ $t('trials:crcUpload:label:ISQ') }}
+        </span>
+        <span>: {{ $t('trials:crcUpload:label:IsSubjectQuit') }}</span>
+      </div>
       <!-- 阅片任务规则 -->
       <el-dialog title="阅片任务规则" :visible.sync="ReadingRulesVisible" width="500px" :close-on-click-modal="false"
         custom-class="base-dialog-wrapper">
@@ -1373,6 +1385,25 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.remark {
+  position: absolute;
+  left: 5px;
+  bottom: 7px;
+  font-size: 12px;
+}
+
+.status-primary-circle {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  text-align: center;
+  line-height: 18px;
+  border-radius: 50%;
+  border: 1px solid #f56c6c;
+  color: #f56c6c;
+  font-size: 10px;
+}
+
 .title {
   line-height: 40px;
   font-weight: bold;

src/views/trials/trials-panel/reading/task-allocation/index.vue

@@ -230,7 +230,7 @@
           sortable="custom"
           show-overflow-tooltip
         >
-          <template v-if="scope.row.UserName" slot-scope="scope">
+          <template v-if="scope.row.TaskAllocationState" slot-scope="scope">
             {{ `${scope.row.UserName}(${scope.row.FullName})` }}
           </template>
         </el-table-column>

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

@@ -120,7 +120,7 @@ name: "CustomizeReportPageUpload",
       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)
+      const res = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${param.file.name}`, file)
       console.log(res)
       this.fileList.push({ name: param.file.name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url)})
       this.urls.push(this.$getObjectName(res.url))