Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

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

@@ -470,7 +470,8 @@ export default {
       // 判断是否有测量数据未保存
       let i = this.markList.findIndex(i=>i.saveEnum === 0)
       if (i > -1 && this.markList[i].measureData && this.markList[i].measureData.MeasureData) {
-        this.$message.warning(this.$t('trials:MRIPDFF:message:message3'))
+        this.$alert(this.$t('trials:MRIPDFF:message:message3'))
+        // this.$message.warning(this.$t('trials:MRIPDFF:message:message3'))
         return
       }
       let orderMarkName = this.getLesionName(this.orderMark, qs.QuestionMark)

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

@@ -48,7 +48,7 @@
         label="CDISC导出配置"
         name="CDISCConfig"
       >
-        <!-- <el-tabs type="border-card" v-model="CDISCCriterionId">
+        <el-tabs type="border-card" v-model="CDISCCriterionId">
           <el-tab-pane
             :label="i.TrialReadingCriterionName"
             :name="i.TrialReadingCriterionId"
@@ -61,7 +61,7 @@
               :exportType="1"
             />
           </el-tab-pane>
-        </el-tabs> -->
+        </el-tabs>
       </el-tab-pane>
     </el-tabs>