医学审核问题配置查询条件可清除

public/index.html

@@ -11,6 +11,14 @@
     <meta http-equiv="Cache-control" content="no-store,no-cache,must-revalidate">
     <meta http-equiv="Cache" content="no-cache">
     <title><%= webpackConfig.name %></title>
+    <style>
+      .customPromptTip {
+        position: absolute;
+        left: 0;
+        bottom: -100px;
+        z-index: 99999;
+      }
+    </style>
     <% if (eval(process.env.VUE_APP_LOGIN_FOR_PERMISSION)) { %>
     <script>
         window.zzSessionStorage = {

src/api/dictionary.js

@@ -281,7 +281,13 @@ export function getCommonDocumentList(param) {
     data: param
   })
 }
-
+export function getCommonDocument(param) {
+  return request({
+    url: `/CommonDocument/getCommonDocument`,
+    method: 'get',
+    params: param
+  })
+}
 export function addOrUpdateCommonDocument(param) {
   return request({
     url: `/CommonDocument/addOrUpdateCommonDocument`,

src/api/export.js

@@ -203,6 +203,15 @@ export function qCVisitList_Export(data) {
     data
   })
 }
+// 导出影像指控问题和答案
+export function GetTrialQCQuestionAnserList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetTrialQCQuestionAnserList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
 // 导出下载记录
 export function getTrialDownloadList_Export(data) {
   return requestDownload({
@@ -273,3 +282,21 @@ export function GetEmailNoticeConfigList_Export(data) {
     data
   })
 }
+// 导出重传审批
+export function GetImageBackList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetImageBackList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出医学审核配置
+export function GetReadingMedicineSystemQuestionList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetReadingMedicineSystemQuestionList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}

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) {
@@ -285,4 +286,11 @@ export function deleteSingleTableQuestionMark(param, type) {
   })
 }
 
-
+// 阅片导入
+export function readingImport(param) {
+  return request({
+    url: `/ReadingCalculate/readingImport`,
+    method: 'post',
+    data: param
+  })
+}

src/api/trials.js

@@ -4204,4 +4204,28 @@ export function getExportSubjectVisitImageList(data) {
     method: 'post',
     data
   })
+}
+// 影像质控-更正dicom
+export function updateDicomStudyInfo(data) {
+  return request({
+    url: `/Inspection/QCOperation/UpdateDicomStudyInfo`,
+    method: 'post',
+    data
+  })
+}
+// 影像质控-更正非dicom
+export function updateNoneDicomStudy(data) {
+  return request({
+    url: `/Inspection/NoneDicomStudy/UpdateNoneDicomStudy`,
+    method: 'post',
+    data
+  })
+}
+// 阅片单元-获取访视计划
+export function getVisitStage(data) {
+  return request({
+    url: `/VisitPlan/getVisitStage`,
+    method: 'post',
+    data
+  })
 }

src/components/downloadDicomAndNonedicom/index.vue

@@ -24,8 +24,7 @@
     </div>
     <!--上传列表@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' }">
+      class="dicomFiles-table" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!-- <el-table-column
         type="selection"
         width="55"
