diff --git a/src/components/Dicom/DicomViewer.vue b/src/components/Dicom/DicomViewer.vue index 41c39b9c..583b303a 100644 --- a/src/components/Dicom/DicomViewer.vue +++ b/src/components/Dicom/DicomViewer.vue @@ -496,7 +496,7 @@ export default { this.colormapsList = cornerstone.colors.getColormapsList() this.currentDicomCanvas = this.$refs['dicomCanvas0'] this.type = this.$route.query.type - this.isEdit = parseInt(this.$route.query.showDelete) + this.isEdit = parseInt(this.$route.query.showDelete) || parseInt(this.$route.query.showEdit) }, beforeDestroy() { clearPTClinicalDataCache() diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue index 4886d9c3..47dfcc74 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue @@ -151,7 +151,7 @@ - + @@ -309,8 +309,14 @@ export default { // 预览影像 handleViewStudy(row) { var token = getToken() + let path = '' + if (this.hasPermi(['trials:trials-panel:visit:crc-upload:edit'])) { + path = `/showdicom?studyId=${row.StudyId}&isFromCRCUpload=1&TokenKey=${token}&type=Study&showEdit=${(this.data.SubmitState * 1 < 2 || (this.data.SubmitState === 2 && this.data.IsQCConfirmedReupload)) ? 1 : 0}` + } else { + path = `/showdicom?studyId=${row.StudyId}&isFromCRCUpload=1&TokenKey=${token}&type=Study` + } const routeData = this.$router.resolve({ - path: `/showdicom?studyId=${row.StudyId}&isFromCRCUpload=1&TokenKey=${token}&type=Study`, + path: path }) var newWindow = window.open(routeData.href, '_blank') this.$emit('setOpenWindow', newWindow) diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index 11cedab5..9b25e7bf 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -791,8 +791,14 @@ export default { // 预览单个检查影像 handleViewStudy(row) { var token = getToken() + let path = '' + if (this.hasPermi(['trials:trials-panel:visit:crc-upload:edit'])) { + path = `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study&showEdit=${!(!this.isAfresh && this.data.SubmitState === 2 && this.data.SubmitTime) ? 1 : 0}` + } else { + path = `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study` + } const routeData = this.$router.resolve({ - path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`, + path: path, }) window.open(routeData.href, '_blank') }, diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue index 57740b24..ed6a8c8d 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue @@ -512,7 +512,6 @@ export default { } }, mounted() { - console.log(this.allowAddOrEdit,this.isPatientFormAllowEdit ) this.isPatientFormCanEdit = this.allowAddOrEdit || this.isPatientFormAllowEdit this.getClinicalData() },