diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index e53aaa8b..e3a7eb1b 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -887,6 +887,12 @@ const actions = {
const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
imageIds.push(imageId)
})
+ } else if (study.IsCriticalSequence && instance.KeyFramesList.length === 0) {
+ // 兼容保存标记数据未存NumberOfFrames的情况,按序列展示
+ for (let i = 0; i < instance.NumberOfFrames; i++) {
+ const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
+ imageIds.push(imageId)
+ }
} else {
for (let i = 0; i < instance.NumberOfFrames; i++) {
const imageId = `wadouri:${localStorage.getItem('location') !== 'USA' ? Vue.prototype.OSSclientConfig.basePath : Vue.prototype.OSSclientConfig.basePath}${instance.Path}?frame=${i}&instanceId=${instance.Id}&visitTaskId=${obj.visitTaskId}&idx=${studyIndex}|${seriesIndex}|${index}`
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
index 725124bd..f93cf82a 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
@@ -3,13 +3,16 @@
ref="sysAttachmentFrom"
v-loading="loading"
:model="form"
- label-width="170px"
+ label-width="190px"
size="small"
:rules="rules"
class="upload-temporary-file"
>
-
+
-
+
Select{{ $t('common:button:check') }}
- (must be in pdf format)
+ ({{ $t('trials:signature:label:mustBepdf') }})
-
+
Save{{ $t('common:button:save') }}
@@ -138,13 +144,25 @@ export default {
},
rules: {
FileTypeId: [
- { required: true, message: 'Please select', trigger: ['blur'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur'],
+ },
],
SignViewMinimumMinutes: [
- { required: true, message: 'Please specify', trigger: ['change'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:specify'),
+ trigger: ['change'],
+ },
],
NeedConfirmedUserTypeIdList: [
- { required: true, message: 'Please select', trigger: ['blur'] },
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur'],
+ },
],
},
fileList: [],
@@ -211,7 +229,7 @@ export default {
this.fileList = []
return true
} else {
- this.$alert('must be in pdf format')
+ this.$alert(this.$t('trials:signature:label:mustBepdf'))
return false
}
@@ -236,7 +254,7 @@ export default {
this.$refs.sysAttachmentFrom.validate((valid) => {
if (!valid) return
if (!this.form.Name) {
- this.$alert('Please select file.')
+ this.$alert(this.$t('trials:signature:message:selectFile'))
return
}
this.saveBtnLoading = true
@@ -245,7 +263,7 @@ export default {
this.saveBtnLoading = false
this.$emit('closeDialog')
this.$emit('getList')
- this.$message.success('Uploaded successfully')
+ this.$message.success(this.$t('common:message:updatedSuccessfully'))
})
.catch(() => {
this.saveBtnLoading = false
@@ -263,7 +281,7 @@ export default {
}
},
handleExceed(files, fileList) {
- this.$message.warning(`Upload is currently limited to 1 file`)
+ this.$message.warning(this.$t('upload:rule:maxFile1'))
},
checkFileSuffix(fileName) {
var typeArr = ['pdf']
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index 29279a3c..3d052d91 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -34,7 +34,7 @@
@@ -69,6 +69,7 @@
:label="$t('dictionary:signature:table:SignViewMinimumMinutes')"
show-overflow-tooltip
sortable="custom"
+ min-width="110"
/>
{{ $fd('ReadingYesOrNo', Number(scope.row.DocUserSignType)) }}
@@ -115,7 +117,7 @@
sortable="custom"
/>
-
+
{{ $t('common:button:preview') }}