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

src/views/trials/trials-panel/subject/reading-period/components/AddSubjectRP.vue

@@ -138,7 +138,7 @@ export default {
           addReadModule(this.form).then(res => {
             this.btnLoading = false
             this.$emit('getList')
-            this.$emit('close')
+            this.$emit('close', {visitStageId: this.form.VisitStageId})
             this.form.Name = null
             this.form.VisitStageId = null
             this.$message.success(this.$t('common:message:savedSuccessfully'))

src/views/trials/trials-panel/subject/reading-period/index.vue

@@ -382,7 +382,7 @@
             <el-dialog v-if="subjectPeriod.visible" :title="subjectPeriod.title" :visible.sync="subjectPeriod.visible"
               width="500px" custom-class="base-dialog-wrapper" :close-on-click-modal="false">
               <SubjectPR :trial-reading-criterion-id="TrialReadingCriterionId" :trial-id="trialId" :data="param"
-                @close="() => { subjectPeriod.visible = false }" @getList="getList" />
+                @close="subjectPeriodClose" @getList="getList" />
             </el-dialog>
             <!-- 编辑受试者阅片期 -->
             <el-dialog v-if="subjectPeriodEdit.visible" :title="subjectPeriodEdit.title"
@@ -527,6 +527,29 @@ export default {
           ? this.$t('trials:readingPeriod:dialogTitle:addSubjectPR')
           : this.$t('trials:readingPeriod:dialogTitle:addSubjectTumorPR')
     },
+    async subjectPeriodClose(obj) {
+      this.subjectPeriod.visible = false
+      if (typeof obj !== 'object' || obj === null) return
+      
+      if (this.param.ReadingSetType === 0 && this.isClinicalReading) {
+        try {
+          const res = await this.$confirm(this.$t('trials:readingPeriod:message:msg1'), {
+            type: 'warning',
+            distinguishCancelAndClose: true,
+          })
+          if (res === 'confirm') {
+            this.param.ReadingSetType = 1
+            this.param.VisitStageId = obj.visitStageId
+            this.subjectPeriod = { visible: true, title: this.$t('trials:readingPeriod:dialogTitle:addSubjectTumorPR') }
+          } else {
+            this.subjectPeriod.visible = true
+          }
+        } catch(e) {
+          console.log(e)
+        }
+      }
+      
+    },
     handleEdit(row, type) {
       this.param = { ...type }
       this.param.VisitStageId = this.param.CutOffVisitId