diff --git a/src/utils/oss.js b/src/utils/oss.js index 569c41e1..4138a02c 100644 --- a/src/utils/oss.js +++ b/src/utils/oss.js @@ -29,7 +29,9 @@ async function ossGenerateSTS() { put: function (objectName, object) { return new Promise(async (resolve, reject) => { try { - objectName = objectName + '_' + new Date().getTime() + var objectItem = objectName.split('/') + objectItem[objectItem.length - 1] = new Date().getTime() + '_' + objectItem[objectItem.length - 1] + objectName = objectItem.join('/') let res = await OSSclient.put(objectName, object) if (res && res.url) { resolve({ diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue index fe4ea337..2494d0a5 100644 --- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue +++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue @@ -150,7 +150,7 @@ {{ $t('trials:trials-myinfo:title:accountInfo') }} - + {{ user.UserName }} @@ -111,7 +111,7 @@ {{ $t('trials:trials-myinfo:title:updatePaasord') }} - + diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue index 440b7c65..fca6f057 100644 --- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue +++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue @@ -31,14 +31,7 @@ sortable="custom" > @@ -445,6 +438,9 @@ export default { this.initPage() }, methods: { + go(path) { + window.open(path) + }, beforeUpload() { if (this.fileList.length > 0) { // 只允许上传1个文件 diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue index adac806a..2cf652e5 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue @@ -769,10 +769,11 @@ export default { handleBeforeUpload(file, accept) { // 检测文件类型是否符合要求 console.log('handleBeforeUpload', file) - if (this.checkFileSuffix(file.name, accept)) { + if (this.checkFileSuffix(file.name, accept) || accept === '-1') { return true } else { - this.$alert(`必须是 ${accept} 格式`) + const msg = this.$t('trials:adReview:title:msg4').replace('xxx', accept) + this.$alert(msg) return false } console.log(file) diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue index 1dbabdb0..3afc5595 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue @@ -235,9 +235,9 @@ export default { mounted() { if (this.question.Type === 'upload') { if (this.questionForm[this.question.Id]) { + this.accept = this.question.Accept this.urls = this.questionForm[this.question.Id].split('|') this.fileList = [] - this.urls.map(url => { this.fileList.push({ name: '', url: `/api/${url}` }) }) @@ -285,11 +285,13 @@ export default { // this.fileList = [] return true } else { - this.$alert(`必须是 ${this.accept} 格式`) + const msg = this.$t('trials:adReview:title:msg4').replace('xxx', this.accept) + this.$alert(msg) return false } }, checkFileSuffix(fileName) { + console.log(this.accept) var index = fileName.lastIndexOf('.') var suffix = fileName.substring(index + 1, fileName.length) if (this.accept.toLocaleLowerCase().search(suffix.toLocaleLowerCase()) === -1) { 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 7d6512c0..1bf5860a 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 @@ -268,7 +268,7 @@ width="1200px" :close-on-click-modal="false" custom-class="base-dialog-wrapper" - :title="'邮件模版'" + :title="$t('trials:emailManageCfg:button:Default')" >
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/PageBreakList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/PageBreakList.vue index 061c8ee6..9fb7ab69 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/PageBreakList.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/PageBreakList.vue @@ -188,7 +188,7 @@ export default { loading: false, addOrEdit: { visible: false, title: '' }, questions: { visible: false, title: '阅片问题' }, - preview: { visible: false, title: 'eCRF预览' }, + preview: { visible: false, title: 'eCRF' + this.$t('common:button:preview') }, rowData: {}, tblList: [] } diff --git a/src/views/trials/trials-panel/setting/trial-config/components/criterionConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/criterionConfig.vue index 5085246c..168bb995 100644 --- a/src/views/trials/trials-panel/setting/trial-config/components/criterionConfig.vue +++ b/src/views/trials/trials-panel/setting/trial-config/components/criterionConfig.vue @@ -33,7 +33,7 @@
- 预览 + {{ $t('common:button:preview') }}