diff --git a/src/api/trials.js b/src/api/trials.js
index 3f4b9dff..2ebd6066 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1378,9 +1378,9 @@ export function getForwardList(param) {
})
}
-export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '') {
+export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
return request({
- url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}`,
+ url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
method: 'get'
})
}
diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue
index 96f9d2e2..370c7bfe 100644
--- a/src/views/none-dicom-show/index.vue
+++ b/src/views/none-dicom-show/index.vue
@@ -6,67 +6,86 @@
-
-
- {{ study.CodeView }}
-
- {{ study.StudyName }}
-
- {{ study.Modality }}
- {{ getBodyPart(study.BodyPart) }}
-
-
-
- {{ $t('trials:audit:message:noData') }}
-
-
-
-
-
- {{ `${j + 1}. ${item.FileName}` }}
-
-
-
- {{ `${j + 1}. ${item.FileName}` }}
-
-
-
-
- {{ $t('trials:audit:table:isReading') }}
-
-
-
- {{ $t('trials:audit:table:isDelete') }}
-
-
-
+
+
+
+ {{ study.CodeView }}
+
+ {{ study.StudyName }}
+
+ {{ study.Modality }}
+ {{ getBodyPart(study.BodyPart) }}
-
-
+
+
+ {{ $t('trials:audit:message:noData') }}
+
+
+
+
+
+
+
+
+ {{ `${j + 1}. ${item.FileName}` }}
+
+
+
+ {{ `${j + 1}. ${item.FileName}` }}
+
+
+
+
+ {{ $t('trials:audit:table:isReading') }}
+
+
+
+ {{ $t('trials:audit:table:isDelete') }}
+
+
+
+
+
+
+
+
@@ -136,12 +155,13 @@ export default {
},
isQcCheck: false,
isAudit: false,
+
+ activeNames: [],
}
},
async created() {
this.bp = await this.$getBodyPart(this.$route.query.trialId)
this.isQcCheck = !!this.$route.query.isQcCheck
- console.log(this.isQcCheck)
},
async mounted() {
if (this.$router.currentRoute.query.TokenKey) {
@@ -154,6 +174,7 @@ export default {
// 默认选择第一个文件
},
methods: {
+ handleChange() {},
changeReadingStatus(callback, row, file) {
let statusStr = ''
if (callback) {
@@ -244,7 +265,6 @@ export default {
.catch(() => {})
},
getBodyPart(bodyPart) {
- console.log(bodyPart)
if (!bodyPart) return ''
var separator = ','
if (bodyPart.indexOf('|') > -1) {
@@ -264,7 +284,6 @@ export default {
'Name'
)
})
- console.log(newArr, this.bp)
return newArr.join(' | ')
},
// 获取非Dicom检查信息
@@ -274,7 +293,8 @@ export default {
this.subjectVisitId,
this.studyId,
false,
- this.$route.query.visitTaskId
+ this.$route.query.visitTaskId,
+ !!this.$route.query.isReading
)
.then((res) => {
this.studyList = res.Result
@@ -284,6 +304,8 @@ export default {
const studyIndex = this.studyList.findIndex((item) => {
return item.NoneDicomStudyFileList.length > 0
})
+ this.activeNames = this.studyList.map((item) => item.CodeView)
+ console.log(this.activeNames)
if (studyIndex > -1) {
var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
this.selected(fileObj[0], studyIndex, 0, true)
@@ -366,7 +388,7 @@ export default {
}
}
.study-desc {
- padding: 15px 5px;
+ padding: 10px 5px;
line-height: 20px;
background-color: #d5d5d5;
font-weight: 500;
@@ -411,6 +433,11 @@ export default {
display: inline-block;
box-sizing: border-box;
border-bottom: 2px solid #f3f3f3;
+ display: flex;
+ align-items: center;
+ flex-wrap: wrap;
+ justify-content: flex-start;
+ padding: 5px 10px;
cursor: pointer;
// margin-bottom: 5px;
@@ -418,7 +445,8 @@ export default {
}
.img-text {
display: inline-block;
- width: 200px;
+ width: calc(100% - 60px);
+ margin-left: 5px;
height: 50px;
line-height: 50px;
overflow: hidden;
@@ -446,7 +474,8 @@ export default {
}
}
.switchBox {
- margin-bottom: 5px;
+ width: 100%;
+ margin: 5px 0;
color: #4e4e4e;
.item {
display: flex;
@@ -455,4 +484,18 @@ export default {
margin-bottom: 5px;
}
}
+.file-image {
+ width: 50px;
+ height: 50px;
+}
+::v-deep .el-collapse-item__header {
+ background-color: #d5d5d5;
+}
+::v-deep .el-collapse-item__header {
+ min-height: 48px;
+ height: auto;
+}
+::v-deep .el-collapse-item__content{
+ padding-bottom: 0;
+}
diff --git a/src/views/system/user/components/Retrospect.vue b/src/views/system/user/components/Retrospect.vue
index 8fc1d69e..d1a31087 100644
--- a/src/views/system/user/components/Retrospect.vue
+++ b/src/views/system/user/components/Retrospect.vue
@@ -223,6 +223,18 @@
{{ $fd('IsDisable', scope.row.IsDeleted) }}
@@ -291,11 +295,7 @@
@@ -306,11 +306,7 @@
diff --git a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
index 5e879517..7582f617 100644
--- a/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
+++ b/src/views/trials/trials-panel/setting/email-manage/components/EmailList.vue
@@ -76,6 +76,7 @@
{{ $t('common:button:reset') }}
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
-
+
+
+
-
-
+
+
-
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
@@ -51,7 +103,7 @@
-
+
- {{ $fd('Subject_Visit_Status', scope.row.SubjectStatus) }}
- {{ $fd('Subject_Visit_Status', scope.row.SubjectStatus) }}
+ {{
+ $fd('Subject_Visit_Status', scope.row.SubjectStatus)
+ }}
+ {{
+ $fd('Subject_Visit_Status', scope.row.SubjectStatus)
+ }}
-
- {{$fd(scope.row.FinalEvaluationList[index].FinalTranslateDictionaryCode, parseInt(scope.row.FinalEvaluationList[index].Answer))}}
+
+ {{
+ $fd(
+ scope.row.FinalEvaluationList[index]
+ .FinalTranslateDictionaryCode,
+ parseInt(scope.row.FinalEvaluationList[index].Answer)
+ )
+ }}
@@ -110,8 +190,14 @@
show-overflow-tooltip
>
- {{ $fd('YesOrNo', scope.row.IsJoinEvaluation) }}
- {{ $fd('YesOrNo', scope.row.IsJoinEvaluation) }}
+ {{
+ $fd('YesOrNo', scope.row.IsJoinEvaluation)
+ }}
+ {{ $fd('YesOrNo', scope.row.IsJoinEvaluation) }}
- {{ $fd('YesOrNo', scope.row.IsImageFiltering) }}
- {{ $fd('YesOrNo', scope.row.IsImageFiltering) }}
+ {{
+ $fd('YesOrNo', scope.row.IsImageFiltering)
+ }}
+ {{ $fd('YesOrNo', scope.row.IsImageFiltering) }}
@@ -151,7 +246,13 @@
-
+
-
-
+
+
-
+
@@ -182,7 +297,15 @@
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 846712f3..79c11671 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -216,6 +216,7 @@
-
+
@@ -433,13 +433,23 @@
>
{{ $t('trials:audit:button:downLoadAllNonDiocms') }}
+
+
+ {{ $t('trials:audit:tip:nonDicomsPreviewAllReading') }}
+
{{ $t('trials:audit:tip:nonDicomsPreviewAll') }}
@@ -2697,16 +2707,20 @@ export default {
}
},
// 预览所有检查下非Dicom文件
- handleViewAllNoneDicoms() {
+ handleViewAllNoneDicoms(isReading = false) {
if (this.open) {
this.open.close()
}
// this.previewAllNoneDicomVisible = true
let trialId = this.$route.query.trialId
var token = getToken()
- const routeData = this.$router.resolve({
- path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=1`,
- })
+ const routeData = isReading
+ ? this.$router.resolve({
+ path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isReading=1`,
+ })
+ : this.$router.resolve({
+ path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${this.data.Id}&TokenKey=${token}&isQcCheck=1`,
+ })
this.open = window.open(routeData.href, '_blank')
},
// 预览单个检查下非Dicom文件