diff --git a/package-lock.json b/package-lock.json
index 39fcd597..205955d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,6 +57,7 @@
         "sortablejs": "^1.15.5",
         "streamsaver": "^2.0.6",
         "svgo": "^1.2.2",
+        "unzipit": "^2.0.3",
         "v-viewer": "^1.7.4",
         "vcrontab": "^0.3.5",
         "vue": "2.7.16",
@@ -21835,6 +21836,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/unzipit": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/unzipit/-/unzipit-2.0.3.tgz",
+      "integrity": "sha512-e6+ftgSQRj9Hwf2mIWFwYIGqBoKV7AziG/d7pep2Uv3NCzHbhLO5d9dGRwpahVlnpQ7aQC+5kWk72dnWocdYyA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/unzipper": {
       "version": "0.10.14",
       "resolved": "https://registry.npmmirror.com/unzipper/-/unzipper-0.10.14.tgz",
diff --git a/package.json b/package.json
index a7979f93..6c83bd26 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "sortablejs": "^1.15.5",
     "streamsaver": "^2.0.6",
     "svgo": "^1.2.2",
+    "unzipit": "^2.0.3",
     "v-viewer": "^1.7.4",
     "vcrontab": "^0.3.5",
     "vue": "2.7.16",
diff --git a/src/App.vue b/src/App.vue
index 3d5733f0..3d017a90 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -98,6 +98,7 @@ import timeTag from '@/components/timeTag'
 import Vue from 'vue'
 import i18n from './lang'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+import WHITELIST from "./utils/whiteList"
 export default {
   name: 'App',
   components: {
@@ -120,10 +121,10 @@ export default {
   mounted() {
     this.show = process.env.VUE_APP_OSS_PATH === '/test/dist'
     Vue.prototype.$openI18n = this.openI18n
-    // this.getIsLock()
-    // DicomEvent.$on("isLock", (isLock) => {
-    //   this.isLock = isLock
-    // })
+    this.getIsLock()
+    DicomEvent.$on("isLock", (isLock) => {
+      this.isLock = isLock
+    })
   },
   // watch: {
   //   '$route.query': {
@@ -156,7 +157,7 @@ export default {
   // },
   methods: {
     getIsLock() {
-      if (zzSessionStorage.getItem('isLock') === 'true') {
+      if (zzSessionStorage.getItem('isLock') === 'true' && !WHITELIST.includes(this.$route.path)) {
         this.isLock = true
       } else {
         this.isLock = false
@@ -322,7 +323,7 @@ export default {
 <style lang="scss">
 .mask {
   position: relative;
-  filter: blur(2px);
+  filter: blur(5px);
   user-select: none;
 }
 
@@ -334,7 +335,7 @@ export default {
   height: 100%;
   content: '';
   display: block;
-  background: rgba(255, 253, 253, 0.2);
+  background: rgba(255, 253, 253, 0.5);
 }
 
 $light_gray: #606266;
diff --git a/src/api/export.js b/src/api/export.js
index da589d90..12ccf939 100644
--- a/src/api/export.js
+++ b/src/api/export.js
@@ -316,3 +316,30 @@ export function GetReadingMedicineSystemQuestionList_Export(data) {
     data
   })
 }
+// 导出中心调研
+export function getTrialSiteSurveyList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getTrialSiteSurveyList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出中心设备
+export function getSiteSurveyEquipmentList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getSiteSurveyEquipmentList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
+// 导出中心调研基本信息
+export function getSiteSurveyInfoList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/getSiteSurveyInfoList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/reading.js b/src/api/reading.js
index 5e6315fd..0ac49b93 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -432,6 +432,22 @@ export function studyUndoMaskImage(data) {
     data
   })
 }
+// 非dicom图像数据匿名
+export function noneDicomStudyMaskImage(data) {
+  return request({
+    url: `/NoneDicomStudy/noneDicomStudyMaskImage`,
+    method: 'post',
+    data
+  })
+}
+// 非dicom图像数据撤销匿名
+export function noneDicomStudyUndoMaskImage(data) {
+  return request({
+    url: `/NoneDicomStudy/noneDicomStudyUndoMaskImage`,
+    method: 'post',
+    data
+  })
+}
 // 获取分割组历史版本
 export function getSegmentationVersionList(data) {
   return request({
@@ -447,4 +463,28 @@ export function restoreSegmentationVersion(data) {
     method: 'post',
     data
   })
-}
\ No newline at end of file
+}
+
+// 获取标记信息
+export function getMarkList(data) {
+  return request({
+    url: `/ReadingImageTask/getMarkList`,
+    method: 'post',
+    data
+  })
+}
+export function getNoneDicomMarkList(data) {
+  return request({
+    url: `/ReadingImageTask/getNoneDicomMarkList`,
+    method: 'post',
+    data
+  })
+}
+
+export function getFilterTableQuestion(data) {
+  return request({
+    url: `/ReadingImageTask/getFilterTableQuestion`,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/research.js b/src/api/research.js
index 66f1b54c..3efefb7e 100644
--- a/src/api/research.js
+++ b/src/api/research.js
@@ -129,3 +129,31 @@ export function getUserTypeList(userTypeEnum) {
     method: 'get'
   })
 }
+
+export function getSiteSurveyLogList(param) {
+  return request({
+    url: `/TrialSiteSurvey/getSiteSurveyLogList`,
+    method: 'post',
+    data: param
+  })
+}
+export function getTrialIsSPMJoin(trialId) {
+  return request({
+    url: `/TrialSiteSurvey/getTrialIsSPMJoin?trialId=${trialId}`,
+    method: 'get'
+  })
+}
+export function getSiteSurveyEquipmentList(param) {
+  return request({
+    url: `/TrialSiteSurvey/getSiteSurveyEquipmentList`,
+    method: 'post',
+    data: param
+  })
+}
+export function getSiteSurveyInfoList(param) {
+  return request({
+    url: `/TrialSiteSurvey/getSiteSurveyInfoList`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/api/trials.js b/src/api/trials.js
index 82aa97ba..a49ed798 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -357,10 +357,11 @@ export function getSubjectList(param) {
   })
 }
 
-export function getTrialSiteSelect(trialId) {
+export function getTrialSiteSelect(trialId, params) {
   return request({
     url: `/trialMaintenance/getTrialSiteSelect/${trialId}`,
-    method: 'get'
+    method: 'get',
+    params
   })
 }
 
@@ -4474,4 +4475,51 @@ export function getTrialUnreadVisitList(params) {
     method: 'get',
     params,
   })
+}
+export function getDoctorUserTrialReadingStat(data) {
+  return request({
+    url: `/DoctorWorkload/getDoctorUserTrialReadingStat`,
+    method: 'post',
+    data,
+  })
+}
+// 设置项目链接过期时间
+export function setTrialLinkExpirationTime(data) {
+  return request({
+    url: `/TrialConfig/setTrialLinkExpirationTime`,
+    method: 'post',
+    data,
+  })
+}
+// 获取项目链接过期时间
+export function getTrialLinkExpirationTime(data) {
+  return request({
+    url: `/TrialConfig/getTrialLinkExpirationTime`,
+    method: 'post',
+    data,
+  })
+}
+// 获取项目链接时间是否过期
+export function getLinkLinkExpirationTime(data) {
+  return request({
+    url: `/TrialConfig/getLinkLinkExpirationTime`,
+    method: 'post',
+    data,
+  })
+}
+// 获取项目链接code是否有效
+export function getLinkVerificationCodeIsEffective(data) {
+  return request({
+    url: `/TrialConfig/getLinkVerificationCodeIsEffective`,
+    method: 'post',
+    data,
+  })
+}
+// 上传通用文件记录
+export function addOrUpdateCommonUploadRecord(data) {
+  return request({
+    url: `/FileUploadRecord/addOrUpdateCommonUploadRecord`,
+    method: 'post',
+    data,
+  })
 }
\ No newline at end of file
diff --git a/src/api/trials/reading.js b/src/api/trials/reading.js
index 9ee3654a..a89be510 100644
--- a/src/api/trials/reading.js
+++ b/src/api/trials/reading.js
@@ -488,3 +488,67 @@ export function setRandomTaskOrder(data) {
     data
   })
 }
+
+export function getJudgeForm(data) {
+  return request({
+    url: `/ReadingImageTask/getJudgeForm`,
+    method: 'post',
+    data
+  })
+}
+
+export function setJudgeForm(data) {
+  return request({
+    url: `/ReadingImageTask/setJudgeForm`,
+    method: 'post',
+    data
+  })
+}
+
+export function getSingleVisitJudgeAnswer(data) {
+  return request({
+    url: `/ReadingImageTask/getSingleVisitJudgeAnswer`,
+    method: 'post',
+    data
+  })
+}
+
+export function submitJudgeForm(data) {
+  return request({
+    url: `/Inspection/ReadingImageTask/SubmitJudgeForm`,
+    method: 'post',
+    data
+  })
+}
+
+export function getTrialQuestionVisitJudgeRule(data) {
+  return request({
+    url: `/ReadingQuestion/getTrialQuestionVisitJudgeRule`,
+    method: 'post',
+    data
+  })
+}
+
+export function setTrialQuestionVisitJudgeRule(data) {
+  return request({
+    url: `/ReadingQuestion/setTrialQuestionVisitJudgeRule`,
+    method: 'post',
+    data
+  })
+}
+
+export function copyTrialQuestionVisitJudgeRule(data) {
+  return request({
+    url: `/ReadingQuestion/copyTrialQuestionVisitJudgeRule`,
+    method: 'post',
+    data
+  })
+}
+
+export function applyBaseLineTrialQuestionVisitJudgeRule(data) {
+  return request({
+    url: `/ReadingQuestion/applyBaseLineTrialQuestionVisitJudgeRule`,
+    method: 'post',
+    data
+  })
+}
diff --git a/src/api/trials/setting.js b/src/api/trials/setting.js
index 063b0e36..104e8254 100644
--- a/src/api/trials/setting.js
+++ b/src/api/trials/setting.js
@@ -94,6 +94,14 @@ export function getTrialJudgyInfo(params) {
     data: params
   })
 }
+
+export function setTrialJudgeRuleInfo(params) {
+  return request({
+    url: `/ReadingQuestion/setTrialJudgeRuleInfo`,
+    method: 'post',
+    data: params
+  })
+}
 // 获取检查部位列表
 export function getTrialBodyPartList(params) {
   return request({
diff --git a/src/components/Dicom/DicomCanvas.vue b/src/components/Dicom/DicomCanvas.vue
index 596c4507..68d8a4c7 100644
--- a/src/components/Dicom/DicomCanvas.vue
+++ b/src/components/Dicom/DicomCanvas.vue
@@ -34,8 +34,8 @@
     </div>
 
     <div class="info-subject">
-      <div v-if="series.subjectCode">{{ series.subjectCode }}</div>
-      <div v-if="series.visitName">{{ series.visitName }}</div>
+      <div v-if="series.subjectCode && IsReadingTaskViewInOrder !== 0">{{ series.subjectCode }}</div>
+      <div v-if="series.visitName && IsReadingTaskViewInOrder !== 0">{{ series.visitName }}</div>
       <div>{{ stack.description }}</div>
       <!-- <div>{{ dicomInfo.hospital }}</div> -->
       <!-- <div v-show="dicomInfo.pid">{{ dicomInfo.pid }}</div> -->
@@ -174,7 +174,8 @@ export default {
       orientationMarkers: [],
       originalMarkers: [],
       dcmTag: { visible: false, title: this.$t('trials:dicom-tag:title') },
-      tip: ''
+      tip: '',
+      IsReadingTaskViewInOrder: 2
     }
   },
 
@@ -182,6 +183,9 @@ export default {
     this.type = this.$router.currentRoute.query.type
       ? this.$router.currentRoute.query.type
       : ''
+    if (this.$router.currentRoute.query.IsReadingTaskViewInOrder) {
+      this.IsReadingTaskViewInOrder = Number(this.$router.currentRoute.query.IsReadingTaskViewInOrder)
+    }
     this.canvas = this.$refs.canvas
     this.canvas.addEventListener('cornerstonenewimage', this.onNewImage)
     this.canvas.addEventListener(
diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue
index f8955262..eb7346a6 100644
--- a/src/components/TrialsTab/index.vue
+++ b/src/components/TrialsTab/index.vue
@@ -56,7 +56,8 @@ export default {
       TrialConfig: {},
       TrialStatusStr: null,
       trialId: null,
-      IsAdditionalAssessment: false
+      IsAdditionalAssessment: false,
+      isReload: false
     }
   },
   computed: {
@@ -71,7 +72,11 @@ export default {
       if (~url.indexOf('?')) {
         query = url.split('?')[1]
       }
-      zzSessionStorage.setItem('lastWorkbench', `${v.path}${query ? '?' : ''}${query}`)
+      if (!this.isReload) {
+        zzSessionStorage.setItem('lastWorkbench', `${v.path}${query ? '?' : ''}${query}`)
+      } else {
+        this.isReload = false
+      }
       var firstGoIn = this.trialsRouter.children.find(v => { return v.name === 'TrialsPanel' }).children[0]
       if (this.trialsTab === '/trials/trials-panel') {
         var targetPath = firstGoIn.path
@@ -96,6 +101,9 @@ export default {
     }
   },
   mounted() {
+    this.$EventBus.$on("reload", () => {
+      this.isReload = true
+    })
     var query = ``
     var url = window.location.href
     if (~url.indexOf('?')) {
diff --git a/src/components/downloadDicomAndNonedicom/index.vue b/src/components/downloadDicomAndNonedicom/index.vue
index 7f08671f..4ff5820c 100644
--- a/src/components/downloadDicomAndNonedicom/index.vue
+++ b/src/components/downloadDicomAndNonedicom/index.vue
@@ -33,7 +33,7 @@
       <el-table-column type="index" width="40" />
       <!--受试者-->
       <el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
-        show-overflow-tooltip />
+        show-overflow-tooltip v-if="isReadingTaskViewInOrder !== 0" />
       <!--访视名称-->
       <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable v-if="IsImageSegment" />
       <!--任务名称-->
@@ -78,7 +78,7 @@
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
       :subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :isDownload="true" :visitTaskId="modelTaskId"
-      :IsImageSegment="IsImageSegment" :Criterion="Criterion" />
+      :IsImageSegment="IsImageSegment" :Criterion="Criterion" :IsReadingTaskViewInOrder="isReadingTaskViewInOrder" />
   </el-dialog>
 </template>
 <script>
@@ -136,6 +136,14 @@ export default {
     IsImageSegment: {
       type: Boolean,
       default: false,
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 2,
+    },
+    isReading: {
+      type: Boolean,
+      default: false,
     }
   },
   data() {
@@ -170,6 +178,7 @@ export default {
     this.getList()
     this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
     if (this.IsImageSegment) this.title = `Download Images：${this.SubjectCode}`
+    if (this.isReadingTaskViewInOrder === 0) this.title = ''
   },
   beforeDestroy() {
     store.dispatch('trials/setUnLock', false)
@@ -327,6 +336,14 @@ export default {
         if (data.StudyList && data.StudyList.length > 0) {
           let StudyList = data.StudyList
           StudyList.forEach((study) => {
+            let arr = []
+            study.SeriesList.forEach(item => {
+              if (!arr.includes(item.Modality)) {
+                arr.push(item.Modality)
+              }
+            })
+            let str = arr.join('_')
+            let time = study.StudyTime.split(' ')[0]
             if (study.StudyDIRPath) {
               let obj = {
                 name: `${data.SubjectCode}/${data.TaskBlindName
@@ -338,7 +355,7 @@ export default {
                 obj = {
                   name: `${data.SubjectCode}/${data.VisitName
                     }/${this.$fd('IsDicom', true)}/${study.StudyCode
-                    }/DICOMDIR`,
+                    }_${time}_${str}/DICOMDIR`,
                   url: this.OSSclientConfig.basePath + study.StudyDIRPath,
                 }
               } else if (this.IsReadingTaskViewInOrder === 0) {
@@ -371,7 +388,7 @@ export default {
                       obj = {
                         name: `${data.SubjectCode}/${data.VisitName
                           }/${this.$fd('IsDicom', true)}/${study.StudyCode
-                          }/IMAGE/${fileName}`,
+                          }_${time}_${str}/IMAGE/${fileName}`,
                         url: this.OSSclientConfig.basePath + instance.Path,
                         IsEncapsulated: instance.IsEncapsulated
                       }
@@ -437,6 +454,9 @@ export default {
         let params = {
           TrialImageDownloadId: this.downloadId,
         }
+        if (this.isReading) {
+          params.VisitTaskId = this.TaskId
+        }
         await downloadImageSuccess(params)
       } catch (err) {
         console.log(err)
@@ -447,6 +467,9 @@ export default {
       if (this.IsImageSegment) {
         this.model_cfg.title = `${item.SubjectCode || ''} > ${item.VisitName}`
       }
+      if (this.isReadingTaskViewInOrder === 0) {
+        this.model_cfg.title = ''
+      }
       if (item.IsDicom) {
         this.modelList = item.DicomStudyList
       } else {
@@ -488,11 +511,11 @@ export default {
       let routeData = null
       if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
         routeData = this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+          path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
         })
       } else {
         routeData = this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
+          path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
         })
       }
       this.open = window.open(routeData.href, '_blank')
@@ -505,7 +528,7 @@ export default {
       var token = getToken()
       let trialId = this.$route.query.trialId
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?page=download&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
+        path: `/showvisitdicoms?page=download&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },
diff --git a/src/components/uploadDicomAndNonedicom/dicomFile.vue b/src/components/uploadDicomAndNonedicom/dicomFile.vue
index 7bc26431..569281fa 100644
--- a/src/components/uploadDicomAndNonedicom/dicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/dicomFile.vue
@@ -10,7 +10,8 @@
     <!--检查列表-->
     <el-table :data="list" style="width: 100%" height="300" :loading="loading">
       <!--受试者-->
-      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" sortable />
+      <el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" sortable
+        v-if="isReadingTaskViewInOrder !== 0" />
       <!--访视名称-->
       <el-table-column prop="VisitName" :label="$t('download:table:VisitName')" v-if="IsImageSegment" sortable />
       <!--任务名称-->
@@ -42,7 +43,8 @@
         <template slot-scope="scope">
           <div class="btnBox">
             <!--上传--->
-            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data" v-if="!forbid">
+            <form id="inputForm" :ref="`uploadForm_${scope.row.Id}`" enctype="multipart/form-data"
+              v-if="!forbid && (!isReading || isDownloaded)">
               <div class="form-group" style="margin-right: 10px">
                 <div :id="`directoryInputWrapper_${scope.row.Id}`" class="btn btn-link file-input">
                   <el-button circle icon="el-icon-upload2" :disabled="btnLoading" :loading="btnLoading"
@@ -69,7 +71,7 @@
     </el-table>
     <div style="margin: 10px 0" class="top">
       <span>{{ $t('upload:dicom:uploadTitle') }}</span>
-      <div class="btnBox" v-if="!forbid">
+      <div class="btnBox" v-if="!forbid && (!isReading || isDownloaded)">
         <span style="margin-right: 10px">{{ $store.state.trials.uploadTip }}</span>
         <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
           <div class="form-group">
@@ -304,7 +306,8 @@
     </el-table>
     <study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
       :subjectVisitId="openSubjectVisitId" :modelList="modelList" :isUpload="openIsUpload"
-      :visitTaskId="openVisitTaskId" :TrialModality="TrialModality" @getList="getList" />
+      :visitTaskId="openVisitTaskId" :TrialModality="TrialModality" :IsReadingTaskViewInOrder="IsReadingTaskViewInOrder"
+      @getList="getList" />
   </div>
 </template>
 <script>
@@ -377,6 +380,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isReading: {
+      type: Boolean,
+      default: false,
+    }
   },
   components: {
     'study-view': studyView,
@@ -426,6 +433,8 @@ export default {
       openSubjectVisitId: null,
       openVisitTaskId: null,
       TrialModality: [],
+      IsReadingTaskViewInOrder: 2,
+      isDownloaded: false
     }
   },
   async mounted() {
@@ -468,7 +477,12 @@ export default {
         let res = await getSubjectImageUploadList(params)
         this.loading = false
         if (res.IsSuccess) {
+          this.isDownloaded = this.Criterion && this.Criterion.CriterionType && (
+            this.Criterion.CriterionType == 19 ||
+            this.Criterion.CriterionType == 20
+          ) ? res.OtherInfo.IsIRImageDownloaded : true
           this.TrialModality = res.OtherInfo.TrialModality.split('|')
+          this.IsReadingTaskViewInOrder = res.OtherInfo.IsReadingTaskViewInOrder || res.OtherInfo.IsReadingTaskViewInOrder === 0 ? res.OtherInfo.IsReadingTaskViewInOrder : 2
           this.StudyInstanceUidList = []
           this.SopInstanceUidList = []
           this.UploadStudyList = []
@@ -550,6 +564,7 @@ export default {
       this.openVisitTaskId = item.VisitTaskId
       this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName
         }`
+      if (this.isReadingTaskViewInOrder === 0) this.model_cfg.title = ''
       this.modelList = item[list]
       this.model_cfg.visible = true
     },
@@ -1639,7 +1654,7 @@ export default {
       const routeData = this.$router.resolve({
         path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${this.IsImageSegment ? 'undefined' : row.VisitTaskId
           }&subjectVisitId=${row.SourceSubjectVisitId
-          }&isReading=1&TokenKey=${token}`,
+          }&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },
diff --git a/src/components/uploadDicomAndNonedicom/index.vue b/src/components/uploadDicomAndNonedicom/index.vue
index 1f3d6d61..98510f22 100644
--- a/src/components/uploadDicomAndNonedicom/index.vue
+++ b/src/components/uploadDicomAndNonedicom/index.vue
@@ -3,15 +3,16 @@
     :append-to-body="true" class="uploadDicomAndNonedicom">
     <span slot="title">{{ title }}</span>
     <el-tabs type="border-card" v-model="activeName">
-      <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:dicom')" name="dicom">
+      <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:dicom')" name="dicom" v-if="!IsImageSegment">
         <dicomFile v-if="activeName === 'dicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
           :Criterion="Criterion" :TaskId="VisitTaskId" :isUpload.sync="isUpload"
-          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" :forbid="forbid" />
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" :forbid="forbid"
+          :isReading="isReading" />
       </el-tab-pane>
       <el-tab-pane :label="$t('uploadDicomAndNonedicom:label:nonedicom')" name="nonedicom">
         <nonedicomFile v-if="activeName === 'nonedicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
           :Criterion="Criterion" :VisitTaskId="VisitTaskId" :isUpload.sync="isUpload" :IsImageSegment="IsImageSegment"
-          :forbid="forbid" />
+          :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :forbid="forbid" :isReading="isReading" />
       </el-tab-pane>
     </el-tabs>
   </el-dialog>
@@ -58,6 +59,10 @@ export default {
     IsImageSegment: {
       type: Boolean,
       default: false,
+    },
+    isReading: {
+      type: Boolean,
+      default: false,
     }
   },
   data() {
@@ -67,9 +72,16 @@ export default {
       isUpload: false,
     }
   },
+  watch: {
+    IsImageSegment() {
+      if (this.IsImageSegment) this.activeName = 'nonedicom'
+    }
+  },
   mounted() {
     this.title = `Upload Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
     if (this.IsImageSegment) this.title = `Upload Images：${this.SubjectCode}`
+    if (this.isReadingTaskViewInOrder === 0) this.title = ''
+    if (this.IsImageSegment) this.activeName = 'nonedicom'
     store.dispatch('trials/setUnLock', true)
   },
   methods: {
diff --git a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
index 7bf20246..bf2777ef 100644
--- a/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
+++ b/src/components/uploadDicomAndNonedicom/nonedicomFile.vue
@@ -14,7 +14,8 @@
     <el-table :data="list" style="width: 100%" v-adaptive="{ bottomOffset: 60 }" :loading="loading"
       :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
       <!--受试者 sortable="custom"-->
-      <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
+      <el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')"
+        v-if="isReadingTaskViewInOrder !== 0" />
       <!--访视名称-->
       <el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable
         v-if="IsImageSegment" />
@@ -110,7 +111,7 @@
             :title="$t('upload:nonedicom:button:preview')" @click.stop="handlePreviewNoneDicomFiles(scope.row)" />
           <!--上传--->
           <el-button circle icon="el-icon-upload2" :title="$t('upload:nonedicom:button:upload')" v-if="!forbid"
-            @click.native.prevent="handleUpload(scope.row)" />
+            @click.native.prevent="handleUpload(scope.row)" :disabled="isReading && !isDownloaded" />
           <!--删除--->
           <el-button :disabled="scope.row.UploadedFileCount <= 0 ||
             scope.row.ReadingTaskState === 2
@@ -223,6 +224,7 @@ import {
 import { preArchiveStudy, uploadNoneDicomFile } from '@/api/trials'
 import store from '@/store'
 import { getToken } from '@/utils/auth'
+import { unzipRaw } from 'unzipit';
 let defaultSearchData = () => {
   return {
     SubjectId: null,
@@ -265,6 +267,14 @@ export default {
       type: Boolean,
       default: false,
     },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      default: 0,
+    },
+    isReading: {
+      type: Boolean,
+      default: false,
+    }
   },
   data() {
     return {
@@ -286,7 +296,8 @@ export default {
       BodyPart: {},
       relationInfo: {
         ImageFormatList: []
-      }
+      },
+      isDownloaded: false
     }
   },
   watch: {
@@ -322,6 +333,34 @@ export default {
     store.dispatch('trials/setUnLock', false)
   },
   methods: {
+    async readZipFileListRaw(zipFile) {
+      try {
+        // 1. 使用 unzipRaw 读取原始条目列表
+        const { entries } = await unzipRaw(zipFile);
+
+        // 2. entries 是一个数组，需要手动处理
+        const fileList = entries.map(entry => {
+          // 3. 使用 TextDecoder 指定编码来解码文件名
+          // 例如，对于简体中文 ZIP 包，可以使用 'gbk'
+          const decoder = new TextDecoder('gbk'); // 或者 'big5'
+          const name = decoder.decode(entry.nameBytes);
+
+          return {
+            path: name,
+            name: name.split('/').pop(),
+            isDirectory: entry.isDirectory,
+            size: entry.size,
+            lastModified: entry.lastModDate
+          };
+        });
+
+        console.log('解码后的文件列表:', fileList);
+        return fileList;
+      } catch (error) {
+        console.error('读取 ZIP 失败:', error);
+        throw error;
+      }
+    },
     async getList() {
       try {
         this.searchData.SubjectId = this.SubjectId
@@ -343,6 +382,10 @@ export default {
         if (res.IsSuccess) {
           this.list = res.Result
           this.relationInfo = res.OtherInfo
+          this.isDownloaded = this.Criterion && this.Criterion.CriterionType && (
+            this.Criterion.CriterionType == 19 ||
+            this.Criterion.CriterionType == 20
+          ) ? res.OtherInfo.IsIRImageDownloaded : true
           this.faccept = []
           this.relationInfo.ImageFormatList.forEach((item) => {
             this.faccept.push(`.${item}`)
@@ -356,11 +399,15 @@ export default {
     // 扫描待上传文件
     beginScanFiles(e) {
       var files = [...e.target.files]
-      var sameFiles = []
+      var sameFiles = [], zipFiles = [], f = false
       files.forEach((file) => {
         var extendName = file.name
           .substring(file.name.lastIndexOf('.'))
           .toLocaleLowerCase()
+        if (extendName === '.zip' && this.IsImageSegment) {
+          if (file.name.indexOf('筛选期') > -1 || file.name.indexOf('研究结束') > -1) f = true
+          zipFiles.push(file)
+        }
         if (
           this.faccept.indexOf(extendName) !== -1 &&
           this.fileList.findIndex((v) => v.name === file.name) > -1
@@ -368,6 +415,16 @@ export default {
           sameFiles.push(file.name)
         }
       })
+      if (zipFiles.length > 0) {
+        zipFiles.forEach(async file => {
+          let list = await this.readZipFileListRaw(file)
+          if (!f) f = list.some(i => i.path.indexOf('筛选期') > -1 || i.path.indexOf('研究结束') > -1)
+          list = null
+        })
+      }
+      if (f) return this.$confirm(this.$t("trials:uploadNonDicoms:confirm:zipNameNonCompliant"), '', {
+        type: "warning"
+      })
       var scope = this
       if (sameFiles.length > 0) {
         const h = this.$createElement
@@ -475,7 +532,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}`,
+        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&visitTaskId=${row.VisitTaskId}&TokenKey=${token}&IsReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },
diff --git a/src/components/uploadDicomAndNonedicom/study-view.vue b/src/components/uploadDicomAndNonedicom/study-view.vue
index 14ae0aa3..fde5fbce 100644
--- a/src/components/uploadDicomAndNonedicom/study-view.vue
+++ b/src/components/uploadDicomAndNonedicom/study-view.vue
@@ -7,7 +7,8 @@
         </el-button>
         <el-table :data="modelList" style="width: 100%" height="300">
           <!--检查编号-->
-          <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')" />
+          <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')"
+            v-if="IsReadingTaskViewInOrder !== 0" />
           <!--检查类型-->
           <el-table-column prop="ModalityForEdit" :label="$t('trials:uploadImage:table:ModalityForEdit')"
             v-if="IsDicom" />
@@ -139,6 +140,10 @@ export default {
         return {}
       },
     },
+    IsReadingTaskViewInOrder: {
+      type: Number,
+      default: 2,
+    }
   },
   components: {
     'base-model': baseModel,
@@ -176,18 +181,18 @@ export default {
         var token = getToken()
         let trialId = this.$route.query.trialId
         routeData = this.$router.resolve({
-          path: `/showvisitdicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
+          path: `/showvisitdicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`,
         })
       } else {
         let trialId = this.$route.query.trialId
         var token = getToken()
         if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
           routeData = this.$router.resolve({
-            path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
+            path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`,
           })
         } else {
           routeData = this.$router.resolve({
-            path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
+            path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true&IsReadingTaskViewInOrder=${this.IsReadingTaskViewInOrder}`,
           })
         }
 
diff --git a/src/icons/svg/sphericalBrush.svg b/src/icons/svg/sphericalBrush.svg
new file mode 100644
index 00000000..565c0f48
--- /dev/null
+++ b/src/icons/svg/sphericalBrush.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1782284218093" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4982" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M512 51.2a460.8 460.8 0 1 1 0 921.6 460.8 460.8 0 0 1 0-921.6z m0 51.2a409.6 409.6 0 1 0 0 819.2 409.6 409.6 0 0 0 0-819.2z" fill="#ffffff" p-id="4983"></path><path d="M512 358.4c70.4 0 137.1136 5.2736 196.7616 14.6432l27.0336 4.6592C877.1584 403.9168 972.8 454.2464 972.8 512c0 57.7536-95.6416 108.032-237.0048 134.2976l-27.0336 4.608A1275.1872 1275.1872 0 0 1 512 665.6c-70.4 0-137.1136-5.2736-196.7616-14.6432l-27.0336-4.6592C146.8416 620.0832 51.2 569.7536 51.2 512c0-57.7536 95.6416-108.032 237.0048-134.2976l27.0336-4.608c55.0912-8.704 116.1728-13.824 180.5824-14.592L512 358.4z m0 51.2c-31.5904 0-62.3104 1.1776-91.8528 3.328l-29.0816 2.5088-28.2112 3.072c-23.1424 2.7648-45.2096 6.144-66.048 9.984l-24.4224 4.7616-23.0912 5.12-21.76 5.5296C150.3744 464.5376 102.4 490.8544 102.4 512c0 21.1456 47.9744 47.4624 125.1328 68.096l21.76 5.4784 23.0912 5.1712 24.4224 4.7616c20.8384 3.84 42.9056 7.168 66.048 9.984l28.16 3.072 29.1328 2.5088a1261.4656 1261.4656 0 0 0 183.7056 0l29.0816-2.5088 28.2112-3.072c23.1424-2.7648 45.2096-6.144 66.048-9.984l24.4224-4.7616 23.0912-5.12 21.76-5.5296C873.6256 559.4624 921.6 533.1456 921.6 512c0-21.1456-47.9744-47.4624-125.1328-68.096l-21.76-5.4784-23.0912-5.1712-24.4224-4.7616c-20.8384-3.84-42.9056-7.168-66.048-9.984l-28.16-3.072-29.1328-2.5088c-24.576-1.792-50.0736-2.9184-76.1344-3.2256L512 409.6z" fill="#ffffff" p-id="4984"></path></svg>
\ No newline at end of file
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 2d89a113..bf9ab81a 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,11 +2,7 @@
   <div class="navbar navbar-flex-wrapper">
     <div class="leftMenu">
       <div class="navbar-flex-wrapper">
-        <hamburger
-          :is-active="sidebar.opened"
-          class="hamburger-container"
-          @toggleClick="toggleSideBar"
-        />
+        <hamburger :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
         <breadcrumb class="breadcrumb-container" />
       </div>
@@ -51,12 +47,8 @@
         <TopLang></TopLang>
       </div>
     </div>
-    <toggleRole
-      v-if="toggleRoleVisible"
-      :visible.sync="toggleRoleVisible"
-      :loading="toggleRoleLoading"
-      @save="loginByRole"
-    />
+    <toggleRole v-if="toggleRoleVisible" :visible.sync="toggleRoleVisible" :loading="toggleRoleLoading"
+      @save="loginByRole" />
   </div>
 </template>
 
@@ -192,12 +184,14 @@ export default {
   flex-direction: row;
   justify-content: space-between;
 }
+
 .navbar {
   height: 50px;
   overflow: hidden;
   // position: relative;
   background: #fff;
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+
   .hamburger-container {
     line-height: 46px;
     height: 100%;
@@ -219,6 +213,7 @@ export default {
     // float: right;
     height: 100%;
     line-height: 65px;
+
     // position: relative;
     &:focus {
       outline: none;
@@ -245,6 +240,7 @@ export default {
     .avatar-container {
       display: inline-block;
       margin-right: 200px;
+
       .user-avatar {
         margin-top: 5px;
         width: 40px;
@@ -252,16 +248,19 @@ export default {
         border-radius: 10px;
       }
     }
+
     .dropdown-container {
       // margin-left: 30px;
       // position: absolute;
       // right: 20px;
       // top: 0px;
       cursor: pointer;
+
       .el-icon-caret-bottom {
         font-size: 12px;
       }
     }
+
     .el-dropdown-link {
       color: #999c9e;
       cursor: pointer;
diff --git a/src/main.js b/src/main.js
index 9c67244c..83cb16e7 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,6 +1,6 @@
 
 import Vue from 'vue'
-// import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
+import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 // import { createVersionPolling } from "@/utils/version-polling.esm.js";
 import ElementUI, { MessageBox } from 'element-ui'
@@ -452,7 +452,7 @@ async function VueInit() {
       isOpen = false
       isLock = null
       zzSessionStorage.removeItem('isLock')
-      // DicomEvent.$emit('isLock', false)
+      DicomEvent.$emit('isLock', false)
       router.push("/login")
     }).then(() => {
       // _vm.$alert(lang === 'zh' ? '由于您长时间未操作，为保护您的数据安全已强制将您下线，如果需要继续操作请重新登陆！' : 'No operation for a long time non-operation, you have been forced logout to protect data security. If continue to operate, please login again!', {
@@ -473,7 +473,7 @@ async function VueInit() {
           if (_vm.$route.path === '/login') {
             zzSessionStorage.removeItem('lastWorkbench')
             zzSessionStorage.removeItem('isLock')
-            // DicomEvent.$emit('isLock', false)
+            DicomEvent.$emit('isLock', false)
             isLock = null
           }
           return
@@ -483,7 +483,7 @@ async function VueInit() {
         }
         isOpen = true
         zzSessionStorage.setItem('isLock', 'true')
-        // DicomEvent.$emit('isLock', true)
+        DicomEvent.$emit('isLock', true)
         _vm.$msgbox({
           title: _vm.$t("env:lock:msgBox:title"),
           confirmButtonText: _vm.$t("env:lock:msgBox:confirmButtonText"),
@@ -516,7 +516,7 @@ async function VueInit() {
                   count = 0;
                   isLock = null
                   zzSessionStorage.removeItem('isLock')
-                  // DicomEvent.$emit('isLock', false)
+                  DicomEvent.$emit('isLock', false)
                   localStorage.setItem('count', '0')
                   document.querySelector('#my_username').value = null
                   document.querySelector('#my_password').value = null
diff --git a/src/permission.js b/src/permission.js
index e0f2cc8f..1c06efac 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -15,7 +15,7 @@ NProgress.configure({ showSpinner: false })
 
 const whiteList = WHITELIST
 store.state.trials.whiteList = whiteList
-router.beforeEach(async(to, from, next) => {
+router.beforeEach(async (to, from, next) => {
   NProgress.start()
   // 设置页面标题
   // document.title = getPageTitle(to.meta.title) store.state.trials.whiteList.indexOf(to.path) === -1
@@ -60,7 +60,7 @@ router.beforeEach(async(to, from, next) => {
   Vue.prototype.toPath = to.path
   Vue.prototype.$path = []
   if (hasToken) {
-    if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
+    if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/link_expired' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {
         await OSSclient()
         await store.dispatch('user/logout')
@@ -92,8 +92,13 @@ router.beforeEach(async(to, from, next) => {
           await store.dispatch('user/getUserInfo')
           const accessRoutes = await store.dispatch('permission/generateRoutes')
           resetRouter()
-          router.addRoutes(accessRoutes)
-          next({ ...to, replace: true })
+          if (accessRoutes.length > 0) {
+            router.addRoutes(accessRoutes)
+            next({ ...to, replace: true })
+          } else {
+            next()
+          }
+
         } catch (error) {
           console.log(error)
           // 删除token并进入登录页面以重新登录
diff --git a/src/router/index.js b/src/router/index.js
index 368b8e35..93dbf25f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -128,6 +128,11 @@ export const constantRoutes = [
     hidden: true,
     component: () => import('@/views/none-dicom-show/index')
   },
+  {
+    path: '/none_dicoms',
+    hidden: true,
+    component: () => import('@/views/none-dicoms/index')
+  },
   {
     path: '/noneDicomReading',
     name: 'noneDicomReading',
@@ -144,6 +149,11 @@ export const constantRoutes = [
     hidden: true,
     component: () => import('@/views/trials/trials-panel/reading/dicoms/none-dicoms')
   },
+  {
+    path: '/ecrfList',
+    hidden: true,
+    component: () => import('@/views/trials/trials-panel/reading/dicoms/components/TableList')
+  },
   {
     path: '/readingPage',
     name: 'readingPage',
@@ -218,6 +228,12 @@ export const constantRoutes = [
     component: () => import('@/views/research/form'),
     hidden: true
   },
+  {
+    path: '/researchLog',
+    name: 'researchLog',
+    component: () => import('@/views/research/form'),
+    hidden: true
+  },
   {
     path: '/researchLogin_m',
     name: 'researchLogin_m',
@@ -278,6 +294,11 @@ export const constantRoutes = [
     component: () => import('@/views/error'),
     hidden: true
   },
+  {
+    path: '/link_expired',
+    component: () => import('@/views/linkExpired'),
+    hidden: true
+  },
   {
     path: '/404',
     component: () => import('@/views/404'),
diff --git a/src/store/modules/global.js b/src/store/modules/global.js
index 3c4ac997..280f8654 100644
--- a/src/store/modules/global.js
+++ b/src/store/modules/global.js
@@ -128,7 +128,14 @@ const actions = {
         if (response.IsSuccess) {
           var noticeList = []
           response.Result.forEach(el => {
-            noticeList.push({ Id: el.Id, Content: el.NoticeContent, NoticeTypeEnum: el.NoticeTypeEnum })
+            noticeList.push({
+              Id: el.Id,
+              Content: el.NoticeContent,
+              NoticeTypeEnum: el.NoticeTypeEnum,
+              PublishedTime: el.PublishedTime,
+              FileName: el.FileName,
+              Path: el.Path
+            })
           })
 
           commit('SET_NOTICE', noticeList)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3ecc4eab..8a932720 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -121,7 +121,7 @@ const actions = {
           localStorage.setItem('CompanyInfo', JSON.stringify(response.Result.CompanyInfo))
           const data = response.Result
           commit('SET_ROLES', data.BasicInfo.AccountList)
-          if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) {
+          if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1 || data.BasicInfo.IsNeedResetPwd) {
             try {
               zzSessionStorage.setItem('userId', data.BasicInfo.Id)
               commit('SET_TOKEN', data.JWTStr)
diff --git a/src/styles/index.scss b/src/styles/index.scss
index f28ee724..c19563d4 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -376,4 +376,8 @@ body .el-table th.gutter {
   height: 20px !important;
   vertical-align: -0.4em !important;
   cursor: pointer;
+}
+
+.mobile_confirm {
+  width: 200px;
 }
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index c16dc0a4..6b6e0713 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -21,6 +21,16 @@ var path
 
 service.interceptors.request.use(
   async config => {
+    if (config.url.includes("/Dictionary/getBasicDataSelect")) {
+      let query = router && router.app && router.app._route && router.app._route.query
+      if (query.trialId) {
+        let str = config.url.split("?")
+        config.url = `${str[0]}?TrialId=${query.trialId}`
+        if (str[1]) {
+          config.url += `&${str[1]}`
+        }
+      }
+    }
     path = router && router.app && router.app._route && router.app._route.path
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
     // config.baseURL = process.env.NODE_ENV === 'prod' ? "https://api.irc.extimaging.com" : '/api'
@@ -108,6 +118,9 @@ service.interceptors.response.use(
     if (res.IsSuccess) {
       return Promise.resolve(res)
     } else if (res.IsSuccess === false) {
+      if (res.Code === -4) {
+        return Promise.resolve(res)
+      }
       if (res.Code !== 5) {
         MessageBox.confirm(res.ErrorMessage, {
           type: 'warning',
diff --git a/src/utils/stream.js b/src/utils/stream.js
index dac09607..c92edb01 100644
--- a/src/utils/stream.js
+++ b/src/utils/stream.js
@@ -11,10 +11,10 @@ function zipFiles(zipName, files) {
             store.dispatch('trials/setUnLock', true)
             files = formatFiles(files)
             // 创建压缩文件输出流  
-            const zipFileOutputStream = streamSaver.createWriteStream(zipName);
+            let zipFileOutputStream = streamSaver.createWriteStream(zipName);
             // 创建下载文件流  
             const fileIterator = files.values();
-            const readableZipStream = new ZIP({
+            let readableZipStream = new ZIP({
                 async pull(ctrl) {
                     const fileInfo = fileIterator.next();
                     if (fileInfo.done) {//迭代终止  
@@ -41,9 +41,13 @@ function zipFiles(zipName, files) {
                     .then(() => {
                         console.log("同步下载打包结束时间：" + new Date());
                         store.dispatch('trials/setUnLock', false)
+                        readableZipStream = null;
+                        zipFileOutputStream = null;
                         resolve(true)
                     }).catch(err => {
                         console.log(err);
+                        readableZipStream = null;
+                        zipFileOutputStream = null;
                         resolve(false)
                     });
             } else {
@@ -61,14 +65,16 @@ async function updateFile(file, name) {
     return new Promise(async resolve => {
         try {
             store.dispatch('trials/setUnLock', true)
-            const fileOutputStream = streamSaver.createWriteStream(name);
+            let fileOutputStream = streamSaver.createWriteStream(name);
             // file = decodeUtf8(file);
             let res = await fetch(file);
             res.body.pipeTo(fileOutputStream).then(() => {
                 store.dispatch('trials/setUnLock', true)
+                fileOutputStream = null;
                 resolve(true)
             }).catch(err => {
                 console.log(err)
+                fileOutputStream = null;
                 resolve(false)
             });
         } catch (err) {
diff --git a/src/utils/whiteList.js b/src/utils/whiteList.js
index fc95b171..741ae39e 100644
--- a/src/utils/whiteList.js
+++ b/src/utils/whiteList.js
@@ -1,2 +1,2 @@
-const WHITELIST = ['/', "/curriculumVitae", 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms']
+const WHITELIST = ['/', "/curriculumVitae", 'researchDetail_m', '/researchForm', '/ReviewersResearch', '/login', '/link_expired', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms', '/ecrfList', '/researchLog']
 export default WHITELIST
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index e4f303ac..7856d3b6 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -20,13 +20,13 @@
                         :name="`${study.StudyId}`">
                         <template slot="title">
                           <div class="collapse-title-wrapper">
-                            <div class="text-desc">
+                            <div class="text-desc" v-if="IsReadingTaskViewInOrder !== 0">
                               {{ study.StudyCode }}
                             </div>
-                          <!-- <div v-show="study.Description" class="text-desc">
+                            <!-- <div v-show="study.Description" class="text-desc">
                             {{ study.Description }}
                           </div> -->
-                          <!-- <el-tooltip v-show="study.Description" class="item" effect="dark" :content="study.Description"
+                            <!-- <el-tooltip v-show="study.Description" class="item" effect="dark" :content="study.Description"
                             placement="bottom">
                             <div v-if="study.Description"
                               style="width: 50px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;padding: 1x;">
@@ -155,8 +155,8 @@
                   </div>
                 </div>
               </el-tab-pane>
-              <el-tab-pane v-show="!visitTaskId" :label="$t('trials:dicom-show:relatedVisit')" name="relation-study"
-                class="pane-relation-wrapper">
+              <el-tab-pane v-show="!visitTaskId" v-if="IsReadingTaskViewInOrder >= 2"
+                :label="$t('trials:dicom-show:relatedVisit')" name="relation-study" class="pane-relation-wrapper">
                 <div class="viewerSidethumbinner">
 
                   <el-collapse v-model="relationActiveName" @change="handelRelationActiveChange">
@@ -169,10 +169,10 @@
                           v-if="study.VisitName === item.VisitName">
                           <template slot="title">
                             <div class="collapse-title-wrapper">
-                              <div class="text-desc">
+                              <div class="text-desc" v-if="IsReadingTaskViewInOrder !== 0">
                                 {{ study.StudyCode }}
                               </div>
-                            <!-- <div v-show="study.Description" class="text-desc">
+                              <!-- <div v-show="study.Description" class="text-desc">
                         {{ study.Description }}
                       </div> -->
 
@@ -187,19 +187,18 @@
                           <div class="viewerSidethumbs ps" style="position: relative;">
                             <div class="viewerSidethumbinner">
                               <div v-for="(seriesItem, index) in study.seriesList" :key="seriesItem.seriesId">
-                                <div class="viewernavigatorwrapper"
-                                  style="position: relative;border:1px solid #434343;" series-type="relation"
+                                <div class="viewernavigatorwrapper" style="position: relative;border:1px solid #434343;"
+                                  series-type="relation"
                                   @click="showRelationSeriesImage($event, seriesItem, studyIndex, index)">
                                   <div class="imageBox" style="width: 72px;height:72px;">
-                                    <img class="image-preview" :src="seriesItem.previewImageUrl"
-                                      crossorigin="anonymous" alt="" style="width: 72px;height:72px;" fit="fill" />
+                                    <img class="image-preview" :src="seriesItem.previewImageUrl" crossorigin="anonymous"
+                                      alt="" style="width: 72px;height:72px;" fit="fill" />
                                     <i class="el-icon-refresh" :title="$t('tip:refreshImage')"
                                       @click.stop="refreshImage(item)"></i>
                                   </div>
 
                                   <div class="viewernavitextwrapper">
-                                    <div
-                                      style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
+                                    <div style="padding: 1px 5px 1px 1px;display: flex;justify-content: space-between;">
                                       <div v-if="seriesItem.keySeries" style="color:red">
                                         Key Images
                                       </div>
@@ -332,7 +331,8 @@ export default {
       visitTaskId: null,
       page: '',
       activeSeriesId: null,
-      activeInstanceId: null
+      activeInstanceId: null,
+      IsReadingTaskViewInOrder: 2
     }
   },
   mounted() {
@@ -351,6 +351,10 @@ export default {
     this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
     this.visitTaskId = this.$router.currentRoute.query.visitTaskId
     this.page = this.$route.query.page
+    if (this.$router.currentRoute.query.IsReadingTaskViewInOrder) {
+      this.IsReadingTaskViewInOrder = Number(this.$router.currentRoute.query.IsReadingTaskViewInOrder)
+    }
+    console.log(this.IsReadingTaskViewInOrder)
     this.beforeUnloadHandler = () => {
       cornerstone.imageCache.purgeCache()
       requestPoolManager.resetRequestPool()
@@ -951,7 +955,7 @@ export default {
       if (this.imageList.length > 0) {
         requestPoolManager.startTaskTimer()
         this.imageList.map(image => {
-          requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).catch(() => {})
+          requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).catch(() => { })
         })
         requestPoolManager.sortTaskPool()
         this.imageList = []
@@ -1338,6 +1342,7 @@ export default {
   border-color: #213a54 !important;
   background-color: #213a54;
 }
+
 .frame_content_active {
   border-color: #213a54 !important;
   background-color: #213a54;
diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 647bbd3c..00ba429f 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -26,11 +26,19 @@
     <el-table v-if="refreshTable" v-adaptive="{ bottomOffset: 45 }" v-loading="loading" height="100" :data="menuList"
       :default-expand-all="isExpandAll" row-key="Id" :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }">
       <!-- 模块 -->
-      <el-table-column prop="ModuleTypeValueCN" :label="$t('audit:label:moduleType')" show-overflow-tooltip align="left" min-width="230px" />
+      <el-table-column v-if="language === 'en'"  prop="ModuleTypeValue" :label="$t('audit:label:moduleType')" show-overflow-tooltip align="left" min-width="230px">
+      </el-table-column>
+      <el-table-column v-else prop="ModuleTypeValueCN" :label="$t('audit:label:moduleType')" show-overflow-tooltip align="left" min-width="230px">
+      </el-table-column>
       <!-- 操作名称 -->
-      <el-table-column prop="Description" :label="$t('audit:label:desc')" :show-overflow-tooltip="true" min-width="200px">
+      <el-table-column v-if="language === 'en'" prop="Description" :label="$t('audit:label:desc')" :show-overflow-tooltip="true" min-width="200px">
         <template slot-scope="scope">
-          <span>{{ scope.row.DescriptionCN }}（{{ scope.row.Description }}）</span>
+          <span>{{ scope.row.Description }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column v-else prop="DescriptionCN" :label="$t('audit:label:desc')" :show-overflow-tooltip="true" min-width="200px">
+        <template slot-scope="scope">
+          <span>{{ scope.row.DescriptionCN }}</span>
         </template>
       </el-table-column>
       <!-- 其他 -->
@@ -61,17 +69,20 @@
         </template>
       </el-table-column>
       <!-- 标识 -->
-      <el-table-column prop="Identification" :label="$t('audit:label:identification')" :show-overflow-tooltip="true" min-width="200px" />
+      <el-table-column prop="Identification" :label="$t('audit:label:identification')" :show-overflow-tooltip="true" min-width="120px" />
       <!-- 操作类型 -->
-      <el-table-column prop="OptTypeValueCN" :label="$t('audit:label:optType')" show-overflow-tooltip width="100px" />
+      <el-table-column v-if="language === 'en'" prop="OptTypeValue" :label="$t('audit:label:optType')" show-overflow-tooltip min-width="110px" />
+      <el-table-column v-else prop="OptTypeValueCN" :label="$t('audit:label:optType')" show-overflow-tooltip min-width="110px" />
       <!-- 对象类型 -->
-      <el-table-column prop="ObjectTypeValueCN" :label="$t('audit:label:objectType')" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="language === 'en'" prop="ObjectTypeValue" :label="$t('audit:label:objectType')" show-overflow-tooltip width="100px" />
+      <el-table-column v-else prop="ObjectTypeValueCN" :label="$t('audit:label:objectType')" show-overflow-tooltip min-width="100px" />
       <!-- 数据类型 -->
-      <el-table-column prop="ChildrenTypeValueCN" :label="$t('audit:label:dataType')" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-if="language === 'en'" prop="ChildrenTypeValue" :label="$t('audit:label:dataType')" show-overflow-tooltip min-width="100px" />
+      <el-table-column v-else prop="ChildrenTypeValueCN" :label="$t('audit:label:dataType')" show-overflow-tooltip min-width="100px" />
       <!-- 显示顺序 -->
-      <el-table-column prop="Sort" :label="$t('audit:label:sort')" min-width="80" show-overflow-tooltip />
+      <el-table-column prop="Sort" :label="$t('audit:label:sort')" min-width="100" show-overflow-tooltip />
       <!-- 启用 -->
-      <el-table-column :label="$t('audit:label:isEnable')" align="center" prop="CreateTime" min-width="80">
+      <el-table-column :label="$t('audit:label:isEnable')" align="center" prop="CreateTime" min-width="90">
         <!-- 启用/禁用 -->
         <template slot-scope="scope">
           <!-- <el-tag v-if="scope.row.IsEnable" size="success">启用</el-tag>
@@ -81,7 +92,7 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('common:action:action')" align="center" fixed="right" min-width="340" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('common:action:action')" align="center" fixed="right" width="290" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <!-- 上移 -->
           <el-button
@@ -659,7 +670,7 @@ import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import Sortable from 'sortablejs'
 import BaseModel from "@/components/BaseModel";
-
+import { mapGetters } from 'vuex'
 export default {
   name: 'CheckConfig',
   dicts: ['OptType', 'ObjectType', 'ModuleType', 'ChildrenType'],
@@ -715,6 +726,9 @@ export default {
     this.getList();
     this.getDictionaryCodeList();
   },
+  computed: {
+    ...mapGetters(['language'])
+  },
   methods: {
     querySearch(queryString, cb) {
       var DictionaryCodeList = this.DictionaryCodeList;
diff --git a/src/views/dictionary/institutions/components/CROs.vue b/src/views/dictionary/institutions/components/CROs.vue
index 3770a62b..829302b6 100644
--- a/src/views/dictionary/institutions/components/CROs.vue
+++ b/src/views/dictionary/institutions/components/CROs.vue
@@ -1,7 +1,7 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" class="base-search-form">
+      <el-form :inline="true" class="base-search-form" @submit.native.prevent="">
         <!-- CRO Name -->
         <el-form-item :label="$t('institutions:cros:label:croName')">
           <el-input v-model="searchData.CROName" style="width: 100px" />
diff --git a/src/views/dictionary/institutions/components/Sponsors.vue b/src/views/dictionary/institutions/components/Sponsors.vue
index 28b55543..03ceb26f 100644
--- a/src/views/dictionary/institutions/components/Sponsors.vue
+++ b/src/views/dictionary/institutions/components/Sponsors.vue
@@ -1,7 +1,7 @@
 <template>
   <box-content>
     <div class="search">
-      <el-form :inline="true" class="base-search-form">
+      <el-form :inline="true" class="base-search-form" @submit.native.prevent="">
         <!-- Sponsor Name -->
         <el-form-item :label="$t('institutions:sponsors:label:sponsorName')">
           <el-input v-model="searchData.SponsorName" style="width: 100px" />
diff --git a/src/views/linkExpired.vue b/src/views/linkExpired.vue
new file mode 100644
index 00000000..26dd8f10
--- /dev/null
+++ b/src/views/linkExpired.vue
@@ -0,0 +1,276 @@
+<template>
+  <div class="wscn-http404-container">
+    <div class="wscn-http404" style="display: flex;align-items: center;flex-wrap: wrap;justify-content: center;">
+      <div class="pic-404">
+        <!-- <img class="pic-404__parent" src="@/assets/login-bg.png" alt="404"> -->
+        <svg-icon icon-class="login-bg" style="width: 100%; height: 100%" />
+        <img class="pic-404__child left" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__child mid" src="@/assets/404_images/404_cloud.png" alt="404">
+        <img class="pic-404__child right" src="@/assets/404_images/404_cloud.png" alt="404">
+      </div>
+      <div class="bullshit">
+        <div class="bullshit__oops" style="color: #428bca">{{ $t('trials:researchForm:title:IsExpired') }}!</div>
+        <!-- <div class="bullshit__headline">{{ $t('trials:researchForm:title:IsExpired') }}</div> -->
+        <!-- <div class="bullshit__return-home" style="background: #428bca" @click="$router.push({ path: '/login' })">{{
+          $t('common:title:goHome') }}</div> -->
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+
+export default {
+  computed: {
+
+    ...mapGetters([
+      'asyncRoutes',
+      'routes',
+      'language'
+    ]),
+  },
+  mounted() {
+    let lang = this.$route.query.lang
+    if (!lang) {
+      const language = navigator.language
+      lang = 'en'
+      if (language.includes("zh")) {
+        lang = 'zh'
+      }
+    }
+    this.$i18n.locale = lang
+    this.setLanguage(lang)
+    this.$updateDictionary()
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.wscn-http404-container {
+  transform: translate(-50%, -50%);
+  position: absolute;
+  top: 40%;
+  left: 50%;
+  width: 100%;
+}
+
+.wscn-http404 {
+  position: relative;
+  width: 100%;
+  padding: 0 50px;
+  overflow: hidden;
+
+  .pic-404 {
+    position: relative;
+    float: left;
+    width: 100%;
+    max-width: 500px;
+    height: 300px;
+    overflow: hidden;
+    margin-right: 10px;
+
+    &__parent {
+      width: 100%;
+    }
+
+    &__child {
+      position: absolute;
+
+      &.left {
+        width: 80px;
+        top: 17px;
+        left: 220px;
+        opacity: 0;
+        animation-name: cloudLeft;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1s;
+      }
+
+      &.mid {
+        width: 46px;
+        top: 10px;
+        left: 420px;
+        opacity: 0;
+        animation-name: cloudMid;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1.2s;
+      }
+
+      &.right {
+        width: 62px;
+        top: 100px;
+        left: 500px;
+        opacity: 0;
+        animation-name: cloudRight;
+        animation-duration: 2s;
+        animation-timing-function: linear;
+        animation-fill-mode: forwards;
+        animation-delay: 1s;
+      }
+
+      @keyframes cloudLeft {
+        0% {
+          top: 17px;
+          left: 220px;
+          opacity: 0;
+        }
+
+        20% {
+          top: 33px;
+          left: 188px;
+          opacity: 1;
+        }
+
+        80% {
+          top: 81px;
+          left: 92px;
+          opacity: 1;
+        }
+
+        100% {
+          top: 97px;
+          left: 60px;
+          opacity: 0;
+        }
+      }
+
+      @keyframes cloudMid {
+        0% {
+          top: 10px;
+          left: 420px;
+          opacity: 0;
+        }
+
+        20% {
+          top: 40px;
+          left: 360px;
+          opacity: 1;
+        }
+
+        70% {
+          top: 130px;
+          left: 180px;
+          opacity: 1;
+        }
+
+        100% {
+          top: 160px;
+          left: 120px;
+          opacity: 0;
+        }
+      }
+
+      @keyframes cloudRight {
+        0% {
+          top: 100px;
+          left: 500px;
+          opacity: 0;
+        }
+
+        20% {
+          top: 120px;
+          left: 460px;
+          opacity: 1;
+        }
+
+        80% {
+          top: 180px;
+          left: 340px;
+          opacity: 1;
+        }
+
+        100% {
+          top: 200px;
+          left: 300px;
+          opacity: 0;
+        }
+      }
+    }
+  }
+
+  .bullshit {
+    position: relative;
+    float: left;
+    width: 300px;
+    padding: 30px 0;
+    overflow: hidden;
+
+    &__oops {
+      font-size: 32px;
+      font-weight: bold;
+      line-height: 40px;
+      color: #1482f0;
+      opacity: 0;
+      margin-bottom: 20px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-fill-mode: forwards;
+      text-align: center;
+    }
+
+    &__headline {
+      font-size: 20px;
+      line-height: 24px;
+      color: #222;
+      font-weight: bold;
+      opacity: 0;
+      margin-bottom: 10px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.1s;
+      animation-fill-mode: forwards;
+    }
+
+    &__info {
+      font-size: 13px;
+      line-height: 21px;
+      color: grey;
+      opacity: 0;
+      margin-bottom: 30px;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.2s;
+      animation-fill-mode: forwards;
+    }
+
+    &__return-home {
+      display: block;
+      float: left;
+      width: 110px;
+      height: 36px;
+      background: #1482f0;
+      border-radius: 100px;
+      text-align: center;
+      color: #ffffff;
+      opacity: 0;
+      font-size: 14px;
+      line-height: 36px;
+      cursor: pointer;
+      animation-name: slideUp;
+      animation-duration: 0.5s;
+      animation-delay: 0.3s;
+      animation-fill-mode: forwards;
+    }
+
+    @keyframes slideUp {
+      0% {
+        transform: translateY(60px);
+        opacity: 0;
+      }
+
+      100% {
+        transform: translateY(0);
+        opacity: 1;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 41bae11a..7d853e62 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -154,7 +154,7 @@
           <!-- {{ $t('login:title:system_title_about') }} -->
           <img src="@/assets/system.png" alt=""
             :style="{ width: isEN ? '180px' : '200px', height: isEN ? '60px' : '65px' }" />
-        <p style="margin-bottom: 0px">{{ $t('login:title:system') }}</p>
+          <p style="margin-bottom: 0px">{{ $t('login:title:system') }}</p>
         </div>
         <p style="margin-bottom: 20px; margin-top: 0">
           V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
@@ -372,6 +372,15 @@ export default {
               })
             }, 500)
             return
+          } else if (res.BasicInfo.IsNeedResetPwd) {
+            // 当前用户管理员重置密码,请先修改密码之后再次登录
+            this.$message.success(this.$t('login:message:login5'))
+            setTimeout(() => {
+              this.$router.push({
+                path: `/user-recompose?UserId=${res.BasicInfo.IdentityUserId}&Email=${res.BasicInfo.EMail}&UserName=${res.BasicInfo.UserName}&lang=${this.$i18n.locale}&access_token=${res.JWTStr}&isUpdate=1`,
+              })
+            }, 500)
+            return
           } else if (res.BasicInfo.NeedChangePassWord) {
             // 请先修改密码后再登录！
             this.$alert(
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index e567c054..f5d1bac6 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -153,7 +153,8 @@ export default {
       isAudit: false,
 
       activeNames: [],
-      Asc: false
+      Asc: false,
+      IsReadingTaskViewInOrder: 2
     }
   },
   async created() {
@@ -165,6 +166,9 @@ export default {
       store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
       changeURLStatic('TokenKey', '')
     }
+    if (this.$router.currentRoute.query.IsReadingTaskViewInOrder) {
+      this.IsReadingTaskViewInOrder = Number(this.$router.currentRoute.query.IsReadingTaskViewInOrder)
+    }
     this.subjectVisitId = this.$router.currentRoute.query.subjectVisitId
     this.studyId = this.$router.currentRoute.query.studyId
     this.getNoneDicomList()
diff --git a/src/views/none-dicoms/components/file-viewer.vue b/src/views/none-dicoms/components/file-viewer.vue
new file mode 100644
index 00000000..cad4cbc0
--- /dev/null
+++ b/src/views/none-dicoms/components/file-viewer.vue
@@ -0,0 +1,1277 @@
+<template>
+  <div class="none-dicom-viewer">
+    <!-- viewports -->
+    <div class="viewports-wrapper" v-loading="loading" ref="viewports-wrapper">
+      <div ref="container" class="grid-container" :style="gridStyle">
+        <div v-for="(v, index) in viewportInfos" :ref="`grid-cell-${index}`" :key="index" :style="getCellStyle(index)"
+          :class="['grid-cell', index === activeCanvasIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
+          @dblclick="toggleFullScreen($event, index)" @click="activeCanvas(index)"
+          @mouseup="sliderMouseup($event, index)" @mousemove="sliderMousemove($event, index)"
+          @mouseleave="sliderMouseleave($event, index)">
+          <div v-show="imageType.includes(v.fileType)" :ref="`canvas-${index}`" class="content">
+            <div class="left-top-text">
+              <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
+              <div v-if="v.imageIds.length > 0">{{ `${v.currentImageIdIndex + 1} / ${v.imageIds.length}` }}</div>
+              <div v-if="isComparison" style="font-size: 30px;color: #428bca;margin-top: 10px;">{{ tip[index] }}</div>
+            </div>
+            <div class="left-bottom-text">
+              <div v-if="v.zoomText">{{ `Zoom: ${v.zoomText}` }}</div>
+            </div>
+            <div :ref="`sliderBox-${index}`" class="right-slider-box" @click.stop="clickSlider($event, index)">
+              <div :style="{ top: v.height + '%' }" class="slider" @click.stop.prevent="() => { return }"
+                @mousedown.stop="sliderMousedown($event, index)" />
+            </div>
+          </div>
+          <div v-if="v.fileType === 'application/pdf' && fullScreenIndex === null" class="content flex_col">
+            <div class="content-top" style="height: 50px;">
+              <div class="left-top-text">
+                <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
+              </div>
+            </div>
+            <div class="content-main" style="flex: 1;">
+              <iframe v-if="v.currentFilePath" :ref="`iframe-${index}`"
+                :src="`/static/pdfjs/web/viewer.html?file=${OSSclientConfig.basePath}${v.currentFilePath}?index=${index}`"
+                width="100%" height="100%" frameborder="0" crossorigin="anonymous" />
+            </div>
+
+          </div>
+
+          <div v-if="v.fileType.includes('mp4')" class="content flex_col">
+            <div class="content-top" style="height: 50px;">
+              <div class="left-top-text">
+                <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
+              </div>
+            </div>
+            <div class="content-main" :ref="`video-content-main-${index}`" style="flex: 1;">
+              <video v-if="v.currentFilePath" :ref="`videovideo-${index}`"
+                :src="`${OSSclientConfig.basePath}${v.currentFilePath}`" crossorigin="anonymous" width="100%"
+                height="100%" autoplay controls controlsList="nodownload"></video>
+            </div>
+
+          </div>
+
+          <div v-if="v.fileType.includes('zip')" class="content flex_col">
+            <img :title="v.FileName" crossorigin="anonymous" :src="zipImg" height="100%"/>
+          </div>
+        </div>
+      </div>
+      <div class="Anonymous" v-if="isAnonymous">
+        <div
+          :class="{ btn: true, activeBtn: activeTool === 'Note_RectangleRoi' && !isComparison, isNoted: isComparison }"
+          @click="setToolActive('Note_RectangleRoi')">{{
+            $t('DicomViewer:anonymous:Note_RectangleRoi') }}</div>
+        <div :class="{ btn: true, activeBtn: activeTool === 'Eraser' && !isComparison, isNoted: isComparison }"
+          @click="setToolActive('Eraser')">{{
+            $t('DicomViewer:anonymous:Eraser') }}
+        </div>
+        <div :class="{ btn: true, isNoted: isComparison }" @click="anonymousImage(false)">{{
+          $t('DicomViewer:anonymous:Application') }}</div>
+        <!-- <div class="btn">刷新图像</div> -->
+        <div class="btn" v-if="!isComparison" @click="comparison(true)">{{
+          $t('DicomViewer:anonymous:Comparison') }}</div>
+        <div class="btn" v-else @click="comparison(false)">{{
+          $t('DicomViewer:anonymous:Exit') }}</div>
+        <div :class="{ btn: true }" @click="recovery(false)">{{
+          $t('DicomViewer:anonymous:Recovery') }}</div>
+        <!-- <div :class="{ btn: true }" @click="recovery(true)">{{
+          $t('DicomViewer:anonymous:RecoveryAll') }}</div> -->
+      </div>
+    </div>
+    <!-- tools -->
+    <div class="dicom-tools">
+      <div class="measureTool-wrapper" v-if="hasAnonymous && hasPermi(['role:iqc'])">
+        <div class="sideTool-title">{{ $t('DicomViewer:anonymous:PixelAnonymity') }}</div>
+        <div class="sideTool-wrapper">
+          <!-- <label>{{ $t('trials:reading:button:layout') }}:</label> -->
+          <!-- <select class="sidetool-select" style="width:90px" :value="layout.replace('*', 'x')"
+            @change="handleLayoutChange">
+            <option value="1x1">1x1</option>
+            <option value="1x2">1x2</option>
+            <option value="2x1">2x1</option>
+            <option value="2x2">2x2</option>
+          </select> -->
+          <div :class="{ btnBox: true, activeBtnBox: isAnonymous }" @click="openAnonymous">{{
+            $t('DicomViewer:anonymous:PixelAnonymity')
+          }}
+          </div>
+        </div>
+      </div>
+      <!-- 图像变换 -->
+      <div class="measureTool-wrapper">
+        <div class="sideTool-title">{{ $t('trials:dicom-show:transform') }}</div>
+        <div class="sideTool-wrapper">
+          <button :title="$t('trials:reading:button:zoom')"
+            :class="{ 'btn-link': true, activeTool: activeTool === 'Zoom' }" data-tool="Zoom"
+            @click="setToolActive('Zoom')">
+            <svg-icon icon-class="magnifier" style="font-size:20px;" />
+          </button>
+          <button :title="$t('trials:reading:button:move')"
+            :class="{ 'btn-link': true, activeTool: activeTool === 'Pan' }" data-tool="Pan"
+            @click="setToolActive('Pan')">
+            <svg-icon icon-class="move" style="font-size:20px;" />
+          </button>
+          <button :title="$t('trials:reading:button:rotate')"
+            :class="{ 'btn-link': true, activeTool: activeTool === 'PlanarRotate' }" data-tool="PlanarRotate"
+            @click="setToolActive('PlanarRotate')">
+            <svg-icon icon-class="rotate" style="font-size:20px;" />
+          </button>
+          <button
+            :title="isFitToWindowMode ? $t('trials:reading:button:fitImage') : $t('trials:reading:button:fitWindow')"
+            class="btn-link" @click="toggleFitMode">
+            <svg-icon v-if="isFitToWindowMode" icon-class="fitToImage" style="font-size:20px;" />
+            <svg-icon v-else icon-class="fitToWindow" style="font-size:20px;" />
+          </button>
+          <button :title="$t('trials:reading:button:reset')" class="btn-link" @click="resetViewport">
+            <svg-icon icon-class="refresh" style="font-size:20px;" />
+          </button>
+        </div>
+      </div>
+      <!-- 测量工具 -->
+      <!-- <div class="measureTool-wrapper">
+        <div class="sideTool-title">{{ $t('trials:dicom-show:measurementLabeling') }}</div>
+        <div class="sideTool-wrapper">
+          <button :title="$t('trials:reading:button:screenShot')" class="btn-link" @click="saveImage">
+            <svg-icon icon-class="image" style="font-size:20px;" />
+          </button>
+          <button :title="$t('trials:reading:button:reset')" class="btn-link" @click="resetViewport">
+            <svg-icon icon-class="refresh" style="font-size:20px;" />
+          </button>
+        </div>
+      </div> -->
+    </div>
+  </div>
+</template>
+<script>
+
+import {
+  RenderingEngine,
+  Enums,
+  imageLoader,
+  metaData,
+  getRenderingEngine,
+  eventTarget,
+  utilities as csUtils
+  // getEnabledElementByIds
+} from '@cornerstonejs/core'
+
+import * as cornerstoneTools from '@cornerstonejs/tools'
+import LengthscaleTool from "@/views/trials/trials-panel/reading/visit-review/tools/LengthscaleTool"
+import initLibraries from '@/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initLibraries'
+import hardcodedMetaDataProvider from '@/views/trials/trials-panel/reading/visit-review/js/hardcodedMetaDataProvider'
+import registerWebImageLoader from '@/views/trials/trials-panel/reading/visit-review/js/registerWebImageLoader'
+import Note_RectangleRoiTool from '@/views/trials/trials-panel/reading/dicoms3D/components/tools/Note_RectangleRoiTool'
+import { noneDicomStudyMaskImage, noneDicomStudyUndoMaskImage } from "@/api/reading"
+import zipImg from '@/assets/zip.png'
+const { ViewportType } = Enums
+const renderingEngineId = 'myRenderingEngine'
+const {
+  ToolGroupManager,
+  Enums: csToolsEnums,
+  StackScrollTool,
+  PanTool,
+  ZoomTool,
+  PlanarRotateTool,
+  ArrowAnnotateTool,
+  RectangleROITool,
+  PlanarFreehandROITool,
+  SplineROITool,
+  EraserTool,
+  LengthTool,
+  EllipticalROITool,
+  CircleROITool,
+  AngleTool,
+  BidirectionalTool,
+  // cursors
+  annotation
+} = cornerstoneTools
+const newStyles = {
+  global: {
+    color: 'rgb(255, 0, 0)',
+    colorHighlighted: 'rgb(0, 255, 0)',
+    colorSelected: 'rgb(255, 0, 0)',
+    colorLocked: 'rgb(255, 0, 0)',
+    lineWidth: '1',
+    lineDash: '',
+    shadow: true,
+    textBoxVisibility: true,
+    textBoxFontFamily: 'Helvetica Neue, Helvetica, Arial, sans-serif',
+    textBoxFontSize: '14px',
+    textBoxColor: 'rgb(255, 0, 0)',
+    textBoxColorHighlighted: 'rgb(0, 255, 0)',
+    textBoxColorSelected: 'rgb(255, 0, 0)',
+    textBoxColorLocked: 'rgb(255, 0, 0)',
+    textBoxBackground: '',
+    textBoxLinkLineWidth: '1',
+    textBoxLinkLineDash: '2,3',
+    textBoxShadow: true,
+    markerSize: '10'
+  }
+}
+cornerstoneTools.annotation.config.style.setDefaultToolStyles(newStyles)
+const { MouseBindings, Events: toolsEvents } = csToolsEnums
+export default {
+  name: 'ImageViewer',
+  data() {
+    return {
+      hasAnonymous: false,
+      isAnonymous: false,
+      isComparison: false,
+      rows: 1,
+      cols: 1,
+      fullScreenIndex: null,
+      imageIds: [],
+      layout: '1*1',
+      cellsMax: 4,
+      activeTool: '',
+      imageType: ['image/jpeg', 'image/jpg', 'image/bmp', 'image/png'],
+      loading: false,
+      isFitToWindowMode: true,
+      trialId: null,
+      activeName: '1',
+      tools: [],
+      viewportInfos: [],
+      activeCanvasIndex: 0,
+      serie: {},
+      tip: [
+        this.$t('DicomViewer:anonymous:after'),
+        this.$t('DicomViewer:anonymous:before')
+      ],
+      zipImg
+    }
+  },
+  computed: {
+    gridStyle() {
+      return {
+        display: 'grid',
+        gridTemplateRows: `repeat(${this.rows}, 1fr)`,
+        gridTemplateColumns: `repeat(${this.cols}, 1fr)`,
+        height: '100%',
+        width: '100%'
+      }
+    },
+    cellStyle() {
+      return {
+        border: '1px dashed #ccc',
+        display: 'flex',
+        alignItems: 'center',
+        justifyContent: 'center'
+      }
+    },
+    cells() {
+      return Array(this.rows * this.cols).fill(0)
+    }
+  },
+  mounted() {
+    // let type = this.$router.currentRoute.query.isQcCheck ? this.$router.currentRoute.query.type : ''
+    this.hasAnonymous = this.$router.currentRoute.query.isQcCheck
+    this.tools = config.customizeStandardsNoneDicom
+    this.trialId = this.$route.query.trialId
+    this.viewportInfos = Array.from({ length: this.cellsMax }, (_, index) => ({
+      index: index,
+      studyId: '',
+      currentImageIdIndex: 0,
+      viewportId: `canvas-${index}`,
+      fileType: '',
+      currentFileName: '',
+      currentFilePath: '',
+      imageIds: [],
+      oldB: null,
+      oldM: null,
+      isMove: false,
+      height: 0,
+      zoomText: ''
+    }))
+    this.initLoader()
+    this.$refs['viewports-wrapper'].addEventListener('wheel', (e) => {
+      this.setToolsPassive()
+    });
+  },
+  methods: {
+    // 对比
+    comparison(f) {
+      this.setToolsPassive()
+      if (f) {
+        if (!this.serie.fileInfo.IsBeMark) return this.$confirm(this.$t("DicomViewer:anonymous:notMasked"))
+        this.isComparison = f
+        this.$emit("update:isComparison", this.isComparison)
+        const toolGroup = ToolGroupManager.getToolGroup(`canvas-0`)
+        toolGroup.setToolEnabled(StackScrollTool.toolName)
+        this.handleLayoutChange({
+          target: {
+            value: `1x2`
+          }
+        })
+        let path = this.serie.fileInfo.Path.split(".MaskNoneDicom_")[0]
+        let imageIds = [`web:${this.OSSclientConfig.basePath}${path}`]
+        let file = Object.assign({}, this.serie.fileInfo)
+        file.Path = path
+        file.FullFilePath = path
+        this.viewportInfos[1] = Object.assign({}, this.viewportInfos[0])
+        this.viewportInfos[1].fileList = [file]
+        this.viewportInfos[1].imageIds = imageIds
+        console.log(imageIds, 'imageIds')
+        if (imageIds.length > 0) {
+          this.renderImage(imageIds, 1, 0)
+        }
+      } else {
+        this.isComparison = f
+        this.$emit("update:isComparison", this.isComparison)
+        const toolGroup = ToolGroupManager.getToolGroup(`canvas-0`)
+        toolGroup.setToolActive(StackScrollTool.toolName, {
+          bindings: [{ mouseButton: MouseBindings.Wheel }]
+        })
+        this.handleLayoutChange({
+          target: {
+            value: `1x1`
+          }
+        })
+        this.activeCanvasIndex = 0
+        this.$emit('toggleImage', {
+          studyId: this.serie.studyId,
+          path: this.serie.fileInfo.Path,
+        })
+      }
+    },
+    // 恢复
+    async recovery() {
+      // if (this.isComparison) return false
+      if (!this.serie.fileInfo.IsBeMark) return this.$confirm(this.$t("DicomViewer:anonymous:notMasked"))
+      if (this.isAnonymous) {
+        this.comparison(false)
+      }
+      this.setToolsPassive()
+      let data = {
+        // NodicomStudyId: this.serie.studyId,
+        NoneDicomStudyFileIdList: [
+          this.serie.fileInfo.Id
+        ],
+      }
+      let res = await this.noneDicomStudyUndoMaskImage(data)
+      if (!res) return false
+      let file = res.find(item => item.Id === this.serie.fileInfo.Id)
+      this.$emit('replaceImage', {
+        studyId: this.serie.studyId,
+        path: this.serie.fileInfo.Path,
+        file,
+        IsBeMark: false
+      })
+    },
+    // 应用
+    async anonymousImage() {
+      if (this.isComparison) return false
+      this.setToolsPassive()
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine.getViewport(`canvas-${this.activeCanvasIndex}`)
+      let imageId = viewport.getCurrentImageId()
+      console.log(imageId);
+      let annotations = annotation.state.getAllAnnotations().filter(item => item.metadata.toolName === "Note_RectangleRoi" && item.metadata.referencedImageId === imageId)
+      if (annotations.length <= 0) return false
+      console.log(annotations)
+      let data = {
+        // NodicomStudyId: this.serie.studyId,
+        NoneDicomStudyFileIdList: [
+          this.serie.fileInfo.Id
+        ],
+        MaskRegionList: []
+      }
+      annotations.forEach(item => {
+        let points = item.data.handles.points
+        let currentStart = points[0]
+        let currentEnd = points[3]
+        let start = {
+          x: currentStart[0] > currentEnd[0] ? Math.round(currentEnd[0]) : Math.round(currentStart[0]),
+          y: currentStart[1] > currentEnd[1] ? Math.round(currentEnd[1]) : Math.round(currentStart[1]),
+        }
+        let end = {
+          x: currentStart[0] > currentEnd[0] ? Math.round(currentStart[0]) : Math.round(currentEnd[0]),
+          y: currentStart[1] > currentEnd[1] ? Math.round(currentStart[1]) : Math.round(currentEnd[1]),
+        }
+        let width = end.x - start.x
+        let height = end.y - start.y
+        data.MaskRegionList.push({
+          X: start.x,
+          Y: start.y,
+          Width: width,
+          Height: height
+        })
+      })
+      let res = await this.noneDicomStudyMaskImage(data)
+      if (!res || res.length <= 0) return this.$confirm(this.$t("DicomViewer:anonymous:studyMaskImageFail"))
+      annotations.forEach(item => {
+        annotation.state.removeAnnotation(item.annotationUID)
+      })
+      let file = res.find(item => item.Id === this.serie.fileInfo.Id)
+      this.$emit('replaceImage', {
+        studyId: this.serie.studyId,
+        path: this.serie.fileInfo.Path,
+        file,
+        IsBeMark: true
+      })
+    },
+    openAnonymous() {
+      if (this.loading || this.isComparison) return false
+      this.isAnonymous = !this.isAnonymous
+      // if (!this.isAnonymous) {
+      //   const elements = document.querySelectorAll('.dicom-item')
+      //   const scope = this
+      //   Array.from(elements).forEach((element, index) => {
+      //     if (element.style.display !== 'none') {
+      //       scope.$refs[`dicomCanvas${index}`].setToolPassive(scope.activeTool)
+      //     }
+      //   })
+      //   scope.activeTool = null
+      // } else {
+      //   this.activateDicomCanvas(0)
+      //   this.changeLayout('1x1')
+      // }
+    },
+    async noneDicomStudyMaskImage(data) {
+      try {
+        this.loading = true
+        let res = await noneDicomStudyMaskImage(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          return res.Result.OkList
+        }
+        return false
+      } catch (err) {
+        console.log(err)
+        this.loading = false
+        return false
+      }
+    },
+    async noneDicomStudyUndoMaskImage(data) {
+      try {
+        this.loading = true
+        let res = await noneDicomStudyUndoMaskImage(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          return res.Result.OkList
+        }
+        return false
+      } catch (err) {
+        console.log(err)
+        this.loading = false
+        return false
+      }
+    },
+    showPanel(e) {
+      e.currentTarget.firstChild.lastChild.style.display = 'block'
+    },
+    toolMouseout(e) {
+      e.currentTarget.firstChild.lastChild.style.display = 'none'
+    },
+    // 初始化加载器
+    async initLoader() {
+      registerWebImageLoader(imageLoader)
+      await initLibraries()
+
+      let renderingEngine = getRenderingEngine(renderingEngineId)
+      if (!renderingEngine) {
+        renderingEngine = new RenderingEngine(renderingEngineId)
+      }
+      const resizeObserver = new ResizeObserver(() => {
+        const renderingEngine = getRenderingEngine(renderingEngineId)
+        if (renderingEngine) {
+          renderingEngine.resize(true, false)
+          this.$nextTick(() => {
+            this.reapplyFitModeForVisibleViewports()
+          })
+        }
+      })
+      const element1 = this.$refs['canvas-0'][0]
+      const element2 = this.$refs['canvas-1'][0]
+      const element3 = this.$refs['canvas-2'][0]
+      const element4 = this.$refs['canvas-3'][0]
+      const elements = [
+        element1,
+        element2,
+        element3,
+        element4
+      ]
+      elements.forEach((element, i) => {
+        element.oncontextmenu = (e) => e.preventDefault()
+        resizeObserver.observe(element)
+        element.addEventListener('CORNERSTONE_STACK_NEW_IMAGE', this.stackNewImage)
+        element.addEventListener('CORNERSTONE_IMAGE_RENDERED', this.handleImageRendered)
+      })
+      const viewportInputArray = [
+        {
+          viewportId: 'canvas-0',
+          type: ViewportType.STACK,
+          element: element1
+        },
+        {
+          viewportId: 'canvas-1',
+          type: ViewportType.STACK,
+          element: element2
+        },
+        {
+          viewportId: 'canvas-2',
+          type: ViewportType.STACK,
+          element: element3
+        },
+        {
+          viewportId: 'canvas-3',
+          type: ViewportType.STACK,
+          element: element4
+        }
+      ]
+      const viewportIds = ['canvas-0', 'canvas-1', 'canvas-2', 'canvas-3']
+      renderingEngine.setViewports(viewportInputArray)
+      cornerstoneTools.addTool(StackScrollTool)
+      cornerstoneTools.addTool(PanTool)
+      cornerstoneTools.addTool(ZoomTool)
+      cornerstoneTools.addTool(PlanarRotateTool)
+      cornerstoneTools.addTool(ArrowAnnotateTool)
+      cornerstoneTools.addTool(RectangleROITool)
+      cornerstoneTools.addTool(EllipticalROITool)
+      cornerstoneTools.addTool(CircleROITool)
+      cornerstoneTools.addTool(AngleTool)
+      cornerstoneTools.addTool(PlanarFreehandROITool)
+      cornerstoneTools.addTool(SplineROITool)
+      cornerstoneTools.addTool(EraserTool)
+      cornerstoneTools.addTool(Note_RectangleRoiTool)
+      cornerstoneTools.addTool(LengthTool)
+      cornerstoneTools.addTool(LengthscaleTool)
+      cornerstoneTools.addTool(BidirectionalTool)
+      viewportIds.forEach((viewportId, i) => {
+        const toolGroupId = `canvas-${i}`
+        const toolGroup = ToolGroupManager.createToolGroup(toolGroupId)
+        toolGroup.addViewport(viewportId, renderingEngineId)
+        toolGroup.addTool(StackScrollTool.toolName)
+        toolGroup.addTool(PanTool.toolName)
+        toolGroup.addTool(ZoomTool.toolName)
+        toolGroup.addTool(PlanarRotateTool.toolName)
+        toolGroup.addTool(ArrowAnnotateTool.toolName)
+        toolGroup.addTool(RectangleROITool.toolName)
+        toolGroup.addTool(BidirectionalTool.toolName)
+        toolGroup.addTool(EllipticalROITool.toolName)
+        toolGroup.addTool(CircleROITool.toolName)
+        toolGroup.addTool(AngleTool.toolName)
+        toolGroup.addTool(PlanarFreehandROITool.toolName)
+        toolGroup.addTool(SplineROITool.toolName)
+
+        toolGroup.addTool(EraserTool.toolName)
+        toolGroup.addTool(Note_RectangleRoiTool.toolName)
+        toolGroup.addTool(LengthTool.toolName)
+        toolGroup.addTool(LengthscaleTool.toolName)
+
+        toolGroup.setToolActive(StackScrollTool.toolName, {
+          bindings: [{ mouseButton: MouseBindings.Wheel }]
+        })
+        toolGroup.setToolPassive(PanTool.toolName)
+        toolGroup.setToolPassive(ZoomTool.toolName)
+        toolGroup.setToolPassive(PlanarRotateTool.toolName)
+        toolGroup.setToolPassive(EraserTool.toolName)
+        toolGroup.setToolPassive(Note_RectangleRoiTool.toolName)
+      })
+    },
+    lengthscaleToolDisabled(saved) {
+      const viewportIds = ['canvas-0', 'canvas-1', 'canvas-2', 'canvas-3']
+      viewportIds.forEach(toolGroupId => {
+        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        if (saved) {
+          toolGroup.setToolPassive(LengthscaleTool.toolName)
+        } else {
+          toolGroup.setToolEnabled(LengthscaleTool.toolName)
+        }
+      })
+    },
+    // 加载图片回调
+    stackNewImage(e) {
+      if (this.isComparison) return false
+      const { detail } = e
+      const i = this.viewportInfos.findIndex(i => i.viewportId === detail.viewportId)
+      if (i === -1) return
+      if (detail.imageIdIndex !== this.viewportInfos[i].currentImageIdIndex) {
+        this.viewportInfos[i].currentImageIdIndex = detail.imageIdIndex
+        const obj = this.viewportInfos[i].fileList[detail.imageIdIndex]
+        if (!obj) return
+        this.viewportInfos[i].currentFileName = obj.FileName
+        const total = this.viewportInfos[i].imageIds.length
+        this.viewportInfos[i].height = total > 1 ? (this.viewportInfos[i].currentImageIdIndex) * 100 / (total - 1) : 0
+        this.$emit('toggleImage', {
+          studyId: this.viewportInfos[i].studyId,
+          path: obj.Path
+        })
+        this.$nextTick(() => {
+          this.applyFitMode(i, this.isFitToWindowMode)
+        })
+        return
+      }
+      this.updateZoomDisplayByViewportId(detail.viewportId)
+    },
+    handleImageRendered(e) {
+      const viewportId = e?.detail?.viewportId || e?.currentTarget?.dataset?.viewportUid
+      if (!viewportId) return
+      this.updateZoomDisplayByViewportId(viewportId)
+    },
+    updateZoomDisplayByViewportId(viewportId) {
+      const index = this.viewportInfos.findIndex(item => item.viewportId === viewportId)
+      if (index === -1) return
+      this.updateZoomDisplay(index)
+    },
+    updateZoomDisplay(index) {
+      const viewportInfo = this.viewportInfos[index]
+      if (!viewportInfo || !this.imageType.includes(viewportInfo.fileType) || !viewportInfo.imageIds.length) {
+        if (viewportInfo) viewportInfo.zoomText = ''
+        return
+      }
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine?.getViewport(viewportInfo.viewportId)
+      if (!viewport) return
+      const camera = viewport.getCamera?.()
+      const canvas = viewport.getCanvas?.() || this.$refs[`canvas-${index}`]?.[0]
+      const canvasHeight = canvas?.clientHeight
+      const parallelScale = Number(camera?.parallelScale)
+      if (!canvasHeight || !Number.isFinite(parallelScale) || parallelScale <= 0) {
+        viewportInfo.zoomText = ''
+        return
+      }
+      const magnification = canvasHeight / (parallelScale * 2)
+      if (!Number.isFinite(magnification) || magnification <= 0) {
+        viewportInfo.zoomText = ''
+        return
+      }
+      viewportInfo.zoomText = `${magnification.toFixed(1)}x`
+    },
+    // 渲染图片
+    async renderImage(imageIds, canvasIndex, sliceIndex) {
+      metaData.addProvider((type, imageId) => hardcodedMetaDataProvider(type, imageId, imageIds), 10000)
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine.getViewport(`canvas-${canvasIndex}`)
+      await viewport.setStack(imageIds)
+      this.setToolsPassive()
+      viewport.setImageIdIndex(sliceIndex)
+      viewport.render()
+      this.$nextTick(() => {
+        this.applyFitMode(canvasIndex, this.isFitToWindowMode)
+        this.updateZoomDisplay(canvasIndex)
+      })
+      // this.updateViewportInfos()
+    },
+    setActiveCanvasImages(obj) {
+      if (!obj || Object.keys(obj).length === 0) return
+      this.serie = obj
+      const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
+      if (i === -1) return
+      if (obj.studyId === this.viewportInfos[i].studyId && this.imageType.includes(this.viewportInfos[i].fileType) && this.imageType.includes(obj.fileInfo.FileType) && !obj.isReset) {
+        const fileIndex = this.viewportInfos[i].fileList.findIndex(i => i.Path === obj.fileInfo.Path)
+        this.sliceIndex(fileIndex)
+      } else {
+        if (!this.imageType.includes(obj.fileInfo.FileType)) {
+          this.fullScreenIndex = null
+        }
+        this.updateViewportInfos(this.activeCanvasIndex, obj)
+      }
+      this.setToolsPassive()
+    },
+    // 激活视图
+    activeCanvas(index) {
+      if (this.activeCanvasIndex === index) return
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1) return
+      this.activeCanvasIndex = index
+      this.setToolsPassive()
+    },
+    // 更新视图信息
+    updateViewportInfos(index, obj) {
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1) return
+
+      this.viewportInfos[i].taskInfo = obj.visitTaskInfo
+
+      this.viewportInfos[i].currentFileName = obj.fileInfo.FileName
+      this.viewportInfos[i].studyId = obj.studyId
+      this.viewportInfos[i].fileType = obj.fileInfo.FileType
+      if (this.imageType.includes(obj.fileInfo.FileType)) {
+        const arr = obj.fileList.filter(i => this.imageType.includes(i.FileType))
+        this.viewportInfos[i].fileList = arr
+        const fileIndex = this.viewportInfos[i].fileList.findIndex(i => i.Path === obj.fileInfo.Path)
+        this.viewportInfos[i].currentImageIdIndex = fileIndex
+        const imageIds = []
+        for (let i = 0; i < arr.length; i++) {
+          const path = arr[i].Path
+          imageIds.push(`web:${this.OSSclientConfig.basePath}${path}`)
+        }
+        this.viewportInfos[i].imageIds = imageIds
+        if (imageIds.length > 0) {
+          this.renderImage(imageIds, index, fileIndex)
+        }
+        this.$nextTick(() => {
+          const renderingEngine = getRenderingEngine(renderingEngineId)
+          if (renderingEngine) {
+            renderingEngine.resize(true, false)
+          }
+        })
+      } else {
+        this.viewportInfos[i].currentFilePath = obj.fileInfo.Path
+        this.viewportInfos[i].zoomText = ''
+      }
+    },
+    // 切换图片
+    sliceIndex(index) {
+      const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
+      if (i === -1) return
+      if (index < 0 || index >= this.viewportInfos[i].imageIds.length) return
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine.getViewport(
+        this.viewportInfos[i].viewportId
+      )
+      this.setToolsPassive()
+      viewport.setImageIdIndex(index)
+      viewport.render()
+    },
+    // 更改视图布局
+    handleCommand(command) {
+      this.fullScreenIndex = null
+      this.layout = command
+      this.rows = parseInt(command.split('*')[0])
+      this.cols = parseInt(command.split('*')[1])
+      if (this.rows === 1 && this.cols === 1) {
+        this.$nextTick(() => {
+          this.activeCanvas(0)
+        })
+      }
+    },
+    handleLayoutChange(event) {
+      this.handleCommand(event.target.value.replace('x', '*'))
+    },
+    getCellStyle(index) {
+      return {
+        ...this.cellStyle,
+        display: index < this.cells.length ? this.cellStyle.display : 'none'
+      }
+    },
+    // 切换全屏
+    toggleFullScreen(e, index) {
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1) return
+      if (!this.viewportInfos[i].currentFileName) return
+      if (this.imageType.includes(this.viewportInfos[i].fileType)) {
+        this.fullScreenIndex = this.fullScreenIndex === index ? null : index
+        this.activeCanvasIndex = index
+      }
+    },
+    // 激活工具
+    setToolActive(toolName) {
+      const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
+      if (i === -1) return
+      const toolGroupId = `canvas-${this.viewportInfos[i].index}`
+      const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+      if (this.activeTool === toolName) {
+        toolGroup.setToolPassive(this.activeTool)
+        this.activeTool = ''
+      } else {
+        if (this.activeTool) {
+          toolGroup.setToolPassive(this.activeTool)
+        }
+        toolGroup.setToolActive(toolName, {
+          bindings: [{ mouseButton: MouseBindings.Primary }]
+        })
+        this.activeTool = toolName
+      }
+    },
+    setToolsPassive() {
+      if (!this.activeTool) return
+      const toolGroupIds = ['canvas-0', 'canvas-1', 'canvas-2', 'canvas-3']
+      toolGroupIds.forEach(toolGroupId => {
+        const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        toolGroup.setToolPassive(this.activeTool)
+      })
+      this.activeTool = ''
+    },
+    // 重置视图
+    resetViewport() {
+      this.setToolsPassive()
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewportId = `canvas-${this.activeCanvasIndex}`
+      const viewport = (renderingEngine.getViewport(viewportId))
+      viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
+      renderingEngine.render()
+      this.updateZoomDisplay(this.activeCanvasIndex)
+    },
+    toggleFitMode() {
+      this.setToolsPassive()
+      this.isFitToWindowMode = !this.isFitToWindowMode
+      this.applyFitMode(this.activeCanvasIndex, this.isFitToWindowMode)
+    },
+    applyFitMode(canvasIndex = this.activeCanvasIndex, isFitToWindowMode = this.isFitToWindowMode) {
+      const viewportInfo = this.viewportInfos[canvasIndex]
+      if (!viewportInfo || !this.imageType.includes(viewportInfo.fileType) || !viewportInfo.imageIds.length) return
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine?.getViewport(`canvas-${canvasIndex}`)
+      if (!viewport) return
+
+      viewport.resetCamera({ resetPan: true, resetZoom: true, resetToCenter: true })
+      if (isFitToWindowMode) {
+        viewport.render()
+        return
+      }
+
+      const canvas = viewport.getCanvas() || this.$refs[`canvas-${canvasIndex}`]?.[0]
+      const imageData = viewport.getImageData?.()?.imageData
+      const dimensions = imageData?.getDimensions?.()
+      const imageWidth = dimensions?.[0]
+      const imageHeight = dimensions?.[1]
+      const canvasWidth = canvas?.clientWidth
+      const canvasHeight = canvas?.clientHeight
+
+      if (!imageWidth || !imageHeight || !canvasWidth || !canvasHeight) {
+        viewport.render()
+        return
+      }
+
+      const fitScale = Math.min(canvasWidth / imageWidth, canvasHeight / imageHeight)
+      if (fitScale > 0) {
+        viewport.setZoom(1 / fitScale)
+      }
+      viewport.render()
+      this.updateZoomDisplay(canvasIndex)
+    },
+    reapplyFitModeForVisibleViewports() {
+      this.viewportInfos.forEach((viewportInfo, index) => {
+        if (index >= this.cells.length) return
+        if (!this.imageType.includes(viewportInfo.fileType) || !viewportInfo.imageIds.length) return
+        this.applyFitMode(index, this.isFitToWindowMode)
+      })
+    },
+    setZoomScale(isZoomIn) {
+      this.setToolsPassive()
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewportId = `canvas-${this.activeCanvasIndex}`
+      const viewport = renderingEngine?.getViewport(viewportId)
+      if (!viewport) return
+      const camera = viewport.getCamera()
+      const factor = 1.1
+      const current = Number(camera.parallelScale)
+      if (!Number.isFinite(current) || current <= 0) return
+      const next = isZoomIn ? current / factor : current * factor
+      const parallelScale = Math.max(0.0001, Math.min(1000000, next))
+      viewport.setCamera({ parallelScale })
+      viewport.render()
+      this.updateZoomDisplay(this.activeCanvasIndex)
+    },
+    // 滚动条
+    clickSlider(e, index) {
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1) return
+      const sliderBox = this.$refs[`sliderBox-${index}`] && this.$refs[`sliderBox-${index}`][0]
+      if (!sliderBox || !this.imageType.includes(this.viewportInfos[i].fileType)) return
+      const boxHeight = sliderBox.clientHeight
+      if (!boxHeight || !this.viewportInfos[i].imageIds.length) return
+      const height = e.offsetY * 100 / boxHeight
+      this.viewportInfos[i].height = height
+      let sliceIdx = Math.trunc(this.viewportInfos[i].imageIds.length * height / 100)
+      sliceIdx = sliceIdx >= this.viewportInfos[i].imageIds.length ? this.viewportInfos[i].imageIds.length - 1 : sliceIdx < 0 ? 0 : sliceIdx
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine.getViewport(
+        this.viewportInfos[i].viewportId
+      )
+      this.setToolsPassive()
+      viewport.setImageIdIndex(sliceIdx)
+      viewport.render()
+      this.updateZoomDisplay(index)
+    },
+    sliderMouseup(e, index) {
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1 || !this.imageType.includes(this.viewportInfos[i].fileType)) return
+      this.viewportInfos[i].isMove = false
+    },
+    sliderMousemove(e, index) {
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1 || !this.imageType.includes(this.viewportInfos[i].fileType)) return
+      if (!this.viewportInfos[i].isMove) return
+      const sliderBox = this.$refs[`sliderBox-${index}`] && this.$refs[`sliderBox-${index}`][0]
+      if (!sliderBox || !this.viewportInfos[i].imageIds.length) return
+      const delta = this.viewportInfos[i].oldB - (this.viewportInfos[i].oldM - e.clientY)
+      const boxHeight = sliderBox.clientHeight
+      if (delta < 0) return
+      if (delta > boxHeight) return
+      const height = delta * 100 / boxHeight
+      let sliceIdx = Math.trunc(this.viewportInfos[i].imageIds.length * height / 100)
+      sliceIdx = sliceIdx >= this.viewportInfos[i].imageIds.length ? this.viewportInfos[i].imageIds.length - 1 : sliceIdx < 0 ? 0 : sliceIdx
+      this.viewportInfos[i].height = height
+      // if (this.viewportInfos[i].currentImageIdIndex !== i) {
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine.getViewport(
+        this.viewportInfos[i].viewportId
+      )
+      this.setToolsPassive()
+      viewport.setImageIdIndex(sliceIdx)
+      viewport.render()
+      this.updateZoomDisplay(index)
+      // }
+      // this.$emit('toggleImage', { taskId: this.viewportInfos[i].taskInfo.VisitTaskId, studyId: this.viewportInfos[i].studyId, imageIndex: sliceIdx })
+    },
+    sliderMouseleave(e, index) {
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1 || !this.imageType.includes(this.viewportInfos[i].fileType)) return
+      if (!this.viewportInfos[i].isMove) return
+      this.viewportInfos[i].isMove = false
+    },
+    sliderMousedown(e, index) {
+      const i = this.viewportInfos.findIndex(i => i.index === index)
+      if (i === -1 || !this.imageType.includes(this.viewportInfos[i].fileType)) return
+      const sliderBox = this.$refs[`sliderBox-${index}`] && this.$refs[`sliderBox-${index}`][0]
+      if (!sliderBox || !this.viewportInfos[i].imageIds.length) return
+      const boxHeight = sliderBox.clientHeight
+      const sliderTop = parseFloat(e.currentTarget.style.top) || 0
+      this.viewportInfos[i].oldB = sliderTop * boxHeight / 100
+      this.viewportInfos[i].oldM = e.clientY
+      this.viewportInfos[i].isMove = true
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.content {
+  cursor: default !important;
+}
+
+.dropdown {
+  position: relative;
+  display: inline-block;
+
+  .text {
+    text-align: center;
+  }
+}
+
+.dropdown-content {
+  display: none;
+  position: absolute;
+  background-color: #383838;
+  color: #fff;
+  box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
+  z-index: 9999;
+  font-size: 12px;
+
+  ul {
+    list-style: none;
+    margin: 0;
+    padding: 0;
+    text-align: center;
+
+    li {
+      a {
+        display: block;
+        padding: 5px;
+      }
+    }
+  }
+
+  ul li a:hover {
+    background-color: #727272;
+  }
+
+  .customize-standards-list {
+    width: max-content;
+    white-space: nowrap;
+
+    li a {
+      display: flex;
+      align-items: center;
+      padding: 8px !important;
+      box-sizing: border-box;
+    }
+  }
+}
+
+.none-dicom-viewer {
+  display: flex;
+  flex-direction: row;
+  width: 100%;
+  height: 100%;
+  user-select: none;
+  background: #000;
+
+  .dicom-tools {
+    width: 300px;
+    height: 100%;
+    background-color: #323232;
+    margin: 0 0 0 2px;
+    padding: 0;
+    color: #d0d0d0;
+    font-size: 13px;
+    overflow-y: auto;
+  }
+
+  .sideTool-title {
+    padding: 5px 8px;
+    background-color: #525252;
+    color: #bebdbd;
+    font-size: 14px;
+    margin: 4px;
+  }
+
+  .sideTool-wrapper {
+    border-bottom: 1px solid gray;
+    margin: 0 4px;
+    padding: 4px;
+    font-size: 12px;
+  }
+
+  .sidetool-select {
+    height: 30px;
+    background-color: rgba(0, 0, 0, 0);
+    color: #d0d0d0;
+    border-radius: 4px;
+    border: 1px solid #5b5b5b;
+  }
+
+  .sidetool-select>option {
+    background-color: #323232;
+  }
+
+  .sideTool-wrapper button.btn-link {
+    height: 40px;
+    padding: 8px !important;
+    border: 1px solid rgba(37, 37, 37, 1);
+    margin: 1px 1px;
+  }
+
+  .sideTool-wrapper .btn-link {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 40px;
+    color: #cccccc;
+    background-color: transparent;
+    cursor: pointer;
+  }
+
+  .activeTool {
+    background: #16477b90 !important;
+    border: none !important;
+  }
+
+  .sideTool-wrapper label {
+    display: inline-block;
+    min-width: 44px;
+    margin-right: 6px;
+  }
+
+  .viewports-wrapper {
+    flex: 1;
+    min-width: 0;
+    position: relative;
+
+    .grid-container {
+      display: grid;
+      height: 100%;
+      width: 100%;
+      position: relative;
+    }
+
+    .grid-cell {
+      border: 1px dashed #ccc;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      overflow: hidden;
+      min-width: 0;
+      min-height: 0;
+      z-index: 1;
+    }
+
+    .cell_active {
+      border-color: #fafa00 !important;
+    }
+
+    .cell-full-screen {
+      grid-column: 1 / -1;
+      grid-row: 1 / -1;
+    }
+
+    .flex_col {
+      display: flex;
+      flex-direction: column;
+    }
+
+    .content {
+      width: 100%;
+      height: 100%;
+      position: relative;
+
+      .left-top-text {
+        position: absolute;
+        left: 5px;
+        top: 5px;
+        color: #ddd;
+        z-index: 1;
+        font-size: 14px;
+
+        .cd-info {
+          color: #ddd;
+          font-size: 18px;
+        }
+
+        .subject-info {
+          color: #f44336;
+          padding: 5px 0px;
+          margin: 0;
+        }
+      }
+
+      .left-bottom-text {
+        position: absolute;
+        left: 5px;
+        bottom: 5px;
+        color: #ddd;
+        z-index: 1;
+        font-size: 14px;
+      }
+
+      .top-center-tool {
+        position: absolute;
+        left: 50%;
+        top: 5px;
+        transform: translateX(-50%);
+        z-index: 1;
+
+        .toggle-visit-container {
+          display: flex;
+        }
+
+        .arrw_icon {
+          width: 20px;
+          height: 20px;
+          background-color: #3f3f3f;
+          text-align: center;
+          line-height: 20px;
+          border-radius: 10%;
+        }
+
+        .arrow_text {
+          height: 20px;
+          line-height: 20px;
+          background-color: #00000057;
+          color: #fff;
+          padding: 0 10px;
+          font-size: 14px;
+        }
+      }
+
+      .right-slider-box {
+        position: absolute;
+        right: 1px;
+        height: calc(100% - 140px);
+        transform: translateY(-50%);
+        top: calc(50% - 30px);
+        width: 10px;
+        background: #333;
+        z-index: 1;
+        cursor: pointer;
+      }
+
+      .right-slider-box:after {
+        content: '';
+        position: absolute;
+        bottom: -20px;
+        left: 0;
+        height: 20px;
+        width: 100%;
+        background: #333;
+      }
+
+      .slider {
+        height: 20px;
+        width: 100%;
+        position: absolute;
+        top: 0;
+        z-index: 10;
+        background: #9e9e9e;
+        cursor: move
+      }
+
+      .content-main {
+        position: relative;
+        overflow: hidden;
+        background: #1e1e1e;
+      }
+
+      video {
+        display: block;
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+        object-position: center center;
+        background: transparent;
+      }
+    }
+  }
+}
+
+.Anonymous {
+  position: absolute;
+  border-radius: 5px;
+  bottom: 30px;
+  left: 5%;
+  right: 5%;
+  width: 90%;
+  height: 60px;
+  padding: 0 10px;
+  background-color: rgba(255, 255, 255, .2);
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  z-index: 2000;
+
+  .btn {
+    width: 12%;
+    text-align: center;
+    height: 40px;
+    line-height: 30px;
+    border-radius: 15px;
+    cursor: pointer;
+    padding: 5px 10px;
+    color: #428bca;
+    background: #ecf3fa;
+    border-color: #b3d1ea;
+  }
+
+  .activeBtn {
+    background: #428bca;
+    border-color: #428bca;
+    color: #fff;
+  }
+
+  .isNoted {
+    cursor: not-allowed;
+  }
+
+  // &:hover {
+  //   background-color: rgba(255, 255, 255, .5);
+  // }
+}
+
+
+
+
+.dicom-tools .btnBox {
+  display: inline-block;
+  width: 80px;
+  text-align: center;
+  height: 30px;
+  line-height: 20px;
+  border-radius: 15px;
+  color: #428bca;
+  background: #ecf3fa;
+  border-color: #b3d1ea;
+  cursor: pointer;
+  padding: 5px 10px;
+  border: 1px solid rgba(255, 255, 255, .7);
+  margin: 5px;
+}
+
+.dicom-tools .activeBtnBox {
+  background: #428bca;
+  border-color: #428bca;
+  color: #fff;
+}
+</style>
diff --git a/src/views/none-dicoms/components/study-list.vue b/src/views/none-dicoms/components/study-list.vue
new file mode 100644
index 00000000..c8ed4f3d
--- /dev/null
+++ b/src/views/none-dicoms/components/study-list.vue
@@ -0,0 +1,516 @@
+<template>
+  <div v-loading="loading" class="none-dicom-study-wrapper">
+    <div class="study-info">
+      <div style="cursor: pointer;" @click.stop="sortFile">
+        <i :class="['el-icon-caret-top', asc === false ? '' : 'icon_check']"
+          style="display: block;margin-bottom: -5px;"></i>
+        <i :class="['el-icon-caret-bottom', asc === true ? '' : 'icon_check']"
+          style="display: block; margin-top: -5px;"></i>
+      </div>
+      <div>{{ $t('trials:none-dicom-show:fileList') }} </div>
+    </div>
+    <div class="ps" ref="studyBox_ps">
+      <el-collapse v-model="activeNames">
+        <el-collapse-item v-for="(study, index) in studyList" :key="`${study.Id}`" :name="`${study.Id}`">
+          <template slot="title">
+            <div class="dicom-desc">
+              <div style="text-overflow: ellipsis;overflow: hidden;">
+                <span :title="study.CodeView">{{ study.CodeView }}</span>
+                <span v-if="otherInfo && otherInfo.IsShowStudyName" :title="study.StudyName" style="margin-left: 5px;">
+                  {{ study.StudyName }}
+                </span>
+              </div>
+              <div style="text-overflow: ellipsis;overflow: hidden;">
+                <span :title="study.BodyPart">{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
+                <span style="margin-left: 5px;" :title="study.Modality">{{ study.Modality }}</span>
+              </div>
+            </div>
+          </template>
+          <div class="file-list-container">
+            <div v-for="(k, i) in study.NoneDicomStudyFileList" :key="i" style="position:relative;margin-top:1px;"
+              @click="selectFile(study, index, i, k)" :ref="`noneDicomRef_${index}_${i}`">
+              <div :class="{ 'file-active': index === activeStudyIndex && i === activeFileIndex }" class="file-wrapper">
+                <div class="file-main">
+                  <div class="file-image">
+                    <el-image
+                      v-if="k.FileType === 'image/jpeg' || k.FileType === 'image/jpg' || k.FileType === 'image/bmp' || k.FileType === 'image/png'"
+                      style="width: 100%;height: 100%;"
+                      :src="`${OSSclientConfig.basePath}${k.Path}?x-oss-process=image/resize,w_50,h_50/format,png`"
+                      fit="contain" crossorigin="anonymous" />
+                    <el-image v-else-if="k.FileType === 'application/pdf'" style="width: 100%;height: 100%;" :src="pdf"
+                      fit="contain" crossorigin="anonymous" />
+                    <el-image v-else-if="
+                      !!~k.FileType.indexOf('mp4')
+                    " style="width: 100%; height: 100%" :src="mp4" fit="contain" crossorigin="anonymous" />
+                    <el-image v-else-if="
+                      !!~k.FileType.indexOf('zip')
+                    " style="width: 100%; height: 100%" :src="zipImg" fit="contain" crossorigin="anonymous" />
+                  </div>
+                  <div class="file-text" :title="k.FileName">
+                    {{ k.FileName }}
+                  </div>
+                </div>
+                <div v-if="isQcCheck" class="switchBox">
+                  <div class="item">
+                    <span>{{ $t('trials:audit:table:isReading') }}</span>
+                    <el-switch v-model="k.IsReading" :disabled="k.IsDeleted || isAudit"
+                      :active-text="$fd('YesOrNo', true)" :inactive-text="$fd('YesOrNo', false)"
+                      @change="changeReadingStatus($event, study, k)" />
+                  </div>
+                  <div class="item">
+                    <span>{{ $t('trials:audit:table:isDelete') }}</span>
+                    <el-switch v-model="k.IsDeleted" :disabled="isAudit" :active-text="$fd('YesOrNo', true)"
+                      :inactive-text="$fd('YesOrNo', false)" @change="changeDeleteStatus($event, study, k)" />
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
+  </div>
+</template>
+<script>
+import { getNoneDicomStudyList, setNodicomStudyState } from '@/api/trials'
+import FileNameSorter from "@/utils/customSort"
+import pdf from '@/assets/pdf.png'
+import mp4 from '@/assets/mp4.png'
+import zipImg from '@/assets/zip.jpg'
+export default {
+  name: 'StudyList',
+  props: {
+    visitTaskInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    isComparison: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      activeNames: [],
+      activeStudyId: '',
+      activeFileId: '',
+      activeStudyIndex: -1,
+      activeFileIndex: -1,
+      studyList: [],
+      pdf,
+      mp4,
+      zipImg,
+      BodyPart: {},
+      subjectVisitId: '',
+      studyId: '',
+      otherInfo: null,
+      criterionType: null,
+      isQcCheck: false,
+      isAudit: false,
+      asc: false
+    }
+  },
+  async mounted() {
+    this.subjectVisitId = this.$route.query.subjectVisitId
+    this.studyId = this.$route.query.studyId
+    this.isQcCheck = !!this.$route.query.isQcCheck
+    this.getNoneDicoms()
+
+    // this.$nextTick(() => {
+    //   this.activeStudy(this.studyList[0].Id)
+    // })
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
+  },
+  methods: {
+    scrollActiveFileIntoView() {
+      this.$nextTick(() => {
+        const refKey = `noneDicomRef_${this.activeStudyIndex}_${this.activeFileIndex}`
+        const targetRef = this.$refs[refKey]
+        const element = Array.isArray(targetRef) ? targetRef[0] : targetRef
+        if (!element) return
+        this.scrollElementToVisible(element)
+      })
+    },
+    scrollElementToVisible(element, options = {}) {
+      const container = this.$refs['studyBox_ps']
+      if (!container || !element) return
+      const elementTop = element.offsetTop
+      const elementBottom = elementTop + element.offsetHeight
+      const visibleTop = container.scrollTop
+      const visibleBottom = visibleTop + container.clientHeight
+      if (elementTop >= visibleTop && elementBottom <= visibleBottom) return
+      const offset = options.offset != null
+        ? options.offset
+        : Math.max((container.clientHeight - element.offsetHeight) / 2, 0)
+      const targetPosition = Math.max(elementTop - offset, 0)
+      container.scrollTo({
+        top: targetPosition,
+        behavior: options.behavior || 'smooth'
+      })
+    },
+    async getNoneDicoms() {
+      const loading = this.$loading({ fullscreen: true })
+      try {
+        let res = await getNoneDicomStudyList(
+          this.subjectVisitId,
+          this.studyId,
+          false,
+          this.$route.query.visitTaskId,
+          !!this.$route.query.isReading,
+          this.$route.query.isImageSegmentLabel,
+        )
+        this.studyList = res.Result
+        this.studyList.forEach(study => {
+          if (study.NoneDicomStudyFileList && study.NoneDicomStudyFileList.length > 0) {
+            study.NoneDicomStudyFileList.forEach(file => {
+              if (file.Path.includes('.MaskNoneDicom_')) {
+                file.IsBeMark = true
+              } else {
+                file.IsBeMark = false
+              }
+            })
+          }
+        })
+        this.otherInfo = res.OtherInfo
+        this.isAudit = res.OtherInfo.AuditState * 1 > 6
+        const studyIndex = this.studyList.findIndex((item) => {
+          return item.NoneDicomStudyFileList.length > 0
+        })
+        if (studyIndex > -1) {
+          this.selectFile(this.studyList[studyIndex], studyIndex, 0)
+          let studyId = this.studyList[studyIndex].Id
+          this.activeNames = [studyId]
+        }
+        if (this.criterionType === 19 || this.criterionType === 20) {
+          this.sortFile()
+        }
+        loading.close()
+      } catch (e) {
+        console.log(e)
+        loading.close()
+      }
+
+    },
+    selected() {
+
+    },
+    sortFile() {
+      this.asc = !this.asc
+      this.studyList.forEach(study => {
+        if (study.NoneDicomStudyFileList.length > 0) {
+          study.NoneDicomStudyFileList = FileNameSorter.sortFileNames(study.NoneDicomStudyFileList, {
+            direction: this.asc ? 'asc' : 'desc',
+            key: 'FileName'
+          })
+        }
+      })
+      this.activeStudyIndex = this.studyList.findIndex(item => item.Id === this.activeStudyId)
+      if (this.activeStudyIndex === -1) return
+      this.activeFileIndex = this.studyList[this.activeStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === this.activeFileId)
+    },
+    changeReadingStatus(callback, row, file) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesReading')
+        file.IsReading = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
+        file.IsReading = true
+      }
+      let message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !file.IsReading))
+      this.$confirm(message, {
+        distinguishCancelAndClose: true,
+        type: 'warning',
+      })
+        .then(() => {
+          const state = file.IsReading ? 1 : 2
+          this.loading = true
+          const params = {
+            SubjectVisitId: row.SubjectVisitId,
+            NoneDicomStudyId: row.Id,
+            State: state,
+            NoneDicomStudyFileId: file.Id,
+          }
+          return setNodicomStudyState(params)
+            .then((res) => {
+              this.loading = false
+              if (res.IsSuccess) {
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+                file.IsReading = !file.IsReading
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
+        .catch(() => { })
+    },
+    changeDeleteStatus(callback, row, file) {
+      let statusStr = ''
+      if (callback) {
+        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
+        file.IsDeleted = false
+      } else {
+        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
+        file.IsDeleted = true
+      }
+      let message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !file.IsDeleted))
+      this.$confirm(message, {
+        distinguishCancelAndClose: true,
+        type: 'warning',
+      })
+        .then(() => {
+          const state = file.IsDeleted ? 5 : 4
+          this.loading = true
+          const params = {
+            SubjectVisitId: row.SubjectVisitId,
+            NoneDicomStudyId: row.Id,
+            State: state,
+            NoneDicomStudyFileId: file.Id,
+          }
+          return setNodicomStudyState(params)
+            .then((res) => {
+              this.loading = false
+              if (res.IsSuccess) {
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+                file.IsDeleted = !file.IsDeleted
+              }
+            })
+            .catch(() => {
+              this.loading = false
+            })
+        })
+        .catch(() => { })
+    },
+    getBodyPart(bodyPart, other) {
+      if (!bodyPart && !other) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
+      }
+      var arr = bodyPart.split(separator)
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
+      })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
+      return newArr.join(' | ')
+    },
+    // 切换文件
+    selectFile(study, studyIndex, fileIndex, isReset = false) {
+      if (this.isComparison) return false
+      this.activeStudyIndex = studyIndex
+      this.activeFileIndex = fileIndex
+      this.activeStudyId = study.Id
+      const fileList = study.NoneDicomStudyFileList
+      this.activeFileId = fileList[fileIndex].Id
+      this.$emit('selectFile', { fileInfo: fileList[fileIndex], fileList, visitTaskInfo: this.visitTaskInfo, studyId: study.Id, isReset })
+      this.scrollActiveFileIntoView()
+    },
+    activeImage(obj) {
+      if (!obj || this.studyList.length === 0) return
+      const study = this.studyList.find(i => i.Id === obj.studyId)
+      const studyIndex = this.studyList.findIndex(i => i.Id === obj.studyId)
+      if (studyIndex === -1) return
+      this.activeStudy(`${obj.studyId}`)
+      this.activeStudyIndex = studyIndex
+      this.activeStudyId = obj.studyId
+      const fileList = this.studyList[studyIndex].NoneDicomStudyFileList || []
+      const fileIndex = fileList.findIndex(f => f.Path === obj.path)
+      if (fileIndex === -1) return
+      this.activeFileIndex = fileIndex
+      this.activeFileId = fileList[fileIndex].Id
+      this.selectFile(study, studyIndex, fileIndex)
+      this.scrollActiveFileIntoView()
+    },
+    replaceImage(obj) {
+      if (!obj || this.studyList.length === 0) return
+      const study = this.studyList.find(i => i.Id === obj.studyId)
+      const studyIndex = this.studyList.findIndex(i => i.Id === obj.studyId)
+      if (studyIndex === -1) return
+      this.activeStudy(`${obj.studyId}`)
+      this.activeStudyIndex = studyIndex
+      this.activeStudyId = obj.studyId
+      const fileList = this.studyList[studyIndex].NoneDicomStudyFileList || []
+      const fileIndex = fileList.findIndex(f => f.Path === obj.path)
+      const file = fileList.find(f => f.Path === obj.path)
+      if (fileIndex === -1) return
+      this.activeFileIndex = fileIndex
+      this.activeFileId = fileList[fileIndex].Id
+      file.Path = obj.file.Path
+      file.FullFilePath = obj.file.Path
+      file.IsBeMark = obj.IsBeMark
+      this.selectFile(study, studyIndex, fileIndex, true)
+    },
+    activeStudy(id) {
+      const studyId = `${id}`
+      if (this.activeNames.indexOf(studyId) > -1) return
+      this.activeNames.push(studyId)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.none-dicom-study-wrapper {
+  width: 100%;
+  height: 100%;
+  overflow-y: hidden;
+  overflow-x: hidden;
+  display: flex;
+  flex-direction: column;
+
+  .study-info {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 16px;
+    font-weight: bold;
+    color: #ddd;
+    background-color: #4c4c4c;
+    line-height: 40px;
+    user-select: none;
+  }
+  .icon_check {
+    color: #409EFF;
+  }
+  .dicom-desc {
+    font-weight: bold;
+    font-size: 13px;
+    text-align: left;
+    color: #d0d0d0;
+    padding: 2px 8px 2px 2px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+
+  .ps {
+    flex: 1;
+    overflow-anchor: none;
+    touch-action: auto;
+    overflow-y: auto;
+  }
+
+  .file-active {
+    // background: #16477b;
+    background-color: #183553 !important;
+    border: 1px solid #23527b !important;
+  }
+
+  ::v-deep .el-progress__text {
+    color: #ccc;
+    font-size: 12px;
+  }
+  ::v-deep .el-switch__label {
+    color: #ccc;
+  }
+
+  .file-list-container {
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    justify-content: flex-start;
+
+    .file-wrapper {
+      width: 100%;
+      padding: 5px;
+      display: flex;
+      flex-direction: column;
+      align-items: stretch;
+      cursor: pointer;
+      background-color: #3a3a3a;
+
+      // color: #ddd;
+      // white-space: nowrap;
+      // overflow: hidden;
+      // text-overflow: ellipsis;
+      .file-main {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        min-width: 0;
+      }
+
+      .el-progress__text {
+        display: none;
+      }
+
+      .el-progress-bar {
+        padding-right: 0px;
+      }
+
+      .file-image {
+        width: 50px;
+        height: 50px;
+      }
+
+      .file-text {
+        flex: 1;
+        padding-left: 5px;
+        color: #ddd;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
+
+    }
+  }
+
+  .switchBox {
+    width: 100%;
+    margin-top: 6px;
+    color: #ddd;
+
+    .item {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-bottom: 5px;
+    }
+
+    .item:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  ::v-deep .el-collapse {
+    border: none;
+
+    .el-collapse-item {
+      background-color: #000 !important;
+      color: #ddd;
+    }
+
+    .el-collapse-item__content {
+      padding-bottom: 0px;
+      background-color: #000 !important;
+    }
+
+    .el-collapse-item__header {
+      background-color: #353535 !important;
+      color: #ddd;
+      border-bottom-color: #5a5a5a;
+      padding-left: 5px;
+      height: 60px;
+      line-height: 20px;
+    }
+  }
+
+
+
+  ::v-deep .el-progress-bar__inner {
+    transition: width 0s ease;
+  }
+}
+</style>
diff --git a/src/views/none-dicoms/index.vue b/src/views/none-dicoms/index.vue
new file mode 100644
index 00000000..6ea4a375
--- /dev/null
+++ b/src/views/none-dicoms/index.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="read-page-container">
+    <!-- 检查列表 -->
+    <div class="left-panel">
+      <div class="study-info">
+        <study-list ref="studyList" :isComparison="isComparison" @selectFile="selectFile" />
+      </div>
+    </div>
+
+    <!-- 图像 -->
+    <div class="middle-panel">
+
+      <file-viewer ref="fileViewer" :isComparison.sync="isComparison" @toggleImage="toggleImage"
+        @selectFile="selectFile" @replaceImage="replaceImage" />
+    </div>
+  </div>
+</template>
+
+<script>
+import store from '@/store'
+import { changeURLStatic } from '@/utils/history.js'
+import StudyList from './components/study-list'
+import FileViewer from './components/file-viewer'
+export default {
+  name: 'NoneDicoms',
+  components: {
+    StudyList,
+    FileViewer
+  },
+  data() {
+    return {
+      isComparison: false
+    }
+  },
+
+  mounted() {
+    if (this.$route.query.TokenKey) {
+      store.dispatch('user/setToken', this.$route.query.TokenKey)
+      changeURLStatic('TokenKey', '')
+    }
+  },
+  methods: {
+    toggleImage(obj) {
+      this.$refs['studyList'].activeImage(obj)
+    },
+    selectFile(obj) {
+      if (obj.fileInfo && obj.fileList && obj.studyId) {
+        this.$refs['fileViewer'].setActiveCanvasImages(obj)
+        return
+      }
+    },
+    replaceImage(obj) {
+      this.$refs['studyList'].replaceImage(obj)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.read-page-container {
+  box-sizing: border-box;
+  height: 100%;
+  display: flex;
+  background-color: #444;
+  padding: 5px;
+
+  ::-webkit-scrollbar {
+    width: 5px;
+    height: 5px;
+  }
+
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+
+  .left-panel {
+    display: flex;
+    width: 230px;
+    border: 1px solid #727272;
+    color: #fff;
+
+    ::-webkit-scrollbar {
+      width: 3px;
+      height: 3px;
+    }
+
+    ::-webkit-scrollbar-thumb {
+      border-radius: 10px;
+      background: #d0d0d0;
+    }
+
+    .study-info {
+      width: 100%;
+      border-left: 1px solid #727272;
+    }
+  }
+
+  .middle-panel {
+    flex: 1;
+    border: 1px solid #727272;
+    margin: 0 5px;
+  }
+
+  // .right-panel {
+  //   width: 400px;
+  //   border: 1px solid #727272;
+  //   padding: 0 10px;
+  //   overflow-y: auto;
+
+  //   .text-info {
+  //     display: flex;
+  //     align-items: center;
+  //     justify-content: space-between;
+  //     color: #ddd;
+  //   }
+  // }
+
+  ::v-deep .dialog-container {
+    margin-top: 50px !important;
+    width: 75%;
+    height: 80%;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 20px 20px 0 20px;
+    height: calc(100% - 70px);
+  }
+
+  .el-dialog__header {
+    position: relative;
+  }
+
+  .full-dialog-container {
+    ::v-deep .is-fullscreen .el-dialog__body {
+      height: calc(100% - 70px);
+    }
+  }
+}
+</style>
diff --git a/src/views/research-mobile/components/BasicInfo.vue b/src/views/research-mobile/components/BasicInfo.vue
index 635115bd..7df3b964 100644
--- a/src/views/research-mobile/components/BasicInfo.vue
+++ b/src/views/research-mobile/components/BasicInfo.vue
@@ -25,19 +25,10 @@
       <div class="login_content">
         <div class="form-label-width">
           <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
-            <el-select
-              v-model="form.TrialSiteId"
-              filterable
-              style="width:100%;"
-              :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-              @change="handleSiteChange"
-            >
-              <el-option
-                v-for="(item,index) of siteOptions"
-                :key="index"
-                :label="item.TrialSiteAliasName"
-                :value="item.TrialSiteId"
-              />
+            <el-select v-model="form.TrialSiteId" filterable style="width:100%;"
+              :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" @change="handleSiteChange">
+              <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
+                :value="item.TrialSiteId" />
             </el-select>
           </el-form-item>
           <!-- 中心编号 -->
@@ -49,74 +40,149 @@
             <el-input v-model="form.UserName" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
           </el-form-item>
           <!-- 联系电话 -->
-          <el-form-item
-            :label="$t('trials:researchForm:form:contactorPhone')"
-            prop="Phone"
-          >
+          <el-form-item :label="$t('trials:researchForm:form:contactorPhone')" prop="Phone">
             <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>
+          <el-form-item :label="$t('trials:researchForm:form:CommonUploadRecordId')
+            " v-if="IsSupportUploadFile" class="file">
+            <el-input v-model="form.SiteSurveyFile.FileName" type="textarea" :autosize="{ minRows: 1, maxRows: 3 }"
+              style="margin-right: 5px;" disabled />
+            <div class="upload" v-if="!(!(state === 0 && userTypeEnumInt === 0) || isHistory)">
+              <input accept=".pdf,.docx,.doc" type="file" name="uploadFolder" class="select-file" title=""
+                @change="beginScanFiles($event)" />
+              <div class="btn-select">
+                {{ $t('dictionary:template:basicData:button:selectFile') }}
+              </div>
+            </div>
+            <!-- <el-button type="primary" @click="viewManualFile"
+              :disabled="!this.form.SiteSurveyFile || !this.form.SiteSurveyFile.Path">{{
+                $t('trials:researchForm:form:preview') }}</el-button> -->
+            <el-button type="primary" @click="downLoad"
+              :disabled="!this.form.SiteSurveyFile || !this.form.SiteSurveyFile.Path">{{
+                $t('trials:researchForm:form:download') }}</el-button>
+          </el-form-item>
           <!-- 平均刻盘周期（天） -->
-          <el-form-item v-if="!notShowFieldList.includes('AverageEngravingCycle')" :label="$t('trials:researchForm:form:engravingCycle')">
-            <el-input-number v-model="form.AverageEngravingCycle" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" style="width:100%;" />
+          <el-form-item v-if="!notShowFieldList.includes('AverageEngravingCycle')"
+            :label="$t('trials:researchForm:form:engravingCycle')">
+            <el-input-number v-model="form.AverageEngravingCycle"
+              :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0"
+              style="width:100%;" />
           </el-form-item>
         </div>
+        <!-- MRI-PDFF 是否为本中心该适应症的常规诊疗检查项目？ -->
+        <el-form-item v-if="!notShowFieldList.includes('IsRoutineMRIPDEE')"
+          :label="$t('trials:researchForm:form:IsRoutineMRIPDEE')" prop="IsRoutineMRIPDEE">
+          <el-radio-group v-model="form.IsRoutineMRIPDEE"
+            :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory)">
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsRoutineMRIPDEE${item.value}`" :label="item.value">{{
+              item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- MRI-PDFF 检查的检测周期（含单次检查时长、预约等待时长等） -->
+        <el-form-item
+          v-if="!notShowFieldList.includes('MRIPDFFScanTime') || !notShowFieldList.includes('MRIPDFFLeadTime') || !notShowFieldList.includes('MRIPDFFOther')"
+          :label="$t('trials:researchForm:form:IsMRIPDFF')">
+        </el-form-item>
+        <!-- 单次检查时长（分钟） -->
+        <el-form-item v-if="!notShowFieldList.includes('MRIPDFFScanTime')"
+          :label="$t('trials:researchForm:form:MRIPDFFScanTime')">
+          <el-input-number v-model="form.MRIPDFFScanTime"
+            :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory)" controls-position="right" :min="0" />
+        </el-form-item>
+        <!-- 平均预约等待时长（天） -->
+        <el-form-item v-if="!notShowFieldList.includes('MRIPDFFLeadTime')"
+          :label="$t('trials:researchForm:form:MRIPDFFLeadTime')">
+          <el-input-number v-model="form.MRIPDFFLeadTime"
+            :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory)" controls-position="right" :min="0" />
+        </el-form-item>
+        <!-- 特殊情况备注-->
+        <el-form-item v-if="!notShowFieldList.includes('MRIPDFFOther')"
+          :label="$t('trials:researchForm:form:MRIPDFFOther')">
+          <el-input v-model="form.MRIPDFFOther" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+            :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory)" />
+        </el-form-item>
+        <!-- 如已选择研究者评估，项目是否会授权影像科老师参与本试验？如不单独授权，是否可在试验中保持 1-2 名固定技师操作？-->
+        <el-form-item
+          v-if="!notShowFieldList.includes('IsAuthorizeRadiologistsParticipate') || !notShowFieldList.includes('AssignFixedTechnologists')"
+          :label="$t('trials:researchForm:form:IsAuthorize')" prop="IsAuthorize">
+          <el-radio-group v-model="form.IsAuthorize" :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory)"
+            @input="handleIsAuthorizeInput">
+            <el-radio label="IsAuthorizeRadiologistsParticipate">{{
+              $t('trials:researchForm:form:IsAuthorizeRadiologistsParticipate') }}</el-radio>
+            <el-radio label="AssignFixedTechnologists">{{
+              $t('trials:researchForm:form:AssignFixedTechnologists') }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <!-- 请确认参与本项目影像采集的影像技师具备对应的资质（如：“技师证”，对应设备的“大型设备上岗证”） -->
-        <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')" :label="$t('trials:researchForm:form:isQualified')">
-          <el-radio-group v-model="form.IsConfirmImagingTechnologist" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
-            <el-radio
-              v-for="item of $d.YesOrNo"
-              :key="`IsConfirmImagingTechnologist${item.value}`"
-              :label="item.value"
-            >{{ item.label }}</el-radio>
+        <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')"
+          :label="$t('trials:researchForm:form:isQualified')" prop="IsConfirmImagingTechnologist">
+          <el-radio-group v-model="form.IsConfirmImagingTechnologist"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsConfirmImagingTechnologist${item.value}`"
+              :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 原因 -->
         <el-form-item
           v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
-          :label="$t('trials:researchForm:form:notQualifiedReason')"
-        >
-          <el-input
-            v-model="form.NotConfirmReson"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4}"
-            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-          />
+          :label="$t('trials:researchForm:form:notQualifiedReason')" prop="NotConfirmReson">
+          <el-input v-model="form.NotConfirmReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
         </el-form-item>
         <!-- 研究单位疗效评估人员类型 -->
-        <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')" :label="$t('trials:researchForm:form:staffType')">
-          <el-radio-group v-model="form.EfficacyEvaluatorType" :disabled="!(state === 0 && userTypeEnumInt === 0)|| isHistory">
-            <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+        <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')"
+          :label="$t('trials:researchForm:form:staffType')">
+          <el-radio-group v-model="form.EfficacyEvaluatorType"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`"
+              :label="item.value">{{ item.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 是否严格按照研究单位影像手册参数完成图像采集 -->
-        <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')">
+        <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')" prop="IsFollowStudyParameters">
           <span slot="label" v-html="$t('trials:researchForm:form:isFollowStudyParam')" />
-          <el-radio-group v-model="form.IsFollowStudyParameters" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
-            <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio-group v-model="form.IsFollowStudyParameters"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+            <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{
+              item.label }}</el-radio>
           </el-radio-group>
+          <el-button type="primary" size="small" style="margin-left: 5px;" @click="viewManual">
+            {{ $t('trials:researchForm:button:viewManual') }}
+          </el-button>
         </el-form-item>
         <!-- 不能严格按照研究单位影像手册参数采集图像原因 -->
-        <el-form-item
-          v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
-        >
+        <el-form-item v-if="!notShowFieldList.includes('NotFollowReson') && !form.IsFollowStudyParameters"
+          prop="NotFollowReson">
           <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
-          <el-input
-            v-model="form.NotFollowReson"
-            type="textarea"
-            :autosize="{ minRows: 2, maxRows: 4}"
-            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-          />
+          <el-input v-model="form.NotFollowReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+            :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+        </el-form-item>
+        <!-- 是否严格按照影像手册参数完成刻盘 -->
+        <el-form-item v-if="!notShowFieldList.includes('ISStrictManualBurnFlag')" prop="ISStrictManualBurnFlag">
+          <span slot="label" v-html="$t('trials:researchForm:form:ISStrictManualBurnFlag')" />
+          <el-radio-group v-model="form.ISStrictManualBurnFlag"
+            :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory)" style="margin-right: 10px;">
+            <el-radio v-for="item of $d.YesOrNo" :key="`ISStrictManualBurnFlag${item.value}`" :label="item.value">{{
+              item.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <!-- 不能严格按照影像手册参数完成刻盘原因 -->
+        <el-form-item v-if="!notShowFieldList.includes('NotStrictManualBurnFlagReason') && !form.ISStrictManualBurnFlag"
+          prop="NotStrictManualBurnFlagReason">
+          <span slot="label" v-html="$t('trials:researchForm:form:NotStrictManualBurnFlagReason')" />
+          <el-input v-model="form.NotStrictManualBurnFlagReason" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
+            :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory)" />
         </el-form-item>
       </div>
     </el-form>
   </div>
 </template>
 <script>
-import { getTrialSiteSelect } from '@/api/trials'
+import { getTrialSiteSelect, getTrialDocumentList, addOrUpdateCommonUploadRecord } from '@/api/trials'
 import { addOrUpdateTrialSiteSurvey } from '@/api/research'
 export default {
   name: 'ResearchBasicInfo',
@@ -124,7 +190,15 @@ export default {
     isHistory: {
       type: Boolean,
       default: false
-    }
+    },
+    IsOnlyUploadFile: {
+      type: Boolean,
+      default: false
+    },
+    IsSupportUploadFile: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     var checkPhone = (rule, value, callback) => {
@@ -156,16 +230,51 @@ export default {
         Phone: '', // 联系人电话
         Email: '', // 联系人邮箱
         AverageEngravingCycle: '',
+        IsRoutineMRIPDEE: '',
+        MRIPDFFScanTime: '',
+        MRIPDFFLeadTime: '',
+        MRIPDFFOther: '',
+        IsAuthorize: '',
+        IsAuthorizeRadiologistsParticipate: '',
+        AssignFixedTechnologists: '',
+        ISStrictManualBurnFlag: '',
+        NotStrictManualBurnFlagReason: '',
         IsConfirmImagingTechnologist: '',
         NotConfirmReson: '',
         EfficacyEvaluatorType: '',
         IsFollowStudyParameters: '',
-        NotFollowReson: ''
+        NotFollowReson: '',
+        CommonUploadRecordId: null,
+        SiteSurveyFile: []
       },
       rules: {
         TrialSiteId: [
           { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
         ],
+        IsRoutineMRIPDEE: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ],
+        IsAuthorize: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ],
+        ISStrictManualBurnFlag: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ],
+        IsFollowStudyParameters: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ],
+        IsConfirmImagingTechnologist: [
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ],
+        NotConfirmReson: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
+        ],
+        NotFollowReson: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
+        ],
+        NotStrictManualBurnFlagReason: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
+        ],
         UserName: [
           { required: true, validator: (rule, value, callback) => { !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: 'blur' },
           { min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: ['blur', 'change'] }
@@ -186,14 +295,173 @@ export default {
       state: null,
       userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
       isShow: false,
-      notShowFieldList: []
+      notShowFieldList: [],
+      perview_visible: false,
+      ExternalList: []
     }
   },
   methods: {
+    async beginScanFiles(e) {
+      try {
+        let file = e.target.files[0]
+        let name = file.name
+        if (!this.checkFileSuffix(name)) return this.$message.warning(this.$t("trials:researchRecord:ImageManual:message:checkFileSuffix"))
+        this.loading = true
+        file = await this.fileToBlob(file)
+        let scope = this
+        var index = name.lastIndexOf('.')
+        var type = name.substring(index + 1, name.length)
+        let res = await this.OSSclient.put(
+          `/${this.$route.query.trialId}/InspectionUpload/SiteSurvey/${this.form.TrialSiteId}/${scope.getGuid(Date.now() + '_' + name.split('.')[0])}.${type}`,
+          file
+        )
+        let data = {
+          Path: this.$getObjectName(res.url),
+          FileName: name,
+          FileSize: file.size,
+          FileType: type
+
+        }
+        res = await addOrUpdateCommonUploadRecord(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.form.CommonUploadRecordId = res.Result
+          data.Id = res.Result
+          this.form.SiteSurveyFile = data
+        }
+      } catch (err) {
+        console.log(err)
+        this.loading = false;
+      }
+    },
+    checkFileSuffix(fileName) {
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
+      if ('.pdf'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1 && '.docx'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1 && '.doc'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+        return false
+      } else {
+        return true
+      }
+    },
+    handleIsAuthorizeInput(label) {
+      this.form.IsAuthorizeRadiologistsParticipate = false
+      this.form.AssignFixedTechnologists = false
+      this.form[label] = true
+    },
+    async viewManualFile() {
+      if (!this.form.SiteSurveyFile || !this.form.SiteSurveyFile.Path) return this.$message.warning(this.$t("trials:researchForm:message:notFile"))
+      this.$preview({
+        path: this.form.SiteSurveyFile.Path,
+        type: this.form.SiteSurveyFile.FileType,
+        title: this.form.SiteSurveyFile.Path.FileName,
+      })
+    },
+    async downLoad() {
+      if (!this.form.SiteSurveyFile || !this.form.SiteSurveyFile.Path) return this.$message.warning(this.$t("trials:researchForm:message:notFile"))
+      let link = document.createElement('a')
+      link.href = this.OSSclientConfig.basePath + this.form.SiteSurveyFile.Path;
+      link.target = '_blank'
+      link.download = this.form.SiteSurveyFile.FileName
+      link.style.display = 'none'
+      document.body.append(link)
+      link.click()
+      document.body.removeChild(link)
+      link = null
+    },
+    async viewManual() {
+      try {
+        let data = {
+          PageIndex: 1,
+          PageSize: 20,
+          TrialId: this.$route.query.trialId,
+          IsPublish: true,
+          FileTypeCode: 4,
+          IsDeleted: false
+        }
+        let res = await getTrialDocumentList(data)
+        if (res.IsSuccess) {
+          const { CurrentPageData } = res.Result
+          if (CurrentPageData.length <= 0) return this.$message.warning(this.$t("trials:researchRecord:ImageManual:message:noImageManual"))
+          this.ExternalList = []
+          CurrentPageData.forEach(item => {
+            let obj = {
+              FilePath: item.Path,
+              FileFormat: 'pdf',
+              Name: item.Name
+            }
+            this.ExternalList.push(obj)
+          });
+          // this.perview_visible = true
+          this.ExternalList.forEach(item => {
+            let link = document.createElement('a')
+            link.href = this.OSSclientConfig.basePath + item.FilePath;
+            link.target = '_blank'
+            link.download = item.Name
+            link.style.display = 'none'
+            document.body.append(link)
+            link.click()
+            document.body.removeChild(link)
+            link = null
+          })
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     // 保存基本信息
-    handleSave(isAutoCommit) {
-      return new Promise(async(resolve) => {
+    handleSave(isAutoCommit, isCheck = false) {
+      return new Promise(async (resolve) => {
+        isCheck = false
         try {
+          if (this.IsOnlyUploadFile && !isCheck) {
+            if (!this.form.UserName) {
+              this.$message.warning(this.$t("trials:researchForm:message:notUserName"))
+              return resolve(false)
+            }
+            if (!this.form.Phone) {
+              this.$message.warning(this.$t("trials:researchForm:message:notPhone"))
+              return resolve(false)
+            }
+            if (!this.form.CommonUploadRecordId) {
+              this.$message.warning(this.$t("trials:researchForm:message:notCommonUploadRecordId"))
+              return resolve(false)
+            }
+            this.btnLoading = true
+            const param = {
+              id: this.form.Id,
+              trialId: this.$route.query.trialId,
+              trialSiteId: this.form.TrialSiteId,
+              userName: this.form.UserName,
+              phone: this.form.Phone,
+              email: this.form.Email,
+              averageEngravingCycle: this.form.AverageEngravingCycle,
+              IsRoutineMRIPDEE: this.form.IsRoutineMRIPDEE,
+              MRIPDFFScanTime: this.form.MRIPDFFScanTime,
+              MRIPDFFLeadTime: this.form.MRIPDFFLeadTime,
+              MRIPDFFOther: this.form.MRIPDFFOther,
+              IsAuthorizeRadiologistsParticipate: this.form.IsAuthorizeRadiologistsParticipate,
+              AssignFixedTechnologists: this.form.AssignFixedTechnologists,
+              ISStrictManualBurnFlag: this.form.ISStrictManualBurnFlag,
+              NotStrictManualBurnFlagReason: this.form.NotStrictManualBurnFlagReason,
+              isConfirmImagingTechnologist: this.form.IsConfirmImagingTechnologist,
+              notConfirmReson: this.form.NotConfirmReson,
+              efficacyEvaluatorType: this.form.EfficacyEvaluatorType,
+              isFollowStudyParameters: this.form.IsFollowStudyParameters,
+              notFollowReson: this.form.NotFollowReson,
+              CommonUploadRecordId: this.form.CommonUploadRecordId
+            }
+            addOrUpdateTrialSiteSurvey(param).then(res => {
+              this.btnLoading = false
+              if (res.IsSuccess && !isAutoCommit) {
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+              }
+              resolve(true)
+            }).catch(() => {
+              this.btnLoading = false
+              reject(false)
+            })
+            return resolve(true)
+          }
           const valid = await this.$refs['researchBSForm'].validate()
           if (valid) {
             this.loading = true
@@ -205,11 +473,20 @@ export default {
               phone: this.form.Phone,
               email: this.form.Email,
               averageEngravingCycle: this.form.AverageEngravingCycle,
+              IsRoutineMRIPDEE: this.form.IsRoutineMRIPDEE,
+              MRIPDFFScanTime: this.form.MRIPDFFScanTime,
+              MRIPDFFLeadTime: this.form.MRIPDFFLeadTime,
+              MRIPDFFOther: this.form.MRIPDFFOther,
+              IsAuthorizeRadiologistsParticipate: this.form.IsAuthorizeRadiologistsParticipate,
+              AssignFixedTechnologists: this.form.AssignFixedTechnologists,
+              ISStrictManualBurnFlag: this.form.ISStrictManualBurnFlag,
+              NotStrictManualBurnFlagReason: this.form.NotStrictManualBurnFlagReason,
               isConfirmImagingTechnologist: this.form.IsConfirmImagingTechnologist,
               notConfirmReson: this.form.NotConfirmReson,
               efficacyEvaluatorType: this.form.EfficacyEvaluatorType,
               isFollowStudyParameters: this.form.IsFollowStudyParameters,
-              notFollowReson: this.form.NotFollowReson
+              notFollowReson: this.form.NotFollowReson,
+              CommonUploadRecordId: this.form.CommonUploadRecordId
             }
             const res = await addOrUpdateTrialSiteSurvey(param)
             this.loading = false
@@ -232,7 +509,7 @@ export default {
     // 初始化
     async initForm(trialInfo, trialSiteSurvey, notShowFieldList) {
       // 获取项目下的site
-      const { Result } = await getTrialSiteSelect(this.$route.query.trialId)
+      const { Result } = await getTrialSiteSelect(this.$route.query.trialId, { IgnoreDisable: true })
       this.siteOptions = Result
       this.form.Id = trialSiteSurvey.Id
       this.form.Sponsor = trialInfo.Sponsor // 申办方
@@ -246,7 +523,20 @@ export default {
       this.form.UserName = trialSiteSurvey.UserName // 联系人
       this.form.Phone = trialSiteSurvey.Phone // 联系人电话
       this.form.Email = trialSiteSurvey.Email // 联系人邮箱
+      this.form.CommonUploadRecordId = trialSiteSurvey.CommonUploadRecordId
+      this.form.SiteSurveyFile = trialSiteSurvey.SiteSurveyFile || {}
+      this.form.fileStr = this.form.SiteSurveyFile.FileName
       this.form.AverageEngravingCycle = trialSiteSurvey.AverageEngravingCycle
+      this.form.IsRoutineMRIPDEE = trialSiteSurvey.IsRoutineMRIPDEE
+      this.form.MRIPDFFScanTime = trialSiteSurvey.MRIPDFFScanTime
+      this.form.MRIPDFFLeadTime = trialSiteSurvey.MRIPDFFLeadTime
+      this.form.MRIPDFFOther = trialSiteSurvey.MRIPDFFOther
+      this.form.IsAuthorizeRadiologistsParticipate = trialSiteSurvey.IsAuthorizeRadiologistsParticipate
+      this.form.AssignFixedTechnologists = trialSiteSurvey.AssignFixedTechnologists
+      if (this.form.IsAuthorizeRadiologistsParticipate) this.form.IsAuthorize = 'IsAuthorizeRadiologistsParticipate'
+      if (this.form.AssignFixedTechnologists) this.form.IsAuthorize = 'AssignFixedTechnologists'
+      this.form.ISStrictManualBurnFlag = trialSiteSurvey.ISStrictManualBurnFlag
+      this.form.NotStrictManualBurnFlagReason = trialSiteSurvey.NotStrictManualBurnFlagReason
       this.form.IsConfirmImagingTechnologist = trialSiteSurvey.IsConfirmImagingTechnologist
       this.form.NotConfirmReson = trialSiteSurvey.NotConfirmReson
       this.form.EfficacyEvaluatorType = trialSiteSurvey.EfficacyEvaluatorType
@@ -267,39 +557,46 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.research_bs_content{
+.research_bs_content {
 
-  .basic_content{
+  .basic_content {
     padding: 0 20px;
     background: #fff;
 
   }
-  .login_content{
+
+  .login_content {
     padding: 5px 20px;
     margin-top: 5px;
     background: #fff;
+
     ::v-deep .el-form-item {
       padding-bottom: 20px;
-      
+
     }
   }
-  .code_content{
-    display:flex;
+
+  .code_content {
+    display: flex;
     flex-direction: row;
     justify-content: flex-start;
-    .el-input{
+
+    .el-input {
       margin-right: 10px;
     }
   }
-  .form-label-width{
-    ::v-deep .el-form-item__label{
+
+  .form-label-width {
+    ::v-deep .el-form-item__label {
       width: 140px;
     }
-    ::v-deep .el-form-item__content{
+
+    ::v-deep .el-form-item__content {
       margin-left: 140px;
     }
   }
-  .submit_content{
+
+  .submit_content {
     margin-top: 20px;
     text-align: center;
   }
@@ -308,10 +605,61 @@ export default {
     margin-bottom: 0px;
     padding-top: 5px;
     border-bottom: 1px solid #f5f7fa;
-    .el-form-item__content{
+
+    .el-form-item__content {
       color: #82848a;
     }
   }
 
 }
+
+.upload {
+  display: inline-block;
+  height: 36px;
+  width: 90px;
+  padding: 0 10px;
+  line-height: 23px;
+  position: relative;
+  text-decoration: none;
+  border-radius: 3px;
+  overflow: hidden;
+  text-align: center;
+  background: #428bca;
+  border-color: #428bca;
+  color: #fff;
+  margin-right: 5px;
+
+  .select-file {
+    height: 36px;
+    width: 90px;
+    position: absolute;
+    overflow: hidden;
+    left: 0;
+    top: 0;
+    opacity: 0;
+    font-size: 0;
+  }
+
+  .btn-select {
+    //给显示在页面上的按钮写样式
+    // width: 70px; 
+    height: 36px;
+    line-height: 36px;
+    text-align: center;
+    cursor: pointer;
+    border-radius: 24px;
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    left: 10px;
+    pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+  }
+}
+
+.file {
+  ::v-deep .el-form-item__content {
+    display: flex;
+    align-items: center;
+  }
+}
 </style>
diff --git a/src/views/research-mobile/components/EquipmentForm.vue b/src/views/research-mobile/components/EquipmentForm.vue
index 80c83c8e..3b2c3d01 100644
--- a/src/views/research-mobile/components/EquipmentForm.vue
+++ b/src/views/research-mobile/components/EquipmentForm.vue
@@ -1,59 +1,107 @@
 <template>
-  <div
-    v-loading="loading"
-    class="equipment_form_content"
-  >
-    <el-form
-      ref="equipmentForm"
-      :model="form"
-      :rules="rules"
-      label-position="left"
-    >
+  <div v-loading="loading" class="equipment_form_content">
+    <el-form ref="equipmentForm" :model="form" :rules="rules" label-position="left">
       <!-- 扫描设备 -->
-      <el-form-item :label="$t('trials:equiptResearch:form:equipment')" prop="EquipmentTypeId">
-        <el-select
-          v-model="form.EquipmentTypeId"
-          style="width:100%"
-        >
-          <el-option
-            v-for="item of $d.SiteSurvey_ScanEquipmentType"
-            :key="item.id"
-            :label="item.label"
-            :value="item.id"
-          />
-        </el-select>
+      <el-form-item :label="$t('trials:equiptResearch:form:equipment')" prop="EquipmentTypeEnum"
+        v-if="EquipmentControlFieldList.includes('EquipmentTypeEnum')">
+        <div style="display: flex;align-items: center;">
+          <el-select v-model="form.EquipmentTypeEnum" style="width:100%" @change="form.OtherEquipmentType = null">
+            <el-option v-for="item of $d.SiteSurvey_ScanEquipmentType" :key="item.id" :label="item.label"
+              :value="item.value" />
+          </el-select>
+          <el-input placeholder="" v-model="form.OtherEquipmentType" style="margin-left: 10px;"
+            v-if="form.EquipmentTypeEnum == '-1'" clearable>
+          </el-input>
+        </div>
       </el-form-item>
       <!-- 扫描参数 -->
-      <el-form-item v-if="isShowParameters" :label="$t('trials:equiptResearch:form:param')">
+      <el-form-item :label="$t('trials:equiptResearch:form:param')"
+        v-if="EquipmentControlFieldList.includes('Parameters')" prop="Parameters">
         <el-input v-model="form.Parameters" />
       </el-form-item>
       <!-- 扫描仪器制造商名称 -->
-      <el-form-item :label="$t('trials:equiptResearch:form:manufacturer')">
-        <el-input v-model="form.ManufacturerName" />
+      <el-form-item :label="$t('trials:equiptResearch:form:manufacturer')"
+        v-if="EquipmentControlFieldList.includes('ManufacturerType')" prop="ManufacturerType">
+        <div style="display: flex;align-items: center;">
+          <el-select v-model="form.ManufacturerType" style="width:100%" @change="form.ManufacturerName = null">
+            <el-option v-for="item of $d.ManufacturerType" :key="item.id" :label="item.label" :value="item.value" />
+          </el-select>
+          <el-input placeholder="" v-model="form.ManufacturerName" style="margin-left: 10px;"
+            v-if="form.ManufacturerType == '-1'" clearable>
+          </el-input>
+        </div>
       </el-form-item>
       <!-- 扫描仪型号 -->
-      <el-form-item :label="$t('trials:equiptResearch:form:model')">
+      <el-form-item :label="$t('trials:equiptResearch:form:model')"
+        v-if="EquipmentControlFieldList.includes('ScannerType')" prop="ScannerType">
         <el-input v-model="form.ScannerType" />
       </el-form-item>
+      <!-- 磁场强度 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:MagneticFieldStrengthType')"
+        v-if="EquipmentControlFieldList.includes('MagneticFieldStrengthType')" prop="MagneticFieldStrengthType">
+        <el-select v-model="form.MagneticFieldStrengthType" style="width:100%">
+          <el-option v-for="item of $d.MagneticFieldStrengthType" :key="item.id" :label="item.label"
+            :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <!-- 体部线圈通道数 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:BodyCoilChannelCount')"
+        v-if="EquipmentControlFieldList.includes('BodyCoilChannelCount')" prop="BodyCoilChannelCount">
+        <el-select v-model="form.BodyCoilChannelCount" style="width:100%">
+          <el-option v-for="item of $d.BodyCoilChannelCount" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <!-- 是否具备专用的PDFF脂肪定量序列（CSE-MRI序列） -->
+      <el-form-item :label="$t('trials:equiptResearch:form:HasDedicatedPdfFatQuantificationSequence')"
+        v-if="EquipmentControlFieldList.includes('HasDedicatedPdfFatQuantificationSequence')"
+        prop="HasDedicatedPdfFatQuantificationSequence">
+        <el-select v-model="form.HasDedicatedPdfFatQuantificationSequence" style="width:100%"
+          @change="form.PdfFatQuantificationSequenceType = null, form.OtherSequenceSpecification = null">
+          <el-option v-for="item of $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <!-- PDFF脂肪定量序列 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:PdfFatQuantificationSequenceType')"
+        prop="PdfFatQuantificationSequenceType"
+        v-if="form.HasDedicatedPdfFatQuantificationSequence && EquipmentControlFieldList.includes('PdfFatQuantificationSequenceType')">
+        <div style="display: flex;align-items: center;">
+          <el-select v-model="form.PdfFatQuantificationSequenceType" style="width:100%"
+            @change="form.OtherSequenceSpecification = null">
+            <el-option v-for="item of $d.PdfFatQuantificationSequenceType" :key="item.id" :label="item.label"
+              :value="item.value" />
+          </el-select>
+          <el-input placeholder="" v-model="form.OtherSequenceSpecification" style="margin-left: 10px;"
+            v-if="form.PdfFatQuantificationSequenceType == '-1'" clearable>
+          </el-input>
+        </div>
+      </el-form-item>
+      <!-- 是否包含 T2/R2 校正（用于铁沉积校正） -->
+      <el-form-item :label="$t('trials:equiptResearch:form:HasT2R2Correction')" prop="HasT2R2Correction"
+        v-if="EquipmentControlFieldList.includes('HasT2R2Correction')">
+        <el-select v-model="form.HasT2R2Correction" style="width:100%">
+          <el-option v-for="item of $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
+      <!-- 是否可完整导出 PDFF 参数图及全部原始 DICOM 数据 -->
+      <el-form-item :label="$t('trials:equiptResearch:form:CanFullyExportPdfParameterMapsAndRawDicom')"
+        prop="CanFullyExportPdfParameterMapsAndRawDicom"
+        v-if="EquipmentControlFieldList.includes('CanFullyExportPdfParameterMapsAndRawDicom')">
+        <el-select v-model="form.CanFullyExportPdfParameterMapsAndRawDicom" style="width:100%">
+          <el-option v-for="item of $d.YesOrNo" :key="item.id" :label="item.label" :value="item.value" />
+        </el-select>
+      </el-form-item>
       <!-- 备注 -->
-      <el-form-item :label="$t('trials:equiptResearch:form:remark')">
+      <el-form-item :label="$t('trials:equiptResearch:form:remark')" prop="Note"
+        v-if="EquipmentControlFieldList.includes('Note')">
         <el-input v-model="form.Note" />
       </el-form-item>
       <div style="text-align: center;padding:20px 0px;">
         <!-- 取消 -->
-        <el-button
-          size="large"
-          type="primary"
-          @click="handleCancel"
-        >
+        <el-button size="large" type="primary" @click="handleCancel">
           {{ $t("common:button:cancel") }}
         </el-button>
         <!-- 保存 -->
-        <el-button
-          size="large"
-          type="primary"
-          @click="handleSave"
-        >
+        <el-button size="large" type="primary" @click="handleSave">
           {{ $t("common:button:save") }}
         </el-button>
       </div>
@@ -76,29 +124,96 @@ export default {
       type: String,
       default: ''
     },
-    isShowParameters: {
-      type: Boolean,
-      default: false
+    EquipmentControlFieldList: {
+      type: Array,
+      default: () => {
+        return []
+      }
     }
   },
   data() {
     return {
       form: {
         Id: '',
-        EquipmentTypeId: '',
-        Parameters: '',
-        ManufacturerName: '',
-        ScannerType: '',
-        Note: '',
+        EquipmentTypeEnum: null,
+        OtherEquipmentType: null,
+        Parameters: null,
+        Note: null,
+        ManufacturerType: null,
+        ManufacturerName: null,
+        ScannerType: null,
+        MagneticFieldStrengthType: null,
+        BodyCoilChannelCount: null,
+        HasDedicatedPdfFatQuantificationSequence: null,
+        PdfFatQuantificationSequenceType: null,
+        OtherSequenceSpecification: null,
+        HasT2R2Correction: null,
+        CanFullyExportPdfParameterMapsAndRawDicom: null,
         TrialSiteSurveyId: ''
       },
       rules: {
-        EquipmentTypeId: [
+        EquipmentTypeEnum: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] },
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.EquipmentTypeEnum === -1 && !this.form.OtherEquipmentType) {
+                callback(this.$t('common:ruleMessage:specify'));
+              } else {
+                callback()
+              }
+            }, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          },
+        ],
+        Parameters: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
+        ],
+        //  Note: [
+        //   { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
+        // ],
+        ManufacturerType: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] },
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.ManufacturerType === -1 && !this.form.ManufacturerName) {
+                callback(this.$t('common:ruleMessage:specify'));
+              } else {
+                callback()
+              }
+            }, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          },
+        ],
+        ScannerType: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
+        ],
+        MagneticFieldStrengthType: [
           { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
-        ]
+        ],
+        BodyCoilChannelCount: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+        ],
+        HasDedicatedPdfFatQuantificationSequence: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+        ],
+        PdfFatQuantificationSequenceType: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] },
+          {
+            validator: (rule, value, callback) => {
+              if (this.form.PdfFatQuantificationSequenceType === -1 && !this.form.OtherSequenceSpecification) {
+                callback(this.$t('common:ruleMessage:specify'));
+              } else {
+                callback()
+              }
+            }, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']
+          },
+        ],
+        HasT2R2Correction: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+        ],
+        CanFullyExportPdfParameterMapsAndRawDicom: [
+          { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] }
+        ],
       },
       loading: false,
-      dictionaryList: {}
     }
   },
   mounted() {
@@ -154,13 +269,15 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.equipment_form_content{
+.equipment_form_content {
   padding: 0 10px;
+
   ::v-deep .el-form-item {
     margin-bottom: 0px;
     padding: 5px 0 20px 0;
     border-bottom: 1px solid #f5f7fa;
-    .el-form-item__content{
+
+    .el-form-item__content {
       color: #82848a;
     }
   }
diff --git a/src/views/research-mobile/components/Equipments.vue b/src/views/research-mobile/components/Equipments.vue
index 9f298386..ace672d8 100644
--- a/src/views/research-mobile/components/Equipments.vue
+++ b/src/views/research-mobile/components/Equipments.vue
@@ -13,18 +13,22 @@
         <i class="el-icon-receiving" />
       </div>
       <div class="p_info">
-        <div
-          class="p_info_basic"
-          :style="{maxWidth:w+'px','white-space': 'nowrap',
-                   overflow: 'hidden',
-                   'text-overflow': 'ellipsis'}"
-        >
-          <div class="p_text">{{ item.EquipmentType }}</div>
-          <div v-if="isShowParameters" class="p_text" style="margin-left:10px">{{ item.Parameters }}</div>
-          <div class="p_text" style="margin-left:10px">{{ item.ManufacturerName }}</div>
+        <div class="p_info_basic" :style="{
+          maxWidth: w + 'px', 'white-space': 'nowrap',
+          overflow: 'hidden',
+          'text-overflow': 'ellipsis'
+        }">
+          <div class="p_text" v-if="EquipmentControlFieldList.includes('EquipmentTypeEnum')">
+            {{ item.OtherEquipmentType ? item.OtherEquipmentType :
+              $fd('SiteSurvey_ScanEquipmentType', item.EquipmentTypeEnum) }}</div>
+          <div v-if="EquipmentControlFieldList.includes('Parameters')" class="p_text" style="margin-left:10px">{{
+            item.Parameters }}</div>
+          <div class="p_text" style="margin-left:10px" v-if="EquipmentControlFieldList.includes('ManufacturerType')">{{
+            item.ManufacturerName ? item.ManufacturerName : $fd('ManufacturerType',
+              item.ManufacturerType) }}</div>
         </div>
-        <div class="p_text">{{ item.ScannerType }}</div>
-        <div class="p_text">{{ item.Note }}</div>
+        <div class="p_text" v-if="EquipmentControlFieldList.includes('ScannerType')">{{ item.ScannerType }}</div>
+        <div class="p_text" v-if="EquipmentControlFieldList.includes('Note')">{{ item.Note }}</div>
       </div>
       <div v-if="state === 0 && userTypeEnumInt === 0 && !isHistory" class="p_func">
         <el-button type="text" @click="handleEdit(item)">
@@ -36,19 +40,9 @@
       </div>
     </div>
     <!-- 添加/编辑设备信息 -->
-    <el-drawer
-      :title="title"
-      :visible.sync="formVisible"
-      direction="btt"
-      size="70%"
-    >
-      <EquipmentForm
-        v-if="formVisible"
-        :equipment-info="equipmentInfo"
-        :is-show-parameters="isShowParameters"
-        @getList="getList"
-        @close="close"
-      />
+    <el-drawer :title="title" :visible.sync="formVisible" direction="btt" size="70%">
+      <EquipmentForm v-if="formVisible" :equipment-info="equipmentInfo"
+        :EquipmentControlFieldList="EquipmentControlFieldList" @getList="getList" @close="close" />
     </el-drawer>
   </div>
 </template>
@@ -81,7 +75,7 @@ export default {
       state: null,
       trialSiteSurveyId: '',
       trialId: '',
-      isShowParameters: false
+      EquipmentControlFieldList: []
     }
   },
   mounted() {
@@ -142,8 +136,11 @@ export default {
         console.log(e)
       }
     },
-    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
-      this.isShowParameters = isShowParameters
+    initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, EquipmentControlFieldList) {
+      this.EquipmentControlFieldList = []
+      EquipmentControlFieldList.forEach(item => {
+        this.EquipmentControlFieldList.push(item.FiledName)
+      })
       this.list = TrialSiteEquipmentSurveyList
       this.state = trialSiteSurvey.State
       this.$forceUpdate()
@@ -157,63 +154,70 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.equipments_content{
+.equipments_content {
   background: #fff;
   padding: 10px;
-  .title{
+
+  .title {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     align-items: center;
     margin-bottom: 10px;
   }
-  .equipment_info{
+
+  .equipment_info {
     display: flex;
     flex-direction: row;
     justify-content: space-around;
     align-items: center;
     border-top: 1px solid #f5f7fa;
-    .p_icon{
+
+    .p_icon {
       width: 70px;
       font-size: 25px;
       font-weight: bold;
       text-align: center;
     }
-    .p_info{
+
+    .p_info {
       position: relative;
-      flex:1;
+      flex: 1;
       display: flex;
       flex-direction: column;
       justify-content: space-evenly;
       // border-right: 1px solid #f5f7fa;
       font-size: 13px;
     }
+
     .p_info:after {
-        content: '';
-        position: absolute;
-        top: 50%;
-        transform: translateY(-50%);
-        right: 0;
-        height: 50px;
-        width: 1px;
-        background-color: #f5f7fa;
+      content: '';
+      position: absolute;
+      top: 50%;
+      transform: translateY(-50%);
+      right: 0;
+      height: 50px;
+      width: 1px;
+      background-color: #f5f7fa;
     }
-    .p_info_basic{
+
+    .p_info_basic {
       display: flex;
       flex-direction: row;
       align-items: center;
 
     }
-    .p_text{
+
+    .p_text {
       line-height: 25px;
       color: #82848a;
     }
-    .p_func{
+
+    .p_func {
       width: 80px;
       padding: 0 10px;
       text-align: center;
     }
   }
 }
-
 </style>
diff --git a/src/views/research-mobile/detail.vue b/src/views/research-mobile/detail.vue
index 0426970a..089ee9d0 100644
--- a/src/views/research-mobile/detail.vue
+++ b/src/views/research-mobile/detail.vue
@@ -4,30 +4,22 @@
     <div class="d_content">
 
       <!-- 项目基本信息 -->
-      <BasicInfo ref="basicInfo" />
+      <BasicInfo ref="basicInfo" :IsOnlyUploadFile="IsOnlyUploadFile" :IsSupportUploadFile="IsSupportUploadFile" />
       <!-- 历史人员 -->
       <HistoricalParticipants ref="historicalParticipant" class="mt5" />
       <!-- 新增人员 -->
       <Participants ref="participants" class="mt5" />
       <!-- 设备调研 -->
-      <Equipments ref="equipments" class="mt5" />
+      <Equipments ref="equipments" class="mt5" v-if="!siteSurveyNoteInfo.IsCloseEquipmentSurvey" />
       <!-- 备注 -->
       <Notes ref="notes" class="mt5" />
     </div>
     <div class="d_footer">
       <div class="d_func_row">
-        <div
-          v-if="state === 0 && userTypeEnumInt === 0"
-          class="d_func"
-          @click="handleSave"
-        >
+        <div v-if="state === 0 && userTypeEnumInt === 0" class="d_func" @click="handleSave">
           {{ $t('common:button:save') }}
         </div>
-        <div
-          v-if="(state === 0 && userTypeEnumInt === 0)"
-          class="d_func"
-          @click="handleSubmit('submit')"
-        >
+        <div v-if="(state === 0 && userTypeEnumInt === 0)" class="d_func" @click="handleSubmit('submit')">
           {{ $t('trials:researchForm:button:submit') }}
         </div>
       </div>
@@ -58,7 +50,9 @@ export default {
       userTypeEnumInt: 0,
       rejectVisible: false,
       rejectForm: { reason: '' },
-      siteSurveyNoteInfo: null
+      siteSurveyNoteInfo: {},
+      IsSupportUploadFile: false,
+      IsOnlyUploadFile: false
     }
   },
   mounted() {
@@ -78,6 +72,9 @@ export default {
           if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
             this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
           }
+          this.IsSupportUploadFile = res.Result.SiteSurveyFiledConfig.IsSupportUploadFile
+          this.IsOnlyUploadFile = res.Result.SiteSurveyFiledConfig.IsOnlyUploadFile
+          this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey
           this.state = res.Result.TrialSiteSurvey.State
           this.$refs['basicInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
           var historicalArr = []
@@ -92,7 +89,7 @@ export default {
 
           this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
           this.$refs['participants'].initList(newArr, res.Result.TrialSiteSurvey)
-          this.$refs['equipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, !(res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0))
+          this.$refs['equipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig.EquipmentControlFieldList)
           this.$refs['notes'].initPage(this.siteSurveyNoteInfo)
         }
         this.loading = false
@@ -129,7 +126,8 @@ export default {
           this.userTypeEnumInt === 0 ? this.$t('trials:researchForm:message:submitWarning') : this.$t('trials:researchForm:message:submitWarning2'),
           {
             type: 'warning',
-            distinguishCancelAndClose: true
+            distinguishCancelAndClose: true,
+            customClass: "mobile_confirm"
           }
         )
         if (confirm !== 'confirm') return
@@ -160,9 +158,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.research_detal_wrapper{
-  background-color:#f5f7fa;
-  .d_title{
+.research_detal_wrapper {
+  background-color: #f5f7fa;
+
+  .d_title {
     margin-bottom: 5px;
     line-height: 80px;
     font-size: 28px;
@@ -173,10 +172,11 @@ export default {
     top: 0;
     z-index: 10;
   }
+
   // .d_content{
 
   // }
-  .d_footer{
+  .d_footer {
     position: sticky;
     bottom: 0;
     z-index: 10;
@@ -185,12 +185,14 @@ export default {
     text-align: center;
     // padding: 20px;
   }
-  .d_func_row{
+
+  .d_func_row {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
   }
-  .d_func{
+
+  .d_func {
     flex: 1;
     margin: 20px;
     color: #fff;
@@ -207,15 +209,16 @@ export default {
     line-height: 1;
     white-space: nowrap;
     cursor: pointer;
-    &:hover{
+
+    &:hover {
       background: #68a2d5;
       border-color: #68a2d5;
       color: #fff;
     }
   }
-  .mt5{
+
+  .mt5 {
     margin-top: 5px
   }
 }
-
 </style>
diff --git a/src/views/research-mobile/login.vue b/src/views/research-mobile/login.vue
index 5e3f05f0..ccb78994 100644
--- a/src/views/research-mobile/login.vue
+++ b/src/views/research-mobile/login.vue
@@ -1,131 +1,88 @@
 <template>
   <div class="research_login_m_content">
-    <div class="title">{{ $t('trials:researchForm:title:question') }}</div>
-    <el-form
-      ref="loginForm"
-      v-loading="loading"
-      label-position="left"
-      label-width="120px"
-      :model="form"
-      :rules="rules"
-    >
-      <div class="basic_content">
-        <!-- 项目编号 -->
-        <el-form-item
-          :label="$t('trials:researchForm:form:trialId')"
-        >
-          <span>{{ form.TrialCode }}</span>
-        </el-form-item>
-        <!-- 试验方案号 -->
-        <el-form-item
-          :label="$t('trials:researchForm:form:researchNo')"
-        >
-          <span>{{ form.ResearchProgramNo }}</span>
-        </el-form-item>
-        <!-- 试验名称 -->
-        <el-form-item
-          :label="$t('trials:researchForm:form:researchName')"
-        >
-          <span>{{ form.ExperimentName }}</span>
-        </el-form-item>
-        <!-- 适应症类型 -->
-        <el-form-item
-          :label="$t('trials:researchForm:form:decleareType')"
-        >
-          <span>{{ form.IndicationType }}</span>
-        </el-form-item>
+    <div v-if="IsExpired"></div>
+    <div v-else-if="verify" class="LinkVerificationCode_content">
+      <el-form ref="codeForm" v-loading="loading" label-position="top" label-width="120px" :model="codeForm"
+        :rules="code_rules">
+        <div class="basic_content">
+          <!-- 项目编号 -->
+          <el-form-item :label="$t('trials:researchForm:message:LinkVerificationCode')" prop="LinkVerificationCode">
+            <el-input v-model="codeForm.LinkVerificationCode" autocomplete="new-password" />
+          </el-form-item>
+        </div>
+      </el-form>
+      <div class="submit_content">
+        <el-button size="large" type="primary" @click="getLinkVerificationCodeIsEffective">
+          {{ $t('common:button:submit') }}
+        </el-button>
       </div>
-      <div class="login_content">
-        <el-form-item
-          :label="$t('trials:researchForm:form:siteName')"
-          prop="TrialSiteId"
-        >
-          <el-select
-            v-model="form.TrialSiteId"
-            filterable
-            style="width:100%;"
-            @change="handleSiteChange"
-          >
-            <el-option
-              v-for="(item,index) of siteOptions"
-              :key="index"
-              :label="item.TrialSiteAliasName"
-              :value="item.TrialSiteId"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-if="form.TrialSiteId && isHaveSiteSurveyRecord"
-          label=""
-          style="text-align:right;"
-        >
-          <!-- 更新调研表 -->
-          <el-link
-            v-if="!form.IsUpdate"
-            type="primary"
-            @click="form.IsUpdate = true"
-          >
-            {{ $t('trials:researchForm:button:updateQsForm') }}
-          </el-link>
-          <!-- 取消更新调研表 -->
-          <el-link
-            v-else
-            type="primary"
-            @click="form.IsUpdate = false;form.ReplaceUserEmailOrPhone=''"
-          >
-            {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
-          </el-link>
-        </el-form-item>
+    </div>
+    <template v-else>
+      <div class="title">{{ $t('trials:researchForm:title:question') }}</div>
+      <el-form ref="loginForm" v-loading="loading" label-position="left" label-width="120px" :model="form"
+        :rules="rules">
+        <div class="basic_content">
+          <!-- 项目编号 -->
+          <el-form-item :label="$t('trials:researchForm:form:trialId')">
+            <span>{{ form.TrialCode }}</span>
+          </el-form-item>
+          <!-- 试验方案号 -->
+          <el-form-item :label="$t('trials:researchForm:form:researchNo')">
+            <span>{{ form.ResearchProgramNo }}</span>
+          </el-form-item>
+          <!-- 试验名称 -->
+          <el-form-item :label="$t('trials:researchForm:form:researchName')">
+            <span>{{ form.ExperimentName }}</span>
+          </el-form-item>
+          <!-- 适应症类型 -->
+          <el-form-item :label="$t('trials:researchForm:form:decleareType')">
+            <span>{{ form.IndicationType }}</span>
+          </el-form-item>
+        </div>
+        <div class="login_content">
+          <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
+            <el-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange">
+              <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
+                :value="item.TrialSiteId" />
+            </el-select>
+          </el-form-item>
+          <el-form-item v-if="form.TrialSiteId && isHaveSiteSurveyRecord" label="" style="text-align:right;">
+            <!-- 更新调研表 -->
+            <el-link v-if="!form.IsUpdate" type="primary" @click="form.IsUpdate = true">
+              {{ $t('trials:researchForm:button:updateQsForm') }}
+            </el-link>
+            <!-- 取消更新调研表 -->
+            <el-link v-else type="primary" @click="form.IsUpdate = false; form.ReplaceUserEmailOrPhone = ''">
+              {{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
+            </el-link>
+          </el-form-item>
 
-        <!-- 原调研表填写人邮箱 -->
-        <el-form-item
-          v-if="form.IsUpdate"
-          :label="$t('trials:researchForm:form:originalEmail')"
-          prop="ReplaceUserEmailOrPhone"
-        >
-          <el-input
-            v-model="form.ReplaceUserEmailOrPhone"
-            autocomplete="new-password"
-          />
-        </el-form-item>
-        <!-- 联系邮箱 -->
-        <el-form-item
-          :label="$t('trials:researchForm:form:contactorEmail')"
-          prop="EmailOrPhone"
-        >
-          <el-input
-            v-model="form.EmailOrPhone"
-            autocomplete="new-password"
-          />
-        </el-form-item>
-        <el-form-item
-          :label="$t('trials:researchForm:form:verifyCode')"
-        >
-          <div class="code_content">
-            <el-input
-              v-model="form.VerificationCode"
-              autocomplete="new-password"
-            />
-            <el-button
-              type="primary"
-              :disabled="sendDisabled || !form.EmailOrPhone || count > 0"
-              @click="handleSendCode"
-            >
-              {{ this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}
+          <!-- 原调研表填写人邮箱 -->
+          <el-form-item v-if="form.IsUpdate" :label="$t('trials:researchForm:form:originalEmail')"
+            prop="ReplaceUserEmailOrPhone">
+            <el-input v-model="form.ReplaceUserEmailOrPhone" autocomplete="new-password" />
+          </el-form-item>
+          <!-- 联系邮箱 -->
+          <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="EmailOrPhone">
+            <el-input v-model="form.EmailOrPhone" autocomplete="new-password" />
+          </el-form-item>
+          <el-form-item :label="$t('trials:researchForm:form:verifyCode')">
+            <div class="code_content">
+              <el-input v-model="form.VerificationCode" autocomplete="new-password" />
+              <el-button type="primary" :disabled="sendDisabled || !form.EmailOrPhone || count > 0"
+                @click="handleSendCode">
+                {{ this.$t('trials:researchForm:button:send') }} {{ sendTitle ? `${sendTitle}` : null }}
+              </el-button>
+            </div>
+          </el-form-item>
+          <div class="submit_content">
+            <el-button size="large" type="primary" @click="onSubmit">
+              {{ $t('common:button:submit') }}
             </el-button>
           </div>
-        </el-form-item>
-        <div class="submit_content">
-          <el-button
-            size="large"
-            type="primary"
-            @click="onSubmit"
-          >
-            {{ $t('common:button:submit') }}
-          </el-button>
         </div>
-      </div>
-    </el-form>
+      </el-form>
+    </template>
   </div>
 </template>
 <script>
@@ -133,6 +90,10 @@ import { sendVerifyCode, verifySendCode, getTrialSurveyInitInfo } from '@/api/re
 import { getUserMenuTree, getUserPermissions } from '@/api/user'
 import store from '@/store'
 import { mapGetters, mapMutations } from 'vuex'
+import {
+  getLinkLinkExpirationTime,
+  getLinkVerificationCodeIsEffective
+} from '@/api/trials'
 export default {
   name: 'ResearchMobileLogin',
   data() {
@@ -185,6 +146,16 @@ export default {
     }
     return {
       trialId: '',
+      IsExpired: true,
+      verify: true,
+      codeForm: {
+        LinkVerificationCode: null,
+      },
+      code_rules: {
+        LinkVerificationCode: [
+          { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] }
+        ],
+      },
       form: {
         Sponsor: null, // 申办方
         ResearchProgramNo: null, // 方案号
@@ -239,16 +210,119 @@ export default {
     ])
   },
   mounted() {
-    this.$i18n.locale = this.$route.query.lang
-    this.setLanguage(this.$route.query.lang)
-    this.$updateDictionary()
-    if (this.$route.query.trialId) {
-      this.trialId = this.$route.query.trialId
-      this.initPage()
+    let lang = this.$route.query.lang
+    if (!lang) {
+      const language = navigator.language
+      lang = 'en'
+      if (language.includes("zh")) {
+        lang = 'zh'
+      }
     }
+    this.$i18n.locale = lang
+    this.setLanguage(lang)
+    this.$updateDictionary()
+    this.getLinkTimeIsExpired()
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    async getLinkTimeIsExpired() {
+      try {
+        let data = {
+          TrialId: this.$route.query.trialId,
+        }
+        let res = await getLinkLinkExpirationTime(data)
+        if (res.IsSuccess) {
+          if (res.Result.IsExpired) {
+            return this.$router.replace('/link_expired')
+            //    return this.$confirm(this.$t("trials:researchForm:confirm:linkIsExpired"), '', {
+            //   type: 'warning'
+            // })
+            // return this.IsExpired = true
+          }
+          // this.customPrompt()
+          this.IsExpired = false
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async getLinkVerificationCodeIsEffective() {
+      try {
+        let validate = await this.$refs.codeForm.validate()
+        if (!validate) return false
+        let data = {
+          TrialId: this.$route.query.trialId,
+          LinkVerificationCode: this.codeForm.LinkVerificationCode
+        }
+        let res = await getLinkVerificationCodeIsEffective(data)
+        if (res.IsSuccess) {
+          if (!res.Result.IsEffective) {
+            return false
+          }
+          this.verify = false
+          if (this.$route.query.trialId) {
+            this.trialId = this.$route.query.trialId
+            this.initPage()
+          }
+          if (this.$route.query.isUpload) {
+            this.isUpload = true
+            this.form.IsUpdate = true
+            let { email, oldEMail, trialSiteId } = this.$route.query
+            if (trialSiteId) this.form.TrialSiteId = trialSiteId
+            if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail
+            if (email && email !== 'null') {
+              this.form.EmailOrPhone = email
+            } else {
+              this.form.EmailOrPhone = oldEMail
+            }
+            if ((email && email !== 'null') || (oldEMail && oldEMail !== 'null')) {
+              this.isNeedUpload = false
+            }
+          }
+        }
+        return true
+      } catch (err) {
+        return false
+        console.log(err)
+      }
+    },
+    async customPrompt(name) {
+      try {
+        const that = this
+        // 请输入标记名称
+        let message = this.$t('trials:researchForm:message:LinkVerificationCode')
+        const { value } = await this.$prompt(message, '', {
+          showClose: false,
+          cancelButtonText: this.$t('common:button:cancel'),
+          confirmButtonText: this.$t('trials:researchForm:button:saveLinkCode'),
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false,
+          inputValue: name,
+          beforeClose: async (action, instance, done) => {
+            if (action === 'confirm') {
+              const value = instance.inputValue
+              if (!value) {
+                that.$message.error(this.$t('trials:researchForm:error:noValue'))
+              } else {
+                let flag = await this.getLinkVerificationCodeIsEffective(value)
+                if (!flag) {
+                  that.$message.error(this.$t('trials:researchForm:confirm:isEffective'))
+                } else {
+                  done()
+                }
+              }
+            } else {
+              done()
+            }
+          }
+        })
+        this.getLinkVerificationCodeIsEffective(value)
+      } catch (err) {
+        console.log(err)
+        return null
+      }
+    },
     // 初始化页面
     async initPage() {
       try {
@@ -292,8 +366,18 @@ export default {
 
         if (res.IsSuccess) {
           zzSessionStorage.clear()
-          this.$i18n.locale = this.$route.query.lang
-          this.setLanguage(this.$route.query.lang)
+          // this.$i18n.locale = this.$route.query.lang
+          // this.setLanguage(this.$route.query.lang)
+          let lang = this.$route.query.lang
+          if (!lang) {
+            const language = navigator.language
+            lang = 'en'
+            if (language.includes("zh")) {
+              lang = 'zh'
+            }
+          }
+          this.$i18n.locale = lang
+          this.setLanguage(lang)
           store.dispatch('user/setToken', res.Result.Token)
           zzSessionStorage.setItem('TokenKey', res.Result.Token)
           var permissions = await getUserPermissions()
@@ -363,9 +447,10 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.research_login_m_content{
-  background-color:#f5f7fa;
-  .title{
+.research_login_m_content {
+  background-color: #f5f7fa;
+
+  .title {
     margin-bottom: 5px;
     line-height: 80px;
     font-size: 28px;
@@ -373,27 +458,33 @@ export default {
     text-align: center;
     background: #fff;
   }
-  .basic_content{
+
+  .basic_content {
     padding: 0 20px;
     background: #fff;
   }
-  .login_content{
+
+  .login_content {
     padding: 5px 20px;
     margin-top: 5px;
     background: #fff;
+
     ::v-deep .el-form-item {
       padding-bottom: 20px;
     }
   }
-  .code_content{
-    display:flex;
+
+  .code_content {
+    display: flex;
     flex-direction: row;
     justify-content: flex-start;
-    .el-input{
+
+    .el-input {
       margin-right: 10px;
     }
   }
-  .submit_content{
+
+  .submit_content {
     margin-top: 20px;
     text-align: center;
   }
@@ -402,11 +493,20 @@ export default {
     margin-bottom: 0px;
     padding-top: 5px;
     border-bottom: 1px solid #f5f7fa;
-    .el-form-item__content{
+
+    .el-form-item__content {
       color: #82848a;
     }
   }
-  
+
 
 }
+
+.LinkVerificationCode_content {
+  position: fixed;
+  top: 40%;
+  bottom: 40%;
+  right: 0;
+  left: 0;
+}
 </style>
diff --git a/src/views/research/components/BaseInfo.vue b/src/views/research/components/BaseInfo.vue
index 0624c28f..2ea058a0 100644
--- a/src/views/research/components/BaseInfo.vue
+++ b/src/views/research/components/BaseInfo.vue
@@ -1,6 +1,6 @@
 <template>
   <el-form v-if="isShow" ref="researchBSForm" size="small" :model="form" :rules="rules" style="width:80%"
-    label-position="left">
+    label-position="left" v-loading="loading">
     <!-- 项目编号 -->
     <el-form-item :label="$t('trials:researchForm:form:trialId')">
       <el-input v-model="form.TrialCode" disabled />
@@ -20,7 +20,7 @@
     <!-- 中心名称 -->
     <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
       <el-select v-model="form.TrialSiteId" filterable style="width:100%;"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" @change="handleSiteChange">
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" @change="handleSiteChange">
         <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteAliasName"
           :value="item.TrialSiteId" />
       </el-select>
@@ -31,28 +31,47 @@
     </el-form-item>
     <!-- 联系人 -->
     <el-form-item :label="$t('trials:researchForm:form:contactor')" prop="UserName">
-      <el-input v-model="form.UserName" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+      <el-input v-model="form.UserName" :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" />
     </el-form-item>
     <!-- 联系电话 -->
     <el-form-item :label="$t('trials:researchForm:form:contactorPhone')" prop="Phone">
-      <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+      <el-input v-model="form.Phone" :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" />
     </el-form-item>
     <!-- 联系邮箱 -->
     <el-form-item :label="$t('trials:researchForm:form:contactorEmail')" prop="Email">
       <el-input v-model="form.Email" disabled />
     </el-form-item>
-
+    <el-form-item :label="$t('trials:researchForm:form:CommonUploadRecordId')
+      " v-if="IsSupportUploadFile" class="file">
+      <el-input v-model="form.SiteSurveyFile.FileName" type="textarea" :autosize="{ minRows: 1, maxRows: 3 }"
+        style="width: 30%;margin-right: 5px;" disabled />
+      <div class="upload" v-if="!(!(state === 0 && userTypeEnumInt === 0) || isHistory)">
+        <input accept=".pdf,.docx,.doc" type="file" name="uploadFolder" class="select-file" title=""
+          @change="beginScanFiles($event)" />
+        <div class="btn-select">
+          {{ $t('dictionary:template:basicData:button:selectFile') }}
+        </div>
+      </div>
+      <el-button type="primary" @click="viewManualFile"
+        :disabled="!this.form.SiteSurveyFile || !this.form.SiteSurveyFile.Path">{{
+          $t('trials:researchForm:form:preview') }}</el-button>
+      <el-button type="primary" @click="downLoad"
+        :disabled="!this.form.SiteSurveyFile || !this.form.SiteSurveyFile.Path">{{
+          $t('trials:researchForm:form:download') }}</el-button>
+    </el-form-item>
     <!-- <el-divider /> -->
     <!-- 平均刻盘周期（天） -->
     <el-form-item v-if="!notShowFieldList.includes('AverageEngravingCycle')"
       :label="$t('trials:researchForm:form:engravingCycle')">
       <el-input-number v-model="form.AverageEngravingCycle"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" controls-position="right" :min="0" />
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" controls-position="right"
+        :min="0" />
     </el-form-item>
     <!-- MRI-PDFF 是否为本中心该适应症的常规诊疗检查项目？ -->
     <el-form-item v-if="!notShowFieldList.includes('IsRoutineMRIPDEE')"
       :label="$t('trials:researchForm:form:IsRoutineMRIPDEE')" prop="IsRoutineMRIPDEE">
-      <el-radio-group v-model="form.IsRoutineMRIPDEE" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+      <el-radio-group v-model="form.IsRoutineMRIPDEE"
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM">
         <el-radio v-for="item of $d.YesOrNo" :key="`IsRoutineMRIPDEE${item.value}`" :label="item.value">{{
           item.label }}</el-radio>
       </el-radio-group>
@@ -65,27 +84,29 @@
     <!-- 单次检查时长（分钟） -->
     <el-form-item v-if="!notShowFieldList.includes('MRIPDFFScanTime')"
       :label="$t('trials:researchForm:form:MRIPDFFScanTime')">
-      <el-input-number v-model="form.MRIPDFFScanTime" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-        controls-position="right" :min="0" />
+      <el-input-number v-model="form.MRIPDFFScanTime"
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" controls-position="right"
+        :min="0" />
     </el-form-item>
     <!-- 平均预约等待时长（天） -->
     <el-form-item v-if="!notShowFieldList.includes('MRIPDFFLeadTime')"
       :label="$t('trials:researchForm:form:MRIPDFFLeadTime')">
-      <el-input-number v-model="form.MRIPDFFLeadTime" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-        controls-position="right" :min="0" />
+      <el-input-number v-model="form.MRIPDFFLeadTime"
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" controls-position="right"
+        :min="0" />
     </el-form-item>
     <!-- 特殊情况备注-->
     <el-form-item v-if="!notShowFieldList.includes('MRIPDFFOther')"
       :label="$t('trials:researchForm:form:MRIPDFFOther')">
       <el-input v-model="form.MRIPDFFOther" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" />
     </el-form-item>
     <!-- 如已选择研究者评估，项目是否会授权影像科老师参与本试验？如不单独授权，是否可在试验中保持 1-2 名固定技师操作？-->
     <el-form-item
       v-if="!notShowFieldList.includes('IsAuthorizeRadiologistsParticipate') || !notShowFieldList.includes('AssignFixedTechnologists')"
       :label="$t('trials:researchForm:form:IsAuthorize')" prop="IsAuthorize">
-      <el-radio-group v-model="form.IsAuthorize" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
-        @input="handleIsAuthorizeInput">
+      <el-radio-group v-model="form.IsAuthorize"
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" @input="handleIsAuthorizeInput">
         <el-radio label="IsAuthorizeRadiologistsParticipate">{{
           $t('trials:researchForm:form:IsAuthorizeRadiologistsParticipate') }}</el-radio>
         <el-radio label="AssignFixedTechnologists">{{
@@ -96,7 +117,7 @@
     <el-form-item v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')"
       :label="$t('trials:researchForm:form:isQualified')" prop="IsConfirmImagingTechnologist">
       <el-radio-group v-model="form.IsConfirmImagingTechnologist"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM">
         <el-radio v-for="item of $d.YesOrNo" :key="`IsConfirmImagingTechnologist${item.value}`" :label="item.value">{{
           item.label }}</el-radio>
       </el-radio-group>
@@ -105,13 +126,13 @@
     <el-form-item v-if="!notShowFieldList.includes('NotConfirmReson') && form.IsConfirmImagingTechnologist === false"
       :label="$t('trials:researchForm:form:notQualifiedReason')" prop="NotConfirmReson">
       <el-input v-model="form.NotConfirmReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" />
     </el-form-item>
     <!-- 研究单位疗效评估人员类型 -->
     <el-form-item v-if="!notShowFieldList.includes('EfficacyEvaluatorType')"
       :label="$t('trials:researchForm:form:staffType')">
       <el-radio-group v-model="form.EfficacyEvaluatorType"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory">
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM">
         <el-radio v-for="item of $d.EfficacyEvaluatorType" :key="`EfficacyEvaluatorType${item.value}`"
           :label="item.value">{{ item.label }}</el-radio>
       </el-radio-group>
@@ -120,7 +141,7 @@
     <el-form-item v-if="!notShowFieldList.includes('IsFollowStudyParameters')" prop="IsFollowStudyParameters">
       <span slot="label" v-html="$t('trials:researchForm:form:isFollowStudyParam')" />
       <el-radio-group v-model="form.IsFollowStudyParameters"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" style="margin-right: 10px;">
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" style="margin-right: 10px;">
         <el-radio v-for="item of $d.YesOrNo" :key="`IsFollowStudyParameters${item.value}`" :label="item.value">{{
           item.label }}</el-radio>
       </el-radio-group>
@@ -133,13 +154,13 @@
       prop="NotFollowReson">
       <span slot="label" v-html="$t('trials:researchForm:form:notFollowStudyParam')" />
       <el-input v-model="form.NotFollowReson" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" />
     </el-form-item>
     <!-- 是否严格按照影像手册参数完成刻盘 -->
     <el-form-item v-if="!notShowFieldList.includes('ISStrictManualBurnFlag')" prop="ISStrictManualBurnFlag">
       <span slot="label" v-html="$t('trials:researchForm:form:ISStrictManualBurnFlag')" />
       <el-radio-group v-model="form.ISStrictManualBurnFlag"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" style="margin-right: 10px;">
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" style="margin-right: 10px;">
         <el-radio v-for="item of $d.YesOrNo" :key="`ISStrictManualBurnFlag${item.value}`" :label="item.value">{{
           item.label }}</el-radio>
       </el-radio-group>
@@ -149,7 +170,7 @@
       prop="NotStrictManualBurnFlagReason">
       <span slot="label" v-html="$t('trials:researchForm:form:NotStrictManualBurnFlagReason')" />
       <el-input v-model="form.NotStrictManualBurnFlagReason" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
-        :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" />
+        :disabled="(!(state === 0 && userTypeEnumInt === 0) || isHistory) && !isPM" />
     </el-form-item>
     <el-form-item>
       <!-- 保存 -->
@@ -163,9 +184,10 @@
   </el-form>
 </template>
 <script>
-import { getTrialSiteSelect, getTrialDocumentList } from '@/api/trials'
+import { getTrialSiteSelect, getTrialDocumentList, addOrUpdateCommonUploadRecord } from '@/api/trials'
 import { addOrUpdateTrialSiteSurvey } from '@/api/research'
 import attachmentPreview from '@/views/dictionary/attachment/components/SignatureTemplate/attachmentPreview'
+import { downLoadFile } from '@/utils/stream.js'
 export default {
   name: 'QuestionForm',
   components: { attachmentPreview },
@@ -173,7 +195,19 @@ export default {
     isHistory: {
       type: Boolean,
       default: false
-    }
+    },
+    IsOnlyUploadFile: {
+      type: Boolean,
+      default: false
+    },
+    IsSupportUploadFile: {
+      type: Boolean,
+      default: false
+    },
+    isPM: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     var checkPhone = (rule, value, callback) => {
@@ -198,6 +232,7 @@ export default {
       }
     }
     return {
+      loading: false,
       form: {
         Id: '',
         Sponsor: '', // 申办方
@@ -225,7 +260,9 @@ export default {
         NotConfirmReson: '',
         EfficacyEvaluatorType: '',
         IsFollowStudyParameters: '',
-        NotFollowReson: ''
+        NotFollowReson: '',
+        CommonUploadRecordId: null,
+        SiteSurveyFile: []
       },
       rules: {
         TrialSiteId: [
@@ -281,11 +318,68 @@ export default {
     }
   },
   methods: {
+    async beginScanFiles(e) {
+      try {
+        let file = e.target.files[0]
+        let name = file.name
+        if (!this.checkFileSuffix(name)) return this.$message.warning(this.$t("trials:researchRecord:ImageManual:message:checkFileSuffix"))
+        this.loading = true
+        file = await this.fileToBlob(file)
+        let scope = this
+        var index = name.lastIndexOf('.')
+        var type = name.substring(index + 1, name.length)
+        let res = await this.OSSclient.put(
+          `/${this.$route.query.trialId}/InspectionUpload/SiteSurvey/${this.form.TrialSiteId}/${scope.getGuid(Date.now() + '_' + name.split('.')[0])}.${type}`,
+          file
+        )
+        let data = {
+          Path: this.$getObjectName(res.url),
+          FileName: name,
+          FileSize: file.size,
+          FileType: type
+
+        }
+        res = await addOrUpdateCommonUploadRecord(data)
+        this.loading = false
+        if (res.IsSuccess) {
+          this.form.CommonUploadRecordId = res.Result
+          data.Id = res.Result
+          this.form.SiteSurveyFile = data
+        }
+      } catch (err) {
+        console.log(err)
+        this.loading = false;
+      }
+    },
+    checkFileSuffix(fileName) {
+      var index = fileName.lastIndexOf('.')
+      var suffix = fileName.substring(index + 1, fileName.length)
+      if ('.pdf'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1 && '.docx'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1 && '.doc'.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) {
+        return false
+      } else {
+        return true
+      }
+    },
     handleIsAuthorizeInput(label) {
       this.form.IsAuthorizeRadiologistsParticipate = false
       this.form.AssignFixedTechnologists = false
       this.form[label] = true
     },
+    async viewManualFile() {
+      if (!this.form.SiteSurveyFile || !this.form.SiteSurveyFile.Path) return this.$message.warning(this.$t("trials:researchForm:message:notFile"))
+      this.$preview({
+        path: this.form.SiteSurveyFile.Path,
+        type: this.form.SiteSurveyFile.FileType,
+        title: this.form.SiteSurveyFile.Path.FileName,
+      })
+    },
+    async downLoad() {
+      if (!this.form.SiteSurveyFile || !this.form.SiteSurveyFile.Path) return this.$message.warning(this.$t("trials:researchForm:message:notFile"))
+      return await downLoadFile(
+        this.OSSclientConfig.basePath + this.form.SiteSurveyFile.Path,
+        this.form.SiteSurveyFile.FileName
+      )
+    },
     async viewManual() {
       try {
         let data = {
@@ -316,8 +410,58 @@ export default {
       }
     },
     // 保存基本信息
-    handleSave(isAutoCommit) {
+    handleSave(isAutoCommit, isCheck = false) {
       return new Promise((resolve, reject) => {
+        isCheck = false
+        if (this.IsOnlyUploadFile && !isCheck) {
+          if (!this.form.UserName) {
+            this.$message.warning(this.$t("trials:researchForm:message:notUserName"))
+            return resolve(false)
+          }
+          if (!this.form.Phone) {
+            this.$message.warning(this.$t("trials:researchForm:message:notPhone"))
+            return resolve(false)
+          }
+          if (!this.form.CommonUploadRecordId) {
+            this.$message.warning(this.$t("trials:researchForm:message:notCommonUploadRecordId"))
+            return resolve(false)
+          }
+          this.btnLoading = true
+          const param = {
+            id: this.form.Id,
+            trialId: this.$route.query.trialId,
+            trialSiteId: this.form.TrialSiteId,
+            userName: this.form.UserName,
+            phone: this.form.Phone,
+            email: this.form.Email,
+            averageEngravingCycle: this.form.AverageEngravingCycle,
+            IsRoutineMRIPDEE: this.form.IsRoutineMRIPDEE,
+            MRIPDFFScanTime: this.form.MRIPDFFScanTime,
+            MRIPDFFLeadTime: this.form.MRIPDFFLeadTime,
+            MRIPDFFOther: this.form.MRIPDFFOther,
+            IsAuthorizeRadiologistsParticipate: this.form.IsAuthorizeRadiologistsParticipate,
+            AssignFixedTechnologists: this.form.AssignFixedTechnologists,
+            ISStrictManualBurnFlag: this.form.ISStrictManualBurnFlag,
+            NotStrictManualBurnFlagReason: this.form.NotStrictManualBurnFlagReason,
+            isConfirmImagingTechnologist: this.form.IsConfirmImagingTechnologist,
+            notConfirmReson: this.form.NotConfirmReson,
+            efficacyEvaluatorType: this.form.EfficacyEvaluatorType,
+            isFollowStudyParameters: this.form.IsFollowStudyParameters,
+            notFollowReson: this.form.NotFollowReson,
+            CommonUploadRecordId: this.form.CommonUploadRecordId
+          }
+          addOrUpdateTrialSiteSurvey(param).then(res => {
+            this.btnLoading = false
+            if (res.IsSuccess && !isAutoCommit) {
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+            }
+            resolve(true)
+          }).catch(() => {
+            this.btnLoading = false
+            reject(false)
+          })
+          return resolve(true)
+        }
         this.$refs['researchBSForm'].validate(valid => {
           if (valid) {
             this.btnLoading = true
@@ -341,7 +485,8 @@ export default {
               notConfirmReson: this.form.NotConfirmReson,
               efficacyEvaluatorType: this.form.EfficacyEvaluatorType,
               isFollowStudyParameters: this.form.IsFollowStudyParameters,
-              notFollowReson: this.form.NotFollowReson
+              notFollowReson: this.form.NotFollowReson,
+              CommonUploadRecordId: this.form.CommonUploadRecordId
             }
             addOrUpdateTrialSiteSurvey(param).then(res => {
               this.btnLoading = false
@@ -366,7 +511,7 @@ export default {
     // 初始化
     async initForm(trialInfo, trialSiteSurvey, notShowFieldList) {
       // 获取项目下的site
-      const { Result } = await getTrialSiteSelect(this.$route.query.trialId)
+      const { Result } = await getTrialSiteSelect(this.$route.query.trialId, { IgnoreDisable: true })
       this.siteOptions = Result
       this.form.Id = trialSiteSurvey.Id
       this.form.Sponsor = trialInfo.Sponsor // 申办方
@@ -380,6 +525,9 @@ export default {
       this.form.UserName = trialSiteSurvey.UserName // 联系人
       this.form.Phone = trialSiteSurvey.Phone // 联系人电话
       this.form.Email = trialSiteSurvey.Email // 联系人邮箱
+      this.form.CommonUploadRecordId = trialSiteSurvey.CommonUploadRecordId
+      this.form.SiteSurveyFile = trialSiteSurvey.SiteSurveyFile || {}
+      this.form.fileStr = this.form.SiteSurveyFile.FileName
       this.form.AverageEngravingCycle = trialSiteSurvey.AverageEngravingCycle
       this.form.IsRoutineMRIPDEE = trialSiteSurvey.IsRoutineMRIPDEE
       this.form.MRIPDFFScanTime = trialSiteSurvey.MRIPDFFScanTime
@@ -410,3 +558,54 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+.upload {
+  display: inline-block;
+  height: 30px;
+  width: 90px;
+  padding: 2px 10px;
+  line-height: 23px;
+  position: relative;
+  text-decoration: none;
+  border-radius: 3px;
+  overflow: hidden;
+  text-align: center;
+  background: #428bca;
+  border-color: #428bca;
+  color: #fff;
+  margin-right: 5px;
+
+  .select-file {
+    height: 30px;
+    width: 90px;
+    position: absolute;
+    overflow: hidden;
+    left: 0;
+    top: 0;
+    opacity: 0;
+    font-size: 0;
+  }
+
+  .btn-select {
+    //给显示在页面上的按钮写样式
+    width: 90px;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    cursor: pointer;
+    border-radius: 24px;
+    overflow: hidden;
+    position: absolute;
+    top: 0;
+    left: 0;
+    pointer-events: none; //pointer-events:none用来控制该标签的点击穿透事件
+  }
+}
+
+.file {
+  ::v-deep .el-form-item__content {
+    display: flex;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/views/research/components/EquipmentForm.vue b/src/views/research/components/EquipmentForm.vue
index 2f645ebb..552b5e3a 100644
--- a/src/views/research/components/EquipmentForm.vue
+++ b/src/views/research/components/EquipmentForm.vue
@@ -132,7 +132,11 @@ export default {
       default: () => {
         return []
       }
-    }
+    },
+    isPM: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
@@ -170,9 +174,9 @@ export default {
         Parameters: [
           { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
         ],
-        Note: [
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
-        ],
+        //  Note: [
+        //   { required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }
+        // ],
         ManufacturerType: [
           { required: true, message: this.$t('trials:researchForm:formRule:select'), trigger: ['blur', 'change'] },
           {
diff --git a/src/views/research/components/EquipmentList.vue b/src/views/research/components/EquipmentList.vue
index 7de4adb9..06cb303e 100644
--- a/src/views/research/components/EquipmentList.vue
+++ b/src/views/research/components/EquipmentList.vue
@@ -2,7 +2,8 @@
   <div class="equipment-wrapper">
     <div class="header-wrapper">
       <!-- 新增 -->
-      <el-button v-if="state === 0 && userTypeEnumInt === 0 && !isHistory && EquipmentControlFieldList.length > 0"
+      <el-button
+        v-if="((state === 0 && userTypeEnumInt === 0 && !isHistory) || isPM) && EquipmentControlFieldList.length > 0"
         size="small" type="primary" @click="handleAdd">
         {{ $t('common:button:add') }}
       </el-button>
@@ -82,7 +83,7 @@
       <!-- 备注 -->
       <el-table-column v-if="EquipmentControlFieldList.includes('Note')" min-width="120" prop="Note"
         :label="$t('trials:equiptResearch:form:precautions')" show-overflow-tooltip />
-      <el-table-column v-if="state === 0 && userTypeEnumInt === 0 && !isHistory" fixed="right"
+      <el-table-column v-if="(state === 0 && userTypeEnumInt === 0 && !isHistory) || isPM" fixed="right"
         :label="$t('common:action:action')" width="100">
         <template slot-scope="scope">
           <!-- 编辑 -->
@@ -121,7 +122,11 @@ export default {
     isHistory: {
       type: Boolean,
       default: false
-    }
+    },
+    isPM: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
@@ -186,7 +191,6 @@ export default {
       EquipmentControlFieldList.forEach(item => {
         this.EquipmentControlFieldList.push(item.FiledName)
       })
-      console.log(this.EquipmentControlFieldList, 'this.EquipmentControlFieldList')
       this.list = TrialSiteEquipmentSurveyList
       this.state = trialSiteSurvey.State
       this.$forceUpdate()
diff --git a/src/views/research/components/HistoricalParticipant.vue b/src/views/research/components/HistoricalParticipant.vue
index b8477c70..9b883696 100644
--- a/src/views/research/components/HistoricalParticipant.vue
+++ b/src/views/research/components/HistoricalParticipant.vue
@@ -1,18 +1,11 @@
 <template>
   <div class="particiapant-wrapper">
     <div class="header-wrapper" />
-    <el-table
-      v-loading="loading"
-      :data="list"
-      border
-      style="width: 100%"
-    >
-      <el-table-column
-        prop="date"
-        :label="$t('trials:staffResearch:form:name')"
-      >
+    <el-table v-loading="loading" :data="list" border style="width: 100%">
+      <el-table-column prop="date" :label="$t('trials:staffResearch:form:name')">
         <template slot-scope="scope">
-          <el-tooltip v-if="scope.row.ErrorMessage" class="item" effect="dark" :content="scope.row.ErrorMessage" placement="bottom">
+          <el-tooltip v-if="scope.row.ErrorMessage" class="item" effect="dark" :content="scope.row.ErrorMessage"
+            placement="bottom">
             <i class="el-icon-warning" style="color:red" />
           </el-tooltip>
 
@@ -29,20 +22,11 @@
         </template>
       </el-table-column> -->
       <!-- 电话号码 -->
-      <el-table-column
-        prop="Phone"
-        :label="$t('trials:staffResearch:form:phone')"
-      />
+      <el-table-column prop="Phone" :label="$t('trials:staffResearch:form:phone')" />
       <!-- 邮箱 -->
-      <el-table-column
-        prop="Email"
-        :label="$t('trials:staffResearch:form:email')"
-      />
+      <el-table-column prop="Email" :label="$t('trials:staffResearch:form:email')" />
       <!-- 单位 -->
-      <el-table-column
-        prop="OrganizationName"
-        :label="$t('trials:staffResearch:form:organization')"
-      />
+      <el-table-column prop="OrganizationName" :label="$t('trials:staffResearch:form:organization')" />
       <!-- 是否生成账号 -->
       <!-- <el-table-column
         prop="IsGenerateAccount"
@@ -53,27 +37,20 @@
         </template>
       </el-table-column> -->
       <!-- 用户类型 -->
-      <el-table-column
-        prop="UserType"
-        :label="$t('trials:staffResearch:form:userType')"
-      />
+      <el-table-column prop="UserType" :label="$t('trials:staffResearch:form:userType')" />
       <!-- 原状态 -->
-      <el-table-column
-        prop="IsHistoryUserOriginDeleted"
-        :label="$t('trials:staffResearch:form:originalState')"
-      >
+      <el-table-column prop="IsHistoryUserOriginDeleted" :label="$t('trials:staffResearch:form:originalState')">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsHistoryUserOriginDeleted" type="info">{{ $fd('IsUserExitTrial', scope.row.IsHistoryUserOriginDeleted) }}</el-tag>
+          <el-tag v-if="scope.row.IsHistoryUserOriginDeleted" type="info">{{ $fd('IsUserExitTrial',
+            scope.row.IsHistoryUserOriginDeleted) }}</el-tag>
           <el-tag v-else type="danger">{{ $fd('IsUserExitTrial', scope.row.IsHistoryUserOriginDeleted) }}</el-tag>
         </template>
       </el-table-column>
       <!-- 更新状态 -->
-      <el-table-column
-        prop="IsHistoryUserDeleted"
-        :label="$t('trials:staffResearch:form:updateState')"
-      >
+      <el-table-column prop="IsHistoryUserDeleted" :label="$t('trials:staffResearch:form:updateState')">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.IsHistoryUserDeleted" type="info">{{ $fd('IsUserExitTrial', scope.row.IsHistoryUserDeleted) }}</el-tag>
+          <el-tag v-if="scope.row.IsHistoryUserDeleted" type="info">{{ $fd('IsUserExitTrial',
+            scope.row.IsHistoryUserDeleted) }}</el-tag>
           <el-tag v-else type="danger">{{ $fd('IsUserExitTrial', scope.row.IsHistoryUserDeleted) }}</el-tag>
         </template>
       </el-table-column>
@@ -88,14 +65,10 @@
           <el-tag v-else type="danger">{{ $fd('IsJoin', scope.row.IsJoin) }}</el-tag>
         </template>
       </el-table-column> -->
-      <el-table-column
-        v-if="state === 0 && (userTypeEnumInt===0 ) && !isHistory"
-        fixed="right"
-        :label="$t('common:action:action')"
-        width="100"
-      >
+      <el-table-column v-if="(state === 0 && (userTypeEnumInt === 0) && !isHistory) || isPM" fixed="right"
+        :label="$t('common:action:action')" width="100">
         <template slot-scope="scope">
-          <el-button v-if="userTypeEnumInt===0" type="text" size="small" @click="handleEdit(scope.row)">
+          <el-button v-if="userTypeEnumInt === 0 || isPM" type="text" size="small" @click="handleEdit(scope.row)">
             {{ $t('common:button:edit') }}
           </el-button>
         </template>
@@ -103,16 +76,9 @@
     </el-table>
 
     <!-- 新增/编辑人员信息 -->
-    <el-dialog
-      v-if="editVisible"
-      :visible.sync="editVisible"
-      :close-on-click-modal="false"
-      :title="title"
-      width="900px"
-      custom-class="base-dialog-wrapper"
-      :append-to-body="userTypeEnumInt !== 0"
-    >
-      <HistoricalParticipantForm :state="state" :data="rowData" @getList="getList" @close="closeDialog" />
+    <el-dialog v-if="editVisible" :visible.sync="editVisible" :close-on-click-modal="false" :title="title" width="900px"
+      custom-class="base-dialog-wrapper" :append-to-body="userTypeEnumInt !== 0">
+      <HistoricalParticipantForm :state="state" :isPM="isPM" :data="rowData" @getList="getList" @close="closeDialog" />
     </el-dialog>
 
   </div>
@@ -128,7 +94,11 @@ export default {
     isHistory: {
       type: Boolean,
       default: false
-    }
+    },
+    isPM: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
@@ -199,8 +169,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.particiapant-wrapper{
-  .header-wrapper{
+.particiapant-wrapper {
+  .header-wrapper {
     text-align: right;
     margin-bottom: 10px;
   }
diff --git a/src/views/research/components/LogList.vue b/src/views/research/components/LogList.vue
new file mode 100644
index 00000000..e7cdc2c2
--- /dev/null
+++ b/src/views/research/components/LogList.vue
@@ -0,0 +1,93 @@
+<template>
+  <div class="log-list">
+    <el-table v-loading="loading" :data="tableData" v-adaptive="{ bottomOffset: 40 }" height="100" style="width: 100%">
+      <el-table-column prop="CreateTime" :label="$t('trials:researchForm:logList:label:CreateTime')" min-width="120"
+        show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.CreateTime ? moment(scope.row.CreateTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="Name" :label="$t('trials:researchForm:logList:label:Name')" min-width="100"
+        show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column prop="UserType" :label="$t('trials:researchForm:logList:label:UserType')" min-width="100"
+        show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ scope.row.UserType && $fd('UserType', scope.row.UserType) ? $fd('UserType', scope.row.UserType) : '--' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="OptType" :label="$t('trials:researchForm:logList:label:OptType')" min-width="100"
+        show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{ $fd('SiteSurveyOptTyp', scope.row.OptType) }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="Json" :label="$t('trials:researchForm:logList:label:Json')" min-width="100"
+        show-overflow-tooltip>
+        <template slot-scope="scope">
+          <el-button v-if="scope.row.Json" type="text" @click="openLog(scope.row)">{{
+            $t('trials:researchForm:logList:label:SurveyForm') }}</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column prop="Reason" :label="$t('trials:researchForm:logList:label:Reason')" min-width="140"
+        show-overflow-tooltip>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import { getSiteSurveyLogList } from '@/api/research'
+import moment from 'moment'
+import { getToken } from '@/utils/auth'
+export default {
+  name: 'LogList',
+  props: {
+    trialSiteSurveyId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      tableData: [],
+      moment,
+      openWindow: null
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      try {
+        this.loading = true
+        let res = await getSiteSurveyLogList({ trialSiteSurveyId: this.trialSiteSurveyId })
+        if (res.IsSuccess) {
+          this.tableData = res.Result
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.loading = false
+      }
+    },
+    openLog(row) {
+      if (this.openWindow) {
+        this.openWindow.close()
+      }
+      var token = getToken()
+      var path = `/researchLog?trialId=${this.$route.query.trialId}&trialSiteSurveyId=${this.trialSiteSurveyId}&logId=${row.Id}&TokenKey=${token}`
+
+      this.openWindow = window.open(path, '_blank')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.log-list {
+  height: 100%;
+  min-height: 0;
+  overflow: hidden;
+}
+</style>
diff --git a/src/views/research/components/ParticipantForm.vue b/src/views/research/components/ParticipantForm.vue
index 70b5ab8c..f2ca35f1 100644
--- a/src/views/research/components/ParticipantForm.vue
+++ b/src/views/research/components/ParticipantForm.vue
@@ -3,43 +3,32 @@
     <div class="base-dialog-body">
       <!-- 姓 -->
       <el-form-item :label="$t('trials:staffResearch:form:lastName')" prop="LastName">
-        <el-input v-model="form.LastName" :disabled="!(state === 0 && userTypeEnumInt === 0)" style="width: 200px" />
+        <el-input v-model="form.LastName" :disabled="(!(state === 0 && userTypeEnumInt === 0))&&!isPM" style="width: 200px" />
       </el-form-item>
       <!-- 名 -->
       <el-form-item :label="$t('trials:staffResearch:form:firstName')" prop="FirstName">
-        <el-input v-model="form.FirstName" :disabled="!(state === 0 && userTypeEnumInt === 0)" style="width: 200px" />
+        <el-input v-model="form.FirstName" :disabled="(!(state === 0 && userTypeEnumInt === 0))&&!isPM" style="width: 200px" />
       </el-form-item>
       <!-- 角色 -->
       <el-form-item :label="$t('trials:staffResearch:form:role')" prop="TrialRoleCode">
-        <el-select
-          v-model="form.TrialRoleCode"
-          style="width: 200px"
-          :disabled="!(state === 0 && userTypeEnumInt === 0)"
-          @change="handleTrialRoleChange"
-        >
-          <el-option
-            v-for="item of $d.SiteSurvey_UserRoles"
-            :key="item.id"
-            :label="item.label"
-            :value="parseInt(item.value)"
-          />
+        <el-select v-model="form.TrialRoleCode" style="width: 200px" :disabled="(!(state === 0 && userTypeEnumInt === 0))&&!isPM"
+          @change="handleTrialRoleChange">
+          <el-option v-for="item of $d.SiteSurvey_UserRoles" :key="item.id" :label="item.label"
+            :value="parseInt(item.value)" />
         </el-select>
       </el-form-item>
       <!-- 电话号码 -->
       <el-form-item :label="$t('trials:staffResearch:form:phone')" prop="Phone">
-        <el-input v-model="form.Phone" :disabled="!(state === 0 && userTypeEnumInt === 0)" style="width: 200px" />
+        <el-input v-model="form.Phone" :disabled="(!(state === 0 && userTypeEnumInt === 0))&&!isPM" style="width: 200px" />
       </el-form-item>
       <!-- 邮箱 -->
       <el-form-item :label="$t('trials:staffResearch:form:email')" prop="Email">
-        <el-input v-model="form.Email" :disabled="!(state === 0 && userTypeEnumInt === 0)" style="width: 200px" />
+        <el-input v-model="form.Email" :disabled="(!(state === 0 && userTypeEnumInt === 0))&&!isPM" style="width: 200px" />
       </el-form-item>
       <!-- 单位 -->
       <el-form-item :label="$t('trials:staffResearch:form:organization')" prop="OrganizationName">
-        <el-input
-          v-model="form.OrganizationName"
-          :disabled="!(state === 0 && userTypeEnumInt === 0)"
-          style="width: 200px"
-        />
+        <el-input v-model="form.OrganizationName" :disabled="(!(state === 0 && userTypeEnumInt === 0))&&!isPM"
+          style="width: 200px" />
       </el-form-item>
       <!--      <el-row>
         &lt;!&ndash; 是否生成账号 &ndash;&gt;
@@ -112,7 +101,11 @@ export default {
     state: {
       type: Number,
       required: true
-    }
+    },
+    isPM: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     // var checkPhone = (rule, value, callback) => {
diff --git a/src/views/research/components/ParticipantList.vue b/src/views/research/components/ParticipantList.vue
index ce625207..9440130f 100644
--- a/src/views/research/components/ParticipantList.vue
+++ b/src/views/research/components/ParticipantList.vue
@@ -2,27 +2,16 @@
   <div class="particiapant-wrapper">
     <div class="header-wrapper">
       <!-- 新增 -->
-      <el-button
-        v-if="state === 0 && userTypeEnumInt === 0 && !isHistory"
-        size="small"
-        type="primary"
-        @click="handleAdd"
-      >
+      <el-button v-if="(state === 0 && userTypeEnumInt === 0 && !isHistory) || isPM" size="small" type="primary"
+        @click="handleAdd">
         {{ $t('common:button:add') }}
       </el-button>
     </div>
-    <el-table
-      v-loading="loading"
-      :data="list"
-      border
-      style="width: 100%"
-    >
-      <el-table-column
-        prop="date"
-        :label="$t('trials:staffResearch:form:name')"
-      >
+    <el-table v-loading="loading" :data="list" border style="width: 100%">
+      <el-table-column prop="date" :label="$t('trials:staffResearch:form:name')">
         <template slot-scope="scope">
-          <el-tooltip v-if="scope.row.ErrorMessage" class="item" effect="dark" :content="scope.row.ErrorMessage" placement="bottom">
+          <el-tooltip v-if="scope.row.ErrorMessage" class="item" effect="dark" :content="scope.row.ErrorMessage"
+            placement="bottom">
             <i class="el-icon-warning" style="color:red" />
           </el-tooltip>
 
@@ -30,29 +19,17 @@
         </template>
       </el-table-column>
       <!-- 姓名 -->
-      <el-table-column
-        prop="TrialRoleCode"
-        :label="$t('trials:staffResearch:form:role')"
-      >
+      <el-table-column prop="TrialRoleCode" :label="$t('trials:staffResearch:form:role')">
         <template slot-scope="scope">
-          {{ $fd('SiteSurvey_UserRoles',scope.row.TrialRoleCode) }}
+          {{ $fd('SiteSurvey_UserRoles', scope.row.TrialRoleCode) }}
         </template>
       </el-table-column>
       <!-- 电话号码 -->
-      <el-table-column
-        prop="Phone"
-        :label="$t('trials:staffResearch:form:phone')"
-      />
+      <el-table-column prop="Phone" :label="$t('trials:staffResearch:form:phone')" />
       <!-- 邮箱 -->
-      <el-table-column
-        prop="Email"
-        :label="$t('trials:staffResearch:form:email')"
-      />
+      <el-table-column prop="Email" :label="$t('trials:staffResearch:form:email')" />
       <!-- 单位 -->
-      <el-table-column
-        prop="OrganizationName"
-        :label="$t('trials:staffResearch:form:organization')"
-      />
+      <el-table-column prop="OrganizationName" :label="$t('trials:staffResearch:form:organization')" />
       <!-- 是否生成账号 -->
       <!--      <el-table-column
         prop="IsGenerateAccount"
@@ -68,33 +45,28 @@
         :label="$t('trials:staffResearch:form:userType')"
       />-->
       <!-- 状态 -->
-      <el-table-column
-        v-if="hasPermi(['role:pm','role:apm'])"
-        prop="State"
-        :label="$t('trials:staffResearch:form:status')"
-      >
+      <el-table-column v-if="hasPermi(['role:pm', 'role:apm'])" prop="State"
+        :label="$t('trials:staffResearch:form:status')">
         <template slot-scope="scope">
           <el-tag v-if="scope.row.IsJoin" type="info">{{ $fd('IsJoin', scope.row.IsJoin) }}</el-tag>
           <el-tag v-else type="danger">{{ $fd('IsJoin', scope.row.IsJoin) }}</el-tag>
         </template>
       </el-table-column>
       <!-- v-if="state !== 3 && (userTypeEnumInt===0 || hasPermi(['role:pm','role:apm']))" -->
-      <el-table-column
-        v-if="state === 0 && (userTypeEnumInt===0 ) && !isHistory"
-        fixed="right"
-        :label="$t('common:action:action')"
-        width="100"
-      >
+      <el-table-column v-if="(state === 0 && (userTypeEnumInt === 0) && !isHistory) || isPM" fixed="right"
+        :label="$t('common:action:action')" width="100">
         <template slot-scope="scope">
           <!-- 编辑 -->
           <!-- <el-button type="text" size="small" :disabled="scope.row.IsGenerateSuccess || (state !== 0 && userTypeEnumInt===0) || (state !== 2 &&hasPermi(['role:pm']))" @click="handleEdit(scope.row)">
             {{ $t('common:button:edit') }}
           </el-button> -->
-          <el-button v-if="userTypeEnumInt===0" type="text" size="small" :disabled="state!==0 || scope.row.IsGenerateSuccess" @click="handleEdit(scope.row)">
+          <el-button v-if="userTypeEnumInt === 0 || isPM" type="text" size="small"
+            :disabled="(state !== 0 || scope.row.IsGenerateSuccess) && !isPM" @click="handleEdit(scope.row)">
             {{ $t('common:button:edit') }}
           </el-button>
           <!-- 删除 -->
-          <el-button v-if="userTypeEnumInt===0" type="text" size="small" :disabled="state!==0 || scope.row.IsGenerateSuccess" @click="handleDelete(scope.row)">
+          <el-button v-if="userTypeEnumInt === 0 || isPM" type="text" size="small"
+            :disabled="(state !== 0 || scope.row.IsGenerateSuccess) && !isPM" @click="handleDelete(scope.row)">
             {{ $t('common:button:delete') }}
           </el-button>
         </template>
@@ -102,16 +74,9 @@
     </el-table>
 
     <!-- 新增/编辑人员信息 -->
-    <el-dialog
-      v-if="editVisible"
-      :visible.sync="editVisible"
-      :close-on-click-modal="false"
-      :title="title"
-      width="900px"
-      custom-class="base-dialog-wrapper"
-      :append-to-body="userTypeEnumInt !== 0"
-    >
-      <ParticipantForm :state="state" :data="rowData" @getList="getList" @close="closeDialog" />
+    <el-dialog v-if="editVisible" :visible.sync="editVisible" :close-on-click-modal="false" :title="title" width="900px"
+      custom-class="base-dialog-wrapper" :append-to-body="userTypeEnumInt !== 0">
+      <ParticipantForm :state="state" :isPM="isPM" :data="rowData" @getList="getList" @close="closeDialog" />
     </el-dialog>
 
   </div>
@@ -127,7 +92,11 @@ export default {
     isHistory: {
       type: Boolean,
       default: false
-    }
+    },
+    isPM: {
+      type: Boolean,
+      default: false
+    },
   },
   data() {
     return {
@@ -197,7 +166,7 @@ export default {
             this.$message.success(this.$t('trials:staffResearch:message:delSuccessfully'))
           }
         }).catch(() => { this.loading = false })
-      }).catch(() => {})
+      }).catch(() => { })
     },
     isExistIncorrect() {
       return this.list.some(item => item.IsCorrect === false)
@@ -224,8 +193,8 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.particiapant-wrapper{
-  .header-wrapper{
+.particiapant-wrapper {
+  .header-wrapper {
     text-align: right;
     margin-bottom: 10px;
   }
diff --git a/src/views/research/components/ResearchForm.vue b/src/views/research/components/ResearchForm.vue
index ee085780..784be8fd 100644
--- a/src/views/research/components/ResearchForm.vue
+++ b/src/views/research/components/ResearchForm.vue
@@ -13,7 +13,8 @@
     <div class="center-wrapper">
       <!-- 基本信息 -->
       <el-card shadow="hover">
-        <BaseInfo ref="baseResearchInfo" :is-history="true" />
+        <BaseInfo ref="baseResearchInfo" :is-history="true" :IsOnlyUploadFile="IsOnlyUploadFile"
+          :IsSupportUploadFile="IsSupportUploadFile" />
       </el-card>
 
       <!-- 人员调查 -->
@@ -125,7 +126,7 @@ export default {
       type: String,
       default: ''
     }
-  }, 
+  },
   data() {
     return {
       trialId: this.$route.query.trialId,
@@ -139,7 +140,9 @@ export default {
       btnLoading: false,
       isFullscreen: false,
       historyVisible: false,
-      siteSurveyNoteInfo: {}
+      siteSurveyNoteInfo: {},
+      IsSupportUploadFile: false,
+      IsOnlyUploadFile: false
     }
   },
   mounted() {
@@ -154,6 +157,8 @@ export default {
       this.loading = true
       getSiteSurveyInfo(this.trialId, this.trialSiteSurveyId).then(res => {
         if (res.Result) {
+          this.IsSupportUploadFile = res.Result.SiteSurveyFiledConfig.IsSupportUploadFile
+          this.IsOnlyUploadFile = res.Result.SiteSurveyFiledConfig.IsOnlyUploadFile
           // this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
           // this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
           if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 8b6859d4..8dadc8a5 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -8,7 +8,7 @@
       <!-- <TopLang style="position: fixed;top: 40px;right: 40px" /> -->
       <div style="display: flex;justify-content: space-between;" v-if="!isPreview">
         <div>{{ $t('trials:researchForm:title:researchSurveyStatus') }} <el-tag>{{ $fd('ResearchRecord', state)
-            }}</el-tag></div>
+        }}</el-tag></div>
         <div>
           <!-- 提交 -->
           <el-button v-if="(state === 0 && userTypeEnumInt === 0)" type="primary" size="small"
@@ -35,6 +35,10 @@
           <el-button v-if="userTypeEnumInt === 0" type="primary" size="small" @click="handleHistory">
             {{ $t('trials:researchForm:button:historicalRecord') }}
           </el-button>
+          <!-- 操作日志 -->
+          <el-button type="primary" size="small" v-if="!isLog" @click="viewLog">
+            {{ $t('trials:researchForm:button:log') }}
+          </el-button>
           <!-- 退出 -->
           <el-button v-if="userTypeEnumInt === 0" type="primary" size="small" @click="handleBack">
             {{ $t('trials:researchForm:button:loginOut') }}
@@ -45,26 +49,27 @@
     <div class="center-wrapper">
       <!-- 基本信息 -->
       <el-card shadow="hover">
-        <BaseInfo ref="baseResearchInfo" :isPreview="isPreview" />
+        <BaseInfo ref="baseResearchInfo" :isPreview="isPreview" :IsOnlyUploadFile="IsOnlyUploadFile"
+          :IsSupportUploadFile="IsSupportUploadFile" :isPM="isPM" />
       </el-card>
 
       <!-- 人员调查 -->
       <el-card shadow="hover" class="mt10">
         <!-- 历史人员 -->
         <h4>{{ $t('trials:staffResearch:title:historicalStaff') }}</h4>
-        <HistoricalParticipant ref="historicalParticipant" :isPreview="isPreview" @refreshPage="refreshPage"
-          @getList="initPage" />
+        <HistoricalParticipant ref="historicalParticipant" :isPreview="isPreview" :isPM="isPM"
+          @refreshPage="refreshPage" @getList="initPage" />
         <!-- <h4>{{ $t('trials:staffResearch:title:staff') }}</h4> -->
         <!-- 新增人员 -->
         <h4>{{ $t('trials:staffResearch:title:newStaff') }}</h4>
-        <ParticipantList ref="researchParticipants" :isPreview="isPreview" @refreshPage="refreshPage"
+        <ParticipantList ref="researchParticipants" :isPreview="isPreview" :isPM="isPM" @refreshPage="refreshPage"
           @getList="initPage" />
       </el-card>
 
       <!-- 设备调研 -->
       <el-card shadow="hover" class="mt10" v-if="!siteSurveyNoteInfo.IsCloseEquipmentSurvey">
         <h4>{{ $t('trials:equiptResearch:title:equiptResearch') }}</h4>
-        <EquipmentList ref="researchEquipments" :isPreview="isPreview" />
+        <EquipmentList ref="researchEquipments" :isPreview="isPreview" :isPM="isPM" />
       </el-card>
 
       <!-- 其他信息调研 -->
@@ -132,26 +137,49 @@
           </div>
         </div>
       </span>
-      <div style="height:100%;margin:0;">
+      <div class="history-dialog-content">
         <HistoricalRecord :trial-id="trialId" :site-id="siteId" :trial-site-survey-id="trialSiteSurveyId" />
       </div>
     </el-dialog>
 
+    <el-dialog v-if="logVisible" :visible.sync="logVisible"
+      :custom-class="isFullscreen ? 'full-log-dialog-container' : 'log-dialog-container'" :close-on-click-modal="false"
+      :fullscreen="isFullscreen" :show-close="false" width="60%" append-to-body>
+      <span slot="title" class="dialog-footer">
+        <div style="display: flex;flex-direction: row;justify-content: space-between;">
+          <div>
+            {{ $t('trials:researchForm:button:log') }}
+          </div>
+          <div>
+            <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+              style="vertical-align: baseline;cursor: pointer;font-size: 20px;" @click="toggleLogFullscreen" />
+            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+              @click="logVisible = false" />
+          </div>
+        </div>
+      </span>
+      <div class="log-dialog-content">
+        <LogList :trial-site-survey-id="trialSiteSurveyId" />
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 <script>
-import { getSiteSurveyInfo, trialSurveySubmit, submissionRejection } from '@/api/research'
-import { getQueryString } from '@/utils/history.js'
+import { getSiteSurveyInfo, trialSurveySubmit, submissionRejection, getSiteSurveyLogList } from '@/api/research'
+import { getQueryString, changeURLStatic } from '@/utils/history.js'
 import BaseInfo from './components/BaseInfo'
 import HistoricalParticipant from './components/HistoricalParticipant'
 import ParticipantList from './components/ParticipantList'
 import EquipmentList from './components/EquipmentList'
-
+import { mapMutations } from 'vuex'
 import TopLang from './topLang'
 import HistoricalRecord from './components/HistoricalRecord'
+import LogList from './components/LogList'
+import store from '@/store'
 export default {
   name: 'QuestionForm',
-  components: { BaseInfo, HistoricalParticipant, ParticipantList, EquipmentList, TopLang, HistoricalRecord },
+  components: { BaseInfo, HistoricalParticipant, ParticipantList, EquipmentList, TopLang, HistoricalRecord, LogList },
   props: {
     isPreview: {
       type: Boolean,
@@ -172,54 +200,123 @@ export default {
       btnLoading: false,
       isFullscreen: false,
       historyVisible: false,
-      siteSurveyNoteInfo: {}
+      siteSurveyNoteInfo: {},
+      IsSupportUploadFile: false,
+      IsOnlyUploadFile: false,
+      logVisible: false,
+      isLog: false,
+      logId: null
     }
   },
   mounted() {
+    let lang = this.$route.query.lang
+    if (!lang) {
+      const language = navigator.language
+      lang = 'en'
+      if (language.includes("zh")) {
+        lang = 'zh'
+      }
+    }
+    this.$i18n.locale = lang
+    this.setLanguage(lang)
+    this.$updateDictionary()
     this.trialSiteSurveyId = getQueryString('trialSiteSurveyId')
+    this.logId = getQueryString('logId')
+    if (this.logId) this.isLog = true
+    if (this.$router.currentRoute.query.TokenKey) {
+      store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
+      changeURLStatic('TokenKey', '')
+    }
     this.initPage()
     if (zzSessionStorage.getItem('userTypeEnumInt')) {
       this.userTypeEnumInt = zzSessionStorage.getItem('userTypeEnumInt') * 1
     }
   },
+  computed: {
+    isPM() {
+      return this.hasPermi(['role:pm', 'role:spm', 'role:cpm', 'role:apm']) && this.state !== 3 && this.IsOnlyUploadFile
+    }
+  },
   methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     // 初始化页面
     initPage() {
       this.loading = true
-      getSiteSurveyInfo(this.trialId, this.trialSiteSurveyId).then(res => {
-        if (res.Result) {
-          // this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
-          // this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
-          if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
-            this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
-          }
-          this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey
-          this.state = res.Result.TrialSiteSurvey.State
-          this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
-          this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
-          var historicalArr = []
-          var newArr = []
-          res.Result.TrialSiteUserSurveyList.map(i => {
-            if (i.IsHistoryUser) {
-              historicalArr.push(i)
-            } else {
-              newArr.push(i)
+      if (this.isLog) {
+        getSiteSurveyLogList({ trialSiteSurveyId: this.trialSiteSurveyId, Id: this.logId }).then(r => {
+          if (r.Result && r.Result[0].Json) {
+            let res = {
+              Result: JSON.parse(r.Result[0].Json)
             }
-          })
+            if (res.Result) {
+              // this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
+              // this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
+              if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+                this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+              }
+              this.IsSupportUploadFile = res.Result.SiteSurveyFiledConfig.IsSupportUploadFile
+              this.IsOnlyUploadFile = res.Result.SiteSurveyFiledConfig.IsOnlyUploadFile
+              this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey
+              this.state = 3
+              this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
+              this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
+              var historicalArr = []
+              var newArr = []
+              res.Result.TrialSiteUserSurveyList.map(i => {
+                if (i.IsHistoryUser) {
+                  historicalArr.push(i)
+                } else {
+                  newArr.push(i)
+                }
+              })
+
+              this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
+              this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)
+              this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig.EquipmentControlFieldList)
+              this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
+            }
+            this.loading = false
+          }
+        }).catch((err) => { console.log(err); this.loading = false })
+      } else {
+        getSiteSurveyInfo(this.trialId, this.trialSiteSurveyId).then(res => {
+          if (res.Result) {
+            // this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
+            // this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
+            if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) {
+              this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote')
+            }
+            this.IsSupportUploadFile = res.Result.SiteSurveyFiledConfig.IsSupportUploadFile
+            this.IsOnlyUploadFile = res.Result.SiteSurveyFiledConfig.IsOnlyUploadFile
+            this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey
+            this.state = res.Result.TrialSiteSurvey.State
+            this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
+            this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null)
+            var historicalArr = []
+            var newArr = []
+            res.Result.TrialSiteUserSurveyList.map(i => {
+              if (i.IsHistoryUser) {
+                historicalArr.push(i)
+              } else {
+                newArr.push(i)
+              }
+            })
+
+            this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
+            this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)
+            this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig.EquipmentControlFieldList)
+            this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
+          }
+          this.loading = false
+        }).catch(() => { this.loading = false })
+      }
 
-          this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
-          this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)
-          this.$refs['researchEquipments'].initList(res.Result.TrialSiteEquipmentSurveyList, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig.EquipmentControlFieldList)
-          this.isExistIncorrect = res.Result.TrialSiteUserSurveyList.every(item => item.IsCorrect === false)
-        }
-        this.loading = false
-      }).catch(() => { this.loading = false })
     },
     // 提交
     handleSubmit(type) {
       if (this.userTypeEnumInt === 0) {
         this.loading = true
-        this.$refs['baseResearchInfo'].handleSave(true).then(res => {
+        this.$refs['baseResearchInfo'].handleSave(true, type === 'approve').then(res => {
           this.loading = false
           if (res) {
             this.submit(type)
@@ -259,38 +356,33 @@ export default {
     },
     // 生成账号
     generateAccount() {
-      // 是否确认审核通过？
-      this.$confirm(this.$t('trials:researchForm:message:auditWarning'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      }).then(() => {
-        // 校验必须至少有1个crc账号和至少1个SR账号
-        // var list = this.$refs['researchParticipants'].list
-        // var cIdx = list.findIndex(i => i.UserTypeEnum === 5)
-        // var sIdx = list.findIndex(i => i.UserTypeEnum === 9)
-        // if (cIdx === -1 || sIdx === -1) {
-        //   this.$alert(this.$t('trials:researchForm:message:saveWarning2'))
-        //   return
-        // }
-        this.loading = true
-        var param = {
-          TrialId: this.trialId,
-          TrialSiteSurveyId: this.trialSiteSurveyId,
-          LoginUrl: `${location.protocol}//${location.host}/login`,
-          BaseUrl: `${location.protocol}//${location.host}/login`,
-          RouteUrl: `${location.protocol}//${location.host}/email-recompose`
-        }
-        trialSurveySubmit(param).then((res) => {
-          this.loading = false
-          if (res.IsSuccess) {
-            this.initPage()
-            this.$emit('refreshPage')
-            this.$message.success(this.$t('common:message:approvedSuccessfully'))
+      this.$refs['baseResearchInfo'].handleSave(true, true).then(res => {
+        this.$confirm(this.$t('trials:researchForm:message:auditWarning'), {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }).then(() => {
+          if (res) {
+            var param = {
+              TrialId: this.trialId,
+              TrialSiteSurveyId: this.trialSiteSurveyId,
+              LoginUrl: `${location.protocol}//${location.host}/login`,
+              BaseUrl: `${location.protocol}//${location.host}/login`,
+              RouteUrl: `${location.protocol}//${location.host}/email-recompose`
+            }
+            this.loading = false
+            trialSurveySubmit(param).then((res) => {
+              this.loading = false
+              if (res.IsSuccess) {
+                this.initPage()
+                this.$emit('refreshPage')
+                this.$message.success(this.$t('common:message:approvedSuccessfully'))
+              }
+            }).catch(() => {
+              this.loading = false
+            })
           }
-        }).catch(() => {
-          this.loading = false
         })
-      }).catch(() => { })
+      })
     },
     // 驳回
     handleReject() {
@@ -330,7 +422,14 @@ export default {
     handleHistory() {
       this.isFullscreen = false
       this.historyVisible = true
-    }
+    },
+    toggleLogFullscreen() {
+      this.isFullscreen = !this.isFullscreen
+    },
+    viewLog() {
+      this.isFullscreen = false
+      this.logVisible = true
+    },
   }
 }
 </script>
@@ -382,5 +481,45 @@ export default {
     }
   }
 
+  .history-dialog-content,
+  .log-dialog-content {
+    height: 100%;
+    margin: 0;
+  }
+
+  .log-dialog-content {
+    overflow: hidden;
+  }
+
+}
+</style>
+<style lang="scss">
+.full-log-dialog-container,
+.log-dialog-container {
+  overflow: hidden;
+}
+
+.full-log-dialog-container {
+  display: flex;
+  flex-direction: column;
+}
+
+.full-log-dialog-container .el-dialog__body {
+  flex: 1;
+  min-height: 0;
+  padding: 10px;
+  overflow: hidden;
+}
+
+.log-dialog-container .el-dialog__body {
+  height: calc(100% - 80px);
+  padding: 10px;
+  overflow: hidden;
+}
+
+.full-log-dialog-container .log-dialog-content,
+.log-dialog-container .log-dialog-content {
+  height: 100%;
+  overflow: hidden;
 }
 </style>
diff --git a/src/views/research/login.vue b/src/views/research/login.vue
index 6c2352af..321af81e 100644
--- a/src/views/research/login.vue
+++ b/src/views/research/login.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="question-login-wrapper">
-    <div class="box-wrapper">
+    <div v-if="verify"></div>
+    <div class="box-wrapper" v-else>
       <h2 style="text-align:center;">
         <!-- 中心调研表 -->
         {{ $t('trials:researchForm:title:question') }}
@@ -91,7 +92,10 @@ import { getUserMenuTree, getUserPermissions } from '@/api/user'
 import store from '@/store'
 import TopLang from './topLang'
 import { mapGetters, mapMutations } from 'vuex'
-
+import {
+  getLinkLinkExpirationTime,
+  getLinkVerificationCodeIsEffective
+} from '@/api/trials'
 export default {
   components: { TopLang },
   data() {
@@ -146,6 +150,7 @@ export default {
     }
     return {
       trialId: '',
+      verify: true,
       form: {
         Sponsor: null, // 申办方
         ResearchProgramNo: null, // 方案号
@@ -202,31 +207,116 @@ export default {
     ])
   },
   mounted() {
-    this.$i18n.locale = this.$route.query.lang
-    this.setLanguage(this.$route.query.lang)
+    let lang = this.$route.query.lang
+    if (!lang) {
+      const language = navigator.language
+      lang = 'en'
+      if (language.includes("zh")) {
+        lang = 'zh'
+      }
+    }
+    this.$i18n.locale = lang
+    this.setLanguage(lang)
     this.$updateDictionary()
-    if (this.$route.query.trialId) {
-      this.trialId = this.$route.query.trialId
-      this.initPage()
-    }
-    if (this.$route.query.isUpload) {
-      this.isUpload = true
-      this.form.IsUpdate = true
-      let { email, oldEMail, trialSiteId } = this.$route.query
-      if (trialSiteId) this.form.TrialSiteId = trialSiteId
-      if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail
-      if (email && email !== 'null') {
-        this.form.EmailOrPhone = email
-      } else {
-        this.form.EmailOrPhone = oldEMail
-      }
-      if ((email && email !== 'null') || (oldEMail && oldEMail !== 'null')) {
-        this.isNeedUpload = false
-      }
-    }
+    this.getLinkTimeIsExpired()
   },
   methods: {
     ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    async getLinkTimeIsExpired() {
+      try {
+        let data = {
+          TrialId: this.$route.query.trialId,
+        }
+        let res = await getLinkLinkExpirationTime(data)
+        if (res.IsSuccess) {
+          if (res.Result.IsExpired) {
+            return this.$router.replace('/link_expired')
+            //    return this.$confirm(this.$t("trials:researchForm:confirm:linkIsExpired"), '', {
+            //   type: 'warning'
+            // })
+            // return this.IsExpired = true
+          }
+          this.customPrompt()
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async getLinkVerificationCodeIsEffective(value) {
+      try {
+        let data = {
+          TrialId: this.$route.query.trialId,
+          LinkVerificationCode: value
+        }
+        let res = await getLinkVerificationCodeIsEffective(data)
+        if (res.IsSuccess) {
+          if (!res.Result.IsEffective) {
+            return false
+          }
+          this.verify = false
+          if (this.$route.query.trialId) {
+            this.trialId = this.$route.query.trialId
+            this.initPage()
+          }
+          if (this.$route.query.isUpload) {
+            this.isUpload = true
+            this.form.IsUpdate = true
+            let { email, oldEMail, trialSiteId } = this.$route.query
+            if (trialSiteId) this.form.TrialSiteId = trialSiteId
+            if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail
+            if (email && email !== 'null') {
+              this.form.EmailOrPhone = email
+            } else {
+              this.form.EmailOrPhone = oldEMail
+            }
+            if ((email && email !== 'null') || (oldEMail && oldEMail !== 'null')) {
+              this.isNeedUpload = false
+            }
+          }
+        }
+        return true
+      } catch (err) {
+        return false
+        console.log(err)
+      }
+    },
+    async customPrompt(name) {
+      try {
+        const that = this
+        // 请输入标记名称
+        let message = this.$t('trials:researchForm:message:LinkVerificationCode')
+        const { value } = await this.$prompt(message, '', {
+          showClose: false,
+          cancelButtonText: this.$t('common:button:cancel'),
+          confirmButtonText: this.$t('trials:researchForm:button:saveLinkCode'),
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false,
+          inputValue: name,
+          beforeClose: async (action, instance, done) => {
+            if (action === 'confirm') {
+              const value = instance.inputValue
+              if (!value) {
+                that.$message.error(this.$t('trials:researchForm:error:noValue'))
+              } else {
+                let flag = await this.getLinkVerificationCodeIsEffective(value)
+                if (!flag) {
+                  that.$message.error(this.$t('trials:researchForm:confirm:isEffective'))
+                } else {
+                  done()
+                }
+              }
+            } else {
+              done()
+            }
+          }
+        })
+        this.getLinkVerificationCodeIsEffective(value)
+      } catch (err) {
+        console.log(err)
+        return null
+      }
+    },
     // 初始化页面
     async initPage() {
       this.loading = true
@@ -267,8 +357,18 @@ export default {
           }
           verifySendCode(param).then(async res => {
             zzSessionStorage.clear()
-            this.$i18n.locale = this.$route.query.lang
-            this.setLanguage(this.$route.query.lang)
+            // this.$i18n.locale = this.$route.query.lang
+            // this.setLanguage(this.$route.query.lang)
+            let lang = this.$route.query.lang
+            if (!lang) {
+              const language = navigator.language
+              lang = 'en'
+              if (language.includes("zh")) {
+                lang = 'zh'
+              }
+            }
+            this.$i18n.locale = lang
+            this.setLanguage(lang)
             store.dispatch('user/setToken', res.Result.Token)
             zzSessionStorage.setItem('TokenKey', res.Result.Token)
             zzSessionStorage.setItem('userId', res.Result.UserRoleId);
diff --git a/src/views/system/notice/components/from.vue b/src/views/system/notice/components/from.vue
index 2e90fe43..69fef6b9 100644
--- a/src/views/system/notice/components/from.vue
+++ b/src/views/system/notice/components/from.vue
@@ -4,30 +4,38 @@
       <el-form ref="NoticeForm" :model="form" :rules="rules" label-width="180px" size="small">
         <el-form-item :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
           <el-select v-model="form.NoticeLevelEnum" clearable size="small">
-            <el-option v-for="item of dict.type.NoteLevel" :key="item.value" :label="item.label"
+            <el-option v-for="item of $d.NoteLevel" :key="item.value" :label="item.label"
               :value="item.raw.Code * 1" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeType')" prop="NoticeTypeEnum">
           <el-select v-model="form.NoticeTypeEnum" clearable size="small">
-            <el-option v-for="item of dict.type.NoteType" :key="item.value" :label="item.label"
+            <el-option v-for="item of $d.NoteType" :key="item.value" :label="item.label"
               :value="item.raw.Code * 1" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:ApplicableProject')" prop="ApplicableProjectEnum">
           <el-select v-model="form.ApplicableProjectEnum" clearable size="small">
-            <el-option v-for="item of dict.type.NoticeApplicableTrial" :key="item.value" :label="item.label"
+            <el-option v-for="item of $d.NoticeApplicableTrial" :key="item.value" :label="item.label"
               :value="item.raw.Code * 1" />
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeUserTypeIdList')" prop="NoticeUserTypeIdList">
-          <el-select v-model="form.NoticeUserTypeIdList" multiple clearable size="small">
-            <el-option v-for="item of roleList" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id" />
-          </el-select>
+          <div class="role-checkbox-group">
+            <div class="role-checkbox-actions">
+              <el-button size="small" type="text" @click="handleSelectAllRoles">全选</el-button>
+              <el-button size="small" type="text" @click="handleClearRoles">清空</el-button>
+            </div>
+            <el-checkbox-group v-model="form.NoticeUserTypeIdList" class="role-checkbox-list">
+              <el-checkbox v-for="item of roleList" :key="item.Id" :label="item.Id">
+                {{ item.UserTypeShortName }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </div>
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeMode')" prop="NoticeModeEnum">
           <el-select v-model="form.NoticeModeEnum" clearable size="small">
-            <el-option v-for="item of dict.type.NoticeMode" :key="item.value" :label="item.label"
+            <el-option v-for="item of $d.NoticeMode" :key="item.value" :label="item.label"
               :value="item.raw.Code * 1" />
           </el-select>
         </el-form-item>
@@ -35,13 +43,14 @@
           <el-date-picker v-model="form.StartDate" type="datetime" />
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:EndDate')" prop="EndDate">
-          <el-date-picker v-model="form.EndDate" type="datetime" :default-time="'23:59:59'" />
+          <el-date-picker v-model="form.EndDate" type="datetime" :default-time="'23:59:59'"
+            @change="handleEndDateChange" />
         </el-form-item>
         <el-form-item v-if="!form.Id" :label="$t('system:notice:label:IsPush')" prop="IsPush">
           <el-switch v-model="form.IsPush" :active-value="true" :inactive-value="false" />
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:NoticeContent')" prop="NoticeContent">
-          <el-input v-model="form.NoticeContent" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }" />
+          <el-input v-model="form.NoticeContent" type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" />
         </el-form-item>
         <el-form-item :label="$t('system:notice:label:file')">
           <el-upload class="upload-demo" action :before-upload="beforeUpload" :http-request="handleUploadFile"
@@ -106,12 +115,44 @@ export default {
         NoticeUserTypeIdList: [{ required: true, message: 'Please specify', trigger: 'blur' }]
       },
       fileList: [],
-      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true }
+      model_cfg: {
+        visible: false,
+        showClose: true,
+        width: '800px',
+        title: '',
+        appendToBody: true,
+        bodyStyle: {
+          maxHeight: '60vh',
+          overflowY: 'auto'
+        }
+      }
     }
   },
   mounted() {
   },
   methods: {
+    handleSelectAllRoles() {
+      this.form.NoticeUserTypeIdList = this.roleList.map(item => item.Id)
+    },
+    handleClearRoles() {
+      this.form.NoticeUserTypeIdList = []
+    },
+    handleEndDateChange(value) {
+      this.form.EndDate = this.normalizeEndDate(value)
+    },
+    normalizeEndDate(value) {
+      if (!value) {
+        return value
+      }
+      const date = new Date(value)
+      if (Number.isNaN(date.getTime())) {
+        return value
+      }
+      if (date.getHours() === 0 && date.getMinutes() === 0 && date.getSeconds() === 0) {
+        date.setHours(23, 59, 59, 0)
+      }
+      return date
+    },
     handleRemoveFile() {
       this.form.FileName = null
       this.form.Path = null
@@ -147,6 +188,7 @@ export default {
           this.fileList[0] = { name: this.form.FileName, path: this.form.FilePath, fullPath: this.form.FullFilePath }
         }
         this.$set(this.form, 'NoticeUserTypeIdList', this.form.NoticeUserTypeList.map(v => v.Id))
+        this.form.EndDate = this.normalizeEndDate(this.form.EndDate)
       } else {
         this.form = formDataDefault()
       }
@@ -177,3 +219,27 @@ export default {
   }
 }
 </script>
+<style scoped>
+.role-checkbox-group {
+  display: flex;
+  flex-direction: column;
+}
+
+.role-checkbox-actions {
+  margin-bottom: 8px;
+}
+
+.role-checkbox-actions .el-button + .el-button {
+  margin-left: 12px;
+}
+
+.role-checkbox-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px 16px;
+}
+
+.role-checkbox-list .el-checkbox {
+  margin-right: 0;
+}
+</style>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 93582b12..75506828 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -57,14 +57,21 @@
           <el-button type="primary" icon="el-icon-plus" @click="handleAdd">{{ $t('common:button:add') }}</el-button>
         </el-form-item>
       </el-form>
-      <el-table v-loading="loading" v-adaptive="{bottomOffset:45}" height="100" :data="list" class="table">
+      <el-table 
+        v-loading="loading" 
+        v-adaptive="{bottomOffset:45}" 
+        height="100" 
+        :data="list" 
+        class="table"
+        @sort-change="handleSortChange"
+      >
         <el-table-column type="index" width="50" />
-        <el-table-column :label="$t('system:notice:table:NoticeLevel')" prop="NoticeLevelEnum" min-width="120" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeLevel')" prop="NoticeLevelEnum" min-width="120" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
             {{ $d.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}) ? $d.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeType')" prop="NoticeTypeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeType')" prop="NoticeTypeEnum" min-width="100" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
             {{ $d.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}) ? $d.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}).label : '' }}
           </template>
@@ -74,46 +81,47 @@
             {{ scope.row.NoticeContent }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeState')" prop="NoticeStateEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeState')" prop="NoticeStateEnum" min-width="100" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
             <el-tag :type="scope.row.ActualNoticeStateEnum === 0 ? 'info' : scope.row.ActualNoticeStateEnum === 1 ? 'success' : 'danger'">
               {{ $d.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}) ? $d.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}).label : '' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:ApplicableProject')" prop="ApplicableProjectEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:ApplicableProject')" prop="ApplicableProjectEnum" min-width="100" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
             {{ $d.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}) ? $d.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeUserTypeList')" prop="NoticeUserTypeList" min-width="80" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeUserTypeList')" prop="NoticeUserTypeList" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.NoticeUserTypeList.map(v => v.UserTypeShortName).toString() }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeMode')" prop="NoticeModeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeMode')" prop="NoticeModeEnum" min-width="100" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
             {{ dict.type.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}) ? $d.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:StartDate')" prop="StartDate" min-width="240" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:StartDate')" prop="StartDate" min-width="160" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
-            {{ scope.row.StartDate }}-{{ scope.row.EndDate }}
+            {{ scope.row.StartDate }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:PublishUserName')" prop="PublishUserName" min-width="100" show-overflow-tooltip />
-        <el-table-column :label="$t('system:notice:table:PublishedTime')" prop="PublishedTime" min-width="160" show-overflow-tooltip />
-        <el-table-column :label="$t('system:notice:table:UpdateTime')" prop="UpdateTime" min-width="160" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:UpdateTime')" prop="EndDate" min-width="160" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
-            {{ scope.row.StartDate ? scope.row.StartDate: scope.row.CreateTime }}
+            {{ scope.row.EndDate }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:FileName')" fixed="right" prop="FileName" min-width="120" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:PublishUserName')" prop="PublishUserName" min-width="100" show-overflow-tooltip sortable="custom"/>
+        <el-table-column :label="$t('system:notice:table:PublishedTime')" prop="PublishedTime" min-width="160" show-overflow-tooltip sortable="custom"/>
+        
+        <el-table-column :label="$t('system:notice:table:FileName')" fixed="right" prop="FileName" min-width="120" show-overflow-tooltip sortable="custom">
           <template slot-scope="scope">
             <a :href="OSSclientConfig.basePath + scope.row.FullFilePath" target="_blank" style="color:#428bca">{{ scope.row.FileName }}</a>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('common:action:action')" fixed="right" prop="UserTypeShortName" min-width="200" show-overflow-tooltip>
+        <el-table-column :label="$t('common:action:action')" fixed="right" prop="UserTypeShortName" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button
               type="text"
@@ -146,8 +154,8 @@ import NoticeForm from './components/from'
 import Pagination from '@/components/Pagination'
 const searchDataDefault = () => {
   return {
-    Asc: true,
-    SortField: '',
+    Asc: false,
+    SortField: 'PublishedTime',
     NoticeContent: null,
     FileName: null,
     NoticeTypeEnum: null,
@@ -236,6 +244,17 @@ export default {
       }).catch(() => {
         this.loading = 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()
     }
   }
 }
diff --git a/src/views/system/role/components/RoleForm.vue b/src/views/system/role/components/RoleForm.vue
index dc1852d3..908c9cda 100644
--- a/src/views/system/role/components/RoleForm.vue
+++ b/src/views/system/role/components/RoleForm.vue
@@ -16,7 +16,7 @@
         <el-form-item label="Shortname: " prop="UserTypeShortName">
           <el-input v-model="form.UserTypeShortName" />
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           :label="$t('system:role:form:isInternal')"
           prop="IsInternal"
         >
@@ -28,7 +28,7 @@
               >{{ item.label }}</el-radio
             >
           </el-radio-group>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item :label="$t('system:role:form:IsEnable')" prop="IsEnable">
           <el-switch
             v-model="form.IsEnable"
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 163e55fc..759b3bb2 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -178,7 +178,7 @@ export default {
             updateUser(this.user)
               .then((res) => {
                 this.isDisabled = false
-                this.$message.success('Updated successfully')
+                this.$message.success(this.$t("common:message:updatedSuccessfully"))
               })
               .catch(() => {
                 this.isDisabled = false
@@ -190,7 +190,7 @@ export default {
                 this.user.Id = res.Result.Id
                 this.user.UserCode = res.Result.UserCode
                 this.$emit('getUserId', res.Result.Id)
-                this.$message.success('Added successfully')
+                this.$message.success(this.$t("common:message:addedSuccessfully"))
                 this.$router.push({ path: '/system/user/list' })
               })
               .catch(() => {
@@ -308,63 +308,63 @@ export default {
         UserWorkLanguage: [
           {
             required: true,
-            message: 'Please Select',
+            message: this.$t("common:ruleMessage:select"),
             trigger: ['blur', 'change'],
           },
         ],
         Roles: [
           {
             required: true,
-            message: 'Please Select',
+            message: this.$t("common:ruleMessage:select"),
             trigger: ['blur', 'change'],
           },
         ],
         IsZhiZhun: [
           {
             required: true,
-            message: 'Please Select',
+            message: this.$t("common:ruleMessage:select"),
             trigger: ['blur', 'change'],
           },
         ],
         OrganizationName: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          { required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
         ],
         LastName: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
+          { max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
         ],
         FirstName: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' },
+          { required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
+          { max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
         ],
         Phone: [
           {
             max: 20,
             min: 7,
-            message: 'The length is 7 to 20',
+            message: this.$t("system:userInfo:ruleMessage:length7to20"),
             trigger: ['blur'],
           },
         ],
         EMail: [
           {
             required: true,
-            message: 'Please input the email address',
+            message: this.$t("common:ruleMessage:specify"),
             trigger: 'blur',
           },
           {
             // type: 'email',
             pattern: new RegExp(this.$reg().EmailRegexStr),
-            message: 'Please input the correct email address',
+            message: this.$t("trials:site:ruleMessage:correctEmail"),
             trigger: ['blur'],
           },
-          { max: 50, message: 'The maximum length is 50' },
+          { max: 50, message: this.$t("trials:researchForm:formRule:maxLength") },
         ],
-        Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        Sex: [{ required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' }],
         Status: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
+          { required: true, message: this.$t("common:ruleMessage:specify"), trigger: 'blur' },
         ],
-        DepartmentName: [{ max: 50, message: 'The maximum length is 50' }],
-        PositionName: [{ max: 50, message: 'The maximum length is 50' }],
+        DepartmentName: [{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") }],
+        PositionName: [{ max: 50, message: this.$t("trials:researchForm:formRule:maxLength") }],
       },
       userTypeOptions: [],
       isDisabled: false,
diff --git a/src/views/trials/components/NoticeDetailDialog.vue b/src/views/trials/components/NoticeDetailDialog.vue
new file mode 100644
index 00000000..9621b52f
--- /dev/null
+++ b/src/views/trials/components/NoticeDetailDialog.vue
@@ -0,0 +1,177 @@
+<template>
+  <el-dialog
+    class="notice-detail-dialog"
+    :visible.sync="dialogVisible"
+    :title="title"
+    width="700px"
+    append-to-body
+    :close-on-click-modal="false"
+    @closed="handleClosed"
+  >
+    <div class="notice-detail-dialog__body">
+      <div v-if="publishedTime" class="notice-detail-dialog__meta">
+        <span class="notice-detail-dialog__time">{{ publishedTime }}</span>
+      </div>
+
+      <div class="notice-detail-dialog__content">
+        {{ content || '-' }}
+      </div>
+
+      <div v-if="filePath" class="notice-detail-dialog__attachment">
+        <div class="notice-detail-dialog__attachment-label">{{ $t('trials:notice:table:appendix') }}</div>
+        <div class="notice-detail-dialog__attachment-card">
+          <i class="el-icon-paperclip" />
+          <el-button size="small" type="text" @click="$emit('open-file', filePath)">
+            {{ fileName}}
+          </el-button>
+        </div>
+      </div>
+    </div>
+
+    <span v-if="showConfirmButton" slot="footer" class="notice-detail-dialog__footer">
+      <el-button size="small" @click="handleClose">{{ $t('common:button:close') }}</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        :loading="confirmLoading"
+        @click="$emit('confirm')"
+      >
+        {{ $t('common:button:confirm') }}
+      </el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'NoticeDetailDialog',
+  props: {
+    visible: {
+      type: Boolean,
+      default: false,
+    },
+    title: {
+      type: String,
+      default: '',
+    },
+    content: {
+      type: String,
+      default: '',
+    },
+    publishedTime: {
+      type: String,
+      default: '',
+    },
+    fileName: {
+      type: String,
+      default: '',
+    },
+    filePath: {
+      type: String,
+      default: '',
+    },
+    showConfirmButton: {
+      type: Boolean,
+      default: false,
+    },
+    confirmLoading: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  computed: {
+    dialogVisible: {
+      get() {
+        return this.visible
+      },
+      set(value) {
+        this.$emit('update:visible', value)
+      },
+    },
+  },
+  methods: {
+    handleClose() {
+      this.dialogVisible = false
+    },
+    handleClosed() {
+      this.$emit('closed')
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+.notice-detail-dialog {
+  ::v-deep .el-dialog__header {
+    padding: 18px 20px 10px;
+    border-bottom: 1px solid #ebeef5;
+  }
+
+  ::v-deep .el-dialog__body {
+    padding: 0;
+  }
+
+  ::v-deep .el-dialog__footer {
+    padding: 12px 20px 18px;
+    border-top: 1px solid #ebeef5;
+  }
+}
+
+.notice-detail-dialog__body {
+  max-height: 70vh;
+  overflow-y: auto;
+  padding: 18px 20px;
+}
+
+.notice-detail-dialog__meta {
+  margin-bottom: 12px;
+  color: #909399;
+  font-size: 13px;
+}
+
+.notice-detail-dialog__content {
+  padding: 14px 16px;
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  background-color: #f8f9fb;
+  white-space: pre-wrap;
+  word-break: break-word;
+  line-height: 1.7;
+  color: #303133;
+}
+
+.notice-detail-dialog__attachment {
+  margin-top: 16px;
+}
+
+.notice-detail-dialog__attachment-label {
+  margin-bottom: 8px;
+  color: #606266;
+  font-size: 13px;
+}
+
+.notice-detail-dialog__attachment-card {
+  display: flex;
+  align-items: center;
+  padding: 12px 14px;
+  border: 1px solid #ebeef5;
+  border-radius: 8px;
+  background-color: #fff;
+}
+
+.notice-detail-dialog__attachment-card .el-icon-paperclip {
+  margin-right: 8px;
+  color: #409eff;
+  font-size: 16px;
+}
+
+.notice-detail-dialog__attachment-name {
+  flex: 1;
+  min-width: 0;
+  margin-right: 12px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  color: #303133;
+}
+</style>
diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue
index 5591e295..85aeb771 100644
--- a/src/views/trials/trials-layout/components/noticeMarquee.vue
+++ b/src/views/trials/trials-layout/components/noticeMarquee.vue
@@ -7,16 +7,45 @@
         {{ item.Content }}
       </span>
     </marquee>
+    <notice-detail-dialog
+      :visible.sync="detailDialog.visible"
+      :title="detailDialog.title"
+      :content="detailDialog.content"
+      :published-time="detailDialog.publishedTime"
+      :file-name="detailDialog.fileName"
+      :file-path="detailDialog.filePath"
+      :show-confirm-button="detailDialog.showConfirmButton"
+      :confirm-loading="detailDialog.confirmLoading"
+      @confirm="handleDetailConfirm"
+      @open-file="downLoadFile"
+      @closed="handleDetailClosed"
+    />
   </div>
 </template>
 <script>
 import { setSystemNoticeHaveRead } from '@/api/global'
 import { getBasicDataSelects } from '@/api/dictionary/dictionary'
+import NoticeDetailDialog from '@/views/trials/components/NoticeDetailDialog'
+const detailDialogDefault = () => {
+  return {
+    visible: false,
+    title: '',
+    content: '',
+    publishedTime: '',
+    fileName: '',
+    filePath: '',
+    showConfirmButton: false,
+    confirmLoading: false,
+    noticeId: null
+  }
+}
 export default {
   name: 'NoticeMarquee',
+  components: { NoticeDetailDialog },
   data() {
     return {
-      noteType: []
+      noteType: [],
+      detailDialog: detailDialogDefault()
     }
   },
   computed: {
@@ -40,25 +69,41 @@ export default {
       if (i > -1) {
         currentNoticeType = this.noteType[i].Value
       }
-      const h = this.$createElement
-      this.$msgbox({
-        title: currentNoticeType,
-        message: h('span', null, item.Content),
-        beforeClose: (action, instance, done) => {
-          if (action === 'confirm') {
-            instance.confirmButtonLoading = true
-            setSystemNoticeHaveRead(item.Id).then(async res => {
-              if (res.IsSuccess) {
-                await this.$store.dispatch('global/getNoticeList')
-              }
-              instance.confirmButtonLoading = false
-              done()
-            }).catch(() => { instance.confirmButtonLoading = false })
-          } else {
-            done()
-          }
-        }
-      })
+      this.detailDialog = {
+        visible: true,
+        title: currentNoticeType,
+        content: item.Content || '',
+        publishedTime: item.PublishedTime || '',
+        fileName: item.FileName || '',
+        filePath: item.Path || '',
+        showConfirmButton: true,
+        confirmLoading: false,
+        noticeId: item.Id
+      }
+    },
+    async handleDetailConfirm() {
+      if (!this.detailDialog.noticeId) {
+        return
+      }
+      this.detailDialog.confirmLoading = true
+      try {
+        const res = await setSystemNoticeHaveRead(this.detailDialog.noticeId)
+        if (res.IsSuccess) {
+          await this.$store.dispatch('global/getNoticeList')
+          this.detailDialog.visible = false
+        }
+      } catch (err) {
+        console.log(err)
+      } finally {
+        this.detailDialog.confirmLoading = false
+      }
+    },
+    handleDetailClosed() {
+      this.detailDialog = detailDialogDefault()
+    },
+    downLoadFile(filePath) {
+      if (!filePath) return
+      window.open(this.OSSclientConfig.basePath + filePath, '_blank')
     },
     getDicData() {
       getBasicDataSelects(['NoteType']).then(res => {
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index 9f1d60f8..0ca5e12f 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -10,53 +10,38 @@
       <NoticeMarquee />
     </div>
     <div class="right-menu">
-      <el-menu
-        :default-active="activeIndex"
-        class="el-menu-demo"
-        mode="horizontal"
-        size="mini"
-        @select="handleSelect"
-      >
-        <el-menu-item
-          v-if="
-            !hasPermi([
-              'role:air',
-              'role:rpm',
-              'role:radmin',
-              'role:rcrc',
-              'role:rir',
-            ])
-          "
-          index="1"
-        >
+      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" size="mini" @select="handleSelect">
+        <el-menu-item v-if="
+          !hasPermi([
+            'role:air',
+            'role:rpm',
+            'role:radmin',
+            'role:rcrc',
+            'role:rir',
+          ])
+        " index="1">
           <i class="el-icon-odometer" />
           <!-- 工作台 -->
           <span slot="title">{{ $t('trials:menuTitle:workbench') }}</span>
         </el-menu-item>
-        <el-menu-item
-          v-if="!hasPermi(['role:zys', 'role:zyss', 'role:zybs'])"
-          index="2"
-          :disabled="TotalNeedSignSystemDocCount !== 0"
-        >
+        <el-menu-item v-if="!hasPermi(['role:zys', 'role:zyss', 'role:zybs'])" index="2"
+          :disabled="TotalNeedSignSystemDocCount !== 0">
           <i class="el-icon-box" />
           <!-- 我的项目 -->
           <span slot="title">
             {{ $t('trials:tab:trials') }}
           </span>
         </el-menu-item>
-        <el-menu-item
-          v-if="
-            !hasPermi([
-              'role:air',
-              'role:rpm',
-              'role:radmin',
-              'role:rcrc',
-              'role:rir',
-              'role:zys',
-            ])
-          "
-          index="3"
-        >
+        <el-menu-item v-if="
+          !hasPermi([
+            'role:air',
+            'role:rpm',
+            'role:radmin',
+            'role:rcrc',
+            'role:rir',
+            'role:zys',
+          ])
+        " index="3">
           <i class="el-icon-chat-dot-square" />
           <!-- 通知消息 -->
           <span slot="title">{{ $t('trials:tab:notice') }}</span>
@@ -74,11 +59,8 @@
             $t('trials:trials-myinfo:title:accountInfo')
           }}</el-menu-item>
           <!-- 管理后台 -->
-          <el-menu-item
-            v-if="hasPermi(['role:dev', 'role:oa', 'role:admin'])"
-            index="4-4"
-            >{{ $t('trials:trials-myinfo:title:system') }}</el-menu-item
-          >
+          <el-menu-item v-if="hasPermi(['role:dev', 'role:oa', 'role:admin'])" index="4-4">{{
+            $t('trials:trials-myinfo:title:system') }}</el-menu-item>
           <!-- 切换角色 -->
           <el-menu-item index="4-5" v-if="hasRole">{{
             $t('trials:trials-myinfo:title:toggleRole')
@@ -89,18 +71,12 @@
           }}</el-menu-item>
         </el-submenu>
       </el-menu>
-      <TopLang
-        v-if="
-          VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' && NODE_ENV !== 'usa'
-        "
-      />
+      <TopLang v-if="
+        VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' && NODE_ENV !== 'usa'
+      " />
     </div>
-    <toggleRole
-      v-if="toggleRoleVisible"
-      :visible.sync="toggleRoleVisible"
-      :loading="toggleRoleLoading"
-      @save="loginByRole"
-    />
+    <toggleRole v-if="toggleRoleVisible" :visible.sync="toggleRoleVisible" :loading="toggleRoleLoading"
+      @save="loginByRole" />
   </div>
 </template>
 
@@ -306,37 +282,45 @@ export default {
   overflow: hidden;
   background: #fff;
   box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
+
   .el-breadcrumb__item {
     font-size: 16px;
   }
+
   .leftMenu {
     display: flex;
     align-items: flex-end;
     padding-left: 20px;
     padding-bottom: 20px;
+
     img {
       height: 28px;
       margin-right: 10px;
     }
+
     .title-logo {
       height: 36px;
     }
+
     span {
       font-size: 20px;
       position: relative;
       bottom: -3px;
     }
   }
+
   .right-menu,
   .center-menu {
     display: flex;
     flex-direction: row;
     justify-content: space-between;
     height: 100%;
+
     // line-height: 70px;
     &:focus {
       outline: none;
     }
+
     .right-menu-item {
       display: inline-block;
       padding: 0 8px;
@@ -354,9 +338,11 @@ export default {
         }
       }
     }
+
     .avatar-container {
       display: inline-block;
       margin-right: 200px;
+
       .user-avatar {
         margin-top: 5px;
         width: 40px;
@@ -364,29 +350,34 @@ export default {
         border-radius: 10px;
       }
     }
+
     .dropdown-container {
       cursor: pointer;
+
       .el-icon-caret-bottom {
         font-size: 12px;
       }
     }
+
     .el-dropdown-link {
       color: #999c9e;
       cursor: pointer;
     }
   }
+
   .right-menu {
     .el-menu-item.is-active {
       font-weight: bolder;
     }
   }
+
   .center-menu {
     width: calc(100% - 1200px);
   }
 }
 </style>
 <style>
-.el-menu--horizontal > .my_info.el-submenu .el-submenu__icon-arrow {
+.el-menu--horizontal>.my_info.el-submenu .el-submenu__icon-arrow {
   margin-top: 0;
 }
 </style>
diff --git a/src/views/trials/trials-notice/index.vue b/src/views/trials/trials-notice/index.vue
index a733e44d..c05e9502 100644
--- a/src/views/trials/trials-notice/index.vue
+++ b/src/views/trials/trials-notice/index.vue
@@ -172,6 +172,19 @@
         :limit.sync="searchData.PageSize"
         @pagination="getList"
       />
+      <notice-detail-dialog
+        :visible.sync="detailDialog.visible"
+        :title="detailDialog.title"
+        :content="detailDialog.content"
+        :published-time="detailDialog.publishedTime"
+        :file-name="detailDialog.fileName"
+        :file-path="detailDialog.filePath"
+        :show-confirm-button="detailDialog.showConfirmButton"
+        :confirm-loading="detailDialog.confirmLoading"
+        @confirm="handleDetailConfirm"
+        @open-file="downLoadFile"
+        @closed="handleDetailClosed"
+      />
     </template>
   </BaseContainer>
 </template>
@@ -179,6 +192,7 @@
 import { getUserSystemNoticeList, setSystemNoticeHaveRead } from '@/api/global'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
+import NoticeDetailDialog from '@/views/trials/components/NoticeDetailDialog'
 const searchDataDefault = () => {
   return {
     NoticeContent: '',
@@ -193,9 +207,22 @@ const searchDataDefault = () => {
     PageSize: 20,
   }
 }
+const detailDialogDefault = () => {
+  return {
+    visible: false,
+    title: '',
+    content: '',
+    publishedTime: '',
+    fileName: '',
+    filePath: '',
+    showConfirmButton: false,
+    confirmLoading: false,
+    noticeId: null,
+  }
+}
 export default {
   name: 'TrialsNotice',
-  components: { BaseContainer, Pagination },
+  components: { BaseContainer, Pagination, NoticeDetailDialog },
   dicts: ['NoteType', 'NoticeState', 'NoticeMode'],
   data() {
     return {
@@ -203,6 +230,7 @@ export default {
       list: [],
       total: 0,
       loading: false,
+      detailDialog: detailDialogDefault(),
     }
   },
   mounted() {
@@ -222,38 +250,39 @@ export default {
         })
     },
     showDetail(row) {
-      var currentNoticeType = this.$fd('NoteType', row.NoticeTypeEnum)
-      if (row.IsRead || row.ActualNoticeStateEnum !== 1) {
-        this.$alert(row.NoticeContent, currentNoticeType, {
-          showConfirmButton: false,
-        })
-      } else {
-        const h = this.$createElement
-        this.$msgbox({
-          title: currentNoticeType,
-          message: h('span', null, row.NoticeContent),
-          beforeClose: (action, instance, done) => {
-            if (action === 'confirm') {
-              instance.confirmButtonLoading = true
-              setSystemNoticeHaveRead(row.Id)
-                .then(async (res) => {
-                  if (res.IsSuccess) {
-                    await this.$store.dispatch('global/getNoticeList')
-                    this.getList()
-                  }
-                  instance.confirmButtonLoading = false
-                  done()
-                })
-                .catch(() => {
-                  instance.confirmButtonLoading = false
-                })
-            } else {
-              done()
-            }
-          },
-        })
+      this.detailDialog = {
+        visible: true,
+        title: this.$fd('NoteType', row.NoticeTypeEnum),
+        content: row.NoticeContent || '',
+        publishedTime: row.PublishedTime || '',
+        fileName: row.FileName || '',
+        filePath: row.Path || '',
+        showConfirmButton: !row.IsRead && row.ActualNoticeStateEnum === 1,
+        confirmLoading: false,
+        noticeId: row.Id
       }
     },
+    async handleDetailConfirm() {
+      if (!this.detailDialog.noticeId) {
+        return
+      }
+      this.detailDialog.confirmLoading = true
+      try {
+        const res = await setSystemNoticeHaveRead(this.detailDialog.noticeId)
+        if (res.IsSuccess) {
+          await this.$store.dispatch('global/getNoticeList')
+          this.detailDialog.visible = false
+          this.getList()
+        }
+      } catch (err) {
+        console.log(err)
+      } finally {
+        this.detailDialog.confirmLoading = false
+      }
+    },
+    handleDetailClosed() {
+      this.detailDialog = detailDialogDefault()
+    },
     downLoadFile(filePath) {
       if (!filePath) return
       window.open(this.OSSclientConfig.basePath + filePath, '_blank')
@@ -281,4 +310,9 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.notice-content-text {
+  white-space: pre-wrap;
+  word-break: break-word;
+  line-height: 1.5;
+}
 </style>
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 467e0d46..fdbb6b0e 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -482,7 +482,7 @@ export default {
       }
     },
     handleSelectTable(row) {
-      return row.DoctorTrialState !== 1 && row.ResumeStatus === 1 && row.AcceptingNewTrial && !row.IsVirtual && !row.IsVacation && row.CooperateStatus === 1
+      return row.DoctorTrialState !== 1 && row.ResumeStatus === 1 && row.AcceptingNewTrial && ((!row.IsVirtual && this.$store.state.trials.config.TrialType !== 0) || (row.IsVirtual && this.$store.state.trials.config.TrialType === 0)) && !row.IsVacation && row.CooperateStatus === 1
     },
     handleDetail(row) {
       const { href } = this.$router.resolve({
diff --git a/src/views/trials/trials-panel/attachments/reReading-tracking/index.vue b/src/views/trials/trials-panel/attachments/reReading-tracking/index.vue
index 45c5e72f..7cb10aea 100644
--- a/src/views/trials/trials-panel/attachments/reReading-tracking/index.vue
+++ b/src/views/trials/trials-panel/attachments/reReading-tracking/index.vue
@@ -665,7 +665,7 @@ export default {
     async audit(row) {
       try {
         this.rowData = Object.assign({}, row)
-        this.rowData.title = `${row.ApplicantName} (${this.$fd('RequestReReadingType', row.RequestReReadingType)}) ${this.$t('trials:spmAudit:title:imageBack').replace('xxx', row.OriginalReReadingTask.SubjectCode).replace('yyy', row.OriginalReReadingTask.TaskName)}`
+        this.rowData.title = `${row.ApplicantName} (${this.$fd('RequestReReadingType', row.RequestReReadingType)}) ${this.$t('trials:spmAudit:title:imageBack').replace('xxx', row.OriginalReReadingTask.SubjectCode).replace('yyy', row.OriginalReReadingTask.TaskBlindName)}`
         Object.keys(this.form).forEach(key => {
           this.form[key] = null
         })
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/Equipments.vue b/src/views/trials/trials-panel/attachments/site-research/components/Equipments.vue
new file mode 100644
index 00000000..3300eb19
--- /dev/null
+++ b/src/views/trials/trials-panel/attachments/site-research/components/Equipments.vue
@@ -0,0 +1,311 @@
+<template>
+  <BaseContainer>
+    <!-- 搜索框 -->
+    <template slot="search-container">
+      <el-form :inline="true">
+        <!-- 中心编号 -->
+        <el-form-item :label="$t('trials:researchStaff:table:siteId')">
+          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
+              :value="item.TrialSiteId" />
+          </el-select>
+        </el-form-item>
+        <!-- 中心名称 -->
+        <el-form-item :label="$t('trials:researchStaff:table:siteName')">
+          <el-input v-model="searchData.TrialSiteName" class="mr" clearable style="width:120px;" />
+        </el-form-item>
+        <!-- 状态 -->
+        <el-form-item :label="$t('trials:researchRecord:table:status')">
+          <el-select v-model="searchData.State" clearable filterable style="width: 120px">
+            <el-option v-for="(item, index) of $d.ResearchRecord" :key="index" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <!-- 是否废除 -->
+        <!-- <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
+          <el-select v-model="searchData.IsDeleted" clearable filterable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`"
+              :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item>
+          <!-- 查询 -->
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+        </el-form-item>
+        <!-- 重置 -->
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+            {{ $t('common:button:reset') }}
+          </el-button>
+        </el-form-item>
+        <!-- 导出 -->
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-download" :disabled="list.length === 0" @click="handleExport">
+            {{ $t('common:button:export') }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+
+    <template slot="main-container">
+      <el-table ref="equipmentsList" v-loading="loading" v-adaptive="{ bottomOffset: 55 }" :data="list" stripe
+        height="100" @sort-change="handleSortByColumn">
+        <el-table-column type="index" width="50" />
+        <!-- 中心编号 -->
+        <el-table-column prop="TrialSiteCode" :label="$t('trials:researchStaff:table:siteId')" show-overflow-tooltip
+          sortable="custom" min-width="100">
+        </el-table-column>
+        <!-- 中心名称 -->
+        <el-table-column prop="TrialSiteName" :label="$t('trials:researchStaff:table:siteName')" show-overflow-tooltip
+          sortable="custom" min-width="120">
+        </el-table-column>
+        <!-- 状态 -->
+        <el-table-column prop="State" :label="$t('trials:researchRecord:table:status')" min-width="150"
+          sortable="custom" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.State === 0" type="primary">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 1" type="info">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 2" type="warning">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 3" type="danger">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- 是否废除 -->
+        <!-- <el-table-column prop="IsDeleted" :label="$t('trials:researchRecord:table:isDeleted')" min-width="100"
+          sortable="custom" show-overflow-tooltip>
+          <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="UserName" :label="$t('trials:researchForm:form:contactor')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
+        <!-- 联系电话 -->
+        <el-table-column prop="Phone" :label="$t('trials:researchForm:form:contactorPhone')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
+        <!-- 联系邮箱 -->
+        <el-table-column prop="Email" :label="$t('trials:researchForm:form:contactorEmail')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
+        <template v-if="equipmentControlFieldList.includes('EquipmentTypeEnum')">
+          <!-- 扫描设备 -->
+          <el-table-column prop="EquipmentTypeEnum" :label="$t('trials:equiptResearch:form:equipment')" min-width="120"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.OtherEquipmentType ? scope.row.OtherEquipmentType :
+                $fd('SiteSurvey_ScanEquipmentType', scope.row.EquipmentTypeEnum) }}
+            </template>
+          </el-table-column>
+        </template>
+        <template v-if="equipmentControlFieldList.includes('Parameters')">
+          <!-- 扫描参数 -->
+          <el-table-column prop="Parameters" :label="$t('trials:equiptResearch:form:param')" min-width="100"
+            show-overflow-tooltip />
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('ManufacturerType')">
+          <!-- 扫描仪器制造商名称 -->
+          <el-table-column min-width="120" prop="ManufacturerType"
+            :label="$t('trials:equiptResearch:form:manufacturer')" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.ManufacturerName ? scope.row.ManufacturerName : $fd('ManufacturerType',
+                scope.row.ManufacturerType) }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('ScannerType')">
+          <!-- 扫描仪型号 -->
+          <el-table-column min-width="120" prop="ScannerType" :label="$t('trials:equiptResearch:form:model')"
+            show-overflow-tooltip />
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('MagneticFieldStrengthType')">
+          <!-- 磁场强度 -->
+          <el-table-column min-width="120" prop="MagneticFieldStrengthType"
+            :label="$t('trials:equiptResearch:form:MagneticFieldStrengthType')" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('MagneticFieldStrengthType', scope.row.MagneticFieldStrengthType) }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('BodyCoilChannelCount')">
+          <!-- 体部线圈通道数 -->
+          <el-table-column min-width="120" prop="BodyCoilChannelCount"
+            :label="$t('trials:equiptResearch:form:BodyCoilChannelCount')" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('BodyCoilChannelCount', scope.row.BodyCoilChannelCount) }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('HasDedicatedPdfFatQuantificationSequence')">
+          <!-- 是否具备专用的PDFF脂肪定量序列（CSE-MRI序列） -->
+          <el-table-column min-width="120" prop="HasDedicatedPdfFatQuantificationSequence"
+            :label="$t('trials:equiptResearch:form:HasDedicatedPdfFatQuantificationSequence')" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.HasDedicatedPdfFatQuantificationSequence) }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('PdfFatQuantificationSequenceType')">
+          <!-- 专用的PDFF脂肪定量序列类型 -->
+          <el-table-column min-width="120" prop="PdfFatQuantificationSequenceType"
+            :label="$t('trials:equiptResearch:form:PdfFatQuantificationSequenceType')" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ scope.row.OtherSequenceSpecification ? scope.row.OtherSequenceSpecification :
+                $fd('PdfFatQuantificationSequenceType', scope.row.PdfFatQuantificationSequenceType) }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('HasT2R2Correction')">
+          <!-- 是否包含 T2/R2 校正（用于铁沉积校正） -->
+          <el-table-column min-width="120" prop="HasT2R2Correction"
+            :label="$t('trials:equiptResearch:form:HasT2R2Correction')" show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.HasT2R2Correction) }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('CanFullyExportPdfParameterMapsAndRawDicom')">
+          <!-- 是否可完整导出 PDFF 参数图及全部原始 DICOM 数据 -->
+          <el-table-column prop="CanFullyExportPdfParameterMapsAndRawDicom"
+            :label="$t('trials:equiptResearch:form:CanFullyExportPdfParameterMapsAndRawDicom')" min-width="120"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.CanFullyExportPdfParameterMapsAndRawDicom) }}
+            </template>
+          </el-table-column>
+        </template>
+
+        <template v-if="equipmentControlFieldList.includes('Note')">
+          <!-- 备注 -->
+          <el-table-column min-width="120" prop="Note" :label="$t('trials:equiptResearch:form:remark')"
+            show-overflow-tooltip />
+        </template>
+
+      </el-table>
+
+      <!-- 分页组件 -->
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
+    </template>
+  </BaseContainer>
+</template>
+<script>
+import { getTrialSiteSelect } from '@/api/trials'
+import { getSiteSurveyEquipmentList } from '@/api/research'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import { getSiteSurveyEquipmentList_Export } from '@/api/export'
+const searchDataDefault = () => {
+  return {
+    SortField: '',
+    State: "",
+    Asc: true,
+    PageIndex: 1,
+    PageSize: 20,
+    TrialId: '',
+    TrialSiteId: '',
+    TrialSiteName: ''
+  }
+}
+export default {
+  name: 'Equipments',
+  components: { BaseContainer, Pagination },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      loading: false,
+      list: [],
+      total: 0,
+      trialId: '',
+      otherInfo: {},
+      siteOptions: [],
+      equipmentControlFieldList: []
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.getList()
+    this.getSite()
+  },
+  methods: {
+    async handleExport() {
+      await getSiteSurveyEquipmentList_Export(this.searchData)
+    },
+    async getList() {
+      try {
+        this.loading = true
+        this.searchData.TrialId = this.trialId
+        let res = await getSiteSurveyEquipmentList(this.searchData)
+        if (res.IsSuccess) {
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.otherInfo = res.OtherInfo
+          const { EquipmentControlFieldList } = res.OtherInfo
+          this.equipmentControlFieldList = []
+          EquipmentControlFieldList.forEach(item => {
+            this.equipmentControlFieldList.push(item.FiledName)
+          })
+          this.$nextTick(() => {
+            this.$refs.equipmentsList.doLayout()
+          })
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.loading = false
+      }
+    },
+    // 获取site下拉框数据
+    async getSite() {
+      try {
+        let res = await getTrialSiteSelect(this.trialId)
+        this.siteOptions = res.Result
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    // 重置
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+      this.$nextTick(() => {
+        this.$refs.list.clearSort()
+      })
+    },
+    // 查询
+    handleSearch() {
+      this.getList()
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.getList()
+    }
+  }
+}
+</script>
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
index f047032a..cbbf6b8b 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue
@@ -1,6 +1,25 @@
 <template>
     <div class="ImageManual">
         <div class="config">
+            <div style="margin-bottom: 20px;font-weight: bold;">
+                {{ $t("trials:researchRecord:ImageManual:uploadFile") }}
+            </div>
+            <el-form size="small" :model="uploadForm" style="width:80%">
+                <el-form-item :label="$t('trials:researchRecord:ImageManual:IsSupportUploadFile')">
+                    <el-radio-group v-model="uploadForm.IsSupportUploadFile"
+                        @input="uploadForm.IsOnlyUploadFile = false">
+                        <el-radio :label="item.value" v-for="item in $d.YesOrNo" :key="item.id">{{ item.label
+                            }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+                <el-form-item :label="$t('trials:researchRecord:ImageManual:IsOnlyUploadFile')"
+                    v-if="uploadForm.IsSupportUploadFile">
+                    <el-radio-group v-model="uploadForm.IsOnlyUploadFile">
+                        <el-radio :label="item.value" v-for="item in $d.YesOrNo" :key="item.id">{{ item.label
+                            }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </el-form>
             <div style="margin-bottom: 20px;font-weight: bold;">
                 {{ $t("trials:researchRecord:ImageManual:BasicQuestion") }}
             </div>
@@ -56,11 +75,11 @@
                 <el-form-item :label="$t('trials:researchRecord:ImageManual:Equipment')">
                     <el-radio-group v-model="form.IsCloseEquipmentSurvey" @input="handleInput">
                         <el-radio :label="item.value" v-for="item in $d.YesOrNo" :key="item.id">{{ item.label
-                        }}</el-radio>
+                            }}</el-radio>
                     </el-radio-group>
                 </el-form-item>
             </el-form>
-            <div style="margin-bottom: 20px;font-weight: bold;">
+            <div style="margin-bottom: 20px;font-weight: bold;" v-if="form.IsCloseEquipmentSurvey">
                 {{ $t("trials:researchRecord:ImageManual:EquipmentConfig") }}
             </div>
             <el-form size="small" :model="EquipmentForm" style="width:80%" v-if="form.IsCloseEquipmentSurvey">
@@ -192,6 +211,10 @@ export default {
                 HasT2R2Correction: false,
                 CanFullyExportPdfParameterMapsAndRawDicom: false,
             },
+            uploadForm: {
+                IsSupportUploadFile: false,
+                IsOnlyUploadFile: false
+            },
             obj: {
                 AverageEngravingCycle: false,
                 IsConfirmImagingTechnologist: false,
@@ -206,7 +229,7 @@ export default {
                 IsAuthorizeRadiologistsParticipate: false,
                 AssignFixedTechnologists: false,
                 ISStrictManualBurnFlag: false,
-                NotStrictManualBurnFlagReason: false, 
+                NotStrictManualBurnFlagReason: false,
             },
             loading: false
         }
@@ -241,6 +264,8 @@ export default {
                 }
                 let res = await getTrialExtralConfig(param)
                 if (res.IsSuccess) {
+                    this.uploadForm.IsOnlyUploadFile = res.Result.IsOnlyUploadFile
+                    this.uploadForm.IsSupportUploadFile = res.Result.IsSupportUploadFile
                     Object.keys(this.form).forEach(key => {
                         this.form[key] = true
                         if (key === 'ReplaceContent' || key === 'ReplaceContentCN') this.form[key] = ''
@@ -314,6 +339,8 @@ export default {
                     IsOpenLostVistRead: this.form.IsOpenLostVistRead,
                     IsSupportQCDownloadImage: this.form.IsSupportQCDownloadImage,
                     IsCloseEquipmentSurvey: !this.form.IsCloseEquipmentSurvey,
+                    IsOnlyUploadFile: this.uploadForm.IsOnlyUploadFile,
+                    IsSupportUploadFile: this.uploadForm.IsSupportUploadFile,
                     ModifyFiledList: [],
                     NotShowFieldList: [],
                     EquipmentControlFieldList: []
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/Questions.vue b/src/views/trials/trials-panel/attachments/site-research/components/Questions.vue
new file mode 100644
index 00000000..60d4ffc7
--- /dev/null
+++ b/src/views/trials/trials-panel/attachments/site-research/components/Questions.vue
@@ -0,0 +1,356 @@
+<template>
+  <BaseContainer>
+    <!-- 搜索框 -->
+    <template slot="search-container">
+      <el-form :inline="true">
+        <!-- 中心编号 -->
+        <el-form-item :label="$t('trials:researchStaff:table:siteId')">
+          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
+              :value="item.TrialSiteId" />
+          </el-select>
+        </el-form-item>
+        <!-- 中心名称 -->
+        <el-form-item :label="$t('trials:researchStaff:table:siteName')">
+          <el-input v-model="searchData.TrialSiteName" class="mr" clearable style="width:120px;" />
+        </el-form-item>
+        <!-- 状态 -->
+        <el-form-item :label="$t('trials:researchRecord:table:status')">
+          <el-select v-model="searchData.State" clearable filterable style="width: 120px">
+            <el-option v-for="(item, index) of $d.ResearchRecord" :key="index" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <!-- 是否废除 -->
+        <!-- <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
+          <el-select v-model="searchData.IsDeleted" clearable filterable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`"
+              :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item> -->
+        <el-form-item>
+          <!-- 查询 -->
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+        </el-form-item>
+        <!-- 重置 -->
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+            {{ $t('common:button:reset') }}
+          </el-button>
+        </el-form-item>
+        <!-- 导出 -->
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-download" :disabled="list.length === 0" @click="handleExport">
+            {{ $t('common:button:export') }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+
+    <template slot="main-container">
+      <el-table ref="questionsList" v-loading="loading" v-adaptive="{ bottomOffset: 55 }" :data="list" stripe
+        height="100" @sort-change="handleSortByColumn">
+        <el-table-column type="index" width="50" />
+
+        <!-- 项目编号 -->
+        <!-- <el-table-column
+          prop="TrialCode"
+          :label="$t('trials:researchForm:form:trialId')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        /> -->
+        <!-- 试验方案号 -->
+        <!-- <el-table-column
+          prop="ResearchProgramNo"
+          :label="$t('trials:researchForm:form:researchNo')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        /> -->
+        <!-- 试验名称 -->
+        <!-- <el-table-column
+          prop="ExperimentName"
+          :label="$t('trials:researchForm:form:researchName')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        /> -->
+        <!-- 适应症类型 -->
+        <!-- <el-table-column
+          prop="IndicationType"
+          :label="$t('trials:researchForm:form:decleareType')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        /> -->
+        <!-- 适应症类型 -->
+        <!-- <el-table-column
+          prop="IndicationType"
+          :label="$t('trials:researchForm:form:decleareType')"
+          show-overflow-tooltip
+          sortable="custom"
+          min-width="100"
+        /> -->
+
+        <!-- 中心编号 -->
+        <el-table-column prop="TrialSiteCode" :label="$t('trials:researchStaff:table:siteId')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
+        <!-- 中心名称 -->
+        <el-table-column prop="SiteName" :label="$t('trials:researchStaff:table:siteName')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
+        <!-- 状态 -->
+        <el-table-column prop="State" :label="$t('trials:researchRecord:table:status')" min-width="150"
+          sortable="custom" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.State === 0" type="primary">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 1" type="info">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 2" type="warning">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 3" type="danger">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- 是否废除 -->
+        <!-- <el-table-column prop="IsDeleted" :label="$t('trials:researchRecord:table:isDeleted')" min-width="100"
+          sortable="custom" show-overflow-tooltip>
+          <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="UserName" :label="$t('trials:researchForm:form:contactor')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
+        <!-- 联系电话 -->
+        <el-table-column prop="Phone" :label="$t('trials:researchForm:form:contactorPhone')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
+        <!-- 联系邮箱 -->
+        <el-table-column prop="Email" :label="$t('trials:researchForm:form:contactorEmail')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
+        <el-table-column v-show="otherInfo.IsSupportUploadFile" prop="SiteSurveyFile.FileName"
+          :label="$t('trials:researchForm:form:SiteSurveyFile')" show-overflow-tooltip min-width="100">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.SiteSurveyFile && scope.row.SiteSurveyFile.FileName" type="text"
+              @click="viewFile(scope.row.SiteSurveyFile)">
+              {{ scope.row.SiteSurveyFile.FileName }}
+            </el-button>
+          </template>
+        </el-table-column>
+        <template v-if="!notShowFieldList.includes('AverageEngravingCycle')">
+          <!-- 平均刻盘周期（天） -->
+          <el-table-column prop="AverageEngravingCycle" :label="$t('trials:researchForm:form:engravingCycle')"
+            show-overflow-tooltip />
+        </template>
+        <template v-if="!notShowFieldList.includes('IsRoutineMRIPDEE')">
+          <!--  MRI-PDFF 是否为本中心该适应症的常规诊疗检查项目？ -->
+          <el-table-column prop="IsRoutineMRIPDEE" :label="$t('trials:researchForm:form:IsRoutineMRIPDEE')"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.IsRoutineMRIPDEE) }}
+            </template>
+          </el-table-column>
+        </template>
+        <template
+          v-if="!notShowFieldList.includes('MRIPDFFScanTime') || !notShowFieldList.includes('MRIPDFFLeadTime') || !notShowFieldList.includes('MRIPDFFOther')">
+          <!--  MRI-PDFF 检查的检测周期（含单次检查时长、预约等待时长等） -->
+          <!-- <el-table-column :label="$t('trials:researchForm:form:IsRoutineMRIPDEE')"> -->
+            <!-- 单次检查时长（分钟） -->
+            <el-table-column v-show="!notShowFieldList.includes('MRIPDFFScanTime')" prop="MRIPDFFScanTime"
+              :label="$t('trials:researchForm:form:MRIPDFFScanTime')" show-overflow-tooltip />
+            <!-- 平均预约等待时长（天） -->
+            <el-table-column v-show="!notShowFieldList.includes('MRIPDFFLeadTime')" prop="MRIPDFFLeadTime"
+              :label="$t('trials:researchForm:form:MRIPDFFLeadTime')" show-overflow-tooltip />
+            <!-- 特殊情况备注-->
+            <el-table-column v-show="!notShowFieldList.includes('MRIPDFFOther')" prop="MRIPDFFOther"
+              :label="$t('trials:researchForm:form:MRIPDFFOther')" show-overflow-tooltip />
+          <!-- </el-table-column> -->
+        </template>
+        <template
+          v-if="!notShowFieldList.includes('IsAuthorizeRadiologistsParticipate') || !notShowFieldList.includes('AssignFixedTechnologists')">
+          <!--  如已选择研究者评估，项目是否会授权影像科老师参与本试验？如不单独授权，是否可在试验中保持 1-2 名固定技师操作？ -->
+          <el-table-column prop="IsAuthorize" :label="$t('trials:researchForm:form:IsAuthorize')" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span v-if="scope.row.IsAuthorizeRadiologistsParticipate">
+                {{ $t('trials:researchForm:form:IsAuthorizeRadiologistsParticipate') }}
+              </span>
+              <span v-else-if="scope.row.AssignFixedTechnologists">
+                {{ $t('trials:researchForm:form:AssignFixedTechnologists') }}
+              </span>
+            </template>
+          </el-table-column>
+        </template>
+        <template v-if="!notShowFieldList.includes('IsConfirmImagingTechnologist')">
+          <!--  请确认参与本项目影像采集的影像技师具备对应的资质（如：“技师证”，对应设备的“大型设备上岗证”） -->
+          <el-table-column prop="IsConfirmImagingTechnologist" :label="$t('trials:researchForm:form:isQualified')"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.IsConfirmImagingTechnologist) }}
+            </template>
+          </el-table-column>
+        </template>
+        <template v-if="!notShowFieldList.includes('NotConfirmReson')">
+          <!-- 原因 -->
+          <el-table-column prop="NotConfirmReson" :label="$t('trials:researchForm:form:notQualifiedReason')"
+            show-overflow-tooltip />
+        </template>
+        <template v-if="!notShowFieldList.includes('EfficacyEvaluatorType')">
+          <!-- 研究单位疗效评估人员类型 -->
+          <el-table-column prop="EfficacyEvaluatorType" :label="$t('trials:researchForm:form:staffType')"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('EfficacyEvaluatorType', scope.row.EfficacyEvaluatorType) }}
+            </template>
+          </el-table-column>
+        </template>
+        <template v-if="!notShowFieldList.includes('IsFollowStudyParameters')">
+          <!-- 是否严格按照研究单位影像手册参数完成图像采集 -->
+          <el-table-column prop="IsFollowStudyParameters" :label="$t('trials:researchForm:form:isFollowStudyParam')"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.IsFollowStudyParameters) }}
+            </template>
+          </el-table-column>
+        </template>
+        <template v-if="!notShowFieldList.includes('NotFollowReson')">
+          <!-- 不能严格按照研究单位影像手册参数采集图像原因 -->
+          <el-table-column prop="NotFollowReson" :label="$t('trials:researchForm:form:notFollowStudyParam')"
+            show-overflow-tooltip />
+        </template>
+        <template v-if="!notShowFieldList.includes('ISStrictManualBurnFlag')">
+          <!-- 是否严格按照影像手册参数完成刻盘 -->
+          <el-table-column prop="ISStrictManualBurnFlag" :label="$t('trials:researchForm:form:ISStrictManualBurnFlag')"
+            show-overflow-tooltip>
+            <template slot-scope="scope">
+              {{ $fd('YesOrNo', scope.row.ISStrictManualBurnFlag) }}
+            </template>
+          </el-table-column>
+        </template>
+        <template v-if="!notShowFieldList.includes('NotStrictManualBurnFlagReason')">
+          <!-- 不能严格按照影像手册参数完成刻盘原因 -->
+          <el-table-column prop="NotStrictManualBurnFlagReason"
+            :label="$t('trials:researchForm:form:NotStrictManualBurnFlagReason')" show-overflow-tooltip />
+        </template>
+      </el-table>
+
+      <!-- 分页组件 -->
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
+    </template>
+  </BaseContainer>
+</template>
+<script>
+import { getTrialSiteSelect } from '@/api/trials'
+import { getSiteSurveyInfoList } from '@/api/research'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import { getSiteSurveyInfoList_Export } from '@/api/export'
+const searchDataDefault = () => {
+  return {
+    SortField: '',
+    Asc: true,
+    State: "",
+    PageIndex: 1,
+    PageSize: 20,
+    TrialId: '',
+    TrialSiteId: '',
+    TrialSiteName: ''
+  }
+}
+export default {
+  name: 'Equipments',
+  components: { BaseContainer, Pagination },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      loading: false,
+      list: [],
+      total: 0,
+      trialId: '',
+      otherInfo: {},
+      siteOptions: [],
+      notShowFieldList: []
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.getList()
+    this.getSite()
+  },
+  methods: {
+    async handleExport() {
+      await getSiteSurveyInfoList_Export(this.searchData)
+    },
+    async getList() {
+      try {
+        this.loading = true
+        this.searchData.TrialId = this.trialId
+        let res = await getSiteSurveyInfoList(this.searchData)
+        if (res.IsSuccess) {
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+          this.otherInfo = res.OtherInfo
+          this.notShowFieldList = res.OtherInfo.NotShowFieldList
+          this.$nextTick(() => {
+            this.$refs.questionsList.doLayout()
+          })
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.loading = false
+      }
+    },
+    // 获取site下拉框数据
+    async getSite() {
+      try {
+        let res = await getTrialSiteSelect(this.trialId)
+        this.siteOptions = res.Result
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    viewFile(siteSurveyFile) {
+      this.$preview({
+        path: siteSurveyFile.Path,
+        type: siteSurveyFile.FileType,
+        title: siteSurveyFile.FileName,
+      })
+    },
+    // 重置
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+      this.$nextTick(() => {
+        this.$refs.list.clearSort()
+      })
+    },
+    // 查询
+    handleSearch() {
+      this.getList()
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.getList()
+    }
+  }
+}
+</script>
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ResearchList.vue b/src/views/trials/trials-panel/attachments/site-research/components/ResearchList.vue
new file mode 100644
index 00000000..68ae8322
--- /dev/null
+++ b/src/views/trials/trials-panel/attachments/site-research/components/ResearchList.vue
@@ -0,0 +1,733 @@
+<template>
+  <BaseContainer>
+    <!-- 搜索框 -->
+    <template slot="search-container">
+      <el-form :inline="true">
+        <!-- 中心 -->
+        <el-form-item :label="$t('trials:researchRecord:table:siteId')">
+          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width: 120px">
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
+              :value="item.TrialSiteId" />
+          </el-select>
+        </el-form-item>
+        <!-- 联系人 -->
+        <el-form-item :label="$t('trials:researchRecord:table:contactor')">
+          <el-input v-model="searchData.UserKeyInfo" class="mr" clearable :placeholder="`${$t(
+            'trials:researchRecord:placeholder:contactorInfo'
+          )}`" style="width: 140px" />
+        </el-form-item>
+        <!-- 初审人 -->
+        <el-form-item :label="$t('trials:researchRecord:table:preliminaryUser')">
+          <el-input v-model="searchData.PreliminaryUserName" class="mr" clearable style="width: 140px" />
+        </el-form-item>
+        <!-- 审核人 -->
+        <el-form-item :label="$t('trials:researchRecord:table:ReviewerUser')">
+          <el-input v-model="searchData.ReviewerUserName" class="mr" clearable style="width: 140px" />
+        </el-form-item>
+        <!-- 状态 -->
+        <!-- <el-form-item :label="$t('trials:researchRecord:table:status')">
+          <el-select v-model="searchData.State" clearable filterable style="width: 120px">
+            <el-option v-for="(item, index) of $d.ResearchRecord" :key="index" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item> -->
+        <!-- 是否废除 -->
+        <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
+          <el-select v-model="searchData.IsDeleted" clearable filterable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`"
+              :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <!-- 更新时间 -->
+        <el-form-item :label="$t('trials:researchRecord:table:updateTime')">
+          <el-date-picker v-model="searchData.DateRange" type="daterange" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+            style="width: 250px" />
+        </el-form-item>
+        <!-- 查询 -->
+        <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+          {{ $t('common:button:search') }}
+        </el-button>
+        <!-- 重置 -->
+        <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          {{ $t('common:button:reset') }}
+        </el-button>
+        <!-- 导出 -->
+        <el-button type="primary" @click="handleExport">
+          {{ $t('common:button:export') }}
+        </el-button>
+        <!-- 中心人员 -->
+        <el-button v-show="searchData.State === 3"
+          v-hasPermi="['trials:trials-panel:attachments:site-research:summary-record']" type="primary"
+          icon="el-icon-info" @click="showResearchUser">
+          {{ $t('trials:researchRecord:button:researchData') }}
+        </el-button>
+        <!-- 调查表链接 -->
+        <el-button v-show="searchData.State === 0"
+          v-hasPermi="['trials:trials-panel:attachments:site-research:questionnaire-link']" type="primary"
+          icon="el-icon-link" @click="showResearchLink">
+          {{ $t('trials:researchRecord:button:questionLink') }}
+        </el-button>
+      </el-form>
+    </template>
+
+    <template slot="main-container">
+      <!-- 系统文件列表 -->
+      <el-table ref="siteResearchList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe
+        height="100" @sort-change="handleSortByColumn">
+        <el-table-column type="index" width="50" />
+        <!-- 中心编号 -->
+        <el-table-column prop="TrialSiteCode" :label="$t('trials:researchRecord:table:siteId')" min-width="100"
+          sortable="custom" show-overflow-tooltip />
+        <!-- 中心名称 -->
+        <el-table-column prop="SiteName" :label="$t('trials:researchRecord:table:siteName')" min-width="100"
+          sortable="custom" show-overflow-tooltip />
+        <!-- 联系人 -->
+        <el-table-column prop="UserName" :label="$t('trials:researchRecord:table:contactor')" min-width="100"
+          sortable="custom" show-overflow-tooltip />
+        <!-- 联系电话 -->
+        <el-table-column prop="Phone" :label="$t('trials:researchRecord:table:contactorPhone')" min-width="100"
+          show-overflow-tooltip />
+        <!-- 联系邮箱 -->
+        <el-table-column prop="Email" :label="$t('trials:researchRecord:table:contactorEmail')" min-width="150"
+          show-overflow-tooltip />
+        <!-- 初审人 -->
+        <el-table-column prop="preliminaryUser" :label="$t('trials:researchRecord:table:preliminaryUser')"
+          min-width="150" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{
+              scope.row.PreliminaryUser
+                ? scope.row.PreliminaryUser.RealName
+                : ''
+            }}
+          </template>
+        </el-table-column>
+        <!-- 审核人 -->
+        <el-table-column prop="ReviewerUser" :label="$t('trials:researchRecord:table:ReviewerUser')" min-width="150"
+          show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.ReviewerUser ? scope.row.ReviewerUser.RealName : '' }}
+          </template>
+        </el-table-column>
+        <!-- 状态 -->
+        <el-table-column prop="State" :label="$t('trials:researchRecord:table:status')" min-width="150"
+          sortable="custom" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.State === 0" type="primary">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 1" type="info">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 2" type="warning">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 3" type="danger">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- 是否废除 -->
+        <el-table-column prop="IsDeleted" :label="$t('trials:researchRecord:table:isDeleted')" min-width="100"
+          sortable="custom" show-overflow-tooltip>
+          <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('trials:researchRecord:table:updateTime')" min-width="150"
+          show-overflow-tooltip sortable="custom" />
+        <el-table-column width="150">
+          <template slot-scope="scope">
+            <!-- 查看 -->
+            <el-button v-show="searchData.State === 3" :disabled="scope.row.State !== 3" circle
+              :title="$t('common:button:view')" icon="el-icon-view" @click="handleViewResearchList(scope.row)" />
+            <!-- 审批 -->
+            <el-button v-show="(searchData.State === 1 || searchData.State === 2) && isAudit"
+              v-hasPermi="['trials:trials-panel:attachments:site-research:auidt']"
+              :disabled="scope.row.State === 0 || scope.row.State === 3 || scope.row.IsDeleted" circle
+              :title="$t('trials:researchRecord:action:view')" icon="el-icon-s-check"
+              @click="handleViewResearchList(scope.row)" />
+            <!-- 日志 -->
+            <el-button circle :title="$t('trials:researchRecord:action:log')" icon="el-icon-tickets"
+              @click="viewLog(scope.row)" />
+            <!-- 废除 -->
+            <el-button v-show="searchData.State === 0" v-hasPermi="[
+              'trials:trials-panel:attachments:site-research:abolish',
+            ]" :disabled="scope.row.State !== 0 || scope.row.IsDeleted" circle
+              :title="$t('trials:researchRecord:action:abolish')" icon="el-icon-delete"
+              @click="handleRepealResearch(scope.row)" />
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页组件 -->
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
+        @pagination="getList" />
+    </template>
+
+    <!-- 中心数据 trials:researchRecord:button:researchData-->
+    <!-- 中心人员 trials:researchRecord:dialogTitle:questionStaff-->
+    <el-dialog v-if="researchUserVisible" :visible.sync="researchUserVisible"
+      :title="$t('trials:researchRecord:button:researchData')" custom-class="base-dialog-wrapper" :fullscreen="true">
+      <div class="base-modal-body" style="border: 1px solid #ccc; padding: 10px">
+        <el-tabs v-model="activeName">
+          <el-tab-pane :label="$t('trials:researchRecord:dialogTitle:questionStaff')" name="first">
+            <Users v-if="activeName === 'first'" />
+          </el-tab-pane>
+          <el-tab-pane label="中心设备" name="second">
+            <Equipments v-if="activeName === 'second'" />
+          </el-tab-pane>
+          <el-tab-pane label="基本情况" name="third">
+            <Questions v-if="activeName === 'third'" />
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+    </el-dialog>
+
+    <!-- 调查表 -->
+    <el-dialog v-if="researchInfoVisible" :visible.sync="researchInfoVisible" :fullscreen="true"
+      :close-on-click-modal="false">
+      <research-form v-if="researchInfoVisible" @refreshPage="getList" />
+    </el-dialog>
+    <!-- 调查表编辑 -->
+    <el-dialog v-if="ImageManualVisible" :visible.sync="ImageManualVisible" :fullscreen="true"
+      :close-on-click-modal="false" :title="$t('trials:researchRecord:dialogTitle:ImageManualEdit')">
+      <ImageManual v-if="ImageManualVisible" :trialSiteSurveyId="trialSiteSurveyId" @getList="getList" />
+    </el-dialog>
+    <!-- 调查表链接 -->
+    <base-model :config="share_model">
+      <template slot="dialog-body" v-loading="shareLoading">
+        <el-button size="small" type="primary" style="margin-bottom: 10px;" @click.stop="openImageManual">{{
+          $t('trials:researchRecord:label:edit')
+        }}</el-button>
+        <div style="width: 100%; display: flex">
+          <div class="date">
+            <el-form :model="shareForm" :rules="rules" ref="shareForm" label-width="100px">
+              <el-form-item :label="$t('trials:researchRecord:label:ExpirationDays')" prop="ExpirationDays">
+                <el-radio-group v-model="shareForm.ExpirationDays" @input="shareForm.OtherExpirationDays = null">
+                  <el-radio :label="1">{{ $t('trials:researchRecord:label:day1') }}</el-radio>
+                  <el-radio :label="7">{{ $t('trials:researchRecord:label:day7') }}</el-radio>
+                  <el-radio :label="15">{{ $t('trials:researchRecord:label:day15') }}</el-radio>
+                  <el-radio :label="`default`">{{ $t('trials:researchRecord:label:default') }}
+                    <el-input placeholder="" type="number" @input="handleInput" v-model="shareForm.OtherExpirationDays"
+                      clearable size="mini" style="width: 60px;" class="dayInput" />
+                    <span style="margin-left: 10px;">{{ $t('trials:researchRecord:label:day') }}</span>
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item :label="$t('trials:researchRecord:label:LinkVerificationCode')" prop="LinkVerificationCode">
+                <el-radio-group v-model="shareForm.LinkVerificationCode"
+                  @input="shareForm.OtherLinkVerificationCode = null">
+                  <el-radio label="researchProgramNo">{{ $t('trials:researchRecord:label:researchProgramNo')
+                  }}</el-radio>
+                  <el-radio label="default">{{ $t('trials:researchRecord:label:default') }}
+                    <el-input placeholder="" type="number" v-model="shareForm.OtherLinkVerificationCode" clearable
+                      size="mini" style="width: 100px;" />
+                  </el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-form>
+            <el-button type="primary" round @click="setLink" style="float: right;">
+              {{ $t('trials:researchRecord:button:setLink') }}
+            </el-button>
+          </div>
+          <div class="share">
+            <div class="shareLink">
+              <h3>{{ $t('trials:researchRecord:label:link') }}</h3>
+              <el-input ref="shareLink" v-model="shareLink" readonly type="textarea" autosize :rows="3" />
+              <div class="dateBox">
+                <span>{{ $t('trials:researchRecord:label:linkVerificationCode') }}</span>
+                <span>{{ LinkVerificationCode }}</span>
+              </div>
+              <div class="dateBox">
+                <span>{{ $t('trials:researchRecord:label:ValidityPeriod') }}</span>
+                <span>{{ validityPeriod }}</span>
+                <span style="color: red;" v-if="isExpired">({{ $t('trials:researchRecord:label:Expired') }})</span>
+              </div>
+              <el-button type="primary" round @click="copyLink" class="shareLinkBtn"
+                :disabled="!validityPeriod || isExpired">
+                {{ $t('trials:researchRecord:button:copyLink') }}
+              </el-button>
+            </div>
+            <div class="shareCode">
+              <h3>{{ $t('trials:researchRecord:label:shareCode') }}</h3>
+              <div style="display: flex;align-items: center;justify-content: space-between;">
+                <div class="qrCodeBox">
+                  <div id="qrcode" ref="qrcode"></div>
+                </div>
+                <div class="codeBtnBox">
+                  <el-button @click="handleCopyImg" type="primary" round :disabled="!validityPeriod || isExpired">{{
+                    $t('trials:researchRecord:button:copyCode')
+                  }}</el-button>
+                  <el-button @click="savePic" round :disabled="!validityPeriod || isExpired">{{
+                    $t('trials:researchRecord:button:savePic')
+                  }}</el-button>
+                </div>
+              </div>
+
+            </div>
+          </div>
+        </div>
+
+      </template>
+    </base-model>
+    <el-dialog v-if="logVisible" :visible.sync="logVisible"
+      :custom-class="isFullscreen ? 'full-log-dialog-container' : 'log-dialog-container'" :close-on-click-modal="false"
+      :fullscreen="isFullscreen" :show-close="false" width="60%" append-to-body>
+      <span slot="title" class="dialog-footer">
+        <div style="display: flex;flex-direction: row;justify-content: space-between;">
+          <div>
+            {{ $t('trials:researchForm:button:log') }}
+          </div>
+          <div>
+            <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+              style="vertical-align: baseline;cursor: pointer;font-size: 20px;" @click="toggleLogFullscreen" />
+            <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+              @click="logVisible = false" />
+          </div>
+        </div>
+      </span>
+      <div class="log-dialog-content">
+        <LogList :trial-site-survey-id="trialSiteSurveyId" />
+      </div>
+    </el-dialog>
+  </BaseContainer>
+</template>
+<script>
+import {
+  getTrialSiteSurveyList,
+  getTrialSiteSelect,
+  abandonSiteSurvey,
+  setTrialLinkExpirationTime,
+  getTrialLinkExpirationTime,
+  getLinkLinkExpirationTime,
+} from '@/api/trials'
+import { changeURLStatic } from '@/utils/history.js'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+import Users from './users'
+import Equipments from './Equipments'
+import Questions from './Questions'
+import ResearchForm from '@/views/research/form'
+import BaseModel from '@/components/BaseModel'
+import ImageManual from './ImageManual'
+import QRCode from 'qrcodejs2'
+import LogList from '@/views/research/components/LogList'
+import { getTrialSiteSurveyList_Export } from '@/api/export'
+const searchDataDefault = () => {
+  return {
+    SortField: '',
+    Asc: true,
+    PageIndex: 1,
+    PageSize: 20,
+    TrialSiteId: '',
+    UserKeyInfo: '',
+    State: null,
+    IsDeleted: '',
+    DateRange: [],
+    PreliminaryUserName: null,
+    ReviewerUserName: null,
+  }
+}
+export default {
+  name: 'ResearchList',
+  components: { BaseContainer, Pagination, Users, Equipments, Questions, ResearchForm, BaseModel, ImageManual, LogList },
+  props: {
+    isAudit: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      loading: false,
+      list: [],
+      total: 0,
+      trialId: this.$route.query.trialId,
+      siteOptions: [],
+      researchUserVisible: false,
+      researchInfoVisible: false,
+      share_model: {
+        visible: false,
+        title: this.$t('trials:researchRecord:title:shark'),
+        width: '1000px',
+      },
+      shareLink: '',
+      researchState: this.$d.ResearchRecord,
+      qrcode: null,
+      validityPeriod: null,
+      LinkVerificationCode: null,
+      isExpired: false,
+      shareLoading: false,
+      shareForm: {
+        ExpirationDays: null,
+        OtherExpirationDays: null,
+        LinkVerificationCode: null,
+        OtherLinkVerificationCode: null,
+      },
+      rules: {
+        ExpirationDays: [
+          { required: true, message: this.$t("common:ruleMessage:select"), trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (value === 'default' && !this.shareForm.OtherExpirationDays) {
+                callback(new Error(this.$t("common:ruleMessage:specify")));
+              } else {
+                callback()
+              }
+
+            }, trigger: 'blur'
+          }
+        ],
+        LinkVerificationCode: [
+          { required: true, message: this.$t("common:ruleMessage:select"), trigger: 'blur' },
+          {
+            validator: (rule, value, callback) => {
+              if (value === 'default' && !this.shareForm.OtherLinkVerificationCode) {
+                callback(new Error(this.$t("common:ruleMessage:specify")));
+              } else {
+                callback()
+              }
+
+            }, trigger: 'blur'
+          }
+        ],
+      },
+      ImageManualVisible: false,
+      trialSiteSurveyId: null,
+      activeName: 'first',
+      isFullscreen: false,
+      logVisible: false
+    }
+  },
+  mounted() {
+    // this.getList()
+    this.getSite()
+  },
+  methods: {
+    async handleExport() {
+      await getTrialSiteSurveyList_Export(this.searchData)
+    },
+    toggleLogFullscreen() {
+      this.isFullscreen = !this.isFullscreen
+    },
+    viewLog(row) {
+      this.trialSiteSurveyId = row.Id
+      this.isFullscreen = false
+      this.logVisible = true
+    },
+    async getLinkTimeIsExpired() {
+      try {
+        let data = {
+          TrialId: this.$route.query.trialId,
+        }
+        this.shareLoading = true
+        let res = await getLinkLinkExpirationTime(data)
+        this.shareLoading = false
+        if (res.IsSuccess) {
+          this.isExpired = res.Result.IsIsExpired
+        }
+      } catch (err) {
+        this.shareLoading = false
+        console.log(err)
+      }
+    },
+    async getLinkTime() {
+      try {
+        let data = {
+          TrialId: this.$route.query.trialId,
+        }
+        this.shareLoading = true
+        let res = await getTrialLinkExpirationTime(data)
+        this.shareLoading = false
+        if (res.IsSuccess) {
+          this.validityPeriod = res.Result.LinkExpirationTime
+          this.LinkVerificationCode = res.Result.LinkVerificationCode || res.Result.ResearchProgramNo
+          if (!this.validityPeriod) {
+            this.LinkVerificationCode = null
+          }
+          if (!this.validityPeriod) return false
+          this.getLinkTimeIsExpired()
+          this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${this.$route.query.trialId}`
+          this.$nextTick(() => {
+            this.creatQrCode()
+          })
+        }
+      } catch (err) {
+        this.shareLoading = false
+        console.log(err)
+      }
+    },
+    async setLink() {
+      try {
+        let validate = await this.$refs.shareForm.validate()
+        if (!validate) return false
+        let data = {
+          TrialId: this.$route.query.trialId,
+          ExpirationDays: this.shareForm.ExpirationDays,
+          LinkVerificationCode: this.shareForm.LinkVerificationCode
+        }
+        if (this.shareForm.LinkVerificationCode === 'researchProgramNo') {
+          data.LinkVerificationCode = null
+        }
+        if (this.shareForm.LinkVerificationCode === 'default') {
+          data.LinkVerificationCode = this.shareForm.OtherLinkVerificationCode
+        }
+        if (this.shareForm.ExpirationDays === 'default') {
+          data.ExpirationDays = this.shareForm.OtherExpirationDays
+        }
+        this.shareLoading = true
+        let res = await setTrialLinkExpirationTime(data)
+        this.shareLoading = false
+        if (res.IsSuccess) {
+          this.getLinkTime()
+        }
+      } catch (err) {
+        this.shareLoading = false
+        console.log(err)
+      }
+    },
+    handleInput(val) {
+      // 过滤掉非数字字符，并取整为正整数
+      this.shareForm.OtherExpirationDays = val.replace(/[^\d]/g, '').replace(/^0+/, '')
+    },
+    openImageManual() {
+      // if (!this.trialSiteSurveyId) return false
+      this.ImageManualVisible = true
+    },
+    // 获取系统文件数据
+    getList() {
+      this.loading = true
+      this.searchData.TrialId = this.trialId
+      if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
+        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
+        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
+      } else {
+        this.searchData.UpdateTimeBegin = ''
+        this.searchData.updateTimeEnd = ''
+      }
+      getTrialSiteSurveyList(this.searchData)
+        .then((res) => {
+          this.loading = false
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    // 查看调查表记录详情
+    handleViewResearchList(row) {
+      changeURLStatic('trialSiteSurveyId', row.Id)
+      this.researchInfoVisible = true
+    },
+    // 废除待提交的调查表
+    handleRepealResearch(row) {
+      // 是否确认废除？
+      this.$confirm(this.$t('trials:researchRecord:message:abolish'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        abandonSiteSurvey(this.trialId, row.Id).then((res) => {
+          if (res.IsSuccess) {
+            this.getList()
+            // 废除成功
+            this.$message.success(
+              this.$t('trials:researchRecord:message:abolishSuccessfully')
+            )
+          }
+        })
+      })
+    },
+    // 展示当前项目下所有调查表需生成账户的用户信息
+    showResearchUser() {
+      this.researchUserVisible = true
+      this.activeName = 'first'
+    },
+    // 复制链接
+    copyLink() {
+      // 中心调研表链接
+      this.$copyText(
+        `${this.$t('trials:researchRecord:message:researchFormLink')}: ${this.shareLink
+        }\n${this.$t('trials:researchRecord:label:linkVerificationCode')}${this.LinkVerificationCode}\n${this.$t('trials:researchRecord:label:ValidityPeriod')}${this.validityPeriod}`
+      )
+        .then((res) => {
+          // 复制成功
+          this.$message.success(
+            this.$t('trials:researchRecord:message:copySuccessfully')
+          )
+        })
+        .catch(() => {
+          // 复制失败
+          this.$alert(this.$t('trials:researchRecord:message:copyFailed'))
+        })
+    },
+    // 创建二维码
+    creatQrCode() {
+      this.$refs.qrcode.innerHTML = '' //清除二维码方法一
+      let text = this.shareLink
+      this.qrcode = new QRCode(this.$refs.qrcode, {
+        text: text, //页面地址 ,如果页面需要参数传递请注意哈希模式#
+        width: 200,
+        height: 200,
+        colorDark: '#000000',
+        colorLight: '#ffffff',
+        correctLevel: QRCode.CorrectLevel.H,
+      })
+      // qrcode.clear(); // 清除二维码方法二
+    },
+    // 下载二维码
+    savePic() {
+      let qrCodeCanvas = document
+        .getElementById('qrcode')
+        .getElementsByTagName('canvas')
+      let a = document.createElement('a')
+      a.href = qrCodeCanvas[0].toDataURL('image/url')
+      a.download = `${this.$route.query.researchProgramNo}${this.$t('trials:researchRecord:title:code')}.png`
+      a.click()
+    },
+    // 复制二维码
+    handleCopyImg() {
+      let qrCodeCanvas = document
+        .getElementById('qrcode')
+        .getElementsByTagName('canvas')
+      qrCodeCanvas[0].toBlob(async (blob) => {
+        console.log(blob)
+        const data = [
+          new ClipboardItem({
+            [blob.type]: blob,
+          }),
+        ] // https://w3c.github.io/clipboard-apis/#dom-clipboard-write
+        await navigator.clipboard.write(data).then(
+          () => {
+            this.$message.success(
+              this.$t('trials:researchRecord:message:copySuccess')
+            )
+          },
+          () => {
+            this.$message.error(
+              this.$t('trials:researchRecord:message:UnableWrite')
+            )
+          }
+        )
+      })
+    },
+    // 获取site下拉框数据
+    getSite() {
+      getTrialSiteSelect(this.trialId).then((res) => {
+        this.siteOptions = res.Result
+      })
+    },
+    // 展示调查表链接
+    showResearchLink() {
+      this.shareForm = {
+        ExpirationDays: null,
+        OtherExpirationDays: null,
+        LinkVerificationCode: null,
+        OtherLinkVerificationCode: null,
+      }
+      this.validityPeriod = null
+      this.isExpired = false
+      this.share_model.visible = true
+      this.getLinkTime()
+      // &lang=${this.$i18n.locale}
+      // this.trialSiteSurveyId = this.list[0].Id
+    },
+    // 重置
+    handleReset() {
+      const state = this.searchData.State
+      this.searchData = searchDataDefault()
+      this.searchData.DateRange = []
+      if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
+        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
+        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
+      } else {
+        this.searchData.UpdateTimeBegin = ''
+        this.searchData.updateTimeEnd = ''
+      }
+      this.searchData.State = state
+      this.getList()
+      this.$nextTick(() => {
+        this.$refs.siteResearchList.clearSort()
+      })
+    },
+    // 查询
+    handleSearch() {
+      this.getList()
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.getList()
+    },
+  },
+  beforeDestroy() {
+    if (this.qrcode) {
+      this.qrcode = null
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+.date,
+.share {
+  width: 55%;
+  height: 100%;
+}
+
+.dayInput {
+  ::v-deep .el-input__inner {
+    padding-left: 5px;
+  }
+}
+
+
+.date {
+  padding-right: 10px;
+}
+
+.share {
+  width: 45%;
+  padding-left: 5%;
+  border-left: 1px solid #f0f0f0;
+  box-sizing: border-box;
+}
+
+.shareLinkBtn {
+  float: right;
+}
+
+.qrCodeBox {
+  width: 220px;
+  height: 220px;
+  display: flex;
+  border: 1px solid #c0c4cc;
+  border-radius: 5px;
+  box-shadow: 1px 1px 5px #c0c4cc;
+  align-items: center;
+  justify-content: center;
+}
+
+.dateBox {
+  margin: 10px;
+}
+
+.codeBtnBox {
+
+  ::v-deep .el-button {
+    display: block;
+    margin: 10px auto;
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/users.vue b/src/views/trials/trials-panel/attachments/site-research/components/users.vue
index c992470c..0b837a38 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/users.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/users.vue
@@ -6,31 +6,33 @@
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:researchStaff:table:siteId')">
           <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
-            <el-option
-              v-for="(item,index) of siteOptions"
-              :key="index"
-              :label="item.TrialSiteCode"
-              :value="item.TrialSiteId"
-            />
+            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
+              :value="item.TrialSiteId" />
           </el-select>
         </el-form-item>
+        <!-- 状态 -->
+        <el-form-item :label="$t('trials:researchRecord:table:status')">
+          <el-select v-model="searchData.State" clearable filterable style="width: 120px">
+            <el-option v-for="(item, index) of $d.ResearchRecord" :key="index" :label="item.label"
+              :value="item.value" />
+          </el-select>
+        </el-form-item>
+        <!-- 是否废除 -->
+        <!-- <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
+          <el-select v-model="searchData.IsDeleted" clearable filterable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`"
+              :label="item.label" :value="item.value" />
+          </el-select>
+        </el-form-item> -->
         <!-- 姓名 -->
         <el-form-item :label="$t('trials:researchStaff:table:Name')">
           <el-input v-model="searchData.UserName" class="mr" clearable style="width:120px;" />
         </el-form-item>
         <!-- 角色 -->
         <el-form-item :label="$t('trials:researchStaff:table:role')">
-          <el-select
-            v-model="searchData.TrialRoleCode"
-            style="width:120px;"
-            clearable
-          >
-            <el-option
-              v-for="item of dict.type.SiteSurvey_UserRoles"
-              :key="item.value"
-              :label="item.label"
-              :value="parseInt(item.raw.Code)"
-            />
+          <el-select v-model="searchData.TrialRoleCode" style="width:120px;" clearable>
+            <el-option v-for="item of dict.type.SiteSurvey_UserRoles" :key="item.value" :label="item.label"
+              :value="parseInt(item.raw.Code)" />
           </el-select>
         </el-form-item>
         <!-- 单位 -->
@@ -39,42 +41,19 @@
         </el-form-item>
         <!-- 是否生成账号 -->
         <el-form-item :label="$t('trials:researchStaff:table:isGenerateAccount')">
-          <el-select
-            v-model="searchData.IsGenerateAccount"
-            style="width:120px;"
-            clearable
-          >
-            <el-option v-for="item of $d.YesOrNo" :key="`IsGenerateAccount${item.value}`" :label="item.label" :value="item.value" />
+          <el-select v-model="searchData.IsGenerateAccount" style="width:120px;" clearable>
+            <el-option v-for="item of $d.YesOrNo" :key="`IsGenerateAccount${item.value}`" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
         <!-- 用户类型 -->
         <el-form-item :label="$t('trials:researchStaff:table:userType')">
-          <el-select
-            v-model="searchData.UserTypeId"
-            style="width:120px;"
-            clearable
-          >
-            <el-option
-              v-for="item of userTypeOptions"
-              :key="item.Id"
-              :label="item.UserTypeShortName"
-              :value="item.Id"
-            >
+          <el-select v-model="searchData.UserTypeId" style="width:120px;" clearable>
+            <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName" :value="item.Id">
               <span>{{ item.UserType }}</span>
             </el-option>
           </el-select>
         </el-form-item>
-        <!-- 状态 -->
-        <!-- <el-form-item :label="$t('trials:researchStaff:table:status')">
-          <el-select v-model="searchData.State" clearable filterable style="width:120px;">
-            <el-option
-              v-for="(item,index) of researchUserState"
-              :key="index"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -89,25 +68,15 @@
         </el-form-item>
         <!-- 发邮件 -->
         <el-form-item>
-          <el-button
-            v-hasPermi="['trials:trials-panel:attachments:site-research:summary-record:sendEmail']"
-            type="primary"
-            icon="el-icon-message"
-            :loading="sendEmailLoading"
-            :disabled="selectArr.length === 0"
-            @click="handleSendEmail"
-          >
+          <el-button v-hasPermi="['trials:trials-panel:attachments:site-research:summary-record:sendEmail']"
+            type="primary" icon="el-icon-message" :loading="sendEmailLoading" :disabled="selectArr.length === 0"
+            @click="handleSendEmail">
             {{ $t('trials:researchRecord:dialogButton:sendEmail') }}
           </el-button>
         </el-form-item>
         <!-- 导出 -->
         <el-form-item>
-          <el-button
-            type="primary"
-            icon="el-icon-download"
-            :disabled="list.length === 0"
-            @click="handleExport"
-          >
+          <el-button type="primary" icon="el-icon-download" :disabled="list.length === 0" @click="handleExport">
             {{ $t('common:button:export') }}
           </el-button>
         </el-form-item>
@@ -116,96 +85,74 @@
 
     <template slot="main-container">
       <!-- 系统文件列表 -->
-      <el-table
-        ref="researchUsers"
-        v-loading="loading"
-        v-adaptive="{bottomOffset:70}"
-        :data="list"
-        stripe
-        height="100"
-        @selection-change="handleSelectChange"
-        @sort-change="handleSortByColumn"
-      >
-        <el-table-column
-          type="selection"
-          width="50"
-          :selectable="handleSelectTable"
-        />
+      <el-table ref="researchUsers" v-loading="loading" v-adaptive="{ bottomOffset: 55 }" :data="list" stripe
+        height="100" @selection-change="handleSelectChange" @sort-change="handleSortByColumn">
+        <el-table-column type="selection" width="50" :selectable="handleSelectTable" />
         <el-table-column type="index" width="50" />
         <!-- 中心编号 -->
-        <el-table-column
-          prop="TrialSiteSurvey.TrialSiteCode"
-          :label="$t('trials:researchStaff:table:siteId')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        >
+        <el-table-column prop="TrialSiteSurvey.TrialSiteCode" :label="$t('trials:researchStaff:table:siteId')"
+          show-overflow-tooltip sortable="custom" min-width="100">
           <template slot-scope="scope">{{ `${scope.row.TrialSiteSurvey.TrialSiteCode}` }}</template>
         </el-table-column>
         <!-- 中心名称 -->
-        <el-table-column
-          prop="TrialSiteSurvey.SiteName"
-          :label="$t('trials:researchStaff:table:siteName')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="120"
-        >
+        <el-table-column prop="TrialSiteSurvey.SiteName" :label="$t('trials:researchStaff:table:siteName')"
+          show-overflow-tooltip sortable="custom" min-width="120">
           <template slot-scope="scope">{{ `${scope.row.TrialSiteSurvey.SiteName}` }}</template>
         </el-table-column>
+        <!-- 状态 -->
+        <el-table-column prop="State" :label="$t('trials:researchRecord:table:status')" min-width="150"
+          sortable="custom" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.State === 0" type="primary">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 1" type="info">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 2" type="warning">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+            <el-tag v-if="scope.row.State === 3" type="danger">{{
+              $fd('ResearchRecord', scope.row.State)
+            }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- 是否废除 -->
+        <!-- <el-table-column prop="IsDeleted" :label="$t('trials:researchRecord:table:isDeleted')" min-width="100"
+          sortable="custom" show-overflow-tooltip>
+          <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="LastName"
-          :label="$t('trials:researchStaff:table:Name')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        >
+        <el-table-column prop="LastName" :label="$t('trials:researchStaff:table:Name')" show-overflow-tooltip
+          sortable="custom" min-width="100">
           <template slot-scope="scope">{{ `${scope.row.LastName} / ${scope.row.FirstName}` }}</template>
         </el-table-column>
         <!-- 角色 -->
-        <el-table-column
-          prop="TrialRoleCode"
-          :label="$t('trials:researchStaff:table:role')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        >
+        <el-table-column prop="TrialRoleCode" :label="$t('trials:researchStaff:table:role')" show-overflow-tooltip
+          sortable="custom" min-width="100">
           <template slot-scope="scope">
-            {{ $fd('SiteSurvey_UserRoles',scope.row.TrialRoleCode) }}
+            {{ $fd('SiteSurvey_UserRoles', scope.row.TrialRoleCode) }}
           </template>
         </el-table-column>
         <!-- 电话号码 -->
-        <el-table-column
-          prop="Phone"
-          :label="$t('trials:researchStaff:table:phone')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="120"
-        />
+        <el-table-column prop="Phone" :label="$t('trials:researchStaff:table:phone')" show-overflow-tooltip
+          sortable="custom" min-width="120" />
         <!-- 邮箱 -->
-        <el-table-column
-          prop="Email"
-          :label="$t('trials:researchStaff:table:email')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="150"
-        />
+        <el-table-column prop="Email" :label="$t('trials:researchStaff:table:email')" show-overflow-tooltip
+          sortable="custom" min-width="150" />
         <!-- 单位 -->
-        <el-table-column
-          prop="OrganizationName"
-          :label="$t('trials:researchStaff:table:organization')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        />
+        <el-table-column prop="OrganizationName" :label="$t('trials:researchStaff:table:organization')"
+          show-overflow-tooltip sortable="custom" min-width="100" />
         <!-- 是否生成账号 -->
-        <el-table-column
-          prop="IsGenerateAccount"
-          :label="$t('trials:researchStaff:table:isGenerateAccount')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="130"
-        >
+        <el-table-column prop="IsGenerateAccount" :label="$t('trials:researchStaff:table:isGenerateAccount')"
+          show-overflow-tooltip sortable="custom" min-width="130">
           <template slot-scope="scope">
             {{ $fd('YesOrNo', scope.row.IsGenerateAccount) }}
           </template>
@@ -223,21 +170,11 @@
         <!--        </el-table-column>-->
 
         <!-- 用户类型 -->
-        <el-table-column
-          prop="UserType"
-          :label="$t('trials:researchStaff:table:userType')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        />
+        <el-table-column prop="UserType" :label="$t('trials:researchStaff:table:userType')" show-overflow-tooltip
+          sortable="custom" min-width="100" />
         <!-- 是否加入 -->
-        <el-table-column
-          prop="IsJoin"
-          :label="$t('trials:researchStaff:table:isJoin')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        >
+        <el-table-column prop="IsJoin" :label="$t('trials:researchStaff:table:isJoin')" show-overflow-tooltip
+          sortable="custom" min-width="100">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.IsJoin" type="info">{{ $fd('IsJoin', scope.row.IsJoin) }}</el-tag>
             <el-tag v-else type="danger">{{ $fd('IsJoin', scope.row.IsJoin) }}</el-tag>
@@ -246,7 +183,8 @@
       </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>
@@ -296,7 +234,6 @@ export default {
     }
   },
   mounted() {
-    console.log(this.dict.type.SiteSurvey_UserRoles)
     this.getList()
     this.getSite()
     this.getUserType()
diff --git a/src/views/trials/trials-panel/attachments/site-research/index.vue b/src/views/trials/trials-panel/attachments/site-research/index.vue
index 07b03083..7bf7c1b6 100644
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@@ -1,502 +1,208 @@
 <template>
   <BaseContainer>
-    <!-- 搜索框 -->
-    <template slot="search-container">
-      <el-form :inline="true">
-        <!-- 中心 -->
-        <el-form-item :label="$t('trials:researchRecord:table:siteId')">
-          <el-select v-model="searchData.TrialSiteId" clearable filterable style="width: 120px">
-            <el-option v-for="(item, index) of siteOptions" :key="index" :label="item.TrialSiteCode"
-              :value="item.TrialSiteId" />
-          </el-select>
-        </el-form-item>
-        <!-- 联系人 -->
-        <el-form-item :label="$t('trials:researchRecord:table:contactor')">
-          <el-input v-model="searchData.UserKeyInfo" class="mr" clearable :placeholder="`${$t(
-            'trials:researchRecord:placeholder:contactorInfo'
-          )}`" style="width: 140px" />
-        </el-form-item>
-        <!-- 初审人 -->
-        <el-form-item :label="$t('trials:researchRecord:table:preliminaryUser')">
-          <el-input v-model="searchData.PreliminaryUserName" class="mr" clearable style="width: 140px" />
-        </el-form-item>
-        <!-- 审核人 -->
-        <el-form-item :label="$t('trials:researchRecord:table:ReviewerUser')">
-          <el-input v-model="searchData.ReviewerUserName" class="mr" clearable style="width: 140px" />
-        </el-form-item>
-        <!-- 状态 -->
-        <el-form-item :label="$t('trials:researchRecord:table:status')">
-          <el-select v-model="searchData.State" clearable filterable style="width: 120px">
-            <el-option v-for="(item, index) of $d.ResearchRecord" :key="index" :label="item.label"
-              :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <!-- 是否废除 -->
-        <el-form-item :label="$t('trials:researchRecord:table:isDeleted')">
-          <el-select v-model="searchData.IsDeleted" clearable filterable style="width: 120px">
-            <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :key="`IsDeleted${item.value}`"
-              :label="item.label" :value="item.value" />
-          </el-select>
-        </el-form-item>
-        <!-- 更新时间 -->
-        <el-form-item :label="$t('trials:researchRecord:table:updateTime')">
-          <el-date-picker v-model="searchData.DateRange" type="daterange" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
-            style="width: 250px" />
-        </el-form-item>
-        <!-- 查询 -->
-        <el-button type="primary" icon="el-icon-search" @click="handleSearch">
-          {{ $t('common:button:search') }}
-        </el-button>
-        <!-- 重置 -->
-        <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
-          {{ $t('common:button:reset') }}
-        </el-button>
-        <!-- 中心人员 -->
-        <el-button v-hasPermi="[
-          'trials:trials-panel:attachments:site-research:summary-record',
-        ]" type="primary" icon="el-icon-info" @click="showResearchUser">
-          {{ $t('trials:researchRecord:button:questionStaffs') }}
-        </el-button>
-        <!-- 调查表链接 -->
-        <el-button v-hasPermi="[
-          'trials:trials-panel:attachments:site-research:questionnaire-link',
-        ]" type="primary" icon="el-icon-link" @click="showResearchLink">
-          {{ $t('trials:researchRecord:button:questionLink') }}
-        </el-button>
-      </el-form>
-    </template>
-
-    <template slot="main-container">
-      <!-- 系统文件列表 -->
-      <el-table ref="siteResearchList" v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe
-        height="100" @sort-change="handleSortByColumn">
-        <el-table-column type="index" width="50" />
-        <!-- 中心编号 -->
-        <el-table-column prop="TrialSiteCode" :label="$t('trials:researchRecord:table:siteId')" min-width="100"
-          sortable="custom" show-overflow-tooltip />
-        <!-- 中心名称 -->
-        <el-table-column prop="SiteName" :label="$t('trials:researchRecord:table:siteName')" min-width="100"
-          sortable="custom" show-overflow-tooltip />
-        <!-- 联系人 -->
-        <el-table-column prop="UserName" :label="$t('trials:researchRecord:table:contactor')" min-width="100"
-          sortable="custom" show-overflow-tooltip />
-        <!-- 联系电话 -->
-        <el-table-column prop="Phone" :label="$t('trials:researchRecord:table:contactorPhone')" min-width="100"
-          show-overflow-tooltip />
-        <!-- 联系邮箱 -->
-        <el-table-column prop="Email" :label="$t('trials:researchRecord:table:contactorEmail')" min-width="150"
-          show-overflow-tooltip />
-        <!-- 初审人 -->
-        <el-table-column prop="preliminaryUser" :label="$t('trials:researchRecord:table:preliminaryUser')"
-          min-width="150" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{
-              scope.row.PreliminaryUser
-                ? scope.row.PreliminaryUser.RealName
-                : ''
-            }}
-          </template>
-        </el-table-column>
-        <!-- 审核人 -->
-        <el-table-column prop="ReviewerUser" :label="$t('trials:researchRecord:table:ReviewerUser')" min-width="150"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.ReviewerUser ? scope.row.ReviewerUser.RealName : '' }}
-          </template>
-        </el-table-column>
-        <!-- 状态 -->
-        <el-table-column prop="State" :label="$t('trials:researchRecord:table:status')" min-width="150"
-          sortable="custom" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.State === 0" type="primary">{{
-              $fd('ResearchRecord', scope.row.State)
-            }}</el-tag>
-            <el-tag v-if="scope.row.State === 1" type="info">{{
-              $fd('ResearchRecord', scope.row.State)
-            }}</el-tag>
-            <el-tag v-if="scope.row.State === 2" type="warning">{{
-              $fd('ResearchRecord', scope.row.State)
-            }}</el-tag>
-            <el-tag v-if="scope.row.State === 3" type="danger">{{
-              $fd('ResearchRecord', scope.row.State)
-            }}</el-tag>
-          </template>
-        </el-table-column>
-        <!-- 是否废除 -->
-        <el-table-column prop="IsDeleted" :label="$t('trials:researchRecord:table:isDeleted')" min-width="100"
-          sortable="custom" show-overflow-tooltip>
-          <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('trials:researchRecord:table:updateTime')" min-width="150"
-          show-overflow-tooltip sortable="custom" />
-        <el-table-column width="150">
-          <template slot-scope="scope">
-            <!-- 查看 -->
-            <el-button :disabled="scope.row.State !== 3" circle :title="$t('common:button:view')" icon="el-icon-view"
-              @click="handleViewResearchList(scope.row)" />
-            <!-- 审批 -->
-            <el-button v-hasPermi="[
-              'trials:trials-panel:attachments:site-research:auidt',
-            ]" :disabled="scope.row.State === 0 || scope.row.State === 3 || scope.row.IsDeleted" circle
-              :title="$t('trials:researchRecord:action:view')" icon="el-icon-s-check"
-              @click="handleViewResearchList(scope.row)" />
-            <!-- 废除 -->
-            <el-button v-hasPermi="[
-              'trials:trials-panel:attachments:site-research:abolish',
-            ]" :disabled="scope.row.State !== 0 || scope.row.IsDeleted" circle
-              :title="$t('trials:researchRecord:action:abolish')" icon="el-icon-delete"
-              @click="handleRepealResearch(scope.row)" />
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <!-- 分页组件 -->
-      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-        @pagination="getList" />
-    </template>
-
-    <!-- 中心人员 -->
-    <el-dialog v-if="researchUserVisible" :visible.sync="researchUserVisible"
-      :title="$t('trials:researchRecord:dialogTitle:questionStaff')" custom-class="base-dialog-wrapper"
-      :fullscreen="true">
-      <div class="base-modal-body" style="border: 1px solid #ccc; padding: 10px">
-        <Users v-if="researchUserVisible" />
+    <div class="step-wrapper">
+      <el-steps :active="activeStatus" align-center :space="300">
+        <!-- 中心填写 -->
+        <el-step :title="$t('trials:siteResearch:timeline:step1')" class="click_cursor"
+          @click.native="handleClick(0)" />
+        <!-- SPM审核 -->
+        <el-step v-if="isSPMJoin" :title="$t('trials:siteResearch:timeline:step2')" class="click_cursor"
+          @click.native="handleClick(1)" />
+        <!-- PM审核 -->
+        <el-step :title="$t('trials:siteResearch:timeline:step3')" class="click_cursor"
+          @click.native="handleClick(2)" />
+        <!-- 审核完毕 -->
+        <el-step :title="$t('trials:siteResearch:timeline:step14')" class="click_cursor"
+          @click.native="handleClick(3)" />
+      </el-steps>
+      <div class="step-content">
+        <ResearchList ref="researchList" :isAudit="isAudit" />
       </div>
-    </el-dialog>
-
-    <!-- 调查表 -->
-    <el-dialog v-if="researchInfoVisible" :visible.sync="researchInfoVisible" :fullscreen="true"
-      :close-on-click-modal="false">
-      <research-form v-if="researchInfoVisible" @refreshPage="getList" />
-    </el-dialog>
-    <!-- 调查表编辑 -->
-    <el-dialog v-if="ImageManualVisible" :visible.sync="ImageManualVisible" :fullscreen="true"
-      :close-on-click-modal="false" :title="$t('trials:researchRecord:dialogTitle:ImageManualEdit')">
-      <ImageManual v-if="ImageManualVisible" :trialSiteSurveyId="trialSiteSurveyId" @getList="getList" />
-    </el-dialog>
-    <!-- 调查表链接 -->
-    <base-model :config="share_model">
-      <template slot="dialog-body">
-        <el-button size="small" type="primary" style="margin-bottom: 10px;" @click.stop="openImageManual">{{
-          $t('trials:researchRecord:label:edit')
-        }}</el-button>
-        <div style="width: 100%; display: flex">
-          <div class="shareLink">
-            <!-- <div>
-              <i style="color: #428bca" class="el-icon-success" />
-              <span>{{
-                $t('trials:researchRecord:message:createLinkSuccessfully')
-              }}</span>
-            </div> -->
-            <div style="margin: 10px 0">
-              <!-- 链接： -->
-              {{ $t('trials:researchRecord:label:link') }}
-              <el-input ref="shareLink" v-model="shareLink" readonly type="textarea" autosize />
-            </div>
-            <div>
-              <!-- 复制链接 -->
-              <el-button type="primary" round @click="copyLink" class="shareLinkBtn">
-                {{ $t('trials:researchRecord:button:copyLink') }}
-              </el-button>
-            </div>
-          </div>
-          <div class="shareCode">
-            <div class="qrCode">
-              <div id="qrcode" ref="qrcode"></div>
-            </div>
-            <div class="codeBtnBox">
-              <el-button @click="handleCopyImg" type="primary" round>{{
-                $t('trials:researchRecord:button:copyCode')
-              }}</el-button>
-              <el-button @click="savePic" round>{{
-                $t('trials:researchRecord:button:savePic')
-              }}</el-button>
-            </div>
-          </div>
-        </div>
-      </template>
-    </base-model>
+    </div>
   </BaseContainer>
 </template>
 <script>
-import {
-  getTrialSiteSurveyList,
-  getTrialSiteSelect,
-  abandonSiteSurvey,
-} from '@/api/trials'
-import { changeURLStatic } from '@/utils/history.js'
+import { getTrialIsSPMJoin } from '@/api/research'
 import BaseContainer from '@/components/BaseContainer'
-import Pagination from '@/components/Pagination'
-import Users from './components/users'
-import ResearchForm from '@/views/research/form'
-import BaseModel from '@/components/BaseModel'
-import ImageManual from './components/ImageManual'
-import QRCode from 'qrcodejs2'
-
-const searchDataDefault = () => {
-  return {
-    SortField: '',
-    Asc: true,
-    PageIndex: 1,
-    PageSize: 20,
-    TrialSiteId: '',
-    UserKeyInfo: '',
-    State: null,
-    IsDeleted: '',
-    DateRange: [],
-    PreliminaryUserName: null,
-    ReviewerUserName: null,
-  }
-}
+import ResearchList from './components/ResearchList'
 export default {
-  name: 'SiteResearchList',
-  components: { BaseContainer, Pagination, Users, ResearchForm, BaseModel, ImageManual },
+  name: 'SiteResearch',
+  components: {
+    BaseContainer,
+    ResearchList
+  },
   data() {
     return {
-      searchData: searchDataDefault(),
-      loading: false,
-      list: [],
-      total: 0,
-      trialId: this.$route.query.trialId,
-      siteOptions: [],
-      researchUserVisible: false,
-      researchInfoVisible: false,
-      share_model: {
-        visible: false,
-        title: this.$t('trials:researchRecord:title:shark'),
-        width: '800px',
-      },
-      shareLink: '',
-      researchState: this.$d.ResearchRecord,
-      qrcode: null,
+      isSPMJoin: true,
+      activeStatus: 0
+    }
+  },
+  watch: {
+    activeStatus: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        this.$nextTick(() => {
+          if (!this.isSPMJoin && v > 0) {
+            this.$refs['researchList'].searchData.State = v + 1
+          } else {
+            this.$refs['researchList'].searchData.State = v
+          }
 
-      ImageManualVisible: false,
-      trialSiteSurveyId: null
+          this.$refs['researchList'].getList()
+        })
+
+      }
+    }
+  },
+  computed: {
+    isAudit() {
+      if (this.isSPMJoin) {
+        return (this.hasPermi(['role:spm', 'role:cpm', 'role:apm']) && this.activeStatus === 1) || (this.hasPermi(['role:pm']) && this.activeStatus === 2)
+      } else {
+        return this.hasPermi(['role:pm']) && this.activeStatus === 1
+      }
     }
   },
   mounted() {
-    this.getList()
-    this.getSite()
+    this.getTrialIsSPMJoin()
   },
   methods: {
-    openImageManual() {
-      // if (!this.trialSiteSurveyId) return false
-      this.ImageManualVisible = true
-    },
-    // 获取系统文件数据
-    getList() {
-      this.loading = true
-      this.searchData.TrialId = this.trialId
-      if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
-        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
-        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
-      } else {
-        this.searchData.UpdateTimeBegin = ''
-        this.searchData.updateTimeEnd = ''
+    async getTrialIsSPMJoin() {
+      try {
+        let trialId = this.$route.query.trialId
+        if (!trialId) return
+        let res = await getTrialIsSPMJoin(trialId)
+        this.isSPMJoin = res.Result
+        if (this.isSPMJoin) {
+          if (this.hasPermi(['role:pm'])) this.activeStatus = 2
+          if (this.hasPermi(['role:spm', 'role:cpm', 'role:apm'])) this.activeStatus = 1
+        } else {
+          if (this.hasPermi(['role:pm'])) this.activeStatus = 1
+          if (this.hasPermi(['role:spm', 'role:cpm', 'role:apm'])) this.activeStatus = 0
+        }
+      } catch (e) {
+        console.log(e)
       }
-      getTrialSiteSurveyList(this.searchData)
-        .then((res) => {
-          this.loading = false
-          this.list = res.Result.CurrentPageData
-          this.total = res.Result.TotalCount
-        })
-        .catch(() => {
-          this.loading = false
-        })
+
     },
-    // 查看调查表记录详情
-    handleViewResearchList(row) {
-      changeURLStatic('trialSiteSurveyId', row.Id)
-      this.researchInfoVisible = true
+    handleClick(step) {
+      this.activeStatus = step
+      if (!this.isSPMJoin && step > 0) this.activeStatus = step - 1
     },
-    // 废除待提交的调查表
-    handleRepealResearch(row) {
-      // 是否确认废除？
-      this.$confirm(this.$t('trials:researchRecord:message:abolish'), {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-      }).then(() => {
-        abandonSiteSurvey(this.trialId, row.Id).then((res) => {
-          if (res.IsSuccess) {
-            this.getList()
-            // 废除成功
-            this.$message.success(
-              this.$t('trials:researchRecord:message:abolishSuccessfully')
-            )
-          }
-        })
-      })
-    },
-    // 展示当前项目下所有调查表需生成账户的用户信息
-    showResearchUser() {
-      this.researchUserVisible = true
-    },
-    // 复制链接
-    copyLink() {
-      // 中心调研表链接
-      this.$copyText(
-        `${this.$t('trials:researchRecord:message:researchFormLink')}: ${this.shareLink
-        }`
-      )
-        .then((res) => {
-          // 复制成功
-          this.$message.success(
-            this.$t('trials:researchRecord:message:copySuccessfully')
-          )
-        })
-        .catch(() => {
-          // 复制失败
-          this.$alert(this.$t('trials:researchRecord:message:copyFailed'))
-        })
-    },
-    // 创建二维码
-    creatQrCode() {
-      this.$refs.qrcode.innerHTML = '' //清除二维码方法一
-      let text = this.shareLink
-      this.qrcode = new QRCode(this.$refs.qrcode, {
-        text: text, //页面地址 ,如果页面需要参数传递请注意哈希模式#
-        width: 200,
-        height: 200,
-        colorDark: '#000000',
-        colorLight: '#ffffff',
-        correctLevel: QRCode.CorrectLevel.H,
-      })
-      // qrcode.clear(); // 清除二维码方法二
-    },
-    // 下载二维码
-    savePic() {
-      let qrCodeCanvas = document
-        .getElementById('qrcode')
-        .getElementsByTagName('canvas')
-      let a = document.createElement('a')
-      a.href = qrCodeCanvas[0].toDataURL('image/url')
-      a.download = `${this.$route.query.researchProgramNo}${this.$t('trials:researchRecord:title:code')}.png`
-      a.click()
-    },
-    // 复制二维码
-    handleCopyImg() {
-      let qrCodeCanvas = document
-        .getElementById('qrcode')
-        .getElementsByTagName('canvas')
-      qrCodeCanvas[0].toBlob(async (blob) => {
-        console.log(blob)
-        const data = [
-          new ClipboardItem({
-            [blob.type]: blob,
-          }),
-        ] // https://w3c.github.io/clipboard-apis/#dom-clipboard-write
-        await navigator.clipboard.write(data).then(
-          () => {
-            this.$message.success(
-              this.$t('trials:researchRecord:message:copySuccess')
-            )
-          },
-          () => {
-            this.$message.error(
-              this.$t('trials:researchRecord:message:UnableWrite')
-            )
-          }
-        )
-      })
-    },
-    // 获取site下拉框数据
-    getSite() {
-      getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result
-      })
-    },
-    // 展示调查表链接
-    showResearchLink() {
-      const trialId = this.trialId
-      this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}`
-      this.share_model.visible = true
-      // this.trialSiteSurveyId = this.list[0].Id
-      this.$nextTick(() => {
-        this.creatQrCode()
-      })
-    },
-    // 重置
-    handleReset() {
-      this.searchData = searchDataDefault()
-      this.searchData.DateRange = []
-      if (this.searchData.DateRange && this.searchData.DateRange.length === 2) {
-        this.searchData.UpdateTimeBegin = this.searchData.DateRange[0]
-        this.searchData.updateTimeEnd = this.searchData.DateRange[1]
-      } else {
-        this.searchData.UpdateTimeBegin = ''
-        this.searchData.updateTimeEnd = ''
-      }
-      this.getList()
-      this.$nextTick(() => {
-        this.$refs.siteResearchList.clearSort()
-      })
-    },
-    // 查询
-    handleSearch() {
-      this.getList()
-    },
-    // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.getList()
-    },
-  },
-  beforeDestroy() {
-    if (this.qrcode) {
-      this.qrcode = null
-    }
-  },
+
+  }
 }
 </script>
 <style lang="scss" scoped>
-.shareLink {
-  padding-right: 20px;
-  width: 50%;
-  position: relative;
+.step-wrapper {
+  height: 100%;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  padding: 0;
+  margin: 0;
+  background-color: #fff;
+}
 
-  .shareLinkBtn {
-    position: absolute;
-    bottom: 0px;
-    left: 0px;
+.el-steps {
+  height: 80px;
+  justify-content: center;
+}
+
+.step-content {
+  flex: 1;
+}
+
+.title {
+  height: 40px;
+  line-height: 40px;
+  padding-left: 5px;
+  background: #e4ebf1;
+  border-left: 3px solid #0fc8e0;
+  font-size: 13px;
+
+  p {
+    padding: 0;
+    margin: 0;
   }
 }
 
-.shareCode {
-  width: 50%;
-  border-left: 1px solid #eee;
-  display: flex;
-  justify-content: center;
-  flex-wrap: wrap;
+.trial-wrapper {
+  height: 60px;
 
-  .qrCode {
-    width: 220px;
-    height: 220px;
+  .div-row {
     display: flex;
-    border: 1px solid #c0c4cc;
-    border-radius: 5px;
-    box-shadow: 1px 1px 5px #c0c4cc;
-    align-items: center;
-    justify-content: center;
-  }
+    justify-content: space-between;
+    margin: 10px 20px !important;
+    font-size: 13px;
 
-  .codeBtnBox {
-    margin-top: 20px;
-    width: 100%;
-    display: flex;
-    justify-content: space-around;
+    .div-col {
+      flex: 1;
+      width: 100px;
+      white-space: nowrap !important;
+      text-overflow: ellipsis !important;
+      word-break: break-word !important;
+      overflow: hidden !important;
+
+      label {
+        font-weight: bold;
+      }
+    }
+
+    .div-textarea {
+      display: inline-block;
+    }
   }
 }
+
+::v-deep .el-step__head.is-process {
+  color: #428bca;
+  border-color: #428bca;
+}
+
+::v-deep .el-step__title.is-process {
+  color: #428bca;
+  border-color: #428bca;
+}
+
+::v-deep .el-step__description.is-process {
+  color: #428bca;
+  border-color: #428bca;
+}
+
+::v-deep .el-step__head.is-process .el-step__line {
+  background-color: #428bca;
+}
+
+::v-deep .el-step__head.is-finish {
+  color: #303133;
+  border-color: #303133;
+}
+
+::v-deep .el-step__title.is-finish {
+  color: #303133;
+  border-color: #303133;
+}
+
+::v-deep .el-step__description.is-finish {
+  color: #303133;
+  border-color: #303133;
+}
+
+::v-deep .el-step__title.is-process {
+  text-decoration: none;
+}
+
+::v-deep .el-step__title.is-finish {
+  text-decoration: none;
+}
+
+::v-deep .el-step__head.is-finish .el-step__line {
+  background-color: #303133;
+}
+
+.click_cursor {
+  cursor: pointer;
+}
 </style>
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index a9144060..69b8cd76 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -217,6 +217,14 @@
                     )
                   }).TotalCount
                 }}
+                <el-button type="text" @click="
+                  statistics(
+                    scope.row,
+                    ite.TrialReadingCriterionId
+                  )
+                  ">
+                  {{ $t('trials:enrolledReviews:button:Statistics') }}
+                </el-button>
               </div>
             </template>
           </el-table-column>
@@ -351,6 +359,7 @@ import {
   enrollBackOrOut,
   setEnrollReadingCategory,
   batchSetCriterionJoinJoinAnalysis,
+  getDoctorUserTrialReadingStat
 } from '@/api/trials'
 import { addDoctorCriterionFile } from '@/api/reviewers'
 import { uploadFile } from '@/api/attachment'
@@ -470,6 +479,28 @@ export default {
     this.initPage()
   },
   methods: {
+    async statistics(row, id) {
+      try {
+        let data = {
+          TrialId: this.$route.query.trialId,
+          TrialReadingCriterionId: id,
+          DoctoruserIdList: [row.DoctorUserId]
+        }
+        let res = await getDoctorUserTrialReadingStat(data)
+        if (res.IsSuccess && res.Result[0]) {
+          row.CriterionCategoryList.some((v) => {
+            if (v.TrialReadingCriterionId === id) {
+              v.PendingCount = res.Result[0].PendingCount
+              v.ComplectedCount = res.Result[0].ComplectedCount
+              v.TotalCount = res.Result[0].TotalCount
+            }
+            return v.TrialReadingCriterionId === id
+          })
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     // 预览
     preview(row, TrialReadingCriterionId, key) {
       let file = row.CriterionCategoryList.find((v) => {
diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue
index 0a85c255..0ef2168e 100644
--- a/src/views/trials/trials-panel/reading/ad-review/index.vue
+++ b/src/views/trials/trials-panel/reading/ad-review/index.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="adReview_wrapper">
-    <el-card v-if="isReadingShowSubjectInfo" shadow="never" :body-style="{ padding: '10px' }"
-      style="margin-bottom: 10px">
+    <el-card
+      v-if="isReadingShowSubjectInfo"
+      shadow="never"
+      :body-style="{ padding: '10px' }"
+      style="margin-bottom: 10px"
+    >
       <h4>
         <!-- 受试者： -->
         {{ $t("trials:adReview:title:subject") }}
@@ -10,14 +14,14 @@
       </h4>
     </el-card>
     <el-card :body-style="{ padding: '10px' }" shadow="never">
-      <!-- <div slot="header" class="clearfix">
-        <span style="font-weight: bold;">评估结果</span>
-      </div> -->
-      <div slot="header" style="
+      <div
+        slot="header"
+        style="
           display: flex;
           flex-direction: row;
           justify-content: space-between;
-        ">
+        "
+      >
         <!-- 评估结果 -->
         <div style="font-weight: bold">
           {{ $t("trials:adReview:title:result") }}
@@ -30,35 +34,54 @@
         </div>
       </div>
 
-      <el-table :data="adInfo.VisitInfoList" style="width: 100%">
+      <el-table v-if="taskInfo.ArbitrationRule !== 1" :data="adInfo.VisitInfoList" style="width: 100%">
         <!-- 访视名称 -->
-        <el-table-column prop="VisitName" :label="$t('trials:adReview:table:visitName')" show-overflow-tooltip
-          width="150" />
+        <el-table-column
+          prop="VisitName"
+          :label="$t('trials:adReview:table:visitName')"
+          show-overflow-tooltip
+          width="150"
+        />
 
         <!-- 评估结果 -->
-        <el-table-column v-for="j in judgeQuestion" :key="j.armEnum" :label="j.armEnum === 1
-          ? $t('trials:adReview:table:viewR1')
-          : j.armEnum === 2
-            ? $t('trials:adReview:table:viewR2')
-            : $fd('ArmEnum', j.armEnum)
-          " align="center" prop="">
+        <el-table-column
+          v-for="j in judgeQuestion"
+          :key="j.armEnum"
+          :label="j.armEnum === 1
+            ? $t('trials:adReview:table:viewR1')
+            : j.armEnum === 2
+              ? $t('trials:adReview:table:viewR2')
+              : $fd('ArmEnum', j.armEnum)
+          "
+          align="center"
+          prop=""
+        >
           <template>
-            <el-table-column v-for="(qs, i) in j.judgeQuestionList" :key="i" prop="" :label="qs" show-overflow-tooltip
-              width="150">
+            <el-table-column
+              v-for="(qs, i) in j.judgeQuestionList"
+              :key="i"
+              prop=""
+              :label="qs"
+              show-overflow-tooltip
+              width="150"
+            >
               <template slot-scope="scope">
                 <div v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].QuestionType === 1">
                   <span v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].DictionaryCode">
                     {{
                       $fd(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].DictionaryCode,
-                        parseInt(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer))
+                          parseInt(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer))
                     }}
                   </span>
                   <span v-else>
                     {{ scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer }}
                   </span>
                   <span
-                    v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit && !isNaN(parseFloat(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer))">{{
-                      $fd('ValueUnit', parseInt(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit)) }}</span>
+                    v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit && !isNaN(parseFloat(scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer))"
+                  >
+                    {{ scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit !== 4 ? $fd('ValueUnit',
+                  scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit) : scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].CustomUnit }}
+                  </span>
                 </div>
                 <div v-else-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].QuestionType === 2">
                   <div v-if="scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer">
@@ -66,11 +89,15 @@
                       {{ $fd("YesOrNo", scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Answer) }}
                     </span>
                     <!-- 查看详情 -->
-                    <el-button type="text" style="margin-left: 5px" @click="
-                      handleViewDetail(
-                        scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId
-                      )
-                      ">
+                    <el-button
+                      type="text"
+                      style="margin-left: 5px"
+                      @click="
+                        handleViewDetail(
+                          scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId
+                        )
+                      "
+                    >
                       {{ $t("trials:adReview:table:view") }}
                     </el-button>
                   </div>
@@ -95,10 +122,14 @@
         </el-table-column>
 
         <!-- 查看详情 -->
-        <el-table-column :label="criterionType === 10
-          ? $t('trials:adReview:table:visitInfoview')
-          : $t('trials:adReview:table:view')
-          " width="200" :fixed="isFixed ? 'right' : false">
+        <el-table-column
+          :label="criterionType === 10
+            ? $t('trials:adReview:table:visitInfoview')
+            : $t('trials:adReview:table:view')
+          "
+          width="200"
+          :fixed="isFixed ? 'right' : false"
+        >
           <template slot-scope="scope">
             <!-- 查看R1详情 -->
             <el-button type="text" :title="$t('trials:adReview:table:viewR1')" @click="handleView(scope.row, 1)">
@@ -112,88 +143,207 @@
         </el-table-column>
 
         <!-- 全局详情 PCWG -->
-        <el-table-column v-if="criterionType === 10" prop="VisitName" :label="$t('trials:adReview:table:glInfo')"
-          show-overflow-tooltip width="150">
+        <el-table-column
+          v-if="criterionType === 10"
+          prop="VisitName"
+          :label="$t('trials:adReview:table:glInfo')"
+          show-overflow-tooltip
+          width="150"
+        >
           <template slot-scope="scope">
             <!-- 查看R1详情 -->
-            <el-button v-if="scope.$index === adInfo.VisitInfoList.length - 1" type="text"
-              :title="$t('trials:adReview:table:viewR1')" @click="handleViewGl(scope.row, 1)">
+            <el-button
+              v-if="scope.$index === adInfo.VisitInfoList.length - 1"
+              type="text"
+              :title="$t('trials:adReview:table:viewR1')"
+              @click="handleViewGl(scope.row, 1)"
+            >
               R1
             </el-button>
             <!-- 查看R2详情 -->
-            <el-button v-if="scope.$index === adInfo.VisitInfoList.length - 1" type="text"
-              :title="$t('trials:adReview:table:viewR2')" @click="handleViewGl(scope.row, 2)">
+            <el-button
+              v-if="scope.$index === adInfo.VisitInfoList.length - 1"
+              type="text"
+              :title="$t('trials:adReview:table:viewR2')"
+              @click="handleViewGl(scope.row, 2)"
+            >
               R2
             </el-button>
           </template>
         </el-table-column>
       </el-table>
+      <el-table v-else :data="judgeAnswers" border>
+        <!-- 问题名称 -->
+        <el-table-column
+          prop="QuestionName"
+          :label="$t('trials:readingTracking:config:questionName')"
+          show-overflow-tooltip
+          width="600"
+        />
+        <!-- R1 -->
+        <el-table-column
+          prop="R1Answer"
+          show-overflow-tooltip
+          width="300"
+        >
+          <template slot="header">
+            {{ $t('trials:adReview:table:viewR1') }}
+            <span v-show="isReadingShowSubjectInfo" style="margin: 0 10px;">{{ taskBlindName }}</span>
+            <el-button
+              type="text"
+              @click.stop="handleViewDetail(r1VisitTaskId)"
+            >
+              {{ $t('trials:adReview:table:view') }}
+            </el-button>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.DictionaryCode">
+              {{ $fd(scope.row.DictionaryCode, parseInt(scope.row.R1Answer)) }}
+            </span>
+            <span v-else>
+              {{ scope.row.R1Answer }}
+            </span>
+            <span v-if="scope.row.Unit">
+              {{ scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit }}
+            </span>
+          </template>
+        </el-table-column>
+        <!-- R2 -->
+        <el-table-column
+          prop="R2Answer"
+          show-overflow-tooltip
+          width="300"
+        >
+          <template slot="header">
+            {{ $t('trials:adReview:table:viewR2') }}
+            <span v-show="isReadingShowSubjectInfo" style="margin: 0 10px;">{{ taskBlindName }}</span>
+            <el-button
+              type="text"
+              @click.stop="handleViewDetail(r2VisitTaskId)"
+            >
+              {{ $t('trials:adReview:table:view') }}
+            </el-button>
+          </template>
+          <template slot-scope="scope">
+            <span v-if="scope.row.DictionaryCode">
+              {{ $fd(scope.row.DictionaryCode, parseInt(scope.row.R2Answer)) }}
+            </span>
+            <span v-else>
+              {{ scope.row.R2Answer }}
+            </span>
+            <span v-if="scope.row.Unit">
+              {{ scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit }}
+            </span>
+          </template>
+        </el-table-column>
+      </el-table>
     </el-card>
-    <el-card :body-style="{ padding: '10px' }" class="box-mr">
+    <el-card
+      v-if="taskInfo.JudgeModeEnum === 0"
+      :key="'judge-mode-0'"
+      :body-style="{ padding: '10px' }"
+      class="box-mr"
+    >
       <div slot="header" class="clearfix">
         <!-- 裁判结果 -->
         <span style="font-weight: bold">{{
           $t("trials:adReview:title:adResult")
         }}</span>
       </div>
-      <el-form ref="adForm" v-loading="loading" :model="adForm" style="width: 800px" label-width="100">
+      <el-form
+        ref="adForm"
+        v-loading="loading"
+        :model="adForm"
+        style="width: 800px"
+        label-width="300px"
+      >
         <!-- 选择阅片人 -->
-        <el-form-item :label="$t('trials:adReview:title:choseReader')" prop="judgeResultTaskId" :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select') },
-        ]">
+        <el-form-item
+          :label="$t('trials:adReview:title:choseReader')"
+          prop="judgeResultTaskId"
+          :rules="[
+            { required: true, message: $t('common:ruleMessage:select') },
+          ]"
+        >
           <el-radio-group v-model="adForm.judgeResultTaskId" :disabled="adInfo.ReadingTaskState >= 2">
-            <el-radio v-for="t in visitTaskArmList" :key="t.VisitTaskId" :label="t.VisitTaskId"
-              @change="handleVisitTaskArmChange">
+            <el-radio
+              v-for="t in visitTaskArmList"
+              :key="t.VisitTaskId"
+              :label="t.VisitTaskId"
+              @change="handleVisitTaskArmChange"
+            >
               {{ $fd("ArmEnum", t.ArmEnum) }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
         <!-- 裁判原因 -->
-        <el-form-item :label="$t('trials:adReview:title:adReason')" prop="judgeResultRemark" :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify') },
-          {
-            max: 500,
-            message: `${this.$t('common:ruleMessage:maxLength')} 500`,
-            trigger: ['blur', 'change'],
-          },
-        ]">
-          <div style="position: relative">
-            <div style="
-                position: absolute;
-                left: 0;
-                top: 30px;
-                color: #606266;
-                font-size: 13px;
-              ">
-              {{ remark }}
-            </div>
-            <el-input v-model="adForm.judgeResultRemark" type="textarea" :autosize="{ minRows: 4, maxRows: 6 }"
-              :disabled="adInfo.ReadingTaskState >= 2" style="margin-top: 25px" />
+        <el-form-item
+          :label="$t('trials:adReview:title:adReason')"
+          prop="judgeResultRemark"
+          :rules="[
+            { required: true, message: $t('common:ruleMessage:specify') },
+            {
+              max: 500,
+              message: `${$t('common:ruleMessage:maxLength')} 500`,
+              trigger: ['blur', 'change'],
+            },
+          ]"
+        >
+          <div class="judge-remark-tip">
+            {{ remark }}
           </div>
+          <el-input
+            v-model="adForm.judgeResultRemark"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            :disabled="adInfo.ReadingTaskState >= 2"
+            class="judge-remark-input"
+          />
         </el-form-item>
         <!-- 截图说明 -->
         <el-form-item :label="$t('trials:adReview:title:screenShot')">
-          <el-upload action :accept="accept" :on-preview="handlePictureCardPreview" :before-upload="handleBeforeUpload"
-            :http-request="uploadScreenshot" list-type="picture-card" :on-remove="handleRemove" :file-list="fileList"
-            :class="{ disabled: adInfo.ReadingTaskState >= 2 }" :disabled="adInfo.ReadingTaskState >= 2">
+          <el-upload
+            action
+            :accept="accept"
+            :on-preview="handlePictureCardPreview"
+            :before-upload="handleBeforeUpload"
+            :http-request="uploadScreenshot"
+            list-type="picture-card"
+            :on-remove="handleRemove"
+            :file-list="fileList"
+            :class="{ disabled: adInfo.ReadingTaskState >= 2 }"
+            :disabled="adInfo.ReadingTaskState >= 2"
+          >
             <i slot="default" class="el-icon-plus" />
             <div slot="file" slot-scope="{ file }" style="width: 100%; height: 100%">
-              <viewer :ref="file.url" :images="images" style="
+              <viewer
+                :ref="file.url"
+                :images="images"
+                style="
                   display: flex;
                   align-items: center;
                   justify-content: center;
                   width: 100%;
                   height: 100%;
-                ">
-                <img class="el-upload-list__item-thumbnail" :src="OSSclientConfig.basePath + file.url" alt=""
-                  crossorigin="anonymous" style="max-width: 100%; max-height: 100%">
+                "
+              >
+                <img
+                  class="el-upload-list__item-thumbnail"
+                  :src="OSSclientConfig.basePath + file.url"
+                  alt=""
+                  crossorigin="anonymous"
+                  style="max-width: 100%; max-height: 100%"
+                >
                 <span class="el-upload-list__item-actions">
                   <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
                     <i class="el-icon-zoom-in" />
                   </span>
 
-                  <span v-if="adInfo.ReadingTaskState < 2" class="el-upload-list__item-delete"
-                    @click="handleRemove(file)">
+                  <span
+                    v-if="adInfo.ReadingTaskState < 2"
+                    class="el-upload-list__item-delete"
+                    @click="handleRemove(file)"
+                  >
                     <i class="el-icon-delete" />
                   </span>
                 </span>
@@ -201,21 +351,181 @@
             </div>
           </el-upload>
         </el-form-item>
+        <el-form-item v-if="adInfo.ReadingTaskState < 2">
+          <el-button type="primary" @click="skipTask">
+            <!-- 跳过 -->
+            {{ $t("trials:readingReport:button:skip") }}
+          </el-button>
+          <!-- 保存 -->
+          <el-button type="primary" :loading="submitLockAction === 'save'" :disabled="!!submitLockAction" @click="handleSave">{{
+            $t("common:button:save")
+          }}</el-button>
+          <!-- 提交 -->
+          <el-button type="primary" :loading="submitLockAction === 'submit'" :disabled="!!submitLockAction" @click="handleSubmit">{{
+            $t("common:button:submit")
+          }}</el-button>
+        </el-form-item>
       </el-form>
-      <div style="text-align: center;width:100%" v-if="adInfo.ReadingTaskState < 2">
-        <el-button type="primary" @click="skipTask">
-          <!-- 跳过 -->
-          {{ $t("trials:readingReport:button:skip") }}
-        </el-button>
-        <!-- 保存 -->
-        <el-button type="primary" @click="handleSave">{{
-          $t("common:button:save")
-        }}</el-button>
-        <!-- 提交 -->
-        <el-button type="primary" @click="handleSubmit">{{
-          $t("common:button:submit")
-        }}</el-button>
+
+    </el-card>
+    <el-card
+      v-else
+      :key="'judge-mode-1'"
+      :body-style="{ padding: '10px' }"
+      class="box-mr"
+    >
+      <div slot="header" class="clearfix">
+        <!-- 裁判结果 -->
+        <span style="font-weight: bold">
+          {{ $t("trials:adReview:title:adResult") }}
+        </span>
       </div>
+      <el-form
+        ref="adForm2"
+        v-loading="loading"
+        :model="judgeForm"
+        label-width="80px"
+      >
+        <el-table
+          :data="judgeQs"
+          border
+          style="margin-bottom: 16px"
+        >
+          <el-table-column
+            prop="QuestionName"
+            :label="$t('trials:readingTracking:config:questionName')"
+            show-overflow-tooltip
+            width="600"
+          />
+          <el-table-column
+            prop="judgeResult"
+            :label="$t('trials:adReview:title:result')"
+            show-overflow-tooltip
+            width="300"
+          >
+            <template slot-scope="scope">
+              <div>
+                <span v-if="scope.row.DictionaryCode">
+                  {{
+                    $fd(
+                      scope.row.DictionaryCode,
+                      parseInt(judgeForm[scope.row.ReadingQuestionId])
+                    )
+                  }}
+                </span>
+                <span v-else>
+                  {{ judgeForm[scope.row.ReadingQuestionId] }}
+                </span>
+                <span
+                  v-if="scope.row.Unit && !isNaN(parseFloat(judgeForm[scope.row.ReadingQuestionId]))"
+                >
+                  {{ scope.row.Unit !== 4 ? $fd('ValueUnit', scope.row.Unit) : scope.row.CustomUnit }}
+                </span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="judgeSelect"
+            :label="$t('trials:adReview:title:select')"
+            show-overflow-tooltip
+            width="300"
+            v-if="readingTaskState < 2"
+          >
+            <template slot-scope="scope">
+              <el-radio-group
+                v-show="!(scope.row.Type === 'class' || scope.row.DataSource === 1)"
+                v-model="judgeSelectedArmMap[scope.row.ReadingQuestionId]"
+                :disabled="readingTaskState >= 2"
+                @change="(val) => handleJudgeArmChange(scope.row, val)"
+              >
+                <el-radio :label="1">
+                  R1
+                </el-radio>
+                <el-radio :label="2">
+                  R2
+                </el-radio>
+              </el-radio-group>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <el-form-item :label="$t('trials:adReview:title:adReason1')">
+          <el-input
+            v-model="judgeForm.judgeResultRemark"
+            type="textarea"
+            :autosize="{ minRows: 4, maxRows: 6 }"
+            :disabled="readingTaskState >= 2"
+            style="width: 360px"
+          />
+        </el-form-item>
+
+        <!-- 截图说明 -->
+        <el-form-item :label="$t('trials:adReview:title:screenShot')">
+          <el-upload
+            action
+            :accept="accept"
+            :on-preview="handlePictureCardPreview"
+            :before-upload="handleBeforeUpload"
+            :http-request="uploadScreenshot"
+            list-type="picture-card"
+            :on-remove="handleRemove"
+            :file-list="fileList"
+            :class="{ disabled: readingTaskState >= 2 }"
+            :disabled="readingTaskState >= 2"
+          >
+            <i slot="default" class="el-icon-plus" />
+            <div slot="file" slot-scope="{ file }" style="width: 100%; height: 100%">
+              <viewer
+                :ref="file.url"
+                :images="images"
+                style="
+                  display: flex;
+                  align-items: center;
+                  justify-content: center;
+                  width: 100%;
+                  height: 100%;
+                "
+              >
+                <img
+                  class="el-upload-list__item-thumbnail"
+                  :src="OSSclientConfig.basePath + file.url"
+                  alt=""
+                  crossorigin="anonymous"
+                  style="max-width: 100%; max-height: 100%"
+                >
+                <span class="el-upload-list__item-actions">
+                  <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
+                    <i class="el-icon-zoom-in" />
+                  </span>
+
+                  <span
+                    v-if="readingTaskState < 2"
+                    class="el-upload-list__item-delete"
+                    @click="handleRemove(file)"
+                  >
+                    <i class="el-icon-delete" />
+                  </span>
+                </span>
+              </viewer>
+            </div>
+          </el-upload>
+        </el-form-item>
+        <div v-if="readingTaskState < 2" style="text-align: center;width:100%">
+          <el-button type="primary" @click="skipTask">
+            <!-- 跳过 -->
+            {{ $t("trials:readingReport:button:skip") }}
+          </el-button>
+          <!-- 保存 -->
+          <el-button type="primary" :loading="submitLockAction === 'save'" :disabled="!!submitLockAction" @click="handleSaveJudgeForm">{{
+            $t("common:button:save")
+          }}</el-button>
+          <!-- 提交 -->
+          <el-button type="primary" :loading="submitLockAction === 'submit'" :disabled="!!submitLockAction" @click="handleSubmitJudgeForm">{{
+            $t("common:button:submit")
+          }}</el-button>
+        </div>
+      </el-form>
+
     </el-card>
 
     <el-card v-if="isReadingShowPreviousResults" :body-style="{ padding: '10px' }">
@@ -228,10 +538,19 @@
 
       <el-table v-loading="priorLoading" :data="priorADList" style="width: 100%">
         <!-- 裁判阅片 -->
-        <el-table-column prop="TaskBlindName" :label="$t('trials:adReview:table:adReading')" show-overflow-tooltip
-          width="200" />
-        <el-table-column prop="JudgeResultArm" :label="$t('trials:adReview:table:adResult')" show-overflow-tooltip
-          width="200">
+        <el-table-column
+          prop="TaskBlindName"
+          :label="$t('trials:adReview:table:adReading')"
+          show-overflow-tooltip
+          width="200"
+        />
+        <el-table-column
+          v-if="taskInfo.JudgeModeEnum === 0"
+          prop="JudgeResultArm"
+          :label="$t('trials:adReview:table:adResult')"
+          show-overflow-tooltip
+          width="200"
+        >
           <template slot-scope="scope">
             {{ $fd("ArmEnum", scope.row.JudgeResultArm) }}
           </template>
@@ -239,15 +558,24 @@
         <el-table-column :label="$t('common:action:action')" width="200">
           <template slot-scope="scope">
             <!-- 查看详情 -->
-            <el-button circle :title="$t('trials:adReview:table:view')" icon="el-icon-view"
-              @click="handleViewDetail(scope.row.VisitTaskId)" />
+            <el-button
+              circle
+              :title="$t('trials:adReview:table:view')"
+              icon="el-icon-view"
+              @click="handleViewDetail(scope.row.VisitTaskId)"
+            />
           </template>
         </el-table-column>
       </el-table>
     </el-card>
     <!-- 签名框 -->
-    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-      custom-class="base-dialog-wrapper">
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
       <div slot="title">
         <span style="font-size: 18px">{{ $t("common:dialogTitle:sign") }}</span>
         <span style="font-size: 12px; margin-left: 5px">{{
@@ -264,8 +592,15 @@ import {
   // uploadJudgeTaskImage,
   saveJudgeVisitTaskResult,
   submitJudgeVisitTaskResult,
-  getReadingPastResultList
+  getReadingPastResultList,
+  getQuestionCalculateRelation
 } from '@/api/trials'
+import {
+  getSingleVisitJudgeAnswer,
+  getJudgeForm,
+  setJudgeForm,
+  submitJudgeForm
+} from '@/api/trials/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import { setSkipReadingCache } from '@/api/reading'
 import const_ from '@/const/sign-code'
@@ -274,6 +609,7 @@ import SignForm from '@/views/trials/components/newSignForm'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 // import store from '@/store'
 import { changeURLStatic } from '@/utils/history.js'
+import LengthTool from '../dicoms/tools/Length/LengthTool'
 export default {
   name: 'AdReview',
   components: { SignForm },
@@ -320,6 +656,7 @@ export default {
     }
   },
   data() {
+    const taskInfo = JSON.parse(localStorage.getItem('taskInfo') || '{}')
     return {
       adInfo: {},
       judgeQuestion: [],
@@ -347,25 +684,35 @@ export default {
       openWindow: null,
       isFixed: false,
       images: [],
-      remark: ''
+      remark: '',
+      submitLockAction: '',
+      taskInfo,
+      judgeAnswers: [],
+      r1VisitTaskId: '',
+      r2VisitTaskId: '',
+      judgeQs: [],
+      judgeForm: {
+        judgeResultRemark: ''
+      },
+      judgeSelectedArmMap: {},
+      readingTaskState: 2,
+      calculationList: [],
+      classArr: []
     }
   },
-  // watch: {
-  //   visitTaskId: {
-  //     immediate: true,
-  //     handler(val) {
-  //       this.$nextTick(() => {
-  //         this.getAdInfo()
-  //         if (this.isReadingShowPreviousResults) {
-  //           this.getPriorAdList()
-  //         }
-  //       })
-  //     }
-  //   }
-  // },
-  mounted() {
+  async mounted() {
     this.criterionType = parseInt(this.$route.query.criterionType)
     this.getAdInfo()
+    if (this.taskInfo.ArbitrationRule === 1) {
+      await this.getVisitJudgeAnswer()
+    } else {
+      
+    }
+    if (this.taskInfo.JudgeModeEnum === 1) {
+      this.getJudgeForm()
+      this.getQuestionCalculateRelation()
+    }
+
     if (this.isReadingShowPreviousResults) {
       this.getPriorAdList()
     }
@@ -389,6 +736,7 @@ export default {
           visitTaskId: this.visitTaskId
         })
         if (res.IsSuccess) {
+          this.readingTaskState = res.Result.ReadingTaskState
           var judgeQS = []
           if (res.Result.VisitInfoList.length > 0) {
             res.Result.VisitInfoList[0].VisitTaskInfoList.map((v, index) => {
@@ -452,6 +800,370 @@ export default {
         this.loading = false
       }
     },
+    async getVisitJudgeAnswer() {
+      try {
+        this.loading = true
+        const res = await getSingleVisitJudgeAnswer({ visitTaskId: this.visitTaskId })
+        if (res.IsSuccess) {
+          this.judgeAnswers = res.Result.QuestionList
+          this.r1VisitTaskId = res.Result.R1VisitTaskId
+          this.r2VisitTaskId = res.Result.R2VisitTaskId
+          
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.loading = false
+      }
+    },
+    async getJudgeForm() {
+      try {
+        this.loading = true
+        const res = await getJudgeForm({ visitTaskId: this.visitTaskId })
+        if (res.IsSuccess) {
+          const { QuestionList, JudgeResultImagePathList } = res.Result
+          this.fileList = []
+          if (JudgeResultImagePathList.length > 0) {
+            JudgeResultImagePathList.map((url) => {
+              if (url) {
+                this.fileList.push({ name: '', url: url })
+              }
+            })
+          }
+          this.judgeQs = QuestionList.filter(item => item.ShowQuestion === 0)
+          // this.judgeQs = QuestionList
+          this.$set(this.judgeForm, 'judgeResultRemark', res.Result.JudgeResultRemark || '')
+          QuestionList.map((item) => {
+            this.$set(
+              this.judgeForm,
+              item.ReadingQuestionId,
+              item.Answer
+            )
+            if (item.Type === 'class') {
+              this.classArr.push({ triggerId: item.ClassifyQuestionId, classId: item.ReadingQuestionId, classifyAlgorithms: item.ClassifyAlgorithms, classifyType: item.ClassifyType })
+            }
+            this.$set(this.judgeSelectedArmMap, item.ReadingQuestionId, null)
+            // if (item.Answer === this.getJudgeAnswerValue(item, 1)) {
+            //   this.$set(this.judgeSelectedArmMap, item.ReadingQuestionId, 1)
+            // } else if (item.Answer === this.getJudgeAnswerValue(item, 2)) {
+            //   this.$set(this.judgeSelectedArmMap, item.ReadingQuestionId, 2)
+            // } else {
+            //   this.$set(this.judgeSelectedArmMap, item.ReadingQuestionId, '')
+            // }
+          })
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.loading = false
+      }
+    },
+    async getQuestionCalculateRelation() {
+      try {
+        const res = await getQuestionCalculateRelation({ TrialReadingCriterionId: this.$route.query.TrialReadingCriterionId, IsGetJudge: true })
+        this.calculationList = res.Result
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    handleJudgeArmChange(question, armEnum) {
+      this.$set(this.judgeSelectedArmMap, question.ReadingQuestionId, armEnum)
+      let val = this.getJudgeAnswerValue(question, armEnum)
+      this.$set(
+        this.judgeForm,
+        question.ReadingQuestionId,
+        val
+      )
+      // 自动分类
+      this.classArr.map(i => {
+        if (i.triggerId === question.ReadingQuestionId) {
+          let answer = null
+          const list = JSON.parse(i.classifyAlgorithms)
+          if (i.classifyType === 0) {
+            const o = list.find(v => {
+              return (
+                parseFloat(val) >= parseFloat(v.gt) &&
+                parseFloat(val) < parseFloat(v.lt)
+              )
+            })
+            answer = o ? o.label : null
+          } else if (i.classifyType === 1) {
+            const o = list.find(v => {
+              return v.val.includes(val)
+            })
+            answer = o ? o.label : null
+          }
+          this.$set(this.judgeForm, i.classId, answer)
+        }
+      })
+      // 自动计算
+      this.calculationList.forEach(v => {
+        let find = v.CalculateQuestionList.filter(o => {
+          return o.TableQuestionId === question.ReadingQuestionId
+        })
+        // find的自动计算值number
+        if (find) {
+          var num = this.logic(v)
+          if (num !== false) {
+            this.$set(this.judgeForm, v.QuestionId, num)
+          }
+        }
+      })
+    },
+    logic(rules, num = 0) {
+      let isNE = false, isNAN = false
+      try {
+        if (rules.CalculateQuestionList.length === 0) {
+          return false
+        }
+        let dataArr = []
+        rules.CalculateQuestionList.forEach((o, i) => {
+          if (i === 0) {
+            if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
+              switch (rules.CustomCalculateMark) {
+                case 5:
+                  this.judgeForm[o.QuestionId].forEach((q, qi) => {
+                    if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
+                      if (qi === 0) {
+                        num = parseFloat(q[o.TableQuestionId])
+                      } else {
+                        num *= parseFloat(q[o.TableQuestionId])
+                      }
+                    } else {
+                      isNAN = true
+                    }
+
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
+                  })
+                  break;
+                case 6:
+                  this.judgeForm[o.QuestionId].forEach((q, qi) => {
+                    if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
+                      if (qi === 0) {
+                        num = parseFloat(q[o.TableQuestionId])
+                      } else {
+                        num += parseFloat(q[o.TableQuestionId])
+                      }
+                    } else {
+                      isNAN = true
+                    }
+
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
+                  })
+                  break;
+                case 7:
+                  this.judgeForm[o.QuestionId].forEach((q, qi) => {
+                    if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
+                      if (qi === 0) {
+                        num = parseFloat(q[o.TableQuestionId])
+                      } else {
+                        num += parseFloat(q[o.TableQuestionId])
+                      }
+                    } else {
+                      isNAN = true
+                    }
+
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
+                  })
+                  num = this.judgeForm[o.QuestionId].length === 0 ? 0 : num / this.judgeForm[o.QuestionId].length
+                  break;
+                case 8:
+                  var arr = []
+                  this.judgeForm[o.QuestionId].forEach(q => {
+                    if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
+                      arr.push(q[o.TableQuestionId])
+                    } else {
+                      isNAN = true
+                    }
+
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
+                  })
+                  num = arr.length === 0 ? 0 : Math.max(...arr)
+                  break;
+                case 9:
+                  var arr = []
+                  this.judgeForm[o.QuestionId].forEach(q => {
+                    if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
+                      arr.push(q[o.TableQuestionId])
+                    } else {
+                      isNAN = true
+                    }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
+                  })
+                  num = arr.length === 0 ? 0 : Math.min(...arr)
+                  break;
+              }
+            } else {
+              switch (rules.CustomCalculateMark) {
+                case 15:
+                  if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                    num = Math.abs(this.judgeForm[o.TableQuestionId])
+                  }
+                  else {
+                    isNAN = true
+                  }
+                  if (this.judgeForm[o.TableQuestionId] === 'NE') {
+                    isNE = true
+                  }
+                  break;
+                default:
+                  if (this.judgeForm[o.TableQuestionId] === 'NE') {
+                    isNE = true
+                  }
+                  if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                    num = parseFloat(this.judgeForm[o.TableQuestionId])
+                  } else {
+                    isNAN = true
+                  }
+                  if (!isNaN(num)) {
+                    dataArr.push(num)
+                  }
+                  break;
+              }
+
+            }
+          } else {
+            if (this.judgeForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
+            switch (rules.CustomCalculateMark) {
+              case 1:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  num += parseFloat(this.judgeForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
+                }
+
+                break;
+              case 2:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  num -= parseFloat(this.judgeForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
+                }
+
+                break;
+              case 3:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  num *= parseFloat(this.judgeForm[o.TableQuestionId])
+                } else {
+                  isNAN = true
+                }
+
+                break;
+              case 4:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  if (parseFloat(this.judgeForm[o.TableQuestionId]) === 0) {
+                    num = 0
+                  } else {
+                    num /= parseFloat(this.judgeForm[o.TableQuestionId])
+                  }
+                } else {
+                  isNAN = true
+                }
+
+                break;
+              case 10:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.judgeForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
+                }
+                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
+                  return acc + (typeof curr === "number" ? curr : 0);
+                }, 0) / dataArr.length;
+                break;
+              case 11:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.judgeForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
+                }
+                num = Math.max(...dataArr);
+                break;
+              case 12:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.judgeForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
+                }
+                num = Math.min(...dataArr);
+                break;
+              case 13:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.judgeForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
+                }
+                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
+                break;
+              case 14:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.judgeForm[o.TableQuestionId]))
+                } else {
+                  isNAN = true
+                }
+                num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc || curr, 0) ? 1 : 0;
+                break;
+              case 15:
+                if (!isNaN(parseFloat(this.judgeForm[o.TableQuestionId]))) {
+                  num = Math.abs(this.judgeForm[o.TableQuestionId])
+                }
+                else {
+                  isNAN = true
+                }
+                break;
+            }
+          }
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      if (isNE) {
+        return 'NE'
+      }
+      if (isNAN) {
+        return null
+      }
+      if (rules.ValueType === 2) {
+        num = num * 100
+      }
+      if (rules.CustomCalculateMark === 13 || rules.CustomCalculateMark === 14) {
+        return num
+      } else {
+        return num.toFixed(this.digitPlaces)
+      }
+
+    },
+    getJudgeAnswerValue(question, armEnum) {
+      const row = this.judgeAnswers.find((item) => {
+        return item.ReadingQuestionId === question.ReadingQuestionId
+      })
+      if (!row) return null
+      return armEnum === 1 ? row.R1Answer : row.R2Answer
+    },
+    validateJudgeSelections() {
+      const missingQuestion = this.judgeQs.find((question) => {
+        const answer = this.judgeForm[question.ReadingQuestionId]
+        return answer === '' || answer === null || answer === undefined
+      })
+      if (missingQuestion) {
+        let msg = this.$t('trials:ad-review:msg:validMsg').replace('xxx', missingQuestion.QuestionName)
+        this.$message.error(msg)
+        return false
+      }
+      return true
+    },
     async getPriorAdList() {
       this.priorLoading = true
       try {
@@ -494,31 +1206,43 @@ export default {
       window.open(routeData.href, '_blank')
     },
     async handleSave() {
-      const valid = await this.$refs['adForm'].validate()
-      if (!valid) return
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'save'
       this.loading = true
-      var paths = []
-      this.fileList.map((file) => {
-        if (file.url) {
-          paths.push(file.url)
-        }
-      })
-      this.adForm.judgeResultImagePathList = paths
-      this.adForm.visitTaskId = this.visitTaskId
       try {
+        const valid = await this.$refs.adForm.validate()
+        if (!valid) return false
+        const paths = []
+        this.fileList.map((file) => {
+          if (file.url) {
+            paths.push(file.url)
+          }
+        })
+        this.adForm.judgeResultImagePathList = paths
+        this.adForm.visitTaskId = this.visitTaskId
         await saveJudgeVisitTaskResult(this.adForm)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
-        this.loading = false
+        return true
       } catch (e) {
+        return false
+      } finally {
         this.loading = false
+        this.submitLockAction = ''
       }
     },
     async handleSubmit() {
-      const valid = await this.$refs['adForm'].validate()
-      if (!valid) return
-      const { ImageAssessmentReportConfirmation } = const_.processSignature
-      this.signCode = ImageAssessmentReportConfirmation
-      this.signVisible = true
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'submit'
+      try {
+        const valid = await this.$refs.adForm.validate()
+        if (!valid) return false
+        const { ImageAssessmentReportConfirmation } = const_.processSignature
+        this.signCode = ImageAssessmentReportConfirmation
+        this.signVisible = true
+        return true
+      } finally {
+        this.submitLockAction = ''
+      }
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
@@ -530,61 +1254,163 @@ export default {
     },
     // 签名并确认
     async signConfirm(signInfo) {
-      this.loading = true
-      var paths = []
-      this.fileList.map((file) => {
-        paths.push(file.url)
-      })
-      var params = {
-        data: {
-          visitTaskId: this.visitTaskId,
-          judgeResultTaskId: this.adForm.judgeResultTaskId,
-          judgeResultRemark: this.adForm.judgeResultRemark,
-          judgeResultImagePathList: paths
-        },
-        signInfo: signInfo
-      }
       try {
-        const res = await submitJudgeVisitTaskResult(params)
-        if (res.IsSuccess) {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.isEdit = false
-          this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          // window.location.reload()
-          // window.opener.postMessage('refreshTaskList', window.location)
-          // 设置当前任务阅片状态为已读 
-          this.adInfo.ReadingTaskState = 2
-          const res = await getAutoCutNextTask({imageToolType: this.imageToolType})
-          var isAutoTask = res.Result.AutoCutNextTask
-          if (isAutoTask) {
-            // store.dispatch('reading/resetVisitTasks')
-            window.location.reload()
-          } else {
-            // '当前阅片任务已完成，是否进入下一个阅片任务？'
-            const confirm = await this.$confirm(
-              this.$t('trials:adReview:title:msg2'),
-              {
-                type: 'warning',
-                distinguishCancelAndClose: true
-              }
-            )
-            if (confirm === 'confirm') {
-              // store.dispatch('reading/resetVisitTasks')
-              // DicomEvent.$emit('getNextTask')
+        this.loading = true
+        const paths = this.fileList.reduce((acc, file) => {
+          if (file.url) acc.push(file.url)
+          return acc
+        }, [])
+
+        if (this.taskInfo.JudgeModeEnum === 1) {
+        // 访视点
+          const qsList = []
+          let reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+          Object.keys(this.judgeForm).forEach(key => {
+            if (reg.test(key)) {
+              qsList.push({
+                readingQuestionId: key,
+                answer: this.judgeForm[key]
+              })
+            }
+          })
+          const params = {
+            data: {
+              visitTaskId: this.visitTaskId,
+              judgeResultRemark: this.judgeForm.judgeResultRemark,
+              judgeResultImagePathList: paths,
+              questionList: qsList
+            },
+            signInfo: signInfo
+          }
+          const res = await submitJudgeForm(params)
+          if (res.IsSuccess) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.isEdit = false
+            this.$refs['signForm'].btnLoading = false
+            this.signVisible = false
+            // 设置当前任务阅片状态为已读
+            this.readingTaskState = 2
+            const res = await getAutoCutNextTask({ imageToolType: this.imageToolType })
+            const isAutoTask = res.Result.AutoCutNextTask
+            if (isAutoTask) {
               window.location.reload()
             } else {
-              changeURLStatic('visitTaskId', this.visitTaskId)
+            // '当前阅片任务已完成，是否进入下一个阅片任务？'
+              const confirm = await this.$confirm(
+                this.$t('trials:adReview:title:msg2'),
+                {
+                  type: 'warning',
+                  distinguishCancelAndClose: true
+                }
+              )
+              if (confirm === 'confirm') {
+                window.location.reload()
+              } else {
+                changeURLStatic('visitTaskId', this.visitTaskId)
+              }
             }
+            window.opener.postMessage('refreshTaskList', window.location)
           }
-          window.opener.postMessage('refreshTaskList', window.location)
+          this.loading = false
+        } else {
+          const params = {
+            data: {
+              visitTaskId: this.visitTaskId,
+              judgeResultTaskId: this.adForm.judgeResultTaskId,
+              judgeResultRemark: this.adForm.judgeResultRemark,
+              judgeResultImagePathList: paths
+            },
+            signInfo: signInfo
+          }
+          const res = await submitJudgeVisitTaskResult(params)
+          if (res.IsSuccess) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.isEdit = false
+            this.$refs['signForm'].btnLoading = false
+            this.signVisible = false
+            // 设置当前任务阅片状态为已读
+            this.adInfo.ReadingTaskState = 2
+            const res = await getAutoCutNextTask({ imageToolType: this.imageToolType })
+            const isAutoTask = res.Result.AutoCutNextTask
+            if (isAutoTask) {
+              window.location.reload()
+            } else {
+            // '当前阅片任务已完成，是否进入下一个阅片任务？'
+              const confirm = await this.$confirm(
+                this.$t('trials:adReview:title:msg2'),
+                {
+                  type: 'warning',
+                  distinguishCancelAndClose: true
+                }
+              )
+              if (confirm === 'confirm') {
+                window.location.reload()
+              } else {
+                changeURLStatic('visitTaskId', this.visitTaskId)
+              }
+            }
+            window.opener.postMessage('refreshTaskList', window.location)
+          }
+          this.loading = false
         }
-        this.loading = false
       } catch (e) {
+        console.log(e)
+      } finally {
         this.loading = false
         this.$refs['signForm'] ? this.$refs['signForm'].btnLoading = false : ''
       }
     },
+    async handleSaveJudgeForm() {
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'save'
+      this.loading = true
+      try {
+        const valid = this.validateJudgeSelections()
+        if (!valid) return false
+        const qsList = []
+        let reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+        Object.keys(this.judgeForm).forEach(key => {
+          if (reg.test(key)) {
+            qsList.push({
+              readingQuestionId: key,
+              answer: this.judgeForm[key]
+            })
+          }
+        })
+        const paths = this.fileList.reduce((acc, file) => {
+          if (file.url) acc.push(file.url)
+          return acc
+        }, [])
+        await setJudgeForm({
+          visitTaskId: this.visitTaskId,
+          judgeResultRemark: this.judgeForm.judgeResultRemark,
+          judgeResultImagePathList: paths,
+          questionList: qsList
+        })
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        return true
+      } catch (e) {
+        console.log(e)
+        return false
+      } finally {
+        this.loading = false
+        this.submitLockAction = ''
+      }
+    },
+    async handleSubmitJudgeForm() {
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'submit'
+      try {
+        const valid = this.validateJudgeSelections()
+        if (!valid) return false
+        const { ImageAssessmentReportConfirmation } = const_.processSignature
+        this.signCode = ImageAssessmentReportConfirmation
+        this.signVisible = true
+        return true
+      } finally {
+        this.submitLockAction = ''
+      }
+    },
     handleViewDetail(visitTaskId) {
       if (this.openWindow) {
         this.openWindow.close()
@@ -601,12 +1427,12 @@ export default {
       var path = ''
       if (readingTool === 0 || readingTool === 2 || readingTool === 3) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId
-          }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
-          }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
+        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId
-          }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
-          }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
+        }&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       }
       var routeData = this.$router.resolve({ path })
       this.openWindow = window.open(routeData.href, '_blank')
@@ -634,14 +1460,14 @@ export default {
       var path = ''
       if (readingTool === 0 || readingTool === 2 || readingTool === 3) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId
-          }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
-          }&visitTaskId=${task.VisitTaskId
-          }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
+        }&visitTaskId=${task.VisitTaskId
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId
-          }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
-          }&visitTaskId=${task.VisitTaskId
-          }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
+        }&visitTaskId=${task.VisitTaskId
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       }
       var routeData = this.$router.resolve({ path })
       this.openWindow = window.open(routeData.href, '_blank')
@@ -663,33 +1489,18 @@ export default {
       var path = ''
       if (readingTool === 0 || readingTool === 2 || readingTool === 3) {
         path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId
-          }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
-          }&visitTaskId=${task.GlobalVisitTaskId
-          }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
+        }&visitTaskId=${task.GlobalVisitTaskId
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       } else {
         path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.trialId
-          }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
-          }&visitTaskId=${task.GlobalVisitTaskId
-          }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
+        }&subjectCode=${this.subjectCode}&subjectId=${this.subjectId
+        }&visitTaskId=${task.GlobalVisitTaskId
+        }&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
       }
       var routeData = this.$router.resolve({ path })
       this.openWindow = window.open(routeData.href, '_blank')
     },
-    // uploadScreenshot(param) {
-    //   this.loading = true
-    //   this.uploadDisabled = false
-    //   const formData = new FormData()
-    //   formData.append('file', param.file)
-    //   uploadJudgeTaskImage(this.$route.query.trialId, this.visitTaskId, formData).then(res => {
-    //     this.loading = false
-    //     if (res.IsSuccess) {
-    //       this.fileList.push({ name: res.Result.FileName, url: `${res.Result.Path}` })
-    //     }
-    //     this.uploadDisabled = true
-    //   }).catch(() => {
-    //     this.loading = false
-    //   })
-    // },
     async uploadScreenshot(param) {
       this.loading = true
       this.uploadDisabled = false
@@ -791,6 +1602,38 @@ export default {
     margin: 10px 0;
   }
 
+  .judge-remark-tip {
+    margin-bottom: 8px;
+    color: #606266;
+    font-size: 13px;
+    line-height: 20px;
+    word-break: break-word;
+    width: 500px;
+  }
+
+  .judge-remark-input {
+    width: 500px;
+  }
+
+  .judge-form-actions {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 12px;
+    white-space: nowrap;
+  }
+
+  .judge-select-radio-group {
+    display: flex;
+    gap: 16px;
+  }
+
+  .judge-answer-text {
+    min-width: 0;
+    line-height: 20px;
+    word-break: break-word;
+  }
+
   .disabled {
     ::v-deep .el-upload--picture-card {
       display: none;
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index f82e1462..c3e28990 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -315,7 +315,7 @@
         <el-table-column
           prop="SubjectCode"
           :label="$t('trials:consistencyAnalysis:table:subjectCode')"
-          min-width="120"
+          min-width="150"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -726,7 +726,7 @@
                   :label="
                     $t('trials:selftConsistencyAnalysis:table:intervalPeriod')
                   "
-                  width="100"
+                  width="120"
                   show-overflow-tooltip
                   v-if="IsSelfAnalysis"
                 >
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
index 8725c252..c0522f04 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue
@@ -47,7 +47,8 @@
         <el-button size="small" @click="handleCancel">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" v-if="readingTaskState < 2" @click="handleSave">
+        <el-button size="small" type="primary" v-if="readingTaskState < 2" :loading="saveLoading"
+          :disabled="saveLoading" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -84,7 +85,8 @@ export default {
   data() {
     return {
       form: {},
-      isRender: false
+      isRender: false,
+      saveLoading: false
     }
   },
   computed: {
@@ -106,10 +108,13 @@ export default {
   },
   methods: {
     async handleSave() {
-      const valid = await this.$refs.assessmentForm.validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
+      if (this.saveLoading) return
+      this.saveLoading = true
+      let loading = null
       try {
+        const valid = await this.$refs.assessmentForm.validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
         var answers = []
         for (const k in this.form) {
           answers.push({ questionId: k, answer: this.form[k] })
@@ -125,7 +130,9 @@ export default {
         loading.close()
       } catch (e) {
         console.log(e)
-        loading.close()
+      } finally {
+        if (loading) loading.close()
+        this.saveLoading = false
       }
     },
     handleCancel() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
index db4cf4dc..df595120 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue
@@ -113,4 +113,9 @@ export default {
 .mb {
   margin-bottom: 0px;
 }
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #428bca;
+  border-color: #428bca;
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index d7bdb6a0..42a4c1c4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -219,6 +219,58 @@
           </div>
         </el-tooltip>
 
+        <el-popover v-model="keySeriesPopoverVisible" placement="bottom" trigger="click"
+          popper-class="key-series-popper" @show="showKeySeriesPanel">
+          <ul class="key-series-list">
+            <li v-if="keyStack && keyStack.taskBlindName" class="key-series-header">
+              <div class="key-series-header-top">
+                <div class="key-series-header-title">
+                  <span class="key-series-header-dot"></span>
+                  <div class="key-series-task-name" :title="keyStack.taskBlindName">
+                    {{ keyStack.taskBlindName }}
+                  </div>
+                </div>
+              </div>
+            </li>
+            <li v-if="keySeriesLoading" class="key-series-empty">
+              <i class="el-icon-loading"></i>
+            </li>
+            <li v-else-if="keySeries.length === 0" class="key-series-empty">
+              {{ $t('trials:reading:keySeries:noData') }}
+            </li>
+            <li v-for="(kf, idx) in keySeries" :key="idx" class="key-series-item"
+              @click.stop.prevent="jumpToKeySeries(kf)">
+              <div class="key-series-img">
+                <img v-if="kf.PicturePath" :src="`${OSSclientConfig.basePath}${kf.PicturePath}`" />
+                <svg-icon v-else icon-class="image" class="svg-icon default-icon" />
+              </div>
+              <div class="key-series-info">
+                <div v-if="kf.MarkName" class="key-series-meta">
+                  <div class="key-series-label">{{ $t('trials:reading:keySeries:annotationName') }}</div>
+                  <div class="key-series-uid" :title="kf.MarkName">
+                    {{ kf.MarkName }}
+                  </div>
+                </div>
+                <div class="key-series-meta">
+                  <div class="key-series-label">{{ $t('trials:reading:keySeries:sopUid') }}</div>
+                  <div class="key-series-uid" :title="kf.SopInstanceUid">
+                    {{ kf.SopInstanceUid }}
+                  </div>
+                </div>
+              </div>
+              <div class="key-series-star">
+                <svg-icon icon-class="star" class="svg-icon" />
+              </div>
+            </li>
+          </ul>
+          <div slot="reference" class="tool-wrapper">
+            <div class="icon" :title="$t('trials:reading:button:keySeries')">
+              <i class="el-icon-star-off svg-icon" />
+            </div>
+            <div class="text">{{ $t('trials:reading:button:keySeries') }}</div>
+          </div>
+        </el-popover>
+
         <div v-for="tool in measuredTools" :key="tool.toolName">
           <el-tooltip class="item" effect="dark" placement="bottom">
             <div slot="content">
@@ -504,13 +556,14 @@
                   <!-- 跳过 -->
                   {{ $t('trials:readingReport:button:skip') }}
                 </el-button>
-                <el-button type="primary" size="small" @click="submit">
+                <el-button type="primary" size="small" :loading="submitLoading" :disabled="submitLoading"
+                  @click="submit">
                   <!-- 提交 -->
                   {{ $t('common:button:submit') }}
                 </el-button>
               </div>
             </div>
-            
+
           </transition>
 
 
@@ -543,7 +596,7 @@
         </el-tab-pane>
         <!-- 其他 -->
         <el-tab-pane :label="$t('trials:reading:tab:others')" name="3">
-          <Others v-if="activeName === '3'" :imageToolType="1"/>
+          <Others v-if="activeName === '3'" :imageToolType="1" />
         </el-tab-pane>
       </el-tabs>
 
@@ -565,7 +618,8 @@
         <Manuals :trial-id="trialId" :justKeyDoc="manualsDialog.justKeyDoc" />
         <div slot="footer" style="text-align:right;" v-if="openManuals && !ManualsClose">
           <!-- 确认 -->
-          <el-button type="primary" size="mini" @click="handleSubmitKeyDoc">
+          <el-button type="primary" size="mini" :loading="keyDocSubmitting" :disabled="keyDocSubmitting"
+            @click="handleSubmitKeyDoc">
             {{ $t('common:button:confirm') }}</el-button>
         </div>
       </div>
@@ -646,17 +700,18 @@
           <!-- 取消 -->
           <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') }}</el-button>
           <!-- 确认 -->
-          <el-button type="primary" size="mini" @click="handleSubmitFusionSeries">
+          <el-button type="primary" size="mini" :loading="fusionSubmitLoading" :disabled="fusionSubmitLoading"
+            @click="handleSubmitFusionSeries">
             {{ $t('common:button:confirm') }}</el-button>
         </el-form-item>
       </el-form>
     </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" />
+      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" :isReading="true" />
     <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
       :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
-      :visible.sync="downloadImageVisible" />
+      :visible.sync="downloadImageVisible" :isReading="true" />
     <!-- 签名框 -->
     <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
       custom-class="base-dialog-wrapper">
@@ -706,6 +761,7 @@ import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
 import SignForm from '@/views/trials/components/newSignForm'
 import { getCriterionReadingInfo, verifyVisitTaskQuestions, submitDicomVisitTask, setReadKeyFile } from '@/api/trials'
 import { setSkipReadingCache } from '@/api/reading'
+import { getMarkList } from '@/api/reading'
 import { getAutoCutNextTask } from '@/api/user'
 import const_ from '@/const/sign-code'
 import { changeURLStatic } from '@/utils/history.js'
@@ -903,10 +959,17 @@ export default {
       uploadTrialCriterion: {},
       uploadStatus: 'upload',
       taskId: '',
+      keySeries: [],
+      keyStack: null,
+      keySeriesPopoverVisible: false,
+      keySeriesLoading: false,
       signVisible: false,
       signCode: null,
       currentUser: zzSessionStorage.getItem('userName'),
       tmpData: null,
+      submitLoading: false,
+      fusionSubmitLoading: false,
+      keyDocSubmitting: false,
 
       AspectRatio: 1,
       listShow: true,
@@ -1066,7 +1129,7 @@ export default {
     DicomEvent.$on('imageLocation', async (measuredData) => {
       return new Promise(async resolve => {
         if (!measuredData) return
-        
+
         await this.imageLocation(measuredData)
         resolve()
       })
@@ -1134,7 +1197,7 @@ export default {
       } else if (this.CriterionType === 22) {
         this.setToolActive('Probe', true, null, 'tableQuestion')
       }
-      
+
     })
     window.addEventListener('beforeunload', () => {
       if (this.petctWindow) {
@@ -1177,6 +1240,8 @@ export default {
       this.$emit('handleReadingChart', e)
     },
     async handleSubmitKeyDoc() {
+      if (this.keyDocSubmitting) return
+      this.keyDocSubmitting = true
       try {
         let data = {
           TrialCriterionId: this.$router.currentRoute.query.TrialReadingCriterionId,
@@ -1188,6 +1253,8 @@ export default {
         }
       } catch (err) {
         console.log(err)
+      } finally {
+        this.keyDocSubmitting = false
       }
     },
     showPanel(e, toolName) {
@@ -1349,6 +1416,45 @@ export default {
     resetViewport() {
       this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].resetViewport()
     },
+    getKeySeriesVisitTaskId() {
+      const currentCanvas = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`]
+      if (currentCanvas && currentCanvas[0] && currentCanvas[0].stack && currentCanvas[0].stack.visitTaskId) {
+        return currentCanvas[0].stack.visitTaskId
+      }
+      return this.activeSeries && this.activeSeries.visitTaskId ? this.activeSeries.visitTaskId : ''
+    },
+    async showKeySeriesPanel() {
+      this.keySeries = []
+      const currentCanvas = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`]
+      this.keyStack = currentCanvas && currentCanvas[0] ? currentCanvas[0].stack : null
+      const visitTaskId = this.keyStack?.visitTaskId
+      if (!visitTaskId) return
+      this.keySeriesLoading = true
+      try {
+        const res = await getMarkList({ visitTaskId })
+        if (res && res.Result) {
+          this.keySeries = res.Result
+        }
+      } catch (err) {
+        console.error(err)
+      } finally {
+        this.keySeriesLoading = false
+      }
+    },
+    jumpToKeySeries(kf) {
+      // this.keySeriesPopoverVisible = false
+      const visitTaskId = this.keyStack?.visitTaskId
+      if (!visitTaskId) return
+      // let annotation = {}
+      // try {
+      //   annotation = kf.MeasureData ? JSON.parse(kf.MeasureData) : {}
+      // } catch (err) {
+      //   console.error(err)
+      // }
+      const series = this.getSeriesInfoByMark(visitTaskId, { lesionName: kf.MarkName })
+      if (!series) return
+      this.loadImageStack(series)
+    },
     previewConfig() {
       this.activeName = '1'
       this.personalConfigDialog.visible = true
@@ -2339,6 +2445,8 @@ export default {
       }
     },
     async submit() {
+      if (this.submitLoading) return
+      this.submitLoading = true
       const loading = this.$loading({ fullscreen: true })
       try {
         const idx = this.visitTaskList.findIndex(i => i.IsCurrentTask)
@@ -2353,6 +2461,8 @@ export default {
         loading.close()
       } catch (e) {
         loading.close()
+      } finally {
+        this.submitLoading = false
       }
     },
     // 关闭签名框
@@ -2386,7 +2496,7 @@ export default {
           this.readingTaskState = 2
           await store.dispatch('reading/setVisitTaskReadingTaskState', { visitTaskId: this.visitTaskId, readingTaskState: 2 })
           await store.dispatch('reading/setCurrentReadingTaskState', 2)
-          const res = await getAutoCutNextTask({imageToolType: 1})
+          const res = await getAutoCutNextTask({ imageToolType: 1 })
           var isAutoTask = res.Result.AutoCutNextTask
           if (isAutoTask) {
             window.location.reload()
@@ -2488,15 +2598,18 @@ export default {
         this.petSeriesInfo = {}
       }
     },
-    handleSubmitFusionSeries() {
-      this.$refs['fusionForm'].validate(async (valid) => {
+    async handleSubmitFusionSeries() {
+      if (this.fusionSubmitLoading) return
+      this.fusionSubmitLoading = true
+      try {
+        const valid = await this.$refs['fusionForm'].validate()
         if (!valid) return
         if (Object.keys(this.ctSeriesInfo).length === 0 || Object.keys(this.petSeriesInfo).length === 0) {
           // '请选择序列信息！'
-          this.$confirm(this.$t('trials:lugano:fusionDialog:message:checkSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
+          await this.$confirm(this.$t('trials:lugano:fusionDialog:message:checkSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
             showCancelButton: false,
             type: 'warning'
-          }).then(() => { }).catch(() => { })
+          }).catch(() => { })
           return
         }
         if (this.ctSeriesInfo.instanceCount > 400) {
@@ -2506,15 +2619,15 @@ export default {
         var count = Math.abs(this.ctSeriesInfo.instanceCount - this.petSeriesInfo.instanceCount)
         if (count > 10) {
           // '选择的两组序列，影像数存在较大差距, 是否继续?'
-          this.$confirm(this.$t('trials:lugano:fusionDialog:message:validSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
+          const confirm = await this.$confirm(this.$t('trials:lugano:fusionDialog:message:validSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
             type: 'warning'
-          }).then(() => {
-            this.fusion()
-          }).catch(() => { })
-        } else {
-          this.fusion()
+          }).catch(() => false)
+          if (confirm !== 'confirm') return
         }
-      })
+        this.fusion()
+      } finally {
+        this.fusionSubmitLoading = false
+      }
     },
     fusion() {
       // sessionStorage.setItem('ctSeriesInfo', JSON.stringify(this.ctSeriesInfo))
@@ -3030,3 +3143,183 @@ export default {
   flex-grow: 1;
 }
 </style>
+<style lang="scss">
+.key-series-popper {
+  padding: 8px !important;
+  background-color: #1e1e1e !important;
+  border: 1px solid #4a4a4a !important;
+
+  .key-series-list {
+    width: 340px;
+    max-height: 420px;
+    overflow-y: auto;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+
+    &::-webkit-scrollbar {
+      width: 8px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #4a4a4a;
+      border-radius: 4px;
+    }
+
+    &::-webkit-scrollbar-track {
+      background: transparent;
+    }
+  }
+
+  .key-series-header {
+    padding: 5px 12px;
+    margin-bottom: 10px;
+    background: linear-gradient(180deg, rgba(64, 64, 64, 0.92) 0%, rgba(43, 43, 43, 0.98) 100%);
+    border: 1px solid #474747;
+    border-radius: 6px;
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.04), 0 6px 18px rgba(0, 0, 0, 0.2);
+  }
+
+  .key-series-header-top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .key-series-header-title {
+    display: flex;
+    align-items: center;
+    min-width: 0;
+  }
+
+  .key-series-header-dot {
+    width: 8px;
+    height: 8px;
+    margin-right: 8px;
+    border-radius: 50%;
+    background: linear-gradient(180deg, #ffd76a 0%, #f39c12 100%);
+    box-shadow: 0 0 8px rgba(243, 156, 18, 0.45);
+  }
+
+  .key-series-task-name {
+    color: #fff;
+    font-size: 15px;
+    font-weight: 600;
+    line-height: 22px;
+    word-break: break-all;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  }
+
+  .key-series-empty {
+    text-align: center;
+    color: #999;
+    padding: 10px;
+  }
+
+  .key-series-item {
+    text-align: left;
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    cursor: pointer;
+    background: linear-gradient(180deg, rgba(46, 46, 46, 0.96) 0%, rgba(40, 40, 40, 0.98) 100%);
+    border-radius: 6px;
+    margin-bottom: 8px;
+    border: 1px solid #353535;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.12);
+    // transition: all 0.2s ease;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &:hover {
+      background: linear-gradient(180deg, rgba(54, 54, 54, 0.98) 0%, rgba(46, 46, 46, 1) 100%);
+      border-color: #5a5a5a;
+      // transform: translateY(-1px);
+      box-shadow: 0 6px 16px rgba(0, 0, 0, 0.18);
+    }
+
+    .key-series-img {
+      width: 60px;
+      height: 60px;
+      flex-shrink: 0;
+      background-color: #000;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      overflow: hidden;
+      margin-right: 12px;
+      border-radius: 4px;
+      border: 1px solid #3a3a3a;
+
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
+
+      .default-icon {
+        font-size: 24px;
+        color: #666;
+      }
+    }
+
+    .key-series-info {
+      flex: 1;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      justify-content: flex-start;
+      padding-right: 5px;
+
+      .key-series-meta {
+        width: 100%;
+        overflow: hidden;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        margin-bottom: 4px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+
+      .key-series-label {
+        font-size: 13px;
+        color: #aaa;
+        margin-right: 4px;
+        white-space: nowrap;
+      }
+
+      .key-series-uid {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 13px;
+        color: #ddd;
+        line-height: 1.2;
+      }
+    }
+
+    .key-series-star {
+      margin-left: 10px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 28px;
+      height: 28px;
+      border-radius: 50%;
+      background: rgba(243, 156, 18, 0.08);
+      border: 1px solid rgba(243, 156, 18, 0.16);
+
+      .svg-icon {
+        color: #f39c12;
+        font-size: 16px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
index 178822e4..89a8d362 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
@@ -141,6 +141,8 @@
       <el-button
         type="primary"
         size="mini"
+        :loading="submitLoading"
+        :disabled="submitLoading"
         @click="handleSubmitFusionSeries"
       >
         {{ $t('common:button:confirm') }}</el-button>
@@ -171,7 +173,8 @@ export default {
       ctSeries: [],
       petSeries: [],
       petctWindow: null,
-      digitPlaces: 2
+      digitPlaces: 2,
+      submitLoading: false
     }
   },
   mounted() {
@@ -216,29 +219,32 @@ export default {
         this.$refs.petSeries.toggleRowSelection(this.petSeries[ptSexiesIdx])
       })
     },
-    handleSubmitFusionSeries() {
-      this.$refs['fusionForm'].validate((valid) => {
+    async handleSubmitFusionSeries() {
+      if (this.submitLoading) return
+      this.submitLoading = true
+      try {
+        const valid = await this.$refs['fusionForm'].validate()
         if (!valid) return
         if (Object.keys(this.fusionForm.ctSeriesInfo).length === 0 || Object.keys(this.fusionForm.petSeriesInfo).length === 0) {
           // '请选择序列信息！'
-          this.$confirm(this.$t('trials:lugano:fusionDialog:message:checkSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
+          await this.$confirm(this.$t('trials:lugano:fusionDialog:message:checkSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
             showCancelButton: false,
             type: 'warning'
-          }).then(() => {}).catch(() => {})
+          }).catch(() => {})
           return
         }
         var count = Math.abs(this.fusionForm.ctSeriesInfo.instanceCount - this.fusionForm.petSeriesInfo.instanceCount)
         if (count > 10) {
           // '选择的两组序列，影像数存在较大差距, 是否继续?'
-          this.$confirm(this.$t('trials:lugano:fusionDialog:message:validSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
+          const confirm = await this.$confirm(this.$t('trials:lugano:fusionDialog:message:validSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
             type: 'warning'
-          }).then(() => {
-            this.fusion()
-          }).catch(() => {})
-        } else {
-          this.fusion()
+          }).catch(() => false)
+          if (confirm !== 'confirm') return
         }
-      })
+        this.fusion()
+      } finally {
+        this.submitLoading = false
+      }
     },
     fusion() {
       const token = getToken()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 3e79ae4d..7e07c593 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -440,4 +440,9 @@ export default {
 ::v-deep .el-select.is-disabled .el-input__inner {
   background-color: #646464a1;
 }
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #428bca;
+  border-color: #428bca;
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 9b4e9303..c1f549e5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -10,7 +10,7 @@
       </template>
       <el-form-item v-if="readingTaskState < 2">
         <div style="text-align:right">
-          <el-button :disabled="!questionFormChangeState" :type="questionFormChangeState ? 'primary' : null" size="mini"
+          <el-button :loading="saveLoading" :disabled="saveLoading || !questionFormChangeState" :type="questionFormChangeState ? 'primary' : null" size="mini"
             @click="handleSave">{{ $t('common:button:save') }}</el-button>
         </div>
       </el-form-item>
@@ -56,7 +56,8 @@ export default {
       focalFDGId: '',
       baseLinePET5PS: null,
       liverRender: true,
-      lungRender: true
+      lungRender: true,
+      saveLoading: false
     }
   },
   computed: {
@@ -94,7 +95,7 @@ export default {
       this.resetSuvQuestions()
     })
     FusionEvent.$on('addAnnotation', obj => {
-      this.$set(obj, 'SaveEnum', 1)
+      // this.$set(obj, 'SaveEnum', 1)
       this.addAnnotation(obj)
     })
     FusionEvent.$on('removeAnnotation', obj => {
@@ -242,12 +243,18 @@ export default {
       })
     },
     handleSave() {
+      if (this.saveLoading) return
+      this.saveLoading = true
       this.$refs['questions'].validate((valid) => {
-        if (!valid) return
+        if (!valid) {
+          this.saveLoading = false
+          return
+        }
         // 是否有标记未保存
         var existUnSave = this.checkAnnotationStatus(this.questions)
         if (existUnSave) {
           this.$alert(this.$t('trials:lugano:message:saveWarning1'), this.$t('trials:lugano:fusionDialog:warning'))
+          this.saveLoading = false
           return
         }
         this.saveQuestionsForm()
@@ -277,11 +284,13 @@ export default {
           window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
           this.loading = false
           this.questionFormChangeState = false
+          this.saveLoading = false
           this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
         }
       } catch (e) {
         console.log(e)
         this.loading = false
+        this.saveLoading = false
       }
     },
     checkAnnotationStatus(obj) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 9b995844..fd087784 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -157,7 +157,7 @@
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button size="mini" @click="handleSave">
+      <el-button size="mini" :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -238,7 +238,8 @@ export default {
       pictureBaseStr: '',
       currentMarkTool: '',
       firstRenderAnnotation: true,
-      isInsideVolume: true
+      isInsideVolume: true,
+      saveLoading: false
     }
   },
   mounted() {
@@ -738,8 +739,13 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     handleSave() {
+      if (this.saveLoading) return
+      this.saveLoading = true
       this.$refs.measurementForm.validate(async valid => {
-        if (!valid) return
+        if (!valid) {
+          this.saveLoading = false
+          return
+        }
         const loading = this.$loading({ fullscreen: true })
         if (!this.isInsideVolume) {
           // this.$alert('当前标记在图像外，不允许保存！', '提示', {
@@ -753,6 +759,7 @@ export default {
             callback: action => { }
           })
 
+          this.saveLoading = false
           return
         }
         // 消失、无法评估状态的病灶限制不能测量SUV值
@@ -766,6 +773,7 @@ export default {
             showCancelButton: false,
             callback: action => { }
           })
+          this.saveLoading = false
           return
         }
         // suv测量值可以测量为0，但不能与病灶、肝脏、纵隔血池绑定。
@@ -779,6 +787,7 @@ export default {
               showCancelButton: false,
               callback: action => { }
             })
+            this.saveLoading = false
             return
           }
         }
@@ -856,9 +865,11 @@ export default {
               this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
             }
             loading.close()
+            this.saveLoading = false
           } catch (e) {
             console.log(e)
             loading.close()
+            this.saveLoading = false
           }
         })
       })
@@ -1054,6 +1065,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 213f3399..601cddcc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
     class="measurement-form">
     <div class="base-dialog-body">
@@ -148,7 +148,7 @@
       </el-button>
       <!-- 保存 -->
       <el-button v-if="(isFirstChangeTask && (lesionType === 5 || lesionType === 6)) || !isFirstChangeTask" size="mini"
-        @click="handleSave">
+        :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -239,7 +239,9 @@ export default {
       lesionMark: '',
       deleteInfo: null,
       pictureBaseStr: '',
-      currentMarkTool: ''
+      currentMarkTool: '',
+      saveLoading: false,
+      validationDialogVisible: false
     }
   },
   mounted() {
@@ -256,8 +258,31 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },
     async initForm() {
       const loading = this.$loading({ fullscreen: true })
+      const closeLoading = loading.close.bind(loading)
+      loading.close = () => {
+        closeLoading()
+        this.saveLoading = false
+      }
       this.questions.forEach(item => {
         var val = this.answers[item.Id]
         if (item.DictionaryCode) {
@@ -833,15 +858,40 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     async handleSave() {
-      const valid = await this.$refs.measurementForm.validate()
-      if (!valid) return
+      if (this.saveLoading) return
+      this.saveLoading = true
+      let valid = false
+      try {
+        valid = await this.$refs.measurementForm.validate()
+      } catch (e) {
+        this.saveLoading = false
+        console.log(e)
+        return
+      }
+      if (!valid) {
+        this.saveLoading = false
+        return
+      }
       const loading = this.$loading({ fullscreen: true })
+      const closeLoading = loading.close.bind(loading)
+      let loadingClosed = false
+      loading.close = () => {
+        if (loadingClosed) return
+        loadingClosed = true
+        closeLoading()
+      }
+      const resetSaveState = () => {
+        loading.close()
+        this.saveLoading = false
+      }
+      let canSubmit = false
       var measureData = this.questionForm.MeasureData
       var lesionState = this.getQuestionVal(7)
       var lesionLength = this.getQuestionVal(0)
       var lesionShort = this.getQuestionVal(1)
       var lymphNodes = this.getQuestionVal(2)
-      if (this.isBaseLineTask) {
+      try {
+        if (this.isBaseLineTask) {
         // 基线
         // 靶病灶且状态为存在（0）
         if (this.lesionType === 0 && lesionState === 0) {
@@ -849,24 +899,14 @@ export default {
             //  淋巴结靶病灶 必须使用长短径测量工具,短径大于等于15mm
             if (!(measureData && measureData.type === 'Bidirectional' && lesionShort >= 15)) {
               // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记，且短径须大于15mm！
-              this.$confirm(this.$t('trials:reading:warnning:msg19'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg19'))
               return
             }
           } else {
             // 非淋巴结靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
             if (!(measureData && measureData.type === 'Length' && lesionLength >= 10 && (measureData.thick && lesionLength >= 2 * measureData.thick || !measureData.thick))) {
               // 评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记，长径须大于10mm且不小于2倍层厚！
-              this.$confirm(this.$t('trials:reading:warnning:msg20'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg20'))
               return
             }
           }
@@ -878,24 +918,14 @@ export default {
             // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
-              this.$confirm(this.$t('trials:reading:warnning:msg21'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg21'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 直径测量工具或箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg22'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg22'))
               return
             }
           }
@@ -908,24 +938,14 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具
             if (!(measureData && measureData.type === 'Bidirectional' && lesionShort >= 10)) {
               // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg23'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg23'))
               return
             }
           } else {
             // 非淋巴结靶病灶 直径测量工具
             if (!(measureData && measureData.type === 'Length')) {
               // `评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg24'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg24'))
               return
             }
           }
@@ -936,12 +956,7 @@ export default {
             // 淋巴结靶病灶 必须使用箭头工具，短径记录为5mm
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg25'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg25'))
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
               const shortId = this.getQuestionId(1)
@@ -952,12 +967,7 @@ export default {
             // 非淋巴结靶病灶 箭头工具，长径记录为5mm
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg26'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg26'))
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
               const lengthId = this.getQuestionId(0)
@@ -973,24 +983,14 @@ export default {
             // 淋巴结靶病灶 不需要添加标记
             if (measureData) {
               // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg27'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg27'))
               return
             }
           } else {
             // 非淋巴结靶病灶 不需要添加标记
             if (measureData) {
               // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg28'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg28'))
               return
             }
           }
@@ -1001,24 +1001,14 @@ export default {
           if (lymphNodes === 1) {
             if (!(measureData && (measureData.type === 'Bidirectional' && lesionShort < 10))) {
               // `评估状态为消失的淋巴结靶病灶需使用长短径工具添加标记,且短径需小于10mm！`
-              this.$confirm(this.$t('trials:reading:warnning:msg29'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg29'))
               return
             }
           } else {
             // 非淋巴结靶病灶 箭头工具
             if (!(measureData && measureData.type === 'ArrowAnnotate')) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg30'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg30'))
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
               const lId = this.getQuestionId(0)
@@ -1034,24 +1024,14 @@ export default {
             // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg31'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg31'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg32'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg32'))
               return
             }
           }
@@ -1063,24 +1043,14 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg33'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg34'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg34'))
               return
             }
           }
@@ -1092,24 +1062,14 @@ export default {
             // 淋巴结靶病灶 无标记
             if (measureData) {
               // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg35'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg35'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 无标记
             if (measureData) {
               // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg36'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg36'))
               return
             }
           }
@@ -1121,24 +1081,14 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionShort < 10)))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg37'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg37'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg38'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg38'))
               return
             }
           }
@@ -1150,24 +1100,14 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg33'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg34'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg34'))
               return
             }
           }
@@ -1179,24 +1119,14 @@ export default {
             // 淋巴结非靶病灶 必须使用长短径测量工具、矩形工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // `评估状态为进一步增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-              this.$confirm(this.$t('trials:iRecist:warnning:msg50'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg50'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为进一步增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-              this.$confirm(this.$t('trials:iRecist:warnning:msg51'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg51'))
               return
             }
           }
@@ -1208,24 +1138,14 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg39'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg39'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为存在的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg40'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg40'))
               return
             }
           }
@@ -1237,24 +1157,14 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg41'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg41'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
               // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg42'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg42'))
               return
             }
           }
@@ -1266,24 +1176,14 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (measureData) {
               // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg43'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg43'))
               return
             }
           } else {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (measureData) {
               // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg44'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg44'))
               return
             }
           }
@@ -1295,24 +1195,14 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionShort < 10)))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg45'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg45'))
               return
             }
           } else {
             // 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg46'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
-              loading.close()
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg46'))
               return
             }
           }
@@ -1327,24 +1217,14 @@ export default {
                 //  淋巴结新靶病灶 必须使用长短径测量工具,短径大于等于15mm
                 if (!(measureData && measureData.type === 'Bidirectional' && lesionShort >= 15)) {
                   // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记，且短径须大于15mm！
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg31'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg31'))
                   return
                 }
               } else {
                 // 非淋巴结新靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
                 if (!(measureData && measureData.type === 'Length' && lesionLength >= 10 && (measureData.thick && lesionLength >= 2 * measureData.thick || !measureData.thick))) {
                   // 评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记，长径须大于10mm且不小于2倍层厚！
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg32'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg32'))
                   return
                 }
               }
@@ -1356,24 +1236,14 @@ export default {
                 // 淋巴结靶病灶 必须使用长短径测量工具
                 if (!(measureData && measureData.type === 'Bidirectional' && lesionShort >= 10)) {
                   // 评估状态为存在的淋巴结新靶病灶需使用长短径测量工具添加标记！ 短径应不小于10mm
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg1'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg1'))
                   return
                 }
               } else {
                 // 非淋巴结靶病灶 直径测量工具
                 if (!(measureData && measureData.type === 'Length')) {
                   // `评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记！`
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg2'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg2'))
                   return
                 }
               }
@@ -1383,24 +1253,14 @@ export default {
               if (lymphNodes === 1) {
                 if (!(measureData && (measureData.type === 'Bidirectional' && lesionShort < 10))) {
                   // `评估状态为消失的淋巴结靶病灶需使用长短径工具添加标记,且短径需小于10mm！`
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg3'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg3'))
                   return
                 }
               } else {
                 // 非淋巴结靶病灶 箭头工具
                 if (!(measureData && measureData.type === 'ArrowAnnotate')) {
                   // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg4'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg4'))
                   return
                 } else if (measureData && measureData.type === 'ArrowAnnotate') {
                   const lId = this.getQuestionId(0)
@@ -1416,24 +1276,14 @@ export default {
                 // 淋巴结新靶病灶 不需要添加标记
                 if (measureData) {
                   // 评估状态为无法评估的淋巴结新靶病灶不需要添加标记！
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg5'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg5'))
                   return
                 }
               } else {
                 // 非淋巴结靶病灶 不需要添加标记
                 if (measureData) {
                   // 状态为无法评估的非淋巴结新靶病灶不需要添加标记！
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg6'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg6'))
                   return
                 }
               }
@@ -1445,12 +1295,7 @@ export default {
                 // 淋巴结靶病灶 必须使用箭头工具，短径记录为5mm
                 if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
                   // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg33'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg33'))
                   return
                 } else if (measureData && measureData.type === 'ArrowAnnotate') {
                   const shortId = this.getQuestionId(1)
@@ -1461,12 +1306,7 @@ export default {
                 // 非淋巴结靶病灶 箭头工具，长径记录为5mm
                 if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
                   // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
-                  this.$confirm(this.$t('trials:iRecist:warnning:msg34'), {
-                    type: 'warning',
-                    showCancelButton: false,
-                    callback: action => { }
-                  })
-                  loading.close()
+                  await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg34'))
                   return
                 } else if (measureData && measureData.type === 'ArrowAnnotate') {
                   const lengthId = this.getQuestionId(0)
@@ -1518,24 +1358,14 @@ export default {
               // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg7'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg7'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg8'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg8'))
                 return
               }
             }
@@ -1546,24 +1376,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
                 // `评估状态为增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-                this.$confirm(this.$t('trials:iRecist:warnning:msg9'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg9'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
                 // 评估状态为增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg10'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg10'))
                 return
               }
             }
@@ -1574,24 +1394,14 @@ export default {
               // 淋巴结靶病灶 无标记
               if (measureData) {
                 // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg11'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg11'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 无标记
               if (measureData) {
                 // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg12'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg12'))
                 return
               }
             }
@@ -1602,24 +1412,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg13'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg13'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 箭头工具
               if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg14'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg14'))
                 return
               }
             }
@@ -1634,24 +1434,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为明确的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg15'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg15'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为明确的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg16'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg16'))
                 return
               }
             }
@@ -1663,24 +1453,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg17'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg17'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
                 // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
-                this.$confirm(this.$t('trials:iRecist:warnning:msg18'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg18'))
                 return
               }
             }
@@ -1692,24 +1472,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (measureData) {
                 // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
-                this.$confirm(this.$t('trials:iRecist:warnning:msg19'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg19'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (measureData) {
                 // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg20'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg20'))
                 return
               }
             }
@@ -1721,24 +1491,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg21'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg21'))
                 return
               }
             } else {
               // 箭头工具
               if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg22'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg22'))
                 return
               }
             }
@@ -1752,24 +1512,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为明确的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg23'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg23'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为存在的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg24'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg24'))
                 return
               }
             }
@@ -1781,24 +1531,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg25'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg25'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
                 // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
-                this.$confirm(this.$t('trials:iRecist:warnning:msg26'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg26'))
                 return
               }
             }
@@ -1809,24 +1549,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg27'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg27'))
                 return
               }
             } else {
               // 箭头工具
               if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
                 // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg28'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg28'))
                 return
               }
             }
@@ -1837,105 +1567,100 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (measureData) {
                 // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
-                this.$confirm(this.$t('trials:iRecist:warnning:msg29'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg29'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (measureData) {
                 // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
-                this.$confirm(this.$t('trials:iRecist:warnning:msg30'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:iRecist:warnning:msg30'))
                 return
               }
             }
           }
         }
+        }
+        canSubmit = true
+      } finally {
+        if (!canSubmit) {
+          resetSaveState()
+        }
       }
-
-      DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
-        // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
-        // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
-        // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
-        try {
-          var picturePath = ''
-          if (val && measureData && this.questionForm.IsDicomReading) {
-            var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
-            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-          }
-          var answers = []
-          var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
-          for (const k in this.questionForm) {
-            if (reg.test(k)) {
-              if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
-                answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
-              }
+      try {
+        const screenshot = await new Promise(resolve => {
+          DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, resolve)
+        })
+        var picturePath = ''
+        if (screenshot && measureData && this.questionForm.IsDicomReading) {
+          var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, screenshot)
+          picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+        }
+        var answers = []
+        var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
+        for (const k in this.questionForm) {
+          if (reg.test(k)) {
+            if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
+              answers.push({ tableQuestionId: k, answer: this.questionForm[k] })
             }
           }
-
-          var params = {
-            questionId: this.parentQsId,
-            rowId: this.questionForm.RowId,
-            rowIndex: this.answers.RowIndex,
-            visitTaskId: this.visitTaskId,
-            trialId: this.trialId,
-            measureData: measureData ? JSON.stringify(measureData) : '',
-            answerList: answers,
-            isCanEditPosition: this.questionForm.IsCanEditPosition,
-            studyId: measureData ? this.questionForm.MeasureData.studyId : '',
-            seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
-            instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
-            numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
-            picturePath: picturePath,
-            organInfoId: this.questionForm.OrganInfoId,
-            markTool: measureData ? measureData.type : '',
-            fromMark: this.answers.FromMark,
-            reportMark: this.answers.FromMark
-          }
-          if (this.questionForm.IsDicomReading === false) {
-            params.isDicomReading = false
-          }
-          if (this.deleteInfo) {
-            await this.deleteOldLesion(this.deleteInfo.rowId)
-            this.deleteInfo = null
-            params.rowId = ''
-          }
-          const res = await submitTableQuestion(params)
-          if (res.IsSuccess) {
-            // 保存成功！
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.currentMarkTool = measureData ? measureData.type : ''
-            // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
-            this.$set(this.questionForm, 'saveTypeEnum', 2)
-            this.originalQuestionForm = { ...this.questionForm }
-            var isLymphLesion = this.getQuestionVal(2)
-            var lesionOrgan = this.getQuestionVal(6)
-            this.$set(this.questionForm, 'RowId', res.Result.RowId)
-            const lesionPart = this.getQuestionVal(8)
-            const lesionState = this.getQuestionVal(7)
-            this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, rowId: res.Result.RowId, questionId: this.parentQsId, anwsers: this.questionForm })
-
-            // await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
-            // DicomEvent.$emit('getMeasureData')
-            this.$emit('close')
-            DicomEvent.$emit('getReportInfo', true)
-            DicomEvent.$emit('setMeasuredToolsPassive')
-          }
-          loading.close()
-        } catch (e) {
-          console.log(e)
-          loading.close()
         }
-      })
+
+        var params = {
+          questionId: this.parentQsId,
+          rowId: this.questionForm.RowId,
+          rowIndex: this.answers.RowIndex,
+          visitTaskId: this.visitTaskId,
+          trialId: this.trialId,
+          measureData: measureData ? JSON.stringify(measureData) : '',
+          answerList: answers,
+          isCanEditPosition: this.questionForm.IsCanEditPosition,
+          studyId: measureData ? this.questionForm.MeasureData.studyId : '',
+          seriesId: measureData ? this.questionForm.MeasureData.seriesId : '',
+          instanceId: measureData ? this.questionForm.MeasureData.instanceId : '',
+          numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
+          picturePath: picturePath,
+          organInfoId: this.questionForm.OrganInfoId,
+          markTool: measureData ? measureData.type : '',
+          fromMark: this.answers.FromMark,
+          reportMark: this.answers.FromMark
+        }
+        if (this.questionForm.IsDicomReading === false) {
+          params.isDicomReading = false
+        }
+        if (this.deleteInfo) {
+          await this.deleteOldLesion(this.deleteInfo.rowId)
+          this.deleteInfo = null
+          params.rowId = ''
+        }
+        const res = await submitTableQuestion(params)
+        if (res.IsSuccess) {
+          // 保存成功！
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.currentMarkTool = measureData ? measureData.type : ''
+          // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
+          this.$set(this.questionForm, 'saveTypeEnum', 2)
+          this.originalQuestionForm = { ...this.questionForm }
+          var isLymphLesion = this.getQuestionVal(2)
+          var lesionOrgan = this.getQuestionVal(6)
+          this.$set(this.questionForm, 'RowId', res.Result.RowId)
+          const lesionPart = this.getQuestionVal(8)
+          const lesionState = this.getQuestionVal(7)
+          this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, rowId: res.Result.RowId, questionId: this.parentQsId, anwsers: this.questionForm })
+
+          // await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
+          // DicomEvent.$emit('getMeasureData')
+          this.$emit('close')
+          DicomEvent.$emit('getReportInfo', true)
+          DicomEvent.$emit('setMeasuredToolsPassive')
+        }
+        return !!res.IsSuccess
+      } catch (e) {
+        console.log(e)
+        return false
+      } finally {
+        resetSaveState()
+      }
     },
     async handleDeleteMeasureData() {
       // 是否确认清除标记？
@@ -2122,6 +1847,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index c853378f..4883bf46 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -33,17 +33,21 @@
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
                     <div class="title">{{ item.QuestionName }}</div>
-                    <div v-if="item.LesionType === 104 && readingTaskState < 2">
-                      <div class="add-icon" @click.prevent="downloadTpl">
+                    <div v-if="item.LesionType === 104">
+                      <div 
+                        class="add-icon" @click.prevent="downloadTpl" v-if="readingTaskState < 2">
                         <i class="el-icon-download" />
                       </div>
                       <div class="add-icon" style="margin: 0 5px;"
-                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)" v-if="readingTaskState < 2">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)" v-if="readingTaskState < 2">
                         <i class="el-icon-plus" />
                       </div>
+                      <div class="add-icon" @click.prevent="handleView(item)">
+                        <i class="el-icon-view" />
+                      </div>
                     </div>
 
                   </div>
@@ -173,7 +177,8 @@
                 <div v-if="isCurrentTask && readingTaskState < 2 && (qs.GroupClassify === 5 || qs.GroupClassify === 6)"
                   class="base-dialog-footer" style="text-align:right;margin-top:10px;">
                   <!-- 保存 -->
-                  <el-button type="primary" size="mini" :disabled="!formChanged" @click="handleSave(index)">
+                  <el-button type="primary" size="mini" :loading="!!rowSaveLoadingMap[index]"
+                    :disabled="!!rowSaveLoadingMap[index] || !formChanged" @click="handleSave(index)">
                     {{ $t('common:button:save') }}
                   </el-button>
                 </div>
@@ -184,11 +189,22 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        :group-classify="4" style="margin-top:20px" />
+      <Questions 
+        ref="ecrf2" 
+        :question-form-change-state="true" 
+        :question-form-change-num="0" 
+        :is-qulity-issues="false"
+        :group-classify="4" 
+        :question-type="12"
+        style="margin-top:20px" />
 
       <!-- 评估结果 -->
-      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+      <Questions 
+        ref="ecrf3" 
+        :question-form-change-state="true" 
+        :question-form-change-num="0" 
+        :is-qulity-issues="false"
+        :question-type="12"
         :group-classify="5" />
       <!-- 新增、编辑弹窗 -->
       <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
@@ -202,7 +218,8 @@
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
-            <el-button size="small" class="my_upload_btn" @click="saveFormData">
+            <el-button size="small" class="my_upload_btn" :loading="dialogSaveLoading"
+              :disabled="dialogSaveLoading" @click="saveFormData">
               {{ $t('common:button:save') }}
             </el-button>
           </el-form-item>
@@ -220,6 +237,7 @@
 <script>
 import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
 import { resetReadingTask, getIVUSTemplate } from '@/api/reading'
+import { getToken } from '@/utils/auth'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { mapGetters } from 'vuex'
@@ -280,7 +298,10 @@ export default {
       lumenId: '',
       sRoiStartDistanceId: '',
       sRoiEndDistanceId: '',
-      sRoiDistanceId: ''
+      sRoiDistanceId: '',
+      rowSaveLoadingMap: {},
+      dialogSaveLoading: false,
+      childWindows: []
     }
   },
   computed: {
@@ -320,11 +341,13 @@ export default {
     DicomEvent.$on('refreshQuestions', _ => {
       this.refreshQuestions()
     })
+    window.addEventListener('beforeunload', this.closeAllChildWindows)
   },
   beforeDestroy() {
     DicomEvent.$off('setCollapseActive')
     DicomEvent.$off('getUnSaveTarget')
     DicomEvent.$off('refreshQuestions')
+    window.removeEventListener('beforeunload', this.closeAllChildWindows)
   },
   methods: {
     handleReadingChart(e) {
@@ -610,29 +633,37 @@ export default {
         return v
       }
     },
-    async handleSave(index) {
+    async handleSave(index, options = {}) {
+      if (this.rowSaveLoadingMap[index]) return
       const refName = `questions${index}`
-      const valid = await this.$refs[refName][0].validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
-      var answers = []
-      for (const k in this.questionForm) {
-        answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
-      }
-      var params = {
-        visitTaskId: this.visitTaskId,
-        answers: answers
-      }
+      this.$set(this.rowSaveLoadingMap, index, true)
+      let loading = null
       try {
+        const valid = await this.$refs[refName][0].validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
+        var answers = []
+        for (const k in this.questionForm) {
+          answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
+        }
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers: answers
+        }
         await saveTaskQuestion(12, params)
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        loading.close()
+        if (!options.silentSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
         DicomEvent.$emit('getReportInfo', true)
-        this.refreshQuestions()
+        if (!options.skipRefresh) {
+          await this.refreshQuestions()
+        }
         this.formChanged = false
       } catch (e) {
         console.log(e)
-        loading.close()
+      } finally {
+        if (loading) loading.close()
+        this.$set(this.rowSaveLoadingMap, index, false)
       }
     },
     getECRFQuestions(obj) {
@@ -731,11 +762,32 @@ export default {
       this.addOrEdit.visible = true
       this.addOrEdit.lesionType = row.LesionType
     },
+    handleView(item) {
+      localStorage.setItem('taskBlindName', this.taskBlindName)
+      localStorage.setItem('isReadingShowSubjectInfo', this.isReadingShowSubjectInfo)
+      let token = getToken()
+      let routeData = this.$router.resolve({ path: `/ecrfList?trialId=${this.$route.query.trialId}&visitTaskId=${this.visitTaskId}&questionId=${item.Id}&TokenKey=${token}` })
+      const win = window.open(routeData.href, '_blank')
+      if (win) {
+        this.childWindows.push(win)
+      }
+    },
+    closeAllChildWindows() {
+      this.childWindows.forEach(win => {
+        if (win && !win.closed) {
+          win.close()
+        }
+      })
+      this.childWindows = []
+    },
     async saveFormData() {
-      const valid = await this.$refs.tableQsForm.validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
+      if (this.dialogSaveLoading) return
+      this.dialogSaveLoading = true
+      let loading = null
       try {
+        const valid = await this.$refs.tableQsForm.validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
         var answers = []
         var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
         for (const k in this.qsForm) {
@@ -765,10 +817,11 @@ export default {
           this.addOrEdit.visible = false
           this.$message.success(this.$t('common:message:savedSuccessfully'))
         }
-        loading.close()
       } catch (e) {
         console.log(e)
-        loading.close()
+      } finally {
+        if (loading) loading.close()
+        this.dialogSaveLoading = false
       }
     },
     async handleDelete(row, index) {
@@ -820,9 +873,29 @@ export default {
       }
     },
     async uploadDlgClose() {
-      this.refreshQuestions()
-      DicomEvent.$emit('getReportInfo', true)
-      this.upload.visible = false
+      try {
+        await this.refreshQuestions()
+        const saveTasks = []
+        for (let index = 0; index < this.questions.length; index++) {
+          const qs = this.questions[index]
+          if (qs.GroupClassify === 6) {
+            saveTasks.push(() => this.handleSave(index, { silentSuccess: true, skipRefresh: true }))
+          }
+        }
+        saveTasks.push(() => this.$refs['ecrf2'] && this.$refs['ecrf2'].handleSave({ silentSuccess: true, skipRefresh: true }))
+        saveTasks.push(() => this.$refs['ecrf3'] && this.$refs['ecrf3'].handleSave({ silentSuccess: true, skipRefresh: true }))
+        for (const saveTask of saveTasks) {
+          try {
+            await saveTask()
+          } catch (e) {
+            console.log(e)
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.upload.visible = false
+      }
     },
     renderHeader(h, { column, $index }) {
       const span = document.createElement('span')
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
index 175d3b1f..0edbab96 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
@@ -249,4 +249,9 @@ export default {
 ::v-deep .el-select.is-disabled .el-input__inner {
   background-color: #646464a1;
 }
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #428bca;
+  border-color: #428bca;
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 1ef29375..dcb6076a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
     class="measurement-form">
     <div class="base-dialog-body">
@@ -192,7 +192,7 @@
           {{ $t('common:button:delete') }}
         </el-button>
         <!-- 保存 -->
-        <el-button size="mini" @click="handleSave">
+        <el-button size="mini" :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </div>
@@ -276,7 +276,9 @@ export default {
       stateDisabled: false,
       splitLesionTargetPPD: null,
       splitLesionTargetLDi: null,
-      splitLesionTargetSDi: null
+      splitLesionTargetSDi: null,
+      saveLoading: false,
+      validationDialogVisible: false
     }
   },
   mounted() {
@@ -299,7 +301,24 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    scrollHandle() {
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },    scrollHandle() {
       for (const k in this.$refs) {
         if (k.indexOf('select_') === -1) continue
         if (this.$refs[k] instanceof Array) {
@@ -1039,43 +1058,41 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     async handleSave() {
-      const valid = await this.$refs.measurementForm.validate()
-      if (!valid) {
-        if (this.lesionType === 0) {
-          this.$refs['scrollPanel'].scrollTo({ top: 0, behavior: 'smooth' })
+      if (this.saveLoading) return
+      this.saveLoading = true
+      let loading = null
+      try {
+        const valid = await this.$refs.measurementForm.validate()
+        if (!valid) {
+          if (this.lesionType === 0) {
+            this.$refs['scrollPanel'].scrollTo({ top: 0, behavior: 'smooth' })
+          }
+          return
         }
-        return
-      }
-      const loading = this.$loading({ fullscreen: true })
-      var measureData = this.questionForm.MeasureData
-      var lesionState = this.getQuestionVal(7)
-      var lesionLength = this.getQuestionVal(0)
-      var lesionShort = this.getQuestionVal(1)
-      var lymphNodes = this.getQuestionVal(2)
-      lymphNodes = (lymphNodes !== null && lymphNodes !== undefined) ? parseInt(lymphNodes) : null
-      if (this.isBaseLineTask) {
+        loading = this.$loading({ fullscreen: true })
+        var measureData = this.questionForm.MeasureData
+        var lesionState = this.getQuestionVal(7)
+        var lesionLength = this.getQuestionVal(0)
+        var lesionShort = this.getQuestionVal(1)
+        var lymphNodes = this.getQuestionVal(2)
+        lymphNodes = (lymphNodes !== null && lymphNodes !== undefined) ? parseInt(lymphNodes) : null
+        if (this.isBaseLineTask) {
         // 基线
         // 靶病灶且状态为存在（0）
         if (this.lesionType === 0 && lesionState === 0) {
           if (lymphNodes === 1) {
             //  评估状态为“存在”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15 && lesionLength >= 2 * measureData.thick)) {
-              this.$confirm(this.$t('trials:lugano:message:validState1'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState1'))
+
               loading.close()
               return
             }
           } else {
             // 评估状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10 && lesionLength >= 2 * measureData.thick)) {
-              this.$confirm(this.$t('trials:lugano:message:validState2'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState2'))
+
               loading.close()
               return
             }
@@ -1087,22 +1104,16 @@ export default {
           if (lymphNodes === 1) {
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
-              this.$confirm(this.$t('trials:reading:warnning:msg21'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg21'))
+
               loading.close()
               return
             }
           } else {
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的非淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
-              this.$confirm(this.$t('trials:lugano:message:validState12'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState12'))
+
               loading.close()
               return
             }
@@ -1115,11 +1126,8 @@ export default {
           if (lymphNodes === 1) {
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15)) {
               // 状态为“存在”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
-              this.$confirm(this.$t('trials:lugano:message:validState3'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState3'))
+
               loading.close()
               return
             }
@@ -1127,11 +1135,8 @@ export default {
             // 非淋巴结靶病灶 长短径测量工具
             if (!(measureData && measureData.type === 'Bidirectional')) {
               // 状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
-              this.$confirm(this.$t('trials:lugano:message:validState4'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState4'))
+
               loading.close()
               return
             }
@@ -1143,11 +1148,8 @@ export default {
             // 淋巴结靶病灶 必须使用箭头工具，长径、短径记录为5mm
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg25'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg25'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -1162,11 +1164,8 @@ export default {
             // 非淋巴结靶病灶 箭头工具，长径记录为5mm
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg26'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg26'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -1186,11 +1185,8 @@ export default {
             // 淋巴结靶病灶 不需要添加标记
             if (measureData) {
               // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg27'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg27'))
+
               loading.close()
               return
             }
@@ -1198,11 +1194,8 @@ export default {
             // 非淋巴结靶病灶 不需要添加标记
             if (measureData) {
               // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg28'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg28'))
+
               loading.close()
               return
             }
@@ -1215,20 +1208,14 @@ export default {
             // 淋巴结靶病灶 使用箭头工具 measureData.type === 'ArrowAnnotate' ||
             if (!(measureData && (measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结靶病灶需使用箭头工具或长短径工具添加标记！
-              this.$confirm(this.$t('trials:lugano:message:validState5'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState5'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'Bidirectional' && lesionLength > 15) {
               // 评估状态为消失的淋巴结靶病灶,短径应不大于15mm！
-              this.$confirm(this.$t('trials:lugano:message:validState6'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState6'))
+
               loading.close()
               return
             }
@@ -1246,11 +1233,8 @@ export default {
             // 非淋巴结靶病灶 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:lugano:warnning:validState7'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:warnning:validState7'))
+
               loading.close()
               return
             }
@@ -1275,11 +1259,8 @@ export default {
           if (lymphNodes === 1) {
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15)) {
               // 状态为“疾病进展”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
-              this.$confirm(this.$t('trials:lugano:message:validState7'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState7'))
+
               loading.close()
               return
             }
@@ -1287,11 +1268,8 @@ export default {
             // 非淋巴结靶病灶 直径测量工具
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10)) {
               // 状态为“疾病进展”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
-              this.$confirm(this.$t('trials:lugano:message:validState8'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState8'))
+
               loading.close()
               return
             }
@@ -1304,11 +1282,8 @@ export default {
             // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg31'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg31'))
+
               loading.close()
               return
             }
@@ -1316,11 +1291,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的非淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:lugano:message:validState9'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState9'))
+
               loading.close()
               return
             }
@@ -1333,11 +1305,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg33'))
+
               loading.close()
               return
             }
@@ -1345,11 +1314,8 @@ export default {
             // 非淋巴结非靶病灶 矩形工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为显著增大的非淋巴结非靶病灶需使用矩形工具添加标记！
-              this.$confirm(this.$t('trials:lugano:message:validState10'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState10'))
+
               loading.close()
               return
             }
@@ -1362,11 +1328,8 @@ export default {
             // 淋巴结靶病灶 无标记
             if (measureData) {
               // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg35'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg35'))
+
               loading.close()
               return
             }
@@ -1374,11 +1337,8 @@ export default {
             // 非淋巴结非靶病灶 无标记
             if (measureData) {
               // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg36'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg36'))
+
               loading.close()
               return
             }
@@ -1391,11 +1351,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionLength < 15)))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:lgmsg37'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:lgmsg37'))
+
               loading.close()
               return
             }
@@ -1403,11 +1360,8 @@ export default {
             // 非淋巴结非靶病灶 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg38'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg38'))
+
               loading.close()
               return
             }
@@ -1420,11 +1374,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg39'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg39'))
+
               loading.close()
               return
             }
@@ -1432,11 +1383,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为存在的非淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:lugano:message:validState11'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState11'))
+
               loading.close()
               return
             }
@@ -1478,11 +1426,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (measureData) {
               // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg43'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg43'))
+
               loading.close()
               return
             }
@@ -1490,11 +1435,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (measureData) {
               // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg44'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg44'))
+
               loading.close()
               return
             }
@@ -1507,11 +1449,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionLength < 15)))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:lgmsg45'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:lgmsg45'))
+
               loading.close()
               return
             }
@@ -1519,16 +1458,17 @@ export default {
             // 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg46'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg46'))
+
               loading.close()
               return
             }
           }
         }
+        }
+      } finally {
+        if (loading) loading.close()
+        this.saveLoading = false
       }
       DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
         // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
@@ -1803,6 +1743,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
index 1ef29375..dcb6076a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
     class="measurement-form">
     <div class="base-dialog-body">
@@ -192,7 +192,7 @@
           {{ $t('common:button:delete') }}
         </el-button>
         <!-- 保存 -->
-        <el-button size="mini" @click="handleSave">
+        <el-button size="mini" :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
       </div>
@@ -276,7 +276,9 @@ export default {
       stateDisabled: false,
       splitLesionTargetPPD: null,
       splitLesionTargetLDi: null,
-      splitLesionTargetSDi: null
+      splitLesionTargetSDi: null,
+      saveLoading: false,
+      validationDialogVisible: false
     }
   },
   mounted() {
@@ -299,7 +301,24 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    scrollHandle() {
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },    scrollHandle() {
       for (const k in this.$refs) {
         if (k.indexOf('select_') === -1) continue
         if (this.$refs[k] instanceof Array) {
@@ -1039,43 +1058,41 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     async handleSave() {
-      const valid = await this.$refs.measurementForm.validate()
-      if (!valid) {
-        if (this.lesionType === 0) {
-          this.$refs['scrollPanel'].scrollTo({ top: 0, behavior: 'smooth' })
+      if (this.saveLoading) return
+      this.saveLoading = true
+      let loading = null
+      try {
+        const valid = await this.$refs.measurementForm.validate()
+        if (!valid) {
+          if (this.lesionType === 0) {
+            this.$refs['scrollPanel'].scrollTo({ top: 0, behavior: 'smooth' })
+          }
+          return
         }
-        return
-      }
-      const loading = this.$loading({ fullscreen: true })
-      var measureData = this.questionForm.MeasureData
-      var lesionState = this.getQuestionVal(7)
-      var lesionLength = this.getQuestionVal(0)
-      var lesionShort = this.getQuestionVal(1)
-      var lymphNodes = this.getQuestionVal(2)
-      lymphNodes = (lymphNodes !== null && lymphNodes !== undefined) ? parseInt(lymphNodes) : null
-      if (this.isBaseLineTask) {
+        loading = this.$loading({ fullscreen: true })
+        var measureData = this.questionForm.MeasureData
+        var lesionState = this.getQuestionVal(7)
+        var lesionLength = this.getQuestionVal(0)
+        var lesionShort = this.getQuestionVal(1)
+        var lymphNodes = this.getQuestionVal(2)
+        lymphNodes = (lymphNodes !== null && lymphNodes !== undefined) ? parseInt(lymphNodes) : null
+        if (this.isBaseLineTask) {
         // 基线
         // 靶病灶且状态为存在（0）
         if (this.lesionType === 0 && lesionState === 0) {
           if (lymphNodes === 1) {
             //  评估状态为“存在”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15 && lesionLength >= 2 * measureData.thick)) {
-              this.$confirm(this.$t('trials:lugano:message:validState1'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState1'))
+
               loading.close()
               return
             }
           } else {
             // 评估状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10 && lesionLength >= 2 * measureData.thick)) {
-              this.$confirm(this.$t('trials:lugano:message:validState2'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState2'))
+
               loading.close()
               return
             }
@@ -1087,22 +1104,16 @@ export default {
           if (lymphNodes === 1) {
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
-              this.$confirm(this.$t('trials:reading:warnning:msg21'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg21'))
+
               loading.close()
               return
             }
           } else {
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的非淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
-              this.$confirm(this.$t('trials:lugano:message:validState12'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState12'))
+
               loading.close()
               return
             }
@@ -1115,11 +1126,8 @@ export default {
           if (lymphNodes === 1) {
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15)) {
               // 状态为“存在”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
-              this.$confirm(this.$t('trials:lugano:message:validState3'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState3'))
+
               loading.close()
               return
             }
@@ -1127,11 +1135,8 @@ export default {
             // 非淋巴结靶病灶 长短径测量工具
             if (!(measureData && measureData.type === 'Bidirectional')) {
               // 状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
-              this.$confirm(this.$t('trials:lugano:message:validState4'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState4'))
+
               loading.close()
               return
             }
@@ -1143,11 +1148,8 @@ export default {
             // 淋巴结靶病灶 必须使用箭头工具，长径、短径记录为5mm
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg25'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg25'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -1162,11 +1164,8 @@ export default {
             // 非淋巴结靶病灶 箭头工具，长径记录为5mm
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg26'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg26'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -1186,11 +1185,8 @@ export default {
             // 淋巴结靶病灶 不需要添加标记
             if (measureData) {
               // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg27'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg27'))
+
               loading.close()
               return
             }
@@ -1198,11 +1194,8 @@ export default {
             // 非淋巴结靶病灶 不需要添加标记
             if (measureData) {
               // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg28'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg28'))
+
               loading.close()
               return
             }
@@ -1215,20 +1208,14 @@ export default {
             // 淋巴结靶病灶 使用箭头工具 measureData.type === 'ArrowAnnotate' ||
             if (!(measureData && (measureData.type === 'Bidirectional'))) {
               // 评估状态为消失的淋巴结靶病灶需使用箭头工具或长短径工具添加标记！
-              this.$confirm(this.$t('trials:lugano:message:validState5'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState5'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'Bidirectional' && lesionLength > 15) {
               // 评估状态为消失的淋巴结靶病灶,短径应不大于15mm！
-              this.$confirm(this.$t('trials:lugano:message:validState6'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState6'))
+
               loading.close()
               return
             }
@@ -1246,11 +1233,8 @@ export default {
             // 非淋巴结靶病灶 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:lugano:warnning:validState7'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:warnning:validState7'))
+
               loading.close()
               return
             }
@@ -1275,11 +1259,8 @@ export default {
           if (lymphNodes === 1) {
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 15)) {
               // 状态为“疾病进展”的淋巴结靶病灶，长径应大于15 mm，请使用长短径测量工具添加标记。
-              this.$confirm(this.$t('trials:lugano:message:validState7'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState7'))
+
               loading.close()
               return
             }
@@ -1287,11 +1268,8 @@ export default {
             // 非淋巴结靶病灶 直径测量工具
             if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10)) {
               // 状态为“疾病进展”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
-              this.$confirm(this.$t('trials:lugano:message:validState8'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState8'))
+
               loading.close()
               return
             }
@@ -1304,11 +1282,8 @@ export default {
             // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg31'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg31'))
+
               loading.close()
               return
             }
@@ -1316,11 +1291,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的非淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:lugano:message:validState9'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState9'))
+
               loading.close()
               return
             }
@@ -1333,11 +1305,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg33'))
+
               loading.close()
               return
             }
@@ -1345,11 +1314,8 @@ export default {
             // 非淋巴结非靶病灶 矩形工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为显著增大的非淋巴结非靶病灶需使用矩形工具添加标记！
-              this.$confirm(this.$t('trials:lugano:message:validState10'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState10'))
+
               loading.close()
               return
             }
@@ -1362,11 +1328,8 @@ export default {
             // 淋巴结靶病灶 无标记
             if (measureData) {
               // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg35'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg35'))
+
               loading.close()
               return
             }
@@ -1374,11 +1337,8 @@ export default {
             // 非淋巴结非靶病灶 无标记
             if (measureData) {
               // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg36'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg36'))
+
               loading.close()
               return
             }
@@ -1391,11 +1351,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionLength < 15)))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:lgmsg37'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:lgmsg37'))
+
               loading.close()
               return
             }
@@ -1403,11 +1360,8 @@ export default {
             // 非淋巴结非靶病灶 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg38'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg38'))
+
               loading.close()
               return
             }
@@ -1420,11 +1374,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg39'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg39'))
+
               loading.close()
               return
             }
@@ -1432,11 +1383,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为存在的非淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:lugano:message:validState11'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:lugano:message:validState11'))
+
               loading.close()
               return
             }
@@ -1478,11 +1426,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (measureData) {
               // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg43'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg43'))
+
               loading.close()
               return
             }
@@ -1490,11 +1435,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (measureData) {
               // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg44'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg44'))
+
               loading.close()
               return
             }
@@ -1507,11 +1449,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionLength < 15)))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:lgmsg45'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:lgmsg45'))
+
               loading.close()
               return
             }
@@ -1519,16 +1458,17 @@ export default {
             // 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg46'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg46'))
+
               loading.close()
               return
             }
           }
         }
+        }
+      } finally {
+        if (loading) loading.close()
+        this.saveLoading = false
       }
       DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
         // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
@@ -1803,6 +1743,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index 59beea11..e7fa362f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -139,7 +139,7 @@
     <div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer"
       style="text-align:right;margin-top:10px;">
       <!-- 保存 -->
-      <el-button size="mini" @click="handleSave">
+      <el-button size="mini" :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -219,7 +219,8 @@ export default {
       isMeasurableId: '',
       isExitsMarks: false,
       isDisabledMeasurableRadio: false,
-      liverSeg: ''
+      liverSeg: '',
+      saveLoading: false
     }
   },
   mounted() {
@@ -698,9 +699,14 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     async handleSave() {
+      if (this.saveLoading) return
+      this.saveLoading = true
       try {
         const valid = await this.$refs.measurementForm.validate()
-        if (!valid) return
+        if (!valid) {
+          this.saveLoading = false
+          return
+        }
         if (parseInt(this.questionForm[this.isMeasurableId]) === 1) {
           // 检验是否有标记为保存
           const i = this.markList.findIndex(i => i.saveEnum === 0)
@@ -708,6 +714,7 @@ export default {
             // 请先保存标注信息！
             this.$alert(this.$t('trials:MRIPDFF:message:message1'))
             // this.$message.warning(this.$t('trials:MRIPDFF:message:message1'))
+            this.saveLoading = false
             return
           }
         } else {
@@ -720,7 +727,10 @@ export default {
               distinguishCancelAndClose: true
             }
           )
-          if (confirm !== 'confirm') return
+          if (confirm !== 'confirm') {
+            this.saveLoading = false
+            return
+          }
           const l1Id = this.getQuestionId(1101)
           this.$set(this.questionForm, l1Id, '')
           const l2Id = this.getQuestionId(1102)
@@ -779,12 +789,15 @@ export default {
             this.$emit('getReadingQuestionAndAnswer')
           }
           loading.close()
+          this.saveLoading = false
         } catch (e) {
           console.log(e)
           loading.close()
+          this.saveLoading = false
         }
       } catch (e) {
         console.log(e)
+        this.saveLoading = false
       }
     },
     async handleClose() {
@@ -830,6 +843,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 7px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFFAdvance/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFFAdvance/QuestionForm.vue
index c1d750f5..4435745a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFFAdvance/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFFAdvance/QuestionForm.vue
@@ -145,7 +145,7 @@
         {{ $t('trials:reading:button:removeMark') }}
       </el-button> -->
       <!-- 保存 -->
-      <el-button size="mini" @click="handleSave">
+      <el-button size="mini" :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -223,7 +223,8 @@ export default {
       digitPlaces: 2,
       isMeasurableId: '',
       isDisabledMeasurableRadio: false,
-      liverSeg: ''
+      liverSeg: '',
+      saveLoading: false
     }
   },
   mounted() {
@@ -555,9 +556,14 @@ export default {
       DicomEvent.$emit('refreshStudyListMeasureData')
     },
     async handleSave() {
+      if (this.saveLoading) return
+      this.saveLoading = true
       try {
         const valid = await this.$refs.measurementForm.validate()
-        if (!valid) return
+        if (!valid) {
+          this.saveLoading = false
+          return
+        }
         const loading = this.$loading({ fullscreen: true })
         let measureData = this.questionForm.MeasureData
         if (parseInt(this.questionForm[this.isMeasurableId]) === 0 && measureData) {
@@ -613,12 +619,15 @@ export default {
               this.$emit('getReadingQuestionAndAnswer')
             }
             loading.close()
+            this.saveLoading = false
           } catch(e) {
             loading.close()
+            this.saveLoading = false
           }
         })
       } catch (e) {
         console.log(e)
+        this.saveLoading = false
       }
     },
     async handleClose() {
@@ -664,6 +673,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 7px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
index 01508b8f..52b75423 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/NoneDicomsCanvas.vue
@@ -30,12 +30,12 @@
           <div class="image-viewer__actions__inner">
             <i class="el-icon-zoom-out" @click="handleActions('zoomOut')" />
             <i class="el-icon-zoom-in" @click="handleActions('zoomIn')" />
-            <i class="el-image-viewer__actions__divider" />
+            <!-- <i class="el-image-viewer__actions__divider" /> -->
             <i class="el-icon-c-scale-to-original" @click="toggleMode" />
-            <i class="el-image-viewer__actions__divider" />
+            <!-- <i class="el-image-viewer__actions__divider" /> -->
             <i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
             <i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
-            <i v-if="readingTaskState < 2" class="el-icon-bottom-right"
+            <i v-if="readingTaskState < 2 && taskInfo.CriterionType !== 19 && taskInfo.CriterionType !== 20" class="el-icon-bottom-right"
               :style="{ cursor: isToolDisabled || readingTaskState >= 2 ? 'not-allowed' : 'pointer' }"
               @click="handleDrawArrow" />
 
@@ -44,7 +44,7 @@
               :style="{cursor:isToolDisabled || readingTaskState >=2 ?'not-allowed':'pointer'}"
               @click="handleDrawRectangle"
             /> -->
-            <svg-icon v-if="readingTaskState < 2" icon-class="rectangle" class="svg-icon"
+            <svg-icon v-if="readingTaskState < 2 && taskInfo.CriterionType !== 19 && taskInfo.CriterionType !== 20" icon-class="rectangle" class="svg-icon"
               :style="{ cursor: isToolDisabled || readingTaskState >= 2 ? 'not-allowed' : 'pointer' }"
               @click="handleDrawRectangle" />
           </div>
@@ -109,6 +109,7 @@ export default {
     }
   },
   data() {
+    const taskInfo = JSON.parse(localStorage.getItem('taskInfo') || '{}')
     return {
       loading: false,
       index: this.initialIndex,
@@ -137,11 +138,13 @@ export default {
       currentDrawData: {},
       canvasData: [],
       imgZoom: 1,
+      isDragging: false,
       isToolDisabled: false,
       lesionName: '',
       visitTaskId: '',
       isInit: false,
-      imgSize: { height: '', width: '' } // 图片原始尺寸
+      imgSize: { height: '', width: '' }, // 图片原始尺寸
+      taskInfo
     }
   },
   computed: {
@@ -209,6 +212,10 @@ export default {
     }
     this.deviceSupportInstall()
   },
+  beforeDestroy() {
+    window.removeEventListener('message', this.receiveMsg)
+    this.stopDragging()
+  },
   methods: {
     getCanvasData() {
       return new Promise(async resolve => {
@@ -337,25 +344,55 @@ export default {
     // 初始化画布
     initCanvas(img) {
       this.loading = true
-      this.canvasSize.height = img.height
-      this.canvasSize.width = img.width
-
       this.imgSize.height = img.height
       this.imgSize.width = img.width
 
       const canvasDiv = document.getElementsByClassName('image-viewer__canvas')[0]
+      const widthRatio = canvasDiv && canvasDiv.offsetWidth ? canvasDiv.offsetWidth / img.width : 1
+      const heightRatio = canvasDiv && canvasDiv.offsetHeight ? canvasDiv.offsetHeight / img.height : 1
+      this.imgZoom = Math.min(widthRatio, heightRatio, 1)
+      this.canvasSize.height = Math.round(img.height * this.imgZoom)
+      this.canvasSize.width = Math.round(img.width * this.imgZoom)
       this.canvasPosition = {
-        x: canvasDiv.offsetWidth / 2 - img.width / 2,
-        y: canvasDiv.offsetHeight / 2 - img.height / 2 - 25
+        x: canvasDiv.offsetWidth / 2 - this.canvasSize.width / 2,
+        y: canvasDiv.offsetHeight / 2 - this.canvasSize.height / 2 - 25
       } // 背景居中
 
       this.$nextTick(async () => {
         ctx = document.getElementById('canvas').getContext('2d') // 获取上下文
-        await ctx.drawImage(img, 0, 0, img.width, img.height) // 在canvas中绘制图片(图片、起始位置、绘图尺寸)
+        await ctx.drawImage(img, 0, 0, this.canvasSize.width, this.canvasSize.height) // 在canvas中绘制图片(图片、起始位置、绘图尺寸)
         this.drawToArr()
         this.loading = false
       })
     },
+    scalePoint(point) {
+      return {
+        x: point.x * this.imgZoom,
+        y: point.y * this.imgZoom
+      }
+    },
+    startDragging(e) {
+      const { offsetX, offsetY } = this.transform
+      const startX = e.pageX
+      const startY = e.pageY
+      this.isDragging = true
+      this._dragHandler = rafThrottle((ev) => {
+        this.transform.offsetX = offsetX + ev.pageX - startX
+        this.transform.offsetY = offsetY + ev.pageY - startY
+      })
+      this._dragEndHandler = () => {
+        this.stopDragging()
+      }
+      on(document, 'mousemove', this._dragHandler)
+      on(document, 'mouseup', this._dragEndHandler)
+    },
+    stopDragging() {
+      off(document, 'mousemove', this._dragHandler)
+      off(document, 'mouseup', this._dragEndHandler)
+      this._dragHandler = null
+      this._dragEndHandler = null
+      this.isDragging = false
+    },
 
     // 清空画布
     clearCanvas() {
@@ -381,6 +418,11 @@ export default {
       if (e.button !== 0) {
         return
       }
+      if (!this.model) {
+        this.startDragging(e)
+        e.preventDefault()
+        return
+      }
       this.isMouseDown = true // 打开鼠标状态
       // 获取画布中鼠标开始点击位置
       this.canvasMouseStart = {
@@ -391,6 +433,9 @@ export default {
 
     // 鼠标移动事件
     async handleMouseMove(e) {
+      if (!this.model || this.isDragging) {
+        return
+      }
       // 获取屏幕中鼠标位置(显示实时坐标)
       this.mousePosition = {
         x: e.pageX,
@@ -437,10 +482,12 @@ export default {
             var headlen = 10// 自定义箭头线的长度
             var theta = 45// 自定义箭头线与直线的夹角
             var arrowX, arrowY// 箭头线终点坐标
-            var fromX = e.data.handles.start.x
-            var fromY = e.data.handles.start.y
-            var toX = e.data.handles.end.x
-            var toY = e.data.handles.end.y
+            var start = this.scalePoint(e.data.handles.start)
+            var end = this.scalePoint(e.data.handles.end)
+            var fromX = start.x
+            var fromY = start.y
+            var toX = end.x
+            var toY = end.y
             // 计算各角度和对应的箭头终点坐标
             var angle = Math.atan2(fromY - toY, fromX - toX) * 180 / Math.PI
             var angle1 = (angle + theta) * Math.PI / 180
@@ -453,8 +500,8 @@ export default {
             // 画直线
             ctx.lineWidth = this.lineWidth
             ctx.beginPath()
-            ctx.moveTo(fromX * this.imgZoom, fromY * this.imgZoom)
-            ctx.lineTo(toX * this.imgZoom, toY * this.imgZoom)
+            ctx.moveTo(fromX, fromY)
+            ctx.lineTo(toX, toY)
 
             arrowX = toX + topX
             arrowY = toY + topY
@@ -473,18 +520,16 @@ export default {
             ctx.lineWidth = this.lineWidth
             ctx.beginPath()
             ctx.strokeStyle = this.color
+            const start = this.scalePoint(e.data.handles.start)
+            const end = this.scalePoint(e.data.handles.end)
             // 绘制矩形边框
             ctx.strokeRect(
-              // this.canvasMouseStart.x,
-              // this.canvasMouseStart.y,
-              // e.offsetX - this.canvasMouseStart.x,
-              // e.offsetY - this.canvasMouseStart.y
-              e.data.handles.start.x,
-              e.data.handles.start.y,
-              e.data.handles.end.x - e.data.handles.start.x,
-              e.data.handles.end.y - e.data.handles.start.y
+              start.x,
+              start.y,
+              end.x - start.x,
+              end.y - start.y
             )
-            this.drawText(ctx, { x: e.data.handles.start.x, y: e.data.handles.start.y }, { x: e.data.handles.end.x, y: e.data.handles.end.y }, e.data.remark, this.color)
+            this.drawText(ctx, start, end, e.data.remark, this.color)
           }
         }
       })
@@ -495,6 +540,10 @@ export default {
       if (e.button !== 0) {
         return // 非左键松开
       }
+      if (this.isDragging) {
+        this.stopDragging()
+        return
+      }
 
       // 左键松开
       if (this.model === 'ArrowAnnotate' || this.model === 'RectangleRoi') {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index deec77ee..5ca8d75d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -33,17 +33,20 @@
                 <div v-for="item in qs.Childrens" :key="item.Id">
                   <div v-if="item.Type === 'basicTable'" class="flex-row" style="margin:3px 0;">
                     <div class="title">{{ item.QuestionName }}</div>
-                    <div v-if="(item.LesionType === 104) && readingTaskState < 2">
-                      <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)">
+                    <div v-if="(item.LesionType === 104)">
+                      <div class="add-icon" @click.prevent="downloadTpl(item.LesionType)" v-if="readingTaskState < 2">
                         <i class="el-icon-download" />
                       </div>
                       <div class="add-icon" style="margin: 0 5px;"
-                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)">
+                        @click.prevent="uploadTpl(item.LesionType, item.QuestionName)" v-if="readingTaskState < 2">
                         <i class="el-icon-upload2" />
                       </div>
-                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)">
+                      <div class="add-icon" @click.prevent="handleAddOrEdit('add', item)" v-if="readingTaskState < 2">
                         <i class="el-icon-plus" />
                       </div>
+                      <div class="add-icon" @click.prevent="handleView(item)">
+                        <i class="el-icon-view" />
+                      </div>
                     </div>
 
                   </div>
@@ -174,7 +177,8 @@
                 <div v-if="isCurrentTask && readingTaskState < 2 && (qs.GroupClassify === 5 || qs.GroupClassify === 6)"
                   class="base-dialog-footer" style="text-align:right;margin-top:10px;">
                   <!-- 保存 -->
-                  <el-button type="primary" size="mini" :disabled="!formChanged" @click="handleSave(index)">
+                  <el-button type="primary" size="mini" :loading="!!rowSaveLoadingMap[index]"
+                    :disabled="!!rowSaveLoadingMap[index] || !formChanged" @click="handleSave(index)">
                     {{ $t('common:button:save') }}
                   </el-button>
                 </div>
@@ -185,11 +189,22 @@
       </template>
 
       <!-- 计算值 -->
-      <Questions ref="ecrf2" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
-        :group-classify="4" style="margin-top:20px" />
+      <Questions 
+        ref="ecrf2" 
+        :question-form-change-state="true" 
+        :question-form-change-num="0" 
+        :is-qulity-issues="false"
+        :group-classify="4" 
+        :question-type="12"
+        style="margin-top:20px" />
 
       <!-- 评估结果 -->
-      <Questions ref="ecrf3" :question-form-change-state="true" :question-form-change-num="0" :is-qulity-issues="false"
+      <Questions 
+        ref="ecrf3" 
+        :question-form-change-state="true" 
+        :question-form-change-num="0" 
+        :is-qulity-issues="false"
+        :question-type="12"
         :group-classify="5" />
       <el-dialog v-if="addOrEdit.visible" :visible.sync="addOrEdit.visible" :close-on-click-modal="false"
         :title="addOrEdit.title" width="500px">
@@ -202,7 +217,8 @@
               {{ $t('common:button:cancel') }}
             </el-button>
             <!-- 保存 -->
-            <el-button size="small" class="my_upload_btn" @click="saveFormData">
+            <el-button size="small" class="my_upload_btn" :loading="dialogSaveLoading"
+              :disabled="dialogSaveLoading" @click="saveFormData">
               {{ $t('common:button:save') }}
             </el-button>
           </el-form-item>
@@ -222,6 +238,7 @@ import { saveTaskQuestion, submitTableQuestion, deleteReadingRowAnswer } from '@
 import { resetReadingTask, getOCTFCTTemplate, getOCTLipidAngleTemplate } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
+import { getToken } from '@/utils/auth'
 import { mapGetters } from 'vuex'
 import Questions from './../Questions'
 import QuestionTableFormItem from './QuestionTableFormItem'
@@ -281,7 +298,10 @@ export default {
       avgId: '',
       sRoiStartDistanceId: '',
       sRoiEndDistanceId: '',
-      sRoiDistanceId: ''
+      sRoiDistanceId: '',
+      rowSaveLoadingMap: {},
+      dialogSaveLoading: false,
+      childWindows: []
     }
   },
   computed: {
@@ -321,11 +341,13 @@ export default {
     DicomEvent.$on('refreshQuestions', _ => {
       this.refreshQuestions()
     })
+    window.addEventListener('beforeunload', this.closeAllChildWindows)
   },
   beforeDestroy() {
     DicomEvent.$off('setCollapseActive')
     DicomEvent.$off('getUnSaveTarget')
     DicomEvent.$off('refreshQuestions')
+    window.removeEventListener('beforeunload', this.closeAllChildWindows)
   },
   methods: {
     handleReadingChart(e) {
@@ -606,29 +628,37 @@ export default {
         return v
       }
     },
-    async handleSave(index) {
+    async handleSave(index, options = {}) {
+      if (this.rowSaveLoadingMap[index]) return
       const refName = `questions${index}`
-      const valid = await this.$refs[refName][0].validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
-      var answers = []
-      for (const k in this.questionForm) {
-        answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
-      }
-      var params = {
-        visitTaskId: this.visitTaskId,
-        answers: answers
-      }
+      this.$set(this.rowSaveLoadingMap, index, true)
+      let loading = null
       try {
+        const valid = await this.$refs[refName][0].validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
+        var answers = []
+        for (const k in this.questionForm) {
+          answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
+        }
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers: answers
+        }
         await saveTaskQuestion(12, params)
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        loading.close()
+        if (!options.silentSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
         DicomEvent.$emit('getReportInfo', true)
-        this.refreshQuestions()
+        if (!options.skipRefresh) {
+          await this.refreshQuestions()
+        }
         this.formChanged = false
       } catch (e) {
         console.log(e)
-        loading.close()
+      } finally {
+        if (loading) loading.close()
+        this.$set(this.rowSaveLoadingMap, index, false)
       }
     },
     getECRFQuestions(obj) {
@@ -747,11 +777,35 @@ export default {
       this.addOrEdit.visible = true
       this.addOrEdit.lesionType = row.LesionType
     },
+    handleView(item) {
+      if (this.openWindow) {
+        this.openWindow.close()
+      }
+      localStorage.setItem('taskBlindName', this.taskBlindName)
+      localStorage.setItem('isReadingShowSubjectInfo', this.isReadingShowSubjectInfo)
+      let token = getToken()
+      let routeData = this.$router.resolve({ path: `/ecrfList?trialId=${this.$route.query.trialId}&visitTaskId=${this.visitTaskId}&questionId=${item.Id}&TokenKey=${token}` })
+      const win = window.open(routeData.href, '_blank')
+      if (win) {
+        this.childWindows.push(win)
+      }
+    },
+    closeAllChildWindows() {
+      this.childWindows.forEach(win => {
+        if (win && !win.closed) {
+          win.close()
+        }
+      })
+      this.childWindows = []
+    },
     async saveFormData() {
-      const valid = await this.$refs.tableQsForm.validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
+      if (this.dialogSaveLoading) return
+      this.dialogSaveLoading = true
+      let loading = null
       try {
+        const valid = await this.$refs.tableQsForm.validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
         var answers = []
         var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
         for (const k in this.qsForm) {
@@ -785,10 +839,11 @@ export default {
           this.addOrEdit.visible = false
           this.$message.success(this.$t('common:message:savedSuccessfully'))
         }
-        loading.close()
       } catch (e) {
         console.log(e)
-        loading.close()
+      } finally {
+        if (loading) loading.close()
+        this.dialogSaveLoading = false
       }
     },
     async handleDelete(row, index) {
@@ -844,9 +899,29 @@ export default {
       }
     },
     async uploadDlgClose() {
-      this.refreshQuestions()
-      DicomEvent.$emit('getReportInfo', true)
-      this.upload.visible = false
+      try {
+        await this.refreshQuestions()
+        const saveTasks = []
+        for (let index = 0; index < this.questions.length; index++) {
+          const qs = this.questions[index]
+          if (qs.GroupClassify === 6) {
+            saveTasks.push(() => this.handleSave(index, { silentSuccess: true, skipRefresh: true }))
+          }
+        }
+        saveTasks.push(() => this.$refs['ecrf2'] && this.$refs['ecrf2'].handleSave({ silentSuccess: true, skipRefresh: true }))
+        saveTasks.push(() => this.$refs['ecrf3'] && this.$refs['ecrf3'].handleSave({ silentSuccess: true, skipRefresh: true }))
+        for (const saveTask of saveTasks) {
+          try {
+            await saveTask()
+          } catch (e) {
+            console.log(e)
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.upload.visible = false
+      }
     },
     renderHeader(h, { column, $index }) {
       const span = document.createElement('span')
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
index 9b00ff69..d9c075b3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
@@ -267,4 +267,9 @@ export default {
 ::v-deep .el-select.is-disabled .el-input__inner {
   background-color: #646464a1;
 }
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #428bca;
+  border-color: #428bca;
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Others.vue b/src/views/trials/trials-panel/reading/dicoms/components/Others.vue
index 3c3408ac..25ba6621 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Others.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Others.vue
@@ -22,7 +22,7 @@
       </el-form>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
-      <el-button size="small" type="primary" @click="handleSave"> {{ $t('common:button:save') }}</el-button>
+      <el-button size="small" type="primary" :loading="loading" :disabled="loading" @click="handleSave"> {{ $t('common:button:save') }}</el-button>
 
     </div>
   </div>
@@ -64,18 +64,19 @@ export default {
       }
     },
     async handleSave() {
-      const valid = await this.$refs.otherForm.validate()
-      if (!valid) return
+      if (this.loading) return
       this.loading = true
       try {
+        const valid = await this.$refs.otherForm.validate()
+        if (!valid) return
         let params = Object.assign(this.form, {imageToolType: this.imageToolType})
         const res = await setAutoCutNextTask(params)
         if (res.IsSuccess) {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
         }
-        this.loading = false
       } catch (e) {
-        this.loading = false
+      } finally {
+        this.loading = false
       }
     }
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
index 661182db..f3706bd4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
     class="measurement-form">
     <div class="base-dialog-body">
@@ -116,7 +116,7 @@
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button size="mini" style="margin-left: 5px;padding:7px 10px" @click="handleSave">
+      <el-button size="mini" style="margin-left: 5px;padding:7px 10px" :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -198,7 +198,9 @@ export default {
       pictureBaseStr: '',
       digitPlaces: 0,
       focusQs: null,
-      currentMarkTool: ''
+      currentMarkTool: '',
+      saveLoading: false,
+      validationDialogVisible: false
     }
   },
 
@@ -216,7 +218,24 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    validateLesionCount(rule, value, callback) {
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },    validateLesionCount(rule, value, callback) {
       // const reg = /^[1-9][0-9]?$|^100$/
       // const reg = /^(0+)|[^\d]+/g
       const reg = /^(?:[1-9]|[1-9][0-9])$/
@@ -563,8 +582,20 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     async handleSave() {
-      const valid = await this.$refs.measurementForm.validate()
-      if (!valid) return
+      if (this.saveLoading) return
+      this.saveLoading = true
+      let valid = false
+      try {
+        valid = await this.$refs.measurementForm.validate()
+      } catch (e) {
+        this.saveLoading = false
+        console.log(e)
+        return
+      }
+      if (!valid) {
+        this.saveLoading = false
+        return
+      }
       var lesionState = this.getQuestionVal(7)
       var measureData = this.questionForm.MeasureData
       // 非基线
@@ -573,12 +604,9 @@ export default {
         // 病灶状态为“存在”的新病灶，请使用箭头工具添加标记2
         if (this.lesionType === 2 && lesionState === 2) {
           if (!(measureData && measureData.type === 'ArrowAnnotate')) {
-            this.$confirm(this.$t('trials:readingPGWC:warnning:msg2'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
-            loading.close()
+            await this.showValidationDialog(this.$t('trials:readingPGWC:warnning:msg2'))
+
+            this.saveLoading = false
             return
           }
         }
@@ -586,48 +614,36 @@ export default {
         // 病灶状态为“存在”的既往新病灶，请使用箭头工具添加标记2
         if (this.lesionType === 3 && lesionState === 2) {
           if (!(measureData && measureData.type === 'ArrowAnnotate')) {
-            this.$confirm(this.$t('trials:readingPGWC:warnning:msg3'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
-            loading.close()
+            await this.showValidationDialog(this.$t('trials:readingPGWC:warnning:msg3'))
+
+            this.saveLoading = false
             return
           }
         }
         // 病灶状态为“良性”的既往新病灶，请使用箭头工具添加标记3
         if (this.lesionType === 3 && lesionState === 3) {
           if (!(measureData && measureData.type === 'ArrowAnnotate')) {
-            this.$confirm(this.$t('trials:readingPGWC:warnning:msg4'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
-            loading.close()
+            await this.showValidationDialog(this.$t('trials:readingPGWC:warnning:msg4'))
+
+            this.saveLoading = false
             return
           }
         }
         // 病灶状态为“消失”的既往新病灶，请使用箭头工具添加标记1
         if (this.lesionType === 3 && lesionState === 1) {
           if (!(measureData && measureData.type === 'ArrowAnnotate')) {
-            this.$confirm(this.$t('trials:readingPGWC:warnning:msg5'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
-            loading.close()
+            await this.showValidationDialog(this.$t('trials:readingPGWC:warnning:msg5'))
+
+            this.saveLoading = false
             return
           }
         }
         // 病灶状态为“不可评估”的既往新病灶，不需要添加标记4
         if (this.lesionType === 3 && lesionState === 4) {
           if (measureData) {
-            this.$confirm(this.$t('trials:readingPGWC:warnning:msg6'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
-            loading.close()
+            await this.showValidationDialog(this.$t('trials:readingPGWC:warnning:msg6'))
+
+            this.saveLoading = false
             return
           }
         }
@@ -690,10 +706,12 @@ export default {
             DicomEvent.$emit('getReportInfo', true)
             DicomEvent.$emit('setMeasuredToolsPassive')
             loading.close()
+            this.saveLoading = false
           }
         } catch (e) {
           console.log(e)
           loading.close()
+          this.saveLoading = false
         }
       })
     },
@@ -858,6 +876,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   .el-form-item__content .el-select {
     width: 100%;
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index f97dbbcc..fb54ae11 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -447,4 +447,9 @@ export default {
 ::v-deep .el-select.is-disabled .el-input__inner {
   background-color: #646464a1;
 }
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #428bca;
+  border-color: #428bca;
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 2cc8b0dc..cb261e9f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -10,7 +10,8 @@
         <div class="ecrf-footer">
           <i v-if="groupClassify === null || groupClassify === 1" class="el-icon-warning feedback-icon"
             @click="openFeedBackTable" :style="{ color: isExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }" />
-          <el-button size="mini" :disabled="!questionFormChangeState || (!formChanged && groupClassify > 0)"
+          <el-button size="mini" :loading="saveLoading"
+            :disabled="saveLoading || !questionFormChangeState || (!formChanged && groupClassify > 0)"
             :type="questionFormChangeState || (!formChanged && groupClassify > 0) ? 'primary' : null"
             @click="handleSave">{{ $t('common:button:save') }}</el-button>
         </div>
@@ -80,7 +81,8 @@ export default {
       calculateSpleenStatus: '',
       formChanged: false,
       digitPlaces: 2,
-      isExistUnprocessedFeedback: false
+      isExistUnprocessedFeedback: false,
+      saveLoading: false
     }
   },
   computed: {
@@ -115,7 +117,7 @@ export default {
     })
     if (this.groupClassify === 3) {
       DicomEvent.$on('addAnnotation', obj => {
-        this.$set(obj, 'SaveEnum', 1)
+        // this.$set(obj, 'SaveEnum', 1)
         this.addAnnotation(obj)
       })
       DicomEvent.$on('removeAnnotation', obj => {
@@ -277,74 +279,86 @@ export default {
       })
     },
 
-    handleSave() {
-      this.$refs['questions'].validate(async (valid) => {
-        if (!valid) return
-        // lugano标准校验脾脏状态是否符合要求
-        if ((this.criterionType === 2 || this.criterionType === 18) && this.groupClassify === 3) {
-          // 是否有标记未保存
-          var existUnSave = this.checkAnnotationStatus(this.questions)
-          if (existUnSave) {
-            this.$alert(this.$t('trials:lugano:message:saveWarning'), this.$t('trials:lugano:fusionDialog:warning'))
-            return
-          }
-
-          var currentSpleenStatus = this.questionForm[this.spleenStatusId]
-          var currentSpleenLength = this.questionForm[this.spleenLengthId]
-          currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
-          var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
-          var slIdx = this.measurements.findIndex(i => i.QuestionType === 61)
-
-          if (currentSpleenLength && currentSpleenStatus === 5) {
-            // '脾脏状态为不可评估，不需要添加标记!'
-            this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
-              callback: _ => { }
-            })
-          } else if (currentSpleenStatus === 5 && ((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData))) {
-            // 若有标记，状态不可为“无法评估”
-            this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
-              callback: _ => { }
-            })
-          } else if (((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData)) && !currentSpleenLength) {
-            this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
-              callback: _ => { }
-            })
-          } else {
-            this.saveQuestionsList()
-          }
-        } else if ((this.criterionType === 2 || this.criterionType === 18) && this.groupClassify === 1 && this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
-          // 保存影响质量问题分组，如果质量问题为PET-CT影像无法融合则验证是否可以保存
-          let res = null
-          if (this.criterionType === 18) {
-            res = await getCanChooseNotMergeNoPet({ visitTaskId: this.visitTaskId })
-          } else {
-            res = await getCanChooseNotMerge({ visitTaskId: this.visitTaskId })
-          }
-
-          if (res.IsSuccess && !res.Result.IsCanChooseNotMerge) {
-            // this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {showCancelButton: false})
-            this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {
-              showCancelButton: false,
-              callback: action => { }
-            })
-            return
-          } else {
-            // 如果设置为PET-CT影像无法融合，则FDG-PET评估会被设置为NE。
-            this.$confirm(this.$t('trials:lugano:saveQuestions:warning2'), {
-              type: 'warning',
-              distinguishCancelAndClose: true
-            })
-              .then(() => {
-                this.saveQuestionsList()
-              })
-          }
-        } else {
-          this.saveQuestionsList()
-        }
-        // this.saveQuestionsList()
+    async handleSave(options = {}) {
+      if (this.saveLoading) return false
+      this.saveLoading = true
+      const valid = await new Promise(resolve => {
+        this.$refs['questions'].validate(v => resolve(v))
       })
+      if (!valid) {
+        this.saveLoading = false
+        return false
+      }
+      // lugano标准校验脾脏状态是否符合要求
+      if ((this.criterionType === 2 || this.criterionType === 18) && this.groupClassify === 3) {
+        // 是否有标记未保存
+        var existUnSave = this.checkAnnotationStatus(this.questions)
+        if (existUnSave) {
+          await this.$alert(this.$t('trials:lugano:message:saveWarning'), this.$t('trials:lugano:fusionDialog:warning'))
+          this.saveLoading = false
+          return false
+        }
+
+        var currentSpleenStatus = this.questionForm[this.spleenStatusId]
+        var currentSpleenLength = this.questionForm[this.spleenLengthId]
+        currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
+        var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+        var slIdx = this.measurements.findIndex(i => i.QuestionType === 61)
+
+        if (currentSpleenLength && currentSpleenStatus === 5) {
+          // '脾脏状态为不可评估，不需要添加标记!'
+          await this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
+            callback: _ => { }
+          })
+          this.saveLoading = false
+          return false
+        } else if (currentSpleenStatus === 5 && ((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData))) {
+          // 若有标记，状态不可为“无法评估”
+          await this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
+            callback: _ => { }
+          })
+          this.saveLoading = false
+          return false
+        } else if (((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData)) && !currentSpleenLength) {
+          await this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
+            callback: _ => { }
+          })
+          this.saveLoading = false
+          return false
+        }
+        return await this.saveQuestionsList(options)
+      } else if ((this.criterionType === 2 || this.criterionType === 18) && this.groupClassify === 1 && this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
+        // 保存影响质量问题分组，如果质量问题为PET-CT影像无法融合则验证是否可以保存
+        let res = null
+        if (this.criterionType === 18) {
+          res = await getCanChooseNotMergeNoPet({ visitTaskId: this.visitTaskId })
+        } else {
+          res = await getCanChooseNotMerge({ visitTaskId: this.visitTaskId })
+        }
+
+        if (res.IsSuccess && !res.Result.IsCanChooseNotMerge) {
+          await this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {
+            showCancelButton: false,
+            callback: action => { }
+          })
+          this.saveLoading = false
+          return false
+        }
+        // 如果设置为PET-CT影像无法融合，则FDG-PET评估会被设置为NE。
+        const confirm = await this.$confirm(this.$t('trials:lugano:saveQuestions:warning2'), {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        }).then(() => true).catch(() => false)
+        if (!confirm) {
+          this.saveLoading = false
+          return false
+        }
+        return await this.saveQuestionsList(options)
+      } else {
+        return await this.saveQuestionsList(options)
+      }
     },
-    async saveQuestionsList() {
+    async saveQuestionsList(options = {}) {
       this.loading = true
       var answers = []
       var imageQuality = null
@@ -370,18 +384,22 @@ export default {
       //   })
       //   params.questionMarkInfoList = questionMarkInfoList
       // }
-
-      saveTaskQuestion(this.questionType, params).then(async res => {
+      try {
+        const res = await saveTaskQuestion(this.questionType, params)
         if (this.imageQualityIssuesId) {
           store.dispatch('reading/setImageQualityIssues', this.questionForm[this.imageQualityIssuesId])
           if (this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
             DicomEvent.$emit('closePetct')
           }
         }
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-        var trialId = this.$route.query.trialId
-        await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: trialId, visitTaskId: this.visitTaskId })
-        this.getQuestions(this.visitTaskId, true)
+        if (!options.silentSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+        if (!options.skipRefresh) {
+          var trialId = this.$route.query.trialId
+          await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: trialId, visitTaskId: this.visitTaskId })
+          this.getQuestions(this.visitTaskId, true)
+        }
         this.loading = false
         if (this.isQulityIssues) {
           DicomEvent.$emit('questionFormChange', false)
@@ -404,9 +422,13 @@ export default {
           }
         }
         this.formChanged = false
-      }).catch(() => {
+        this.saveLoading = false
+        return res
+      } catch (e) {
         this.loading = false
-      })
+        this.saveLoading = false
+        throw e
+      }
     },
     checkAnnotationStatus(obj) {
       for (let i = 0; i < obj.length; i++) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 86b01849..124bfd84 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -27,7 +27,7 @@
                 class="study-wrapper">
                 <StudyList v-if="selectArr.includes(s.VisitTaskId)" :ref="s.VisitTaskId" :visit-task-id="s.VisitTaskId"
                   :trial-id="trialId" :subject-visit-id="s.VisitId" :task-blind-name="s.TaskBlindName"
-                  :is-reading-show-subject-info="isReadingShowSubjectInfo" @loadImageStack="loadImageStack"
+                  :is-reading-show-subject-info="isReadingShowSubjectInfo" :is-reading-task-view-in-order="isReadingTaskViewInOrder" @loadImageStack="loadImageStack"
                   @previewNoneDicoms="previewNoneDicoms" />
               </div>
             </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index e155c010..4e8e8e55 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
     class="measurement-form">
     <div class="base-dialog-body">
@@ -139,7 +139,7 @@
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button size="mini" @click="handleSave">
+      <el-button size="mini" :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -217,7 +217,9 @@ export default {
       lesionMark: '',
       deleteInfo: null,
       pictureBaseStr: '',
-      currentMarkTool: ''
+      currentMarkTool: '',
+      saveLoading: false,
+      validationDialogVisible: false
     }
   },
   mounted() {
@@ -234,8 +236,30 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    async initForm() {
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },    async initForm() {
       const loading = this.$loading({ fullscreen: true })
+      const closeLoading = loading.close.bind(loading)
+      loading.close = () => {
+        closeLoading()
+        this.saveLoading = false
+      }
       this.questions.forEach(item => {
         var val = this.answers[item.Id]
         if (item.DictionaryCode) {
@@ -763,8 +787,20 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     async handleSave() {
-      const valid = await this.$refs.measurementForm.validate()
-      if (!valid) return
+      if (this.saveLoading) return
+      this.saveLoading = true
+      let valid = false
+      try {
+        valid = await this.$refs.measurementForm.validate()
+      } catch (e) {
+        this.saveLoading = false
+        console.log(e)
+        return
+      }
+      if (!valid) {
+        this.saveLoading = false
+        return
+      }
       const loading = this.$loading({ fullscreen: true })
       var measureData = this.questionForm.MeasureData
       var lesionState = this.getQuestionVal(7)
@@ -779,11 +815,8 @@ export default {
             //  淋巴结靶病灶 必须使用长短径测量工具,短径大于等于15mm
             if (!(measureData && measureData.type === 'Bidirectional' && lesionShort >= 15)) {
               // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记，且短径须大于15mm！
-              this.$confirm(this.$t('trials:reading:warnning:msg19'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg19'))
+
               loading.close()
               return
             }
@@ -791,11 +824,8 @@ export default {
             // 非淋巴结靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
             if (!(measureData && measureData.type === 'Length' && lesionLength >= 10 && (measureData.thick && lesionLength >= 2 * measureData.thick || !measureData.thick))) {
               // 评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记，长径须大于10mm且不小于2倍层厚！
-              this.$confirm(this.$t('trials:reading:warnning:msg20'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg20'))
+
               loading.close()
               return
             }
@@ -808,11 +838,8 @@ export default {
             // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
-              this.$confirm(this.$t('trials:reading:warnning:msg21'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg21'))
+
               loading.close()
               return
             }
@@ -820,11 +847,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具或箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg22'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg22'))
+
               loading.close()
               return
             }
@@ -838,11 +862,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具
             if (!(measureData && measureData.type === 'Bidirectional' && lesionShort >= 10)) {
               // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg23'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg23'))
+
               loading.close()
               return
             }
@@ -850,11 +871,8 @@ export default {
             // 非淋巴结靶病灶 直径测量工具
             if (!(measureData && measureData.type === 'Length')) {
               // `评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg24'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg24'))
+
               loading.close()
               return
             }
@@ -866,11 +884,8 @@ export default {
             // 淋巴结靶病灶 必须使用箭头工具，短径记录为5mm
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg25'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg25'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -882,11 +897,8 @@ export default {
             // 非淋巴结靶病灶 箭头工具，长径记录为5mm
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg26'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg26'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -903,11 +915,8 @@ export default {
             // 淋巴结靶病灶 不需要添加标记
             if (measureData) {
               // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg27'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg27'))
+
               loading.close()
               return
             }
@@ -915,11 +924,8 @@ export default {
             // 非淋巴结靶病灶 不需要添加标记
             if (measureData) {
               // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg28'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg28'))
+
               loading.close()
               return
             }
@@ -950,11 +956,8 @@ export default {
             // }
             if (!(measureData && (measureData.type === 'Bidirectional' && lesionShort < 10))) {
               // `评估状态为消失的淋巴结靶病灶需使用长短径工具添加标记,且短径需小于10mm！`
-              this.$confirm(this.$t('trials:reading:warnning:msg29'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg29'))
+
               loading.close()
               return
             }
@@ -962,11 +965,8 @@ export default {
             // 非淋巴结靶病灶 箭头工具
             if (!(measureData && measureData.type === 'ArrowAnnotate')) {
               // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg30'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg30'))
+
               loading.close()
               return
             } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -983,11 +983,8 @@ export default {
             // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg31'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg31'))
+
               loading.close()
               return
             }
@@ -995,11 +992,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg32'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg32'))
+
               loading.close()
               return
             }
@@ -1012,11 +1006,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'RectangleRoi'))) {
               // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg33'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg33'))
+
               loading.close()
               return
             }
@@ -1024,11 +1015,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
               // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg34'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg34'))
+
               loading.close()
               return
             }
@@ -1041,11 +1029,8 @@ export default {
             // 淋巴结靶病灶 无标记
             if (measureData) {
               // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg35'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg35'))
+
               loading.close()
               return
             }
@@ -1053,11 +1038,8 @@ export default {
             // 非淋巴结非靶病灶 无标记
             if (measureData) {
               // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg36'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg36'))
+
               loading.close()
               return
             }
@@ -1070,11 +1052,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionShort < 10)))) {
               // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg37'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg37'))
+
               loading.close()
               return
             }
@@ -1082,11 +1061,8 @@ export default {
             // 非淋巴结非靶病灶 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg38'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg38'))
+
               loading.close()
               return
             }
@@ -1099,11 +1075,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg39'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg39'))
+
               loading.close()
               return
             }
@@ -1111,11 +1084,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为存在的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg40'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg40'))
+
               loading.close()
               return
             }
@@ -1128,11 +1098,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Bidirectional' || measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg41'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg41'))
+
               loading.close()
               return
             }
@@ -1140,11 +1107,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
               // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg42'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg42'))
+
               loading.close()
               return
             }
@@ -1157,11 +1121,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (measureData) {
               // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
-              this.$confirm(this.$t('trials:reading:warnning:msg43'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg43'))
+
               loading.close()
               return
             }
@@ -1169,11 +1130,8 @@ export default {
             // 非淋巴结非靶病灶 直径测量工具、箭头工具
             if (measureData) {
               // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg44'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg44'))
+
               loading.close()
               return
             }
@@ -1186,11 +1144,8 @@ export default {
             // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate' || (measureData.type === 'Bidirectional' && lesionShort < 10)))) {
               // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg45'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg45'))
+
               loading.close()
               return
             }
@@ -1198,11 +1153,8 @@ export default {
             // 箭头工具
             if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
               // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
-              this.$confirm(this.$t('trials:reading:warnning:msg46'), {
-                type: 'warning',
-                showCancelButton: false,
-                callback: action => { }
-              })
+              await this.showValidationDialog(this.$t('trials:reading:warnning:msg46'))
+
               loading.close()
               return
             }
@@ -1277,9 +1229,11 @@ export default {
             DicomEvent.$emit('setMeasuredToolsPassive')
           }
           loading.close()
+          this.saveLoading = false
         } catch (e) {
           console.log(e)
           loading.close()
+          this.saveLoading = false
         }
       })
     },
@@ -1456,6 +1410,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index cd448991..0039032b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
   <el-form v-if="isRender" ref="measurementForm" v-loading="loading" :model="questionForm" size="mini"
     class="measurement-form">
     <div class="base-dialog-body">
@@ -130,7 +130,7 @@
         {{ $t('common:button:delete') }}
       </el-button>
       <!-- 保存 -->
-      <el-button size="mini" @click="handleSave">
+      <el-button size="mini" :loading="saveLoading" :disabled="saveLoading" @click="handleSave">
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -208,7 +208,9 @@ export default {
       lesionMark: '',
       deleteInfo: null,
       pictureBaseStr: '',
-      currentMarkTool: ''
+      currentMarkTool: '',
+      saveLoading: false,
+      validationDialogVisible: false
     }
   },
   mounted() {
@@ -225,8 +227,30 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
-    async initForm() {
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },    async initForm() {
       const loading = this.$loading({ fullscreen: true })
+      const closeLoading = loading.close.bind(loading)
+      loading.close = () => {
+        closeLoading()
+        this.saveLoading = false
+      }
       this.questions.forEach(item => {
         var val = this.answers[item.Id]
         if (item.DictionaryCode) {
@@ -690,8 +714,20 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     async handleSave() {
-      const valid = await this.$refs.measurementForm.validate()
-      if (!valid) return
+      if (this.saveLoading) return
+      this.saveLoading = true
+      let valid = false
+      try {
+        valid = await this.$refs.measurementForm.validate()
+      } catch (e) {
+        this.saveLoading = false
+        console.log(e)
+        return
+      }
+      if (!valid) {
+        this.saveLoading = false
+        return
+      }
       const loading = this.$loading({ fullscreen: true })
       var measureData = this.questionForm.MeasureData
       var lesionState = this.getQuestionVal(7)
@@ -704,11 +740,8 @@ export default {
           // 靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
           if (!(measureData && measureData.type === 'Length' && lesionLength >= 10 && (measureData.thick && lesionLength >= 2 * measureData.thick || !measureData.thick))) {
             // 病灶状态为“存在”的靶病灶，长径应大于10mm且不小于2倍层厚。请使用直径测量工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg06'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg06'))
+
             loading.close()
             return
           }
@@ -718,11 +751,8 @@ export default {
         if (this.lesionType === 1 && lesionState === 0) {
           if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
             // 病灶状态为“存在”的非靶病灶，请使用直径测量工具或矩形工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg07'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg07'))
+
             loading.close()
             return
           }
@@ -733,11 +763,8 @@ export default {
         if (this.lesionType === 0 && lesionState === 0) {
           if (!(measureData && measureData.type === 'Length')) {
             // `病灶状态为“存在”的靶病灶，请使用直径测量工具添加标记。`
-            this.$confirm(this.$t('trials:readingBM:warnning:msg08'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg08'))
+
             loading.close()
             return
           }
@@ -746,11 +773,8 @@ export default {
         if (this.lesionType === 0 && lesionState === 1) {
           if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
             // 病灶状态为“太小”的靶病灶，请使用箭头工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg09'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg09'))
+
             loading.close()
             return
           } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -764,11 +788,8 @@ export default {
         if (this.lesionType === 0 && lesionState === 2) {
           if (measureData) {
             // 病灶状态为“无法评估”的靶病灶，不需要添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg10'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg10'))
+
             loading.close()
             return
           }
@@ -778,11 +799,8 @@ export default {
         if (this.lesionType === 0 && lesionState === 3) {
           if (!(measureData && measureData.type === 'ArrowAnnotate')) {
             // 病灶状态为“消失”的靶病灶，请使用箭头工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg11'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg11'))
+
             loading.close()
             return
           } else if (measureData && measureData.type === 'ArrowAnnotate') {
@@ -796,11 +814,8 @@ export default {
         if (this.lesionType === 1 && lesionState === 0) {
           if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
             // 病灶状态为“存在”的非靶病灶，请使用直径测量工具或矩形工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg12'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg12'))
+
             loading.close()
             return
           }
@@ -810,11 +825,8 @@ export default {
         if (this.lesionType === 1 && lesionState === 1) {
           if (!(measureData && (measureData.type === 'Length' || measureData.type === 'RectangleRoi'))) {
             // 病灶状态为“显著增大”的非靶病灶，请使用直径测量工具或矩形工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg13'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg13'))
+
             loading.close()
             return
           }
@@ -824,11 +836,8 @@ export default {
         if (this.lesionType === 1 && lesionState === 2) {
           if (measureData) {
             // 病灶状态为“无法评估”的非靶病灶，不需要添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg14'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg14'))
+
             loading.close()
             return
           }
@@ -838,11 +847,8 @@ export default {
         if (this.lesionType === 1 && lesionState === 3) {
           if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
             // 病灶状态为“消失”的非靶病灶，请使用箭头工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg15'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg15'))
+
             loading.close()
             return
           }
@@ -852,11 +858,8 @@ export default {
         if (this.lesionType === 2 && lesionState === 0) {
           if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
             // 病灶状态为“明确”的新病灶，请使用直径测量工具或箭头工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg16'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg16'))
+
             loading.close()
             return
           }
@@ -866,11 +869,8 @@ export default {
         if (this.lesionType === 2 && lesionState === 1) {
           if (!(measureData && (measureData.type === 'Length' || measureData.type === 'ArrowAnnotate'))) {
             // 病灶状态为“疑似”的新病灶，请使用直径测量工具或箭头工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg17'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg17'))
+
             loading.close()
             return
           }
@@ -880,11 +880,8 @@ export default {
         if (this.lesionType === 2 && lesionState === 2) {
           if (measureData) {
             // 病灶状态为“无法评估”的新病灶，不需要添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg18'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg18'))
+
             loading.close()
             return
           }
@@ -894,11 +891,8 @@ export default {
         if (this.lesionType === 2 && lesionState === 3) {
           if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
             // 病灶状态为“消失”的新病灶，请使用箭头工具添加标记。
-            this.$confirm(this.$t('trials:readingBM:warnning:msg19'), {
-              type: 'warning',
-              showCancelButton: false,
-              callback: action => { }
-            })
+            await this.showValidationDialog(this.$t('trials:readingBM:warnning:msg19'))
+
             loading.close()
             return
           }
@@ -966,9 +960,11 @@ export default {
             DicomEvent.$emit('setMeasuredToolsPassive')
           }
           loading.close()
+          this.saveLoading = false
         } catch (e) {
           console.log(e)
           loading.close()
+          this.saveLoading = false
         }
       })
     },
@@ -1139,6 +1135,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 808f5f7c..5c9afa9d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -22,11 +22,13 @@
             {{ $t('trials:readingReport:button:refresh') }}
           </el-button>
           <el-button v-if="readingTaskState < 2 && CriterionType !== 10" type="primary" size="small"
+            :loading="submitLockAction === 'save'" :disabled="!!submitLockAction"
             @click="handleSave(true)">
             <!-- 保存 -->
             {{ $t('common:button:save') }}
           </el-button>
-          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="beforeLeave">
+          <el-button v-if="readingTaskState < 2" type="primary" size="small"
+            :loading="submitLockAction === 'submit'" :disabled="!!submitLockAction" @click="beforeLeave">
             <!-- 提交 -->
             {{ $t('common:button:submit') }}
           </el-button>
@@ -126,7 +128,7 @@
                         :autosize="{ minRows: 2, maxRows: 4 }" size="mini" maxlength="500"
                         @change="evaluateReasonChange" />
                       <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
-                      <p v-if="currentEvaluateResult !== tumorEvaluate"
+                      <p v-if="currentEvaluateResult !== null && currentEvaluateResult !== undefined && currentEvaluateResult !== tumorEvaluate"
                         style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;"
                         v-html="getWarningText()" />
                       <p v-else-if="currentExistDisease !== isExistDisease"
@@ -279,7 +281,9 @@ export default {
       tLesionCount: null,
       ntLesionCount: null,
       openWindow: null,
-      expandedRows: []
+      expandedRows: [],
+      submitLockAction: '',
+      validationDialogVisible: false
     }
   },
   computed: {
@@ -353,6 +357,24 @@ export default {
         })
       })
     },
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },
     async beforeLeave() {
       // if (this.questionFormChangeState && this.CriterionType !== 2) {
       //   var msg = this.$t('trials:readingReport:message:msg5')
@@ -483,15 +505,23 @@ export default {
                 var idx = item.Childrens.findIndex(i => i.QuestionMark === 8)
                 var idxLoc = item.Childrens.findIndex(i => i.QuestionMark === 10)
                 var state = item.Childrens.findIndex(i => i.QuestionMark === 7)
+                if (this.CriterionType === 22) {
+                  idx = item.Childrens.findIndex(i => i.QuestionMark === 1106)
+                }
                 if (idx > -1) {
                   if (item.Childrens[idx].Answer.length > 0) {
                     var k = item.Childrens[idx].Answer.findIndex(v => v.Answer !== '')
                     var part = ''
-                    if (obj.IsCanEditPosition) {
-                      part = `${item.Childrens[idx].Answer[k].Answer}--${item.Childrens[idxLoc].Answer[k].Answer}`
+                    if (this.CriterionType === 22) {
+                      part = item.Childrens[idx].Answer[k].Answer ? this.$fd('Liver4Segmentation', parseInt(item.Childrens[idx].Answer[k].Answer)) : ''
                     } else {
-                      part = `${item.Childrens[idx].Answer[k].Answer}`
+                      if (obj.IsCanEditPosition) {
+                        part = `${item.Childrens[idx].Answer[k].Answer}--${item.Childrens[idxLoc].Answer[k].Answer}`
+                      } else {
+                        part = `${item.Childrens[idx].Answer[k].Answer}`
+                      }
                     }
+                    
                     if (item.SplitOrMergeLesionName && k > -1) {
                       // obj.QuestionName = `${obj.QuestionName} --${part} (Split from ${item.SplitOrMergeLesionName})`
                       obj.QuestionName = `${obj.QuestionName} --${part}`
@@ -509,6 +539,7 @@ export default {
                       this.$set(obj, 'Answers', Answers)
                       // obj.QuestionName = `${obj.QuestionName} `
                     } else if (!item.SplitOrMergeLesionName && k > -1) {
+                      console.log(part)
                       obj.QuestionName = `${obj.QuestionName}--${part}`
                       const Answers = {}
                       if (state >= 0) {
@@ -655,11 +686,12 @@ export default {
       }
     },
     async handleConfirm() {
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'submit'
       this.loading = true
       try {
-        // await this.handleSave(false)
-        let r = await this.handleSave(false)
-        if (!r) return
+        const r = await this.handleSave(false, true)
+        if (!r) return false
         await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
         var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
         var isBaseline = this.visitTaskList[i].IsBaseLine
@@ -680,9 +712,13 @@ export default {
           this.signCode = ImageAssessmentReportConfirmation
           this.signVisible = true
         }
-        this.loading = false
+        return true
       } catch (e) {
+        console.log(e)
+        return false
+      } finally {
         this.loading = false
+        this.submitLockAction = ''
       }
     },
     sign(type = 'sign') {
@@ -800,15 +836,26 @@ export default {
       }
       // this.openWindow = window.open(routeData.href, '_blank')
     },
-    handleSave(isPrompt) {
-      return new Promise(async (resolve, reject) => {
+    async handleSave(isPrompt, fromSubmit = false) {
+      if (this.submitLockAction && !fromSubmit) return false
+      if (!fromSubmit) {
+        this.submitLockAction = 'save'
+      }
+      const hasValue = (value) => value !== null && value !== undefined && `${value}`.trim() !== ''
+      const resetSaveState = () => {
+        this.loading = false
+        if (!fromSubmit) {
+          this.submitLockAction = ''
+        }
+      }
+      try {
         var isBeill
         var evaluateResult = ''
         var evaluateAjustReason = ''
         this.answers = []
         var isExistEvaluateResult = false
         this.answerArr.map(item => {
-          if (item.questionType === 13 || item.questionType === 42) {
+          if (item.questionType === 13 || item.questionType === 42 || (item.questionType === 39 && this.CriterionType === 18)) {
             evaluateResult = item.answer
             isExistEvaluateResult = true
           }
@@ -820,53 +867,36 @@ export default {
           }
           this.answers.push({ id: item.id, answer: item.answer })
         })
-        console.log(this.currentExistDisease, this.isExistDisease, evaluateAjustReason, isBeill)
-        if (this.currentExistDisease !== this.isExistDisease && !evaluateAjustReason) {
-          this.$confirm(this.$t('trials:readingReport:message:msg2'), {
-            type: 'warning',
-            showCancelButton: false,
-            callback: action => { }
-          })
-          reject()
-          return
+        if (this.currentExistDisease !== this.isExistDisease && !hasValue(evaluateAjustReason)) {
+          await this.showValidationDialog(this.$t('trials:readingReport:message:msg2'))
+          return false
         }
-        if (isExistEvaluateResult && evaluateResult === null) {
+        if (isExistEvaluateResult && !hasValue(evaluateResult) && !this.isBaseline) {
           // 请将疗效评估信息填写完整
-          this.$confirm(this.$t('trials:readingReport:message:msg2'), {
-            type: 'warning',
-            showCancelButton: false,
-            callback: action => { }
-          })
-          reject()
-          return
+          await this.showValidationDialog(this.$t('trials:readingReport:message:msg2'))
+          return false
         }
-        if (isExistEvaluateResult && (evaluateResult !== this.tumorEvaluate) && !evaluateAjustReason) {
+        if (isExistEvaluateResult && hasValue(evaluateResult) && (evaluateResult !== this.tumorEvaluate) && !hasValue(evaluateAjustReason)) {
           // 请填写整体评估调整原因
-          this.$confirm(this.$t('trials:readingReport:message:msg3'), {
-            type: 'warning',
-            showCancelButton: false,
-            callback: action => { }
-          })
-          reject()
-          return
+          await this.showValidationDialog(this.$t('trials:readingReport:message:msg3'))
+          return false
         }
         this.loading = true
-        try {
-          var params = {
-            visitTaskId: this.visitTaskId,
-            answers: this.answers
-          }
-          const res = await changeDicomReadingQuestionAnswer(params)
-          if (res.IsSuccess && isPrompt) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-          }
-          this.loading = false
-          resolve(true)
-        } catch (e) {
-          this.loading = false
-          reject()
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers: this.answers
         }
-      })
+        const res = await changeDicomReadingQuestionAnswer(params)
+        if (res.IsSuccess && isPrompt) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+        return !!res.IsSuccess
+      } catch (e) {
+        console.log(e)
+        return false
+      } finally {
+        resetSaveState()
+      }
     },
     getWarningText() {
       var sysRes = ''
@@ -881,6 +911,9 @@ export default {
         sysRes = this.$fd('OverallAssessment', this.tumorEvaluate)
         curRes = this.$fd('OverallAssessment', this.currentEvaluateResult)
       }
+      if (!curRes) {
+        return ''
+      }
       const msg = this.$t('trials:readingReport:message:msg9').replace('xxx', '<font color="red">' + sysRes + '</font>').replace('yyy', '<font color="red">' + curRes + '</font>')
       return msg
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index 15eeb45a..b1fb9ab4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -28,7 +28,7 @@
                   </div>
                   <div>
                     <span class="study-meta-line" :title="study.Modalities">
-                      <span class="study-code" :title="study.StudyCode">{{ study.StudyCode }}</span>
+                      <span v-if="isReadingTaskViewInOrder !== 0" class="study-code" :title="study.StudyCode">{{ study.StudyCode }}</span>
                       <span class="study-modality">{{ study.Modalities }}({{ study.SeriesCount }})</span>
                       <span class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)">
                         <el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper">
@@ -226,6 +226,10 @@ export default {
     isReadingShowSubjectInfo: {
       type: Boolean,
       required: true
+    },
+    isReadingTaskViewInOrder: {
+      type: Number,
+      required: true
     }
   },
   data() {
@@ -340,7 +344,7 @@ export default {
           }
         })
         var i = -1
-        var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
+        var isReadingTaskViewInOrder = parseInt(this.isReadingTaskViewInOrder)
         if (isReadingTaskViewInOrder === 2) {
           // 受试者内随机
           i = res.length === 2 ? 1 : -1
@@ -427,7 +431,7 @@ export default {
 
     async getInitSeries() {
       var seriesList = []
-      var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder)
+      var isReadingTaskViewInOrder = parseInt(this.isReadingTaskViewInOrder)
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
       this.studyList = this.visitTaskList[idx].StudyList
       const studyList = this.visitTaskList[idx].StudyList.filter(i => i.IsDicom)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/TableList/index.vue b/src/views/trials/trials-panel/reading/dicoms/components/TableList/index.vue
new file mode 100644
index 00000000..6973f85a
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/TableList/index.vue
@@ -0,0 +1,115 @@
+<template>
+  <div class="table-list-container" v-loading="loading">
+    <h3 v-if="isReadingShowSubjectInfo">
+      <span v-if="subjectCode">{{ subjectCode }} </span>
+      <span style="margin-left:5px;">{{ taskBlindName }}</span>
+    </h3>
+    <h3 v-if="tableQuestion && tableQuestion.GroupName">
+      {{ language === 'en' ? tableQuestion.GroupEnName : tableQuestion.GroupName }}
+    </h3>
+    <h4 v-if="tableQuestion && tableQuestion.QuestionName">
+      {{ tableQuestion.QuestionName }}
+    </h4>
+    <el-table 
+      v-if="tableQuestion && tableQuestion.Type === 'basicTable' && tableQuestion.TableQuestions" 
+      :ref="tableQuestion.Id"
+      :data="tableQuestion.TableQuestions.Answers"
+      height="100%"
+    >
+      <el-table-column 
+        v-for="q of tableQuestion.TableQuestions.Questions" 
+        :key="q.Id" 
+        :prop="q.Id"
+        :label="q.QuestionName" 
+        show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span v-if="q.Unit > 0 && !isNaN(parseFloat(scope.row[q.Id]))">
+            {{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
+          </span>
+          <span v-else-if="q.DictionaryCode">
+            {{`${scope.row[q.Id] instanceof Array ? scope.row[q.Id].map(item => $fd(q.DictionaryCode,
+              parseInt(item))).join(',') : $fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}`}}
+          </span>
+          <span v-else-if="q.OptionTypeEnum === 1">
+            {{ `${scope.row[q.Id] instanceof Array ? scope.row[q.Id].join(',') : scope.row[q.Id]}` }}
+          </span>
+          <span v-else>
+            {{ `${scope.row[q.Id]}` }}
+          </span>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import { getFilterTableQuestion } from '@/api/reading'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+import { changeURLStatic } from '@/utils/history.js'
+export default {
+  name: 'DicomTableList',
+  data() {
+    return {
+      isReadingShowSubjectInfo: false,
+      subjectCode: null,
+      taskBlindName: null,
+      questionId: null,
+      tableQuestion: null,
+      loading: false
+    }
+  },
+  computed: {
+    ...mapGetters(['language'])
+  },
+  created() {
+    if (this.$route.query.TokenKey) {
+      store.dispatch('user/setToken', this.$route.query.TokenKey)
+      changeURLStatic('TokenKey', '')
+    }
+    this.subjectCode = localStorage.getItem('subjectCode')
+    this.taskBlindName = localStorage.getItem('taskBlindName')
+    this.isReadingShowSubjectInfo = localStorage.getItem('isReadingShowSubjectInfo')
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      try {
+        this.loading = true
+        let params = {
+          trialId: this.$route.query.trialId,
+          visitTaskId: this.$route.query.visitTaskId,
+          questionId: this.$route.query.questionId
+        }
+        let res = await getFilterTableQuestion(params)
+        if (res.IsSuccess) {
+          this.tableQuestion = res.Result
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.loading = false
+      }
+      
+    },
+    resetList() {
+
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.table-list-container {
+  height: 100%;
+  padding: 0 10px;
+  box-sizing: border-box;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+h3, h4 {
+  flex-shrink: 0;
+  margin: 10px 0 10px;
+}
+
+</style>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/WLForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/WLForm.vue
index 90344f17..b3ad4c62 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/WLForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/WLForm.vue
@@ -30,6 +30,8 @@
       <!-- Save -->
       <el-button
         type="primary"
+        :loading="loading"
+        :disabled="loading"
         @click="handleSave"
       >
         {{ $t('common:button:save') }}
@@ -84,12 +86,12 @@ export default {
   },
   methods: {
     async handleSave() {
-      const valid = await this.$refs.wlForm.validate()
-      if (!valid) return
+      if (this.loading) return
       this.loading = true
       try {
+        const valid = await this.$refs.wlForm.validate()
+        if (!valid) return
         await addOrUpdateUserWLTemplate(this.form)
-        this.loading = false
         this.$emit('getWL')
         this.$emit('close')
         if (this.form.Id) {
@@ -98,7 +100,8 @@ export default {
           this.$message.success(this.$t('common:message:addedSuccessfully'))
         }
       } catch (e) {
-        this.loading = false
+      } finally {
+        this.loading = false
       }
     },
     handleCancel() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
index f2a1801d..613d6ac5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue
@@ -338,7 +338,7 @@
         </el-tooltip>
 
         <div style="margin-left: auto">
-          <div style="padding: 5px">
+          <div style="display: flex;">
             <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:handbooks')" placement="bottom"
               v-if="(isExistsManual || isHaveKeyFile) && currentReadingTaskState < 2">
               <div class="tool-wrapper">
@@ -411,7 +411,7 @@
           <WL v-if="activeName === '2'" @getWwcTpl="getWwcTpl" />
         </el-tab-pane>
         <el-tab-pane :label="$t('trials:reading:tab:others')" name="3">
-          <Others v-if="activeName === '3'" :imageToolType="1"/>
+          <Others v-if="activeName === '3'" :imageToolType="1" />
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
@@ -448,10 +448,10 @@
     /> -->
     <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId" :SubjectCode="uploadSubjectCode"
       :Criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible" :VisitTaskId="taskId"
-      :isReadingTaskViewInOrder="isReadingTaskViewInOrder" />
+      :isReadingTaskViewInOrder="isReadingTaskViewInOrder" :isReading="true" />
     <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
       :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :TaskId="taskId"
-      :visible.sync="downloadImageVisible" />
+      :visible.sync="downloadImageVisible" :isReading="true"/>
   </div>
 </template>
 <script>
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
index 4dc1257c..1affeed4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeMeasurementList.vue
@@ -19,7 +19,7 @@
       </QuestionsPreview>
     </div>
     <div class="questions-footer">
-      <i class="el-icon-warning feedback-icon" @click="openFeedBackTable"
+      <i v-if="readingTaskState < 2" class="el-icon-warning feedback-icon" @click="openFeedBackTable"
         :style="{ color: isExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }" />
       <el-button v-if="readingTaskState < 2" style="margin-right: 10px" type="primary" size="small"
         @click="handleSave(true)">
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index eeaed460..074952d0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -147,7 +147,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <div style="text-align:right;margin-top: 10px;">
+        <div style="text-align:right;margin-top: 10px;" v-if="!IsViewStudyPart">
           <!-- 确认 -->
           <el-button type="primary" @click="handleConfirmBP">{{ $t('trials:reading:button:confirm')
           }}</el-button>
@@ -223,7 +223,8 @@ export default {
       readingVersionEnum: null,
       dialogBodyPartVisible: false,
       isReadKeyFile: true,
-      isHaveKeyFile: false
+      isHaveKeyFile: false,
+      IsViewStudyPart: true
     }
   },
   computed: {
@@ -619,6 +620,14 @@ export default {
       }
     }
 
+    ::v-deep .el-dialog.cd-dialog-container {
+      .el-input.is-disabled .el-input__inner {
+        background-color: rgb(245, 247, 250);
+        color: #666;
+        border: 1px solid #dcdfe6;
+      }
+    }
+
   }
 
   ::v-deep .dialog-container {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
index 1b8c15c2..2454db56 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/FusionForm.vue
@@ -12,7 +12,9 @@
       { required: true, message: $t('common:ruleMessage:select'), trigger: 'blur' }
     ]">
       <el-select v-model="fusionForm.studyId" clearable @change="handleStudyIdChange">
-        <el-option v-for="item in studyList" :key="item.StudyId" :label="item.StudyCode" :value="item.StudyId" />
+        <el-option v-for="item in studyList" :key="item.StudyId"
+          :label="taskInfo.IsReadingTaskViewInOrder !== 0 ? item.StudyCode : `${item.Modalities}(${item.SeriesCount})`"
+          :value="item.StudyId" />
       </el-select>
     </el-form-item>
     <!-- 融合图像 -->
@@ -111,10 +113,12 @@ export default {
       ctSeries: [],
       petSeries: [],
       petctWindow: null,
-      digitPlaces: 2
+      digitPlaces: 2,
+      taskInfo: {}
     }
   },
   mounted() {
+    this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.initForm()
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
index 1f77aabc..92fee015 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue
@@ -187,6 +187,7 @@ export default {
       originalMarkers: [],
       markers: { top: '', right: '', bottom: '', left: '' },
       playClipState: false,
+      clipFramesPerSecond: null,
       wwwcIdx: 2,
       presetName: '',
       volumeId: null,
@@ -302,36 +303,46 @@ export default {
         y: Math.min(Math.max(e.clientY - rect.top, padding), maxY),
       }
     },
+    getInstanceInfo(imageId) {
+      const params = {}
+      if (imageId) {
+        const searchParams = new URLSearchParams(imageId.split('?')[1])
+        for (const [key, value] of searchParams.entries()) {
+          params[key] = value
+        }
+        if (isNaN(params.frame)) {
+          params.frame = null
+        }
+      }
+      return params
+    },
     getCircleAnnotationFromContextMenuEvent(e) {
       const viewport = this.getViewportInstance()
       if (!viewport || !this.element) return null
 
       const rect = this.element.getBoundingClientRect()
       const canvasPoint = [e.clientX - rect.left, e.clientY - rect.top]
-      const currentVisitTaskId = this.series?.TaskInfo?.VisitTaskId
-      const toolNames = ['CircleROI'] //FixedRadiusCircleROI看后期是不是要补充
-      const candidates = []
-
-      toolNames.forEach((toolName) => {
+      const currentImageId = viewport.getCurrentImageId?.()
+      const currentInstanceId = this.getInstanceInfo(currentImageId).instanceId
+      const toolNames = ['CircleROI', 'FixedRadiusCircleROI']
+      for (const toolName of toolNames) {
         const annotations = cornerstoneTools.annotation.state.getAnnotations(toolName, this.element) || []
-        annotations.forEach((annotation) => {
-          if (!annotation?.data?.handles?.points?.length) return
-          if (currentVisitTaskId && annotation.visitTaskId && annotation.visitTaskId !== currentVisitTaskId) return
+        const selectedAnnotation = annotations.find((annotation) => {
+          if (!annotation?.highlighted) return false
+          if (!annotation?.data?.handles?.points?.length) return false
+          const annotationInstanceId = annotation.instanceId || this.getInstanceInfo(annotation.metadata?.referencedImageId).instanceId
+          if (currentInstanceId && annotationInstanceId && annotationInstanceId !== currentInstanceId) return false
 
           const hitInfo = this.getCircleAnnotationHitInfo(annotation, canvasPoint, viewport)
-          if (!hitInfo.hit || hitInfo.score === null) return
-
-          candidates.push({
-            annotation,
-            score: hitInfo.score,
-          })
+          return hitInfo.hit
         })
-      })
 
-      if (!candidates.length) return null
+        if (selectedAnnotation) {
+          return selectedAnnotation
+        }
+      }
 
-      candidates.sort((a, b) => a.score - b.score)
-      return candidates[0].annotation
+      return null
     },
     getCircleAnnotationHitInfo(annotation, canvasPoint, viewport) {
       const points = annotation?.data?.handles?.points || []
@@ -615,6 +626,22 @@ export default {
       }
 
     },
+    syncViewportStaticState() {
+      const renderingEngine = getRenderingEngine(this.renderingEngineId)
+      if (!renderingEngine) return
+      const viewport = renderingEngine.getViewport(this.viewportId)
+      if (!viewport) return
+
+      this.getOrientationMarker()
+      const toolGroup =
+        cornerstoneTools.ToolGroupManager.getToolGroupForViewport(
+          this.viewportId,
+          this.renderingEngineId
+        ) || cornerstoneTools.ToolGroupManager.getToolGroup(this.viewportId)
+      if (toolGroup) {
+        toolGroup.setToolEnabled('ScaleOverlay')
+      }
+    },
     setFullScreen(index) {
       setTimeout(() => {
         const renderingEngine = getRenderingEngine(this.renderingEngineId)
@@ -717,14 +744,33 @@ export default {
       }
     },
     toggleClipPlay(isPlay, framesPerSecond) {
-      this.playClipState = isPlay
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
+      if (!renderingEngine) return
       const viewport = renderingEngine.getViewport(this.viewportId)
+      if (!viewport?.element) return
+
+      const parsedFramesPerSecond = Number(framesPerSecond)
+      const nextFramesPerSecond = Number.isFinite(parsedFramesPerSecond)
+        ? parsedFramesPerSecond
+        : (this.clipFramesPerSecond || 15)
+      const isSameSpeedWhilePlaying = this.playClipState &&
+        isPlay &&
+        this.clipFramesPerSecond === nextFramesPerSecond
 
       if (isPlay) {
-        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: true })
+        if (isSameSpeedWhilePlaying) return
+
+        cornerstoneTools.utilities.cine.playClip(viewport.element, {
+          framesPerSecond: nextFramesPerSecond,
+          loop: true,
+          waitForRendered: 1
+        })
+        this.clipFramesPerSecond = nextFramesPerSecond
+        this.playClipState = true
       } else {
         cornerstoneTools.utilities.cine.stopClip(viewport.element)
+        this.clipFramesPerSecond = null
+        this.playClipState = false
       }
     },
     scrollPage(type) {
@@ -1115,6 +1161,7 @@ export default {
 
         }
         viewport.render()
+        this.syncViewportStaticState()
         if (this.currentVoiUpper > 0) {
           this.voiChange(this.currentVoiUpper)
         }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
index 205d0398..71a98c29 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -93,13 +93,12 @@
                   <i class="el-icon-arrow-down" style="color:#fff;" />
                 </div>
                 <div class="dropdown-content">
-                  <ul style="width:165px;">
+                  <ul class="wwwc-list">
                     <li v-for="item in wwwcArr" :key="item.label">
                       <span @click.stop="changeVoiRange(item)">
-                        <div v-if="item.wc !== null"
-                          style="display:flex;flex-direction: row;justify-content: space-between;">
-                          <div>{{ item.label }}</div>
-                          <div>{{ `${item.ww} / ${item.wc}` }}</div>
+                        <div v-if="item.wc !== null" class="wwwc-item-content">
+                          <div class="wwwc-item-label">{{ item.label }}</div>
+                          <div class="wwwc-item-value">{{ `${item.ww} / ${item.wc}` }}</div>
                         </div>
                         <div v-else style="text-align:left;">
                           {{ item.label }}
@@ -143,7 +142,7 @@
                   <i class="el-icon-arrow-down" style="color:#fff;" />
                 </div>
                 <div class="dropdown-content">
-                  <ul style="width:110px;">
+                  <ul class="rotate-options-list">
                     <li v-for="rotate in rotateOptions" :key="rotate.label" style="text-align:left;">
                       <span @click.prevent="setViewportRotate(rotate.val)">
                         <svg-icon v-if="rotate.icon" :icon-class="rotate.icon" class="svg-icon" />
@@ -171,6 +170,61 @@
               v-if="((criterionType === 0 && readingTool === 0) || this.readingTool === 3) && isMPR">
               <svg-icon icon-class="exit_mpr" class="svg-icon" style="transform: rotate(180deg);" />
             </div>
+            <!-- 关键序列 -->
+            <el-popover v-model="keySeriesPopoverVisible" placement="bottom" trigger="click"
+              popper-class="key-series-popper" v-if="!isFusion && !isMPR" @show="showKeySeriesPanel">
+              <ul class="key-series-list">
+                <li v-if="keyTaskInfo && keyTaskInfo.TaskBlindName" class="key-series-header">
+                  <div class="key-series-header-top">
+                    <div class="key-series-header-title">
+                      <span class="key-series-header-dot"></span>
+                      <div class="key-series-task-name" :title="keyTaskInfo.TaskBlindName">
+                        {{ keyTaskInfo.TaskBlindName }}
+                      </div>
+                    </div>
+                  </div>
+                </li>
+                <li v-if="keySeriesLoading" class="key-series-empty">
+                  <i class="el-icon-loading"></i>
+                </li>
+                <li v-else-if="keySeries.length === 0" class="key-series-empty">
+                  <!-- 暂无关键序列 -->
+                  {{ $t('trials:reading:keySeries:noData') }}
+                </li>
+                <li v-for="(kf, idx) in keySeries" :key="idx" class="key-series-item"
+                  @click.stop.prevent="jumpToKeySeries(kf)">
+                  <div class="key-series-img">
+                    <img v-if="kf.PicturePath" :src="`${OSSclientConfig.basePath}${kf.PicturePath}`" />
+                    <svg-icon v-else icon-class="image" class="svg-icon default-icon" />
+                  </div>
+                  <div class="key-series-info">
+                    <div class="key-series-meta" v-if="kf.MarkName">
+                      <!-- 标注名称 -->
+                      <div class="key-series-label">{{ $t('trials:reading:keySeries:annotationName') }}</div>
+                      <div class="key-series-uid" :title="kf.MarkName">
+                        {{ kf.MarkName }}
+                      </div>
+                    </div>
+                    <div class="key-series-meta">
+                      <!-- 图像号 -->
+                      <div class="key-series-label">{{ $t('trials:reading:keySeries:sopUid') }}</div>
+                      <div class="key-series-uid" :title="kf.SopInstanceUid">
+                        {{ kf.SopInstanceUid }}
+                      </div>
+                    </div>
+                  </div>
+                  <div class="key-series-star">
+                    <svg-icon icon-class="star" class="svg-icon" />
+                  </div>
+                </li>
+              </ul>
+              <div slot="reference" class="tool-item">
+                <div class="icon" :title="$t('trials:reading:button:keySeries')">
+                  <!-- <svg-icon icon-class="star" class="svg-icon" /> -->
+                  <i class="el-icon-star-off svg-icon"></i>
+                </div>
+              </div>
+            </el-popover>
             <!-- 直方图 -->
             <div class="tool-item" :title="`${$t('trials:reading:button:histogram')}`" @click.prevent="openHistogram"
               v-if="this.readingTool === 3">
@@ -230,7 +284,7 @@
                 <svg-icon icon-class="lastframe" class="svg-icon" />
               </div>
               <select v-model="fps" :title="$t('trials:dicom-show:speed')" class="select-wrapper"
-                :disabled="clipPlaying">
+                @change="handleClipFpsChange">
                 <!-- 默认值 -->
                 <option :value="5">5</option>
                 <option :value="10">10</option>
@@ -245,8 +299,8 @@
               <svg-icon icon-class="refresh" class="svg-icon" />
             </div>
             <!-- 更多 :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '']" -->
-            <div v-if="criterionType === 0" :class="['tool-item']" @click.stop="showPanel($event)"
-              @mouseleave="toolMouseout">
+            <div v-if="criterionType === 0 && customizeStandards.length > 0" :class="['tool-item']"
+              @click.stop="showPanel($event)" @mouseleave="toolMouseout">
               <div class="dropdown">
                 <div class="icon" data-tool="more" :title="$t('trials:reading:button:more')">
                   <svg-icon icon-class="more" class="svg-icon" />
@@ -254,10 +308,10 @@
                 </div>
                 <div class="dropdown-content">
                   <!--v-if="readingTaskState < 2"-->
-                  <ul style="width:140px;">
+                  <ul class="customize-standards-list">
                     <li v-for="i in customizeStandards" :key="i.toolName" style="text-align:left;">
                       <span @click.prevent="setMoreToolActive(i.toolName)">
-                        <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;" />
+                        <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px; font-size: 15px;" />
                         {{ $t(i.i18nKey) }}
                       </span>
                     </li>
@@ -528,17 +582,18 @@
       :renderingEngineId="renderingEngineId" :visitInfo="taskInfo" /> -->
     <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" />
+      :visit-task-id="taskId" :is-reading-task-view-in-order="isReadingTaskViewInOrder" :isReading="true" />
     <download-dicom-and-nonedicom v-if="downloadImageVisible" :subject-id="uploadSubjectId"
       :subject-code="uploadSubjectCode" :criterion="uploadTrialCriterion" :task-id="taskId"
-      :visible.sync="downloadImageVisible" />
+      :visible.sync="downloadImageVisible" :is-reading-task-view-in-order="isReadingTaskViewInOrder"
+      :isReading="true" />
     <readingChart ref="readingChart" />
   </div>
 </template>
 <script>
 import { getRelatedVisitTask, getReadingVisitStudyList, getTableAnswerRowInfoList, deleteCustomTag, getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
 import { getDoctorShortcutKey, getUserWLTemplateList } from '@/api/user'
-import { getCustomTag, submitCustomTag } from '@/api/reading'
+import { getCustomTag, submitCustomTag, getMarkList } from '@/api/reading'
 import { getToken } from '@/utils/auth'
 import {
   RenderingEngine,
@@ -709,6 +764,10 @@ export default {
       cols: 1,
       fullScreenIndex: null,
       activeViewportIndex: 0,
+      keySeries: [],
+      keyTaskInfo: null,
+      keySeriesPopoverVisible: false,
+      keySeriesLoading: false,
       activeTool: '',
       readingTaskState: 2,
       renderingEngineId: renderingEngineId,
@@ -988,6 +1047,13 @@ export default {
       this.cols = 2
       this.activeViewportIndex = 1
     }
+    if (localStorage.getItem('SegmentConfig') && this.readingTool === 3) {
+      let obj = JSON.parse(localStorage.getItem('SegmentConfig'))
+      this.SegmentConfig.renderOutline = obj.renderOutline
+      this.SegmentConfig.renderFill = obj.renderFill
+      this.SegmentConfig.fillAlpha = obj.fillAlpha
+      this.SegmentConfig.outlineWidth = obj.outlineWidth
+    }
 
     this.$nextTick(() => {
       this.loadRelatedTasks()
@@ -1156,12 +1222,7 @@ export default {
               this.selectArr.push(item.VisitTaskId)
             }
             if (item.IsCurrentTask) {
-              this.markedSeriesIds = []
-              annotations.map(i => {
-                if (i.MeasureData && i.MeasureData.seriesId) {
-                  this.markedSeriesIds.push(i.MeasureData.seriesId)
-                }
-              })
+              this.syncMarkedSeriesIds(annotations)
             }
           }
 
@@ -1909,6 +1970,17 @@ export default {
           const annotation = i.MeasureData
           if ((this.readingTool === 3 && annotation.seriesId === series.Id) || this.readingTool < 3) {
             annotation.highlighted = false
+            const textBox = annotation?.data?.handles?.textBox
+            const worldPosition = textBox?.worldPosition
+            const hasValidTextBoxWorldPosition = Array.isArray(worldPosition) &&
+              worldPosition.length === 3 &&
+              worldPosition.every(v => Number.isFinite(v)) &&
+              worldPosition.some(v => Math.abs(v) > 0)
+
+            // 如果保存的标注里已带 textbox 世界坐标，则优先按该坐标回显，避免重新计算位置。
+            if (textBox && hasValidTextBoxWorldPosition) {
+              textBox.hasMoved = true
+            }
             cornerstoneTools.annotation.state.addAnnotation(annotation)
             if (this.visitTaskList[taskIdx].ReadingTaskState === 2) {
               cornerstoneTools.annotation.locking.setAnnotationLocked(annotation.annotationUID)
@@ -1976,7 +2048,7 @@ export default {
 
         // this.$refs['ecrf'].setAnnotation({ annotation, toolName: annotation.metadata.toolName })
         this.$refs[`ecrf_${this.lastViewportTaskId}`][0].setAnnotation({ annotation, toolName: annotation.metadata.toolName })
-        this.markedSeriesIds.push(series.Id)
+        this.syncMarkedSeriesIdsFromState(series.TaskInfo.VisitTaskId)
       }
 
       this.setToolsPassive()
@@ -2011,16 +2083,14 @@ export default {
           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)
-          }
+          this.syncMarkedSeriesIdsFromState(annotation.visitTaskId)
         } else {
           const errorMsg = { message: 'annotation Not allowed to operate' }
           throw errorMsg
         }
       } catch (e) {
         cornerstoneTools.annotation.state.addAnnotation(annotation)
+        this.syncMarkedSeriesIdsFromState(annotation.visitTaskId)
         const renderingEngine = getRenderingEngine(renderingEngineId)
         for (let i = 0; i < this.cells.length; i++) {
           const viewportId = `${this.viewportKey}-${i}`
@@ -2057,7 +2127,7 @@ export default {
         annotation.sliceThickness = series.SliceThickness
         annotation.numberOfFrames = isNaN(parseInt(params.frame)) ? null : parseInt(params.frame)
         annotation.markTool = annotation.metadata.toolName
-        this.markedSeriesIds.push(series.Id)
+        this.syncMarkedSeriesIdsFromState(series.TaskInfo.VisitTaskId)
         const operateStateEnum = this.$refs[`ecrf_${this.taskInfo.VisitTaskId}`][0].operateStateEnum
         const markName = await this.customPrompt(!this.isNumber(operateStateEnum))
 
@@ -2094,7 +2164,7 @@ export default {
         const measureData = Object.assign({}, annotation)
         const params = {}
         await this.getScreenshots({
-          visitTaskId: this.visitTaskId,
+          visitTaskId: this.taskInfo.VisitTaskId,
           annotation
         }, async (base64Str) => {
           const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
@@ -2199,10 +2269,7 @@ export default {
               if (!res.IsSuccess) throw ''
             }
           }
-          const index = this.markedSeriesIds.indexOf(annotation.seriesId)
-          if (index !== -1) {
-            this.markedSeriesIds.splice(index, 1)
-          }
+          this.syncMarkedSeriesIdsFromState(annotation.visitTaskId)
           const renderingEngine = getRenderingEngine(renderingEngineId)
           for (let i = 0; i < this.cells.length; i++) {
             const viewportId = `${this.viewportKey}-${i}`
@@ -2215,6 +2282,7 @@ export default {
         }
       } catch (e) {
         cornerstoneTools.annotation.state.addAnnotation(annotation)
+        this.syncMarkedSeriesIdsFromState(annotation.visitTaskId)
         const renderingEngine = getRenderingEngine(renderingEngineId)
         for (let i = 0; i < this.cells.length; i++) {
           const viewportId = `${this.viewportKey}-${i}`
@@ -2291,6 +2359,22 @@ export default {
       this.$set(this.visitTaskList[taskIdx], 'Annotations', annotations)
       this.$set(this.visitTaskList[taskIdx], 'AnnotationUIDs', annotationUIDs)
     },
+    collectMarkedSeriesIds(list = []) {
+      return [...new Set(
+        list
+          .map(item => item?.MeasureData?.seriesId || item?.seriesId)
+          .filter(Boolean)
+      )]
+    },
+    syncMarkedSeriesIds(list = []) {
+      this.markedSeriesIds = this.collectMarkedSeriesIds(list)
+    },
+    syncMarkedSeriesIdsFromState(visitTaskId = this.taskInfo?.VisitTaskId) {
+      const annotations = cornerstoneTools.annotation.state.getAllAnnotations().filter(item => {
+        return item.visitTaskId === visitTaskId && item.seriesId
+      })
+      this.syncMarkedSeriesIds(annotations)
+    },
     async resetAnnotations(visitTaskId) {
       if (this.readingTaskState === 2) return
       const taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
@@ -2325,9 +2409,9 @@ export default {
         if (i.MeasureData) {
           const annotation = i.MeasureData
           cornerstoneTools.annotation.state.addAnnotation(annotation)
-          this.markedSeriesIds.push(annotation.seriesId)
         }
       })
+      this.syncMarkedSeriesIds(annotations)
       const renderingEngine = getRenderingEngine(renderingEngineId)
       for (let i = 0; i < this.cells.length; i++) {
         const viewportId = `${this.viewportKey}-${i}`
@@ -2990,6 +3074,8 @@ export default {
           }
         } else if (this.activeTool === FusionJumpToPointTool.toolName) {
           this.setFusionMipJumpEnabled(false)
+        } else if (this.activeTool === 'SphericalBrush') {
+          toolGroup.setToolDisabled('ThresholdSphere')
         } else {
           toolGroup.setToolPassive(this.activeTool)
         }
@@ -3337,6 +3423,15 @@ export default {
       this.clipPlaying = !this.clipPlaying
       this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].toggleClipPlay(isPlay, this.fps)
     },
+    handleClipFpsChange() {
+      if (!this.clipPlaying) return
+
+      const activeViewportRef = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`]
+      const activeViewport = activeViewportRef && activeViewportRef[0]
+      if (!activeViewport || typeof activeViewport.toggleClipPlay !== 'function') return
+
+      activeViewport.toggleClipPlay(true, this.fps)
+    },
     // 获取窗宽窗位模板
     async getWwcTpl() {
       try {
@@ -3959,8 +4054,10 @@ export default {
             }
           }
         }
-        this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(series, true)
-        this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
+        if (!this.isActiveViewportAtMeasureLocation(obj.annotation)) {
+          this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(series, true)
+          this.$refs[series.TaskInfo.VisitTaskId][0].setSeriesActive(series.StudyIndex, series.SeriesIndex)
+        }
         setTimeout(async () => {
           const divForDownloadViewport = document.querySelector(
             `div[data-viewport-uid="${this.viewportKey}-${this.activeViewportIndex}"]`
@@ -3971,9 +4068,48 @@ export default {
         }, 200)
       }
     },
+    getMeasureImageLocation(measureData = {}) {
+      const referencedImageId = measureData?.metadata?.referencedImageId
+      const referencedImageParams = referencedImageId ? this.getInstanceInfo(referencedImageId) : {}
+      return {
+        visitTaskId: measureData.visitTaskId,
+        studyId: measureData.studyId || measureData.StudyId,
+        seriesId: measureData.seriesId || measureData.SeriesId,
+        instanceId: measureData.instanceId || measureData.InstanceId || referencedImageParams.instanceId || null,
+        frame: measureData.numberOfFrames ?? measureData.NumberOfFrames ?? referencedImageParams.frame
+      }
+    },
+    getActiveViewportImageLocation() {
+      const viewportRef = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`]?.[0]
+      const currentSeries = viewportRef?.series
+      if (!currentSeries) return null
+      const renderingEngine = getRenderingEngine(renderingEngineId)
+      const viewport = renderingEngine?.getViewport(`${this.viewportKey}-${this.activeViewportIndex}`)
+      const currentImageId = viewport?.getCurrentImageId?.()
+      const currentImageParams = currentImageId ? this.getInstanceInfo(currentImageId) : {}
+      return {
+        visitTaskId: currentSeries.TaskInfo?.VisitTaskId,
+        studyId: currentSeries.StudyId,
+        seriesId: currentSeries.Id,
+        instanceId: currentImageParams.instanceId || null,
+        frame: currentImageParams.frame
+      }
+    },
+    isActiveViewportAtMeasureLocation(measureData) {
+      const targetLocation = this.getMeasureImageLocation(measureData)
+      const currentLocation = this.getActiveViewportImageLocation()
+      if (!currentLocation || !targetLocation.seriesId) return false
+      if (targetLocation.visitTaskId && currentLocation.visitTaskId !== targetLocation.visitTaskId) return false
+      if (targetLocation.studyId && currentLocation.studyId !== targetLocation.studyId) return false
+      if (currentLocation.seriesId !== targetLocation.seriesId) return false
+      if (targetLocation.instanceId && currentLocation.instanceId !== targetLocation.instanceId) return false
+      return currentLocation.frame === targetLocation.frame
+    },
     async getScreenshots(measureData, callback) {
       if (measureData) {
-        await this.imageLocation(measureData)
+        if (!this.isActiveViewportAtMeasureLocation(measureData.annotation)) {
+          await this.imageLocation(measureData)
+        }
         const divForDownloadViewport = document.querySelector(
           `div[data-viewport-uid="${this.viewportKey}-${this.activeViewportIndex}"]`
         )
@@ -4219,12 +4355,53 @@ export default {
     isNumber(value) {
       return typeof value === 'number' && value !== null && !isNaN(value)
     },
+    async showKeySeriesPanel() {
+      this.keySeries = []
+      this.keySeriesLoading = true
+      try {
+        const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
+        this.keyTaskInfo = series ? series.TaskInfo : null
+        if (this.keyTaskInfo) {
+          let res = await getMarkList({ visitTaskId: this.keyTaskInfo.VisitTaskId })
+          if (res && res.Result) {
+            this.keySeries = res.Result
+          }
+        }
+      } catch (err) {
+        console.error(err)
+      } finally {
+        this.keySeriesLoading = false
+      }
+    },
+    jumpToKeySeries(kf) {
+
+      let tIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.keyTaskInfo.VisitTaskId)
+      if (tIdx < 0) return
+      const task = this.visitTaskList[tIdx]
+      const studyList = task.StudyList
+      const annotation = kf.MeasureData ? JSON.parse(kf.MeasureData) : {}
+      let targetSeries = this.getMarkedSeries(studyList, annotation, true)
+      if (Object.keys(targetSeries).length === 0) return
+      // this.activeTaskId = this.taskInfo.VisitTaskId
+      this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].setSeriesInfo(targetSeries, true)
+      this.$refs[this.keyTaskInfo.VisitTaskId][0].setSeriesActive(targetSeries.StudyIndex, targetSeries.SeriesIndex)
+    },
     showPanel(e, toolName) {
       if (toolName === 'layout' && (this.isFusion || this.isMPR)) return false
-      e.currentTarget.firstChild.lastChild.style.display = 'block'
+      const dropdownContent = e.currentTarget.querySelector('.dropdown-content')
+      if (dropdownContent) {
+        dropdownContent.style.display = 'block'
+      } else {
+        e.currentTarget.firstChild.lastChild.style.display = 'block'
+      }
     },
     toolMouseout(e) {
-      e.currentTarget.firstChild.lastChild.style.display = 'none'
+      const dropdownContent = e.currentTarget.querySelector('.dropdown-content')
+      if (dropdownContent) {
+        dropdownContent.style.display = 'none'
+      } else {
+        e.currentTarget.firstChild.lastChild.style.display = 'none'
+      }
     },
     debounce(callback, delay) {
       let timerId
@@ -4636,7 +4813,7 @@ export default {
         const trialId = this.$route.query.trialId
         const taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
         const subjectId = taskInfo.SubjectId
-        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.visitTaskId}/${fileName}.png`, file)
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/${this.taskInfo.VisitTaskId}/${fileName}.png`, file)
         return { isSuccess: true, result: result }
       } catch (e) {
         console.log(e)
@@ -4937,7 +5114,7 @@ export default {
           color: #fff;
           box-shadow: 0px 8px 16px 0px rgba(0, 0, 0, 0.2);
           z-index: 9999;
-          font-size: 12px;
+          font-size: 13px;
 
           ul {
             list-style: none;
@@ -4948,7 +5125,7 @@ export default {
             li {
               span {
                 display: block;
-                padding: 5px;
+                padding: 8px;
               }
             }
           }
@@ -4962,6 +5139,55 @@ export default {
           background-color: #727272;
         }
 
+        .customize-standards-list {
+          width: max-content;
+          white-space: nowrap;
+
+          li span {
+            display: flex;
+            align-items: center;
+            padding: 8px !important;
+            box-sizing: border-box;
+          }
+        }
+
+        .wwwc-list {
+          width: max-content;
+          white-space: nowrap;
+
+          li span {
+            padding: 8px !important;
+          }
+        }
+
+        .wwwc-item-content {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+          gap: 16px;
+          min-width: 210px;
+        }
+
+        .wwwc-item-label {
+          text-align: left;
+        }
+
+        .wwwc-item-value {
+          text-align: right;
+        }
+
+        .rotate-options-list {
+          width: max-content;
+          white-space: nowrap;
+
+          li span {
+            display: flex;
+            align-items: center;
+            padding: 8px !important;
+            box-sizing: border-box;
+          }
+        }
+
         .layout-content ul li {
           border-top: 1px solid #ddd;
           border-left: 1px solid #ddd;
@@ -5227,4 +5453,183 @@ export default {
     position: relative;
   }
 }
+
+.key-series-popper {
+  padding: 8px !important;
+  background-color: #1e1e1e !important;
+  border: 1px solid #4a4a4a !important;
+
+  .key-series-list {
+    width: 340px;
+    max-height: 420px;
+    overflow-y: auto;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+
+    &::-webkit-scrollbar {
+      width: 8px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #4a4a4a;
+      border-radius: 4px;
+    }
+
+    &::-webkit-scrollbar-track {
+      background: transparent;
+    }
+  }
+
+  .key-series-header {
+    padding: 5px 12px;
+    margin-bottom: 10px;
+    background: linear-gradient(180deg, rgba(64, 64, 64, 0.92) 0%, rgba(43, 43, 43, 0.98) 100%);
+    border: 1px solid #474747;
+    border-radius: 6px;
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.04), 0 6px 18px rgba(0, 0, 0, 0.2);
+  }
+
+  .key-series-header-top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .key-series-header-title {
+    display: flex;
+    align-items: center;
+    min-width: 0;
+  }
+
+  .key-series-header-dot {
+    width: 8px;
+    height: 8px;
+    margin-right: 8px;
+    border-radius: 50%;
+    background: linear-gradient(180deg, #ffd76a 0%, #f39c12 100%);
+    box-shadow: 0 0 8px rgba(243, 156, 18, 0.45);
+  }
+
+  .key-series-task-name {
+    color: #fff;
+    font-size: 15px;
+    font-weight: 600;
+    line-height: 22px;
+    word-break: break-all;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  }
+
+  .key-series-empty {
+    text-align: center;
+    color: #999;
+    padding: 10px;
+  }
+
+  .key-series-item {
+    text-align: left;
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    cursor: pointer;
+    background: linear-gradient(180deg, rgba(46, 46, 46, 0.96) 0%, rgba(40, 40, 40, 0.98) 100%);
+    border-radius: 6px;
+    margin-bottom: 8px;
+    border: 1px solid #353535;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.12);
+    // transition: all 0.2s ease;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &:hover {
+      background: linear-gradient(180deg, rgba(54, 54, 54, 0.98) 0%, rgba(46, 46, 46, 1) 100%);
+      border-color: #5a5a5a;
+      // transform: translateY(-1px);
+      box-shadow: 0 6px 16px rgba(0, 0, 0, 0.18);
+    }
+
+    .key-series-img {
+      width: 60px;
+      height: 60px;
+      flex-shrink: 0;
+      background-color: #000;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      overflow: hidden;
+      margin-right: 12px;
+      border-radius: 4px;
+      border: 1px solid #3a3a3a;
+
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
+
+      .default-icon {
+        font-size: 24px;
+        color: #666;
+      }
+    }
+
+    .key-series-info {
+      flex: 1;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      justify-content: flex-start;
+      padding-right: 5px;
+
+      .key-series-meta {
+        width: 100%;
+        overflow: hidden;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        margin-bottom: 4px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+
+      .key-series-label {
+        font-size: 13px;
+        color: #aaa;
+        margin-right: 4px;
+        white-space: nowrap;
+      }
+
+      .key-series-uid {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 13px;
+        color: #ddd;
+        line-height: 1.2;
+      }
+    }
+
+    .key-series-star {
+      margin-left: 10px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 28px;
+      height: 28px;
+      border-radius: 50%;
+      background: rgba(243, 156, 18, 0.08);
+      border: 1px solid rgba(243, 156, 18, 0.16);
+
+      .svg-icon {
+        color: #f39c12;
+        font-size: 16px;
+      }
+    }
+  }
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
index 3f2d821f..b5e8310d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
@@ -240,7 +240,8 @@ export default {
   background-color: #646464a1;
 }
 
-// ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
-//   background-color: #428bca;
-//   border-color: #428bca;
-// }</style>
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #428bca;
+  border-color: #428bca;
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
index 28adf62b..a05ef00d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
@@ -27,7 +27,7 @@
               <i class="el-icon-warning feedback-icon"
                 :style="{ color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }"
                 @click="openFeedBackTable" />
-              <el-button size="mini" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
+              <el-button size="mini" :loading="outerSaveLoading" :disabled="outerSaveLoading" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
             </div>
           </el-form-item>
         </el-form>
@@ -182,7 +182,8 @@
                         {{ $t('common:button:delete') }}
                       </el-button>
                       <!-- 保存 -->
-                      <el-button size="mini" @click="saveLesion(table, answer.RowIndex)">
+                      <el-button size="mini" :loading="!!rowSaveLoadingMap[`${table.Id}_${answer.RowIndex}`]"
+                        :disabled="!!rowSaveLoadingMap[`${table.Id}_${answer.RowIndex}`]" @click="saveLesion(table, answer.RowIndex)">
                         {{ $t('common:button:save') }}
                       </el-button>
                     </div>
@@ -280,6 +281,9 @@ export default {
       digitPlaces: 2,
       imageQualityId: '',
       imageQualityIssuesId: '',
+      outerSaveLoading: false,
+      rowSaveLoadingMap: {},
+      validationDialogVisible: false,
 
 
       merge: { visible: false, loading: false },
@@ -322,6 +326,24 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },
     // 融合
     async handleMerge(answers, questionId, orderMark) {
       this.lesionData = []
@@ -526,10 +548,13 @@ export default {
     },
     // 保存外层问题表单
     async saveOuterForm() {
-      const valid = await this.$refs['outerForm'].validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
+      if (this.outerSaveLoading) return
+      this.outerSaveLoading = true
+      let loading = null
       try {
+        const valid = await this.$refs['outerForm'].validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
         const answers = []
         let imageQuality = null
         for (const k in this.outerForm) {
@@ -561,7 +586,9 @@ export default {
         loading.close()
       } catch (e) {
         console.log(e)
-        loading.close()
+      } finally {
+        if (loading) loading.close()
+        this.outerSaveLoading = false
       }
     },
     setAnnotation(obj) {
@@ -956,10 +983,20 @@ export default {
     },
     // 保存病灶
     async saveLesion(table, rowIndex) {
-      const valid = await this.$refs[`${table.Id}_${rowIndex}`][0].validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
+      const rowKey = `${table.Id}_${rowIndex}`
+      if (this.rowSaveLoadingMap[rowKey]) return
+      this.$set(this.rowSaveLoadingMap, rowKey, true)
+      await this.$nextTick()
+      let loading = null
       try {
+        const valid = await this.$refs[`${table.Id}_${rowIndex}`][0].validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
+        const closeLoading = loading.close.bind(loading)
+        loading.close = () => {
+          closeLoading()
+          loading = null
+        }
         const innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
         const measureData = innerForm.MeasureData
         const lesionState = innerForm.LesionState
@@ -976,24 +1013,14 @@ export default {
               //  淋巴结靶病灶 必须使用长短径测量工具,短径大于等于15mm
               if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 15)) {
                 // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记，且短径须大于15mm！
-                this.$confirm(this.$t('trials:reading:warnning:msg19'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg19'))
                 return
               }
             } else {
               // 非淋巴结靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
               if (!(measureData && measureData.markTool === 'Length' && lesionLength >= 10 && (measureData.sliceThickness && lesionLength >= 2 * measureData.sliceThickness || !measureData.sliceThickness))) {
                 // 评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记，长径须大于10mm且不小于2倍层厚！
-                this.$confirm(this.$t('trials:reading:warnning:msg20'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg20'))
                 return
               }
             }
@@ -1005,12 +1032,7 @@ export default {
               // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
-                this.$confirm(this.$t('trials:reading:warnning:msg21'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg21'))
                 return
               }
             } else {
@@ -1018,12 +1040,7 @@ export default {
               console.log(measureData, 'measureData')
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg22'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg22'))
                 return
               }
             }
@@ -1036,24 +1053,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具
               if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 10)) {
                 // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg23'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg23'))
                 return
               }
             } else {
               // 非淋巴结靶病灶 直径测量工具
               if (!(measureData && measureData.markTool === 'Length')) {
                 // `评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记！`
-                this.$confirm(this.$t('trials:reading:warnning:msg24'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg24'))
                 return
               }
             }
@@ -1064,12 +1071,7 @@ export default {
               // 淋巴结靶病灶 必须使用箭头工具，短径记录为5mm
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg25'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg25'))
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
@@ -1081,12 +1083,7 @@ export default {
               // 非淋巴结靶病灶 箭头工具，长径记录为5mm
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg26'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg26'))
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
@@ -1103,24 +1100,14 @@ export default {
               // 淋巴结靶病灶 不需要添加标记
               if (measureData) {
                 // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg27'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg27'))
                 return
               }
             } else {
               // 非淋巴结靶病灶 不需要添加标记
               if (measureData) {
                 // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg28'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg28'))
                 return
               }
             }
@@ -1131,24 +1118,14 @@ export default {
             if (lymphNodes === 1) {
               if (!(measureData && (measureData.markTool === 'Bidirectional' && lesionShort < 10))) {
                 // `评估状态为消失的淋巴结靶病灶需使用长短径工具添加标记,且短径需小于10mm！`
-                this.$confirm(this.$t('trials:reading:warnning:msg29'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg29'))
                 return
               }
             } else {
               // 非淋巴结靶病灶 箭头工具
               if (!(measureData && measureData.markTool === 'ArrowAnnotate')) {
                 // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg30'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg30'))
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
@@ -1165,24 +1142,14 @@ export default {
               // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg31'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg31'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg32'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg32'))
                 return
               }
             }
@@ -1194,24 +1161,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-                this.$confirm(this.$t('trials:reading:warnning:msg33'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg33'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI' || measureData.markTool === "RectangleRoi"))) {
                 // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg34'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg34'))
                 return
               }
             }
@@ -1223,24 +1180,14 @@ export default {
               // 淋巴结靶病灶 无标记
               if (measureData) {
                 // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg35'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg35'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 无标记
               if (measureData) {
                 // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg36'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg36'))
                 return
               }
             }
@@ -1252,24 +1199,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || (measureData.markTool === 'Bidirectional' && lesionShort < 10)))) {
                 // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg37'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg37'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 箭头工具
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg38'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg38'))
                 return
               }
             }
@@ -1281,24 +1218,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg39'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg39'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为存在的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg40'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg40'))
                 return
               }
             }
@@ -1310,24 +1237,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg41'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg41'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'ArrowAnnotate'))) {
                 // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
-                this.$confirm(this.$t('trials:reading:warnning:msg42'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg42'))
                 return
               }
             }
@@ -1339,24 +1256,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (measureData) {
                 // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
-                this.$confirm(this.$t('trials:reading:warnning:msg43'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg43'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (measureData) {
                 // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg44'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg44'))
                 return
               }
             }
@@ -1368,24 +1275,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || (measureData.markTool === 'Bidirectional' && lesionShort < 10)))) {
                 // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg45'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg45'))
                 return
               }
             } else {
               // 箭头工具
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg46'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg46'))
                 return
               }
             }
@@ -1452,7 +1349,14 @@ export default {
         loading.close()
       } catch (e) {
         console.log(e)
-        loading.close()
+        if (loading) {
+          loading.close()
+        }
+      } finally {
+        this.$set(this.rowSaveLoadingMap, rowKey, false)
+        if (loading) {
+          loading.close()
+        }
       }
     },
     // 上传截图
@@ -1605,6 +1509,8 @@ export default {
       } catch (e) {
         loading.close()
         console.log(e)
+      } finally {
+        this.$set(this.rowSaveLoadingMap, rowKey, false)
       }
     },
     // 重置表单
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
index e7dc9073..33e6ab01 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -290,6 +290,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
index 8ad20ec1..fba22f6d 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
@@ -38,12 +38,21 @@
             v-if="readingTaskState < 2 && criterionType !== 10"
             type="primary"
             size="small"
+            :loading="submitLockAction === 'save'"
+            :disabled="!!submitLockAction"
             @click="handleSave(true)"
           >
             <!-- 保存 -->
             {{ $t('common:button:save') }}
           </el-button>
-          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="beforeLeave">
+          <el-button
+            v-if="readingTaskState < 2"
+            type="primary"
+            size="small"
+            :loading="submitLockAction === 'submit'"
+            :disabled="!!submitLockAction"
+            @click="beforeLeave"
+          >
             <!-- 提交 -->
             {{ $t('common:button:submit') }}
           </el-button>
@@ -398,6 +407,8 @@ export default {
       taskInfo: {},
       visitTaskId: '',
       isBaselineTask: false,
+      submitLockAction: '',
+      validationConfirmVisible: false,
     }
   },
   computed: {
@@ -838,9 +849,11 @@ export default {
       }
     },
     async handleConfirm() {
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'submit'
       this.loading = true
       try {
-        let r = await this.handleSave(false)
+        let r = await this.handleSave(false, true)
         if (!r) return
         await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
         var i = this.visitTaskList.findIndex(
@@ -867,9 +880,10 @@ export default {
           this.signCode = ImageAssessmentReportConfirmation
           this.signVisible = true
         }
-        this.loading = false
       } catch (e) {
+      } finally {
         this.loading = false
+        this.submitLockAction = ''
       }
     },
     sign(type = 'sign') {
@@ -992,89 +1006,96 @@ export default {
         )
       }
     },
-    handleSave(isPrompt) {
-      return new Promise(async (resolve, reject) => {
-        var isBeill
-        var evaluateResult = ''
-        var evaluateAjustReason = ''
-        this.answers = []
-        var isExistEvaluateResult = false
-        this.answerArr.map((item) => {
-          if (item.questionType === 13 || item.questionType === 42) {
-            evaluateResult = item.answer
-            isExistEvaluateResult = true
-          }
-          if (item.questionType === 14) {
-            evaluateAjustReason = item.answer
-          }
-          if (item.questionType === 15) {
-            isBeill = item.answer
-          }
-          this.answers.push({ id: item.id, answer: item.answer })
-        })
-        console.log(
-          this.currentExistDisease,
-          this.isExistDisease,
-          evaluateAjustReason,
-          isBeill
-        )
-        if (
-          this.currentExistDisease !== this.isExistDisease &&
-          !evaluateAjustReason
-        ) {
-          this.$confirm(this.$t('trials:readingReport:message:msg2'), {
-            type: 'warning',
-            showCancelButton: false,
-            callback: (action) => {},
-          })
-          resolve(false)
-          return
-        }
-        if (
-          isExistEvaluateResult &&
-          evaluateResult === null &&
-          !this.isBaselineTask
-        ) {
-          // 请将疗效评估信息填写完整
-          this.$confirm(this.$t('trials:readingReport:message:msg2'), {
-            type: 'warning',
-            showCancelButton: false,
-            callback: (action) => {},
-          })
-          resolve(false)
-          return
-        }
-        if (
-          isExistEvaluateResult &&
-          evaluateResult !== this.tumorEvaluate &&
-          !evaluateAjustReason
-        ) {
-          // 请填写整体评估调整原因
-          this.$confirm(this.$t('trials:readingReport:message:msg3'), {
-            type: 'warning',
-            showCancelButton: false,
-            callback: (action) => {},
-          })
-          resolve(false)
-          return
-        }
-        this.loading = true
+    async handleSave(isPrompt, fromSubmit = false) {
+      if (this.validationConfirmVisible) return false
+      if (this.submitLockAction && !fromSubmit) return false
+      if (!fromSubmit) {
+        this.submitLockAction = 'save'
+      }
+      const showValidationConfirm = async (message) => {
+        if (this.validationConfirmVisible) return false
+        this.validationConfirmVisible = true
         try {
-          var params = {
-            visitTaskId: this.visitTaskId,
-            answers: this.answers,
-          }
-          const res = await changeDicomReadingQuestionAnswer(params)
-          if (res.IsSuccess && isPrompt) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-          }
-          this.loading = false
-          resolve(true)
+          await this.$confirm(message, {
+            type: 'warning',
+            showCancelButton: false,
+            closeOnClickModal: false,
+            closeOnPressEscape: false,
+          })
         } catch (e) {
-          this.loading = false
-          reject()
+          // Ignore close actions and always restore the save button state.
+        } finally {
+          this.validationConfirmVisible = false
+          resetSubmitLock()
         }
+        return false
+      }
+      const resetSubmitLock = () => {
+        if (!fromSubmit) {
+          this.submitLockAction = ''
+        }
+      }
+      var isBeill
+      var evaluateResult = ''
+      var evaluateAjustReason = ''
+      this.answers = []
+      var isExistEvaluateResult = false
+      this.answerArr.map((item) => {
+        if (item.questionType === 13 || item.questionType === 42) {
+          evaluateResult = item.answer
+          isExistEvaluateResult = true
+        }
+        if (item.questionType === 14) {
+          evaluateAjustReason = item.answer
+        }
+        if (item.questionType === 15) {
+          isBeill = item.answer
+        }
+        this.answers.push({ id: item.id, answer: item.answer })
       })
+      if (
+        this.currentExistDisease !== this.isExistDisease &&
+        !evaluateAjustReason
+      ) {
+        return showValidationConfirm(
+          this.$t('trials:readingReport:message:msg2')
+        )
+      }
+      if (
+        isExistEvaluateResult &&
+        evaluateResult === null &&
+        !this.isBaselineTask
+      ) {
+        // 请将疗效评估信息填写完整
+        return showValidationConfirm(
+          this.$t('trials:readingReport:message:msg2')
+        )
+      }
+      if (
+        isExistEvaluateResult &&
+        evaluateResult !== this.tumorEvaluate &&
+        !evaluateAjustReason
+      ) {
+        // 请填写整体评估调整原因
+        return showValidationConfirm(
+          this.$t('trials:readingReport:message:msg3')
+        )
+      }
+      this.loading = true
+      try {
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers: this.answers,
+        }
+        const res = await changeDicomReadingQuestionAnswer(params)
+        if (res.IsSuccess && isPrompt) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+        return true
+      } finally {
+        this.loading = false
+        resetSubmitLock()
+      }
     },
     getWarningText() {
       var sysRes = ''
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/SegmentForm.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/SegmentForm.vue
index 9e248b66..2090e874 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/SegmentForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/SegmentForm.vue
@@ -4,7 +4,8 @@
         <el-form-item :label="$t('segment:form:label:studyName')" prop="taskBlindName">
             <el-select v-model="form.studyId" clearable @change="(e) => handleChange(e, 'study')"
                 @clear="(e) => handleClear(e, 'study')">
-                <el-option v-for="item in studyList" :key="item.StudyId" :label="item.StudyCode"
+                <el-option v-for="item in studyList" :key="item.StudyId"
+                    :label="taskInfo.IsReadingTaskViewInOrder !== 0 ? item.StudyCode : `${item.Modalities}(${item.SeriesCount})`"
                     :value="item.StudyId" />
             </el-select>
         </el-form-item>
@@ -87,12 +88,13 @@ export default {
                         }, trigger: ['blur', 'change']
                     }
                 ]
-            }
+            },
+            taskInfo: {}
         }
     },
-    // mounted() {
-    //     this.init()
-    // },
+    mounted() {
+        this.taskInfo = JSON.parse(sessionStorage.getItem('taskInfo'))
+    },
     methods: {
         setSeries(series) {
             this.series = series
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue
index 36935e99..9ac946d7 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue
@@ -19,7 +19,7 @@
                     <div :title="$t('trials:Segmentations:tools:thresholecircle')"
                         :class="['tool-item', ThresholdTools.includes(activeTool) && segmentList.length > 0 ? 'tool-item-active' : '']"
                         :style="{ cursor: isMPR || segmentList.length <= 0 || (curSegment && curSegment.lock) || ['viewport-MPR-1', 'viewport-MPR-2'].includes(`${viewportKey}-${activeViewportIndex}`) ? 'not-allowed' : 'pointer' }"
-                        @click.prevent="initThreshold">
+                        @click.prevent="initThreshold()">
                         <svg-icon icon-class="thresholecircle" class="svg-icon" />
                     </div>
                     <div :title="$t('trials:Segmentations:tools:circularbrush')"
@@ -28,19 +28,25 @@
                         @click.prevent="setToolActive('CircularBrush')">
                         <svg-icon icon-class="circularbrush" class="svg-icon" />
                     </div>
+                    <div :title="$t('trials:Segmentations:tools:SphericalBrush')"
+                        :class="['tool-item', activeTool === 'SphericalBrush' && segmentList.length > 0 ? 'tool-item-active' : '']"
+                        :style="{ cursor: isMPR || segmentList.length <= 0 || (curSegment && curSegment.lock) || ['viewport-MPR-1', 'viewport-MPR-2'].includes(`${viewportKey}-${activeViewportIndex}`) ? 'not-allowed' : 'pointer' }"
+                        @click.prevent="initThreshold('SphericalBrush')">
+                        <svg-icon icon-class="sphericalBrush" class="svg-icon" />
+                    </div>
                     <div :class="['tool-item', activeTool === 'CircularEraser' && segmentList.length > 0 ? 'tool-item-active' : '']"
                         :style="{ cursor: isMPR || segmentList.length <= 0 || (curSegment && curSegment.lock) || ['viewport-MPR-1', 'viewport-MPR-2'].includes(`${viewportKey}-${activeViewportIndex}`) ? 'not-allowed' : 'pointer' }"
                         :title="$t('trials:Segmentations:tools:Eraser')"
                         @click.prevent="setToolActive('CircularEraser')">
                         <svg-icon icon-class="clear" class="svg-icon" />
                     </div>
-                    <!-- <div :class="['tool-item']">
+                    <!-- <div :class="['tool-item']"> 
                         <input type="file" @change="beginScanFiles($event)">
                     </div> -->
                 </div>
                 <div class="ConfigBox">
                     <div class="EraserConfig"
-                        v-if="activeTool === 'CircularEraser' || activeTool === 'CircularBrush' || ThresholdTools.includes(activeTool)">
+                        v-if="activeTool === 'SphericalBrush' || activeTool === 'CircularEraser' || activeTool === 'CircularBrush' || ThresholdTools.includes(activeTool)">
                         <span>{{ $t('trials:reading:Segmentations:title:EraserConfigSection') }}</span>
                         <el-select v-model="sliderMax" placeholder="" size="small" @change="handleSliderChange">
                             <el-option v-for="item in sliderSection" :key="item.id" :label="item.label"
@@ -48,8 +54,8 @@
                             </el-option>
                         </el-select>
                     </div>
-                    <div class="EraserConfig"
-                        v-if="activeTool === 'CircularEraser' || activeTool === 'CircularBrush' || ThresholdTools.includes(activeTool)">
+                    <div class="EraserConfig RadiusConfig"
+                        v-if="activeTool === 'SphericalBrush' || activeTool === 'CircularEraser' || activeTool === 'CircularBrush' || ThresholdTools.includes(activeTool)">
                         <span>{{ $t('trials:reading:Segmentations:title:EraserConfig') }}</span>
                         <el-slider v-model="brushSize" show-input :step="sliderStep" :max="sliderMax" input-size="mini"
                             :show-input-controls="false" />
@@ -127,8 +133,8 @@
                     </div>
                     <div class="SegmentConfig">
                         <span>{{ $t('trials:reading:Segmentations:title:Border') }}</span>
-                        <el-slider v-model="SegmentConfig.outlineWidth" show-input :step="0.5" :max="10"
-                            input-size="mini" :show-input-controls="false" />
+                        <el-slider v-model="SegmentConfig.outlineWidth" show-input :step="1" :max="10" input-size="mini"
+                            :show-input-controls="false" />
                     </div>
                     <span class="line" />
                     <div class="SegmentConfig" style="justify-content: flex-start;">
@@ -564,6 +570,7 @@ export default {
         })
         const digitPlaces = Number(localStorage.getItem('digitPlaces'))
         this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+        this.getSegmentConfig()
         // document.addEventListener("click", () => {
         //     this.popoverId = null
         // });
@@ -588,12 +595,14 @@ export default {
         SegmentConfig: {
             handler() {
                 // this.readingSegmentByConfig()
+                this.setSegmentConfig()
             },
             deep: true
         },
         brushSize: {
             handler() {
                 this.setBrushSize(this.activeTool)
+                this.setSegmentConfig()
             },
             deep: true
         },
@@ -611,6 +620,23 @@ export default {
         }
     },
     methods: {
+        getSegmentConfig() {
+            if (!localStorage.getItem('SegmentConfig')) return false
+            let obj = JSON.parse(localStorage.getItem('SegmentConfig'))
+            this.sliderStep = obj.sliderStep
+            this.sliderMax = obj.sliderMax
+        },
+        setSegmentConfig() {
+            let obj = {
+                sliderStep: this.sliderStep,
+                sliderMax: this.sliderMax,
+                renderOutline: this.SegmentConfig.renderOutline,
+                renderFill: this.SegmentConfig.renderFill,
+                fillAlpha: this.SegmentConfig.fillAlpha,
+                outlineWidth: this.SegmentConfig.outlineWidth,
+            }
+            localStorage.setItem('SegmentConfig', JSON.stringify(obj))
+        },
         handleSliderChange(value) {
             // console.log(value, 'value')
             let data = this.sliderSection.find(item => item.max === value)
@@ -620,6 +646,7 @@ export default {
             if (this.brushSize >= data.max) {
                 this.brushSize = data.max
             }
+            this.setSegmentConfig()
         },
         fileSizeFormatter(size) {
             if (!size) return
@@ -636,8 +663,13 @@ export default {
         handleClickPopover(item) {
             this.popoverId = `popover-${item.segmentationId}_${item.segmentIndex}`
         },
-        initThreshold() {
+        initThreshold(key = null) {
             if (this.isMPR) return false
+            if (key === 'SphericalBrush') {
+                this.setToolActive(this.ThresholdTools[1], 'SphericalBrush')
+                this.setSphericalBrushConfig()
+                return false
+            }
             if (!this.ThresholdTools.includes(this.activeTool)) {
                 this.setToolActive(this.ThresholdTools[0])
                 this.thresholdType = this.ThresholdTools[0]
@@ -757,7 +789,7 @@ export default {
             }
 
         },
-        setToolActive(toolName) {
+        setToolActive(toolName, name = null) {
             if (this.segmentList.length <= 0) return false
             if (this.curSegment.lock) return false
             if (this.isMPR) return false
@@ -772,12 +804,16 @@ export default {
                     toolGroup.setToolPassive(this.activeTool)
                 }
                 this.$emit('update:activeTool', '')
+            } else if (this.activeTool === name) {
+                toolGroup.setToolPassive(this.ThresholdTools[1])
+                this.$emit('update:activeTool', '')
             } else {
                 if (this.activeTool) {
                     if (toolName === CrosshairsTool.toolName) {
                         toolGroup.setToolDisabled(this.activeTool)
                     } else {
                         toolGroup.setToolPassive(this.activeTool)
+                        toolGroup.setToolPassive(this.ThresholdTools[1])
                     }
                 }
                 toolGroup.setToolActive(toolName, {
@@ -786,10 +822,15 @@ export default {
                 // if (toolName === 'CircularEraser') {
                 //     console.log(toolGroup.getToolInstance(toolName))
                 // }
-                this.$emit('update:activeTool', toolName)
-                this.setBrushSize(toolName)
-                if (this.ThresholdTools.includes(toolName)) {
-                    this.setBrushThreshold()
+                if (name) {
+                    this.$emit('update:activeTool', name)
+                    this.setBrushSize(name)
+                } else {
+                    this.$emit('update:activeTool', toolName)
+                    this.setBrushSize(toolName)
+                    if (this.ThresholdTools.includes(toolName)) {
+                        this.setBrushThreshold()
+                    }
                 }
 
             }
@@ -1389,12 +1430,13 @@ export default {
             let imageId = null
             if (isFile) {
                 imageId = cornerstoneDICOMImageLoader.wadouri.fileManager.add(obj);
+                obj.segmentationId = this.$guid()
+                await this.createSegmentation(obj.segmentationId);
             } else {
                 const imageIdObj = await cornerstoneDICOMImageLoader.wadouri.loadImage(`wadouri:${this.OSSclientConfig.basePath}${obj.segUrl}`).promise
                 imageId = imageIdObj.imageId
             }
             const image = await imageLoader.loadAndCacheImage(imageId);
-
             if (!image) {
                 return;
             }
@@ -1423,7 +1465,6 @@ export default {
                 );
                 return;
             }
-            await this.createSegmentation(segmentationId);
             let arr = []
             generateToolState.segMetadata.data.forEach(item => {
                 if (item) {
@@ -1464,6 +1505,7 @@ export default {
                 );
                 voxelManager.setScalarData(scalarData);
             }
+            this.createSegmentationRepresentation(segmentationId)
         },
         createSegmentGroupObj(name) {
             let flag = this.segmentList.some(item => item.name === name)
@@ -1495,6 +1537,21 @@ export default {
             if (toolName === 'ThresholdSphere') {
                 this.setDynamicRadius()
             }
+            if (toolName === 'SphericalBrush') {
+                this.setSphericalBrushConfig()
+            }
+        },
+        setSphericalBrushConfig() {
+            let volume = cache.getVolume(this.series.SeriesInstanceUid);
+            let { spacing, numFrames } = volume
+            let constant = numFrames * spacing[2] / 100
+            let dynamicRadius = Math.ceil(this.brushSize * constant)
+            let obj = {
+                dynamicRadius: dynamicRadius,
+                isDynamic: false,
+                range: [-10000, 100000]
+            }
+            this.setBrushThreshold(obj)
         },
         setDynamicRadius() {
             let volume = cache.getVolume(this.series.SeriesInstanceUid);
@@ -1502,7 +1559,7 @@ export default {
             let constant = numFrames * spacing[2] / 100
             this.brushThreshold.dynamicRadius = Math.ceil(this.brushSize * constant)
         },
-        setBrushThreshold() {
+        setBrushThreshold(OBJ = null) {
             const toolGroupId = this.isMPR ? this.volumeToolGroupId : `${this.viewportKey}-${this.activeViewportIndex}`
             let brushThreshold = {
                 isDynamic: this.brushThreshold.isDynamic,
@@ -1511,6 +1568,7 @@ export default {
             if (!this.brushThreshold.isDynamic) {
                 brushThreshold.range = this.brushThreshold.range
             }
+            if (OBJ) brushThreshold = OBJ
             CStUtils.segmentation.setBrushThresholdForToolGroup(toolGroupId, brushThreshold);
         },
         async createSegmentation(segmentationId) {
@@ -1545,7 +1603,7 @@ export default {
         },
         segmentationModifiedCallback(evt) {
             const { detail } = evt;
-            let tools = [...this.ThresholdTools, ...this.tools]
+            let tools = [...this.ThresholdTools, ...this.tools, 'SphericalBrush']
             if (!detail || detail.segmentIndex === 255 || !this.activeTool || !tools.includes(this.activeTool)) {
                 return;
             }
@@ -1563,12 +1621,26 @@ export default {
                 console.log(stats)
                 if (mode === 'individual') {
                     const segmentStats = stats;
-
                     for (const segmentIndex of indices) {
                         if (segmentStats[segmentIndex]) {
                             const segmentStat = segmentStats[segmentIndex];
                             // console.log(segmentStat, 'segmentStat')
                             segmentStat.count.label = 'Voxels';
+                            if (this.series.Modality === 'PT') {
+                                const renderingEngine = getRenderingEngine(this.renderingEngineId)
+                                const viewportId = `${this.viewportKey}-${this.activeViewportIndex}`
+                                const viewport = renderingEngine.getViewport(viewportId);
+                                let imageIds = viewport.getImageIds(this.series.SeriesInstanceUid)
+                                let imageId = imageIds[0]
+                                const suvFactor = metaData.get('scalingModule', imageId) || {};
+                                console.log(suvFactor, 'suvFactor')
+                                segmentStat.sulpeak = {
+                                    label: "Mean Pixel",
+                                    name: "sulpeak",
+                                    unit: "SUL",
+                                    value: suvFactor.suvlbm && suvFactor.suvbw ? segmentStat.mean.value * suvFactor.suvlbm / suvFactor.suvbw : 0,
+                                }
+                            }
                             let segmentGroup = this.segmentList.find(item => item.segmentationId === segmentationId)
                             if (segmentGroup) {
                                 let segment = segmentGroup.segments.find(item => item.segmentIndex === segmentIndex)
@@ -1596,12 +1668,12 @@ export default {
         contentMouseup() {
             try {
                 // console.log("segment contentMouseup")
-                if (!this.drawing) return false
                 if (this.timeoutId) {
                     clearTimeout(this.timeoutId);
                     this.timeoutId = null;
                 }
                 this.timeoutId = setTimeout(() => {
+                    if (!this.drawing) return false
                     this.timeoutId = null;
                     this.drawing = false;
                     let segmentGroup = this.segmentList.find(item => item.segmentationId === this.segmentationId)
@@ -2477,6 +2549,21 @@ export default {
 .EraserConfig {
     margin: 5px 0;
 
+    ::v-deep .el-input-number {
+        width: 90px;
+    }
+
+    ::v-deep .el-input-number.is-without-controls .el-input__inner {
+        padding: 0 10px;
+        width: 90px;
+    }
+
+    ::v-deep .el-radio-button__inner {
+        width: 105px;
+    }
+}
+
+.RadiusConfig {
     ::v-deep .el-input-number {
         width: 50px;
     }
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue
index a41a442e..bcd6b3ff 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue
@@ -4,7 +4,10 @@
       <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" :title="taskInfo.SubjectCode">
         {{ taskInfo.SubjectCode }}
       </div>
-      <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" :title="visitTaskInfo.TaskBlindName">
+      <div :title="visitTaskInfo.TaskBlindName">
+        <span v-if="taskInfo && !taskInfo.IsReadingShowSubjectInfo">
+          {{ $t('trials:reading:title:taskName') }}
+        </span>
         {{ visitTaskInfo.TaskBlindName }}
       </div>
     </div>
@@ -21,7 +24,7 @@
               </div>
               <div>
                 <span class="study-meta-line" :title="study.Modalities">
-                  <span class="study-code" :title="study.StudyCode">{{ study.StudyCode }}</span>
+                  <span v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder !== 0" class="study-code" :title="study.StudyCode">{{ study.StudyCode }}</span>
                   <span class="study-modality">{{ `${study.Modalities}(${study.SeriesCount})` }}</span>
                   <span class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)">
                     <el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper">
@@ -329,7 +332,13 @@ export default {
     margin: 0;
     text-align: center;
     background-color: #4c4c4c;
-    height: 50px;
+    min-height: 50px;
+    height: auto;
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    word-break: break-word;
   }
 
   .dicom-desc {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
index dd0e6753..06805756 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue
@@ -7,8 +7,8 @@
         <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon"
           @click.stop="viewCD(series.TaskInfo.VisitTaskId)" />
       </div>
-      <h2 v-if="taskInfo.IsReadingShowSubjectInfo" class="subject-info">
-        {{ `${series.TaskInfo.SubjectCode} ${series.TaskInfo.TaskBlindName} ` }}
+      <h2 class="subject-info">
+        {{ taskInfo.IsReadingShowSubjectInfo ? series.TaskInfo.SubjectCode + ' ' + series.TaskInfo.TaskBlindName : series.TaskInfo.TaskBlindName }}
       </h2>
       <div>Series: #{{ series.SeriesNumber }}</div>
       <div v-if="series.Stack">Image: #{{ `${series.SliceIndex + 1}/${series.Stack.length}` }}</div>
@@ -150,8 +150,12 @@ export default {
       originalMarkers: [],
       markers: { top: '', right: '', bottom: '', left: '' },
       playClipState: false,
+      clipFramesPerSecond: null,
+      toggleClipPlayTimer: null,
       wwwcIdx: 2,
-      loading: false
+      loading: false,
+      forceFitToWindow: false,
+      resizeObserver: null
     }
   },
   mounted() {
@@ -162,17 +166,30 @@ export default {
       this.initViewport()
     })
   },
+  beforeDestroy() {
+    if (this.resizeObserver && this.element) {
+      this.resizeObserver.unobserve(this.element)
+      this.resizeObserver.disconnect()
+    }
+    if (this.toggleClipPlayTimer) {
+      clearInterval(this.toggleClipPlayTimer)
+      this.toggleClipPlayTimer = null
+    }
+  },
   methods: {
     initViewport() {
       this.element = this.$refs['viewport']
-      const resizeObserver = new ResizeObserver(() => {
+      this.resizeObserver = new ResizeObserver(() => {
         const renderingEngine = getRenderingEngine(this.renderingEngineId)
         if (renderingEngine) {
-          renderingEngine.resize(true, false)
+          renderingEngine.resize(true, true)
+          if (this.forceFitToWindow) {
+            this.resize(true)
+          }
         }
       })
       this.element.oncontextmenu = (e) => e.preventDefault()
-      resizeObserver.observe(this.element)
+      this.resizeObserver.observe(this.element)
       this.element.addEventListener('CORNERSTONE_STACK_NEW_IMAGE', this.stackNewImage)
       // this.element.addEventListener('CORNERSTONE_VOI_MODIFIED', this.voiModified)
       // this.element.addEventListener('CORNERSTONE_CAMERA_MODIFIED', this.cameraModified)
@@ -199,12 +216,11 @@ export default {
       this.imageInfo.imageOrientationPatient = imagePlaneModule.imageOrientationPatient
       this.imageInfo.imagePositionPatient = imagePlaneModule.imagePositionPatient
       this.imageInfo.location = imagePlaneModule.sliceLocation
-      // this.imageInfo.wwwc = `${Math.round(detail.image.windowWidth)}/${Math.round(detail.image.windowCenter)}`
       this.getOrientationMarker()
-      this.$emit('renderAnnotations', this.series)
-      const toolGroupId = this.viewportId
-      const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId)
-      toolGroup.setToolEnabled('ScaleOverlay')
+      const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(this.viewportId)
+      if (toolGroup) {
+        toolGroup.setToolEnabled('ScaleOverlay')
+      }
     },
     imageRendered(e) {
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
@@ -301,14 +317,61 @@ export default {
       }
     },
     toggleClipPlay(isPlay, framesPerSecond) {
-      this.playClipState = isPlay
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
+      if (!renderingEngine) return
       const viewport = renderingEngine.getViewport(this.viewportId)
+      if (!viewport?.element) return
+
+      const parsedFramesPerSecond = Number(framesPerSecond)
+      const nextFramesPerSecond = Number.isFinite(parsedFramesPerSecond)
+        ? parsedFramesPerSecond
+        : (this.clipFramesPerSecond || 15)
+      const isSameSpeedWhilePlaying = this.playClipState &&
+        isPlay &&
+        this.clipFramesPerSecond === nextFramesPerSecond
 
       if (isPlay) {
-        cornerstoneTools.utilities.cine.playClip(viewport.element, { framesPerSecond, loop: true })
+        if (isSameSpeedWhilePlaying) return
+
+        cornerstoneTools.utilities.cine.stopClip(viewport.element)
+        if (this.toggleClipPlayTimer) {
+          clearInterval(this.toggleClipPlayTimer)
+          this.toggleClipPlayTimer = null
+        }
+
+        const frameInterval = Math.max(16, Math.round(1000 / nextFramesPerSecond))
+        this.toggleClipPlayTimer = setInterval(() => {
+          const imageIds = viewport.getImageIds()
+          if (!imageIds?.length) return
+
+          let index = viewport.getCurrentImageIdIndex() + 1
+          if (index > imageIds.length - 1) {
+            index = 0
+          }
+
+          csUtils.jumpToSlice(viewport.element, {
+            imageIndex: index,
+            debounceLoading: false
+          })
+        }, frameInterval)
+        this.clipFramesPerSecond = nextFramesPerSecond
+        this.playClipState = true
       } else {
         cornerstoneTools.utilities.cine.stopClip(viewport.element)
+        if (this.toggleClipPlayTimer) {
+          clearInterval(this.toggleClipPlayTimer)
+          this.toggleClipPlayTimer = null
+        }
+        this.clipFramesPerSecond = null
+        this.playClipState = false
+      }
+    },
+    syncViewportStaticState() {
+      this.getOrientationMarker()
+      this.$emit('renderAnnotations', this.series)
+      const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(this.viewportId)
+      if (toolGroup) {
+        toolGroup.setToolEnabled('ScaleOverlay')
       }
     },
     scrollPage(type) {
@@ -328,7 +391,13 @@ export default {
       }
       // viewport.setImageIdIndex(newImageIdIndex)
       csUtils.jumpToSlice(viewport.element, { imageIndex: newImageIdIndex })
+      if (this.toggleClipPlayTimer) {
+        clearInterval(this.toggleClipPlayTimer)
+        this.toggleClipPlayTimer = null
+      }
       cornerstoneTools.utilities.cine.stopClip(viewport.element)
+      this.clipFramesPerSecond = null
+      this.playClipState = false
     },
     setZoom(ratio) {
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
@@ -343,6 +412,7 @@ export default {
       viewport.render()
     },
     resize(forceFitToWindow) {
+      this.forceFitToWindow = !!forceFitToWindow
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
       const viewport = renderingEngine.getViewport(this.viewportId)
       if (!viewport) return
@@ -405,7 +475,8 @@ export default {
           obj.SliceIndex = this.series.SliceIndex
         }
         // if (isLocate && obj.SliceIndex === this.series.SliceIndex) return
-        if (this.series?.Stack && obj.Stack[obj.SliceIndex] === this.series.Stack[this.series.SliceIndex]) return
+        const isSameSeries = this.series && obj.Id === this.series.Id && obj.Description === this.series.Description
+        if (isSameSeries && this.series?.Stack && obj.Stack[obj.SliceIndex] === this.series.Stack[this.series.SliceIndex]) return
         this.toggleClipPlay(false)
         this.series = { ...obj }
         const renderingEngine = getRenderingEngine(this.renderingEngineId)
@@ -419,6 +490,7 @@ export default {
         }
         this.prefetchMetadataInformation(obj.ImageIds, obj.Modality)
         await viewport.setStack(this.series.Stack, obj.SliceIndex)
+        this.syncViewportStaticState()
 
         viewport.render()
       } catch (e) {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
index 1d1289a6..5695e497 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
@@ -1,10 +1,12 @@
 <template>
   <div class="criterion-form-item">
-    <div v-if="!!question.GroupName && question.Type === 'group'"
+    <div
+      v-if="(!!question.GroupName && question.Type === 'group') && ((question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0)"
       style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;">
       {{ question.GroupName }}
     </div>
-    <div v-if="question.Type === 'table' || question.Type === 'basicTable'"
+    <div
+      v-if="(question.Type === 'table' || question.Type === 'basicTable') && ((question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0)"
       style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
       <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
         <span :title="question.Remark">{{ question.QuestionName }}</span>
@@ -14,7 +16,8 @@
           {{ $t('common:button:add') }}
         </el-button>
       </div>
-      <el-table :data="questionForm[question.Id]">
+      <el-table :data="questionForm[question.Id]"
+        v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0">
         <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ question.OrderMark }}{{ scope.$index + 1 }}
@@ -43,7 +46,7 @@
             <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">
               {{ question.IsPreinstall ?
                 $t('CustomizeQuestionFormItem:button:assessment') : readingTaskState >= 2 ? $t('common:button:view') :
-                $t('common:button:edit') }}
+                  $t('common:button:edit') }}
             </el-button>
             <el-button type="text" size="mini" :disabled="addOrEdit.visible"
               v-if="readingTaskState < 2 && (scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || isBaseline) && !question.IsPreinstall && (question.AddDeleteTypeEnum === 0 || (isBaseline && question.AddDeleteTypeEnum === 1) || (!isBaseline && question.AddDeleteTypeEnum === 2))"
@@ -81,7 +84,7 @@
     </div>
     <template v-else>
       <el-form-item
-        v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion === 0"
+        v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0"
         :title="question.Remark" :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
           {
             required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type !== 'group' && question.Type !== 'summary',
@@ -109,12 +112,12 @@
               :value="item[question.DataTableColumn]" />
           </template>
           <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
               :label="item.label" />
           </template>
           <template
             v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
               :label="item.label" />
           </template>
           <template v-else>
@@ -127,7 +130,7 @@
         <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
           @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState === 2">
           <template v-if="question.DictionaryCode">
-            <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="val.value">
+            <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="String(val.value)">
               {{ val.label }}
             </el-radio>
           </template>
@@ -156,7 +159,7 @@
           v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
           @change="(val) => { formItemChange(val, question) }">
           <template v-if="question.DictionaryCode">
-            <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="val.value">
+            <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="String(val.value)">
               {{ val.label }}
             </el-radio>
           </template>
@@ -797,7 +800,7 @@ export default {
     async handleSave() {
       let loading = null
       try {
-        let valid = await this.$refs.tableQsForm.validate()
+        let valid = await this.$refs.tableQsForm.validate().catch(() => false)
         if (!valid) return
         // 判断是否有标记未保存
         let isExistUnSaved = false
@@ -1710,6 +1713,11 @@ export default {
     color: #c3c3c3;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-input-group__append {
     background: #000;
     color: #ddd;
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
index 8b34c73a..b619646a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
@@ -2,9 +2,16 @@
   <div v-loading="loading" class="questionList-wrapper">
     <div class="container">
       <div class="basic-info">
-        <h3 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo">
-          <span v-if="visitInfo.SubjectCode">{{ visitInfo.SubjectCode }} </span>
-          <span style="margin-left:5px;">{{ visitInfo.TaskBlindName }}</span>
+        <h3>
+          <span v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && visitInfo.SubjectCode" style="margin-right:5px;">
+            {{ visitInfo.SubjectCode }} 
+          </span>
+          <span>
+            <span v-if="taskInfo && !taskInfo.IsReadingShowSubjectInfo">
+              {{ $t('trials:reading:title:taskName') }}
+            </span>
+            {{ visitInfo.TaskBlindName }}
+          </span>
         </h3>
         <div v-if="readingTaskState < 2">
           <el-tooltip class="item" effect="dark" :content="$t('trials:dicomReading:message:confirmReset')"
@@ -26,15 +33,19 @@
         </template>
 
         <el-form-item v-if="readingTaskState < 2">
-          <div style="text-align:center;">
-            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible || isSaved"
+          <div class="action-bar">
+            <!-- <i class="el-icon-warning feedback-icon" @click="openFeedBackTable"
+              :style="{ color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }" /> -->
+            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible"
               type="primary" @click="skipTask">
               {{ $t('trials:readingReport:button:skip') }}
             </el-button>
-            <el-button type="primary" :disabled="isTableVisible || isSaved" @click="handleSave">
+            <el-button type="primary" :loading="submitLockAction === 'save'"
+              :disabled="isTableVisible || isSaved || !!submitLockAction" @click="handleSave">
               {{ $t('common:button:save') }}
             </el-button>
-            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible || isSaved"
+            <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :loading="submitLockAction === 'submit'"
+              :disabled="isTableVisible || !!submitLockAction"
               type="primary" @click="handleSubmit">
               {{ $t('common:button:submit') }}
             </el-button>
@@ -122,7 +133,8 @@ export default {
       questionImageToolAttributeInfo: {},
       unSaveTargets: [],
       isTableVisible: false,
-      isSaved: false
+      isSaved: false,
+      submitLockAction: ''
     }
   },
   mounted() {
@@ -148,6 +160,17 @@ export default {
     },
   },
   methods: {
+    normalizeQuestionAnswer(question, answer) {
+      if (answer === null || answer === undefined || answer === '') return answer
+      if (question.Type === 'select' && question.OptionTypeEnum === 1) return answer
+      if (question.DictionaryCode && ['radio', 'select'].includes(question.Type)) {
+        return String(answer)
+      }
+      if (question.Type === 'class' && question.ClassifyShowType === 3 && question.DictionaryCode) {
+        return String(answer)
+      }
+      return answer
+    },
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
@@ -164,7 +187,7 @@ export default {
           res.Result.SinglePage.map((v) => {
             if (v.Type === 'group' && v.Childrens.length === 0) return
             if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary' && v.Type !== 'table' && v.Type !== 'basicTable' && v.Type !== 'number') {
-              this.$set(this.questionForm, v.Id, v.Answer)
+              this.$set(this.questionForm, v.Id, this.normalizeQuestionAnswer(v, v.Answer))
             }
             if (v.Type === 'table' || v.Type === 'basicTable') {
               this.$set(this.questionForm, v.Id, v.TableQuestions.Answers)
@@ -212,7 +235,7 @@ export default {
     setChild(obj) {
       obj.forEach(i => {
         if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table' && i.Type !== 'basicTable') {
-          this.$set(this.questionForm, i.Id, i.Answer)
+          this.$set(this.questionForm, i.Id, this.normalizeQuestionAnswer(i, i.Answer))
         }
         if (i.Type === 'select' && i.OptionTypeEnum === 1) {
           this.$set(this.questionForm, i.Id, i.Answer ? JSON.parse(i.Answer) : [])
@@ -230,6 +253,11 @@ export default {
                 this.$set(i.TableQuestions.Answers[index], o.Id, i.TableQuestions.Answers[index][o.Id] ? JSON.parse(i.TableQuestions.Answers[index][o.Id]) : [])
               })
             }
+            if ((o.DictionaryCode && ['radio', 'select'].includes(o.Type) && o.OptionTypeEnum !== 1) || (o.Type === 'class' && o.ClassifyShowType === 3 && o.DictionaryCode)) {
+              i.TableQuestions.Answers.forEach((ite, index) => {
+                this.$set(i.TableQuestions.Answers[index], o.Id, this.normalizeQuestionAnswer(o, i.TableQuestions.Answers[index][o.Id]))
+              })
+            }
           })
           this.$set(this.questionForm, i.Id, i.TableQuestions.Answers)
         }
@@ -255,16 +283,17 @@ export default {
         console.log(e)
       }
     },
-    async handleSave(isMsg) {
-      const valid = await this.$refs['questions'].validate()
-      if (!valid) return
-      let isSaved = this.verifyAnnotationIsSave()
-      if (isSaved) {
-        let confirm = this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), {
+    async validateBeforeSave() {
+      const valid = await this.$refs['questions'].validate().catch(() => false)
+      if (!valid) return false
+      const hasUnsavedAnnotation = this.verifyAnnotationIsSave()
+      if (!hasUnsavedAnnotation) return true
+      const confirm = await this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), {
           type: 'warning'
-        })
-        if (!confirm) return false
-      }
+        }).catch(() => false)
+      return confirm === 'confirm'
+    },
+    async saveQuestions(isMsg) {
       this.loading = true
       try {
         var answers = []
@@ -287,27 +316,42 @@ export default {
             this.isSaved = true
             this.$message.success(this.$t('common:message:savedSuccessfully'))
           }
-          this.loading = false
+          return true
         }
+        return false
       } catch (e) {
+        return false
+      } finally {
         this.loading = false
       }
     },
-    async handleSubmit() {
-      const valid = await this.$refs['questions'].validate()
-      if (!valid) return
-      let isSaved = this.verifyAnnotationIsSave()
-      if (isSaved) {
-        let confirm = this.$confirm(this.$t('trials:reading:confirm:AnnotationNotSave'), this.$t('system:menu:confirm:title:warning'), {
-          type: 'warning'
-        })
-        if (!confirm) return false
+    async handleSave(isMsg = true) {
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'save'
+      try {
+        const isValid = await this.validateBeforeSave()
+        if (!isValid) return false
+        return await this.saveQuestions(isMsg)
+      } finally {
+        this.submitLockAction = ''
+      }
+    },
+    async handleSubmit() {
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'submit'
+      try {
+        const isValid = await this.validateBeforeSave()
+        if (!isValid) return false
+        const isSaveSuccess = await this.saveQuestions(false)
+        if (!isSaveSuccess) return false
+        await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
+        const { ImageAssessmentReportConfirmation } = const_.processSignature
+        this.signCode = ImageAssessmentReportConfirmation
+        this.signVisible = true
+        return true
+      } finally {
+        this.submitLockAction = ''
       }
-      await this.handleSave(false)
-      await verifyVisitTaskQuestions({ visitTaskId: this.visitTaskId })
-      const { ImageAssessmentReportConfirmation } = const_.processSignature
-      this.signCode = ImageAssessmentReportConfirmation
-      this.signVisible = true
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
@@ -1464,6 +1508,32 @@ export default {
         console.log(err)
       }
     },
+    openFeedBackTable() {
+      this.$FB({
+        type: 'imgfail',
+        trialId: this.$route.query.trialId,
+        visitTaskId: this.visitTaskId,
+        callBack: async () => {
+          try {
+            await this.$confirm(
+              this.$t('trials:reading:confirm:feedbackmsg'),
+              {
+                type: 'warning',
+                distinguishCancelAndClose: true
+              }
+            ).catch(() => {})
+            this.loading = true
+            const res = await setSkipReadingCache({ visitTaskId: this.visitTaskId })
+            this.loading = false
+            if (res.IsSuccess) {
+              window.location.reload()
+            }
+          } catch (err) {
+            this.loading = false
+          }
+        }
+      })
+    }
   },
   watch: {
     questionsMarkStatus: {
@@ -1580,6 +1650,26 @@ export default {
       }
     }
   }
+  .action-bar {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 10px;
+  }
+  .feedback-icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    color: #fff;
+    font-weight: 400;
+    font-size: 24px;
+    line-height: 1;
+    cursor: pointer;
+
+    &:hover {
+      color: #68a2d5;
+    }
+  }
 }
 
 // .ecrf-list-container{
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
index 35981fcc..0da88d1a 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="criterion-table-form-item">
     <el-form-item
-      v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
+      v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(String(questionForm[question.ParentId]))) || question.ShowQuestion === 0"
       :title="question.Remark" :label="`${question.QuestionName}`" :prop="question.Id" :rules="[
         {
           required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type !== 'group' && question.Type !== 'summary',
@@ -30,12 +30,12 @@
             :value="item[question.DataTableColumn]" />
         </template>
         <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
             :label="item.label" />
         </template>
         <template
           v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
+          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
             :label="item.label" />
         </template>
         <template v-else>
@@ -48,7 +48,7 @@
         :disabled="question.TableQuestionType === 2 || question.IsPreinstall || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || readingTaskState >= 2"
         @change="((val) => { formItemChange(val, question) })">
         <template v-if="question.DictionaryCode">
-          <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="val.value">
+          <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="String(val.value)">
             {{ val.label }}
           </el-radio>
         </template>
@@ -79,7 +79,7 @@
         :disabled="!question.ClassifyEditType || question.IsPreinstall || readingTaskState >= 2"
         @change="(val) => { formItemChange(val, question) }">
         <template v-if="question.DictionaryCode">
-          <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="val.value">
+          <el-radio v-for="val in $d[question.DictionaryCode]" :key="val.id" :label="String(val.value)">
             {{ val.label }}
           </el-radio>
         </template>
@@ -794,5 +794,10 @@ export default {
     flex-direction: column;
     align-items: flex-start;
   }
+
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
 }
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
index 5e3f91f5..972fd4aa 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/customize/ReportPage.vue
@@ -12,11 +12,13 @@
             {{
               $t('trials:readingReport:button:refresh') }}
           </el-button>
-          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="handleSave(true)">
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" :loading="submitLockAction === 'save'"
+            :disabled="!!submitLockAction" @click="handleSave(true)">
             {{
               $t('common:button:save') }}
           </el-button>
-          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="handleConfirm">
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" :loading="submitLockAction === 'submit'"
+            :disabled="!!submitLockAction" @click="handleConfirm">
             {{
               $t('common:button:submit') }}
           </el-button>
@@ -328,6 +330,7 @@ export default {
       taskInfo: null,
       currentPath: '',
       currentType: '',
+      submitLockAction: '',
 
       viewerOptions: {
         toolbar: {
@@ -897,11 +900,17 @@ export default {
       // this.taskQuestions = this.getQuestions(res.Result.TaskQuestions, !this.isShowDetail, null)
     },
     async handleConfirm() {
-      await this.handleSave(false)
-      await this.verifyVisitTaskQuestions()
-      const { ImageAssessmentReportConfirmation } = const_.processSignature
-      this.signCode = ImageAssessmentReportConfirmation
-      this.signVisible = true
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'submit'
+      try {
+        await this.handleSave(false, true)
+        await this.verifyVisitTaskQuestions()
+        const { ImageAssessmentReportConfirmation } = const_.processSignature
+        this.signCode = ImageAssessmentReportConfirmation
+        this.signVisible = true
+      } finally {
+        this.submitLockAction = ''
+      }
     },
     verifyVisitTaskQuestions() {
       return new Promise((resolve, reject) => {
@@ -1027,7 +1036,11 @@ export default {
       }
       localStorage.setItem('closePage', Date.now());
     },
-    handleSave(isPrompt) {
+    handleSave(isPrompt, fromSubmit = false) {
+      if (this.submitLockAction && !fromSubmit) return Promise.resolve(false)
+      if (!fromSubmit) {
+        this.submitLockAction = 'save'
+      }
       return new Promise((resolve, reject) => {
         this.loading = true
         var answers = []
@@ -1069,6 +1082,11 @@ export default {
             this.loading = false
             reject()
           })
+          .finally(() => {
+            if (!fromSubmit) {
+              this.submitLockAction = ''
+            }
+          })
       })
     },
     async skipTask() {
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
index b721cd74..0ad0fbaa 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionFormItem.vue
@@ -240,7 +240,8 @@ export default {
   background-color: #646464a1;
 }
 
-// ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
-//   background-color: #428bca;
-//   border-color: #428bca;
-// }</style>
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+  background-color: #428bca;
+  border-color: #428bca;
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
index 9853fcd4..b634b06b 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
@@ -27,7 +27,7 @@
               <i class="el-icon-warning feedback-icon"
                 :style="{ color: taskInfo && taskInfo.IsExistUnprocessedFeedback ? '#ffeb3b' : '#fff' }"
                 @click="openFeedBackTable" />
-              <el-button size="mini" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
+              <el-button size="mini" :loading="outerSaveLoading" :disabled="outerSaveLoading" @click="saveOuterForm">{{ $t('common:button:save') }}</el-button>
             </div>
           </el-form-item>
         </el-form>
@@ -180,7 +180,8 @@
                         {{ $t('common:button:delete') }}
                       </el-button>
                       <!-- 保存 -->
-                      <el-button size="mini" @click="saveLesion(table, answer.RowIndex)">
+                      <el-button size="mini" :loading="!!rowSaveLoadingMap[`${table.Id}_${answer.RowIndex}`]"
+                        :disabled="!!rowSaveLoadingMap[`${table.Id}_${answer.RowIndex}`]" @click="saveLesion(table, answer.RowIndex)">
                         {{ $t('common:button:save') }}
                       </el-button>
                     </div>
@@ -278,6 +279,9 @@ export default {
       digitPlaces: 2,
       imageQualityId: '',
       imageQualityIssuesId: '',
+      outerSaveLoading: false,
+      rowSaveLoadingMap: {},
+      validationDialogVisible: false,
 
       merge: { visible: false, loading: false },
       lesionData: [],
@@ -318,6 +322,24 @@ export default {
     handleReadingChart(e) {
       this.$emit('handleReadingChart', e)
     },
+    async showValidationDialog(msg) {
+      if (this.validationDialogVisible) {
+        return false
+      }
+      this.validationDialogVisible = true
+      try {
+        await this.$confirm(msg, {
+          type: 'warning',
+          showCancelButton: false,
+          closeOnClickModal: false,
+          closeOnPressEscape: false
+        })
+      } catch (e) {
+      } finally {
+        this.validationDialogVisible = false
+      }
+      return false
+    },
     // 融合
     async handleMerge(answers, questionId, orderMark) {
       this.lesionData = []
@@ -527,10 +549,13 @@ export default {
     },
     // 保存外层问题表单
     async saveOuterForm() {
-      const valid = await this.$refs['outerForm'].validate()
-      if (!valid) return
-      const loading = this.$loading({ fullscreen: true })
+      if (this.outerSaveLoading) return
+      this.outerSaveLoading = true
+      let loading = null
       try {
+        const valid = await this.$refs['outerForm'].validate()
+        if (!valid) return
+        loading = this.$loading({ fullscreen: true })
         const answers = []
         let imageQuality = null
         for (const k in this.outerForm) {
@@ -562,7 +587,9 @@ export default {
         loading.close()
       } catch (e) {
         console.log(e)
-        loading.close()
+      } finally {
+        if (loading) loading.close()
+        this.outerSaveLoading = false
       }
     },
     setAnnotation(obj) {
@@ -946,10 +973,15 @@ export default {
     },
     // 保存病灶
     async saveLesion(table, rowIndex) {
-      const valid = await this.$refs[`${table.Id}_${rowIndex}`][0].validate()
-      if (!valid) return
+      const rowKey = `${table.Id}_${rowIndex}`
+      if (this.rowSaveLoadingMap[rowKey]) return
+      this.$set(this.rowSaveLoadingMap, rowKey, true)
+      await this.$nextTick()
+      await new Promise(resolve => requestAnimationFrame(resolve))
       let loading = null
       try {
+        const valid = await this.$refs[`${table.Id}_${rowIndex}`][0].validate()
+        if (!valid) return
         const innerForm = this.innerFormData[`${table.Id}_${rowIndex}`]
         if (table.LesionType === 0 && this.isBaseLineTask && !innerForm.IntrahepaticLesion) {
           const arr = Object.values(this.innerFormData).filter(
@@ -968,6 +1000,11 @@ export default {
         }
 
         loading = this.$loading({ fullscreen: true })
+        const closeLoading = loading.close.bind(loading)
+        loading.close = () => {
+          closeLoading()
+          loading = null
+        }
         const measureData = innerForm.MeasureData
         const lesionState = innerForm.LesionState
         let lesionLength = innerForm.LesionLength
@@ -984,34 +1021,19 @@ export default {
               //  淋巴结靶病灶 必须使用长短径测量工具,短径大于等于15mm
               if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 15)) {
                 // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记，且短径须大于15mm！
-                this.$confirm(this.$t('trials:reading:warnning:msg19'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg19'))
                 return
               }
               if ((lesionPart === '肝门淋巴结' || lesionPart === 'Lymph node-hilum of liver') && !(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 20)) {
                 // 靶病灶部位为肝门淋巴结时，选择要求时短轴≥2cm
-                this.$confirm(this.$t('trials:mRecist:warnning:msg2'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:mRecist:warnning:msg2'))
                 return
               }
             } else {
               // 非淋巴结靶病灶 直径测量工具 长径须大于等于10mm且不小于2倍层厚
               if (!(measureData && measureData.markTool === 'Length' && lesionLength >= 10 && (measureData.sliceThickness && lesionLength >= 2 * measureData.sliceThickness || !measureData.sliceThickness))) {
                 // 评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记，长径须大于10mm且不小于2倍层厚！
-                this.$confirm(this.$t('trials:reading:warnning:msg20'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg20'))
                 return
               }
             }
@@ -1023,24 +1045,14 @@ export default {
               // 淋巴结非靶病灶 必须使用长短径测量工具或箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记
-                this.$confirm(this.$t('trials:reading:warnning:msg21'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg21'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具或箭头工具
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg22'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg22'))
                 return
               }
             }
@@ -1053,24 +1065,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具
               if (!(measureData && measureData.markTool === 'Bidirectional' && lesionShort >= 10)) {
                 // 评估状态为存在的淋巴结靶病灶需使用长短径测量工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg23'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg23'))
                 return
               }
             } else {
               // 非淋巴结靶病灶 直径测量工具
               if (!(measureData && measureData.markTool === 'Length')) {
                 // `评估状态为存在的非淋巴结靶病灶需使用直径测量工具添加标记！`
-                this.$confirm(this.$t('trials:reading:warnning:msg24'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg24'))
                 return
               }
             }
@@ -1081,12 +1083,7 @@ export default {
               // 淋巴结靶病灶 必须使用箭头工具，短径记录为5mm
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为太小的淋巴结靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg25'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg25'))
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
@@ -1098,12 +1095,7 @@ export default {
               // 非淋巴结靶病灶 箭头工具，长径记录为5mm
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为太小的非淋巴结靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg26'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg26'))
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
@@ -1120,24 +1112,14 @@ export default {
               // 淋巴结靶病灶 不需要添加标记
               if (measureData) {
                 // 评估状态为无法评估的淋巴结靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg27'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg27'))
                 return
               }
             } else {
               // 非淋巴结靶病灶 不需要添加标记
               if (measureData) {
                 // 状态为无法评估的非淋巴结靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg28'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg28'))
                 return
               }
             }
@@ -1148,24 +1130,14 @@ export default {
             if (lymphNodes === 1) {
               if (!(measureData && (measureData.markTool === 'Bidirectional' && lesionShort < 10))) {
                 // `评估状态为消失的淋巴结靶病灶需使用长短径工具添加标记,且短径需小于10mm！`
-                this.$confirm(this.$t('trials:reading:warnning:msg29'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg29'))
                 return
               }
             } else {
               // 非淋巴结靶病灶 箭头工具
               if (!(measureData && measureData.markTool === 'ArrowAnnotate')) {
                 // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg30'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg30'))
                 return
               } else if (measureData && measureData.markTool === 'ArrowAnnotate') {
                 const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
@@ -1182,24 +1154,14 @@ export default {
               // 淋巴结非靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为存在的淋巴结非靶病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg31'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg31'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为存在的非淋巴结非靶病灶需使用直径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg32'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg32'))
                 return
               }
             }
@@ -1211,24 +1173,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'RectangleROI'))) {
                 // `评估状态为显著增大的淋巴结非靶病灶需使用长短径测量工具或矩形工具添加标记！`
-                this.$confirm(this.$t('trials:reading:warnning:msg33'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg33'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'RectangleROI'))) {
                 // 评估状态为显著增大的非淋巴结非靶病灶需使用直径测量工具或矩形工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg34'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg34'))
                 return
               }
             }
@@ -1240,24 +1192,14 @@ export default {
               // 淋巴结靶病灶 无标记
               if (measureData) {
                 // 评估状态为无法评估的淋巴结非靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg35'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg35'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 无标记
               if (measureData) {
                 // 评估状态为无法评估的非淋巴结非靶病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg36'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg36'))
                 return
               }
             }
@@ -1269,24 +1211,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || measureData.markTool === 'Bidirectional'))) {
                 // 评估状态为消失的淋巴结非靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg37'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg37'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 箭头工具
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为消失的非淋巴结非靶病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg38'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg38'))
                 return
               }
             }
@@ -1298,44 +1230,24 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为存在的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg39'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg39'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (intrahepaticLesion && !(measureData && measureData.markTool === 'Length')) {
                 // 评估状态为存在的非淋巴结新病灶需使用直径测量工具添加标记！
-                this.$confirm(this.$t('trials:mRecist:warnning:msg6'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:mRecist:warnning:msg6'))
                 return
               }
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为存在的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg40'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg40'))
                 return
               }
               if (measureData && measureData.markTool === 'Length' && innerForm.IntrahepaticLesion && lesionLength < 10) {
                 // 病灶状态为“明确”的典型肝内病灶，长径应不小于10mm。
-                this.$confirm(this.$t('trials:mRecist:warnning:msg3'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:mRecist:warnning:msg3'))
                 return
               }
             }
@@ -1347,44 +1259,24 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Bidirectional' || measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为疑似的淋巴结新病灶需使用长短径测量工具或箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg41'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg41'))
                 return
               }
             } else {
               if (innerForm.IntrahepaticLesion && !(measureData && (measureData.markTool === 'Length'))) {
                 // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具添加标记！`
-                this.$confirm(this.$t('trials:mRecist:warnning:msg6'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:mRecist:warnning:msg6'))
                 return
               }
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'Length' || measureData.markTool === 'ArrowAnnotate'))) {
                 // `评估状态为疑似的非淋巴结新病灶需使用直径测量工具或箭头工具添加标记！`
-                this.$confirm(this.$t('trials:reading:warnning:msg42'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg42'))
                 return
               }
               if (measureData && measureData.markTool === 'Length' && innerForm.IntrahepaticLesion && lesionLength >= 10) {
                 // 病灶状态为“疑似”的典型肝内病灶，长径应小于10mm。
-                this.$confirm(this.$t('trials:mRecist:warnning:msg4'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:mRecist:warnning:msg4'))
                 return
               }
             }
@@ -1396,24 +1288,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (measureData) {
                 // `评估状态为无法评估的淋巴结新病灶不需要添加标记！`
-                this.$confirm(this.$t('trials:reading:warnning:msg43'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg43'))
                 return
               }
             } else {
               // 非淋巴结非靶病灶 直径测量工具、箭头工具
               if (measureData) {
                 // 评估状态为无法评估的非淋巴结新病灶不需要添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg44'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg44'))
                 return
               }
             }
@@ -1425,24 +1307,14 @@ export default {
               // 淋巴结靶病灶 必须使用长短径测量工具、箭头工具
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate' || measureData.markTool === 'Bidirectional'))) {
                 // 评估状态为消失的淋巴结新病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg45'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg45'))
                 return
               }
             } else {
               // 箭头工具
               if (!(measureData && (measureData.markTool === 'ArrowAnnotate'))) {
                 // 评估状态为消失的非淋巴结新病灶需使用箭头工具添加标记！
-                this.$confirm(this.$t('trials:reading:warnning:msg46'), {
-                  type: 'warning',
-                  showCancelButton: false,
-                  callback: action => { }
-                })
-                loading.close()
+                await this.showValidationDialog(this.$t('trials:reading:warnning:msg46'))
                 return
               }
             }
@@ -1513,6 +1385,11 @@ export default {
         if (loading) {
           loading.close()
         }
+      } finally {
+        this.$set(this.rowSaveLoadingMap, rowKey, false)
+        if (loading) {
+          loading.close()
+        }
       }
     },
     // 上传截图
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
index 3e05bae9..cb80b319 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue
@@ -301,6 +301,11 @@ export default {
     background-color: #646464a1;
   }
 
+  ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
+    background-color: #428bca;
+    border-color: #428bca;
+  }
+
   ::v-deep .el-button--mini,
   .el-button--mini.is-round {
     padding: 7px 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
index 17274ebe..ec331e93 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/toolConfig.js
@@ -409,7 +409,7 @@ const config = {
       'name': 'Labelmap分割',
       'icon': 'labelmap',
       'toolName': 'Labelmap',
-      'props': ['max', 'min', 'volume', 'count', 'mean', 'stdDev', 'length', 'width'],
+      'props': ['max', 'min', 'volume', 'count', 'mean', 'stdDev', 'length', 'width', 'sulpeak'],
       'i18nKey': 'trials:reading:button:Labelmap',
       'isDisabled': false,
       'disabledReason': ''
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/tools/Note_RectangleRoiTool.js b/src/views/trials/trials-panel/reading/dicoms3D/components/tools/Note_RectangleRoiTool.js
new file mode 100644
index 00000000..20a6783d
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/tools/Note_RectangleRoiTool.js
@@ -0,0 +1,341 @@
+
+import {
+  VolumeViewport,
+  utilities as csUtils,
+} from '@cornerstonejs/core'
+import * as cornerstoneTools from '@cornerstonejs/tools'
+const {
+  utilities,
+  annotation,
+  drawing
+
+} = cornerstoneTools
+
+const { getAnnotations } = annotation.state
+const { isAnnotationVisible } = annotation.visibility
+const { isAnnotationLocked } = annotation.locking
+
+
+const drawHandlesSvg = drawing.drawHandles
+// const drawRectSvg = drawing.drawRectByCoordinates
+const drawLinkedTextBoxSvg = drawing.drawLinkedTextBox
+const { getTextBoxCoordsCanvas } = utilities.drawing
+const setAttributesIfNecessary = drawing.setAttributesIfNecessary
+const setNewAttributesIfValid = drawing.setNewAttributesIfValid
+const _getHash = (
+  annotationUID,
+  drawingElementType,
+  nodeUID
+) => {
+  return `${annotationUID}::${drawingElementType}::${nodeUID}`;
+}
+const drawRectSvg = (
+  svgDrawingHelper,
+  annotationUID,
+  rectangleUID,
+  canvasCoordinates,
+  options = {},
+  dataId = ''
+) => {
+  const {
+    color,
+    width: _width,
+    lineWidth,
+    lineDash,
+  } = Object.assign(
+    {
+      color: 'rgb(255, 255, 0)',
+      width: '2',
+      lineWidth: undefined,
+      lineDash: undefined,
+    },
+    options
+  );
+
+  // for supporting both lineWidth and width options
+
+  const strokeWidth = lineWidth || _width;
+
+  const svgns = 'http://www.w3.org/2000/svg';
+  const svgNodeHash = _getHash(annotationUID, 'rect', rectangleUID);
+  const existingRect = svgDrawingHelper.getSvgNode(svgNodeHash);
+
+  const [topLeft, topRight, bottomLeft, bottomRight] = canvasCoordinates;
+
+  const width = Math.hypot(topLeft[0] - topRight[0], topLeft[1] - topRight[1]);
+  const height = Math.hypot(
+    topLeft[0] - bottomLeft[0],
+    topLeft[1] - bottomLeft[1]
+  );
+
+  const center = [
+    (bottomRight[0] + topLeft[0]) / 2,
+    (bottomRight[1] + topLeft[1]) / 2,
+  ];
+  const leftEdgeCenter = [
+    (bottomLeft[0] + topLeft[0]) / 2,
+    (bottomLeft[1] + topLeft[1]) / 2,
+  ];
+  const angle =
+    (Math.atan2(center[1] - leftEdgeCenter[1], center[0] - leftEdgeCenter[0]) *
+      180) /
+    Math.PI;
+
+  const attributes = {
+    x: `${center[0] - width / 2}`,
+    y: `${center[1] - height / 2}`,
+    width: `${width}`,
+    height: `${height}`,
+    stroke: color,
+    fill: 'rgba(0, 0, 0, 1)',
+    transform: `rotate(${angle} ${center[0]} ${center[1]})`,
+    'stroke-width': strokeWidth,
+    'stroke-dasharray': lineDash,
+  };
+
+  if (existingRect) {
+    setAttributesIfNecessary(attributes, existingRect);
+
+    svgDrawingHelper.setNodeTouched(svgNodeHash);
+  } else {
+    const svgRectElement = document.createElementNS(svgns, 'rect');
+
+    if (dataId !== '') {
+      svgRectElement.setAttribute('data-id', dataId);
+    }
+
+    setNewAttributesIfValid(attributes, svgRectElement);
+
+    svgDrawingHelper.appendNode(svgRectElement, svgNodeHash);
+  }
+}
+/**
+ * RectangleROIAnnotation let you draw annotations that measures the statistics
+ * such as area, max, mean and stdDev of a Rectangular region of interest.
+ * You can use RectangleROIAnnotation in all perpendicular views (axial, sagittal, coronal).
+ * Note: annotation tools in cornerstone3DTools exists in the exact location
+ * in the physical 3d space, as a result, by default, all annotations that are
+ * drawing in the same frameOfReference will get shared between viewports that
+ * are in the same frameOfReference. RectangleROI tool's text box lines are dynamically
+ * generated based on the viewport's underlying Modality. For instance, if
+ * the viewport is displaying CT, the text box will shown the statistics in Hounsfield units,
+ * and if the viewport is displaying PET, the text box will show the statistics in
+ * SUV units.
+ *
+ * The resulting annotation's data (statistics) and metadata (the
+ * state of the viewport while drawing was happening) will get added to the
+ * ToolState manager and can be accessed from the ToolState by calling getAnnotations
+ * or similar methods.
+ *
+ * ```js
+ * cornerstoneTools.addTool(RectangleROITool)
+ *
+ * const toolGroup = ToolGroupManager.createToolGroup('toolGroupId')
+ *
+ * toolGroup.addTool(RectangleROITool.toolName)
+ *
+ * toolGroup.addViewport('viewportId', 'renderingEngineId')
+ *
+ * toolGroup.setToolActive(RectangleROITool.toolName, {
+ *   bindings: [
+ *    {
+ *       mouseButton: MouseBindings.Primary, // Left Click
+ *     },
+ *   ],
+ * })
+ * ```
+ *
+ * Read more in the Docs section of the website.
+ */
+
+class Note_RectangleRoiTool extends cornerstoneTools.RectangleROITool {
+  static toolName = "Note_RectangleRoi"
+  constructor(
+    toolProps,
+    defaultToolProps
+  ) {
+    super(toolProps, defaultToolProps);
+  }
+
+  /**
+   * it is used to draw the rectangleROI annotation in each
+   * request animation frame. It calculates the updated cached statistics if
+   * data is invalidated and cache it.
+   *
+   * @param enabledElement - The Cornerstone's enabledElement.
+   * @param svgDrawingHelper - The svgDrawingHelper providing the context for drawing.
+   */
+  renderAnnotation = (
+    enabledElement,
+    svgDrawingHelper
+  ) => {
+    let renderStatus = false;
+    const { viewport } = enabledElement;
+    const { element } = viewport;
+
+    let annotations = getAnnotations(this.getToolName(), element);
+
+    if (!annotations?.length) {
+      return renderStatus;
+    }
+
+    annotations = this.filterInteractableAnnotationsForElement(
+      element,
+      annotations
+    );
+
+    if (!annotations?.length) {
+      return renderStatus;
+    }
+
+    const targetId = this.getTargetId(viewport);
+    const renderingEngine = viewport.getRenderingEngine();
+
+    const styleSpecifier = {
+      toolGroupId: this.toolGroupId,
+      toolName: this.getToolName(),
+      viewportId: enabledElement.viewport.id,
+    };
+
+    for (let i = 0; i < annotations.length; i++) {
+      const annotation = annotations[i];
+      const { annotationUID, data } = annotation;
+      const { points, activeHandleIndex } = data.handles;
+      const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p));
+
+      styleSpecifier.annotationUID = annotationUID;
+
+      const { lineWidth, lineDash } = this.getAnnotationStyle({
+        annotation,
+        styleSpecifier,
+      });
+      let color = 'rgb(255, 255, 0)'
+      const { viewPlaneNormal, viewUp } = viewport.getCamera();
+
+      // If cachedStats does not exist, or the unit is missing (as part of import/hydration etc.),
+      // force to recalculate the stats from the points
+      if (
+        !data.cachedStats[targetId] ||
+        data.cachedStats[targetId].areaUnit == null
+      ) {
+        data.cachedStats[targetId] = {
+          Modality: null,
+          area: null,
+          max: null,
+          mean: null,
+          stdDev: null,
+          areaUnit: null,
+        };
+
+        this._calculateCachedStats(
+          annotation,
+          viewPlaneNormal,
+          viewUp,
+          renderingEngine,
+          enabledElement
+        );
+      } else if (annotation.invalidated) {
+        this._throttledCalculateCachedStats(
+          annotation,
+          viewPlaneNormal,
+          viewUp,
+          renderingEngine,
+          enabledElement
+        );
+
+        // If the invalidated data is as a result of volumeViewport manipulation
+        // of the tools, we need to invalidate the related stackViewports data if
+        // they are not at the referencedImageId, so that
+        // when scrolling to the related slice in which the tool were manipulated
+        // we re-render the correct tool position. This is due to stackViewport
+        // which doesn't have the full volume at each time, and we are only working
+        // on one slice at a time.
+        if (viewport instanceof VolumeViewport) {
+          const { referencedImageId } = annotation.metadata;
+
+          // invalidate all the relevant stackViewports if they are not
+          // at the referencedImageId
+          for (const targetId in data.cachedStats) {
+            if (targetId.startsWith('imageId')) {
+              const viewports = renderingEngine.getStackViewports();
+
+              const invalidatedStack = viewports.find((vp) => {
+                // The stack viewport that contains the imageId but is not
+                // showing it currently
+                const referencedImageURI =
+                  csUtils.imageIdToURI(referencedImageId);
+                const hasImageURI = vp.hasImageURI(referencedImageURI);
+                const currentImageURI = csUtils.imageIdToURI(
+                  vp.getCurrentImageId()
+                );
+                return hasImageURI && currentImageURI !== referencedImageURI;
+              });
+
+              if (invalidatedStack) {
+                delete data.cachedStats[targetId];
+              }
+            }
+          }
+        }
+      }
+
+      // If rendering engine has been destroyed while rendering
+      if (!viewport.getRenderingEngine()) {
+        console.warn('Rendering Engine has been destroyed');
+        return renderStatus;
+      }
+
+      let activeHandleCanvasCoords;
+
+      if (!isAnnotationVisible(annotationUID)) {
+        continue;
+      }
+
+      if (
+        !isAnnotationLocked(annotationUID) &&
+        !this.editData &&
+        activeHandleIndex !== null && activeHandleIndex !== undefined
+      ) {
+        // Not locked or creating and hovering over handle, so render handle.
+        activeHandleCanvasCoords = [canvasCoordinates[activeHandleIndex]];
+      }
+
+      if (activeHandleCanvasCoords) {
+        const handleGroupUID = '0';
+
+        drawHandlesSvg(
+          svgDrawingHelper,
+          annotationUID,
+          handleGroupUID,
+          activeHandleCanvasCoords,
+          {
+            color,
+          }
+        );
+      }
+
+      const dataId = `${annotationUID}-rect`;
+      const rectangleUID = '0';
+      drawRectSvg(
+        svgDrawingHelper,
+        annotationUID,
+        rectangleUID,
+        canvasCoordinates,
+        {
+          color,
+          lineDash,
+          lineWidth,
+        },
+        dataId
+      );
+
+      renderStatus = true;
+    }
+
+    return renderStatus;
+  };
+
+}
+
+
+export default Note_RectangleRoiTool;
diff --git a/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue b/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue
index c4b9103e..cedddd44 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue
@@ -316,11 +316,12 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
+      if (this.loading) return Promise.resolve(false)
       return new Promise(async (resolve, reject) => {
         try {
+          this.loading = true
           let valid = await this.$refs['globalRuleForm'].validate()
           if (valid) {
-            this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
               var answerList = []
@@ -358,6 +359,7 @@ export default {
             resolve(true)
             
           } else {
+            this.loading = false
             reject(false)
           }
         } catch(e) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/EditGlobalForm.vue b/src/views/trials/trials-panel/reading/global-review/components/EditGlobalForm.vue
index 65e5b2fe..378bf1e2 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/EditGlobalForm.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/EditGlobalForm.vue
@@ -215,9 +215,13 @@ export default {
   },
   methods: {
     handleSave() {
+      if (this.loading) return
+      this.loading = true
       this.$refs.globalReviewForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
+        if (!valid) {
+          this.loading = false
+          return
+        }
         var questionList = []
         var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
         for (const i in this.form) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
index 037e61d9..e7090197 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue
@@ -372,11 +372,12 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
+      if (this.loading) return Promise.resolve(false)
       return new Promise(async (resolve, reject) => {
         try {
+          this.loading = true
           let valid = await this.$refs['globalRuleForm'].validate()
-          if (valid) {
-            this.loading = true
+          if (valid) {
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
               var answerList = []
@@ -413,6 +414,7 @@ export default {
             resolve(true)
             
           } else {
+            this.loading = false
             resolve(false)
           }
         } catch(e) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
index 4fb959c5..ca52ee41 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
@@ -290,11 +290,12 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
+      if (this.loading) return Promise.resolve(false)
       return new Promise(async (resolve, reject) => {
         try {
+          this.loading = true
           let valid = await this.$refs['globalRuleForm'].validate()
           if (valid) {
-            this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
               var answerList = []
@@ -333,6 +334,7 @@ export default {
             resolve(true)
 
           } else {
+            this.loading = false
             resolve(false)
           }
         } catch (e) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue
index b789281e..b998c460 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoWithoutPETTable.vue
@@ -304,11 +304,12 @@ export default {
             return lesion ? lesion.Count : 0
         },
         handleSave(isPrompt = true) {
+            if (this.loading) return Promise.resolve(false)
             return new Promise(async (resolve, reject) => {
                 try {
+                    this.loading = true
                     let valid = await this.$refs['globalRuleForm'].validate()
                     if (valid) {
-                        this.loading = true
                         var visitTaskAnswerList = []
                         this.globalForm.taskList.forEach((item, index) => {
                             var answerList = []
@@ -347,6 +348,7 @@ export default {
                         resolve(true)
 
                     } else {
+                        this.loading = false
                         resolve(false)
                     }
                 } catch (e) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
index b5ba1602..63ae94ee 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue
@@ -278,11 +278,12 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
+      if (this.loading) return Promise.resolve(false)
       return new Promise(async (resolve, reject) => {
         try {
+          this.loading = true
           let valid = await this.$refs['globalRuleForm'].validate()
           if (valid) {
-            this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
               var answerList = []
@@ -321,6 +322,7 @@ export default {
             resolve(true)
 
           } else {
+            this.loading = false
             resolve(false)
           }
         } catch (e) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue b/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
index c2d47e02..3ea0ca97 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue
@@ -178,11 +178,12 @@ export default {
       this.$emit('handleView', row)
     },
     handleSave(isPrompt = true) {
+      if (this.loading) return Promise.resolve(false)
       return new Promise(async (resolve, reject) => {
         try {
+          this.loading = true
           let valid = await this.$refs['globalRuleForm'].validate()
           if (valid) {
-            this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
               var answerList = []
@@ -216,6 +217,7 @@ export default {
             resolve(true)
 
           } else {
+            this.loading = false
             resolve(false)
           }
         } catch (e) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/PGWC3EditGlobalForm.vue b/src/views/trials/trials-panel/reading/global-review/components/PGWC3EditGlobalForm.vue
index f6810e68..bc6356d6 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/PGWC3EditGlobalForm.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/PGWC3EditGlobalForm.vue
@@ -213,9 +213,13 @@ export default {
   },
   methods: {
     handleSave() {
+      if (this.loading) return
+      this.loading = true
       this.$refs.globalReviewForm.validate(valid => {
-        if (!valid) return
-        this.loading = true
+        if (!valid) {
+          this.loading = false
+          return
+        }
         var questionList = []
         var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
         for (const i in this.form) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
index 42af198e..79c1a33a 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue
@@ -369,11 +369,12 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
+      if (this.loading) return Promise.resolve(false)
       return new Promise(async (resolve, reject) => {
         try {
+          this.loading = true
           let valid = await this.$refs['globalRuleForm'].validate()
-          if (valid) {
-            this.loading = true
+          if (valid) {
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
               var answerList = []
@@ -410,6 +411,7 @@ export default {
             resolve(true)
             
           } else {
+            this.loading = false
             resolve(false)
           }
         } catch(e) {
diff --git a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
index 24548d37..e1a4e5ab 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue
@@ -363,11 +363,12 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
+      if (this.loading) return Promise.resolve(false)
       return new Promise(async (resolve, reject) => {
         try {
+          this.loading = true
           let valid = await this.$refs['globalRuleForm'].validate()
           if (valid) {
-            this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
               var answerList = []
@@ -404,6 +405,7 @@ export default {
             resolve(true)
             
           } else {
+            this.loading = false
             resolve(false)
           }
         } catch(e) {
diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index e1f74be9..47eb95f6 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -29,11 +29,11 @@
           <!-- 跳过 -->
           {{ $t('trials:readingReport:button:skip') }}
         </el-button>
-        <el-button size="small" type="primary" @click="handleSave">
+        <el-button size="small" type="primary" :loading="submitLockAction === 'save'" :disabled="!!submitLockAction" @click="handleSave">
           {{ $t('common:button:save') }}
         </el-button>
         <!-- 提交 -->
-        <el-button size="small" type="primary" @click="handleConfirm">
+        <el-button size="small" type="primary" :loading="submitLockAction === 'submit'" :disabled="!!submitLockAction" @click="handleConfirm">
           {{ $t('trials:globalReview:button:submit') }}
         </el-button>
       </div>
@@ -178,7 +178,8 @@ export default {
       assessTypeList: [],
       CriterionType: 0,
       globalInfo: {},
-      openWindow: null
+      openWindow: null,
+      submitLockAction: ''
     }
   },
   // watch: {
@@ -293,8 +294,14 @@ export default {
         this.historyLoading = false
       }
     },
-    handleSave() {
-      this.$refs['globalTbl'].handleSave(true)
+    async handleSave() {
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'save'
+      try {
+        return await this.$refs['globalTbl'].handleSave(true)
+      } finally {
+        this.submitLockAction = ''
+      }
     },
     async skipTask() {
       try {
@@ -319,6 +326,7 @@ export default {
       }
     },
     async handleConfirm() {
+      if (this.submitLockAction) return false
       // 判断是否存在访视评估结果未确认
       var idx = this.taskList.findIndex(i => !i.AgreeOrNotAnswer)
       if (idx > -1) {
@@ -330,14 +338,18 @@ export default {
           .then(() => { })
           .catch(() => { })
       } else {
-        // 自动保存
-        let res = await this.$refs['globalTbl'].handleSave(false)
-        if (res) {
-          const { ImageAssessmentReportConfirmation } = const_.processSignature
-          this.signCode = ImageAssessmentReportConfirmation
-          this.signVisible = true
+        this.submitLockAction = 'submit'
+        try {
+          // 自动保存
+          let res = await this.$refs['globalTbl'].handleSave(false)
+          if (res) {
+            const { ImageAssessmentReportConfirmation } = const_.processSignature
+            this.signCode = ImageAssessmentReportConfirmation
+            this.signVisible = true
+          }
+        } finally {
+          this.submitLockAction = ''
         }
-
       }
     },
     // 关闭签名框
diff --git a/src/views/trials/trials-panel/reading/medical-feedback/index.vue b/src/views/trials/trials-panel/reading/medical-feedback/index.vue
index 852973d5..5fddf936 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/index.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/index.vue
@@ -1,6 +1,6 @@
 <template>
   <BaseContainer class="medical-feedback-ir">
-    <el-tabs v-model="TrialReadingCriterionId" type="border-card">
+    <el-tabs v-if="TrialReadingCriterionId" v-model="TrialReadingCriterionId" type="border-card">
       <el-tab-pane v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId" :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId">
         <div v-if="TrialReadingCriterionId === i.TrialReadingCriterionId">
           <div slot="search-container">
@@ -24,7 +24,7 @@
                 </el-select>
               </el-form-item>
               <!-- 受试者编号 -->
-              <el-form-item :label="$t('trials:medicalFeedback:table:subjectCode')">
+              <el-form-item v-if="otherInfo && otherInfo.IsReadingTaskViewInOrder !== 0" :label="$t('trials:medicalFeedback:table:subjectCode')">
                 <el-input
                   v-model="searchData.SubjectCode"
                   style="width:130px;"
@@ -32,7 +32,7 @@
                 />
               </el-form-item>
               <!-- 盲态任务标识 -->
-              <!-- <el-form-item
+              <el-form-item
                 style="margin-bottom:10px"
                 :label="$t('trials:medicalFeedback:table:taskBlindName')"
               >
@@ -41,7 +41,7 @@
                   style="width:100px;"
                   clearable
                 />
-              </el-form-item> -->
+              </el-form-item>
               <!-- 任务类型 -->
               <el-form-item
                 style="margin-bottom:10px"
@@ -148,6 +148,7 @@
           </div>
           <div slot="main-container">
             <el-table
+              :ref="TrialReadingCriterionId"
               v-adaptive="{bottomOffset:75}"
               v-loading="loading"
               :data="list"
@@ -172,6 +173,7 @@
 
               <!-- 受试者编号 -->
               <el-table-column
+                v-if="otherInfo && otherInfo.IsReadingTaskViewInOrder !== 0"
                 prop="SubjectCode"
                 min-width="100"
                 :label="$t('trials:medicalFeedback:table:subjectCode')"
@@ -310,7 +312,6 @@
               <el-table-column
                 :label="$t('common:action:action')"
                 min-width="100"
-                fixed="right"
               >
                 <template slot-scope="scope">
                   <!-- 查看 -->
@@ -409,12 +410,14 @@ export default {
       chatForm: { visible: false, title: '' }, // 质询记录
       auditVisible: false,
       trialCriterionList: [],
-      TrialReadingCriterionId: '0'
+      TrialReadingCriterionId: '',
+      otherInfo: null
     }
   },
   watch: {
     TrialReadingCriterionId(v) {
       if (v) {
+        this.searchData = searchDataDefault()
         this.getList()
       }
     }
@@ -437,7 +440,11 @@ export default {
       getIRMedicalFeedbackList(this.searchData).then(res => {
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount
+        this.otherInfo = res.OtherInfo
         this.loading = false
+        this.$nextTick(() => {
+          this.$refs[this.TrialReadingCriterionId][0].doLayout()
+        })
       }).catch(() => { this.loading = false })
     },
     handleSearch() {
@@ -454,7 +461,11 @@ export default {
     },
     handleReply(row) {
       this.currentRow = { ...row }
-      this.chatForm.title = `${this.$t('trials:medicalFeedback:title:qaRecord')} (${row.SubjectCode} ${row.TaskBlindName})`
+      if (this.otherInfo && this.otherInfo.IsReadingTaskViewInOrder !== 0) {
+        this.chatForm.title = `${this.$t('trials:medicalFeedback:title:qaRecord')} (${row.SubjectCode} ${row.TaskBlindName})`
+      } else {
+        this.chatForm.title = `${this.$t('trials:medicalFeedback:title:qaRecord')} (${row.TaskBlindName})`
+      }
       this.chatForm.visible = true
     },
     async nextTask(taskMedicalReviewId) {
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index 9c641355..ae1270ea 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@@ -232,7 +232,7 @@
               <el-table-column
                 prop="SubjectCode"
                 :label="$t('trials:medicalFeedback:table:subjectCode')"
-                width="140"
+                width="150"
                 sortable="custom"
                 show-overflow-tooltip
               >
diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue
index 31aad8cd..0bae659d 100644
--- a/src/views/trials/trials-panel/reading/oncology-review/index.vue
+++ b/src/views/trials/trials-panel/reading/oncology-review/index.vue
@@ -27,11 +27,13 @@
           {{ $t('trials:readingReport:button:skip') }}
         </el-button>
         <!-- 保存 -->
-        <el-button v-if="oncologyInfo.ReadingTaskState < 2" size="small" type="primary" @click="handleSave(true)">
+        <el-button v-if="oncologyInfo.ReadingTaskState < 2" size="small" type="primary"
+          :loading="submitLockAction === 'save'" :disabled="!!submitLockAction" @click="handleSave(true)">
           {{ $t('common:button:save') }}
         </el-button>
         <!-- 提交 -->
-        <el-button v-if="oncologyInfo.ReadingTaskState < 2" size="small" type="primary" @click="handleConfirm">
+        <el-button v-if="oncologyInfo.ReadingTaskState < 2" size="small" type="primary"
+          :loading="submitLockAction === 'submit'" :disabled="!!submitLockAction" @click="handleConfirm">
           {{ $t('common:button:submit') }}
         </el-button>
       </div>
@@ -222,7 +224,8 @@ export default {
       questionCols: [],
       oncologyInfo: {},
       assessTypeList: [],
-      openWindow: null
+      openWindow: null,
+      submitLockAction: ''
     }
   },
   // watch: {
@@ -289,52 +292,61 @@ export default {
       }
     },
     handleSave(isPrompt) {
+      if (this.submitLockAction && this.submitLockAction !== 'submit') return Promise.resolve(false)
       return new Promise(async (resolve, reject) => {
-        this.loading = true
-        // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
-        var isDiffer = this.checkDifferResult()
-        if (isDiffer) {
-          this.loading = false
-          const confirm = await this.$confirm(
-            this.$t('trials:oncologyReview:message:msg2'),
-            {
-              type: 'warning',
-              distinguishCancelAndClose: true
-            }
-          )
-          if (confirm === 'confirm') reject(false)
-        } else {
-          this.loading = true
-          var oncologyQuestionList = []
-          this.oncologyInfo.OncologyVisits.map(item => {
-            if (item.EvaluationResult && !item.IsBaseLine) {
-              oncologyQuestionList.push(
-                {
-                  visitTaskId: item.VisitTaskId,
-                  evaluationResult: item.EvaluationResult,
-                  evaluationReason: item.EvaluationReason
-                }
-              )
-            }
-          })
-          var params = {
-            oncologyTaskId: this.visitTaskId,
-            oncologyQuestionList: oncologyQuestionList,
-            globalTaskId: this.oncologyInfo.GlobalTaskId,
-            relatedTaskId: this.oncologyInfo.RelatedTaskId
-          }
-          try {
-            await setOncologyReadingInfo(params)
+        if (!this.submitLockAction) {
+          this.submitLockAction = 'save'
+        }
+        try {
+          this.loading = true
+          // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
+          var isDiffer = this.checkDifferResult()
+          if (isDiffer) {
             this.loading = false
-            this.getList()
-            if (isPrompt) {
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
-            }
-            resolve(true)
-          } catch (e) {
-            this.loading = false
-            reject(false)
+            const confirm = await this.$confirm(
+              this.$t('trials:oncologyReview:message:msg2'),
+              {
+                type: 'warning',
+                distinguishCancelAndClose: true
+              }
+            ).catch(() => false)
+            if (confirm === 'confirm') {
+              resolve(false)
+              return
+            }
+          } else {
+            this.loading = true
+            var oncologyQuestionList = []
+            this.oncologyInfo.OncologyVisits.map(item => {
+              if (item.EvaluationResult && !item.IsBaseLine) {
+                oncologyQuestionList.push(
+                  {
+                    visitTaskId: item.VisitTaskId,
+                    evaluationResult: item.EvaluationResult,
+                    evaluationReason: item.EvaluationReason
+                  }
+                )
+              }
+            })
+            var params = {
+              oncologyTaskId: this.visitTaskId,
+              oncologyQuestionList: oncologyQuestionList,
+              globalTaskId: this.oncologyInfo.GlobalTaskId,
+              relatedTaskId: this.oncologyInfo.RelatedTaskId
+            }
+            await setOncologyReadingInfo(params)
+            this.loading = false
+            this.getList()
+            if (isPrompt) {
+              this.$message.success(this.$t('common:message:savedSuccessfully'))
+            }
+            resolve(true)
           }
+        } catch (e) {
+          this.loading = false
+          reject(false)
+        } finally {
+          this.submitLockAction = this.submitLockAction === 'save' ? '' : this.submitLockAction
         }
       })
     },
@@ -373,12 +385,15 @@ export default {
       }
     },
     async handleConfirm() {
+      if (this.submitLockAction) return false
+      this.submitLockAction = 'submit'
       const res = await this.handleSave(false)
       if (res) {
         const { ImageAssessmentReportConfirmation } = const_.processSignature
         this.signCode = ImageAssessmentReportConfirmation
         this.signVisible = true
       }
+      this.submitLockAction = ''
     },
     // 签名并确认
     async signConfirm(signInfo) {
diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue
index db180bc9..d4e26315 100644
--- a/src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue
+++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue
@@ -157,7 +157,7 @@
         <el-table-column
           prop="SubjectCode"
           :label="$t('trials:pmMedicalReview:table:subjectCode')"
-          min-width="120"
+          min-width="150"
           sortable="custom"
           show-overflow-tooltip
         >
diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
index 3f9cf539..d6d0aa2e 100644
--- a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
+++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
@@ -337,7 +337,7 @@
         <el-table-column
           prop="SubjectCode"
           :label="$t('trials:pmMedicalReview:table:subjectCode')"
-          width="120"
+          width="150"
           sortable="custom"
           show-overflow-tooltip
         >
diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
index a0eda895..69fb2c4b 100644
--- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
@@ -128,7 +128,7 @@
           min-width="100" sortable="custom" show-overflow-tooltip />
         <!-- 受试者编号 -->
         <el-table-column prop="OriginalReReadingTask.SubjectCode" :label="$t('trials:rereadTrack:table:subjectCode')"
-          min-width="120" sortable="custom" show-overflow-tooltip>
+          min-width="150" sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             <span>
               {{ getSubjectCode(scope.row.OriginalReReadingTask) }}
@@ -888,7 +888,7 @@ export default {
     async audit(row) {
       try {
         this.rowData = Object.assign({}, row)
-        this.rowData.title = `${row.ApplicantName} (${this.$fd('RequestReReadingType', row.RequestReReadingType)}) ${this.$t('trials:rereadTrack:title:imageBack').replace('xxx', row.OriginalReReadingTask.SubjectCode).replace('yyy', row.OriginalReReadingTask.TaskName)}`
+        this.rowData.title = `${row.ApplicantName} (${this.$fd('RequestReReadingType', row.RequestReReadingType)}) ${this.$t('trials:rereadTrack:title:imageBack').replace('xxx', row.OriginalReReadingTask.SubjectCode).replace('yyy', row.OriginalReReadingTask.TaskBlindName)}`
         Object.keys(this.form).forEach(key => {
           this.form[key] = null
         })
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/components/ManualAllocationTable.vue b/src/views/trials/trials-panel/reading/read-task-allocation/components/ManualAllocationTable.vue
index 8375b0c0..312c66f5 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/components/ManualAllocationTable.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/components/ManualAllocationTable.vue
@@ -117,7 +117,7 @@
     <el-table-column
       prop=""
       :label="$t('trials:reviewAssign:assignReader:table:averageReadingTime')"
-      min-width="120"
+      min-width="150"
       show-overflow-tooltip
     >
     </el-table-column>
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 057188a5..9c27ca5b 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -79,7 +79,7 @@
               <el-table-column prop="TrialSiteCode" :label="$t('trials:reviewAssign:table:siteCode')" width="140"
                 show-overflow-tooltip sortable="custom" />
               <!-- 受试者编号 -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:subjectCode')" width="140"
+              <el-table-column prop="SubjectCode" :label="$t('trials:reviewAssign:table:subjectCode')" width="150"
                 show-overflow-tooltip sortable="custom" />
               <!-- 访视 -->
               <el-table-column prop="VisitTaskTypeCount" :label="$t('trials:reviewAssign:table:visit')" width="140"
diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 7f2faafc..28592821 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -1,6 +1,6 @@
 <template>
   <BaseContainer v-loading="loading" class="read-task">
-    <el-tabs v-model="TrialReadingCriterionId" type="border-card">
+    <el-tabs v-if="TrialReadingCriterionId" v-model="TrialReadingCriterionId" type="border-card">
       <el-tab-pane v-for="item of trialCriterionList" :key="item.TrialReadingCriterionId"
         :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
         <div v-if="TrialReadingCriterionId === item.TrialReadingCriterionId">
@@ -13,9 +13,13 @@
                 </el-select>
               </el-form-item>
               <!-- 受试者编号 -->
-              <el-form-item :label="$t('trials:readTask:table:subjectCode')">
+              <el-form-item v-if="otherInfo && otherInfo.IsReadingTaskViewInOrder !== 0" :label="$t('trials:readTask:table:subjectCode')">
                 <el-input v-model="searchData.SubjectCode" style="width:130px;" clearable />
               </el-form-item>
+              <!-- 任务名称 -->
+              <el-form-item :label="$t('trials:readTask:table:blindName')">
+                <el-input v-model="searchData.TaskBlindName" style="width:130px;" clearable />
+              </el-form-item>
               <!-- 任务状态 -->
               <el-form-item style="margin-bottom:10px" :label="$t('trials:readTask:table:taskState')">
                 <el-select v-model="searchData.TaskState" clearable style="width:120px;">
@@ -50,7 +54,7 @@
             </span>
           </div>
           <div slot="main-container">
-            <el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100"
+            <el-table :ref="TrialReadingCriterionId" v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100"
               @sort-change="handleSortChange">
               <el-table-column type="index" width="40" align="left" />
               <!-- 是否加急 -->
@@ -70,7 +74,7 @@
                 show-overflow-tooltip
               /> -->
               <!-- 受试者编号 -->
-              <el-table-column prop="SubjectCode" min-width="100" :label="$t('trials:readTask:table:subjectCode')"
+              <el-table-column v-if="otherInfo && otherInfo.IsReadingTaskViewInOrder !== 0" prop="SubjectCode" min-width="100" :label="$t('trials:readTask:table:subjectCode')"
                 sortable="custom" show-overflow-tooltip />
               <!-- 盲态任务标识 -->
               <el-table-column prop="TaskBlindName" min-width="100" :label="$t('trials:readTask:table:blindName')"
@@ -149,7 +153,7 @@
                     scope.row.ReReadingApplyState) }}</el-tag>
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
+              <el-table-column :label="$t('common:action:action')" width="200" >
                 <template slot-scope="scope">
                   <!-- 查看 -->
                   <el-button circle :title="$t('trials:readTask:button:view')" icon="el-icon-view"
@@ -177,9 +181,8 @@
       custom-class="base-dialog-wrapper">
       <el-form ref="reasonForm" :rules="rules" :model="ApplyforReasonForm" class="demo-ruleForm" size="small"
         label-width="380px">
-        <p>{{ $t('trials:readTask:applyReread:title').replace('xxx', rowData.SubjectCode).replace('yyy',
-          rowData.TaskName)
-        }}</p>
+        <p v-if="otherInfo && otherInfo.IsReadingTaskViewInOrder !== 0">{{ $t('trials:readTask:applyReread:title').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskBlindName) }}</p>
+        <p v-else>{{ $t('trials:readTask:applyReread:title2').replace('yyy', rowData.TaskBlindName) }}</p>
         <!-- 申请原因 -->
         <el-divider content-position="left">{{ $t('trials:readTask:title:applyReason') }}</el-divider>
         <!-- 申请原因 -->
@@ -211,7 +214,7 @@
         </el-form-item>
         <!-- 是否复制阅片表单 -->
         <el-form-item :label="$t('trials:readTask:title:IsCopyLesionAnswer')"
-          v-if="ApplyforReasonForm.IsCopyOrigenalForms && isTumor" prop="IsCopyFollowForms" :rules="[
+          v-if="ApplyforReasonForm.IsCopyOrigenalForms && rowData.ReadingCategory === 1 && otherInfo.IsReadingTaskViewInOrder === 1" prop="IsCopyFollowForms" :rules="[
             { required: true, message: $t('common:ruleMessage:select') },
           ]">
           <el-radio-group v-model="ApplyforReasonForm.IsCopyFollowForms">
@@ -231,7 +234,7 @@
           <el-table-column prop="TrialSiteCode" :label="$t('trials:readTask:table:siteCode')" min-width="100"
             show-overflow-tooltip />
           <!-- 受试者编号 -->
-          <el-table-column prop="SubjectCode" :label="$t('trials:readTask:table:subjectCode')" min-width="120"
+          <el-table-column v-if="otherInfo && otherInfo.IsReadingTaskViewInOrder !== 0" prop="SubjectCode" :label="$t('trials:readTask:table:subjectCode')" min-width="120"
             show-overflow-tooltip />
           <!-- <el-table-column
             prop="VisitTaskNum"
@@ -333,6 +336,7 @@ import { openWindow } from "@/utils/splitScreen";
 const searchDataDefault = () => {
   return {
     SubjectCode: '',
+    TaskBlindName: '',
     SortField: '',
     PageIndex: 1,
     PageSize: 20,
@@ -367,13 +371,15 @@ export default {
         RequestReReadingReason: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       trialCriterionList: [],
-      TrialReadingCriterionId: '0',
-      openWindow: null
+      TrialReadingCriterionId: '',
+      openWindow: null,
+      otherInfo: null
     }
   },
   watch: {
     TrialReadingCriterionId(v) {
       if (v) {
+        this.searchData = searchDataDefault()
         this.getList()
       }
     }
@@ -415,7 +421,11 @@ export default {
       getIRHaveReadTaskList(this.searchData).then(res => {
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount
+        this.otherInfo = res.OtherInfo
         this.loading = false
+        this.$nextTick(() => {
+          this.$refs[this.TrialReadingCriterionId][0].doLayout()
+        })
       }).catch(() => { this.loading = false })
     },
     handleSearch() {
@@ -485,7 +495,7 @@ export default {
         if (!valid) return
         this.loading = true
         this.btnLoading = true
-        if (!this.ApplyforReasonForm.IsCopyOrigenalForms || !this.isTumor) {
+        if (!this.ApplyforReasonForm.IsCopyOrigenalForms) {
           this.ApplyforReasonForm.IsCopyFollowForms = false
         }
         var params = {
@@ -499,6 +509,7 @@ export default {
           // IsCopyLesionAnswer: this.ApplyforReasonForm.IsCopyOrigenalForms,
           RequestReReadingReason: this.ApplyforReasonForm.Type === 2 ? this.ApplyforReasonForm.RequestReReadingReason : this.$t('trials:readTask:option:errorRecords') // '阅片记录错误'
         }
+        console.log(params)
         applyReReading(params).then(res => {
           this.loading = false
           this.btnLoading = false
diff --git a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
index 4042945b..1d8b8fc8 100644
--- a/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/components/TargetSection.vue
@@ -1,94 +1,127 @@
 <template>
-    <BaseContainer>
-        <div slot="search-container">
-            <el-form :inline="true">
-                <!-- 受试者编号 -->
-                <el-form-item :label="$t('trials:pendingReadingTasks:table:subjectCode')">
-                    <el-input v-model="searchData.SubjectCode" 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-form>
-        </div>
-        <div slot="main-container">
-            <el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" @sort-change="handleSortChange"
-                v-loading="loading">
-                <el-table-column type="index" width="40" align="left" />
-                <el-table-column prop="IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
-                    show-overflow-tooltip min-width="100">
-                    <template slot-scope="scope">
-                        <el-tag :type="scope.row.IsUrgent
-                            ? 'danger' : 'primary'
-                            ">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
-                    </template>
-                </el-table-column>
-                <!-- 受试者编号 -->
-                <el-table-column prop="SubjectCode" min-width="100"
-                    :label="$t('trials:pendingReadingTasks:table:subjectCode')" show-overflow-tooltip
-                    sortable="custom" />
-                <!-- 访视数量 -->
-                <el-table-column prop="VisitCount" :label="$t('trials:pendingReadingTasks:table:VisitCount')"
-                    show-overflow-tooltip sortable="custom" />
-                <!-- dicom检查数量 -->
-                <!-- <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
+    <div>
+        <el-tabs type="border-card" v-model="activeName">
+            <template v-for="item in tabPaneList">
+                <el-tab-pane :label="$t(`uploadDicomAndNonedicom:label:TargetSection_${item}`)" :name="item">
+                    <BaseContainer v-if="activeName == item">
+                        <div slot="search-container">
+                            <el-form :inline="true">
+                                <!-- 受试者编号 -->
+                                <el-form-item :label="$t('trials:pendingReadingTasks:table:subjectCode')">
+                                    <el-input v-model="searchData.SubjectCode" 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-form>
+                        </div>
+                        <div slot="main-container">
+                            <el-table v-adaptive="{ bottomOffset: 85 }" :data="list" stripe height="100"
+                                @sort-change="handleSortChange" v-loading="loading">
+                                <el-table-column type="index" width="40" align="left" />
+                                <el-table-column prop="IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
+                                    show-overflow-tooltip min-width="100">
+                                    <template slot-scope="scope">
+                                        <el-tag :type="scope.row.IsUrgent
+                                            ? 'danger' : 'primary'
+                                            ">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
+                                    </template>
+                                </el-table-column>
+                                <!-- 受试者编号 -->
+                                <el-table-column prop="SubjectCode" min-width="100"
+                                    :label="$t('trials:pendingReadingTasks:table:subjectCode')" show-overflow-tooltip
+                                    sortable="custom" />
+                                <!-- 访视数量 -->
+                                <el-table-column prop="VisitCount"
+                                    :label="$t('trials:pendingReadingTasks:table:VisitCount')" show-overflow-tooltip
+                                    sortable="custom" />
+                                <!-- dicom检查数量 -->
+                                <!-- <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
                     show-overflow-tooltip sortable="custom" /> -->
-                <!-- 非dicom检查数量 -->
-                <!-- <el-table-column prop="NoneDicomStudyCount"
+                                <!-- 非dicom检查数量 -->
+                                <!-- <el-table-column prop="NoneDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip
                     sortable="custom" /> -->
-                <!-- 标记访视数量 -->
-                <el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
-                    show-overflow-tooltip>
-                    <template slot-scope="scope">
-                        <span>{{ `${scope.row.MarkIVUSVisitCount || 0}/${scope.row.MarkOCTVisitCount || 0}` }}</span>
-                    </template>
-                </el-table-column>
-                <!-- 标记dicom检查数量 -->
-                <!-- <el-table-column prop="MarkDicomStudyCount"
+                                <!-- 标记访视数量 -->
+                                <el-table-column prop="MarkVisitCount"
+                                    :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')" show-overflow-tooltip
+                                    sortable="custom">
+                                    <template slot-scope="scope">
+                                        <span>{{ scope.row.MarkIVUSVisitCount || 0
+                                            }}</span>
+                                    </template>
+                                </el-table-column>
+                                <!-- 标记访视数量 -->
+                                <el-table-column prop="MarkVisitCount"
+                                    :label="$t('trials:pendingReadingTasks:table:MarkOCTVisitCount')"
+                                    show-overflow-tooltip sortable="custom">
+                                    <template slot-scope="scope">
+                                        <span>{{ scope.row.MarkOCTVisitCount ||
+                                            0
+                                            }}</span>
+                                    </template>
+                                </el-table-column>
+                                <!-- 标记dicom检查数量 -->
+                                <!-- <el-table-column prop="MarkDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip
                     sortable="custom" /> -->
-                <!-- 标记非dicom检查数量 -->
-                <!-- <el-table-column prop="MarkNoneDicomStudyCount"
+                                <!-- 标记非dicom检查数量 -->
+                                <!-- <el-table-column prop="MarkNoneDicomStudyCount"
                     :label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip
                     sortable="custom" /> -->
-                <el-table-column :label="$t('common:action:action')" width="100" fixed="right">
-                    <template slot-scope="scope">
-                        <!-- 阅片 -->
-                        <!-- <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
+                                <!-- 下载时间 -->
+                                <el-table-column prop="LatestDownloadTime" min-width="100"
+                                    :label="$t('trials:pendingReadingTasks:table:latestDownloadTime')"
+                                    show-overflow-tooltip sortable="custom" />
+                                <!-- 上传时间 -->
+                                <el-table-column prop="LatestUploadTime" min-width="100"
+                                    :label="$t('trials:pendingReadingTasks:table:latestUploadTime')"
+                                    show-overflow-tooltip sortable="custom" />
+                                <el-table-column :label="$t('common:action:action')" width="100" fixed="right">
+                                    <template slot-scope="scope">
+                                        <!-- 阅片 -->
+                                        <!-- <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
                             ? $t(
                                 'trials:pendingReadingTasks:button:ExistReadingApply'
                             )
                             : $t('trials:pendingReadingTasks:button:review')
                             " icon="el-icon-edit-outline" @click="handleReadImage(scope.row)" /> -->
-                        <!-- 上传 -->
-                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle icon="el-icon-upload2"
-                            :title="$t('trials:pendingReadingTasks:button:upload')"
-                            @click="openUploadImage(scope.row, 'upload')" />
-                        <!-- 下载 -->
-                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle icon="el-icon-download"
-                            :title="$t('trials:pendingReadingTasks:button:download')"
-                            @click="openUploadImage(scope.row, 'download')" />
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
-                @pagination="getList" />
-        </div>
-        <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId"
-            :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
-            :IsImageSegment="true" :forbid="forbid" />
-        <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
-            :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="downloadImageVisible"
-            :IsImageSegment="true" :forbid="forbid" />
-    </BaseContainer>
+                                        <!-- 上传 -->
+                                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle
+                                            icon="el-icon-upload2"
+                                            :title="$t('trials:pendingReadingTasks:button:upload')"
+                                            @click="openUploadImage(scope.row, 'upload')" />
+                                        <!-- 下载 -->
+                                        <el-button v-hasPermi="['role:ir', 'role:pm', 'role:apm']" circle
+                                            icon="el-icon-download"
+                                            :title="$t('trials:pendingReadingTasks:button:download')"
+                                            @click="openUploadImage(scope.row, 'download')" />
+                                    </template>
+                                </el-table-column>
+                            </el-table>
+                            <pagination class="page" :total="total" :page.sync="searchData.PageIndex"
+                                :limit.sync="searchData.PageSize" @pagination="getList" />
+                        </div>
+                        <upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId"
+                            :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion"
+                            :visible.sync="uploadImageVisible" :IsImageSegment="true" :forbid="forbid" />
+                        <download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
+                            :SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion"
+                            :visible.sync="downloadImageVisible" :IsImageSegment="true" :forbid="forbid" />
+                    </BaseContainer>
+                </el-tab-pane>
+            </template>
+
+        </el-tabs>
+    </div>
+
 </template>
 <script>
 import BaseContainer from '@/components/BaseContainer'
@@ -99,6 +132,7 @@ import { getTrialSubjectVisitMarkList } from "@/api/trials"
 const searchDataDefault = () => {
     return {
         SubjectCode: '',
+        State: 0,
         PageIndex: 1,
         PageSize: 20,
     }
@@ -129,6 +163,8 @@ export default {
     },
     data() {
         return {
+            activeName: '0',
+            tabPaneList: ['0', '1', '2'],
             searchData: searchDataDefault(),
             loading: false,
             list: [],
@@ -153,6 +189,9 @@ export default {
             if (!v) {
                 this.getList()
             }
+        },
+        activeName() {
+            this.getList()
         }
     },
     mounted() {
@@ -171,6 +210,7 @@ export default {
             try {
                 this.searchData.TrialId = this.$route.query.trialId
                 this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
+                this.searchData.State = this.activeName
                 this.loading = true
                 let res = await getTrialSubjectVisitMarkList(this.searchData)
                 this.loading = false
diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index 73b596f0..592dfc8a 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -9,7 +9,7 @@
           TrialReadingCriterionId === item.TrialReadingCriterionId
         ">
           <div slot="search-container">
-            <el-form :inline="true">
+            <el-form :inline="true" @submit.native.prevent="">
               <!-- 受试者编号 -->
               <el-form-item :label="$t('trials:pendingReadingTasks:table:subjectCode')">
                 <el-input v-model="searchData.SubjectCode" style="width: 130px" clearable />
@@ -78,7 +78,7 @@
                   {{ scope.row.SuggesteFinishedTime.split(':')[0] + ':00:00' }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('common:action:action')" width="250" fixed="right">
+              <el-table-column :label="$t('common:action:action')" width="250" >
                 <template slot-scope="scope">
                   <!-- 阅片 -->
                   <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
@@ -88,21 +88,21 @@
                     : $t('trials:pendingReadingTasks:button:review')
                     " icon="el-icon-edit-outline" @click="handleReadImage(scope.row)" />
                   <!-- 上传 -->
-                  <el-button v-if="
+                  <!-- <el-button v-if="
                     item.ImageUploadEnum > 0 &&
                     item.IsReadingTaskViewInOrder > 1 &&
                     !scope.row.IsSubjectJudge
                   " v-hasPermi="['role:ir']" circle icon="el-icon-upload2"
                     :title="$t('trials:pendingReadingTasks:button:upload')"
-                    @click="openUploadImage(scope.row, item, 'upload')" />
+                    @click="openUploadImage(scope.row, item, 'upload')" /> -->
                   <!-- 下载 -->
-                  <el-button v-if="
+                  <!-- <el-button v-if="
                     item.ImageDownloadEnum > 0 &&
                     item.IsReadingTaskViewInOrder > 1 &&
                     !scope.row.IsSubjectJudge
                   " v-hasPermi="['role:ir']" circle icon="el-icon-download"
                     :title="$t('trials:pendingReadingTasks:button:download')"
-                    @click="openUploadImage(scope.row, item, 'download')" />
+                    @click="openUploadImage(scope.row, item, 'download')" /> -->
                 </template>
               </el-table-column>
             </el-table>
@@ -234,6 +234,7 @@ export default {
   watch: {
     TrialReadingCriterionId(v) {
       if (v) {
+        this.searchData = searchDataDefault()
         this.getList()
       }
     },
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
index 1acba418..319deefc 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
@@ -171,7 +171,7 @@
         <el-table-column
           prop="SubjectCode"
           :label="$t('trials:reviewTrack:table:subjectCode')"
-          min-width="120"
+          min-width="150"
           sortable="custom"
           show-overflow-tooltip
         >
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index b4ca06ac..c8527ce4 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -200,7 +200,7 @@
         <el-table-column prop="TrialSiteCode" :label="$t('trials:reviewTrack:table:siteCode')" width="100"
           sortable="custom" show-overflow-tooltip />
         <!-- 受试者编号 -->
-        <el-table-column prop="SubjectCode" :label="$t('trials:reviewTrack:table:subjectCode')" min-width="120"
+        <el-table-column prop="SubjectCode" :label="$t('trials:reviewTrack:table:subjectCode')" min-width="150"
           sortable="custom" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="
@@ -460,7 +460,7 @@
         custom-class="base-dialog-wrapper">
         <el-form ref="reasonForm" :rules="rules" :model="ApplyforReasonForm" class="demo-ruleForm" size="small"
           label-width="180px">
-          <p>{{ $t('trials:reviewTrack:applyReread:title2').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskName) }}</p>
+          <p>{{ $t('trials:reviewTrack:applyReread:title2').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskBlindName) }}</p>
           <!-- 申请原因 -->
           <el-divider content-position="left">
             {{ $t('trials:reviewTrack:applyReread:title:applyReason') }}
@@ -625,7 +625,7 @@
         custom-class="base-dialog-wrapper">
         <el-form ref="backReasonForm" :rules="rules" :model="backforReasonForm" class="demo-ruleForm" size="small"
           label-width="180px">
-          <p>{{ $t('trials:reviewTrack:applyReread:title1').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskName) }}</p>
+          <p>{{ $t('trials:reviewTrack:applyReread:title1').replace('xxx', rowData.SubjectCode).replace('yyy', rowData.TaskBlindName) }}</p>
           <!-- 申请原因 -->
           <el-divider content-position="left">
             {{ $t('trials:reviewTrack:applyReread:title:backReason') }}
diff --git a/src/views/trials/trials-panel/reading/referee-allocation/index.vue b/src/views/trials/trials-panel/reading/referee-allocation/index.vue
index b9892ab0..e3eb91ab 100644
--- a/src/views/trials/trials-panel/reading/referee-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/referee-allocation/index.vue
@@ -118,7 +118,7 @@
         <el-table-column
           prop="SubjectCode"
           :label="$t('trials:reviewAssign:readingTask:table:subjectCode')"
-          min-width="120"
+          min-width="150"
           sortable="custom"
           show-overflow-tooltip
         />
diff --git a/src/views/trials/trials-panel/reading/reread-task/index.vue b/src/views/trials/trials-panel/reading/reread-task/index.vue
index 3591e31c..3b0dae8c 100644
--- a/src/views/trials/trials-panel/reading/reread-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reread-task/index.vue
@@ -1,6 +1,6 @@
 <template>
   <BaseContainer class="reread-task">
-    <el-tabs v-model="TrialReadingCriterionId" type="border-card">
+    <el-tabs v-if="TrialReadingCriterionId" v-model="TrialReadingCriterionId" type="border-card">
       <el-tab-pane v-for="item of trialCriterionList" :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
         <div v-if="TrialReadingCriterionId === item.TrialReadingCriterionId">
           <div slot="search-container">
@@ -35,7 +35,7 @@
                 </el-select>
               </el-form-item>
               <!-- 受试者编号 -->
-              <el-form-item :label="$t('trials:rereadTask:table:subjectCode')">
+              <el-form-item v-if="otherInfo && otherInfo.IsReadingTaskViewInOrder !== 0" :label="$t('trials:rereadTask:table:subjectCode')">
                 <el-input v-model="searchData.SubjectCode" style="width:100px;" />
               </el-form-item>
               <!-- <el-form-item style="margin-bottom:10px" label="访视/阅片期名称">
@@ -45,14 +45,14 @@
                   clearable
                 />
               </el-form-item> -->
-              <!-- 任务编号 -->
-              <!-- <el-form-item :label="$t('trials:rereadTask:table:taskCode')">
+              <!-- 任务名称 -->
+              <el-form-item :label="$t('trials:rereadTask:table:taskBlindName')">
                 <el-input
-                  v-model="searchData.TaskCode"
+                  v-model="searchData.TaskBlindName"
                   style="width:130px;"
                   clearable
                 />
-              </el-form-item> -->
+              </el-form-item>
               <el-form-item :label="$t('trials:rereadTask:table:taskState')">
                 <el-select v-model="searchData.TaskState" clearable style="width:120px;">
                   <el-option v-for="i of $d.TaskState" :key="'TaskState' + i.label" :value="i.value" :label="i.label" />
@@ -82,6 +82,7 @@
           </div>
           <div slot="main-container">
             <el-table
+              :ref="TrialReadingCriterionId"
               v-adaptive="{bottomOffset:75}"
               v-loading="loading"
               :data="list"
@@ -121,6 +122,7 @@
               />
               <!-- 受试者编号 -->
               <el-table-column
+                v-if="otherInfo && otherInfo.IsReadingTaskViewInOrder !== 0"
                 prop="OriginalReReadingTask.SubjectCode"
                 min-width="90"
                 :label="$t('trials:rereadTask:table:subjectCode')"
@@ -303,6 +305,7 @@ const searchDataDefault = () => {
   return {
     IsUrgent: null,
     SubjectCode: '',
+    TaskBlindName: '',
     TaskCode: '',
     PageIndex: 1,
     PageSize: 20,
@@ -330,12 +333,14 @@ export default {
       },
       ConfirmReReadingVisible: false,
       trialCriterionList: [],
-      TrialReadingCriterionId: '0'
+      TrialReadingCriterionId: '',
+      otherInfo: null
     }
   },
   watch: {
     TrialReadingCriterionId(v) {
       if (v) {
+        this.searchData = searchDataDefault()
         this.getList()
       }
     }
@@ -373,7 +378,11 @@ export default {
       getIRReReadingTaskList(this.searchData).then(res => {
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount
+        this.otherInfo = res.OtherInfo
         this.loading = false
+        this.$nextTick(() => {
+          this.$refs[this.TrialReadingCriterionId][0].doLayout()
+        })
       }).catch(() => { this.loading = false })
     },
     handleSearch() {
diff --git a/src/views/trials/trials-panel/reading/task-allocation/index.vue b/src/views/trials/trials-panel/reading/task-allocation/index.vue
index c78a0c17..3a33e93c 100644
--- a/src/views/trials/trials-panel/reading/task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/task-allocation/index.vue
@@ -130,7 +130,7 @@
         <el-table-column
           prop="SubjectCode"
           :label="$t('trials:reviewAssign:readingTask:table:subjectCode')"
-          min-width="120"
+          min-width="150"
           sortable="custom"
           show-overflow-tooltip
         />
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
index 73605664..ef6aaefb 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/FileViewer.vue
@@ -31,6 +31,58 @@
           :title="$t('trials:reading:button:rotate')" @click.prevent="setToolActive('PlanarRotate')">
           <svg-icon icon-class="rotate" class="svg-icon" />
         </div>
+        <!-- 查看关键序列 -->
+        <el-popover v-model="keySeriesPopoverVisible" placement="bottom" trigger="click"
+          popper-class="key-series-popper" @show="showKeySeriesPanel">
+          <ul class="key-series-list">
+            <li v-if="keyTaskInfo && keyTaskInfo.TaskBlindName" class="key-series-header">
+              <div class="key-series-header-top">
+                <div class="key-series-header-title">
+                  <span class="key-series-header-dot"></span>
+                  <div class="key-series-task-name" :title="keyTaskInfo.TaskBlindName">
+                    {{ keyTaskInfo.TaskBlindName }}
+                  </div>
+                </div>
+              </div>
+            </li>
+            <li v-if="keySeriesLoading" class="key-series-empty">
+              <i class="el-icon-loading"></i>
+            </li>
+            <li v-else-if="keySeries.length === 0" class="key-series-empty">
+              {{ $t('trials:reading:keyImage:noData') }}
+            </li>
+            <li v-for="(kf, idx) in keySeries" :key="idx" class="key-series-item"
+              @click.stop.prevent="jumpToKeySeries(kf)">
+              <div class="key-series-img">
+                <img v-if="kf.PicturePath" :src="`${OSSclientConfig.basePath}${kf.PicturePath}`" />
+                <svg-icon v-else icon-class="image" class="svg-icon default-icon" />
+              </div>
+              <div class="key-series-info">
+                <div class="key-series-meta" v-if="kf.MarkName">
+                  <div class="key-series-label">{{ $t('trials:reading:keySeries:annotationName') }}</div>
+                  <div class="key-series-uid" :title="kf.MarkName">
+                    {{ kf.MarkName }}
+                  </div>
+                </div>
+                <div class="key-series-meta">
+                  <div class="key-series-label">{{ $t('trials:reading:keySeries:fileName') }}</div>
+                  <div class="key-series-uid" :title="kf.FileName">
+                    {{ kf.FileName }}
+                  </div>
+                </div>
+              </div>
+              <div class="key-series-star">
+                <svg-icon icon-class="star" class="svg-icon" />
+              </div>
+            </li>
+          </ul>
+          <div slot="reference" class="tool-item">
+            <div class="icon" :title="$t('trials:reading:button:keyImage')">
+              <!-- <svg-icon icon-class="star" class="svg-icon" /> -->
+              <i class="el-icon-star-off svg-icon"></i>
+            </div>
+          </div>
+        </el-popover>
         <div v-for="tool in tools" :key="tool.toolName"
           :class="['tool-item', readingTaskState === 2 ? 'tool-disabled' : '', activeTool === tool.toolName ? 'tool-item-active' : '']"
           :style="{ cursor: tool.isDisabled ? 'not-allowed' : 'pointer' }"
@@ -56,21 +108,18 @@
           :title="$t('trials:nondicom-show:scale')" @click.prevent="setAnnotateToolActive('Lengthscale')">
           <svg-icon icon-class="lengthscale" class="svg-icon" />
         </div>
+
         <!-- 截图 -->
-        <!-- <div
-          class="tool-item"
-          :title="$t('trials:reading:button:screenShot')"
-          @click.prevent="saveImage"
-        >
+        <div class="tool-item" :title="$t('trials:reading:button:screenShot')" @click.prevent="saveImage">
           <svg-icon icon-class="image" class="svg-icon" />
-        </div> -->
+        </div>
         <!-- 重置 -->
         <div class="tool-item" :title="$t('trials:reading:button:reset')" @click.prevent="resetViewport">
           <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']"
-          @click.stop="showPanel($event)" @mouseleave="toolMouseout">
+        <div v-if="criterionType === 0 && customizeStandardsNoneDicom.length > 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" />
@@ -78,10 +127,10 @@
             </div>
             <div class="dropdown-content">
               <!--v-if="readingTaskState < 2"-->
-              <ul style="width:100px;">
+              <ul class="customize-standards-list">
                 <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;" />
+                    <svg-icon :icon-class="i.icon" class="svg-icon" style="margin-right: 5px;font-size: 15px;" />
                     {{ $t(i.i18nKey) }}
                   </a>
                 </li>
@@ -130,7 +179,7 @@
     <!-- viewports -->
     <div class="viewports-wrapper" v-loading="loading" ref="viewports-wrapper">
       <div ref="container" class="grid-container" :style="gridStyle">
-        <div v-for="(v, index) in viewportInfos" v-show="index < cells.length" :key="index" :style="cellStyle"
+        <div v-for="(v, index) in viewportInfos" :ref="`grid-cell-${index}`" :key="index" :style="getCellStyle(index)"
           :class="['grid-cell', index === activeCanvasIndex ? 'cell_active' : '', index === fullScreenIndex ? 'cell-full-screen' : '']"
           @dblclick="toggleFullScreen($event, index)" @click="activeCanvas(index)"
           @mouseup="sliderMouseup($event, index)" @mousemove="sliderMousemove($event, index)"
@@ -143,8 +192,8 @@
                 <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon"
                   @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
               </div>
-              <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
-                {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
+              <h2 class="subject-info">
+                {{ taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo ? taskInfo.SubjectCode + ' ' + v.taskInfo.TaskBlindName : v.taskInfo.TaskBlindName }}
               </h2>
               <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
             </div>
@@ -172,7 +221,7 @@
                 @mousedown.stop="sliderMousedown($event, index)" />
             </div>
           </div>
-          <div v-show="v.fileType === 'application/pdf' && fullScreenIndex === null" class="content flex_col">
+          <div v-if="v.fileType === 'application/pdf' && fullScreenIndex === null" class="content flex_col">
             <div class="content-top" style="height: 50px;">
               <div class="left-top-text">
                 <div v-if="v.taskInfo.IsExistsClinicalData" class="cd-info"
@@ -212,6 +261,48 @@
             </div>
 
           </div>
+
+          <div v-if="v.fileType.includes('mp4')" class="content flex_col">
+            <div class="content-top" style="height: 50px;">
+              <div class="left-top-text">
+                <div v-if="v.taskInfo.IsExistsClinicalData" class="cd-info"
+                  :title="$t('trials:reading:button:clinicalData')">
+                  <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon"
+                    @click.stop="viewCD(v.taskInfo.VisitTaskId)" />
+                </div>
+                <h2 v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo && v.taskInfo" class="subject-info">
+                  {{ `${taskInfo.SubjectCode} ${v.taskInfo.TaskBlindName} ` }}
+                </h2>
+                <div v-if="v.currentFileName">{{ v.currentFileName }}</div>
+              </div>
+              <div v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder === 1 && v.taskInfo" class="top-center-tool">
+                <div class="toggle-visit-container">
+                  <div class="arrw_icon"
+                    :style="{ cursor: v.taskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum !== 0 ? '#fff' : '#6b6b6b' }"
+                    @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, -1, v.index)"
+                    @dblclick.stop="preventDefault($event)">
+                    <i class="el-icon-caret-left" />
+                  </div>
+                  <div class="arrow_text">
+                    {{ v.taskInfo.TaskBlindName }}
+                  </div>
+                  <div class="arrw_icon"
+                    :style="{ cursor: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: v.taskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff' : '#6b6b6b' }"
+                    @click.stop.prevent="toggleTask($event, v.taskInfo.VisitTaskNum, 1, v.index)"
+                    @dblclick.stop="preventDefault($event)">
+                    <i class="el-icon-caret-right" />
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="content-main" :ref="`video-content-main-${index}`" style="flex: 1;">
+              <video v-if="v.currentFilePath" :ref="`videovideo-${index}`"
+                :src="`${OSSclientConfig.basePath}${v.currentFilePath}`" crossorigin="anonymous" width="100%"
+                height="100%" autoplay controls controlsList="nodownload"></video>
+            </div>
+
+          </div>
+
         </div>
       </div>
     </div>
@@ -245,7 +336,7 @@
         </el-tab-pane>
         <!-- 其他 -->
         <el-tab-pane :label="$t('trials:reading:tab:others')" name="2">
-          <Others v-if="activeName === '2'" :imageToolType="2"/>
+          <Others v-if="activeName === '2'" :imageToolType="2" />
         </el-tab-pane>
       </el-tabs>
     </el-dialog>
@@ -282,6 +373,7 @@
 </template>
 <script>
 import { addNoneDicomMark, deleteTrialFileType, getCriterionReadingInfo, setReadKeyFile } from '@/api/trials'
+import { getNoneDicomMarkList } from '@/api/reading'
 import { getDoctorShortcutKey } from '@/api/user'
 import html2canvas from 'html2canvas'
 import {
@@ -329,6 +421,30 @@ const {
   BidirectionalTool,
   // cursors
 } = cornerstoneTools
+const newStyles = {
+  global: {
+    color: 'rgb(255, 0, 0)',
+    colorHighlighted: 'rgb(0, 255, 0)',
+    colorSelected: 'rgb(255, 0, 0)',
+    colorLocked: 'rgb(255, 0, 0)',
+    lineWidth: '1',
+    lineDash: '',
+    shadow: true,
+    textBoxVisibility: true,
+    textBoxFontFamily: 'Helvetica Neue, Helvetica, Arial, sans-serif',
+    textBoxFontSize: '14px',
+    textBoxColor: 'rgb(255, 0, 0)',
+    textBoxColorHighlighted: 'rgb(0, 255, 0)',
+    textBoxColorSelected: 'rgb(255, 0, 0)',
+    textBoxColorLocked: 'rgb(255, 0, 0)',
+    textBoxBackground: '',
+    textBoxLinkLineWidth: '1',
+    textBoxLinkLineDash: '2,3',
+    textBoxShadow: true,
+    markerSize: '10'
+  }
+}
+cornerstoneTools.annotation.config.style.setDefaultToolStyles(newStyles)
 const { MouseBindings, Events: toolsEvents } = csToolsEnums
 export default {
   name: 'ImageViewer',
@@ -416,7 +532,11 @@ export default {
       ManualsClose: false,
       activeName: '1',
       hotKeyList: [],
-      isShowAnnotations: true
+      isShowAnnotations: true,
+      keySeries: [],
+      keyTaskInfo: null,
+      keySeriesLoading: false,
+      keySeriesPopoverVisible: false
     }
   },
   computed: {
@@ -564,6 +684,34 @@ export default {
     toolMouseout(e) {
       e.currentTarget.firstChild.lastChild.style.display = 'none'
     },
+    async showKeySeriesPanel() {
+      this.keySeries = []
+      this.keySeriesLoading = true
+
+      try {
+        const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
+        if (i > -1) {
+          this.keyTaskInfo = this.viewportInfos[i].taskInfo
+          const visitTaskId = this.viewportInfos[i].taskInfo.VisitTaskId
+          const res = await getNoneDicomMarkList({ visitTaskId: visitTaskId })
+          if (res && res.Result) {
+            this.keySeries = res.Result
+          }
+        }
+      } catch (err) {
+        console.log(err)
+      } finally {
+        this.keySeriesLoading = false
+      }
+    },
+    jumpToKeySeries(kf) {
+      const visitTaskId = this.keyTaskInfo.VisitTaskId
+      this.$emit('selectFile', {
+        path: kf.Path,
+        studyId: kf.StudyId,
+        visitTaskId: visitTaskId
+      })
+    },
     // 初始化加载器
     async initLoader() {
       registerWebImageLoader(imageLoader)
@@ -946,6 +1094,12 @@ export default {
       //   })
       // })
     },
+    getCellStyle(index) {
+      return {
+        ...this.cellStyle,
+        display: index < this.cells.length ? this.cellStyle.display : 'none'
+      }
+    },
     // 切换全屏
     toggleFullScreen(e, index) {
       const i = this.viewportInfos.findIndex(i => i.index === index)
@@ -1164,7 +1318,8 @@ export default {
       const { annotation } = e.detail
       if (!annotation.highlighted) return
       if (!annotation) return
-      // if (!annotation.annotationId) return
+      const savedAnnotationId = annotation.id || annotation.annotationId
+      if (!savedAnnotationId && annotation.metadata.toolName !== 'Lengthscale') return
       let i = this.tools.findIndex(i => i.toolName === annotation.metadata.toolName)
       if (i === -1 && annotation.metadata.toolName !== 'Lengthscale') {
         this.setToolsPassive()
@@ -1279,7 +1434,7 @@ export default {
               clearTimeout(this.saveCustomAnnotationTimer)
               this.saveCustomAnnotationTimer = null
             }
-            this.saveCustomAnnotationTimer = setTimeout(() => { this.saveCustomAnnotation(annotation) }, 500)
+            this.saveCustomAnnotation(annotation)
           }
         } else {
           // if (this.isNumber(operateStateEnum)) {
@@ -1315,6 +1470,7 @@ export default {
       try {
         const measureData = Object.assign({}, annotation)
         const params = {}
+        const savedAnnotationId = annotation.id || annotation.annotationId
         const i = this.viewportInfos.findIndex(i => i.index === this.activeCanvasIndex)
         this.loading = true
         await this.getScreenshots({
@@ -1324,7 +1480,7 @@ export default {
           this.loading = false
           const pictureObj = await this.uploadScreenshots(`${Date.now()}`, base64Str)
           let picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-          if (annotation.id) params.Id = annotation.id
+          if (savedAnnotationId) params.Id = savedAnnotationId
           if (!isNaN(parseFloat(ps))) params.Proportion = ps
           params.PicturePath = picturePath
           params.Path = annotation.path || ''
@@ -1338,6 +1494,7 @@ export default {
           const res = await addNoneDicomMark(params)
           annotation.markId = params.MarkId
           annotation.id = res.Result
+          annotation.annotationId = res.Result
           if (!isNaN(parseFloat(ps))) this.$emit('getEcrf', { type: "changePlottingScaleChangeAnswer", VisitTaskId: this.taskInfo.VisitTaskId, noneDicomFileId: annotation.noneDicomFileId, path: annotation.path || '', picturePath, psArr: this.psArr, isRemovePlottingScale: ps < 0 ? true : false })
 
           this.$emit('getMarkedFileIds', { type: "add", visitTaskId: this.taskInfo.VisitTaskId, fileId: annotation.noneDicomFileId })
@@ -1763,16 +1920,84 @@ export default {
       viewport.render()
     },
     async saveImage() {
-      const divForDownloadViewport = document.querySelector(
-        `div[data-viewport-uid="canvas-${this.activeCanvasIndex}"]`
-      )
+      const viewportIndex = this.viewportInfos.findIndex(v => v.index === this.activeCanvasIndex)
+      if (viewportIndex === -1) return
+      const currentViewport = this.viewportInfos[viewportIndex]
+
+      let divForDownloadViewport = null
+      let tempImg = null
+
+      if (currentViewport.fileType && currentViewport.fileType.includes('mp4')) {
+        divForDownloadViewport = this.$refs[`grid-cell-${this.activeCanvasIndex}`][0]
+        const videoEl = this.$refs[`videovideo-${this.activeCanvasIndex}`][0]
+
+        if (videoEl) {
+          // 将视频帧画到 canvas 上生成图片
+          const tempCanvas = document.createElement('canvas')
+          // 设置 canvas 尺寸为容器实际尺寸
+          const containerWidth = videoEl.clientWidth
+          const containerHeight = videoEl.clientHeight
+          tempCanvas.width = containerWidth
+          tempCanvas.height = containerHeight
+
+          const ctx = tempCanvas.getContext('2d')
+          // 填充黑色背景
+          ctx.fillStyle = '#000'
+          ctx.fillRect(0, 0, containerWidth, containerHeight)
+
+          // 计算视频保持比例的缩放尺寸和位置 (等同于 object-fit: contain)
+          const videoWidth = videoEl.videoWidth || containerWidth
+          const videoHeight = videoEl.videoHeight || containerHeight
+
+          const scale = Math.min(containerWidth / videoWidth, containerHeight / videoHeight)
+          const drawWidth = videoWidth * scale
+          const drawHeight = videoHeight * scale
+          const offsetX = (containerWidth - drawWidth) / 2
+          const offsetY = (containerHeight - drawHeight) / 2
+
+          // 将视频帧居中绘制
+          ctx.drawImage(videoEl, offsetX, offsetY, drawWidth, drawHeight)
+
+          const frameBase64 = tempCanvas.toDataURL('image/png')
+
+          // 创建一个 img 标签遮盖在 video 上
+          tempImg = document.createElement('img')
+          tempImg.src = frameBase64
+          tempImg.style.position = 'absolute'
+          tempImg.style.top = '0'
+          tempImg.style.left = '0'
+          tempImg.style.width = '100%'
+          tempImg.style.height = '100%'
+          tempImg.style.zIndex = '99'
+
+          const videoContainer = this.$refs[`video-content-main-${this.activeCanvasIndex}`][0]
+          videoContainer.style.position = 'relative'
+          videoContainer.appendChild(tempImg)
+        }
+      } else {
+        divForDownloadViewport = document.querySelector(
+          `div[data-viewport-uid="canvas-${this.activeCanvasIndex}"]`
+        )
+      }
+
       if (!divForDownloadViewport) return
-      const canvas = await html2canvas(divForDownloadViewport)
+
+      // 等待 DOM 更新
+      await this.$nextTick()
+
+      const canvas = await html2canvas(divForDownloadViewport, {
+        useCORS: true,
+        backgroundColor: '#000000' // 指定截图背景为黑色
+      })
+
+      // 截图后恢复
+      if (tempImg) {
+        tempImg.remove()
+      }
+
       const base64Str = canvas.toDataURL('image/png', 1)
-      const i = this.viewportInfos.findIndex(v => v.index === this.activeCanvasIndex)
-      const name = (i > -1 ? this.viewportInfos[i].currentFileName : '') || `screenshot-${Date.now()}`
-      const safeName = String(name).replace(/[\\/:*?"<>|]/g, '_')
-      const downloadName = safeName.toLowerCase().endsWith('.png') ? safeName : `${safeName}.png`
+      const downloadName = `${Date.now()}.png`
+
       const a = document.createElement('a')
       a.href = base64Str
       a.download = downloadName
@@ -1919,6 +2144,14 @@ export default {
       if (i === -1) return
       if (this.curOperation.type === 'Modified') {
         let annotation = this.curOperation.annotation
+        const savedAnnotationId = annotation.id || annotation.annotationId
+        if (!savedAnnotationId && annotation.metadata.toolName !== 'Lengthscale') {
+          this.curOperation = {
+            type: '',
+            annotation: null
+          }
+          return
+        }
         if (annotation.metadata.toolName === 'Lengthscale') {
           this.$emit('getEcrf', { type: "verifyFileIsBound", VisitTaskId: this.taskInfo.VisitTaskId, annotation })
           this.$nextTick(() => {
@@ -1941,6 +2174,9 @@ export default {
             }
           })
         } else {
+          if ((annotation.metadata.toolName === 'ArrowAnnotate' && annotation.data.label === 'Annotation') || annotation.data.label === '') {
+            return
+          }
           this.saveCustomAnnotation(annotation)
         }
       }
@@ -2134,6 +2370,18 @@ export default {
   ul li a:hover {
     background-color: #727272;
   }
+
+  .customize-standards-list {
+    width: max-content;
+    white-space: nowrap;
+
+    li a {
+      display: flex;
+      align-items: center;
+      padding: 8px !important;
+      box-sizing: border-box;
+    }
+  }
 }
 
 .none-dicom-viewer {
@@ -2188,10 +2436,13 @@ export default {
 
     .grid-cell {
       border: 1px dashed #ccc;
-      ;
       display: flex;
       align-items: center;
       justify-content: center;
+      overflow: hidden;
+      min-width: 0;
+      min-height: 0;
+      z-index: 1;
     }
 
     .cell_active {
@@ -2294,6 +2545,21 @@ export default {
         background: #9e9e9e;
         cursor: move
       }
+
+      .content-main {
+        position: relative;
+        overflow: hidden;
+        background: #1e1e1e;
+      }
+
+      video {
+        display: block;
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+        object-position: center center;
+        background: transparent;
+      }
     }
   }
 
@@ -2321,11 +2587,13 @@ export default {
     }
   }
 }
+
 .personal_config {
   ::v-deep .el-tabs__content {
     height: 450px;
     overflow-y: auto;
   }
+
   ::v-deep .hot-keys-label {
     color: #dfdfdf !important;
   }
@@ -2335,3 +2603,183 @@ export default {
   }
 }
 </style>
+<style lang="scss">
+.key-series-popper {
+  padding: 8px !important;
+  background-color: #1e1e1e !important;
+  border: 1px solid #4a4a4a !important;
+
+  .key-series-list {
+    width: 340px;
+    max-height: 420px;
+    overflow-y: auto;
+    margin: 0;
+    padding: 0;
+    list-style: none;
+
+    &::-webkit-scrollbar {
+      width: 8px;
+    }
+
+    &::-webkit-scrollbar-thumb {
+      background: #4a4a4a;
+      border-radius: 4px;
+    }
+
+    &::-webkit-scrollbar-track {
+      background: transparent;
+    }
+  }
+
+  .key-series-header {
+    padding: 5px 12px;
+    margin-bottom: 10px;
+    background: linear-gradient(180deg, rgba(64, 64, 64, 0.92) 0%, rgba(43, 43, 43, 0.98) 100%);
+    border: 1px solid #474747;
+    border-radius: 6px;
+    box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.04), 0 6px 18px rgba(0, 0, 0, 0.2);
+  }
+
+  .key-series-header-top {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+
+  .key-series-header-title {
+    display: flex;
+    align-items: center;
+    min-width: 0;
+  }
+
+  .key-series-header-dot {
+    width: 8px;
+    height: 8px;
+    margin-right: 8px;
+    border-radius: 50%;
+    background: linear-gradient(180deg, #ffd76a 0%, #f39c12 100%);
+    box-shadow: 0 0 8px rgba(243, 156, 18, 0.45);
+  }
+
+  .key-series-task-name {
+    color: #fff;
+    font-size: 15px;
+    font-weight: 600;
+    line-height: 22px;
+    word-break: break-all;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  }
+
+  .key-series-empty {
+    text-align: center;
+    color: #999;
+    padding: 10px;
+  }
+
+  .key-series-item {
+    text-align: left;
+    display: flex;
+    align-items: center;
+    padding: 10px;
+    cursor: pointer;
+    background: linear-gradient(180deg, rgba(46, 46, 46, 0.96) 0%, rgba(40, 40, 40, 0.98) 100%);
+    border-radius: 6px;
+    margin-bottom: 8px;
+    border: 1px solid #353535;
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.12);
+    // transition: all 0.2s ease;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+
+    &:hover {
+      background: linear-gradient(180deg, rgba(54, 54, 54, 0.98) 0%, rgba(46, 46, 46, 1) 100%);
+      border-color: #5a5a5a;
+      // transform: translateY(-1px);
+      box-shadow: 0 6px 16px rgba(0, 0, 0, 0.18);
+    }
+
+    .key-series-img {
+      width: 60px;
+      height: 60px;
+      flex-shrink: 0;
+      background-color: #000;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      overflow: hidden;
+      margin-right: 12px;
+      border-radius: 4px;
+      border: 1px solid #3a3a3a;
+
+      img {
+        width: 100%;
+        height: 100%;
+        object-fit: contain;
+      }
+
+      .default-icon {
+        font-size: 24px;
+        color: #666;
+      }
+    }
+
+    .key-series-info {
+      flex: 1;
+      overflow: hidden;
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      justify-content: flex-start;
+      padding-right: 5px;
+
+      .key-series-meta {
+        width: 100%;
+        overflow: hidden;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        margin-bottom: 4px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+
+      .key-series-label {
+        font-size: 13px;
+        color: #aaa;
+        margin-right: 4px;
+        white-space: nowrap;
+      }
+
+      .key-series-uid {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-size: 13px;
+        color: #ddd;
+        line-height: 1.2;
+      }
+    }
+
+    .key-series-star {
+      margin-left: 10px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 28px;
+      height: 28px;
+      border-radius: 50%;
+      background: rgba(243, 156, 18, 0.08);
+      border: 1px solid rgba(243, 156, 18, 0.16);
+
+      .svg-icon {
+        color: #f39c12;
+        font-size: 16px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
index 3d92dc22..1bd430f4 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/ReadPage.vue
@@ -36,8 +36,10 @@
         @toggleImage="toggleImage"
       /> -->
       <file-viewer ref="fileViewer" :related-study-info="relatedStudyInfo" :ps-arr="psArr" :ecrf="ecrf"
-        @toggleTaskByViewer="toggleTaskByViewer" @toggleTask="toggleTask" @toggleImage="toggleImage"
-        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" @getMarkedFileIds="getMarkedFileIds" />
+        @toggleTaskByViewer="toggleTaskByViewer" @toggleTask="toggleTask"
+        @toggleImage="toggleImage"
+        @previewCD="previewCD" @setPS="setPS" @getEcrf="getEcrf" @getMarkedFileIds="getMarkedFileIds"
+        @selectFile="selectFile" />
     </div>
     <!-- 表单 -->
     <div class="right-panel">
@@ -169,6 +171,21 @@ export default {
     document.addEventListener("click", this.foo);
   },
   methods: {
+    setDefaultRelatedStudyInfo(visitTaskInfo) {
+      if (!visitTaskInfo) return
+      const studyList = visitTaskInfo.StudyList || []
+      if (studyList.length === 0) return
+      const firstStudy = studyList[0]
+      const fileList = firstStudy.NoneDicomStudyFileList || []
+      if (fileList.length === 0) return
+      this.relatedStudyInfo = {
+        fileInfo: fileList[0],
+        visitTaskInfo,
+        fileList,
+        fileIndex: 0,
+        studyId: firstStudy.Id
+      }
+    },
     handleReadingChart(row) {
       let { e, data } = row
       let obj = Object.assign({}, data)
@@ -234,6 +251,7 @@ export default {
         return i
       })
       this.$set(this.visitTaskList[taskIdx], 'Annotations', annotations)
+      this.$refs[visitTaskId][0].initCurrentMaredFiles(annotations)
       this.$refs.fileViewer.resetAnnotations({ annotations, visitTaskId })
     },
     setReadingTaskState(state) {
@@ -269,6 +287,9 @@ export default {
         const idx = res.Result.findIndex(i => i.IsCurrentTask)
         if (idx > -1) {
           await this.setActiveTaskVisitId(res.Result[idx].VisitTaskId)
+          if (this.taskInfo.IsReadingTaskViewInOrder === 0) {
+            this.setDefaultRelatedStudyInfo(this.visitTaskList[idx])
+          }
           this.$nextTick(() => {
             this.$refs[res.Result[idx].VisitTaskId][0].setInitActiveFile()
           })
@@ -279,23 +300,15 @@ export default {
           if (i > -1) {
             await this.getReadingImageFile(res.Result[i].VisitTaskId, i)
             await this.getAnnotations(res.Result[i].VisitTaskId, i)
-            const studyList = this.visitTaskList[i].StudyList
-            if (studyList.length > 0) {
-              const fileInfo = studyList[0].NoneDicomStudyFileList[0]
-              this.relatedStudyInfo = { fileInfo, visitTaskInfo: this.visitTaskList[i], fileList: studyList[0].NoneDicomStudyFileList, fileIndex: 0, studyId: studyList[0].Id }
-              if (!this.selectArr.includes(res.Result[i].VisitTaskId)) {
-                this.selectArr.push(res.Result[i].VisitTaskId)
-              }
+            this.setDefaultRelatedStudyInfo(this.visitTaskList[i])
+            if (!this.selectArr.includes(res.Result[i].VisitTaskId)) {
+              this.selectArr.push(res.Result[i].VisitTaskId)
             }
           }
         }
         if (this.taskInfo.IsReadingTaskViewInOrder === 2) {
           // 受试者内随机
-          const studyList = this.visitTaskList[idx].StudyList
-          if (studyList.length > 0) {
-            const fileInfo = studyList[0].NoneDicomStudyFileList[0]
-            this.relatedStudyInfo = { fileInfo, visitTaskInfo: this.visitTaskList[idx], fileList: studyList[0].NoneDicomStudyFileList, fileIndex: 0, studyId: studyList[0].Id }
-          }
+          this.setDefaultRelatedStudyInfo(this.visitTaskList[idx])
         }
         if (this.readingTaskState < 2) {
           this.$refs[res.Result[idx].VisitTaskId][0].initCurrentMaredFiles()
@@ -412,8 +425,29 @@ export default {
       this.clinicalDataVisible = true
     },
     selectFile(obj) {
-      // this.$refs['imageViewer'].setActiveCanvasImages(obj)
-      this.$refs['fileViewer'].setActiveCanvasImages(obj)
+      if (obj.fileInfo && obj.fileList && obj.visitTaskInfo && obj.studyId) {
+        this.$refs['fileViewer'].setActiveCanvasImages(obj)
+        return
+      }
+
+      const taskIndex = this.visitTaskList.findIndex(item => item.VisitTaskId === obj.visitTaskId)
+      if (taskIndex === -1) return
+
+      const visitTaskInfo = this.visitTaskList[taskIndex]
+      const studyList = visitTaskInfo.StudyList || []
+      const studyIndex = studyList.findIndex(study => study.Id === obj.studyId)
+      if (studyIndex === -1) return
+
+      const fileList = studyList[studyIndex].NoneDicomStudyFileList || []
+      const fileIndex = fileList.findIndex(file => file.Path === obj.path)
+      if (fileIndex === -1) return
+      this.setActiveTaskVisitId(obj.visitTaskId)
+      this.$refs['fileViewer'].setActiveCanvasImages({
+        fileInfo: fileList[fileIndex],
+        fileList,
+        visitTaskInfo,
+        studyId: obj.studyId
+      })
     }
   }
 }
diff --git a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
index 9cda8fc5..f6525a95 100644
--- a/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/visit-review/components/StudyList.vue
@@ -4,7 +4,10 @@
       <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" :title="taskInfo.SubjectCode">
         {{ taskInfo.SubjectCode }}
       </div>
-      <div v-if="taskInfo && taskInfo.IsReadingShowSubjectInfo" :title="visitTaskInfo.TaskBlindName">
+      <div :title="visitTaskInfo.TaskBlindName">
+        <span v-if="taskInfo && !taskInfo.IsReadingShowSubjectInfo">
+          {{ $t('trials:reading:title:taskName') }}
+        </span>
         {{ visitTaskInfo.TaskBlindName }}
       </div>
     </div>
@@ -15,12 +18,13 @@
             <div v-if="!study.IsCriticalSequence" class="dicom-desc">
               <!-- <div v-if="taskInfo && taskInfo.IsShowStudyName">{{ study.StudyName }}</div> -->
               <div style="text-overflow: ellipsis;overflow: hidden;">
-                <span :title="study.CodeView">{{ study.CodeView }}</span>
+                <span v-if="taskInfo && taskInfo.IsReadingTaskViewInOrder !== 0" :title="study.CodeView">{{
+                  study.CodeView }}</span>
                 <span v-if="taskInfo && taskInfo.IsShowStudyName" :title="study.StudyName" style="margin-left: 5px;">{{
                   study.StudyName }}</span>
               </div>
               <div style="text-overflow: ellipsis;overflow: hidden;">
-                <span :title="study.BodyPart">{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
+                <span :title="study.DisplayBodyPart">{{ study.DisplayBodyPart }}</span>
                 <span style="margin-left: 5px;" :title="study.Modality">{{ study.Modality }}</span>
               </div>
             </div>
@@ -91,31 +95,65 @@ export default {
   },
   async mounted() {
     this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
-    this.studyList = this.visitTaskInfo.StudyList
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
+    this.studyList = this.decorateStudyList(this.visitTaskInfo.StudyList || [])
+    this.initCurrentMaredFiles(this.visitTaskInfo.Annotations)
     if (this.studyList.length === 0) return
     this.$nextTick(() => {
       this.activeStudy(this.studyList[0].Id)
     })
-    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
   },
   watch: {
     activeFileIndex() {
-      this.scrollElementToTop(this.$refs[`noneDicomRef_${this.activeFileIndex}`][0], {
-        offset: 50
-      })
+      if (this.$refs[`noneDicomRef_${this.activeFileIndex}`]) {
+        this.scrollElementToTop(this.$refs[`noneDicomRef_${this.activeFileIndex}`][0], {
+          offset: 50
+        })
+      }
     },
+    'visitTaskInfo.Annotations': {
+      handler(annotations) {
+        this.initCurrentMaredFiles(annotations)
+      },
+      deep: true
+    }
   },
   methods: {
+    buildCurrentMarkedFiles(annotations = []) {
+      return annotations.reduce((result, item) => {
+        const fileId = item?.NoneDicomFileId
+        if (!fileId) return result
+        if (!Object.hasOwn(result, fileId)) {
+          result[fileId] = { count: 1 }
+        } else {
+          result[fileId].count++
+        }
+        return result
+      }, {})
+    },
+    decorateStudyList(studyList = []) {
+      return studyList.map(study => ({
+        ...study,
+        DisplayBodyPart: this.getBodyPart(study.BodyPart, study.BodyPartForEditOther)
+      }))
+    },
     scrollElementToTop(element, options = {}) {
-      const absoluteTop = element.offsetTop;
-      const targetPosition = absoluteTop - (options.offset || 0);
-      this.$refs['studyBox_ps'].scrollTo({
+      const container = this.$refs['studyBox_ps']
+      if (!container || !element) return
+      const elementTop = element.offsetTop
+      const elementBottom = elementTop + element.offsetHeight
+      const visibleTop = container.scrollTop
+      const visibleBottom = visibleTop + container.clientHeight
+      if (elementTop >= visibleTop && elementBottom <= visibleBottom) return
+      const targetPosition = Math.max(elementTop - (options.offset || 0), 0)
+      container.scrollTo({
         top: targetPosition,
         behavior: options.behavior || 'smooth'
-      });
+      })
     },
     getBodyPart(bodyPart, other) {
       if (!bodyPart && !other) return ''
+      if (!bodyPart) return other || ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -136,6 +174,9 @@ export default {
     },
     // 设置初始化激活文件
     setInitActiveFile() {
+      if (this.studyList.length === 0) {
+        this.studyList = this.decorateStudyList(this.visitTaskInfo.StudyList || [])
+      }
       if (this.studyList.length === 0) return
       this.$nextTick(() => {
         this.activeStudy(this.studyList[0].Id)
@@ -144,11 +185,11 @@ export default {
     },
     // 切换文件
     selectFile(study, studyIndex, fileIndex, item) {
-      if (item.FileType.includes('mp4')) return this.$preview({
-        path: item.Path || item.FilePath,
-        type: 'mp4',
-        title: item.FileName,
-      })
+      // if (item.FileType.includes('mp4')) return this.$preview({
+      //   path: item.Path || item.FilePath,
+      //   type: 'mp4',
+      //   title: item.FileName,
+      // }) 
       this.activeStudyIndex = studyIndex
       this.activeFileIndex = fileIndex
       const fileList = study.NoneDicomStudyFileList
@@ -166,8 +207,9 @@ export default {
       this.activeFileIndex = fIndex
     },
     activeStudy(id) {
-      if (this.activeNames.indexOf(id) > -1) return
-      this.activeNames.push(id)
+      const studyId = `${id}`
+      if (this.activeNames.indexOf(studyId) > -1) return
+      this.activeNames.push(studyId)
     },
     handleChange(v) {
       console.log(v)
@@ -181,6 +223,9 @@ export default {
       if (type === 'remove') {
         if (Object.hasOwn(this.currentMarkedFiles, fileId)) {
           this.currentMarkedFiles[fileId].count--
+          if (this.currentMarkedFiles[fileId].count <= 0) {
+            this.$delete(this.currentMarkedFiles, fileId)
+          }
         }
       } else if (type === 'add') {
         if (!Object.hasOwn(this.currentMarkedFiles, fileId)) {
@@ -191,14 +236,8 @@ export default {
 
       }
     },
-    initCurrentMaredFiles() {
-      this.visitTaskInfo.Annotations.map(i => {
-        if (!Object.hasOwn(this.currentMarkedFiles, i.NoneDicomFileId)) {
-          this.$set(this.currentMarkedFiles, i.NoneDicomFileId, { count: 1 })
-        } else {
-          this.currentMarkedFiles[i.NoneDicomFileId].count++
-        }
-      })
+    initCurrentMaredFiles(annotations = this.visitTaskInfo.Annotations || []) {
+      this.currentMarkedFiles = this.buildCurrentMarkedFiles(annotations)
     },
   }
 }
@@ -220,7 +259,13 @@ export default {
     margin: 0;
     text-align: center;
     background-color: #4c4c4c;
-    height: 50px;
+    min-height: 50px;
+    height: auto;
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    word-break: break-word;
   }
 
   .dicom-desc {
diff --git a/src/views/trials/trials-panel/setting/attachment/index.vue b/src/views/trials/trials-panel/setting/attachment/index.vue
index 3c2c3a2c..ba1e3a6b 100644
--- a/src/views/trials/trials-panel/setting/attachment/index.vue
+++ b/src/views/trials/trials-panel/setting/attachment/index.vue
@@ -66,7 +66,7 @@
         sortable="custom" min-width="160" />
       <!--附件-->
       <el-table-column prop="AttachmentCount" :label="$t('trials:attachment:table:AttachmentCount')"
-        show-overflow-tooltip sortable="custom" min-width="150px">
+        show-overflow-tooltip sortable="custom" min-width="130">
         <template slot-scope="scope">
           <el-button type="text" @click.stop="openAttachment(scope.row, true)">
             {{ scope.row.AttachmentCount }}
@@ -76,7 +76,7 @@
       </el-table-column>
       <!-- 查看最短时间(分钟) -->
       <el-table-column prop="SignViewMinimumMinutes" :label="$t('trials:attachment:table:min')" show-overflow-tooltip
-        sortable="custom" min-width="150" />
+        sortable="custom" min-width="160" />
       <!-- 已有成员(分钟) -->
       <el-table-column prop="CurrentStaffTrainDays" :label="$t('trials:attachment:table:CurrentStaffTrainDays')"
         show-overflow-tooltip sortable="custom" min-width="150" />
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
index f6d50402..2139acbb 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRules.vue
@@ -1,18 +1,60 @@
+<!-- eslint-disable -->
 <!-- eslint-disable vue/no-unused-vars -->
 <!-- eslint-disable vue/no-template-shadow -->
 /* eslint-disable */
 <template>
-  <el-form v-loading="loading">
+  <el-form v-loading="loading" :label-width="'100px'">
     <!-- 仲裁对象 -->
-    <el-form-item :label="$t('trials:adRules:title:arbitrationRule')" :label-width="'180px'">
-      <el-radio-group v-model="JudgyInfo.ArbitrationRule" :disabled="OtherInfo.IsSign">
+    <el-form-item :label="$t('trials:adRules:title:arbitrationRule')">
+      <el-radio-group v-model="JudgyInfo.ArbitrationRule" :disabled="isSign">
         <el-radio v-for="item of $d.ArbitrationRule" :key="item.id"
           :disabled="!JudgyInfo.IsReadingTaskViewInOrder || true" :label="item.value" @change="changeArbitrationRule">
           {{ item.label }}
         </el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-collapse v-model="activeNames" style="border-top:none;">
+    <!-- 仲裁模式JudgeModeEnum 整体结果择一判定；指标组合判定-->
+    <el-form-item :label="$t('trials:adRules:title:judgeMode')">
+      <el-radio-group v-model="JudgyInfo.JudgeModeEnum" :disabled="isSign">
+        <el-radio
+          v-for="item of $d.JudgeMode"
+          :key="item.id"
+          :disabled="JudgyInfo.ArbitrationRule !== 1"
+          :label="item.value"
+        >
+          {{ item.label }}
+        </el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <!-- 裁判规则JudgeRuleEnum 访视一致规则；访视差异规则-->
+    <el-form-item :label="$t('trials:adRules:title:judgeRule')">
+      <el-radio-group v-model="JudgyInfo.JudgeRuleEnum" :disabled="isSign">
+        <el-radio
+          v-for="item of $d.JudgeRule"
+          :key="item.id"
+          :label="item.value"
+        >
+          {{ item.label }}
+        </el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item>
+      <el-button
+        v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
+        type="primary"
+        size="small"
+        @click="saveJugeRule"
+        v-show="!isSign">
+        {{ $t('common:button:save') }}
+      </el-button>
+    </el-form-item>
+    <ArbitrationRulesByVisit 
+      v-if="judgeRuleEnum === 1" 
+      ref="visitRules"
+      :trial-reading-criterion-id="trialReadingCriterionId"
+      :isSign="isSign"
+    />
+    <el-collapse v-else-if="judgeRuleEnum === 0" v-model="activeNames" style="border-top:none;">
       <el-collapse-item v-for="(item, index) of QuestionList" :key="item.ReadingQuestionTrialId"
         style="position: relative;padding:0 10px;" :name="item.ReadingQuestionTrialId">
         <div slot="title">
@@ -21,24 +63,28 @@
         <div style="position: relative">
           <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
             style="position: absolute; right: 0; top: 0; z-index: 10" size="mini" type="primary"
-            :disabled="OtherInfo.IsSign" @click="apply(item.ReadingQuestionTrialId, index)">{{ $t('common:button:save')
+            :disabled="isSign" @click="apply(item.ReadingQuestionTrialId, index)">{{ $t('common:button:save')
             }}</el-button>
           <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
             style="position: absolute; right: 60px; top: 0; z-index: 10" size="mini" type="primary"
-            :disabled="OtherInfo.IsSign" @click="reset(item.ReadingQuestionTrialId, index)">{{ $t('common:button:reset')
+            :disabled="isSign" @click="reset(item.ReadingQuestionTrialId, index)">{{ $t('common:button:reset')
             }}</el-button>
           <!-- 产生裁判阅片的条件 -->
           <el-form-item :label-width="'280px'" :label="$t('trials:adRules:title:judgeTypeEnum')" style="width: 95%">
             <el-radio-group v-model="QuestionList[index].JudgeType" @input="(val) => JudgeTypeChange(val, index)">
               <template v-for="item of $d.JudgeTypeEnum">
-                <el-radio style="margin-bottom: 5px" :key="item.id" :disabled="OtherInfo.IsSign ||
-                  !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])
-                  " :label="item.value" v-if="
-                    item.value < 4 ||
-                    (item.value > 3 &&
-                      (QuestionList[index].Type === 'number' ||
-                        QuestionList[index].Type === 'calculation'))
-                  ">
+                <el-radio 
+                  style="margin-bottom: 5px" 
+                  :key="item.id" 
+                  :disabled="isSign ||  !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])" 
+                  :label="item.value"
+                  v-if="
+                    (['number', 'calculation'].includes(QuestionList[index].Type)
+                      ? [1, 4, 5]
+                      : [1, 2, 3]
+                    ).includes(item.value)
+                  "
+                >
                   {{ item.label }}
                 </el-radio>
               </template>
@@ -48,7 +94,7 @@
         <div v-if="QuestionList[index].JudgeType === 3" style="text-align: right; margin: 10px 0">
           <!-- 添加规则 -->
           <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']" size="mini" type="primary"
-            :disabled="OtherInfo.IsSign" @click="addGroup(index, null)">{{ $t('trials:adRules:button:addRule')
+            :disabled="isSign" @click="addGroup(index, null)">{{ $t('trials:adRules:button:addRule')
             }}</el-button>
         </div>
         <el-table v-if="QuestionList[index].JudgeType === 3" v-loading="loading"
@@ -87,10 +133,10 @@
             <template slot-scope="scope">
               <!-- 编辑 -->
               <el-button icon="el-icon-edit" circle :title="$t('common:button:edit')" size="mini"
-                :disabled="OtherInfo.IsSign" @click="addGroup(index, scope.$index)" />
+                :disabled="isSign" @click="addGroup(index, scope.$index)" />
               <!-- 删除 -->
               <el-button icon="el-icon-delete" circle :title="$t('common:button:delete')" size="mini"
-                :disabled="OtherInfo.IsSign" @click="tagClose(index, scope.$index)" />
+                :disabled="isSign" @click="tagClose(index, scope.$index)" />
             </template>
           </el-table-column>
         </el-table>
@@ -103,12 +149,12 @@
             ">
             <el-checkbox-group v-if="QuestionList[index].QuestionGenre === 3" v-model="QuestionList[index].grouping">
               <template v-for="item of $d[QuestionList[index].DictionaryCode]">
-                <el-checkbox v-if="item.value !== -1" :key="item.id" :disabled="OtherInfo.IsSign" :label="item.value">{{
+                <el-checkbox v-if="item.value !== -1" :key="item.id" :disabled="isSign" :label="item.value">{{
                   item.label }}</el-checkbox>
               </template>
             </el-checkbox-group>
             <el-checkbox-group v-else v-model="QuestionList[index].grouping">
-              <el-checkbox v-for="item of item.TypeValue.split('|')" :key="item" :disabled="OtherInfo.IsSign"
+              <el-checkbox v-for="item of item.TypeValue.split('|')" :key="item" :disabled="isSign"
                 :label="item">{{
                 item }}</el-checkbox>
             </el-checkbox-group>
@@ -135,7 +181,7 @@
                     .toString()
                     .replaceAll(',', '|')
                 }}</el-tag>
-              <el-button size="mini" type="primary" :disabled="OtherInfo.IsSign" @click="addGroup2(index)">
+              <el-button size="mini" type="primary" :disabled="isSign" @click="addGroup2(index)">
                 <!-- 添加分组 -->
                 {{ $t('trials:adRules:title:addGroup') }}
               </el-button>
@@ -181,7 +227,7 @@
             )
               " prop="JudgeDifferenceType">
               <el-select v-model="QuestionList[index].JudgeDifferenceType" placeholder="请选择"
-                :disabled="OtherInfo.IsSign">
+                :disabled="isSign">
                 <el-option v-for="item of $d.JudgeDifferenceType" :key="item.id" :label="item.label"
                   :value="item.value">
                 </el-option>
@@ -193,7 +239,7 @@
               " prop="JudgeDifferenceValue">
               <div style="display: flex">
                 <el-input v-model="QuestionList[index].JudgeDifferenceValue" clearable
-                  :disabled="OtherInfo.IsSign"></el-input>
+                  :disabled="isSign"></el-input>
                 <span style="margin-left: 10px" v-if="QuestionList[index].JudgeType !== 5 && QuestionList[index].Unit !== 0">
                   {{ `${QuestionList[index].Unit === 4 ? QuestionList[index].CustomUnit : $fd('ValueUnit', QuestionList[index].Unit)}`}}
                 </span>
@@ -203,8 +249,6 @@
         </div>
       </el-collapse-item>
     </el-collapse>
-    <!--      </el-tab-pane>-->
-    <!--    </el-tabs>-->
     <!-- 选择答案 -->
     <el-dialog v-if="QuestionVisible" :title="$t('trials:adRules:title:selectAnswer')" :visible.sync="QuestionVisible"
       width="800px" :close-on-click-modal="false" custom-class="base-dialog-wrapper" append-to-body>
@@ -212,40 +256,50 @@
         <!-- 阅片人A -->
         <el-form-item label-width="110px" :label="$t('trials:adRules:title:answerGroupA')">
           <el-checkbox-group v-model="QuestionList[selectIndex].groupingA">
-            <template v-for="item of QuestionList[selectIndex].TypeValue.split('|')">
-              <el-checkbox v-if="QuestionList[selectIndex].QuestionGenre !== 3" :key="item" :label="item" :disabled="QuestionList[selectIndex].groupingB.length
-                  ? ~QuestionList[selectIndex].groupingB.indexOf(item)
-                  : false
-                ">{{ item }}</el-checkbox>
+            <template v-for="item of QuestionList[selectIndex].TypeValue.split('|') || []">
+              <el-checkbox 
+                v-if="QuestionList[selectIndex].QuestionGenre !== 3" 
+                :key="item" 
+                :label="item" 
+                :disabled="QuestionList[selectIndex]?.groupingB?.includes(item) ?? false"
+              >
+              {{ item }}
+            </el-checkbox>
             </template>
             <template v-for="item of $d[QuestionList[selectIndex].DictionaryCode]">
-              <el-checkbox v-if="
-                QuestionList[selectIndex].QuestionGenre === 3 &&
-                item.value !== -1
-              " :key="item.id" :label="item.value" :disabled="QuestionList[selectIndex].groupingB.length
-                    ? ~QuestionList[selectIndex].groupingB.indexOf(item.value)
-                    : false
-                  ">{{ item.label }}</el-checkbox>
+              <el-checkbox 
+                v-if="QuestionList[selectIndex].QuestionGenre === 3 && item.value !== -1" 
+                :key="item.id" 
+                :label="item.value" 
+                :disabled="QuestionList[selectIndex]?.groupingB?.includes(item.value) ?? false"
+                >
+                {{ item.label }}
+              </el-checkbox>
             </template>
           </el-checkbox-group>
         </el-form-item>
         <!-- 阅片人B -->
         <el-form-item label-width="110px" :label="$t('trials:adRules:title:answerGroupB')">
           <el-checkbox-group v-model="QuestionList[selectIndex].groupingB">
-            <template v-for="item of QuestionList[selectIndex].TypeValue.split('|')">
-              <el-checkbox v-if="QuestionList[selectIndex].QuestionGenre !== 3" :key="item" :label="item" :disabled="QuestionList[selectIndex].groupingA.length
-                  ? ~QuestionList[selectIndex].groupingA.indexOf(item)
-                  : false
-                ">{{ item }}</el-checkbox>
+            <template v-for="item of QuestionList[selectIndex].TypeValue.split('|') || []">
+              <el-checkbox 
+                v-if="QuestionList[selectIndex].QuestionGenre !== 3" 
+                :key="item" 
+                :label="item" 
+                :disabled="QuestionList[selectIndex]?.groupingA?.includes(item) ?? false"
+                >
+                {{ item }}
+              </el-checkbox>
             </template>
             <template v-for="item of $d[QuestionList[selectIndex].DictionaryCode]">
-              <el-checkbox v-if="
-                QuestionList[selectIndex].QuestionGenre === 3 &&
-                item.value !== -1
-              " :key="item.id" :label="item.value" :disabled="QuestionList[selectIndex].groupingA.length
-                    ? ~QuestionList[selectIndex].groupingA.indexOf(item.value)
-                    : false
-                  ">{{ item.label }}</el-checkbox>
+              <el-checkbox 
+                v-if="QuestionList[selectIndex].QuestionGenre === 3 && item.value !== -1" 
+                :key="item.id" 
+                :label="item.value" 
+                :disabled="QuestionList[selectIndex]?.groupingA?.includes(item.value) ?? false"
+                >
+                {{ item.label }}
+              </el-checkbox>
             </template>
           </el-checkbox-group>
         </el-form-item>
@@ -255,8 +309,8 @@
         <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']" :disabled="btnLoading" size="small"
           type="primary" @click="
             QuestionVisible = false
-          $set(QuestionList[selectIndex], 'groupingA', [])
-          $set(QuestionList[selectIndex], 'groupingB', [])
+            $set(QuestionList[selectIndex], 'groupingA', [])
+            $set(QuestionList[selectIndex], 'groupingB', [])
             ">
           {{ $t('common:button:cancel') }}
         </el-button>
@@ -269,13 +323,17 @@
   </el-form>
 </template>
 <script>
+/* eslint-disable */
 import {
-  getTrialConfirmCriterionList,
   getTrialCriterionJudgeQuestionList,
   setTrialCriterionJudgeQuestionAnswerGroup,
 } from '@/api/trials/reading'
-import { setTrialJudgyInfo, getTrialJudgyInfo } from '@/api/trials/setting'
+import { setTrialJudgyInfo, getTrialJudgyInfo, setTrialJudgeRuleInfo } from '@/api/trials/setting'
+import ArbitrationRulesByVisit from './ArbitrationRulesByVisit'
 export default {
+  components: {
+    ArbitrationRulesByVisit,
+  },
   props: {
     trialReadingCriterionId: {
       type: String,
@@ -294,9 +352,7 @@ export default {
       activeNames: null,
       indexA: null,
       type: null,
-      OtherInfo: {
-        IsSign: true,
-      },
+      isSign: true,
       JudgyInfo: {},
       JudgeDifferenceValueQRules: {
         JudgeDifferenceType: [
@@ -339,47 +395,38 @@ export default {
           },
         ],
       },
+      judgeRuleEnum: -1,
+      savedJudgyInfo: {
+        JudgeModeEnum: null,
+        JudgeRuleEnum: null,
+      },
     }
   },
   watch: {
-    TrialReadingCriterionId(v) {
+    async trialReadingCriterionId(v) {
       if (v === null) return
-      this.loading = true
-      getTrialCriterionJudgeQuestionList({
-        TrialId: this.$route.query.trialId,
-        // ReadingQuestionCriterionTrialId: v,
-        TrialReadingCriterionId: this.trialReadingCriterionId,
-      })
-        .then((res) => {
-          this.loading = false
-          this.QuestionList = res.Result
-          this.OtherInfo = res.OtherInfo
-          this.activeNames = this.QuestionList.map(
-            (v) => v.ReadingQuestionTrialId
-          )
-          this.QuestionList.forEach((v) => {
-            this.$set(v, 'grouping', [])
-            this.$set(v, 'groupingA', [])
-            this.$set(v, 'groupingB', [])
-            this.$set(
-              v,
-              'AnswerGroupList',
-              Object.assign([], v.AnswerCombination)
-            )
-            this.$set(v, 'AnswerGroup2List', Object.assign([], v.AnswerGroup))
-          })
-        })
-        .catch(() => {
-          this.btnLoading = false
-          this.loading = false
-        })
+      await this.initData()
     },
   },
-  mounted() {
-    this.getList()
-    this.getTrialJudgyInfo()
+  async mounted() {
+    await this.initData()
   },
   methods: {
+    resetJudgeTypeRelatedFields(question = {}) {
+      this.$set(question, 'AnswerGroup2List', [])
+      this.$set(question, 'AnswerGroupList', [])
+      this.$set(question, 'grouping', [])
+      this.$set(question, 'groupingA', [])
+      this.$set(question, 'groupingB', [])
+      this.$set(question, 'JudgeDifferenceValue', 0)
+      this.$set(question, 'JudgeDifferenceType', 0)
+    },
+    async initData() {
+      await this.getTrialJudgyInfo()
+      if (this.judgeRuleEnum !== 1) {
+        await this.getList(false)
+      }
+    },
     // 修改仲裁规则
     changeArbitrationRule(value) {
       if (value !== 1) {
@@ -387,12 +434,16 @@ export default {
           item.JudgeDifferenceValue = 0
           item.JudgeDifferenceType = 0
         })
+        if (this.$refs.visitRules) {
+          this.$refs.visitRules.changeArbitrationRule(value)
+        }
       }
     },
     JudgeTypeChange(value, index) {
+      this.resetJudgeTypeRelatedFields(this.QuestionList[index])
       this.$nextTick(() => {
         if (value === 4 || value === 5) {
-          if (this.$refs['JudgeDifferenceValue' + value + index][0]) {
+          if (this.$refs['JudgeDifferenceValue' + value + index] && this.$refs['JudgeDifferenceValue' + value + index][0]) {
             this.$refs['JudgeDifferenceValue' + value + index][0].resetFields()
             // this.QuestionList[index].JudgeDifferenceValue = 0;
           }
@@ -400,25 +451,26 @@ export default {
       })
     },
     saveAllSync() {
-      return new Promise((resolve, reject) => {
+      if (this.judgeRuleEnum === 1 && this.$refs.visitRules) {
+        return Promise.resolve(true)
+        // return this.$refs.visitRules.saveAllSync()
+      }
+      return new Promise((resolve) => {
         var arr = []
         this.QuestionList.forEach((v, i) => {
           arr.push(this.applySync(v.ReadingQuestionTrialId, i))
         })
         Promise.all(arr)
-          .then((res) => {
-            console.log(res)
+          .then(() => {
             resolve(true)
           })
-          .catch((res) => {
-            console.log('进入catch')
+          .catch(() => {
             resolve(false)
           })
       })
     },
     applySync(ReadingQuestionTrialId, index) {
       return new Promise(async (resolve, reject) => {
-        console.log(this.QuestionList[index].JudgeType)
         if (this.QuestionList[index].JudgeType === 0) {
           reject(false)
           return
@@ -442,7 +494,7 @@ export default {
           this.QuestionList[index].JudgeType === 5
         ) {
           try {
-            let validate = await this.$refs[
+            const validate = await this.$refs[
               'JudgeDifferenceValue' +
               this.QuestionList[index].JudgeType +
               index
@@ -493,19 +545,55 @@ export default {
           this.loading = false
         })
     },
-    getTrialJudgyInfo() {
-      this.loading = true
-      getTrialJudgyInfo({
-        TrialId: this.$route.query.trialId,
-        TrialReadingCriterionId: this.trialReadingCriterionId,
-      })
-        .then((res) => {
-          this.JudgyInfo = res.Result
-          this.loading = false
-        })
-        .catch((v) => {
-          this.loading = false
+    async getTrialJudgyInfo() {
+      try {
+        this.loading = true
+        const res = await getTrialJudgyInfo({
+          TrialId: this.$route.query.trialId,
+          TrialReadingCriterionId: this.trialReadingCriterionId,
         })
+        this.JudgyInfo = res.Result
+        this.judgeRuleEnum = this.JudgyInfo.JudgeRuleEnum
+        this.isSign = res.Result.IsSigned
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.loading = false
+      }
+    },
+    async saveJugeRule(showMessage = true) {
+      try {
+        this.loading = true
+        const prevJudgeRuleEnum = this.judgeRuleEnum
+        const params = {
+          trialReadingCriterionId: this.trialReadingCriterionId,
+          judgeModeEnum: this.JudgyInfo.JudgeModeEnum,
+          judgeRuleEnum: this.JudgyInfo.JudgeRuleEnum,
+        }
+        const res = await setTrialJudgeRuleInfo(params)
+        if (res.IsSuccess) {
+          if (showMessage) {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          }
+          this.judgeRuleEnum = this.JudgyInfo.JudgeRuleEnum
+          if (prevJudgeRuleEnum !== this.judgeRuleEnum) {
+            if (this.judgeRuleEnum === 1) {
+              await this.$nextTick()
+              if (this.$refs.visitRules) {
+                await this.$refs.visitRules.initData()
+              }
+            } else {
+              await this.getList(false)
+            }
+          }
+        }
+        return true
+      } catch (e) {
+        console.log(e)
+        return false
+      } finally {
+        this.loading = false
+      }
     },
     tagClose2(index, indexA) {
       // '删除该规则组？'
@@ -593,7 +681,7 @@ export default {
           AnswerCombination: [],
           JudgeType: 0,
           JudgeDifferenceValue: 0,
-          JudgeDifferenceType: 0,
+          JudgeDifferenceType: 0
         })
           .then((res) => {
             this.$set(this.QuestionList[index], 'AnswerGroup2List', [])
@@ -635,7 +723,7 @@ export default {
         this.QuestionList[index].JudgeType === 5
       ) {
         try {
-          let validate = await this.$refs[
+          const validate = await this.$refs[
             'JudgeDifferenceValue' + this.QuestionList[index].JudgeType + index
           ][0].validate()
           if (!validate) return
@@ -655,7 +743,7 @@ export default {
         ),
         JudgeDifferenceType: Number(
           this.QuestionList[index].JudgeDifferenceType
-        ),
+        )
       })
         .then((res) => {
           this.$message.success(this.$t('trials:adRules:message:msg9')) // '应用成功'
@@ -671,18 +759,23 @@ export default {
       this.ReadingQuestionCriterionTrialId =
         this.CriterionList[this.index].ReadingQuestionCriterionTrialId
     },
-    getList() {
+    async getList(needGetTrialJudgyInfo = true) {
       this.loading = true
-      getTrialCriterionJudgeQuestionList({
+      if (needGetTrialJudgyInfo) {
+        await this.getTrialJudgyInfo()
+      }
+      if (this.judgeRuleEnum === 1 && this.$refs.visitRules) {
+        return this.$refs.visitRules.getList()
+      }
+      return getTrialCriterionJudgeQuestionList({
         TrialId: this.$route.query.trialId,
         TrialReadingCriterionId: this.trialReadingCriterionId,
       })
         .then((res) => {
           this.loading = false
           this.QuestionList = res.Result
-          this.OtherInfo = res.OtherInfo
           this.activeNames = this.QuestionList.map(
-            (v) => v.ReadingQuestionTrialId
+            (item) => item.ReadingQuestionTrialId
           )
           this.QuestionList.forEach((v) => {
             this.$set(v, 'grouping', [])
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRulesByVisit.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRulesByVisit.vue
new file mode 100644
index 00000000..5f8653f3
--- /dev/null
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ArbitrationRulesByVisit.vue
@@ -0,0 +1,955 @@
+<template>
+  <div v-loading="loading">
+    <el-tabs v-model="activeVisitTab" class="visit-tabs" type="border-card">
+      <el-tab-pane v-for="visit in visitPlanOptions" :key="visit.Id"
+        :label="visit.VisitName" :name="visit.Id">
+        <div v-show="!isSign" class="visit-tabs-actions">
+          <!-- 批量保存 -->
+          <el-button
+            v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
+            :disabled="btnLoading || questionListMap[visit.Id] && questionListMap[visit.Id].length === 0"
+            :loading="btnLoading"
+            size="small"
+            type="primary"
+            @click="handleBatchSave(visit.Id, visit.VisitNum)"
+          >
+            {{ $t('common:button:batchSave') }}
+          </el-button>
+          <!-- 复制 -->
+          <el-button
+            v-show="visitPlanOptions.length > 1"
+            v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
+            :disabled="btnLoading || questionListMap[visit.Id] && questionListMap[visit.Id].length === 0"
+            :loading="btnLoading"
+            size="small"
+            type="primary"
+            @click="handleCopy(visit.VisitNum)"
+          >
+            {{ $t('common:button:copy') }}
+          </el-button>
+          <!-- 应用到随访 -->
+          <el-button
+            v-show="visitPlanOptions.length > 1 && visit.VisitNum === 0"
+            v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
+            :disabled="btnLoading || questionListMap[visit.Id] && questionListMap[visit.Id].length === 0"
+            :loading="btnLoading"
+            size="small"
+            type="primary"
+            @click="applyToFollowup"
+          >
+            {{ $t('trials:adRules:button:applyToFollowup') }}
+          </el-button>
+        </div>
+        <el-collapse v-if="questionListMap[visit.Id]" v-model="visitActiveNamesMap[visit.Id]" style="border-top:none;">
+          <el-collapse-item v-for="(item, index) of questionListMap[visit.Id]"
+            :key="item.ReadingQuestionTrialId"
+            style="position: relative;padding:0 10px;" :name="item.ReadingQuestionTrialId">
+            <div slot="title">
+              {{ item.PageName }}Q{{ index + 1 }}：{{ item.QuestionName }}
+            </div>
+            <div style="position: relative">
+              <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
+                style="position: absolute; right: 0; top: 0; z-index: 10" size="mini" type="primary"
+                :disabled="isSign"
+                @click="visitApply(item.ReadingQuestionTrialId, index, visit.Id, visit.VisitNum)">{{ $t('common:button:save')
+                }}</el-button>
+              <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
+                style="position: absolute; right: 60px; top: 0; z-index: 10" size="mini" type="primary"
+                :disabled="isSign"
+                @click="visitReset(item.ReadingQuestionTrialId, index, visit.Id, visit.VisitNum)">{{ $t('common:button:reset')
+                }}</el-button>
+              <el-form-item :label-width="'280px'" :label="$t('trials:adRules:title:judgeTypeEnum')" style="width: 95%">
+                <el-radio-group
+                  v-model="questionListMap[visit.Id][index].JudgeType"
+                  @input="(val) => visitJudgeTypeChange(val, index, visit.Id)"
+                >
+                  <template v-for="judgeTypeItem of $d.JudgeTypeEnum">
+                    <el-radio 
+                      style="margin-bottom: 5px" 
+                      :key="judgeTypeItem.id" 
+                      :disabled="isSign || !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])" 
+                      :label="judgeTypeItem.value" 
+                      v-if="
+                        (['number', 'calculation'].includes(questionListMap[visit.Id][index].Type)
+                          ? [1, 4, 5, 6]
+                          : [1, 2, 3, 6]
+                        ).includes(judgeTypeItem.value)
+                      "
+                    >
+                      {{ judgeTypeItem.label }}
+                    </el-radio>
+                  </template>
+                </el-radio-group>
+              </el-form-item>
+            </div>
+            <div v-if="questionListMap[visit.Id][index].JudgeType === 3" style="text-align: right; margin: 10px 0">
+              <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']" size="mini" type="primary"
+                :disabled="isSign"
+                @click="visitAddGroup(index, null, visit.Id)">{{ $t('trials:adRules:button:addRule')
+                }}</el-button>
+            </div>
+            <el-table v-if="questionListMap[visit.Id][index].JudgeType === 3" v-loading="loading"
+              :data="questionListMap[visit.Id][index].AnswerGroupList" border stripe>
+              <el-table-column prop="AnswerGroupA" :label="$t('trials:adRules:title:order')" width="160">
+                <template slot-scope="scope">
+                  {{ scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="AnswerGroupA" :label="$t('trials:adRules:title:answerGroupA')" min-width="100">
+                <template slot-scope="scope">
+                  {{
+                    questionListMap[visit.Id][index].QuestionGenre === 3
+                      ? scope.row.AnswerGroupA.map((v) =>
+                        $fd(questionListMap[visit.Id][index].DictionaryCode, parseInt(v))
+                      ).toString()
+                      : scope.row.AnswerGroupA.toString()
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="AnswerGroupB" :label="$t('trials:adRules:title:answerGroupB')" min-width="100">
+                <template slot-scope="scope">
+                  {{
+                    questionListMap[visit.Id][index].QuestionGenre === 3
+                      ? scope.row.AnswerGroupB.map((v) =>
+                        $fd(questionListMap[visit.Id][index].DictionaryCode, parseInt(v))
+                      ).toString()
+                      : scope.row.AnswerGroupB.toString()
+                  }}
+                </template>
+              </el-table-column>
+              <el-table-column prop="AnswerGroupB" :label="$t('common:action:action')" min-width="80">
+                <template slot-scope="scope">
+                  <el-button icon="el-icon-edit" circle :title="$t('common:button:edit')" size="mini"
+                    :disabled="isSign"
+                    @click="visitAddGroup(index, scope.$index, visit.Id)" />
+                  <el-button icon="el-icon-delete" circle :title="$t('common:button:delete')" size="mini"
+                    :disabled="isSign"
+                    @click="visitTagClose(index, scope.$index, visit.Id)" />
+                </template>
+              </el-table-column>
+            </el-table>
+            <div v-if="questionListMap[visit.Id][index].JudgeType === 2">
+              <div style="
+                  background: #f6f6f6;
+                  border-radius: 20px;
+                  padding: 15px 20px;
+                  margin-top: 10px;
+                ">
+                <el-checkbox-group v-if="questionListMap[visit.Id][index].QuestionGenre === 3"
+                  v-model="questionListMap[visit.Id][index].grouping"
+                >
+                  <template v-for="dictItem of $d[questionListMap[visit.Id][index].DictionaryCode]">
+                    <el-checkbox v-if="dictItem.value !== -1" :key="dictItem.id" :disabled="isSign"
+                      :label="dictItem.value">{{ dictItem.label }}</el-checkbox>
+                  </template>
+                </el-checkbox-group>
+                <el-checkbox-group v-else v-model="questionListMap[visit.Id][index].grouping">
+                  <el-checkbox v-for="answerItem of item.TypeValue.split('|')" :key="answerItem"
+                    :disabled="isSign" :label="answerItem">{{ answerItem }}</el-checkbox>
+                </el-checkbox-group>
+                <div style="margin-top: 20px">
+                  {{ $t('trials:adRules:title:selectAnswerGroup') }}
+                  <el-tag v-if="
+                    questionListMap[visit.Id][index].grouping.length > 0 &&
+                    questionListMap[visit.Id][index].QuestionGenre !== 3
+                  ">{{
+                    questionListMap[visit.Id][index].grouping.toString().replaceAll(',', '|')
+                    }}</el-tag>
+                  <el-tag v-if="
+                    questionListMap[visit.Id][index].grouping.length > 0 &&
+                    questionListMap[visit.Id][index].QuestionGenre === 3
+                  ">{{
+                    questionListMap[visit.Id][index].grouping
+                        .map(
+                          (v) =>
+                            $d[questionListMap[visit.Id][index].DictionaryCode].find(
+                              (v1) => v1.value === v
+                            ).label
+                        )
+                        .toString()
+                        .replaceAll(',', '|')
+                    }}</el-tag>
+                  <el-button size="mini" type="primary" :disabled="isSign"
+                    @click="visitAddGroup2(index, visit.Id)">
+                    {{ $t('trials:adRules:title:addGroup') }}</el-button>
+                </div>
+              </div>
+              <div v-if="questionListMap[visit.Id][index].QuestionGenre !== 3" style="margin-top: 20px">
+                {{ $t('trials:adRules:title:group') }}
+                <el-tag v-for="(itemA, indexA) of questionListMap[visit.Id][index].AnswerGroup2List"
+                  :key="visit.Id+indexA" closable
+                  style="margin-right: 10px" @close="() => visitTagClose2(index, indexA, visit.Id)">{{ itemA }}</el-tag>
+              </div>
+              <div v-if="questionListMap[visit.Id][index].QuestionGenre === 3" style="margin-top: 20px">
+                {{ $t('trials:adRules:title:group') }}
+                <el-tag v-for="(itemA, indexA) of questionListMap[visit.Id][index].AnswerGroup2List"
+                  :key="visit.Id+indexA" closable
+                  style="margin-right: 10px" @close="() => visitTagClose2(index, indexA, visit.Id)">
+                  {{
+                    itemA
+                      .split('|')
+                      .map((v) =>
+                        $fd(questionListMap[visit.Id][index].DictionaryCode, parseInt(v))
+                      )
+                      .join('|')
+                  }}
+                </el-tag>
+              </div>
+            </div>
+            <div v-if="
+              questionListMap[visit.Id][index].JudgeType === 4 ||
+              questionListMap[visit.Id][index].JudgeType === 5
+            ">
+              <el-form :inline="true" :model="questionListMap[visit.Id][index]" class="demo-form-inline"
+                :ref="`JudgeDifferenceValue${questionListMap[visit.Id][index].JudgeType}_${visit.Id}_${index}`"
+                :rules="JudgeDifferenceValueQRules">
+                <el-form-item :label="$t(
+                  `trials:trials-panel:setting:reading-unit:JudgeDifferenceType`
+                )
+                  " prop="JudgeDifferenceType">
+                  <el-select
+                    v-model="questionListMap[visit.Id][index].JudgeDifferenceType"
+                    :disabled="isSign">
+                    <el-option v-for="judgeDiffItem of $d.JudgeDifferenceType" :key="judgeDiffItem.id"
+                      :label="judgeDiffItem.label" :value="judgeDiffItem.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item :label="$t(
+                  `trials:trials-panel:setting:reading-unit:JudgeDifferenceValue${questionListMap[visit.Id][index].JudgeType}`
+                )
+                  " prop="JudgeDifferenceValue">
+                  <div style="display: flex">
+                    <el-input v-model="questionListMap[visit.Id][index].JudgeDifferenceValue" clearable
+                      :disabled="isSign"></el-input>
+                    <span style="margin-left: 10px"
+                      v-if="questionListMap[visit.Id][index].JudgeType !== 5 && questionListMap[visit.Id][index].Unit !== 0">
+                      {{ `${questionListMap[visit.Id][index].Unit === 4 ? questionListMap[visit.Id][index].CustomUnit : $fd('ValueUnit', questionListMap[visit.Id][index].Unit)}` }}
+                    </span>
+                  </div>
+                </el-form-item>
+              </el-form>
+            </div>
+          </el-collapse-item>
+        </el-collapse>
+      </el-tab-pane>
+    </el-tabs>
+    <el-dialog v-if="questionVisible" :title="$t('trials:adRules:title:selectAnswer')" :visible.sync="questionVisible"
+      width="800px" :close-on-click-modal="false" custom-class="base-dialog-wrapper" append-to-body>
+      <div class="base-dialog-body">
+        <el-form-item label-width="110px" :label="$t('trials:adRules:title:answerGroupA')">
+          <el-checkbox-group v-model="questionList[selectIndex].groupingA">
+            <template v-for="item of questionList[selectIndex].TypeValue.split('|') || []">
+              <el-checkbox 
+                v-if="questionList[selectIndex].QuestionGenre !== 3" 
+                :key="item" 
+                :label="item" 
+                :disabled="questionList[selectIndex]?.groupingB?.includes(item) ?? false"
+              >
+              {{ item }}
+            </el-checkbox>
+            </template>
+            <template v-for="item of $d[questionList[selectIndex].DictionaryCode]">
+              <el-checkbox 
+                v-if="questionList[selectIndex].QuestionGenre === 3 &&  item.value !== -1" 
+                :key="item.id" 
+                :label="item.value" 
+                :disabled="questionList[selectIndex]?.groupingB?.includes(item.value) ?? false"
+                >{{ item.label }}</el-checkbox>
+            </template>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label-width="110px" :label="$t('trials:adRules:title:answerGroupB')">
+          <el-checkbox-group v-model="questionList[selectIndex].groupingB">
+            <template v-for="item of questionList[selectIndex].TypeValue.split('|') || []">
+              <el-checkbox 
+                v-if="questionList[selectIndex].QuestionGenre !== 3" 
+                :key="item" 
+                :label="item" 
+                :disabled="questionList[selectIndex]?.groupingA?.includes(item) ?? false"
+                >
+                {{ item }}
+              </el-checkbox>
+            </template>
+            <template v-for="item of $d[questionList[selectIndex].DictionaryCode]">
+              <el-checkbox 
+                v-if="questionList[selectIndex].QuestionGenre === 3 && item.value !== -1" 
+                :key="item.id" 
+                :label="item.value" 
+                :disabled="questionList[selectIndex]?.groupingA?.includes(item.value) ?? false"
+                >
+                {{ item.label }}
+              </el-checkbox>
+            </template>
+          </el-checkbox-group>
+        </el-form-item>
+      </div>
+      <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+        <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']" :disabled="btnLoading" size="small"
+          type="primary" @click="
+            questionVisible = false
+            $set(questionList[selectIndex], 'groupingA', [])
+            $set(questionList[selectIndex], 'groupingB', [])
+            ">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']" :disabled="btnLoading" size="small"
+          type="primary" @click="save">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-if="copyVisible"
+      :title="$t('common:button:copy')"
+      :visible.sync="copyVisible"
+      width="500px"
+      :close-on-click-modal="false"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
+      <div class="base-dialog-body">
+        <el-form label-width="100px">
+          <el-form-item :label="$t('trials:trials-panel:setting:reading-unit:targetVisitNum')">
+            <el-select v-model="copySourceVisitNum" style="width: 100%" filterable>
+              <el-option
+                v-for="visit in copySourceVisitOptions"
+                :key="visit.Id"
+                :label="visit.VisitName"
+                :value="visit.VisitNum"
+              />
+            </el-select>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+        <el-button
+          v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
+          :disabled="btnLoading"
+          size="small"
+          @click="closeCopyDialog"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button
+          v-hasPermi="['trials:trials-panel:setting:reading-unit:edit']"
+          :disabled="btnLoading"
+          :loading="btnLoading"
+          size="small"
+          type="primary"
+          @click="confirmCopy"
+        >
+          {{ $t('common:button:confirm') }}
+        </el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+/* eslint-disable */
+import {
+  getTrialQuestionVisitJudgeRule,
+  setTrialQuestionVisitJudgeRule,
+  copyTrialQuestionVisitJudgeRule,
+  applyBaseLineTrialQuestionVisitJudgeRule
+} from '@/api/trials/reading'
+import { getTrialVisitStageSelect } from '@/api/trials'
+
+export default {
+  props: {
+    trialReadingCriterionId: {
+      type: String,
+      default: '',
+    },
+    isSign: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data() {
+    return {
+      btnLoading: false,
+      loading: false,
+      activeVisitTab: '',
+      visitActiveNamesMap: {},
+      questionListMap: {},
+      visitPlanOptions: [],
+      questionVisible: false,
+      copyVisible: false,
+      copyTargetVisitNum: null,
+      copySourceVisitNum: null,
+      selectIndex: 0,
+      indexA: null,
+      selectVisitKey: '',
+      type: null,
+      OtherInfo: {
+        IsSign: true,
+      },
+      JudgeDifferenceValueQRules: {
+        JudgeDifferenceType: [
+          {
+            required: true,
+            message: this.$t(
+              'trials:trials-list:setitng:JudgeDifferenceTypeRequired'
+            ),
+            trigger: 'blur',
+          },
+        ],
+        JudgeDifferenceValue: [
+          {
+            required: true,
+            message: this.$t(
+              'trials:trials-list:setitng:JudgeDifferenceValueRequired'
+            ),
+            trigger: 'blur',
+          },
+          {
+            pattern: /^[0-9]+(.[0-9]{2})?$/,
+            message: this.$t('trials:trials-list:setitng:JudgeDifferenceValue'),
+            trigger: 'blur',
+          },
+          {
+            validator: (rule, value, callback) => {
+              if (value <= 0) {
+                callback(
+                  new Error(
+                    this.$t(
+                      'trials:trials-list:setitng:JudgeDifferenceValueMin'
+                    )
+                  )
+                )
+              } else {
+                callback()
+              }
+            },
+            trigger: 'blur',
+          },
+        ],
+      },
+    }
+  },
+  computed: {
+    questionList() {
+      return this.questionListMap[this.selectVisitKey]
+    },
+    copySourceVisitOptions() {
+      return this.visitPlanOptions.filter((visit) => visit.VisitNum !== this.copyTargetVisitNum)
+    }
+  },
+  watch: {
+    async activeVisitTab(v) {
+      if (!v) return
+      if (this.questionListMap[v]) {
+        return
+      }
+      await this.getList(v)
+    },
+  },
+  async mounted() {
+    await this.initData()
+  },
+  methods: {
+    async initData() {
+      this.questionListMap = {}
+      this.visitActiveNamesMap = {}
+      this.activeVisitTab = ''
+      await this.getVisitPlanOptions()
+    },
+    resetVisitJudgeTypeRelatedFields(question = {}) {
+      this.$set(question, 'AnswerGroup2List', [])
+      this.$set(question, 'AnswerGroupList', [])
+      this.$set(question, 'grouping', [])
+      this.$set(question, 'groupingA', [])
+      this.$set(question, 'groupingB', [])
+      this.$set(question, 'JudgeDifferenceValue', null)
+      this.$set(question, 'JudgeDifferenceType', 0)
+    },
+    normalizeQuestionList(questionList = []) {
+      return questionList.map((item) => ({
+        ...item,
+        grouping: [],
+        groupingA: [],
+        groupingB: [],
+        AnswerGroupList: Array.isArray(item.AnswerCombination)
+          ? item.AnswerCombination.map((group) => ({
+            ...group,
+            AnswerGroupA: Array.isArray(group.AnswerGroupA)
+              ? [...group.AnswerGroupA]
+              : group.AnswerGroupA,
+            AnswerGroupB: Array.isArray(group.AnswerGroupB)
+              ? [...group.AnswerGroupB]
+              : group.AnswerGroupB
+          }))
+          : [],
+        AnswerGroup2List: Array.isArray(item.AnswerGroup)
+          ? [...item.AnswerGroup]
+          : []
+      }))
+    },
+    closeCopyDialog() {
+      this.copyVisible = false
+      this.copyTargetVisitNum = null
+      this.copySourceVisitNum = null
+    },
+    async getVisitPlanOptions() {
+      try {
+        const trialId = this.$route.query.trialId
+        const res = await getTrialVisitStageSelect(trialId)
+        if (res.IsSuccess) {
+          this.visitPlanOptions = res.Result || []
+          if (!this.activeVisitTab && this.visitPlanOptions.length > 0) {
+            this.activeVisitTab = this.visitPlanOptions[0].Id
+          }
+          const outOfPlan = {
+            "Id": "00000000-0000-0000-0000-000000000000",
+            "VisitNum": -1,
+            "VisitName": "Out of Plan",
+            "IsBaseLine": false
+          }
+          const isExists = this.visitPlanOptions.some(x => x.Id === outOfPlan.Id);
+          if (!isExists) {
+            this.visitPlanOptions.push(outOfPlan);
+          }
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    getVisitById(visitKey) {
+      return this.visitPlanOptions.find((visit) => visit.Id === visitKey)
+    },
+    async getList(visitKey = this.activeVisitTab) {
+      const visit = this.getVisitById(visitKey)
+      if (!visit) return
+      try {
+        this.loading = true
+        let params = {
+          trialId: this.$route.query.trialId,
+          trialReadingCriterionId: this.trialReadingCriterionId,
+          visitNum: visit.VisitNum
+        }
+        const res = await getTrialQuestionVisitJudgeRule(params)
+        const questionList = this.normalizeQuestionList(res.Result)
+        this.$set(this.questionListMap, visitKey, questionList)
+        this.$set(
+          this.visitActiveNamesMap,
+          visitKey,
+          questionList.map((item) => item.ReadingQuestionTrialId)
+        )
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.loading = false
+      }
+    },
+    changeArbitrationRule(value) {
+      if (value !== 1) {
+        Object.values(this.questionListMap).forEach((questionList) => {
+          questionList.forEach((item) => {
+            item.JudgeDifferenceValue = 0
+            item.JudgeDifferenceType = 0
+          })
+        })
+      }
+    },
+    visitJudgeTypeChange(value, index, visitKey) {
+      this.resetVisitJudgeTypeRelatedFields(this.questionListMap[visitKey][index])
+      this.$nextTick(() => {
+        if (value === 4 || value === 5) {
+          const refName = `JudgeDifferenceValue${value}_${visitKey}_${index}`
+          if (this.$refs[refName] && this.$refs[refName][0]) {
+            this.$refs[refName][0].resetFields()
+          }
+        }
+      })
+    },
+    // async saveAllSync(showMessage = false) {
+    //   try {
+    //     this.btnLoading = true
+    //     this.loading = true
+    //     for (let i = 0; i < this.visitPlanOptions.length; i++) {
+    //       const visit = this.visitPlanOptions[i]
+    //       if (!this.questionListMap[visit.Id]) {
+    //         await this.getList(visit.Id)
+    //       }
+    //       const questionList = this.questionListMap[visit.Id] || []
+    //       if (questionList.length === 0) {
+    //         continue
+    //       }
+    //       for (let index = 0; index < questionList.length; index++) {
+    //         if (questionList[index].JudgeType === 0) {
+    //           this.activeVisitTab = visit.Id
+    //           this.$alert(this.$t('trials:adRules:message:msg8'))
+    //           return false
+    //         }
+    //         if (
+    //           questionList[index].JudgeType === 2 &&
+    //           questionList[index].AnswerGroup2List.length === 0
+    //         ) {
+    //           this.activeVisitTab = visit.Id
+    //           this.$alert(this.$t('trials:adRules:message:msg8'))
+    //           return false
+    //         }
+    //         if (
+    //           questionList[index].JudgeType === 3 &&
+    //           questionList[index].AnswerGroupList.length === 0
+    //         ) {
+    //           this.activeVisitTab = visit.Id
+    //           this.$alert(this.$t('trials:adRules:message:msg8'))
+    //           return false
+    //         }
+    //         if (
+    //           questionList[index].JudgeType === 4 ||
+    //           questionList[index].JudgeType === 5
+    //         ) {
+    //           this.activeVisitTab = visit.Id
+    //           await this.$nextTick()
+    //           const refName = `JudgeDifferenceValue${questionList[index].JudgeType}_${visit.Id}_${index}`
+    //           try {
+    //             const validate = await this.$refs[refName][0].validate()
+    //             if (!validate) return false
+    //           } catch (err) {
+    //             return false
+    //           }
+    //         }
+    //       }
+    //       let params = {
+    //         TrialReadingCriterionId: this.trialReadingCriterionId,
+    //         VisitNum: visit.VisitNum,
+    //         QuestionList: questionList.map((item) => {
+    //           return {
+    //             ReadingQuestionTrialId: item.ReadingQuestionTrialId,
+    //             AnswerGroup: item.AnswerGroup2List,
+    //             AnswerCombination: item.AnswerGroupList,
+    //             JudgeType: item.JudgeType,
+    //             JudgeDifferenceValue: item.JudgeDifferenceValue,
+    //             JudgeDifferenceType: item.JudgeDifferenceType
+    //           }
+    //         })
+    //       }
+    //       let res = await setTrialQuestionVisitJudgeRule(params)
+    //       if (!res.IsSuccess) {
+    //         return false
+    //       }
+    //     }
+    //     if (showMessage) {
+    //       this.$message.success(this.$t('common:message:savedSuccessfully'))
+    //     }
+    //     return true
+    //   } catch (e) {
+    //     console.log(e)
+    //     return false
+    //   } finally {
+    //     this.btnLoading = false
+    //     this.loading = false
+    //   }
+    // },
+    async handleBatchSave(visitKey, visitNum) {
+      if (!visitKey) return
+      const questionList = this.questionListMap[visitKey] || []
+      if (questionList.length === 0) return
+      try {
+        this.btnLoading = true
+        this.loading = true
+        for (let index = 0; index < questionList.length; index++) {
+          if (questionList[index].JudgeType === 0) {
+            this.$alert(this.$t('trials:adRules:message:msg8'))
+            return
+          }
+          if (
+            questionList[index].JudgeType === 2 &&
+            questionList[index].AnswerGroup2List.length === 0
+          ) {
+            this.$alert(this.$t('trials:adRules:message:msg8'))
+            return
+          }
+          if (
+            questionList[index].JudgeType === 3 &&
+            questionList[index].AnswerGroupList.length === 0
+          ) {
+            this.$alert(this.$t('trials:adRules:message:msg8'))
+            return
+          }
+          if (
+            questionList[index].JudgeType === 4 ||
+            questionList[index].JudgeType === 5
+          ) {
+            await this.$nextTick()
+            const refName = `JudgeDifferenceValue${questionList[index].JudgeType}_${visitKey}_${index}`
+            try {
+              const validate = await this.$refs[refName][0].validate()
+              if (!validate) return
+            } catch (err) {
+              return
+            }
+          }
+        }
+        let params = {
+          TrialReadingCriterionId: this.trialReadingCriterionId,
+          VisitNum: visitNum,
+          QuestionList: questionList.map((item) => {
+            return {
+              ReadingQuestionTrialId: item.ReadingQuestionTrialId,
+              AnswerGroup: item.AnswerGroup2List,
+              AnswerCombination: item.AnswerGroupList,
+              JudgeType: item.JudgeType,
+              JudgeDifferenceValue: item.JudgeDifferenceValue,
+              JudgeDifferenceType: item.JudgeDifferenceType
+            }
+          })
+        }
+        let res = await setTrialQuestionVisitJudgeRule(params)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.btnLoading = false
+        this.loading = false
+      }
+    },
+    save() {
+      const questionList = this.questionList
+      let index = this.selectIndex
+      let indexA = this.indexA
+      if (questionList[index].groupingA.length === 0) {
+        this.$alert(this.$t('trials:adRules:message:msg2'))
+        return
+      }
+      if (questionList[index].groupingB.length === 0) {
+        this.$alert(this.$t('trials:adRules:message:msg3'))
+        return
+      }
+      if (this.type === 'add') {
+        questionList[index].AnswerGroupList.push({
+          AnswerGroupA: questionList[index].groupingA,
+          AnswerGroupB: questionList[index].groupingB
+        })
+      } else {
+        this.$set(
+          questionList[index].AnswerGroupList[indexA],
+          'AnswerGroupA',
+          questionList[index].groupingA
+        )
+        this.$set(
+          questionList[index].AnswerGroupList[indexA],
+          'AnswerGroupB',
+          questionList[index].groupingB
+        )
+      }
+      this.$set(questionList[index], 'groupingA', [])
+      this.$set(questionList[index], 'groupingB', [])
+      this.$message.success(this.$t('trials:adRules:message:msg4'))
+      this.questionVisible = false
+    },
+    handleCopy(visitNum) {
+      this.copyTargetVisitNum = visitNum
+      this.copyVisible = true
+    },
+    async confirmCopy() {
+      if (!this.copySourceVisitNum) {
+        this.$alert(this.$t('trials:setting:reading-unit:msg1'))
+        return
+      }
+      try {
+        this.btnLoading = true
+        this.loading = true
+        const params = {
+          trialReadingCriterionId: this.trialReadingCriterionId,
+          sourceVisitNum: this.copySourceVisitNum,
+          targetVisitNum: this.copyTargetVisitNum
+        }
+        const res = await copyTrialQuestionVisitJudgeRule(params)
+        if (res.IsSuccess) {
+          await this.getList(this.activeVisitTab)
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.closeCopyDialog()
+        }
+      } catch (e) {
+        console.log(e)
+      } finally {
+        this.btnLoading = false
+        this.loading = false
+      }
+    },
+    async applyToFollowup() {
+      try {
+        await this.$confirm(
+          this.$t('trials:adRules:message:msg10'),
+          {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+          }
+        )
+        this.btnLoading = true
+        this.loading = true
+        const res = await applyBaseLineTrialQuestionVisitJudgeRule({
+          trialReadingCriterionId: this.trialReadingCriterionId
+        })
+        if (res.IsSuccess) {
+          this.questionListMap = {}
+          this.visitActiveNamesMap = {}
+          if (this.activeVisitTab) {
+            await this.getList(this.activeVisitTab)
+          }
+          this.$message.success(this.$t('trials:adRules:message:msg9'))
+        }
+      } catch (e) {
+        if (e === 'cancel') return
+        console.log(e)
+      } finally {
+        this.btnLoading = false
+        this.loading = false
+      }
+    },
+    visitTagClose2(index, indexA, visitKey) {
+      this.$confirm(this.$t('trials:adRules:message:msg1')).then(() => {
+        this.questionListMap[visitKey][index].AnswerGroup2List.splice(indexA, 1)
+      })
+    },
+    visitTagClose(index, indexA, visitKey) {
+      this.$confirm(this.$t('trials:adRules:message:msg1')).then(() => {
+        this.questionListMap[visitKey][index].AnswerGroupList.splice(indexA, 1)
+      })
+    },
+    visitAddGroup2(index, visitKey) {
+      const questionList = this.questionListMap[visitKey]
+      if (questionList[index].grouping.length === 0) {
+        this.$alert(this.$t('trials:adRules:message:msg5'))
+        return
+      }
+      let grouping = questionList[index].grouping
+        .toString()
+        .replaceAll(',', '|')
+      questionList[index].AnswerGroup2List.push(`|${grouping}|`)
+      this.$set(questionList[index], 'grouping', [])
+    },
+    visitAddGroup(index, indexA, visitKey) {
+      const questionList = this.questionListMap[visitKey]
+      this.selectIndex = index
+      this.selectVisitKey = visitKey
+      this.type = 'add'
+      if (indexA !== null) {
+        this.indexA = indexA
+        this.type = 'edit'
+        this.$set(
+          questionList[index],
+          'groupingA',
+          questionList[index].AnswerGroupList[indexA].AnswerGroupA
+        )
+        this.$set(
+          questionList[index],
+          'groupingB',
+          questionList[index].AnswerGroupList[indexA].AnswerGroupB
+        )
+      }
+      this.questionVisible = true
+    },
+    async visitReset(ReadingQuestionTrialId, index, visitKey, visitNum) {
+      const questionList = this.questionListMap[visitKey]
+      this.btnLoading = true
+      this.loading = true
+      try {
+        await this.$confirm(this.$t('trials:adRules:message:msg6'))
+        const params = {
+          TrialReadingCriterionId: this.trialReadingCriterionId,
+          VisitNum: visitNum,
+          QuestionList: [
+            {
+              ReadingQuestionTrialId: ReadingQuestionTrialId,
+              AnswerGroup: [],
+              AnswerCombination: [],
+              JudgeType: 0,
+              JudgeDifferenceValue: 0,
+              JudgeDifferenceType: 0
+            }
+          ]
+        }
+        await setTrialQuestionVisitJudgeRule(params)
+        this.$set(questionList[index], 'AnswerGroup2List', [])
+        this.$set(questionList[index], 'AnswerGroupList', [])
+        this.$set(questionList[index], 'JudgeType', 0)
+        this.$set(questionList[index], 'JudgeDifferenceValue', 0)
+        this.$set(questionList[index], 'JudgeDifferenceType', 0)
+
+        this.$message.success(this.$t('trials:adRules:message:msg7'))
+      } catch(e) {
+        console.log(e)
+      } finally {
+        this.btnLoading = false
+        this.loading = false
+      }
+    },
+    async visitApply(ReadingQuestionTrialId, index, visitKey, visitNum) {
+      try {
+        const questionList = this.questionListMap[visitKey]
+        if (questionList[index].JudgeType === 0) {
+          this.$alert(this.$t('trials:adRules:message:msg8'))
+          return
+        }
+        if (
+          questionList[index].JudgeType === 2 &&
+          questionList[index].AnswerGroup2List.length === 0
+        ) {
+          this.$alert(this.$t('trials:adRules:message:msg8'))
+          return
+        }
+        if (
+          questionList[index].JudgeType === 3 &&
+          questionList[index].AnswerGroupList.length === 0
+        ) {
+          this.$alert(this.$t('trials:adRules:message:msg8'))
+          return
+        }
+        if (
+          questionList[index].JudgeType === 4 ||
+          questionList[index].JudgeType === 5
+        ) {
+          const refName = `JudgeDifferenceValue${questionList[index].JudgeType}_${visitKey}_${index}`
+          const validate = await this.$refs[refName][0].validate()
+          if (!validate) return
+        }
+        this.btnLoading = true
+        this.loading = true
+        let params = {
+          TrialReadingCriterionId: this.trialReadingCriterionId,
+          VisitNum: visitNum,
+          QuestionList: [
+            {
+              ReadingQuestionTrialId: ReadingQuestionTrialId,
+              AnswerGroup: questionList[index].AnswerGroup2List,
+              AnswerCombination: questionList[index].AnswerGroupList,
+              JudgeType: questionList[index].JudgeType,
+              JudgeDifferenceValue: questionList[index].JudgeDifferenceValue,
+              JudgeDifferenceType: questionList[index].JudgeDifferenceType
+            }
+          ]
+        }
+        let res = await setTrialQuestionVisitJudgeRule(params)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('trials:adRules:message:msg9'))
+        }
+      } catch(e) {
+        console.log(e)
+      } finally {
+        this.btnLoading = false
+        this.loading = false
+      }
+    }
+  },
+}
+</script>
+<style scoped>
+.visit-tabs-actions {
+  display: flex;
+  justify-content: flex-end;
+  margin-bottom: 10px;
+  padding: 0 10px;
+}
+
+.visit-tabs ::v-deep .el-tabs__content {
+  min-height: 520px;
+  padding-top: 20px !important;
+}
+</style>
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index a889039f..bda77edd 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -776,7 +776,7 @@ export default {
         MaxQuestionCount: null,
         IsCopyLesions: false,
         MaxAnswerLength: null,
-        AddDeleteTypeEnum: null,
+        AddDeleteTypeEnum: 0,
         FileType: [],
         DictionaryCode: null,
         GroupId: null,
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 39e45a68..1ca6d8ad 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -222,6 +222,9 @@
                 form.IseCRFShowInDicomReading = false
               } else {
                 form.ReadingTaskViewEnum = 2
+                form.IsReadingShowSubjectInfo = false
+                form.IsReadingShowPreviousResults = false
+                form.IseCRFShowInDicomReading = true
               }
               if (CriterionType !== 10 && (v === 0 || v === 2)) {
                 form.IsReadingPeriod = false
@@ -279,7 +282,7 @@
         " prop="IsReadingShowSubjectInfo">
         <el-radio-group v-model="form.IsReadingShowSubjectInfo" :disabled="isConfirm ||
           !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-          !!form.IsReadingTaskViewInOrder
+          form.IsReadingTaskViewInOrder >= 0
           ">
           <el-radio v-for="item of $d.YesOrNo" :key="'IsReadingShowSubjectInfo' + item.value" :label="item.value">
             {{ item.label }}
@@ -293,7 +296,7 @@
         " prop="IsReadingShowPreviousResults">
         <el-radio-group v-model="form.IsReadingShowPreviousResults" :disabled="isConfirm ||
           !hasPermi(['trials:trials-panel:setting:reading-unit:edit']) ||
-          !!form.IsReadingTaskViewInOrder
+          form.IsReadingTaskViewInOrder >= 0
           " @change="
             (v) => {
               if (!v) {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index 53694695..9bf8c85b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -240,7 +240,6 @@ export default {
       if (ReadingTool === 3) {
         this.readingSegmentTools = getCustomizeStandardsSegmentDicomTools(readingSegmentTools)
       }
-      console.log(this.readingSegmentTools, 'this.readingSegmentTools')
     },
     setIsClinicalReading(isClinicalReading) {
       this.isClinicalReading = isClinicalReading;
@@ -300,11 +299,15 @@ export default {
                 this.$refs["arbitrationRules" + this.TrialReadingCriterionId]
                   .length
               ) {
-                var arbitrationRules = await this.$refs[
+                const arbitrationRulesRef = this.$refs[
                   "arbitrationRules" + this.TrialReadingCriterionId
-                ][0].saveAllSync();
+                ][0];
+                var judgeRuleSaved = await arbitrationRulesRef.saveJugeRule(false);
+                var arbitrationRules = judgeRuleSaved
+                  ? await arbitrationRulesRef.saveAllSync()
+                  : false;
                 isCheckList.push({
-                  isCheck: arbitrationRules,
+                  isCheck: judgeRuleSaved && arbitrationRules,
                   msg: this.$t("trials:readingUnit:adRules"), // '仲裁规则'
                 });
               }
@@ -448,9 +451,6 @@ export default {
         this.$refs[
           "arbitrationRules" + this.TrialReadingCriterionId
         ][0].getList();
-        this.$refs[
-          "arbitrationRules" + this.TrialReadingCriterionId
-        ][0].getTrialJudgyInfo();
       }
     },
   },
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index 612c4a71..a18e147e 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -1325,7 +1325,7 @@ export default {
         let obj = {
           Name: item.Name,
           NewVal: item.TrialName,
-          OldVal: old.TrialName,
+          OldVal: old.TrialName, 
         }
         this.confirmData.push(obj)
       })
diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue
index da4ca5bd..3a4cd558 100644
--- a/src/views/trials/trials-panel/study/index.vue
+++ b/src/views/trials/trials-panel/study/index.vue
@@ -172,7 +172,7 @@
             <span v-else style="color: #f44336">N/A</span>
           </template>
         </el-table-column>
-        <el-table-column prop="SubjectCode" :label="$t('trials:studyList:table:subject')" sortable="custom"
+        <el-table-column min-width="120" prop="SubjectCode" :label="$t('trials:studyList:table:subject')" sortable="custom"
           show-overflow-tooltip />
         <el-table-column min-width="90" show-overflow-tooltip>
           <template slot="header">
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 848bcc1f..b2427d76 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -78,7 +78,7 @@
               <el-table-column prop="TrialSiteCode" :label="$t('trials:readingPeriod:table:siteCode')" min-width="110"
                 fixed="left" sortable="custom" show-overflow-tooltip />
               <!-- 受试者编号 -->
-              <el-table-column prop="SubjectCode" :label="$t('trials:readingPeriod:table:subjectCode')" min-width="120"
+              <el-table-column prop="SubjectCode" :label="$t('trials:readingPeriod:table:subjectCode')" min-width="150"
                 fixed="left" sortable="custom" show-overflow-tooltip />
               <!-- 阅片计划 -->
               <el-table-column :label="$t('trials:readingPeriod:table:readingPlan')" align="center" min-width="100">
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
index f3756c28..7c4e76da 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectChart.vue
@@ -13,9 +13,13 @@
             </el-form-item>
         </el-form>
         <el-table :data="tableList" border style="width: 100%">
-            <el-table-column v-for="item in tableKey" :key="item.key" :prop="item.key" :label="item.title">
+            <el-table-column v-for="(item, index) in tableKey" :key="item.key" :prop="item.key" :label="item.title">
                 <template slot-scope="scope">
-                    <span>{{ scope.row[item.key] }}</span>
+                    <span :class="{ IsHighlight: scope.row.IsHighlight.includes(item.key) }">{{ scope.row[item.key]
+                        }}</span>
+                    <el-button icon="el-icon-view" circle v-if="index > 0 && scope.row[item.key]" size="mini"
+                        style="margin-left: 5px;" :title="$t('common:button:view')"
+                        @click="lookReadingResults(scope.row.VisitTaskId[item.key])"></el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -48,6 +52,7 @@ import {
 } from '@/api/trials'
 import * as echarts from 'echarts/core';
 import { LineChart } from 'echarts/charts';
+import { getToken } from '@/utils/auth'
 import {
     TitleComponent,
     TooltipComponent,
@@ -107,13 +112,33 @@ export default {
             tableKey: [],
             tableList: [],
             R1ChartList: [],
-            R2ChartList: []
+            R2ChartList: [],
+            openWindow: null
         }
     },
     mounted() {
         this.getTrialCriterionList()
     },
     methods: {
+        // 查看阅片结果
+        lookReadingResults(id) {
+            if (this.openWindow) {
+                this.openWindow.close()
+            }
+            var token = getToken()
+            var path = null
+            let trialCriterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId)
+            let trialId = this.$route.query.trialId
+            if (trialCriterion.ReadingTool === 0 || trialCriterion.ReadingTool === 2 || trialCriterion.ReadingTool === 3) {
+                path = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.data.Code}&subjectId=${this.data.Id}&visitTaskId=${id}&isReadingTaskViewInOrder=${trialCriterion.IsReadingTaskViewInOrder}&criterionType=${trialCriterion.CriterionType}&readingTool=${trialCriterion.ReadingTool}&TokenKey=${token}`
+            } else {
+                path = `/noneDicomReading?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.data.Code}&subjectId=${this.data.Id}&visitTaskId=${id}&isReadingTaskViewInOrder=${trialCriterion.IsReadingTaskViewInOrder}&criterionType=${trialCriterion.CriterionType}&readingTool=${trialCriterion.ReadingTool}&TokenKey=${token}`
+            }
+            // const routeData = this.$router.resolve({
+            //   path: `/readingPage?subjectId=${row.SubjectId}&trialId=${row.TrialId}&visitTaskId=${row.Id}&TokenKey=${token}`
+            // })
+            this.openWindow = window.open(path, '_blank')
+        },
         handleChange(v) {
             this.getList()
         },
@@ -143,33 +168,51 @@ export default {
                     this.tableKey = [
                         {
                             title: this.$t(`subjectChart:table:label:visit`),
-                            key: 'visit'
+                            key: 'visit',
+                            IsHighlight: []
                         }
                     ]
                     Evaluation[0].forEach(key => {
                         let obj = {
                             title: key.Value,
                             key: key.Value,
+                            IsHighlight: []
                         }
                         this.tableKey.push(obj)
                     })
                     this.tableList = []
                     if (Evaluation[1] && Evaluation[1].length > 0) {
-                        let obj = {}
+                        let obj = {
+                            IsHighlight: [],
+                            VisitTaskId: {}
+                        }
                         this.tableKey.forEach((item, index) => {
                             if (index === 0) {
                                 obj[item.key] = 'R1'
                             } else {
-                                console.log(Evaluation[1][index - 1].DictionaryCode, Evaluation[1][index - 1].Value)
+                                obj.VisitTaskId[item.key] = Evaluation[1][index - 1].VisitTaskId
                                 obj[item.key] = Evaluation[1][index - 1].DictionaryCode ? this.$fd(Evaluation[1][index - 1].DictionaryCode, parseFloat(Evaluation[1][index - 1].Value)) : Evaluation[1][index - 1].Value
+                                if (Evaluation[1][index - 1].IsHighlight) {
+                                    obj.IsHighlight.push(item.key)
+                                }
+
                             }
                         })
                         this.tableList.push(obj)
                     }
                     if (Evaluation[2] && Evaluation[2].length > 0) {
-                        let obj = {}
+                        let obj = {
+                            IsHighlight: [],
+                            VisitTaskId: {}
+                        }
                         this.tableKey.forEach((item, index) => {
                             obj[item.key] = index === 0 ? 'R2' : Evaluation[2][index - 1].DictionaryCode ? this.$fd(Evaluation[2][index - 1].DictionaryCode, parseFloat(Evaluation[2][index - 1].Value)) : Evaluation[2][index - 1].Value
+                            if (index > 0 && Evaluation[2][index - 1].IsHighlight) {
+                                obj.IsHighlight.push(item.key)
+                            }
+                            if (index > 0) {
+                                obj.VisitTaskId[item.key] = Evaluation[2][index - 1].VisitTaskId
+                            }
                         })
                         this.tableList.push(obj)
                     }
@@ -317,6 +360,10 @@ export default {
     margin: auto;
 }
 
+.IsHighlight {
+    color: #00f;
+}
+
 .chartBox {
     display: flex;
 
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
index 81944f94..8ccc7423 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
@@ -3,16 +3,16 @@
     <div class="base-dialog-body">
       <!-- Status -->
       <el-form-item :label="$t('trials:subject:table:status')" prop="Status">
-        <el-radio-group v-model="form.Status" :disabled="originalStatus === 2" @change="handleChange">
+        <el-radio-group v-model="form.Status" @change="handleChange">
           <el-radio v-for="item of $d.Subject_Visit_Status" :label="item.value" :key="item.id">
             {{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- Out Visit Date -->
-      <el-form-item v-if="form.Status == 2" :label="$t('trials:subject:table:outVisitDate')" prop="VisitOverTime">
+      <!-- <el-form-item v-if="form.Status == 2" :label="$t('trials:subject:table:outVisitDate')" prop="VisitOverTime">
         <el-date-picker v-model="form.VisitOverTime" type="date" :picker-options="pickerOption"
           value-format="yyyy-MM-dd" format="yyyy-MM-dd" />
-      </el-form-item>
+      </el-form-item> -->
       <!-- 末次访视 -->
       <el-form-item v-if="form.Status === 2" :label="$t('trials:subject:table:finalSubjectVisit')"
         prop="FinalSubjectVisitId">
@@ -21,14 +21,43 @@
           <el-option v-for="item in subjectVisitOptions" :key="item.Id" :label="item.VisitName" :value="item.Id" />
         </el-select>
       </el-form-item>
+      <!-- 访视中原因-->
+      <el-form-item 
+        v-if="(form.Status < data.Status && form.Status === 1) || (form.BackReason)" 
+        :label="$t('trials:subject:table:outVisitReason')" 
+        prop="BackReason"
+        :rules="[
+          { required: this.form.Status < this.data.Status, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+          { max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur'] }
+        ]"
+        >
+        <el-input v-model="form.BackReason" type="textarea" autosize />
+      </el-form-item>
       <!-- 结束访视的原因 -->
-      <el-form-item v-if="form.Status === 2" :label="$t('trials:subject:table:outVisitReason')" prop="Reason">
+      <el-form-item 
+        v-if="form.Status === 2" 
+        :label="$t('trials:subject:table:outVisitReason')" 
+        prop="Reason"
+        :rules="[
+          { required: this.form.Status < this.data.Status, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+          { max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur'] }
+        ]"
+        >
         <el-input v-model="form.Reason" type="textarea" autosize />
       </el-form-item>
       <!-- 访视中止的原因 -->
-      <el-form-item v-if="form.Status === 3" :label="$t('trials:subject:table:outVisitReason')" prop="SuspendReason">
+      <el-form-item 
+        v-if="form.Status === 3" 
+        :label="$t('trials:subject:table:outVisitReason')" 
+        prop="SuspendReason"
+        :rules="[
+          { required: this.form.Status < this.data.Status, message: this.$t('common:ruleMessage:specify'), trigger: ['blur'] },
+          { max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500`, trigger: ['blur'] }
+        ]"
+      >
         <el-input v-model="form.SuspendReason" type="textarea" autosize />
       </el-form-item>
+
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item style="text-align:right;">
@@ -61,16 +90,16 @@ export default {
         Status: 1,
         OutEnrollmentTime: '',
         Reason: '',
-        VisitOverTime: '',
+        // VisitOverTime: '',
         FinalSubjectVisitId: '',
-        SuspendReason: ''
+        SuspendReason: '',
+        BackReason: ''
       },
       rules: {
         OutEnrollmentTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
         FinalSubjectVisitId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
-        Reason: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }],
-        SuspendReason: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }],
-        VisitOverTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
+        // SuspendReason: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }],
+        // VisitOverTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
       },
       pickerOption: {
         disabledDate: time => {
@@ -91,6 +120,8 @@ export default {
   methods: {
     handleChange() {
       if (this.form.Status !== 3) this.form.SuspendReason = ''
+      if (this.form.Status !== 2) this.form.Reason = ''
+      if (this.form.Status !== 1) this.form.BackReason = ''
     },
     async initForm() {
       this.loading = true
@@ -115,6 +146,10 @@ export default {
 
         this.form.TrialId = this.trialId
         this.form.TrialSiteId = this.data.TrialSiteId
+        if (this.form.Status !== 2) {
+          // this.form.VisitOverTime = ''
+          this.form.FinalSubjectVisitId = ''
+        }
         updateSubjectStatus(this.form).then(res => {
           this.btnLoading = false
           this.$emit('getList')
diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index 5ec8e551..c760fe40 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -57,23 +57,23 @@
         <el-table-column type="index" width="40" />
         <!-- Site -->
         <el-table-column prop="TrialSiteCode" :label="$t('trials:subject:table:site')" sortable="custom"
-          show-overflow-tooltip width="120" />
+          show-overflow-tooltip min-width="120" />
         <!-- Code -->
         <el-table-column prop="Code" :label="$t('trials:subject:table:subjectId')" show-overflow-tooltip
-          sortable="custom" width="130" />
+          sortable="custom" min-width="150" />
         <!-- 第二编号 -->
         <el-table-column v-if="otherInfo.IsSubjectSecondCodeView" prop="MedicalNo"
-          :label="$t('trials:subject:table:medicalNo')" show-overflow-tooltip sortable="custom" width="150" />
+          :label="$t('trials:subject:table:medicalNo')" show-overflow-tooltip sortable="custom" min-width="150" />
         <!-- 访视基准日期 -->
         <el-table-column prop="FirstGiveMedicineTime" :label="$t('trials:subject:table:firstGiveMedicineTime')"
-          sortable="custom" show-overflow-tooltip width="150">
+          sortable="custom" show-overflow-tooltip min-width="150">
           <template slot-scope="scope">
             {{ scope.row.FirstGiveMedicineTime ? moment(scope.row.FirstGiveMedicineTime).format('YYYY-MM-DD') : '' }}
           </template>
         </el-table-column>
         <!-- Status -->
         <el-table-column prop="Status" :label="$t('trials:subject:table:status')" show-overflow-tooltip
-          sortable="custom" width="120">
+          sortable="custom" min-width="120">
           <template slot-scope="scope">
             <el-tag v-if="scope.row.Status === 1" type="primary">{{ $fd('Subject_Visit_Status', scope.row.Status)
             }}</el-tag>
@@ -99,7 +99,7 @@
           show-overflow-tooltip sortable="custom" min-width="140" />
         <!-- 计划外访视量 -->
         <el-table-column prop="OutPlanVisitCount" :label="$t('trials:subject:table:outPlanVisitCount')"
-          show-overflow-tooltip sortable="custom" width="160" />
+          show-overflow-tooltip sortable="custom" min-width="160" />
         <!-- 当前提交访视量 -->
         <el-table-column prop="TotalVisitSubmmitCount" :label="$t('trials:subject:table:totalVisitSubmmitCount')"
           show-overflow-tooltip min-width="130" />
@@ -120,7 +120,7 @@
           min-width="120" />
         <!-- 最新提交访视名称 -->
         <el-table-column prop="LatestVisitName" :label="$t('trials:subject:table:latestVisitName')"
-          show-overflow-tooltip sortable="custom" min-width="120" />
+          show-overflow-tooltip sortable="custom" min-width="140" />
 
         <el-table-column
           v-if="hasPermi(['trials:trials-panel:subject:edit', 'trials:trials-panel:subject:status', 'trials:trials-panel:subject:delete', 'trials:trials-panel:subject:report']) || (hasPermi(['trials:trials-panel:subject:chart']) && isShowChart)"
@@ -141,7 +141,8 @@
               :title="$t('trials:subject:title:report')" @click="handleMessage(scope.row)" />
             <!-- 图表 -->
             <el-button v-hasPermi="['trials:trials-panel:subject:chart']" v-if="isShowChart" icon="el-icon-s-data"
-              circle :title="$t('trials:subject:title:chart')" @click="handleopenSubjectChart(scope.row)" />
+              circle :title="$t('trials:subject:title:chart')" :disabled="!scope.row.IsHaveTaskFinished"
+              @click="handleopenSubjectChart(scope.row)" />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index f8b50654..f5d0c8e4 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -109,7 +109,7 @@
         <el-table-column prop="SiteCode" min-width="100" :label="$t('trials:auditRecord:table:siteNo')" fixed="left"
           show-overflow-tooltip sortable="custom" />
         <!-- 受试者 -->
-        <el-table-column prop="SubjectCode" min-width="100" :label="$t('trials:auditRecord:table:subject')" fixed="left"
+        <el-table-column prop="SubjectCode" min-width="150" :label="$t('trials:auditRecord:table:subject')" fixed="left"
           show-overflow-tooltip sortable="custom" />
         <!-- 访视 -->
         <el-table-column prop="VisitName" min-width="120" :label="$t('trials:auditRecord:table:visit')" fixed="left"
diff --git a/src/views/trials/trials-panel/trial-summary/image-summary/index.vue b/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
index 3dce0dbf..15fc925e 100644
--- a/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/image-summary/index.vue
@@ -70,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>
                 <!-- 影像数量 -->
@@ -286,7 +286,7 @@ export default {
                 //项目研究方案号(评估标准)/中心ID/受试者ID/访视名/阅片人角色-裁判选择标记/文件名
                 name = `${this.$route.query.researchProgramNo}_${this.$t('trials:imageSummary:downloadname:keyImage')}_${Date.now()}.zip`
                 row.forEach(item => {
-                    ['QuestionMarkPictureList', 'TableQuestionRowPictureList', 'ReadingNoneDicomMarkPathList'].forEach(key => {
+                    ['QuestionMarkPictureList', 'TableQuestionRowPictureList', 'ReadingNoneDicomMarkPathList', 'SegmentationFileList'].forEach(key => {
                         if (item[key] && item[key].length > 0) {
                             item[key].forEach(data => {
                                 ['PicturePath', 'otherPicturePath'].forEach(imgKey => {
diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
index 661c65a4..26ca675a 100644
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@@ -73,7 +73,7 @@
         <el-table-column prop="TrialSiteCode" min-width="100" :label="$t('trials:uploadMonitor:table:siteId')"
           show-overflow-tooltip sortable="custom" />
         <!-- 受试者编号 -->
-        <el-table-column prop="SubjectCode" min-width="130" :label="$t('trials:uploadMonitor:table:subjectId')"
+        <el-table-column prop="SubjectCode" min-width="150" :label="$t('trials:uploadMonitor:table:subjectId')"
           show-overflow-tooltip sortable="custom" />
         <!-- 访视名 -->
         <el-table-column prop="VisitName" min-width="130" :label="$t('trials:uploadMonitor:table:visitName')"
diff --git a/src/views/trials/trials-panel/visit/consistency-check/index.vue b/src/views/trials/trials-panel/visit/consistency-check/index.vue
index 3b402b96..d0d28474 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/index.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/index.vue
@@ -114,7 +114,7 @@
           width="140" sortable="custom" />
         <!-- 受试者编号 -->
         <el-table-column prop="SubjectCode" :label="$t('trials:consistencyCheck:table:subjectId')" show-overflow-tooltip
-          width="140" sortable="custom" />
+          width="150" sortable="custom" />
         <!-- 访视名称 -->
         <el-table-column prop="VisitName" :label="$t('trials:consistencyCheck:table:visitName')" show-overflow-tooltip
           width="140" sortable="custom">
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 17f1ac4d..f4d9edb1 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -127,7 +127,7 @@
           min-width="100" sortable="custom" />
         <!-- 受试者 -->
         <el-table-column prop="SubjectCode" :label="$t('trials:crcUpload:table:subjectId')" show-overflow-tooltip
-          sortable="custom" min-width="120">
+          sortable="custom" min-width="150">
           <template slot-scope="scope">
             <span style="margin: 0 4px">{{ scope.row.SubjectCode }}</span>
             <!-- 基 -->
diff --git a/src/views/trials/trials-panel/visit/forward-list/index.vue b/src/views/trials/trials-panel/visit/forward-list/index.vue
index 9670364b..40f248f1 100644
--- a/src/views/trials/trials-panel/visit/forward-list/index.vue
+++ b/src/views/trials/trials-panel/visit/forward-list/index.vue
@@ -92,7 +92,7 @@
           prop="SubjectCode"
           :label="$t('trials:dicomForward:table:subjectId')"
           show-overflow-tooltip
-          min-width="90"
+          min-width="140"
           sortable="custom"
         />
         <!-- 访视名称 -->
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 2b329033..421b738d 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -644,7 +644,7 @@
               <el-input v-model="studyForm.Modalities" disabled />
             </el-form-item>
             <!-- 检查类型 -->
-            <el-form-item v-else :label="$t('trials:audit:table:modality')" prop="Modalities" :rules="[
+            <el-form-item v-else :label="$t('trials:audit:table:modality')" prop="Modality" :rules="[
               {
                 required: true,
                 message: $t('common:ruleMessage:specify'),
@@ -2504,10 +2504,10 @@ export default {
       var token = getToken()
       const routeData = isReading
         ? this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isReading=1`,
+          path: `/none_dicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isReading=1`,
         })
         : this.$router.resolve({
-          path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=${this.SecondReviewState > 0 ? 0 : 1}`,
+          path: `/none_dicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=${this.SecondReviewState > 0 ? 0 : 1}`,
         })
       this.open = window.open(routeData.href, '_blank')
     },
@@ -2520,7 +2520,7 @@ export default {
       let trialId = this.$route.query.trialId
       var token = getToken()
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&studyId=${row.Id}&TokenKey=${token}&isQcCheck=${this.SecondReviewState > 0 ? 0 : 1}`,
+        path: `/none_dicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&studyId=${row.Id}&TokenKey=${token}&isQcCheck=${this.SecondReviewState > 0 ? 0 : 1}`,
       })
       this.open = window.open(routeData.href, '_blank')
     },
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 61990df9..0fd11e64 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -33,7 +33,7 @@
         </el-form-item>
         <!-- 受试者中止状态 -->
         <el-form-item style="margin-bottom: 10px" :label="$t('trials:qcCheck:table:IsSubjectQuit')">
-          <el-select v-model="searchData.IsSubjectQuit" clearable style="width: 120px">
+          <el-select v-model="searchData.SubjectStatus" clearable style="width: 120px">
             <el-option v-for="item of $d.Subject_Visit_Status" :value="item.value" :label="item.label"
               :key="item.label" />
           </el-select>
@@ -146,7 +146,7 @@
           min-width="100" sortable="custom" />
         <!-- 受试者编号 -->
         <el-table-column prop="SubjectCode" :label="$t('trials:qcCheck:table:subjectId')" show-overflow-tooltip
-          min-width="120" sortable="custom" />
+          min-width="150" sortable="custom" />
         <!-- 访视名称 -->
         <el-table-column prop="VisitName" :label="$t('trials:qcCheck:table:visitName')" show-overflow-tooltip
           width="130" sortable="custom">
@@ -658,7 +658,8 @@ const searchDataDefault = () => {
     EndAuditTime: null,
     PageIndex: 1,
     PageSize: 20,
-    IsSubjectQuit: ''
+    IsSubjectQuit: '',
+    SubjectStatus: null
     // SortField: '',
     // Asc: false
   }
diff --git a/src/views/trials/trials-panel/visit/qc-question/index.vue b/src/views/trials/trials-panel/visit/qc-question/index.vue
index 89b0421a..c655f930 100644
--- a/src/views/trials/trials-panel/visit/qc-question/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-question/index.vue
@@ -179,7 +179,7 @@
           prop="SubjectCode"
           :label="$t('trials:qcQuality:table:subjectId')"
           show-overflow-tooltip
-          width="120"
+          width="150"
           sortable="custom"
         />
         <!-- 访视名称 -->
diff --git a/src/views/trials/trials-panel/visit/reupload-audit/index.vue b/src/views/trials/trials-panel/visit/reupload-audit/index.vue
index 98e879c0..628def9a 100644
--- a/src/views/trials/trials-panel/visit/reupload-audit/index.vue
+++ b/src/views/trials/trials-panel/visit/reupload-audit/index.vue
@@ -115,7 +115,7 @@
                     show-overflow-tooltip sortable="custom" min-width="120px" />
                 <!-- 受试者编号 -->
                 <el-table-column prop="SubjectCode" :label="$t('trials:reuploadAudit:table:subjectId')"
-                    show-overflow-tooltip sortable="custom" min-width="120px" />
+                    show-overflow-tooltip sortable="custom" min-width="140px" />
                 <!-- 访视名称 -->
                 <el-table-column prop="VisitName" :label="$t('trials:reuploadAudit:table:visitName')"
                     show-overflow-tooltip sortable="custom" min-width="120px">
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 30777727..737dd7ef 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -667,6 +667,7 @@ export default {
     }
     this.hoursTip = hoursTip
     this.$EventBus.$on("reload", (data) => {
+      zzSessionStorage.removeItem('lastWorkbench')
       window.location.reload()
     });
   },
diff --git a/vue.config.js b/vue.config.js
index 1d1c4751..e2f45fbd 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -135,7 +135,8 @@ module.exports = defineConfig({
           test: /\.wasm$/,
           type: 'asset/resource'
         }
-      ]
+      ],
+      exprContextCritical: false,
     },
     optimization: {
       splitChunks: {