上传对象名加上时间戳

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({

src/views/dictionary/attachment/components/SignatureTemplate/index.vue

@@ -150,7 +150,7 @@
       <el-dialog
         v-if="previewVisible"
         :visible.sync="previewVisible"
-        title="预览"
+        :title="$t('common:button:preview')"
         :fullscreen="true"
         append-to-body
         custom-class="base-dialog-wrapper"

src/views/dictionary/template/components/ClinicalQuestionConfig.vue

@@ -235,7 +235,7 @@ export default {
       rowData: {},
       activeName: '0',
       addOrEdit: { visible: false, title: '' },
-      preview: { visible: false, title: 'eCRF预览' },
+      preview: { visible: false, title: 'eCRF' + this.$t('common:button:preview') },
       config: { visible: false, title: '' }
     }
   },

src/views/dictionary/template/components/CriterionsConfig.vue

@@ -288,7 +288,7 @@ export default {
       rowData: {},
       activeName: '0',
       addOrEdit: { visible: false, title: '' },
-      preview: { visible: false, title: 'eCRF预览' },
+      preview: { visible: false, title: 'eCRF' + this.$t('common:button:preview') },
       config: { visible: false, title: '' }
     }
   },

src/views/dictionary/template/components/QcQuestions.vue

@@ -187,7 +187,7 @@ export default {
       loading: false,
       rowData: {},
       model_cfg: { visible: false, showClose: true, width: '600px', title: '' },
-      preview: { visible: false, title: '预览' }
+      preview: { visible: false, title: this.$t('common:button:preview') }
     }
   },
   mounted() {

src/views/trials/trials-myinfo/index.vue

@@ -66,7 +66,7 @@
           <!-- 账号信息 -->
           {{ $t('trials:trials-myinfo:title:accountInfo') }}
         </div>
-        <el-form label-position="right" label-width="150px">
+        <el-form label-position="right" label-width="180px">
           <!-- 用户名 -->
           <el-form-item :label="$t('trials:trials-myinfo:form:userName')" style="margin-bottom: 5px;" prop="UserName">
             <span>{{ user.UserName }}</span>
@@ -111,7 +111,7 @@
           <!-- 修改密码 -->
           {{ $t('trials:trials-myinfo:title:updatePaasord') }}
         </div>
-        <el-form ref="passwordForm" label-position="right" :model="password" :rules="passwordFormRules" label-width="150px">
+        <el-form ref="passwordForm" label-position="right" :model="password" :rules="passwordFormRules" label-width="180px">
           <!-- 旧密码 -->
           <el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord">
             <el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:oldPassword')"/>

src/views/trials/trials-panel/enrolled-reviewers/list/index.vue

@@ -31,14 +31,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <router-link
-              style="color: #428bca;"
-              tag="a"
-              :to="{
-                path: `/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`,
-              }"
-              target="_blank"
-            >{{ scope.row.LastName }} / {{ scope.row.FirstName }}</router-link>
+            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
           </template>
         </el-table-column>
         <!-- Name CN -->
@@ -445,6 +438,9 @@ export default {
     this.initPage()
   },
   methods: {
+    go(path) {
+      window.open(path)
+    },
     beforeUpload() {
       if (this.fileList.length > 0) {
         // 只允许上传1个文件

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)

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) {

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')"
       >
         <div class="base-dialog-body">
           <DefaultQS @getList="getList" :is-distinguish-criteria="isDistinguishCriteria" @close="addVisible = false" />

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: []
     }

src/views/trials/trials-panel/setting/trial-config/components/criterionConfig.vue

@@ -33,7 +33,7 @@
         </el-form-item>
       </el-form>
       <div>
-        <el-button size="mini" type="primary" @click="preview.visible = true">预览</el-button>
+        <el-button size="mini" type="primary" @click="preview.visible = true">{{ $t('common:button:preview') }}</el-button>
         <el-button
           v-if="!data.IsCompleteConfig && ! data.IsSystemData"
           size="mini"
@@ -216,7 +216,7 @@ export default {
       loading: false,
       rowData: {},
       addOrEdit: { visible: false, title: '' },
-      preview: { visible: false, title: 'eCRF预览' }
+      preview: { visible: false, title: 'eCRF' + this.$t('common:button:preview') }
     }
   },
   mounted() {

src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue

@@ -1095,7 +1095,7 @@ export default {
       selectClinicalDataArr: [],
       selectedCD: [],
       QuestionConfigVisible: { visible: false, title: '' },
-      preview: { visible: false, title: '预览' },
+      preview: { visible: false, title: this.$t('common:button:preview') },
     }
   },
   mounted() {

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -180,11 +180,11 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            <el-tooltip placement="top">
+            <el-tooltip placement="top" v-key="scope.row.Id" v-if="scope.row.IsHaveUploadFailed">
               <div slot="content">
                 {{ $t('trials:uploadDicomList:table:status4') }}
               </div>
-              <span class="el-icon-warning" style="color: #cbb024;cursor: pointer" v-if="scope.row.IsHaveUploadFailed"></span>
+              <span class="el-icon-warning" style="color: #cbb024;cursor: pointer"></span>
             </el-tooltip>
             <span style="margin: 0 4px">{{ scope.row.SubjectCode }}</span>
             <!-- 基 -->

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -1331,7 +1331,9 @@ export default {
         })
         if (!isgo) {
           // `请补充检查${isgoList.toString()}的检查部位！`
-          this.$alert(this.$t('trials:qcQuality:title:title1').replace('xxx', isgoList.toString()))
+          this.$confirm(this.$t('trials:qcQuality:title:title1').replace('xxx', isgoList.toString()), '',{
+            showCancelButton: false
+          })
           return
         }
       }
@@ -1410,7 +1412,9 @@ export default {
             SubjectId: this.data.SubjectId
           }).then(res => {
             if (res.Result) {
-              this.$confirm(this.$t('trials:qcQuality:title:title2')).then(() => {
+              this.$confirm(this.$t('trials:qcQuality:title:title2', '', {
+                showCancelButton: false
+              })).then(() => {
                 collectNextIQCQuality({
                   trialId: this.trialId,
                   SubjectId: this.data.SubjectId

src/views/trials/trials-workbench/components/clinicalDataConfirm.vue

@@ -2,7 +2,7 @@
   <div class="wrapper">
     <el-row>
       <el-col :span="8">
-        <h3>{{$t('trials:audit:tab:clinicalData')}}{{$t('common:button:confirm')}}</h3>
+        <h3>{{$t('trials:audit:tab:clinicalDataconfirm')}}</h3>
       </el-col>
       <el-col :span="16" style="text-align:right;">
         <h3>