@@ -298,24 +297,47 @@ export default {
         if (data.StudyList && data.StudyList.length > 0) {
           let StudyList = data.StudyList
           StudyList.forEach((study) => {
+            if (study.StudyDIRPath) {
+              let obj = {
+                name: `${data.SubjectCode}/${data.TaskBlindName
+                  }/${this.$fd('IsDicom', true)}/${study.StudyCode
+                  }/DICOMDIR`,
+                url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+              }
+              if (this.IsReadingTaskViewInOrder === 0) {
+                obj = {
+                  name: `${data.TaskBlindName}/${this.$fd(
+                    'IsDicom',
+                    true
+                  )}/DICOMDIR`,
+                  url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+                }
+              }
+              files.push(obj)
+            }
             if (study.SeriesList.length > 0) {
               study.SeriesList.forEach((series) => {
-                if (series.InstancePathList.length > 0) {
-                  series.InstancePathList.forEach((instance) => {
+                if (series.InstanceList.length > 0) {
+                  series.InstanceList.forEach((instance) => {
                     let fileName = instance.Path.split('/').pop()
+                    if (instance.FileName) {
+                      fileName = instance.FileName
+                    }
                     let obj = {
                       name: `${data.SubjectCode}/${data.TaskBlindName
                         }/${this.$fd('IsDicom', true)}/${study.StudyCode
-                        }/${fileName}`,
+                        }/IMAGE/${fileName}`,
                       url: this.OSSclientConfig.basePath + instance.Path,
+                      IsEncapsulated: instance.IsEncapsulated
                     }
                     if (this.IsReadingTaskViewInOrder === 0) {
                       obj = {
                         name: `${data.TaskBlindName}/${this.$fd(
                           'IsDicom',
                           true
-                        )}/${fileName}`,
+                        )}/IMAGE/${fileName}`,
                         url: this.OSSclientConfig.basePath + instance.Path,
+                        IsEncapsulated: instance.IsEncapsulated
                       }
                     }
                     files.push(obj)

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -731,6 +731,8 @@ export default {
                 fileList: [],
                 dicomInfo: {
                   studyId: data.string('x00200010'),
+                  DicomStudyDate: data.string('x00080020'),
+                  DicomStudyTime: data.string('x00080030'),
                   studyUid: studyUid,
                   patientId: data.string('x00100020'),
                   patientName: patientNameStr,
@@ -841,6 +843,8 @@ export default {
               )
               seriesItem = {
                 seriesUid: seriesUid,
+                DicomSeriesDate: data.string('x00080021'),
+                DicomSeriesTime: data.string('x00080031'),
                 seriesNumber: data.intString('x00200011') || 1,
                 modality: data.string('x00080060') || '',
                 description: seriesDescriptionStr,
@@ -880,6 +884,10 @@ export default {
               }
               instanceItem = {
                 instanceUid: instanceUid,
+                SOPClassUID: data.string('x00080016'),
+                TransferSytaxUID: data.string('x00020010'),
+                MediaStorageSOPInstanceUID: instanceUid,
+                MediaStorageSOPClassUID: data.string('x00080016'),
                 instanceNumber: data.intString('x00200013') || 1,
                 frameCount: data.intString('x00280008') || 1,
                 instanceTime: instanceTime,
@@ -1088,6 +1096,8 @@ export default {
                   acquisitionNumber: dicomInfo.acquisitionNumber,
                   triggerTime: dicomInfo.triggerTime,
                   bodyPartExamined: '',
+                  DicomStudyDate: dicomInfo.DicomStudyDate,
+                  DicomStudyTime: dicomInfo.DicomStudyTime,
                   seriesList: [],
                 },
               }
@@ -1112,6 +1122,10 @@ export default {
                             instanceList.push({
                               studyInstanceUid: dicomInfo.studyUid,
                               seriesInstanceUid: v.seriesUid,
+                              SOPClassUID: o.SOPClassUID,
+                              TransferSytaxUID: o.TransferSytaxUID,
+                              MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+                              MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                               sopInstanceUid: o.instanceUid,
                               instanceNumber: o.instanceNumber,
                               instanceTime: o.instanceTime,
@@ -1193,6 +1207,10 @@ export default {
                                 studyInstanceUid: dicomInfo.studyUid,
                                 seriesInstanceUid: v.seriesUid,
                                 sopInstanceUid: o.instanceUid,
+                                SOPClassUID: o.SOPClassUID,
+                                TransferSytaxUID: o.TransferSytaxUID,
+                                MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+                                MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                                 instanceNumber: o.instanceNumber,
                                 instanceTime: o.instanceTime,
                                 imageRows: o.imageRows,
@@ -1238,6 +1256,8 @@ export default {
                   seriesInstanceUid: v.seriesUid,
                   seriesNumber: v.seriesNumber,
                   seriesTime: v.seriesTime,
+                  DicomSeriesDate: v.DicomSeriesDate,
+                  DicomSeriesTime: v.DicomSeriesTime,
                   sliceThickness: v.sliceThickness,
                   imagePositionPatient: v.imagePositionPatient,
                   imageOrientationPatient: v.imageOrientationPatient,

src/components/uploadDicomAndNonedicom/study-view.vue

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

src/const/sign-code.vue

@@ -32,7 +32,7 @@ export default {
     ResetImageQualityControlQuestion: 112, // 重置影像质控问题
     CreateReviewTask: 113, // 生成复核任务
     ReviewImageQualityControlQuestion: 219, // 复核质控问题
-
+    CorrectImageExaminationInformation: 220, // 更正影像检查信息
   },
 };
 </script>

src/main.js

@@ -202,6 +202,7 @@ async function VueInit() {
   // 获取版本信息
   let PublishInfo = await getCurrentPublishInfo();
   Vue.prototype.$version = PublishInfo.Result;
+  Vue.prototype.$companyInfo = PublishInfo.OtherInfo;
   // 获取检查部位
   Vue.prototype.$getBodyPart = (id) => {
     return new Promise(async (resolve, reject) => {
@@ -275,6 +276,20 @@ async function VueInit() {
     }
     return companyName;
   }
+  Vue.prototype.$reg = () => {
+    if (localStorage.getItem('CompanyInfo')) {
+      let { EmailRegexStr } = JSON.parse(localStorage.getItem('CompanyInfo'))
+      if (EmailRegexStr) {
+        return { EmailRegexStr }
+      }
+    } else if (Vue.prototype.$companyInfo) {
+      let { EmailRegexStr } = Vue.prototype.$companyInfo
+      if (EmailRegexStr) {
+        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
@@ -316,7 +331,7 @@ async function VueInit() {
       })
     }
     let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'))
-    if (CompanyInfo && CompanyInfo.SystemShortName) {
+    if (CompanyInfo && CompanyInfo.SystemShortName && text.toUpperCase() !== "CIRCLE") {
       let test = new RegExp('IRC', 'ig')
       text = text.replace(test, CompanyInfo.SystemShortName)
     }

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]) {
@@ -42,7 +44,7 @@ export const anonymization = function (file, config) {
             }
           } else {
             if (dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element]) {
-              dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element].Value[0] = DicomStoreInfo[AnonymizeNotFixed.ReplaceValue] ? DicomStoreInfo[AnonymizeNotFixed.ReplaceValue].toString() : ''
+              dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element].Value[0] = DicomStoreInfo[AnonymizeNotFixed.ReplaceValue] || Number(DicomStoreInfo[AnonymizeNotFixed.ReplaceValue]) === 0 ? DicomStoreInfo[AnonymizeNotFixed.ReplaceValue].toString() : ''
             } else {
               dataset.dict[AnonymizeNotFixed.Group + AnonymizeNotFixed.Element] = {
                 vr: AnonymizeNotFixed.ValueRepresentation,
@@ -53,9 +55,9 @@ export const anonymization = function (file, config) {
             }
           }
         }
-        // console.log(dataset)
+
         try {
-          let newDicomFile = dataset.write()
+          let newDicomFile = dataset.write() // fragmentMultiframe 原始数据是否进行分割
           const bufferArray = new Uint8Array(newDicomFile)
           const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
           resolve({ blob, pixelDataElement })

src/utils/stream.js

@@ -1,6 +1,7 @@
 import streamSaver from "streamsaver";
 import "streamsaver/examples/zip-stream.js";
 import store from '@/store'
+import dcmjs from './dcmUpload/dcmjs'
 streamSaver.mitm = `${window.location.origin}/mitm.html?version=2.0.0`
 // 下载文件并压缩
 function zipFiles(zipName, files) {
@@ -19,7 +20,10 @@ function zipFiles(zipName, files) {
                     if (fileInfo.done) {//迭代终止  
                         ctrl.close();
                     } else {
-                        let { name, url } = fileInfo.value;
+                        let { name, url, IsEncapsulated = false } = fileInfo.value;
+                        if (IsEncapsulated) {
+                            url = await downloadFileToUrl(url)
+                        }
                         // url = decodeUtf8(url); // 待定，可能做过特殊处理
                         return fetch(url).then(res => {
                             ctrl.enqueue({
@@ -99,6 +103,24 @@ function decodeUtf8(bytes) {
     str2.pop();
     return str2.join("/") + '/' + name;
 }
+// 下载文件进行修改并输出本地url
+function downloadFileToUrl(url) {
+    return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open('GET', url);
+        xhr.responseType = 'arraybuffer';
+        xhr.onload = function () {
+            const arraybuffer = xhr.response;
+            let dataset = dcmjs.data.DicomMessage.readFile(arraybuffer)
+            let newDicomFile = dataset.write({ fragmentMultiframe: false }) // fragmentMultiframe 原始数据是否进行分割
+            const bufferArray = new Uint8Array(newDicomFile)
+            const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
+            const href = URL.createObjectURL(blob)
+            resolve(href)
+        };
+        xhr.send();
+    })
+}
 export async function downLoadFile(file, name, type = 'file') {
     if (type === 'zip') return await zipFiles(name, file);
     return await updateFile(file, name)

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)
       }

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

@@ -0,0 +1,269 @@
+<template>
+  <el-form ref="sysTemplateFrom" v-loading="loading" :model="form" label-width="140px" size="small" :rules="rules"
+    class="upload-temporary-file">
+    <div class="base-dialog-body">
+      <el-form-item :label="$t('dictionary:attachment:label:code')" prop="Code">
+        <el-input v-model="form.Code" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:attachment:label:businessScenario')" prop="BusinessScenarioEnum">
+        <el-select v-model="form.BusinessScenarioEnum" style="width: 100%" size="small" filterable>
+          <el-option v-for="item of $d.Common_File_BusinessScenario" :key="item.id" :label="item.label"
+            :value="item.value" />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item :label="$t('dictionary:attachment:label:file')">
+        <div class="upload-container">
+          <el-upload class="upload-demo" action accept="" :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.FileTypeEnum && form.FileTypeEnum !== 0)">
+            <el-button size="small" type="primary" :disabled="(!form.FileTypeEnum && form.FileTypeEnum !== 0)"
+              :loading="btnLoading">Select</el-button>
+            <!-- <span slot="tip" style="margin-left: 10px" class="el-upload__tip">
+              (must be in xlsx/xls/doc/docx format)
+            </span> -->
+          </el-upload>
+        </div>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:attachment:label:name')" prop="Name">
+        <el-input v-model="form.Name" />
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:attachment:export:form:nameCN')" prop="NameCN">
+        <el-input v-model="form.NameCN" />
+      </el-form-item>
+      <el-form-item v-if="form.Id !== ''" :label="$t('dictionary:attachment:label:isDeleted')">
+        <el-radio-group v-model="form.IsDeleted">
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item :label="$t('dictionary:attachment:label:description')">
+        <el-input v-model="form.Description" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
+      </el-form-item>
+    </div>
+    <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+      <el-form-item style="text-align: right">
+        <el-button size="small" type="primary" :disabled="(!form.FileTypeEnum && form.FileTypeEnum !== 0)"
+          :loading="saveBtnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+      </el-form-item>
+    </div>
+  </el-form>
+</template>
+<script>
+import {
+  addOrUpdateCommonDocument,
+  uploadCommonDoc,
+  Upload,
+} from '@/api/dictionary'
+import { getBasicDataSelects } from '@/api/dictionary/dictionary'
+export default {
+  name: 'TemplateForm',
+  props: {
+    data: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+
+  data() {
+    return {
+      form: {
+        Id: '',
+        Code: '',
+        FileTypeEnum: 0,
+        BusinessScenarioEnum: null,
+        Name: '',
+        NameCN: '',
+        Path: '',
+        Description: '',
+        IsDeleted: false,
+      },
+      rules: {
+        Code: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        Name: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        NameCN: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+        BusinessScenarioEnum: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+        ],
+      },
+      fileList: [],
+      btnLoading: false,
+      saveBtnLoading: false,
+      loading: false,
+      dictionaryList: {},
+    }
+  },
+  mounted() {
+    this.initForm()
+  },
+  methods: {
+    async initForm() {
+      await this.getDicData()
+      if (Object.keys(this.data).length > 0) {
+        if (this.data.Path) {
+          this.fileList = [
+            {
+              name: this.data.Name,
+              path: this.data.Path,
+              url: this.data.Path,
+              type: this.data.Type,
+            },
+          ]
+        }
+        for (const k in this.form) {
+          if (this.data.hasOwnProperty(k)) {
+            this.form[k] = this.data[k]
+          }
+        }
+      }
+    },
+    // 获取文件类型下拉框
+    getDicData() {
+      this.loading = true
+      getBasicDataSelects(['Common_File_ModuleType', 'Common_File_Type'])
+        .then((res) => {
+          this.dictionaryList = { ...res.Result }
+          this.loading = false
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    beforeUpload(file) {
+      // 检测文件类型是否符合要求
+      if (this.checkFileSuffix(file.name)) {
+        this.fileList = []
+        return true
+      } else {
+        this.$alert(this.$t('dictionary:attachment:export:alert:formatFile'))
+
+        return false
+      }
+    },
+    async handleUploadFile(param) {
+      this.loading = true
+      this.form.FileName = param.file.name
+      let extendName = param.file.name
+        .substring(param.file.name.lastIndexOf('.'))
+        .toLocaleLowerCase()
+      let file = await this.fileToBlob(param.file)
+      let res = await this.OSSclient.put(`/System/Tools/${this.$guid()}${extendName}`, file)
+      this.form.Path = this.$getObjectName(res.url)
+      this.form.NameCN = param.file.name
+      this.fileList.push({
+        name: param.file.name,
+        path: this.form.Path,
+        fullPath: this.form.Path,
+        url: this.form.Path,
+      })
+      this.loading = false
+      this.btnLoading = false
+      // Upload(formData, 1).then((res) => {
+      //   this.fileList.push({
+      //     name: param.file.name,
+      //     path: res.Result.FilePath,
+      //     fullPath: res.Result.FullFilePath,
+      //     url: res.Result.FilePath,
+      //   })
+
+      // })
+    },
+    fileToBlob(file) {
+      // 创建 FileReader 对象
+      const reader = new FileReader()
+      return new Promise((resolve) => {
+        // FileReader 添加 load 事件
+        reader.addEventListener('load', (e) => {
+          let blob
+          if (typeof e.target.result === 'object') {
+            blob = new Blob([e.target.result])
+          } else {
+            blob = e.target.result
+          }
+          resolve(blob)
+        })
+        // FileReader 以 ArrayBuffer 格式 读取 File 对象中数据
+        reader.readAsArrayBuffer(file)
+      })
+    },
+    handleSave() {
+      this.$refs.sysTemplateFrom.validate((valid) => {
+        if (!valid) return
+        if (!this.form.Name) {
+          this.$alert(this.$t('dictionary:attachment:message:msg1'))
+          return
+        }
+        this.saveBtnLoading = true
+        addOrUpdateCommonDocument(this.form)
+          .then((res) => {
+            this.saveBtnLoading = false
+            this.$emit('closeDialog')
+            this.$emit('getList')
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          })
+          .catch(() => {
+            this.saveBtnLoading = false
+          })
+      })
+    },
+    handleRemoveFile() {
+      this.fileList = []
+      this.form.Path = ''
+      this.form.NameCN = ''
+      this.form.Name = ''
+    },
+    handlePreview(file) {
+      if (file.fullPath) {
+        window.open(file.fullPath, '_blank')
+      }
+    },
+    handleExceed(files, fileList) {
+      this.$message.warning(this.$t('upload:rule:maxFile1'))
+    },
+    checkFileSuffix(fileName) {
+      return true
+      var typeArr = ['xls', 'xlsx', 'doc', 'docx']
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
+      if (typeArr.indexOf(extendName) !== -1) {
+        return true
+      } else {
+        return false
+      }
+    },
+  },
+}
+</script>
+
+<style lang="scss">
+.upload-temporary-file {
+  .upload-container .el-upload--text {
+    border: none;
+    width: 80px;
+    height: 40px;
+  }
+
+  .upload-container .el-input--small {
+    margin-bottom: 5px;
+  }
+
+  .upload-container .el-icon-circle-check {
+    color: #428bca;
+    font-size: 13px;
+  }
+
+  .account_item_clear {
+    .el-tag__close {
+      display: none !important;
+    }
+  }
+}
+</style>

src/views/dictionary/attachment/components/ToolsTemplate/index.vue

@@ -0,0 +1,238 @@
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true" size="small">
+        <!-- 业务场景 -->
+        <el-form-item :label="$t('dictionary:attachment:label:businessScenario')">
+          <el-select v-model="searchData.BusinessScenarioEnum" style="width: 150px">
+            <el-option v-for="item of $d.Common_File_BusinessScenario" :key="item.value" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <!-- 文件名称 -->
+        <el-form-item :label="$t('dictionary:attachment:label:name')">
+          <el-input v-model="searchData.Name" style="width: 130px" clearable />
+        </el-form-item>
+
+        <el-form-item>
+          <!-- 查询 -->
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <!-- 重置 -->
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+            {{ $t('common:button:reset') }}
+          </el-button>
+        </el-form-item>
+        <el-button type="primary" style="float: right" size="small" @click="handleAdd">
+          {{ $t('common:button:new') }}
+        </el-button>
+      </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 type="index" width="40" />
+        <el-table-column prop="Code" :label="$t('dictionary:attachment:label:code')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 业务场景 -->
+        <el-table-column prop="BusinessScenarioEnum" :label="$t('dictionary:attachment:label:businessScenario')"
+          show-overflow-tooltip sortable="custom">
+          <template slot-scope="scope">
+            {{
+              $fd(
+                'Common_File_BusinessScenario',
+                scope.row.BusinessScenarioEnum
+              )
+            }}
+          </template>
+        </el-table-column>
+        <!-- 文件名称 -->
+        <el-table-column prop="Name" :label="$t('dictionary:attachment:label:name')" show-overflow-tooltip
+          sortable="custom" />
+        <el-table-column prop="NameCN" :label="$t('dictionary:attachment:upload:table:nameCN')" show-overflow-tooltip
+          sortable="custom" />
+        <!-- 描述 -->
+        <el-table-column prop="Description" :label="$t('dictionary:attachment:label:description')"
+          show-overflow-tooltip />
+        <!-- 是否废除 -->
+        <el-table-column prop="IsDeleted" :label="$t('dictionary:attachment:label:isDeleted')" show-overflow-tooltip
+          sortable="custom">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
+              $fd('YesOrNo', scope.row.IsDeleted)
+            }}</el-tag>
+            <el-tag v-else type="primary">{{
+              $fd('YesOrNo', scope.row.IsDeleted)
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- 上传时间 -->
+        <el-table-column prop="UpdateTime" :label="$t('dictionary:attachment:label:updateTime')" show-overflow-tooltip
+          sortable="custom" />
+
+        <el-table-column :label="$t('common:action:action')" width="300">
+          <template slot-scope="scope">
+            <!-- <el-button type="text" @click="PreviewFile(scope.row)">
+              {{ $t('common:button:preview') }}
+            </el-button> -->
+            <el-button type="text" @click="handleDownload(scope.row)">
+              {{ $t('common:button:download') }}
+            </el-button>
+            <el-button type="text" @click="handleEdit(scope.row)">
+              {{ $t('common:button:edit') }}
+            </el-button>
+            <el-button type="text" @click="handleDelete(scope.row)">
+              {{ $t('common:button:delete') }}
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
+
+      <!-- 新增/编辑 -->
+      <el-dialog v-if="editDialog.visible" :visible.sync="editDialog.visible" :close-on-click-modal="false"
+        :title="editDialog.title" width="600px" custom-class="base-dialog-wrapper">
+        <TemplateForm :data="currentRow" @closeDialog="closeDialog" @getList="getList" />
+      </el-dialog>
+    </template>
+  </BaseContainer>
+</template>
+<script>
+import {
+  getCommonDocumentList,
+  DownloadCommonDoc,
+  deleteCommonDocument,
+} from '@/api/dictionary'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import TemplateForm from './TemplateForm'
+import { downLoadFile } from '@/utils/stream.js'
+const FileTypeEnum = 0
+const searchDataDefault = () => {
+  return {
+    FileTypeEnum: FileTypeEnum,
+    BusinessScenarioEnum: null,
+    Name: '',
+    PageIndex: 1,
+    PageSize: 20,
+  }
+}
+export default {
+  name: 'ToolsTemplate',
+  components: { BaseContainer, Pagination, TemplateForm },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      currentRow: {},
+      editDialog: { title: '', visible: false },
+      loading: false,
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  computed: {
+    isEN() {
+      return this.$i18n.locale !== 'zh'
+    },
+  },
+  methods: {
+    handleDelete(row) {
+      // 确定删除该模版？
+      this.$confirm(this.$t('dictionary:attachment:message:msg1')).then(() => {
+        deleteCommonDocument(row.Id).then(() => {
+          this.$message.success(this.$t('common:message:deletedSuccessfully'))
+          this.getList()
+        })
+      }).catch(() => { })
+    },
+    PreviewFile(row) {
+      let basePath = window.location.origin
+      if (window.location.protocol !== 'https:') {
+        basePath = 'https://irc.test.extimaging.com'
+      }
+      let data = {
+        name: row.NameCN,
+        path: basePath + row.Path,
+      }
+      this.$emit('PreviewFile', data)
+    },
+    getList() {
+      this.loading = true
+      getCommonDocumentList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    // 新增
+    handleAdd() {
+      this.editDialog.title = this.$t('common:button:new')
+      this.currentRow = { FileTypeEnum: FileTypeEnum }
+      this.editDialog.visible = true
+    },
+    // 下载
+    async handleDownload(row) {
+      try {
+        this.loading = true
+        let fileName = this.isEN ? row.Name : row.NameCN;
+        let type = fileName
+          .substring(fileName.lastIndexOf('.'))
+          .toLocaleLowerCase()
+        if (!type) {
+          let extendName = row.Path
+            .substring(row.Path.lastIndexOf('.'))
+            .toLocaleLowerCase()
+          fileName += extendName
+        }
+        let res = await downLoadFile(this.OSSclientConfig.basePath + row.Path, fileName)
+        this.loading = false
+      } catch (err) {
+        this.loading = false
+      }
+    },
+    // 编辑
+    handleEdit(row) {
+      this.editDialog.title = this.$t('common:button:edit')
+      this.currentRow = { ...row }
+      this.editDialog.visible = true
+    },
+    handleSearch() {
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    closeDialog() {
+      this.editDialog.visible = false
+    },
+    // 排序
+    handleSortChange(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .search {
+  display: block;
+}
+</style>

src/views/dictionary/attachment/index.vue

@@ -1,52 +1,22 @@
 <template>
   <div class="attachment-wrapper">
     <el-tabs v-model="activeTab" @tab-click="clickTab">
-      <el-tab-pane
-        v-for="item in $d.Common_File_Type"
-        :key="item.value"
-        :label="item.label"
-        :name="String(item.value)"
-      >
-        <UploadTemplate
-          v-if="activeTab === '1' && item.value == activeTab"
-          @PreviewFile="PreviewFile"
-        />
-        <ExportTemplate
-          v-if="activeTab === '2' && item.value == activeTab"
-          @PreviewFile="PreviewFile"
-        />
+      <el-tab-pane v-for="item in $d.Common_File_Type" :key="item.value" :label="item.label" :name="String(item.value)">
+        <UploadTemplate v-if="activeTab === '1' && item.value == activeTab" @PreviewFile="PreviewFile" />
+        <ExportTemplate v-if="activeTab === '2' && item.value == activeTab" @PreviewFile="PreviewFile" />
         <EmailTemplate v-if="activeTab === '3' && item.value == activeTab" />
         <CommonTemplate v-if="activeTab === '4' && item.value == activeTab" />
-        <SignatureTemplate
-          v-if="activeTab === '5' && item.value == activeTab"
-        />
+        <SignatureTemplate v-if="activeTab === '5' && item.value == activeTab" />
+        <ToolsTemplate v-if="activeTab === '0' && item.value == activeTab" />
       </el-tab-pane>
     </el-tabs>
     <!-- 预览 -->
-    <el-dialog
-      v-if="Preview.visible"
-      :visible.sync="Preview.visible"
-      :close-on-click-modal="false"
-      :fullscreen="true"
-      :title="Preview.title"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <vue-office-docx
-        v-if="docxTypes.includes(Preview.type)"
-        :src="Preview.path"
-        style="height: calc(100vh - 70px)"
-        @rendered="renderedHandler"
-        @error="errorHandler"
-      />
-      <vue-office-excel
-        v-else-if="excelTypes.includes(Preview.type)"
-        :src="Preview.path"
-        :options="options"
-        style="height: calc(100vh - 70px)"
-        @rendered="renderedHandler"
-        @error="errorHandler"
-      />
+    <el-dialog v-if="Preview.visible" :visible.sync="Preview.visible" :close-on-click-modal="false" :fullscreen="true"
+      :title="Preview.title" width="600px" custom-class="base-dialog-wrapper">
+      <vue-office-docx v-if="docxTypes.includes(Preview.type)" :src="Preview.path" style="height: calc(100vh - 70px)"
+        @rendered="renderedHandler" @error="errorHandler" />
+      <vue-office-excel v-else-if="excelTypes.includes(Preview.type)" :src="Preview.path" :options="options"
+        style="height: calc(100vh - 70px)" @rendered="renderedHandler" @error="errorHandler" />
       <PreviewFile v-else :file-path="Preview.path" :file-type="Preview.type" />
     </el-dialog>
   </div>
@@ -57,6 +27,7 @@ import ExportTemplate from './components/ExportTemplate'
 import EmailTemplate from './components/EmailTemplate'
 import CommonTemplate from './components/CommonTemplate'
 import SignatureTemplate from './components/SignatureTemplate'
+import ToolsTemplate from './components/ToolsTemplate'
 import VueOfficeDocx from '@vue-office/docx'
 import '@vue-office/docx/lib/index.css'
 import VueOfficeExcel from '@vue-office/excel'
@@ -73,6 +44,7 @@ export default {
     VueOfficeDocx,
     VueOfficeExcel,
     PreviewFile,
+    ToolsTemplate
   },
   data() {
     return {
@@ -142,16 +114,18 @@ export default {
     display: flex;
     flex-direction: column;
   }
+
   .el-tabs__header {
     height: 40px;
     margin-bottom: 5px;
   }
+
   .el-tabs__content {
     flex: 1;
+
     .el-tab-pane {
       height: 100%;
     }
   }
 }
 </style>
-

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

@@ -43,6 +43,7 @@
       :data="list"
       stripe
       height="100"
+      @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="60" />
       <!-- Group -->
@@ -50,6 +51,7 @@
         prop="Group"
         :label="$t('template:anonymization:label:group')"
         show-overflow-tooltip
+        sortable="custom"
       />
       <!-- Element -->
       <el-table-column
@@ -57,24 +59,28 @@
         :label="$t('template:anonymization:label:element')"
         show-overflow-tooltip
         min-width="110"
+        sortable="custom"
       />
       <!-- Tag Description -->
       <el-table-column
         prop="TagDescription"
         :label="$t('template:anonymization:label:tagDescription')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Tag DescriptionCN -->
       <el-table-column
         prop="TagDescriptionCN"
         :label="$t('template:anonymization:label:tagDescriptionCN')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Value Representation -->
       <el-table-column
         prop="ValueRepresentation"
         :label="$t('template:anonymization:label:valueRepresentation')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Is Fixed -->
       <el-table-column :label="$t('template:anonymization:label:isFixed')" width="100">
@@ -92,6 +98,7 @@
         prop="ReplaceValue"
         :label="$t('template:anonymization:label:valueReplace')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Is Enable -->
       <el-table-column :label="$t('template:anonymization:label:isEnable')" width="100" fixed="right">
@@ -139,7 +146,9 @@ const searchDataDefault = () => {
     IsAdd: false,
     TagDescriptionCN: '',
     PageIndex: 1,
-    PageSize: 500
+    PageSize: 500,
+    Asc: false,
+    SortField: ''
   }
 }
 export default {
@@ -159,6 +168,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()
+    },
     switchChange(event, item) {
       this.loading = true
       addOrUpdateSystemAnonymization(item).then(res => {

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

@@ -43,6 +43,7 @@
       :data="list"
       stripe
       height="100"
+      @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="60" />
       <!-- Group -->
@@ -50,6 +51,7 @@
         prop="Group"
         :label="$t('template:anonymization:label:group')"
         show-overflow-tooltip
+        sortable="custom"
       />
       <!-- Element -->
       <el-table-column
@@ -57,24 +59,28 @@
         :label="$t('template:anonymization:label:element')"
         show-overflow-tooltip
         min-width="110"
+        sortable="custom"
       />
       <!-- Tag Description -->
       <el-table-column
         prop="TagDescription"
         :label="$t('template:anonymization:label:tagDescription')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Tag DescriptionCN -->
       <el-table-column
         prop="TagDescriptionCN"
         :label="$t('template:anonymization:label:tagDescriptionCN')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Value Representation -->
       <el-table-column
         prop="ValueRepresentation"
         :label="$t('template:anonymization:label:valueRepresentation')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Is Fixed -->
       <el-table-column :label="$t('template:anonymization:label:isFixed')" width="100">
@@ -92,6 +98,7 @@
         prop="ReplaceValue"
         :label="$t('template:anonymization:label:valueReplace')"
         min-width="110"
+        sortable="custom"
       />
       <!-- Is Enable -->
       <el-table-column :label="$t('template:anonymization:label:isEnable')" width="100" fixed="right">
@@ -138,7 +145,9 @@ const searchDataDefault = () => {
     TagDescriptionCN: '',
     IsAdd: true,
     PageIndex: 1,
-    PageSize: 500
+    PageSize: 500,
+    Asc: false,
+    SortField: ''
   }
 }
 export default {
@@ -158,6 +167,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()
+    },
     switchChange(event, item) {
       this.loading = true
       addOrUpdateSystemAnonymization(item).then(res => {

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

@@ -30,13 +30,13 @@
         <el-form-item
           :label="$t('trials:auditRecord:table:criterion')"
         >
-          <el-select v-model="searchData.CriterionTypeEnum">
+          <el-select v-model="searchData.CriterionTypeEnum" clearable>
             <el-option v-for="item of $d.CriterionType" :key="item.id" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 是否通用 -->
         <el-form-item :label="$t('dictionary:medicalAudit:label:IsGeneral')">
-          <el-select v-model="searchData.IsGeneral">
+          <el-select v-model="searchData.IsGeneral" clearable>
             <el-option v-for="item of $d.YesOrNo" :key="item.id" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
@@ -51,6 +51,9 @@
           >
             {{ $t('common:button:reset') }}
           </el-button>
+          <el-button type="primary" @click="handleExport">
+            {{ $t('common:button:export') }}
+          </el-button>
         </el-form-item>
       </el-form>
       <span style="margin-left:auto">
@@ -66,6 +69,7 @@
       :data="list"
       stripe
       height="100"
+      @sort-change="handleSortByColumn"
     >
       <!-- 序号 -->
       <el-table-column
@@ -79,6 +83,7 @@
         :label="$t('trials:MIMqcCfg:table:questionName')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       />
       <!-- 审核问题 -->
       <el-table-column
@@ -86,6 +91,7 @@
         :label="$t('common:title:languageType')"
         show-overflow-tooltip
         min-width="160"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('LanguageType', scope.row.LanguageType) }}
@@ -97,6 +103,7 @@
         :label="$t('trials:qcCfg:table:type')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('QcType', scope.row.Type) }}
@@ -108,6 +115,7 @@
         :label="$t('trials:qcCfg:table:typeValue')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       />
       <!-- 任务类型 -->
       <el-table-column
@@ -115,6 +123,7 @@
         :label="$t('trials:medicalFeedbackCfg:title:taskType')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       >
         <template slot-scope="scope">
           <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">
@@ -136,6 +145,7 @@
         :label="$t('trials:auditRecord:table:criterion')"
         min-width="160"
         show-overflow-tooltip
+        sortable="custom"
       >
         <template slot-scope="scope">
          <div>
@@ -148,6 +158,7 @@
         :label="$t('dictionary:medicalAudit:label:IsGeneral')"
         min-width="120"
         show-overflow-tooltip
+        sortable="custom"
       >
         <template slot-scope="scope">
           <div>
@@ -161,6 +172,7 @@
         :label="$t('trials:qcCfg:table:parentQs')"
         show-overflow-tooltip
         min-width="140"
+        sortable="custom"
       />
       <!-- 父问题触发值 -->
       <el-table-column
@@ -168,12 +180,14 @@
         :label="$t('trials:qcCfg:table:parentTriggerValue')"
         show-overflow-tooltip
         min-width="160"
+        sortable="custom"
       />
       <!-- 是否必填 -->
       <el-table-column
         prop="IsRequired"
         :label="$t('trials:qcCfg:table:isRequired')"
         min-width="120"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsRequired) }}
@@ -184,6 +198,7 @@
         prop="IsEnable"
         :label="$t('trials:qcCfg:table:isEnable')"
         min-width="120"
+        sortable="custom"
       >
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsEnable) }}
@@ -215,7 +230,7 @@
 </template>
 <script>
 import { getReadingMedicineSystemQuestionList, deleteReadingMedicineSystemQuestion } from '@/api/dictionary'
-
+import { GetReadingMedicineSystemQuestionList_Export } from '@/api/export'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
 import MedicalAuditForm from './MedicalAuditForm'
@@ -228,7 +243,9 @@ const searchDataDefault = () => {
     LanguageType: null,
     Type: '',
     CriterionTypeEnum: null,
-    IsGeneral: null
+    IsGeneral: null,
+    Asc: false,
+    SortField: ''
   }
 }
 export default {
@@ -248,6 +265,20 @@ export default {
     this.getList()
   },
   methods: {
+    async handleExport() {
+      await GetReadingMedicineSystemQuestionList_Export(this.searchData)
+    },
+    // 排序
+    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()
+    },
     // 获取受试者列表信息
     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/clinicalTrials.vue

@@ -254,7 +254,7 @@
             <el-date-picker
               v-model="form.StartTime"
               type="year"
-              value-format="yyyy-MM-DD"
+              value-format="yyyy"
             >
             </el-date-picker>
           </el-form-item>
@@ -265,7 +265,7 @@
             <el-date-picker
               v-model="form.EndTime"
               type="year"
-              value-format="yyyy-MM-DD"
+              value-format="yyyy"
             >
             </el-date-picker>
           </el-form-item>
@@ -904,12 +904,23 @@ export default {
       try {
         if (key === 'clinicalTrials') {
           let validate = await this.$refs.clinicalTrialsFrom.validate()
-          console.log(validate, 'validate')
           if (!validate) return false
           this.form.DoctorId = this.reviewerId
           if (this.trialId) {
             this.form.TrialId = this.trialId
           }
+          if (this.form.StartTime) {
+            let arr = this.form.StartTime.split("-")
+            if (arr.length <= 1) {
+              this.form.StartTime = `${this.form.StartTime}-01-01`
+            }
+          }
+          if (this.form.EndTime) {
+            let arr = this.form.EndTime.split("-")
+            if (arr.length <= 1) {
+              this.form.EndTime = `${this.form.EndTime}-12-31`
+            }
+          }
           this.loading = true
           let res = await addOrUpdateTrialExperience(this.form)
           this.loading = false

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

@@ -38,7 +38,11 @@
           <span v-if="isEN">{{ DATA.DepartmentOther }}</span>
           <span v-else>{{ DATA.DepartmentOtherCN }}</span>
         </span>
-        <span class="el-icon-user" v-if="DATA.Rank || DATA.RankCN">
+        <span class="el-icon-user" v-if="DATA.RankOther || DATA.RankOtherCN">
+          <span v-if="isEN">{{ DATA.RankOther }}</span>
+          <span v-else>{{ DATA.RankOtherCN }}</span>
+        </span>
+        <span class="el-icon-user" v-else-if="DATA.Rank || DATA.RankCN">
           <span v-if="isEN">{{ DATA.Rank }}</span>
           <span v-else>{{ DATA.RankCN }}</span>
         </span>
@@ -327,7 +331,13 @@
             :label="$t('curriculumVitae:info:form:physician')"
             prop="RankId"
           >
-            <el-select v-model="form.RankId" clearable placeholder="">
+            <el-select v-model="form.RankId" clearable placeholder="" @change="()=>{
+              if($fd('Rank', form.RankId, 'id') !==
+                $t('curriculumVitae:selectLabel:Other')){
+                  form.RankOther = null
+                  form.RankOtherCN = null
+                }
+            }">
               <el-option
                 v-for="item in $d.Rank"
                 :key="item.id"
@@ -548,7 +558,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/curriculumVitae/preview.vue

@@ -72,7 +72,11 @@
               reviewerData.EmploymentView.DepartmentOtherCN
             }}</span>
           </span>
-          <span class="el-icon-user"
+          <span class="el-icon-user" v-if="reviewerData.EmploymentView.RankOther || reviewerData.EmploymentView.RankOtherCN">
+            <span v-if="isEN">{{ reviewerData.EmploymentView.RankOther }}</span>
+            <span v-else>{{ reviewerData.EmploymentView.RankOtherCN }}</span>
+          </span>
+          <span class="el-icon-user" v-else
             ><span v-if="isEN">{{ reviewerData.EmploymentView.Rank }}</span>
             <span v-else>{{ reviewerData.EmploymentView.RankCN }}</span></span
           >
@@ -417,7 +421,12 @@
             v-if="true"
           >
             <template slot-scope="scope">
-              <span>{{ $fd('Indication', scope.row.IndicationEnum) }}</span>
+              <span v-if="scope.row.EvaluationContent">
+                {{ scope.row.EvaluationContent }}
+              </span>
+              <span v-else>
+                {{ $fd('Indication', scope.row.IndicationEnum) }}
+              </span>
             </template>
           </el-table-column>
           <el-table-column

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/system/user/list/index.vue

@@ -219,6 +219,13 @@ export default {
           sortable: 'custom',
           showOverflowTooltip: true,
         },
+        {
+          prop: 'JoinedTrialCount',
+          label: this.$t('system:userlist:table:JoinedTrialCount'),
+          minWidth: 150,
+          sortable: 'custom',
+          showOverflowTooltip: true,
+        },
         {
           prop: 'LastLoginTime',
           label: this.$t('system:userlist:table:LastLoginTime'),

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

@@ -290,11 +290,8 @@ export default {
     handleEmailChange() {
       var reg =
         /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$/
-      if (localStorage.getItem('CompanyInfo')) {
-        let CompanyInfo = JSON.parse(localStorage.getItem('CompanyInfo'));
-        if (CompanyInfo.EmailRegexStr) {
-          reg = CompanyInfo.EmailRegexStr
-        }
+      if (this.$reg().EmailRegexStr) {
+        reg = new RegExp(this.$reg().EmailRegexStr)
       }
       if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
         this.sendDisabled = false

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/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/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/IVUS/QuestionList.vue

@@ -37,7 +37,7 @@
                       <div class="add-icon" @click.prevent="downloadTpl">
                         <i class="el-icon-download" />
                       </div>
-                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
+                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
                         <i class="el-icon-upload2" />
                       </div>
                       <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@@ -174,7 +174,7 @@
       <!-- 导入 -->
       <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
         :title="upload.title" width="500px">
-        <UploadExcel :visit-task-id="visitTaskId" @close="uploadDlgClose" />
+        <UploadExcel :visit-task-id="visitTaskId" :TableName="upload.TableName" @close="uploadDlgClose" />
       </el-dialog>
     </div>
   </div>
@@ -233,7 +233,7 @@ export default {
       formChanged: false,
       digitPlaces: 2,
       addOrEdit: { visible: false, title: '' },
-      upload: { visible: false, title: '' },
+      upload: { visible: false, title: '', TableName: '' },
       qsList: [],
       answersList: [],
       qsForm: {},
@@ -668,7 +668,8 @@ export default {
         console.log(e)
       }
     },
-    uploadTpl(lesionType) {
+    uploadTpl(lesionType, TableName) {
+      this.upload.TableName = TableName
       this.upload.title = `导入（ ${this.$fd('LesionType', lesionType)} ）`
       this.upload.visible = true
     },

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

@@ -33,12 +33,16 @@
   </el-form>
 </template>
 <script>
-import { uploadIVUSTemplate } from '@/api/reading'
+import { readingImport } from '@/api/reading'
 export default {
   props: {
     visitTaskId: {
       type: String,
       required: true
+    },
+    TableName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -63,7 +67,9 @@ export default {
         var data = new FormData()
         data.append('file', param.file)
         data.append('visitTaskId', this.visitTaskId)
-        await uploadIVUSTemplate(data)
+        data.append('readingImportType', 0)
+        data.append('TableName', this.TableName)
+        await readingImport(data)
         this.$emit('close')
         this.$message.success('导入成功！')
         loading.close()

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/OCT/QuestionList.vue

@@ -37,7 +37,7 @@
                       <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)">
                         <i class="el-icon-download" />
                       </div>
-                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType)">
+                      <div class="add-icon" style="margin: 0 5px;" @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
                         <i class="el-icon-upload2" />
                       </div>
                       <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
@@ -169,7 +169,7 @@
       <!-- 导入 -->
       <el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
         :title="upload.title" width="500px">
-        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" @close="uploadDlgClose" />
+        <UploadExcel :visit-task-id="visitTaskId" :lesion-type="upload.lesionType" :TableName="upload.TableName" @close="uploadDlgClose" />
       </el-dialog>
     </div>
   </div>
@@ -228,7 +228,7 @@ export default {
       formChanged: false,
       digitPlaces: 2,
       addOrEdit: { visible: false, title: '', lesionType: null },
-      upload: { visible: false, title: '', lesionType: null },
+      upload: { visible: false, title: '', lesionType: null, TableName: '', },
       qsList: [],
       answersList: [],
       qsForm: {},
@@ -669,8 +669,9 @@ export default {
         console.log(e)
       }
     },
-    uploadTpl(lesionType) {
+    uploadTpl(lesionType, TableName) {
       this.upload.lesionType = lesionType
+      this.upload.TableName = TableName
       this.upload.title = `导入（ ${this.$fd('LesionType', lesionType)} ）`
       this.upload.visible = true
     },

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

@@ -33,7 +33,7 @@
   </el-form>
 </template>
 <script>
-import { uploadOCTFCTTemplate, uploadOCTLipidAngleTemplate } from '@/api/reading'
+import { readingImport } from '@/api/reading'
 export default {
   props: {
     visitTaskId: {
@@ -43,6 +43,10 @@ export default {
     lesionType: {
       type: Number,
       required: true
+    },
+    TableName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -67,10 +71,13 @@ export default {
         var data = new FormData()
         data.append('file', param.file)
         data.append('visitTaskId', this.visitTaskId)
+        data.append('TableName', this.TableName)
         if (this.lesionType === 112) {
-          await uploadOCTFCTTemplate(data)
+          data.append('readingImportType', 1)
+          await readingImport(data)
         } else {
-          await uploadOCTLipidAngleTemplate(data)
+          data.append('readingImportType', 2)
+          await readingImport(data)
         }
         this.$emit('close')
         this.$message.success('导入成功！')

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/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

@@ -353,7 +353,7 @@ export default {
     validatorNumberInput(rule, value, callback) {
       let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
       if (value === '') {
-        callback(new Error(this.$t('common:ruleMessage:specify')));
+        callback();
       } else {
         if (!reg.test(value)) {
           callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));

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

@@ -261,7 +261,7 @@ export default {
     validatorNumberInput(rule, value, callback) {
       let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
       if (value === '') {
-        callback(new Error(this.$t('common:ruleMessage:specify')));
+        callback();
       } else {
         if (!reg.test(value)) {
           callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
@@ -483,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))

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

@@ -407,7 +407,8 @@ export default {
           // this.$set(v, 'xfIndex', i)
         }
         if (v.Type === 'number') {
-          this.$set(this.questionForm, v.QuestionId, v.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : v.Answers[this.visitTaskId])
+          // this.$set(this.questionForm, v.QuestionId, v.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : v.Answers[this.visitTaskId])
+          this.$set(this.questionForm, v.QuestionId,  v.Answers[this.visitTaskId])
         }
         if (v.Childrens.length > 0) {
           this.setChild(v.Childrens)
@@ -425,7 +426,8 @@ export default {
           this.$set(this.questionForm, i.QuestionId, tableAnswers)
         }
         if (i.Type === 'number') {
-          this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : i.Answers[this.visitTaskId])
+          // this.$set(this.questionForm, i.QuestionId, i.Answers[this.visitTaskId] === '' ? parseFloat(0).toFixed(this.digitPlaces) : i.Answers[this.visitTaskId])
+          this.$set(this.questionForm, i.QuestionId,  i.Answers[this.visitTaskId])
         }
         if (i.Childrens && i.Childrens.length > 0 && i.Type !== 'table' && i.Type !== 'basicTable') {
           this.setChild(i.Childrens)

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

@@ -346,6 +346,7 @@ export default {
         localStorage.setItem('digitPlaces', res.Result.DigitPlaces)
         localStorage.setItem('IsExistUnprocessedFeedback', res.Result.IsExistUnprocessedFeedback)
         localStorage.setItem('taskInfo', JSON.stringify(res.Result))
+        sessionStorage.setItem('taskInfo', JSON.stringify(res.Result))
         this.readingCategory = res.Result.ReadingCategory
         this.readingVersionEnum = res.Result.ReadingVersionEnum
         this.questionFormChangeState = false

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

@@ -190,7 +190,7 @@ export default {
     }
   },
   mounted() {
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.$nextTick(() => {

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

@@ -280,11 +280,11 @@
             >
               <svg-icon icon-class="refresh" class="svg-icon" />
             </div>
-            <!-- 更多 -->
+            <!-- 更多 :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']" -->
             <div
               v-if="criterionType === 0"
               :title="$t('trials:reading:button:more')"
-              :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']"
+              :class="['tool-item']"
               @click.stop="showPanel($event)"
               @mouseleave="toolMouseout"
             >
@@ -297,7 +297,8 @@
                   <i class="el-icon-arrow-down" style="color:#fff;" />
                 </div>
                 <div class="dropdown-content">
-                  <ul v-if="readingTaskState < 2" style="width:100px;">
+                  <!--v-if="readingTaskState < 2"-->
+                  <ul  style="width:100px;">
                     <li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;">
                       <a href="#" @click.prevent="setMoreToolActive(i.toolName)">
                         <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
@@ -786,7 +787,7 @@ export default {
       // resetAnnotation: false , // 是否初始化标记 （融合时使用）
       saveCustomAnnotationTimer: null,
 
-         // 上传
+      // 上传
       downloadImageVisible: false,
       uploadImageVisible: false,
       uploadSubjectId: null,
@@ -873,7 +874,7 @@ export default {
     }
   },
   mounted() {
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     this.isReadingTaskViewInOrder = this.taskInfo.IsReadingTaskViewInOrder
     this.criterionType = this.taskInfo.CriterionType
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
@@ -882,6 +883,7 @@ export default {
       this.tools = getCustomizeStandardsTools(this.taskInfo.ReadingToolList)
       const toolNames = this.tools.map(i => i.toolName)
       this.customizeStandards = config.customizeStandards.filter(item => !toolNames.includes(item.toolName))
+      console.log(this.customizeStandards,'this.customizeStandards')
     } else {
       this.tools = getTools(this.criterionType)
     }
@@ -1363,10 +1365,12 @@ export default {
       const isCriticalSequence = this.visitTaskList[taskIndex].StudyList[studyIndex].IsCriticalSequence
       const keyImages = this.visitTaskList[taskIndex].KeyImages
       const series = this.visitTaskList[taskIndex].StudyList[studyIndex].SeriesList[seriesIndex]
-      let file = series.find(item => item.ImageId === imageId)
-      if (file) {
-        getNetWorkSpeed()
-        setNetWorkSpeedSizeAll(percentComplete, detail.total, imageId)
+      if (series && series.length > 0) {
+        let file = series.find(item => item.ImageId === imageId)
+        if (file) {
+          getNetWorkSpeed()
+          setNetWorkSpeedSizeAll(percentComplete, detail.total, imageId)
+        }
       }
       if (percentComplete === 100) {
         workSpeedclose()
@@ -1508,14 +1512,32 @@ export default {
       this.setToolsPassive()
     },
     annotationRemovedListener(e) {
-      if (this.readingTaskState === 2) return
       const { annotation } = e.detail
-      if (!annotation) return
-      if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) {
-        const index = this.markedSeriesIds.indexOf(annotation.seriesId)
-        if (index !== -1) {
-          this.markedSeriesIds.splice(index, 1)
+      try{
+        if (!annotation) return
+        if (this. readingTaskState === 2 && !annotation.data.label) return false
+        if (this.readingTaskState === 2) {
+          const errorMsg = { message: 'annotation Not allowed to operate' }
+          throw errorMsg
         }
+        if (annotation.visitTaskId === this.taskInfo.VisitTaskId && annotation.seriesId) {
+          const index = this.markedSeriesIds.indexOf(annotation.seriesId)
+          if (index !== -1) {
+            this.markedSeriesIds.splice(index, 1)
+          }
+        } else {
+          const errorMsg = { message: 'annotation Not allowed to operate' }
+          throw errorMsg
+        }
+      } catch (e) {
+        cornerstoneTools.annotation.state.addAnnotation(annotation)
+        const renderingEngine = getRenderingEngine(renderingEngineId)
+        for (let i = 0; i < this.cells.length; i++) {
+          const viewportId = `${this.viewportKey}-${i}`
+          const viewport = renderingEngine.getViewport(viewportId)
+          viewport.render()
+        }
+        console.log(e)
       }
     },
     async customAnnotationCompletedListener(e) {
@@ -1557,6 +1579,10 @@ export default {
             }
             this.saveCustomAnnotationTimer = setTimeout(()=>{this.saveCustomAnnotation(annotation)},500)
           }
+        } else {
+          // if (this.isNumber(operateStateEnum)) {
+          //   this.removeAnnotation(annotation)
+          // }  
         }
       }
 
@@ -1631,6 +1657,7 @@ export default {
       try {
         // if ( this.resetAnnotation && this.isFusion ) return false
         if (!annotation) return false
+        if (this.readingTaskState === 2 && !annotation.data.label) return false
         if (this.readingTaskState === 2) {
           const errorMsg = { message: 'annotation Not allowed to operate' }
           throw errorMsg
@@ -1659,10 +1686,10 @@ export default {
             )
             if (annotation.markId) {
             let res = await deleteCustomTag(annotation.markId)
-            if (!res.IsSuccess) return false
+            if (!res.IsSuccess) throw ''
             }else if (annotation.id) {
             let res = await deleteCustomTag(annotation.id)
-            if (!res.IsSuccess) return false
+            if (!res.IsSuccess) throw ''
             }
           }
           const index = this.markedSeriesIds.indexOf(annotation.seriesId)
@@ -2034,7 +2061,7 @@ export default {
     },
     // 激活标注工具
     setAnnotateToolActive(toolName) {
-      if (this.readingTaskState === 2) return
+      // if (this.readingTaskState === 2) return
       const toolObj = this.tools.find(i => i.toolName === toolName)
       if (!toolObj || toolObj.isDisabled) return
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
@@ -2087,7 +2114,7 @@ export default {
       }
     },
     setMoreToolActive(toolName) {
-      if (this.readingTaskState === 2) return
+      // if (this.readingTaskState === 2) return
       this.setToolsPassive()
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       if (series && series.TaskInfo.VisitTaskId && series.TaskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
@@ -2124,7 +2151,10 @@ export default {
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       const isCurrentTask = series.TaskInfo.IsCurrentTask
       const readingTaskState = this.readingTaskState
-      if (!isCurrentTask || readingTaskState >= 2) {
+      if (isCurrentTask && readingTaskState >= 2) {
+        this.tools[i].isDisabled = false
+        e.target.style.cursor = 'pointer'
+      } else if (!isCurrentTask || readingTaskState >= 2) {
         this.tools[i].isDisabled = true
         e.target.style.cursor = 'not-allowed'
         if (this.activeTool) {
@@ -2941,11 +2971,22 @@ export default {
       try {
         const that = this
         // 请输入标记名称
-        const { value } = await this.$prompt(this.$t('trials:noneDicom:message:msg1'), '', {
+        let message = this.$t('trials:noneDicom:message:msg1')
+        // if (isShowCancelButton) {
+        //   message = `<div><p>${this.$t('trials:noneDicom:message:msg1')}</p><p style='font-size:12px' class='customPromptTip'>${this.$t('trials:noneDicom:message:saveTip')}</p></div>`
+        // }
+        const { value } = await this.$prompt( message, '', {
           showClose: false,
           cancelButtonText: isShowCancelButton ? this.$t('trials:reading:button:temporarySave') : this.$t('common:button:cancel'),
           confirmButtonText: isShowCancelButton ? this.$t('trials:reading:button:enduringSave') : this.$t('trials:reading:button:relevancy'),
           // showCancelButton: isShowCancelButton,
+          // dangerouslyUseHTMLString: isShowCancelButton,
+          inputValidator: (res) => {
+            if (!res) {
+              return isShowCancelButton ? this.$t('trials:noneDicom:message:saveTip') : this.$t('trials:noneDicom:message:saveTipByRelevancy')
+            } 
+          },
+          inputErrorMessage: this.$t('trials:noneDicom:message:saveTip'),
           showCancelButton: true,
           closeOnClickModal: false,
           closeOnPressEscape: false,
@@ -2965,7 +3006,8 @@ export default {
           }
         })
         return value
-      } catch {
+      } catch(err) {
+        console.log(err)
         return null
       }
     },
@@ -3204,9 +3246,9 @@ export default {
       try {
         file = this.convertBase64ToBlob(file)
         const trialId = this.$route.query.trialId
-        const taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+        const taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
         const subjectId = 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/Recist/QuestionList.vue

@@ -235,7 +235,7 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.visitTaskId = this.visitInfo.VisitTaskId
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     this.isBaseLineTask = this.taskInfo.IsBaseLine
     this.criterionType = this.taskInfo.CriterionType
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
@@ -1325,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)

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

@@ -327,7 +327,7 @@ export default {
   },
   created() { this.getTableHeight() },
   mounted() {
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     this.criterionType = this.taskInfo.CriterionType
     this.visitTaskId = this.taskInfo.VisitTaskId
     this.isBaselineTask = this.taskInfo.IsBaseLine
@@ -367,7 +367,7 @@ export default {
     getTableHeight() {
       this.height = window.innerHeight - 170
     },
-    async getReportInfo(IsCalculate) {
+    async getReportInfo(IsCalculate = true) {
       this.loading = true
       try {
         var params = {

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

@@ -153,7 +153,7 @@ export default {
     }
   },
   mounted() {
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.studyList = this.visitTaskInfo.StudyList

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

@@ -174,7 +174,7 @@ export default {
     }
   },
   mounted() {
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.$nextTick(() => {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="visit-review-container">
-    <el-tabs v-model="activeName">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
       <!-- 阅片 -->
       <el-tab-pane v-if="taskInfo" :label="$t('trials:reading:tabTitle:review')" name="read">
         <read-page ref="readPage" :reading-tool="readingTool" />
@@ -12,11 +12,13 @@
         name="report"
       >
         <report-page
-          v-if="activeName === 'report' && taskInfo.CriterionType !== 0"
+          v-if="taskInfo.CriterionType !== 0"
+          ref="reportPage"
           @setReadingTaskState="setReadingTaskState"
         />
         <customize-report-page
-          v-if="activeName === 'report' && taskInfo.CriterionType === 0"
+          v-if="taskInfo.CriterionType === 0"
+          ref="reportPage"
           @setReadingTaskState="setReadingTaskState"
         />
       </el-tab-pane>
@@ -47,12 +49,16 @@ export default {
     }
   },
   mounted() {
-    console.log(this.readingTool)
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
   },
   methods: {
     setReadingTaskState(state) {
       this.$refs['readPage'].setReadingTaskState(state)
+    },
+    handleClick(tab) {
+      if (tab.name === 'report') {
+        this.$refs['reportPage'].getReportInfo()
+      }
     }
   }
 }

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

@@ -166,7 +166,7 @@
               @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[question.Id] ? questionsMarkStatus[question.Id].OrderMarkName : ''"
+              :title="questionsMarkStatus[question.Id] ? questionsMarkStatus[question.Id].OrderMarkName : question.Remark"
               :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">
@@ -1255,15 +1255,22 @@ export default {
         text: 'Loading',
         spinner: 'el-icon-loading'
       })
-      var fileName = param.file.name
-      var index = fileName.lastIndexOf('.')
-      var suffix = fileName.substring(index + 1, url.length)
-      let file = await this.fileToBlob(param.file)
-      let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file)
-      this.fileList.push({ name: `${this.$t('trials:emailManageCfg:title:fileName')}${this.fileList.length + 1}(${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 })
-      this.$set(this.QuestionsForm, this.question.Id, this.urls.length > 0 ? this.urls.join('|') : '')
+      try {
+        var fileName = param.file.name
+        var index = fileName.lastIndexOf('.')
+        var suffix = fileName.substring(index + 1, fileName.length)
+        let 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(sessionStorage.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 })
+        this.$set(this.QuestionsForm, this.question.Id, this.urls.length > 0 ? this.urls.join('|') : '')
+      } catch (err) {
+        console.log(err)
+      }
       loading.close()
       // uploadReadingAnswerImage(this.$route.query.trialId, this.visitTaskId, formData).then(res => {
       //   if (res.IsSuccess) {

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

@@ -55,7 +55,7 @@
 
 <script>
 
-import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, getQuestionCalculateRelation, saveTaskQuestion } from '@/api/trials'
+import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, verifyVisitTaskQuestions, getQuestionCalculateRelation, saveTaskQuestion } from '@/api/trials'
 import { setSkipReadingCache, resetReadingTask, saveTableQuestionMark } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import QuestionFormItem from './QuestionFormItem'
@@ -114,7 +114,7 @@ export default {
     window.addEventListener('message', this.receiveMsg)
     this.trialId = this.$route.query.trialId
     this.visitTaskId = this.visitInfo.VisitTaskId
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     this.isBaseLineTask = this.taskInfo.IsBaseLine
     this.criterionId = this.taskInfo.TrialReadingCriterionId
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
@@ -242,6 +242,8 @@ export default {
     async handleSubmit() {
       const valid = await this.$refs['questions'].validate()
       if (!valid) return
+      await this.handleSave(false)
+      await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
       const { ImageAssessmentReportConfirmation } = const_.processSignature
       this.signCode = ImageAssessmentReportConfirmation
       this.signVisible = true
@@ -616,7 +618,7 @@ export default {
         this.$set(this.questionsMarkStatus, obj.question.Id, {
           isMarked: !!this.questionMarkInfoList[index]?.MeasureData,
           isSaved: true,
-          OrderMarkName:index > -1 ? this.questionMarkInfoList[index].OrderMarkName : ''
+          OrderMarkName: index > -1 ? this.questionMarkInfoList[index].OrderMarkName : ''
         })
         this.resetOperateState()
         if (annotation) {
@@ -990,7 +992,7 @@ export default {
         const trialId = this.$route.query.trialId
         const taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
         const subjectId = taskInfo.SubjectId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        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/customize/QuestionTableFormItem.vue

@@ -85,7 +85,7 @@
             @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 : ''"
+            :title="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] ? questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].OrderMarkName : question.Remark"
             :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">
@@ -308,7 +308,7 @@ export default {
     validatorNumberInput(rule, value, callback) {
       let reg = new RegExp(/^(?:-?(?:(?:0|[1-9]\d*)(?:\.\d+)?|\.\d+)|NE)$/, 'g')
       if (value === '') {
-        callback(new Error(this.$t('common:ruleMessage:specify')));
+        callback();
       } else {
         if (!reg.test(value)) {
           callback(new Error(this.$t('trials:reading:ruleMessage:validatorNumberInput')));
@@ -344,6 +344,7 @@ export default {
       } else {
         this.$emit('setFormItemData', { key: question.Id, val: v, question: question })
       }
+      this.$emit('formItemTableNumberChange', v, question)
     },
     handleBlur(value, a, b) {
       if (!value) return false
@@ -561,7 +562,10 @@ export default {
       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)
+      // let res = await this.OSSclient.put(`/${this.$route.query.trialId}/Customize/${this.visitTaskId}/${fileName}`, file)
+      const taskInfo = JSON.parse(sessionStorage.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 })

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

@@ -275,7 +275,7 @@ export default {
     }
   },
   async mounted() {
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     this.trialId = this.$route.query.trialId
     this.visitTaskId = this.taskInfo.VisitTaskId
     this.subjectId = this.taskInfo.SubjectId

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

@@ -263,7 +263,7 @@ export default {
     }
   },
   mounted() {
-    let digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    let digitPlaces = Number(sessionStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
   },
   methods: {

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

@@ -276,7 +276,7 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.visitTaskId = this.visitInfo.VisitTaskId
-    this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     this.isBaseLineTask = this.taskInfo.IsBaseLine
     this.criterionType = this.taskInfo.CriterionType
     const digitPlaces = Number(localStorage.getItem('digitPlaces'))
@@ -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

@@ -292,7 +292,16 @@ const config = {
       'i18nKey': 'trials:reading:button:CobbAngle',
       'isDisabled': false,
       'disabledReason': ''
-    }
+    },
+    {
+      'name': '自由曲线',
+      'icon': 'polygon',
+      'toolName': 'PlanarFreehandROI',
+      'props': ['radius', 'area', 'mean', 'max', 'stdDev'],
+      'i18nKey': 'trials:reading:button:planarFreehandROI',
+      'isDisabled': false,
+      'disabledReason': ''
+    },
   ],
   'customizeStandardsNoneDicom': [
     {

src/views/trials/trials-panel/reading/dicoms3D/index.vue

@@ -70,6 +70,7 @@ export default {
         }
         const res = await getNextTask(params)
         this.taskInfo = res.Result
+        sessionStorage.setItem('taskInfo', JSON.stringify(res.Result))
         localStorage.setItem('taskInfo', JSON.stringify(res.Result))
         localStorage.setItem('digitPlaces', JSON.stringify(res.Result.DigitPlaces))
         this.loading = false

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/ECRF.vue

@@ -285,6 +285,7 @@ export default {
     async handleSubmit() {
       const valid = await this.$refs['questions'].validate()
       if (!valid) return
+      await this.handleSave()
       const { ImageAssessmentReportConfirmation } = const_.processSignature
       this.signCode = ImageAssessmentReportConfirmation
       this.signVisible = true

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

@@ -93,6 +93,7 @@ export default {
         const res = await getNextTask(params)
         this.taskInfo = res.Result
         localStorage.setItem('taskInfo', JSON.stringify(res.Result))
+        sessionStorage.setItem('taskInfo', JSON.stringify(res.Result))
         localStorage.setItem('digitPlaces', JSON.stringify(res.Result.DigitPlaces))
         this.loading = false
         this.$nextTick(() => {

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

@@ -130,18 +130,9 @@
         <el-table-column prop="OriginalReReadingTask.SubjectCode" :label="$t('trials:rereadTrack:table:subjectCode')"
           min-width="120" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span v-if="
-              scope.row.OriginalReReadingTask.MedicalNo &&
-              scope.row.OriginalReReadingTask.MedicalNo !==
-              scope.row.OriginalReReadingTask.SubjectCode
-            ">
-              {{
-                `${scope.row.OriginalReReadingTask.SubjectCode}/${scope.row.OriginalReReadingTask.MedicalNo}`
-              }}
+            <span>
+              {{ getSubjectCode(scope.row.OriginalReReadingTask) }}
             </span>
-            <span v-else>{{
-              scope.row.OriginalReReadingTask.SubjectCode
-            }}</span>
           </template>
         </el-table-column>
         <!-- 任务名称 -->
@@ -385,7 +376,8 @@
               </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 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 />
@@ -873,6 +865,16 @@ export default {
     this.getTrialCriterionList()
   },
   methods: {
+    getSubjectCode(obj) {
+      let str = obj.SubjectCode
+      if (obj.MedicalNo && obj.MedicalNo !== obj.SubjectCode) {
+        str += `/${obj.MedicalNo}`
+      }
+      if (obj.BlindSubjectCode && obj.BlindSubjectCode !== obj.SubjectCode) {
+        str += `/${obj.BlindSubjectCode}`
+      }
+      return str
+    },
     async auditImageBack() {
       try {
         console.log(this.form)

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 && exportInfo.CriterionType !== 0)"
+            :disabled="scope.row.HasChildren || (scope.row.IsTableQuestion && exportInfo.CriterionType !== 0 && exportInfo.CriterionGroup !== 0)"
             v-show="!scope.row.IsGroup || !scope.row.HasChildren"
           >
           </el-input>
@@ -152,7 +152,7 @@ export default {
       } else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
         // 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
         return true
-      } else if (item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0))) {
+      } else if ( item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0 && this.exportInfo.CriterionGroup !== 0) )) {
         // else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion))
         // CDISC导出不能配置表格问题
         return true

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -340,7 +340,7 @@
         <el-table-column fixed="right" :label="$t('common:action:action')" width="220">
           <template slot-scope="scope">
             <!-- 查看阅片结果 -->
-            <el-button :disabled="scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit" icon="el-icon-view"
+            <el-button :disabled="scope.row.ReadingTaskState !== 2" icon="el-icon-view"
               circle :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
             <!-- 申请重阅 -->
             <el-button :disabled="scope.row.ReadingCategory !== 1 ||

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))

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

@@ -43,7 +43,7 @@
 
 <script>
 
-import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, getQuestionCalculateRelation } from '@/api/trials'
+import { getCustomTableQuestionAnswer, changeDicomReadingQuestionAnswer, submitVisitTaskQuestionsInDto, getQuestionCalculateRelation, verifyVisitTaskQuestions } from '@/api/trials'
 import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
 import store from '@/store'
@@ -215,6 +215,8 @@ export default {
     async handleSubmit() {
       const valid = await this.$refs['questions'].validate()
       if (!valid) return
+      await this.handleSave(false)
+      await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
       const { ImageAssessmentReportConfirmation } = const_.processSignature
       this.signCode = ImageAssessmentReportConfirmation
       this.signVisible = true

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

@@ -45,9 +45,8 @@
         >
           <svg-icon icon-class="polygon" class="svg-icon" />
         </div> -->
-
-        <div
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === 'Eraser' ? 'tool-item-active' : '']"
+        <!--readingTaskState === 2 ? 'tool-disabled' : '',-->
+        <div :class="['tool-item', activeTool === 'Eraser' ? 'tool-item-active' : '']"
           :title="$t('trials:dicom-show:Eraser')" @click.prevent="setAnnotateToolActive('Eraser')">
           <svg-icon icon-class="clear" class="svg-icon" />
         </div>
@@ -69,17 +68,17 @@
         <div class="tool-item" :title="$t('trials:reading:button:reset')" @click.prevent="resetViewport">
           <svg-icon icon-class="refresh" class="svg-icon" />
         </div>
-        <!-- 更多 -->
-        <div v-if="criterionType === 0" :title="$t('trials:reading:button:more')"
-          :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']" @click.stop="showPanel($event)"
-          @mouseleave="toolMouseout">
+        <!-- 更多:class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']" -->
+        <div v-if="criterionType === 0" :title="$t('trials:reading:button:more')" :class="['tool-item']"
+          @click.stop="showPanel($event)" @mouseleave="toolMouseout">
           <div class="dropdown">
             <div class="icon" data-tool="more">
               <svg-icon icon-class="more" class="svg-icon" />
               <i class="el-icon-arrow-down" style="color:#fff;" />
             </div>
             <div class="dropdown-content">
-              <ul v-if="readingTaskState < 2" style="width:100px;">
+              <!--v-if="readingTaskState < 2"-->
+              <ul  style="width:100px;">
                 <li v-for="i in customizeStandardsNoneDicom" :key="i.toolName" style="text-align:left;">
                   <a href="#" @click.prevent="setAnnotateToolActive(i.toolName)">
                     <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
@@ -90,6 +89,29 @@
             </div>
           </div>
         </div>
+        <div class="tool-item" :title="$t('trials:reading:button:upload')"
+          v-if="trialCriterion.ImageUploadEnum > 0 && readingTaskState < 2" v-hasPermi="['role:ir']">
+          <div class="tool-wrapper">
+            <div class="icon" @click.prevent="openUploadImage('upload')">
+              <i class="el-icon-upload2 svg-icon" />
+            </div>
+          </div>
+        </div>
+        <div v-if="trialCriterion.ImageDownloadEnum > 0" v-hasPermi="[
+          'role:ir',
+          'role:mim',
+          'role:mc',
+          'role:pm',
+          'role:apm',
+          'role:ea',
+          'role:qa',
+        ]" class="tool-item" :title="$t('trials:reading:button:download')">
+          <div class="tool-wrapper">
+            <div class="icon" @click.prevent="openUploadImage('download')">
+              <i class="el-icon-download svg-icon" />
+            </div>
+          </div>
+        </div>
       </div>
 
       <div>
@@ -202,10 +224,16 @@
       :close-on-click-modal="false" :title="personalConfigDialog.title" width="600px">
       <Others />
     </el-dialog>
+    <upload-dicom-and-nonedicom v-if="uploadImageVisible" :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
+      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" />
+    <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
+      :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
+      :visible.sync="downloadImageVisible" />
   </div>
 </template>
 <script>
-import { addNoneDicomMark, deleteTrialFileType } from '@/api/trials'
+import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo } from '@/api/trials'
 import {
   RenderingEngine,
   Enums,
@@ -228,6 +256,8 @@ const { ViewportType } = Enums
 const renderingEngineId = 'myRenderingEngine'
 import LengthscaleTool from "../tools/LengthscaleTool"
 import { getCustomizeStandardsNoneDicomTools, config } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig'
+import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
+import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 const {
   ToolGroupManager,
   Enums: csToolsEnums,
@@ -249,7 +279,11 @@ const {
 const { MouseBindings, Events: toolsEvents } = csToolsEnums
 export default {
   name: 'ImageViewer',
-  components: { Others },
+  components: {
+    Others,
+    downloadDicomAndNonedicom,
+    uploadDicomAndNonedicom,
+  },
   props: {
     relatedStudyInfo: {
       type: Object,
@@ -296,7 +330,19 @@ export default {
 
       customizeStandardsNoneDicom: [],
       tools: [],
-      criterionType: null
+      criterionType: null,
+
+
+      // 上传
+      downloadImageVisible: false,
+      uploadImageVisible: false,
+      uploadSubjectId: null,
+      uploadSubjectCode: null,
+      uploadTrialCriterion: {},
+      uploadStatus: 'upload',
+      taskId: '',
+      isReadingTaskViewInOrder: null,
+      trialCriterion: {}
     }
   },
   computed: {
@@ -347,7 +393,6 @@ export default {
   },
   mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
-    console.log(this.taskInfo, 'this.taskInfo')
     this.readingTaskState = this.taskInfo.ReadingTaskState
     this.criterionType = this.taskInfo.CriterionType
     if (this.criterionType === 0) {
@@ -381,11 +426,30 @@ export default {
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.initLoader()
     window.addEventListener('message', this.handleIframeMessage)
+    this.getTrialCriterion()
   },
   beforeDestroy() {
     window.removeEventListener('message', this.handleIframeMessage)
   },
   methods: {
+    getTrialCriterion() {
+      getCriterionReadingInfo({
+        TrialId: this.$route.query.trialId,
+        TrialReadingCriterionId: this.$route.query.TrialReadingCriterionId
+      })
+        .then((res) => {
+          this.trialCriterion = res.Result
+        })
+        .catch(() => { })
+    },
+    openUploadImage(status) {
+      this.taskId = this.taskInfo.VisitTaskId
+      this.uploadSubjectCode = localStorage.getItem("subjectCode")
+      this.uploadSubjectId = localStorage.getItem("subjectId")
+      this.uploadTrialCriterion = this.trialCriterion
+      this.uploadStatus = status
+      this[`${status}ImageVisible`] = true
+    },
     showPanel(e) {
       e.currentTarget.firstChild.lastChild.style.display = 'block'
     },
@@ -789,7 +853,8 @@ export default {
     },
     // 激活标注工具
     setAnnotateToolActive(toolName) {
-      if (this.readingTaskState === 2) return
+      // if (this.readingTaskState === 2) return
+      if (this.readingTaskState === 2 && toolName === 'Lengthscale') return
       const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
       if (i === -1) return
       if (this.viewportInfos[i].taskInfo.VisitTaskId === this.taskInfo.VisitTaskId) {
@@ -856,25 +921,41 @@ export default {
       )
     },
     async annotationRemovedListener(e) {
-      if (this.readingTaskState === 2) return
       const { annotation } = e.detail
-      if (!annotation) return
-      if (annotation.annotationId) {
-        await deleteTrialFileType(annotation.annotationId)
-      } else {
-        cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
-      }
-      const renderingEngine = getRenderingEngine(renderingEngineId)
-      const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
-      viewport.render()
-      const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
-      const imageId = annotation.metadata.referencedImageId
-      const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
-      const fileList = this.viewportInfos[i].fileList
-      const fileIndex = fileList.findIndex(f => f.Path === path)
-      if (annotation.metadata.toolName === 'Lengthscale') {
-        this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: null })
+      try {
+        if (!annotation) return
+        if (this.readingTaskState === 2 && !annotation.annotationId) {
+          cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
+          return false
+        }
+        if (this.readingTaskState === 2) {
+          const errorMsg = { message: 'annotation Not allowed to operate' }
+          throw errorMsg
+        }
+        if (annotation.annotationId) {
+          await deleteTrialFileType(annotation.annotationId)
+        } else {
+          cornerstoneTools.annotation.state.removeAnnotation(annotation.annotationUID)
+        }
+        const renderingEngine = getRenderingEngine(renderingEngineId)
+        const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
+        viewport.render()
+        const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
+        const imageId = annotation.metadata.referencedImageId
+        const path = imageId.split(`web:${this.OSSclientConfig.basePath}`)[1]
+        const fileList = this.viewportInfos[i].fileList
+        const fileIndex = fileList.findIndex(f => f.Path === path)
+        if (annotation.metadata.toolName === 'Lengthscale') {
+          this.$emit('setPS', { NoneDicomFileId: fileList[fileIndex].Id, Path: fileList[fileIndex].Path, PS: null })
+        }
+      } catch (e) {
+        cornerstoneTools.annotation.state.addAnnotation(annotation)
+        const renderingEngine = getRenderingEngine(renderingEngineId)
+        const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
+        viewport.render()
+        console.log(e)
       }
+
     },
     async annotationModifiedListener(e) {
       console.log('Modified')

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

@@ -12,7 +12,7 @@
       <!-- 文件 -->
       <el-form-item :label="$t('trials:attachment:form:file')">
         <div class="upload-container">
-          <el-upload class="upload-demo" action accept=".pdf,.mp4" :before-upload="beforeUpload"
+          <el-upload class="upload-demo" action accept=".pdf" :before-upload="beforeUpload"
             :http-request="handleUploadFile" :on-remove="handleRemoveFile" :show-file-list="true" :file-list="fileList"
             :limit="1" :on-exceed="handleExceed" :disabled="form.FileTypeId === ''">
             <el-button size="small" type="primary" :disabled="form.FileTypeId === '' || saveBtnLoading"
@@ -218,7 +218,7 @@ export default {
     },
     // 文件类型是否是pdf
     checkFileSuffix(fileName) {
-      var typeArr = ['pdf', 'mp4']
+      var typeArr = ['pdf']
       var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
       if (typeArr.indexOf(extendName) !== -1) {
         return true

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

@@ -93,9 +93,12 @@
       <el-col :span="24">
         <el-form-item :label="$t('trials:emailManageCfg:table:CriterionTypeEnum')"
           v-if="form.CriterionTypeList && form.CriterionTypeList.length > 0" prop="CriterionTypeList">
-          <el-select disabled v-model="form.CriterionTypeList" clearable class="mr" multiple>
-            <el-option v-for="item of $d.CriterionType" :key="`CriterionType${item.label}`" :label="item.label"
-              :value="item.value" />
+          <el-select v-model="form.CriterionTypeList" clearable class="mr" multiple>
+            <template v-for="item of $d.CriterionType">
+              <el-option :key="`CriterionType${item.label}`" :label="item.label" :value="item.value"
+                v-if="form.SysCriterionTypeList.includes(item.value)" />
+            </template>
+
           </el-select>
         </el-form-item>
       </el-col>
@@ -196,6 +199,7 @@ export default {
         IsAutoSend: true,
         CriterionTypeEnum: null,
         CriterionTypeList: [],
+        SysCriterionTypeList: [],
         FromEmail: '',
         FromName: '',
         AuthorizationCode: '',

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

@@ -11,9 +11,9 @@
         </el-form-item>
         <el-form-item v-if="isDistinguishCriteria" style="margin-bottom: 10px"
           :label="$t('trials:reviewTrack:table:criterionName')">
-          <el-select v-model="searchData.TrialReadingCriterionId" clearable style="width: 120px">
+          <el-select v-model="searchData.CriterionTypeEnum" clearable style="width: 120px">
             <el-option v-for="item of trialCriterionList"
-              :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.TrialReadingCriterionId"
+              :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.CriterionType"
               :label="item.TrialReadingCriterionName" />
           </el-select>
         </el-form-item>

src/views/trials/trials-panel/setting/email-manage/index.vue

@@ -143,6 +143,7 @@ export default {
           },]
       },
       NODE_ENV: process.env.NODE_ENV,
+      VUE_APP_OSS_PATH: process.env.VUE_APP_OSS_PATH,
     }
   },
   // watch: {
@@ -151,10 +152,20 @@ export default {
   //   }
   // },
   created() {
-    if(this.NODE_ENV === 'production'){
+    if(this.VUE_APP_OSS_PATH === '/uat/dist'){
+      this.form= {
+        EmailFromEmail: 'uat@extimaging.com',
+        EmailFromName: 'Uat IRC Imaging System',
+        EmailAuthorizationCode: 'SHzyyl2021',
+        EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
+        EmailSMTPServerPort: 465,
+        IsConfigureEmail: true
+      };
+    }
+    if(this.VUE_APP_OSS_PATH === '/test/dist'){
       this.form= {
         EmailFromEmail: 'test@extimaging.com',
-        EmailFromName: 'Test_IRC',
+        EmailFromName: 'Test IRC Imaging System',
         EmailAuthorizationCode: 'SHzyyl2021',
         EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
         EmailSMTPServerPort: 465,

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

@@ -114,6 +114,9 @@ export default {
         callback(new Error(this.$t('common:ruleMessage: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.Email && reg.test(this.form.Email)) {
           this.sendDisabled = false
           callback()

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -245,6 +245,10 @@
                       v-show="false" crossorigin="anonymous" alt="">
                   </viewer>
                   <div v-else-if="scope.row.DataType === 'Dialog'" v-html="scope.row.oldValue"></div>
+                  <el-button v-else-if="isFile(scope.row.oldValue)" type="text" size="small"
+                    @click.stop="download(scope.row.oldValue)">
+                    {{ $t('common:button:download') }}
+                  </el-button>
                   <span v-else>
                     {{ scope.row.oldValue }}
                   </span>
@@ -284,6 +288,10 @@
                     <!--                     <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
                   </viewer>
                   <div v-else-if="scope.row.DataType === 'Dialog'" v-html="scope.row.newValue"></div>
+                  <el-button v-else-if="isFile(scope.row.newValue)" type="text" size="small"
+                    @click.stop="download(scope.row.newValue)">
+                    {{ $t('common:button:download') }}
+                  </el-button>
                   <span v-else>{{ scope.row.newValue }}</span>
                 </span>
               </template>
@@ -630,6 +638,7 @@ import Pagination from '@/components/Pagination'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
 import { getToken } from '@/utils/auth'
+import { downLoadFile } from '@/utils/stream.js'
 const searchDataDefault = () => {
   return {
     SortField: 'CreateTime',
@@ -711,6 +720,22 @@ export default {
     this.getModuleTypeList()
   },
   methods: {
+    isFile(str) {
+      return str && Object.prototype.toString.call(str) === "[object String]" && !!~str.indexOf('❄❅❆❇❈❉❊')
+    },
+    async download(str) {
+      str = str.replace("❄❅❆❇❈❉❊", '')
+      let urls = str.split("|")
+      let name = `${Date.now()}.zip`, files = []
+      urls.forEach(url => {
+        let obj = {
+          url: this.OSSclientConfig.basePath + url,
+          name: url.split("/")[url.split("/").length - 1]
+        }
+        files.push(obj)
+      })
+      await downLoadFile(files, name, 'zip')
+    },
     openImage(url, type) {
       console.log(url)
 
@@ -866,7 +891,7 @@ export default {
         // 数组图片
         if (v.DataType === 'ArrayImage') {
           let objArr = [], upObjArr = []
-          if (obj[v.Code] && obj[v.Code].length > 0) {
+          if (obj && obj[v.Code] && obj[v.Code].length > 0) {
             obj[v.Code].forEach(item => {
               if (item[v.ChildDataValue]) {
                 objArr.push(item[v.ChildDataValue])
@@ -874,7 +899,7 @@ export default {
 
             })
           }
-          if (upObj[v.Code] && upObj[v.Code].length > 0) {
+          if (upObj && upObj[v.Code] && upObj[v.Code].length > 0) {
             upObj[v.Code].forEach(item => {
               if (item[v.ChildDataValue]) {
                 upObjArr.push(item[v.ChildDataValue])
@@ -1138,6 +1163,7 @@ export default {
           this.tableListData = body
           return
         }
+        console.log(v.IsShowParent, 'v.IsShowParent')
         if (v.IsShowParent === 1) {
           if (row.OptType === 'Delete') {
             item = {
@@ -1155,7 +1181,7 @@ export default {
             item = {
               // newValue: parentRow ? (parentRow[v.Code] ? parentRow[v.Code] : '--') : '--',
               newValue: parentRow ? ((parentRow[v.Code] && parentRow[v.Code] !== null && parentRow[v.Code] !== '' || parentRow[v.Code] === 0) ? parentRow[v.Code] : '--') : '--',
-              oldValue: parentRow ? ((parentRow[v.Code] && parentRow[v.Code] !== null && parentRow[v.Code] !== '' || parentRow[v.Code] === 0) ? parentRow[v.Code] : '--') : '--',
+              oldValue: parentRow ? ((parentRow[v.Code] && parentRow[v.Code] !== null && parentRow[v.Code] !== '' || parentRow[v.Code] === 0) && v.IsBeforeModifyView ? parentRow[v.Code] : '--') : '--',
               // oldValue: parentRow ? (parentRow[v.Code] ? parentRow[v.Code] : '--') : '--'
             }
           }
@@ -1174,7 +1200,7 @@ export default {
           } else {
             item = {
               newValue: obj ? ((obj[v.Code] && obj[v.Code] !== null && obj[v.Code] !== '' || obj[v.Code] === 0) ? obj[v.Code] : '--') : '--',
-              oldValue: upObj ? ((upObj[v.Code] && upObj[v.Code] !== null && upObj[v.Code] !== '' || upObj[v.Code] === 0) ? upObj[v.Code] : '--') : '--'
+              oldValue: upObj ? ((upObj[v.Code] && upObj[v.Code] !== null && upObj[v.Code] !== '' || upObj[v.Code] === 0) && v.IsBeforeModifyView ? upObj[v.Code] : '--') : '--'
             }
           }
         } else {
@@ -1191,7 +1217,7 @@ export default {
           } else {
             item = {
               newValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) ? row[v.Code] : '--') : '--',
-              oldValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) ? row[v.Code] : '--') : '--'
+              oldValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) && v.IsBeforeModifyView ? row[v.Code] : '--') : '--'
             }
           }
         }

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

@@ -33,6 +33,10 @@
                         v-if="hasPermi(['trials:trials-panel:trial-summary:image-summary:exportImage'])">
                         {{ $t('trials:imageSummary:button:export_dicom') }}
                     </el-button>
+                    <el-button type="primary" @click="handleExportImage(false, true)" :disabled="selectArr.length <= 0"
+                        v-if="hasPermi(['trials:trials-panel:trial-summary:image-summary:exportImage'])">
+                        {{ $t('trials:imageSummary:button:export_readingDicom') }}
+                    </el-button>
                     <el-button type="primary" @click="handleExportImage(true)" :disabled="selectArr.length <= 0"
                         v-if="hasPermi(['trials:trials-panel:trial-summary:image-summary:exportKeyImage'])">
                         {{ $t('trials:imageSummary:button:export_image') }}
@@ -66,10 +70,10 @@
                     <template slot-scope="scope">
                         <el-tag v-if="scope.row.IsHaveDicom" type="primary">{{
                             $fd('IsDicom', true)
-                            }}</el-tag>
+                        }}</el-tag>
                         <el-tag v-if="scope.row.IsHaveNoneDicom" type="primary">{{
                             $fd('IsDicom', false)
-                            }}</el-tag>
+                        }}</el-tag>
                     </template>
                 </el-table-column>
                 <!-- 影像数量 -->
@@ -79,6 +83,10 @@
                 <el-table-column prop="TotalImageSizeStr" min-width="120"
                     :label="$t('trials:imageSummary:table:TotalImageSizeStr')" show-overflow-tooltip
                     sortable="custom" />
+                <!-- 阅片影像大小 -->
+                <el-table-column prop="TotalReadingImageSizeStr" min-width="120"
+                    :label="$t('trials:imageSummary:table:TotalReadingImageSizeStr')" show-overflow-tooltip
+                    sortable="custom" />
                 <!-- 最早拍片日期 -->
                 <el-table-column prop="EarliestScanDate" min-width="120"
                     :label="$t('trials:imageSummary:table:EarliestScanDate')" show-overflow-tooltip sortable="custom" />
@@ -102,7 +110,9 @@
                 <span>{{ $t('trials:imageSummary:remark:SubjectImageAVGSizeStr') }}</span>
                 <span class="size">{{ image_size.SubjectImageAVGSizeStr }} </span>,
                 <span>{{ $t('trials:imageSummary:remark:SubjectVisitImageAVGSizeStr') }}</span>
-                <span class="size">{{ image_size.SubjectVisitImageAVGSizeStr }}</span>,
+                <span class="size">{{ image_size.SubjectVisitImageAVGSizeStr }}</span><span>{{ `; ` }}</span>
+                <span>{{ $t('trials:imageSummary:remark:TotalReadingImageSizeStr') }}</span>
+                <span class="size">{{ image_size.TotalReadingImageSizeStr }} </span><span>{{ `; ` }}</span>
                 <span>{{ $t('trials:imageSummary:remark:CheckImageSize') }}</span>
                 <span class="size">{{ image_size.CheckImageSize }} </span>
             </div>
@@ -144,6 +154,7 @@ export default {
                 TotalImageSizeStr: null,
                 SubjectImageAVGSizeStr: null,
                 SubjectVisitImageAVGSizeStr: null,
+                TotalReadingImageSizeStr: null,
                 CheckImageSize: null
             }
         }
@@ -179,11 +190,12 @@ export default {
             }
         },
         // 导出影像或关键图
-        async handleExportImage(IsKeyImage = false) {
+        async handleExportImage(IsKeyImage = false, IsExportReading = false) {
             try {
                 let data = {
                     TrialId: this.$route.query.trialId,
-                    IsKeyImage
+                    IsKeyImage,
+                    IsExportReading
                 }
                 data.SubjectVisitIdList = this.selectArr.map(item => item.SubjectVisitId)
                 if (!IsKeyImage) {
@@ -223,8 +235,9 @@ export default {
                                         serie.InstancePathList.forEach(instance => {
                                             let instanceArr = instance.Path.split("/")
                                             let fileName = instanceArr[instanceArr.length - 1]
+                                            let time = study.StudyTime.split(' ')[0]
                                             let obj = {
-                                                name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${study.StudyTime}_${serie.Modality}/${fileName}`,
+                                                name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${study.StudyCode}_${time}_${serie.Modality}/IMAGE/${fileName}`,
                                                 url: this.OSSclientConfig.basePath + instance.Path,
                                             }
                                             files.push(obj)
@@ -238,8 +251,9 @@ export default {
                         visit.NoneDicomStudyList.forEach(noneDicomStudy => {
                             if (noneDicomStudy.FileList && noneDicomStudy.FileList.length > 0) {
                                 noneDicomStudy.FileList.forEach(file => {
+                                    let time = noneDicomStudy.ImageDate.split(' ')[0]
                                     let obj = {
-                                        name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${noneDicomStudy.StudyCode}_${noneDicomStudy.ImageDate}_${noneDicomStudy.Modality}/${file.FileName}`,
+                                        name: `${visit.TrialSiteCode}/${visit.SubjectCode}/${visit.VisitName}/${noneDicomStudy.StudyCode}_${time}_${noneDicomStudy.Modality}/${file.FileName}`,
                                         url: this.OSSclientConfig.basePath + file.Path,
                                     }
                                     files.push(obj)
@@ -287,6 +301,7 @@ export default {
                     this.image_size.TotalImageSizeStr = res.Result.TotalImageSizeStr;
                     this.image_size.SubjectImageAVGSizeStr = res.Result.SubjectImageAVGSizeStr;
                     this.image_size.SubjectVisitImageAVGSizeStr = res.Result.SubjectVisitImageAVGSizeStr;
+                    this.image_size.TotalReadingImageSizeStr = res.Result.TotalReadingImageSizeStr;
                 }
             } catch (err) {
                 this.loading = false
@@ -307,7 +322,7 @@ export default {
         handleSelectionChange(selection) {
             this.selectArr = selection
             let num = this.selectArr.reduce((sum, item) => sum + item.TotalImageSize, 0)
-            if (num <= 0) return this.image_size.CheckImageSize = null
+            if (num <= 0) return this.image_size.CheckImageSize = `0MB`
             this.image_size.CheckImageSize = this.$FormatSize(num)
         },
         // 获取site下拉框数据

src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue

@@ -89,7 +89,7 @@
       <div class="function">
         <!-- 申请重传 -->
         <el-button
-          v-show="ReuploadEnum === 0 || ReuploadEnum === 3"
+          v-show="(ReuploadEnum === 0 || ReuploadEnum === 3) && data.SecondReviewState !== 1"
           v-hasPermi="['trials:trials-panel:visit:crc-upload:apply-reupload']"
           type="primary"
           @click="handleCRCApplyReupload"
@@ -98,7 +98,7 @@
         </el-button>
         <!-- 重传 -->
         <el-button
-          v-show="ReuploadEnum === 2"
+          v-show="ReuploadEnum === 2 && data.SecondReviewState !== 1"
           v-hasPermi="['trials:trials-panel:visit:crc-upload:reupload']"
           type="primary"
           :loading="uploadBtnLoading"

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

@@ -90,7 +90,7 @@
             <div class="function">
               <!-- 申请重传 -->
               <el-button
-                v-show="item.ReuploadEnum === 0 || item.ReuploadEnum === 3"
+                v-show="(item.ReuploadEnum === 0 || item.ReuploadEnum === 3) && item.SecondReviewState !== 1"
                 v-hasPermi="[
                   'trials:trials-panel:visit:crc-upload:apply-reupload',
                 ]"
@@ -102,7 +102,7 @@
               </el-button>
               <!-- 重传 -->
               <el-button
-                v-show="item.ReuploadEnum === 2"
+                v-show="item.ReuploadEnum === 2 && item.SecondReviewState !== 1"
                 v-hasPermi="['trials:trials-panel:visit:crc-upload:reupload']"
                 type="primary"
                 :loading="uploadBtnLoading"
@@ -398,6 +398,7 @@ export default {
               Content: item.Content,
               DeadlineTime: item.DeadlineTime,
               IsOverTime: item.IsOverTime,
+              SecondReviewState: item.SecondReviewState
             })
             this.list = Object.assign({}, list)
             this.loading = false

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

@@ -900,6 +900,8 @@ export default {
                 fileList: [],
                 dicomInfo: {
                   studyId: data.string('x00200010'),
+                  DicomStudyDate: data.string('x00080020'),
+                  DicomStudyTime: data.string('x00080030'),
                   studyUid: studyUid,
                   patientId: data.string('x00100020'),
                   patientName: patientNameStr,
@@ -1008,6 +1010,8 @@ export default {
               )
               seriesItem = {
                 seriesUid: seriesUid,
+                DicomSeriesDate: data.string('x00080021'),
+                DicomSeriesTime: data.string('x00080031'),
                 seriesNumber: data.intString('x00200011') || 1,
                 modality: data.string('x00080060') || '',
                 description: seriesDescriptionStr,
@@ -1047,6 +1051,10 @@ export default {
               }
               instanceItem = {
                 instanceUid: instanceUid,
+                SOPClassUID: data.string('x00080016'),
+                TransferSytaxUID: data.string('x00020010'),
+                MediaStorageSOPInstanceUID: instanceUid,
+                MediaStorageSOPClassUID: data.string('x00080016'),
                 instanceNumber: data.intString('x00200013') || 1,
                 frameCount: data.intString('x00280008') || 1,
                 instanceTime: instanceTime,
@@ -1405,6 +1413,8 @@ export default {
                   acquisitionNumber: dicomInfo.acquisitionNumber,
                   triggerTime: dicomInfo.triggerTime,
                   bodyPartExamined: '',
+                  DicomStudyDate: dicomInfo.DicomStudyDate,
+                  DicomStudyTime: dicomInfo.DicomStudyTime,
                   seriesList: [],
                 },
               }
@@ -1429,6 +1439,10 @@ export default {
                             instanceList.push({
                               studyInstanceUid: dicomInfo.studyUid,
                               seriesInstanceUid: v.seriesUid,
+                              SOPClassUID: o.SOPClassUID,
+                              TransferSytaxUID: o.TransferSytaxUID,
+                              MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+                              MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                               sopInstanceUid: o.instanceUid,
                               instanceNumber: o.instanceNumber,
                               instanceTime: o.instanceTime,
@@ -1514,6 +1528,10 @@ export default {
                               instanceList.push({
                                 studyInstanceUid: dicomInfo.studyUid,
                                 seriesInstanceUid: v.seriesUid,
+                                SOPClassUID: o.SOPClassUID,
+                                TransferSytaxUID: o.TransferSytaxUID,
+                                MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+                                MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                                 sopInstanceUid: o.instanceUid,
                                 instanceNumber: o.instanceNumber,
                                 instanceTime: o.instanceTime,
@@ -1560,6 +1578,8 @@ export default {
                   seriesInstanceUid: v.seriesUid,
                   seriesNumber: v.seriesNumber,
                   seriesTime: v.seriesTime,
+                  DicomSeriesDate: v.DicomSeriesDate,
+                  DicomSeriesTime: v.DicomSeriesTime,
                   sliceThickness: v.sliceThickness,
                   imagePositionPatient: v.imagePositionPatient,
                   imageOrientationPatient: v.imageOrientationPatient,
@@ -1579,7 +1599,7 @@ export default {
               }
               let text = JSON.stringify(Record)
               let logJsonBlob = scope.generateTxtFile(text)
-              let logJsonObjectName = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
+              let logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
               let logRes
               try {
                 logRes = await scope.OSSclient.put(

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

@@ -3,96 +3,47 @@
     <template slot="search-container">
       <el-form :inline="true">
         <!--患者信息-->
-        <el-form-item
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:search:patientInfo')
-          "
-          prop="TrialSiteKeyInfo"
-        >
-          <el-input
-            v-model="searchData.PatientInfo"
-            size="small"
-            clearable
-            style="width: 190px"
-            :placeholder="
-              $t('trials:visit:crcUpload:uploadDicomPacs:search:placeholder')
-            "
-          />
+        <el-form-item :label="$t('trials:visit:crcUpload:uploadDicomPacs:search:patientInfo')
+          " prop="TrialSiteKeyInfo">
+          <el-input v-model="searchData.PatientInfo" size="small" clearable style="width: 190px" :placeholder="$t('trials:visit:crcUpload:uploadDicomPacs:search:placeholder')
+            " />
         </el-form-item>
         <!--检查技术-->
-        <el-form-item
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:search:modalities')
-          "
-          prop="CalledAE"
-        >
+        <el-form-item :label="$t('trials:visit:crcUpload:uploadDicomPacs:search:modalities')
+          " prop="CalledAE">
           <el-select v-model="searchData.Modalities" clearable>
-            <el-option
-              v-for="item of DicomModalityList"
-              :key="item"
-              :label="item"
-              :value="item"
-            >
+            <el-option v-for="item of DicomModalityList" :key="item" :label="item" :value="item">
             </el-option>
           </el-select>
         </el-form-item>
         <!--检查日期-->
-        <el-form-item
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:search:studyTime')"
-        >
-          <el-date-picker
-            v-model="datetimerange"
-            type="datetimerange"
-            :default-time="['00:00:00', '23:59:59']"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            @change="handleDatetimeChange"
-          />
+        <el-form-item :label="$t('trials:visit:crcUpload:uploadDicomPacs:search:studyTime')">
+          <el-date-picker v-model="datetimerange" type="datetimerange" :default-time="['00:00:00', '23:59:59']"
+            value-format="yyyy-MM-dd HH:mm:ss" @change="handleDatetimeChange" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t("common:button:search") }}
           </el-button>
           <!-- 重置 -->
-          <el-button
-            type="primary"
-            icon="el-icon-refresh-left"
-            @click="handleReset"
-          >
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t("common:button:reset") }}
           </el-button>
           <!-- 添加 -->
-          <el-button
-            type="primary"
-            icon="el-icon-plus"
-            :disabled="tableSelectData.length <= 0"
-            @click="handleAddList"
-          >
+          <el-button type="primary" icon="el-icon-plus" :disabled="tableSelectData.length <= 0" @click="handleAddList">
             {{ $t("common:button:add") }}
           </el-button>
         </el-form-item>
       </el-form>
     </template>
     <template slot="main-container">
-      <el-table
-        v-loading="loading"
-        :data="list"
-        class="table"
-        @selection-change="handleSelectChange"
-        @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'StudyTime', order: 'descending' }"
-      >
+      <el-table v-loading="loading" :data="list" class="table" @selection-change="handleSelectChange"
+        @sort-change="handleSortByColumn" :default-sort="{ prop: 'StudyTime', order: 'descending' }">
         <el-table-column type="selection" align="center" width="45" />
         <el-table-column type="index" width="50" />
         <!--患者信息-->
-        <el-table-column
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:patientMessage')
-          "
-          prop="PatientIdStr"
-          min-width="140"
-          show-overflow-tooltip
-          sortable="custom"
-        >
+        <el-table-column :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:patientMessage')
+          " prop="PatientIdStr" min-width="140" show-overflow-tooltip sortable="custom">
           <template slot="header">
             <el-tooltip placement="top">
               <div slot="content">
@@ -106,10 +57,8 @@
           <template slot-scope="scope">
             <div style="line-height: 15px">
               <div>
-                <span v-if="scope.row.PatientIdStr"
-                  ><span style="font-weight: 500">PID: </span
-                  >{{ scope.row.PatientIdStr }}</span
-                >
+                <span v-if="scope.row.PatientIdStr"><span style="font-weight: 500">PID: </span>{{ scope.row.PatientIdStr
+                }}</span>
                 <span v-else style="color: #f44336">N/A</span>
               </div>
               <div>
@@ -138,91 +87,42 @@
           </template>
         </el-table-column>
         <!--检查申请号-->
-        <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:accNumber')"
-          prop="AccessionNumber"
-          min-width="90"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:accNumber')" prop="AccessionNumber"
+          min-width="90" show-overflow-tooltip sortable="custom" />
         <!--检查模态-->
-        <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:modalities')"
-          prop="Modalities"
-          min-width="120"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:modalities')" prop="Modalities"
+          min-width="120" show-overflow-tooltip sortable="custom" />
         <!--检查部位-->
-        <el-table-column
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:bodyPartExamined')
-          "
-          prop="BodyPartExamined"
-          min-width="120"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:bodyPartExamined')
+          " prop="BodyPartExamined" min-width="120" show-overflow-tooltip sortable="custom" />
         <!--检查描述-->
-        <el-table-column
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:description')
-          "
-          prop="Description"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:description')
+          " prop="Description" min-width="160" show-overflow-tooltip sortable="custom" />
         <!--序列数量-->
-        <el-table-column
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:seriesCount')
-          "
-          prop="SeriesCount"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:seriesCount')
+          " prop="SeriesCount" show-overflow-tooltip sortable="custom" />
         <!--图像数量-->
-        <el-table-column
-          :label="
-            $t('trials:visit:crcUpload:uploadDicomPacs:table:instanceCount')
-          "
-          prop="InstanceCount"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:instanceCount')
+          " prop="InstanceCount" show-overflow-tooltip sortable="custom" />
         <!--检查日期-->
-        <el-table-column
-          :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:studyTime')"
-          prop="StudyTime"
-          min-width="160"
-          show-overflow-tooltip
-          sortable="custom"
-        />
+        <el-table-column :label="$t('trials:visit:crcUpload:uploadDicomPacs:table:studyTime')" prop="StudyTime"
+          min-width="160" show-overflow-tooltip sortable="custom" />
         <el-table-column :label="$t('common:action:action')" fixed="right">
           <template slot-scope="scope">
+            <el-button icon="el-icon-view" :title="$t('trials:uploadedDicoms:action:preview')" circle
+              @click="handleViewStudy(scope.row)" />
             <!-- 添加 -->
-            <el-button
-              :title="$t('common:button:add')"
-              type="text"
-              @click="handleAdd(scope.row)"
-              >{{ $t("common:button:add") }}</el-button
-            >
+            <el-button :title="$t('common:button:add')" @click="handleAdd(scope.row)" icon="el-icon-plus" circle />
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
     </template>
   </BaseContainer>
 </template>
-      <script>
+<script>
 import {
   getVisitPatientStudyFilterList,
   submitVisitStudyBinding,
@@ -232,6 +132,7 @@ import {
 import BaseContainer from "@/components/BaseContainer";
 import Pagination from "@/components/Pagination";
 import moment from "moment";
+import { getToken } from '@/utils/auth'
 const searchDataDefault = () => {
   return {
     PatientInfo: null,
@@ -282,6 +183,14 @@ export default {
     this.getDicomModalityList();
   },
   methods: {
+    // 预览单个检查影像
+    handleViewStudy(row) {
+      var token = getToken()
+      const routeData = this.$router.resolve({
+        path: `/showdicom?studyId=${row.SCPStudyId}&TokenKey=${token}&type=Study&isPacs=1`,
+      })
+      window.open(routeData.href, '_blank')
+    },
     // 校验上传数据
     async verifyPacsImage(arr) {
       try {
@@ -339,7 +248,7 @@ export default {
                   "trials:uploadDicomList:label:confirm"
                 ),
                 dangerouslyUseHTMLString: true,
-                callback: (action) => {},
+                callback: (action) => { },
               }
             );
             this.loading = false;
@@ -469,5 +378,4 @@ export default {
     },
   },
 };
-</script>
-      
+</script>

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -127,6 +127,10 @@
             <span v-if="scope.row.SubjectFirstGiveMedicineTime" class="status-primary-circle">
               {{ $t('trials:crcUpload:label:firstGiveMedicineTime') }}
             </span>
+            <!-- 终止 -->
+            <span v-if="scope.row.IsSubjectQuit" class="status-primary-circle">
+              {{ $t('trials:crcUpload:label:ISQ') }}
+            </span>
           </template>
         </el-table-column>
         <!-- 访视 -->
@@ -157,10 +161,6 @@
             <span v-if="scope.row.IsImageBackApplying" class="status-primary-circle">
               {{ $t('trials:crcUpload:label:back') }}
             </span>
-            <!-- 终止 -->
-            <span v-if="scope.row.IsSubjectQuit" class="status-primary-circle">
-              {{ $t('trials:crcUpload:label:ISQ') }}
-            </span>
           </template>
         </el-table-column>
         <!-- 数据收集 -->

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -49,10 +49,18 @@
               <el-button v-if="
                 $store.state.trials.config.IsSupportQCDownloadImage &&
                 !hasPermi(['role:spm'])
-              " :loading="downloading" :disabled="selectTableDicom.length <= 0 || SecondReviewState > 0" size="small"
-                type="primary" style="margin-left: 10px" @click="getCRCUploadedStudyInfo('dicom')">
+              " :loading="downloading" :disabled="selectTableDicom.length <= 0" size="small" type="primary"
+                style="margin-left: 10px" @click="getCRCUploadedStudyInfo('dicom')">
                 {{ $t('trials:audit:button:downLoadAllDiocms') }}
               </el-button>
+              <!-- 下载工具 -->
+              <el-button v-if="
+                $store.state.trials.config.IsSupportQCDownloadImage &&
+                !hasPermi(['role:spm'])
+              " :loading="downloading" size="small" type="primary" style="margin-left: 10px"
+                @click="getCRCUploadedStudyInfo('tools')">
+                {{ $t('trials:audit:button:downLoadTools') }}
+              </el-button>
               <!-- 预览所有影像 -->
               <el-button size="small" type="primary" style="margin-left: 10px" @click="handleViewImages">
                 {{ $t('trials:audit:button:previewAllDiocms') }}
@@ -129,7 +137,7 @@
               <!-- 上传时间 -->
               <el-table-column prop="UploadedTime" :label="$t('trials:audit:table:seriesOfUploadedDate')"
                 min-width="120" sortable show-overflow-tooltip />
-              <el-table-column :label="$t('common:action:action')">
+              <el-table-column :label="$t('common:action:action')" min-width="160">
                 <template slot-scope="scope">
                   <!-- 预览 -->
                   <el-button icon="el-icon-view" :title="$t('trials:audit:action:preview')" circle
@@ -145,6 +153,9 @@
                         scope.row.Modalities
                       ) && IsHaveStudyClinicalData
                     " circle :disabled="scope.row.IsDeleted" @click="handlePreviewClinicalData(scope.row)" />
+                  <!-- 质控后编辑 -->
+                  <el-button icon="el-icon-edit" :title="$t('trials:audit:action:Correction')" circle
+                    v-if="isAuditToEdit" @click="handleEditStudy(scope.row)" />
                 </template>
               </el-table-column>
             </el-table>
@@ -244,8 +255,8 @@
               <el-button v-if="
                 $store.state.trials.config.IsSupportQCDownloadImage &&
                 !hasPermi(['role:spm'])
-              " :loading="downloading" :disabled="selectTableNonedicom.length <= 0 || SecondReviewState > 0"
-                size="small" type="primary" style="margin-left: 10px" @click="getCRCUploadedStudyInfo('noneDicom')">
+              " :loading="downloading" :disabled="selectTableNonedicom.length <= 0" size="small" type="primary"
+                style="margin-left: 10px" @click="getCRCUploadedStudyInfo('noneDicom')">
                 {{ $t('trials:audit:button:downLoadAllNonDiocms') }}
               </el-button>
               <!-- 预览 -->
@@ -354,7 +365,7 @@
                     :inactive-text="$fd('YesOrNo', false)" />
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('common:action:action')">
+              <el-table-column :label="$t('common:action:action')" min-width="160">
                 <template slot-scope="scope">
                   <!-- 预览 -->
                   <el-button icon="el-icon-view" :title="$t('trials:audit:button:nonDicomsPreview')" circle
@@ -365,6 +376,9 @@
                   <el-button icon="el-icon-edit-outline" :title="$t('trials:audit:button:nonDicomsEdit')" circle
                     :disabled="isAudit || SecondReviewState > 0"
                     @click.native.prevent="handleEditNoneDicomInfo(scope.row)" />
+                  <!-- 质控后编辑 -->
+                  <el-button icon="el-icon-edit" :title="$t('trials:audit:action:Correction')" circle
+                    v-if="isAuditToEdit" @click="handleEditNoneDicomInfo(scope.row)" />
                 </template>
               </el-table-column>
             </el-table>
@@ -633,18 +647,28 @@
               </el-checkbox-group>
             </el-form-item>
             <!-- 序列数量 -->
-            <el-form-item :label="$t('trials:audit:table:seriesCount')">
+            <el-form-item :label="$t('trials:audit:table:seriesCount')" v-if="!isAuditToEdit">
               <el-input v-model="studyForm.SeriesCount" disabled />
             </el-form-item>
             <!-- 图像数量 -->
-            <el-form-item v-if="studyForm.InstanceCount" :label="$t('trials:audit:table:instanceCount')">
+            <el-form-item v-if="studyForm.InstanceCount && !isAuditToEdit"
+              :label="$t('trials:audit:table:instanceCount')">
               <el-input v-model="studyForm.InstanceCount" disabled />
             </el-form-item>
             <!-- 检查日期 -->
-            <el-form-item :label="$t('trials:audit:table:studyDate')">
+            <el-form-item :label="$t('trials:audit:table:studyDate')" v-if="!isAuditToEdit">
               <el-date-picker v-model="studyForm.StudyTime" disabled type="date" value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd" style="width: 100%" />
             </el-form-item>
+            <!-- 修改原因 -->
+            <el-form-item v-if="isAuditToEdit" :label="$t('trials:audit:table:Reason')" prop="ModifyReason" :rules="[
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              }]">
+              <el-input v-model="studyForm.ModifyReason" type="textarea" />
+            </el-form-item>
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
@@ -730,10 +754,29 @@
               </el-checkbox-group>
             </el-form-item>
             <!-- 检查日期 -->
-            <el-form-item :label="$t('trials:audit:table:nonDicomsStudyDate')" prop="ImageDate">
+            <el-form-item :label="$t('trials:audit:table:nonDicomsStudyDate')" prop="ImageDate" :rules="[
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              }]" v-if="isAuditToEdit">
+              <el-date-picker v-model="noneDicomForm.ImageDate" type="date" :picker-options="pickerOption"
+                value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 100%" />
+            </el-form-item>
+            <!-- 检查日期 -->
+            <el-form-item :label="$t('trials:audit:table:nonDicomsStudyDate')" prop="ImageDate" v-else>
               <el-date-picker v-model="noneDicomForm.ImageDate" disabled type="date" :picker-options="pickerOption"
                 value-format="yyyy-MM-dd" format="yyyy-MM-dd" style="width: 100%" />
             </el-form-item>
+            <!-- 修改原因 -->
+            <el-form-item v-if="isAuditToEdit" :label="$t('trials:audit:table:Reason')" prop="ModifyReason" :rules="[
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              }]">
+              <el-input v-model="noneDicomForm.ModifyReason" type="textarea" />
+            </el-form-item>
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
@@ -882,7 +925,9 @@ import {
   updateModality,
   getQCChallengeDialogList,
   replaceQCTaskActionUser,
-  getTrialUserRoleList
+  getTrialUserRoleList,
+  updateNoneDicomStudy,
+  updateDicomStudyInfo
 } from '@/api/trials'
 import { qCPassedOrFailed } from '@/api/trials/visit'
 import { getBasicDataSelects } from '@/api/dictionary/dictionary'
@@ -896,6 +941,9 @@ import const_ from '@/const/sign-code'
 import uploadPetClinicalData from '@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue'
 import { downLoadFile } from '@/utils/stream.js'
 import { getCRCUploadedStudyInfo, downloadImageSuccess } from '@/api/load.js'
+import {
+  getCommonDocument,
+} from '@/api/dictionary'
 import store from '@/store'
 export default {
   name: 'QualityAssurance',
@@ -924,12 +972,19 @@ export default {
     SecondReviewState: {
       type: Number,
       default: 0,
+    },
+    auditorId: {
+      type: String,
+      default: ''
     }
   },
   computed: {
     isEN() {
       return this.$i18n.locale !== 'zh'
     },
+    isAuditToEdit() {
+      return this.isAudit && this.auditorId === this.userId
+    }
   },
   data() {
     return {
@@ -963,6 +1018,7 @@ export default {
         BodyPartForEdit: [],
         SeriesCount: null,
         StudyTime: '',
+        ModifyReason: ''
       },
       currentQCRow: {},
       isAudit: false, // 审核过之后功能按钮禁用标识
@@ -981,6 +1037,7 @@ export default {
         Modality: '',
         ImageDate: '',
         StudyName: '',
+        ModifyReason: ''
       },
       subjectClinicalData: {},
       moment,
@@ -1035,7 +1092,8 @@ export default {
       secondReviewList: [],
       secondReviewActiveName: null,
       SecondReviewTime: '',
-      IsSecondPass: false
+      IsSecondPass: false,
+      userId: zzSessionStorage.getItem('userId'),
     }
   },
   async mounted() {
@@ -1079,6 +1137,9 @@ export default {
           NoneDicomStudyIdList: [],
           DicomStudyIdList: [],
         }
+        if (type === 'tools') {
+          return this.handleDownload()
+        }
         if (type === 'dicom') {
           data.DicomStudyIdList = this.selectTableDicom.map(
             (item) => item.StudyId
@@ -1092,6 +1153,7 @@ export default {
         this.downloading = true
         let res = await getCRCUploadedStudyInfo(data)
         this.downloading = false
+        // return
         if (res.IsSuccess) {
           this.downloadId = res.OtherInfo
           this.downloadImage(res.Result, type)
@@ -1101,6 +1163,30 @@ export default {
         console.log(err)
       }
     },
+    // 获取工具并下载
+    async handleDownload() {
+      try {
+        this.downloading = true
+        let res = await getCommonDocument({ Code: 'TrialImageConvert_Soft' })
+        if (res.IsSuccess) {
+          let row = res.Result
+          let fileName = this.isEN ? row.Name : row.NameCN;
+          let type = fileName
+            .substring(fileName.lastIndexOf('.'))
+            .toLocaleLowerCase()
+          if (!type) {
+            let extendName = row.Path
+              .substring(row.Path.lastIndexOf('.'))
+              .toLocaleLowerCase()
+            fileName += extendName
+          }
+          res = await downLoadFile(this.OSSclientConfig.basePath + row.Path, fileName)
+        }
+        this.downloading = false
+      } catch (err) {
+        this.downloading = false
+      }
+    },
     // 打包下载
     async downloadImage(data, type) {
       try {
@@ -1129,18 +1215,31 @@ export default {
         )}.zip`
         let StudyList = data.StudyList
         StudyList.forEach((study) => {
+          if (study.StudyDIRPath) {
+            let obj = {
+              name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
+                'IsDicom',
+                true
+              )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}/DICOMDIR`,
+              url: this.OSSclientConfig.basePath + study.StudyDIRPath,
+            }
+            files.push(obj)
+          }
           if (study.SeriesList.length > 0) {
             study.SeriesList.forEach((series) => {
               if (series.InstanceList.length > 0) {
                 series.InstanceList.forEach((instance) => {
                   let fileName = instance.Path.split('/').pop()
+                  if (instance.FileName) {
+                    fileName = instance.FileName
+                  }
                   let obj = {
                     name: `${data.SubjectCode}_${data.VisitName}_${this.$fd(
                       'IsDicom',
                       true
-                    )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}_${series.Modality
-                      }/${fileName}`,
+                    )}/${study.StudyCode}_${study.StudyTime.split(' ')[0]}/IMAGE/${fileName}`,
                     url: this.OSSclientConfig.basePath + instance.Path,
+                    IsEncapsulated: instance.IsEncapsulated
                   }
                   files.push(obj)
                 })
@@ -1334,6 +1433,12 @@ export default {
                   answer: item.answer,
                   trialQCQuestionConfigureId: item.Id,
                 })
+              } else {
+                answerList.push({
+                  id: null,
+                  answer: item.answer,
+                  trialQCQuestionConfigureId: item.Id,
+                })
               }
             } else {
               answerList.push({
@@ -1438,6 +1543,7 @@ export default {
               this.qcVisible = false
               this.relationInfo.TotalChallengeCount++
               this.relationInfo.NotClosedChallengeCount++
+              this.$emit('getList')
             }
           })
           .catch(() => {
@@ -1929,7 +2035,17 @@ export default {
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
       if (isSign) {
-        this.setQCStatus(signInfo)
+        if (this.isAuditToEdit) {
+          if (this.editStudyInfoVisible) {
+            // dicom更正
+            this.updateDicomStudyInfo(signInfo)
+          } else if (this.editNoneDicomVisible) {
+            // 非dicom更正
+            this.updateNoneDicomStudy(signInfo)
+          }
+        } else {
+          this.setQCStatus(signInfo)
+        }
       } else {
         this.signVisible = false
       }
@@ -1957,9 +2073,9 @@ export default {
             this.isAudit = true
             if (this.signCode === 219) {
               this.$emit('getList')
-              return this.getQCInfo()
+              this.getQCInfo()
             }
-            if (!this.$store.state.trials.config.IsIQCAutoNextTask) return false
+            if (!this.$store.state.trials.config.IsIQCAutoNextTask) return this.$emit('getList')
             this.$forceUpdate()
             getNextIQCQuality({
               trialId: this.trialId,
@@ -2039,6 +2155,7 @@ export default {
       this.$set(this.studyForm, 'Modality', row.ModalityForEdit)
       // this.studyForm.Modality = row.ModalityForEdit
       this.studyForm.BodyPartForEdit = bodyPart
+      this.$set(this.studyForm, 'ModifyReason', '')
     },
     // 更新拍片部位/拍片类型信息
     handleUpdateStudyInfo() {
@@ -2055,20 +2172,59 @@ export default {
           bodyPart: this.studyForm.BodyPart,
           StudyName: this.studyForm.StudyName,
         }
-        updateModality(this.data.TrialId, params)
-          .then((res) => {
-            this.btnLoading = false
-            if (res.IsSuccess) {
-              this.getStudyInfo()
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
-              this.editStudyInfoVisible = false
-            }
-          })
-          .catch(() => {
-            this.btnLoading = false
-          })
+        if (this.isAuditToEdit) {
+          this.btnLoading = false
+          const { CorrectImageExaminationInformation } = const_.processSignature
+          this.signCode = CorrectImageExaminationInformation
+          this.signVisible = true
+        } else {
+          updateModality(this.data.TrialId, params)
+            .then((res) => {
+              this.btnLoading = false
+              if (res.IsSuccess) {
+                this.getStudyInfo()
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+                this.editStudyInfoVisible = false
+              }
+            })
+            .catch(() => {
+              this.btnLoading = false
+            })
+        }
+
       })
     },
+    // 更正dicom信息
+    async updateDicomStudyInfo(signInfo) {
+      try {
+        this.loading = true
+        let data = {
+          data: {
+            Id: this.studyForm.StudyId,
+            SubjectVisitId: this.data.Id,
+            StudyName: this.studyForm.StudyName,
+            ModifyReason: this.studyForm.ModifyReason,
+            Modality: this.studyForm.Modality,
+            BodyPart: this.studyForm.BodyPart,
+          },
+          signInfo
+        }
+        let res = await updateDicomStudyInfo(data)
+        this.loading = false
+        this.btnLoading = false
+        this.signVisible = false
+        if (res.IsSuccess) {
+          this.getStudyInfo()
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.editStudyInfoVisible = false
+        }
+      } catch (err) {
+        console.log(err)
+        this.btnLoading = false
+        this.loading = false
+        this.signVisible = false
+      }
+    },
     // 设置重传时刷新历史质疑列表及影响指控列表
     refreshList() {
       // 如果是复审时候设置重传，需要将当前审核状态设置为初审，且刷新页面数据并关闭历史质疑和质疑记录窗口
@@ -2095,6 +2251,7 @@ export default {
       this.noneDicomForm.Modality = Modality
       this.noneDicomForm.ImageDate = ImageDate
       this.noneDicomForm.BodyParts = BodyPart.split(', ')
+      this.noneDicomForm.ModifyReason = null
       this.editNoneDicomVisible = true
     },
     // 更新非Dicom部位/拍片类型信息
@@ -2107,20 +2264,59 @@ export default {
         this.noneDicomForm.TrialSiteId = this.data.TrialSiteId
         this.noneDicomForm.SubjectId = this.data.SubjectId
         this.noneDicomForm.SubjectVisitId = this.data.Id
-        addOrUpdateNoneDicomStudy(this.noneDicomForm)
-          .then((res) => {
-            this.btnLoading = false
-            if (res.IsSuccess) {
-              this.getNoneDicomList()
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
-              this.editNoneDicomVisible = false
-            }
-          })
-          .catch(() => {
-            this.btnLoading = false
-          })
+        if (this.isAuditToEdit) {
+          this.btnLoading = false
+          const { CorrectImageExaminationInformation } = const_.processSignature
+          this.signCode = CorrectImageExaminationInformation
+          this.signVisible = true
+        } else {
+          addOrUpdateNoneDicomStudy(this.noneDicomForm)
+            .then((res) => {
+              this.btnLoading = false
+              if (res.IsSuccess) {
+                this.getNoneDicomList()
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+                this.editNoneDicomVisible = false
+              }
+            })
+            .catch(() => {
+              this.btnLoading = false
+            })
+        }
       })
     },
+    // 更正非dicom信息
+    async updateNoneDicomStudy(signInfo) {
+      try {
+        this.loading = true
+        let data = {
+          data: {
+            Id: this.noneDicomForm.Id,
+            SubjectVisitId: this.data.Id,
+            StudyName: this.noneDicomForm.StudyName,
+            ModifyReason: this.noneDicomForm.ModifyReason,
+            Modality: this.noneDicomForm.Modality,
+            BodyPart: this.noneDicomForm.BodyParts.join(', '),
+            ImageDate: this.noneDicomForm.ImageDate
+          },
+          signInfo
+        }
+        let res = await updateNoneDicomStudy(data)
+        this.loading = false
+        this.btnLoading = false
+        this.signVisible = false
+        if (res.IsSuccess) {
+          this.getNoneDicomList()
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.editNoneDicomVisible = false
+        }
+      } catch (err) {
+        console.log(err)
+        this.btnLoading = false
+        this.loading = false
+        this.signVisible = false
+      }
+    },
     // 获取非Dicom检查信息
     getNoneDicomList() {
       this.loading = true