diff --git a/src/App.vue b/src/App.vue index 03b14177..1d5e9db3 100644 --- a/src/App.vue +++ b/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.tableData)) + // console.log(JSON.stringify(this.$path)) + // console.log(JSON.stringify(this.tableData)) } } } diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue index 485edc30..66e23a16 100644 --- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue +++ b/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) } 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 2a42a448..41e22c99 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 @@ -152,7 +152,7 @@ - {{ $t('trials:lugano:button:suvscreenshot') }} + {{ $t('trials:lugano:button:suvscreenshot') }} 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++) { 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 9713d05a..f1c7664f 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 @@ -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(', ')