脾尖、脾底标注添加限制

src/App.vue

@@ -148,8 +148,8 @@ export default {
       } else {
         this.tableData = Object.assign([], this.arr)
       }
-      console.log(JSON.stringify(this.$path))
+      // console.log(JSON.stringify(this.$path))
-      console.log(JSON.stringify(this.tableData))
+      // console.log(JSON.stringify(this.tableData))
     }
   }
 }

src/views/trials/trials-panel/attachments/self-attachment/index.vue

@@ -325,12 +325,17 @@ export default {
     closeSignDialog(isSave) {
       this.signVisible = false
       if (isSave) {
+        this.currentIsConfirm = true
         this.$confirm(this.$t('trials:self-attachment:message:nextDocument')).then(res => {
           getNextUnSignDocument({
             TrialId: this.trialId
           }).then(res => {
             if (!res.Result) {
-              this.currentIsConfirm = true
+              // 文档签署已完成，是否关闭弹窗？
+              this.$confirm(this.$t('trials:self-attachment:message:closeDocument')).then(() => {
+                this.previewVisible = false
+              }).catch(()=>{})
+              
             } else {
               this.handleSign(res.Result)
             }

src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue

@@ -152,7 +152,7 @@
               <!-- <span style="color:#409eff;cursor: pointer" @click="previewImages(answers.RowId)">
                 {{ $t('trials:lugano:button:suvscreenshot') }}
               </span> -->
-              <el-button type="text" @click="previewImages(answers.RowId)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
+              <el-button v-if="!isBaseLineTask" type="text" @click="previewImages(answers.RowId)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
             </div>
           </template>
           <el-input

src/views/trials/trials-panel/reading/dicoms/components/Questions.vue

@@ -261,11 +261,14 @@ export default {
             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)
+          var chenckVaild = this.checkAnnotationValid(stIdx, slIdx)
+
           if (currentSpleenLength && currentSpleenStatus === 5) {
             // '脾脏状态为不可评估，不需要添加标记!'
             this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
@@ -280,6 +283,11 @@ export default {
             this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => {}
             })
+          } else if (!chenckVaild) {
+            // 校验标记是否在同一序列的不同图像上
+            this.$alert(this.$t('trials:lugano:message:validSpleen3'), this.$t('trials:lugano:fusionDialog:warning'), {
+              callback: _ => {}
+            })
           } else {
             this.saveQuestionsList()
           }
@@ -357,6 +365,19 @@ export default {
         }
       }
     },
+    checkAnnotationValid(stIdx, slIdx) {
+      var isValid = true
+      if (stIdx > -1 && slIdx > -1 && this.measurements[stIdx].MeasureData && this.measurements[slIdx].MeasureData) {
+        var stSeriesId = this.measurements[stIdx].SeriesId
+        var stInstanceId = this.measurements[stIdx].InstanceId
+        var slSeriesId = this.measurements[slIdx].SeriesId
+        var slInstanceId = this.measurements[slIdx].InstanceId
+        if (!(stSeriesId && stInstanceId && slSeriesId && slInstanceId && stSeriesId === slSeriesId && stInstanceId !== slInstanceId)) {
+          isValid = false
+        }
+      }
+      return isValid
+    },
     setSpleenCommentDisplay() {
       if (this.spleenCommentsId && this.spleenStatusId) {
         for (let i = 0; i < this.questions[0].Childrens.length; i++) {

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -781,7 +781,7 @@ export default {
       var bodyPartTypes = this.form.BodyPartTypeList.map(i => {
         return this.$fd('Bodypart', i)
       })
-      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ')
+      this.form.BodyPartTypes = bodyPartTypes.join(' | ')
       this.bodyPartListVisible = false
     },
     // 配置信息保存
@@ -791,7 +791,9 @@ export default {
         this.loading = true
         // 保存配置信息
         var params = Object.assign({}, this.form)
+        console.log(this.form.BodyPartTypeList)
         params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
+        
         configTrialBasicInfo(params).then(res => {
           this.loading = false
           if (res.IsSuccess) {
@@ -979,9 +981,9 @@ export default {
         }
       }
       this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', ' | ')
-      this.form.BodyPartTypeList = this.form.BodyPartTypes.split(' | ')
+      this.form.BodyPartTypeList = this.form.BodyPartTypes.split('|')
       var bodyPartTypes = this.form.BodyPartTypeList.map(i => {
-        return this.$fd('Bodypart', i)
+        return this.$fd('Bodypart', i.trim())
       })
       this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ')
       // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')