Merge branch 'uat'
continuous-integration/drone/push Build is passing

# Conflicts:
#	src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
#	src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
This commit is contained in:
2025-03-05 10:12:21 +08:00
4 changed files with 8 additions and 8 deletions
+3 -3
View File
@@ -9,9 +9,9 @@
<div v-for="(study, i) in studyList" :key="study.CodeView">
<div class="study-desc">
<span>{{ study.CodeView }}</span>
<span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">{{
study.StudyName
}}</span>
<span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
{{ study.StudyName }}
</span>
<span style="margin: 0 5px">{{ study.Modality }}</span>
<span>{{ getBodyPart(study.BodyPart) }}</span>
</div>
@@ -113,14 +113,14 @@
prop="UploadedTime"
:label="$t('trials:uploadedDicoms:table:uploadedTime')"
sortable
min-width="80"
min-width="120"
show-overflow-tooltip
/>
<!-- 更新时间 -->
<el-table-column
prop="UpdateTime"
:label="$t('trials:uploadedDicoms:table:UpdateTime')"
min-width="80"
min-width="120"
show-overflow-tooltip
sortable
/>
@@ -156,7 +156,7 @@
<el-table-column
prop="UploadedTime"
:label="$t('trials:uploadedDicoms:table:uploadedTime')"
min-width="80"
min-width="120"
show-overflow-tooltip
sortable
/>
@@ -164,7 +164,7 @@
<el-table-column
prop="UpdateTime"
:label="$t('trials:uploadedDicoms:table:UpdateTime')"
min-width="80"
min-width="120"
show-overflow-tooltip
sortable
/>