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 e3e236fa..1f33dd0f 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
@@ -2040,7 +2040,7 @@ export default {
     },
     // 激活标注工具
     setAnnotateToolActive(toolName) {
-      if (this.readingTaskState === 2) return
+      // if (this.readingTaskState === 2) return
       const toolObj = this.tools.find(i => i.toolName === toolName)
       if (!toolObj || toolObj.isDisabled) return
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
@@ -2130,7 +2130,10 @@ export default {
       const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
       const isCurrentTask = series.TaskInfo.IsCurrentTask
       const readingTaskState = this.readingTaskState
-      if (!isCurrentTask || readingTaskState >= 2) {
+      if (isCurrentTask && readingTaskState >= 2) {
+        this.tools[i].isDisabled = false
+        e.target.style.cursor = 'pointer'
+      } else if (!isCurrentTask || readingTaskState >= 2) {
         this.tools[i].isDisabled = true
         e.target.style.cursor = 'not-allowed'
         if (this.activeTool) {
@@ -2948,15 +2951,22 @@ export default {
         const that = this
         // 请输入标记名称
         let message = this.$t('trials:noneDicom:message:msg1')
-        if (isShowCancelButton) {
-          message = `<div><p>${this.$t('trials:noneDicom:message:msg1')}</p><p style='font-size:12px' class='customPromptTip'>${this.$t('trials:noneDicom:message:saveTip')}</p></div>`
-        }
+        // if (isShowCancelButton) {
+        //   message = `<div><p>${this.$t('trials:noneDicom:message:msg1')}</p><p style='font-size:12px' class='customPromptTip'>${this.$t('trials:noneDicom:message:saveTip')}</p></div>`
+        // }
         const { value } = await this.$prompt( message, '', {
           showClose: false,
           cancelButtonText: isShowCancelButton ? this.$t('trials:reading:button:temporarySave') : this.$t('common:button:cancel'),
           confirmButtonText: isShowCancelButton ? this.$t('trials:reading:button:enduringSave') : this.$t('trials:reading:button:relevancy'),
           // showCancelButton: isShowCancelButton,
-          dangerouslyUseHTMLString: isShowCancelButton,
+          // dangerouslyUseHTMLString: isShowCancelButton,
+          inputValidator: (res) => {
+            if (!res) {
+              return false
+            }
+            return this.$t('trials:noneDicom:message:saveTip')
+          },
+          inputErrorMessage: this.$t('trials:noneDicom:message:saveTip'),
           showCancelButton: true,
           closeOnClickModal: false,
           closeOnPressEscape: false,
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
index fcf155cc..208e7f68 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
@@ -152,7 +152,7 @@ export default {
       } else if ((this.exportInfo.CriterionGroup === 0 || this.exportInfo.CriterionType === 0 ) && item.Code === 1 && (row.HasChildren || row.IsTableQuestion)) {
         // 自定义或非肿瘤阅片标准阅片结果表(1)不能配置表格问题
         return true
-      } else if (item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0))) {
+      } else if (this.exportInfo.CriterionGroup !== 0 && item.Code === 8 && (row.HasChildren || (row.IsTableQuestion && this.exportInfo.CriterionType !== 0))) {
         // else if (item.Code === 8 && (row.HasChildren || row.IsTableQuestion))
         // CDISC导出不能配置表格问题
         return true
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 fa1c2967..32ae9761 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -340,7 +340,7 @@
         <el-table-column fixed="right" :label="$t('common:action:action')" width="220">
           <template slot-scope="scope">
             <!-- 查看阅片结果 -->
-            <el-button :disabled="scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit" icon="el-icon-view"
+            <el-button :disabled="scope.row.ReadingTaskState !== 2" icon="el-icon-view"
               circle :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
             <!-- 申请重阅 -->
             <el-button :disabled="scope.row.ReadingCategory !== 1 ||
diff --git a/src/views/trials/trials-panel/setting/email-manage/index.vue b/src/views/trials/trials-panel/setting/email-manage/index.vue
index dbf44eab..0b31ae3d 100644
--- a/src/views/trials/trials-panel/setting/email-manage/index.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/index.vue
@@ -143,6 +143,7 @@ export default {
           },]
       },
       NODE_ENV: process.env.NODE_ENV,
+      VUE_APP_OSS_PATH: process.env.VUE_APP_OSS_PATH,
     }
   },
   // watch: {
@@ -151,7 +152,17 @@ export default {
   //   }
   // },
   created() {
-    if(this.NODE_ENV === 'production'){
+    if(this.VUE_APP_OSS_PATH === '/uat/dist'){
+      this.form= {
+        EmailFromEmail: 'uat@extimaging.com',
+        EmailFromName: 'Uat IRC Imaging System',
+        EmailAuthorizationCode: 'SHzyyl2021',
+        EmailSMTPServerAddress: 'smtp.qiye.aliyun.com',
+        EmailSMTPServerPort: 465,
+        IsConfigureEmail: true
+      };
+    }
+    if(this.VUE_APP_OSS_PATH === '/test/dist'){
       this.form= {
         EmailFromEmail: 'test@extimaging.com',
         EmailFromName: 'Test_IRC',