@@ -173,9 +173,9 @@
-
-
+
{{ $t('trials:reading:Segmentations:button:addSegment') }}
@@ -302,7 +302,7 @@
{{
$t('trials:reading:Segmentations:button:recovery')
- }}
+ }}
@@ -797,7 +797,9 @@ export default {
},
async restoreSegmentationVersion(row) {
try {
- let confirm = await this.$confirm(this.$t('trials:reading:Segmentations:confirm:CurrentDataIsLoss'))
+ this.popoverId = null
+ let message = this.$t('trials:reading:Segmentations:confirm:CurrentDataIsLoss').replace("xxx", row.Version)
+ let confirm = await this.$confirm(message)
if (!confirm) return false
let data = {
SegmentationId: this.segmentationId,
@@ -863,6 +865,7 @@ export default {
},
async recoverySegmentGroup() {
try {
+ this.popoverId = null
let res = await this.getSegmentationVersionList(this.segmentationId)
if (!res) return this.$message.warning(this.$t("trials:reading:Segmentations:message:getSegmentationVersionFail"))
this.visible = true
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/helpers/segmentations.js b/src/views/trials/trials-panel/reading/dicoms3D/components/helpers/segmentations.js
index 6a33e468..75b41fe2 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/helpers/segmentations.js
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/helpers/segmentations.js
@@ -226,10 +226,12 @@ async function readingSegmentByConfig(series, visitInfo, viewportId, segmentatio
)
}
function selectSegmentation(viewportId, segmentationId) {
+ if (!segmentation.state.getSegmentation(segmentationId)) return false
segmentation.activeSegmentation.setActiveSegmentation(viewportId, segmentationId)
}
function selectSegment(viewportId, segmentationId, segmentIndex) {
if (!segmentIndex || !segmentationId) return false
+ if (!segmentation.state.getSegmentation(segmentationId)) return false
selectSegmentation(viewportId, segmentationId)
segmentation.segmentIndex.setActiveSegmentIndex(segmentationId, segmentIndex);
}
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
index fb398151..9062a1fb 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@@ -10,29 +10,24 @@
+
+
+
+
+
-
+
-
+
@@ -41,114 +36,61 @@
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
{{ $t('trials:sitesList:button:siteResearch') }}
-
+
{{ $t('trials:sitesList:dialogTitle:assignSite') }}
-
+
{{ $t('common:button:export') }}
-
+
{{ $t('common:button:downloadTpl') }}
-
+
{{ $t('common:button:upload') }}
-
+
-
+
{{
scope.row.TrialSiteCode
}}
-
+
-
+
-
+
+
-
+
{{
@@ -160,29 +102,14 @@
-
+
-
+
-
+
{{
$fd('IsSiteDisable', scope.row.IsDeleted)
@@ -193,21 +120,11 @@
-
+
-
+
{{
scope.row.CallingAEList.length > 0
? scope.row.CallingAEList.join(', ')
@@ -217,63 +134,32 @@
-
-
+
+
-
+
-
-
+
+
@@ -286,67 +172,37 @@
-
+
-
+
-
-
+
+
-
+
+
+
+
+
+
-
+
-
+
{{ $t('common:button:cancel') }}
-
+
{{ $t('common:button:save') }}
@@ -357,29 +213,14 @@
{{ $t('trials:internalStaff:table:status') }}:
- {{ item.label }}
+ {{ item.label }}
-
+
{{ $t('common:button:cancel') }}
-
+
{{ $t('common:button:save') }}
@@ -389,72 +230,34 @@
-
+
{{ $t('common:button:add') }}
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
{{
$fd('IsUserExitTrial', scope.row.IsDeleted)
@@ -464,37 +267,18 @@
}}
-
-
-
+
+
+
-
+
@@ -503,10 +287,7 @@
-
+
@@ -583,6 +364,7 @@ export default {
TrialSiteCode: '',
TrialSiteName: '',
TrialSiteAliasName: '',
+ Country: '',
IsDeleted: true,
},
upload_model: {
@@ -634,6 +416,13 @@ export default {
trigger: 'blur',
},
],
+ Country: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: 'blur',
+ },
+ ],
},
trialId: '',
TrialSiteSelectList: [],
@@ -656,10 +445,12 @@ export default {
? item.AliasName
: item.SiteName
this.form.SiteId = item.SiteId
+ this.form.Country = item.Country
},
handleChange(v) {
if (v) return
this.form.TrialSiteAliasName = ''
+ this.form.Country = this.$i18n.locale !== 'zh' ? this.$fd("SiteCountry", 1) : this.$fd("SiteCountry", 0)
},
querySearch(queryString, cb) {
var TrialSiteSelectList = this.TrialSiteSelectList
@@ -728,6 +519,7 @@ export default {
this.form[key] = true
}
})
+ this.form.Country = this.$i18n.locale !== 'zh' ? this.$fd("SiteCountry", 1) : this.$fd("SiteCountry", 0)
this.edit_model.visible = true
},
// 给site分配CRC
@@ -764,6 +556,7 @@ export default {
trialSiteCode: this.form.TrialSiteCode,
trialSiteAliasName: this.form.TrialSiteAliasName,
isDeleted: this.form.IsDeleted,
+ Country: this.form.Country,
}
if (this.edit_model.model_type === 'add') {
addTrialSites([param])