Merge branch 'uat' into uat_us

src/components/MFA/index.vue

@@ -167,6 +167,7 @@ export default {
           this.timer = setInterval(() => {
             this.second--;
             if (this.second <= 0) {
+              this.flag = false;
               clearInterval(this.timer);
               this.timer = null;
             }
@@ -201,7 +202,7 @@ export default {
     margin-right: 5px;
   }
 }
-::v-deep .el-dialog__header{
+::v-deep .el-dialog__header {
   font-weight: bold;
 }
 </style>

src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue

@@ -231,7 +231,13 @@ export default {
       window.open(href, '_blank')
     },
     handleDownloadAll() {
-      this.dialogVisible = true
+      // 英文环境直接下载
+      if (process.env.NODE_ENV === 'usa') {
+        this.language = 2
+        this.handleDownloadResumes()
+      } else {
+        this.dialogVisible = true
+      }
     },
     getFileData(fileUrl) {
       return new Promise((resolve, reject) => {
@@ -285,11 +291,16 @@ export default {
         language: this.language
       }).then(async res => {
         this.selectTable = {};
-        for (let i = 0; res.Result.length > i; i++) {
-          let item = res.Result[i]
-          await this.handleBatchDown(item)
-        }
         this.dialogVisible = false
+        if (!res.Result || res.Result.length === 0) {
+          this.$alert(this.$t('trials:seletctedReviews:table:noResume'))
+        }else{
+          for (let i = 0; res.Result.length > i; i++) {
+            let item = res.Result[i]
+            await this.handleBatchDown(item)
+          }
+        }
+        
       }).catch(err=>{
         this.dialogVisible = false;
         this.selectTable= {};
@@ -305,9 +316,14 @@ export default {
       downloadResume(this.$route.query.trialId, this.language, arr).then(res => { window.open(res.Result) })
     },
     handleDownload(row) { 
-      // this.downloadResume([row.Id]) 
+      this.selectTable = row
-      this.dialogVisible = true;
+      // 英文环境直接下载
-      this.selectTable = row;
+      if (process.env.NODE_ENV === 'usa') {
+        this.language = 2
+        this.handleDownloadResumes()
+      } else {
+        this.dialogVisible = true
+      }
     }
   }
 }

src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue

@@ -1054,7 +1054,7 @@ export default {
         this.stack.studyId = dicomSeries.studyId
         this.stack.seriesNumber = dicomSeries.seriesNumber
         this.stack.imageIds = dicomSeries.imageIds
-        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0
         this.stack.imageIdIndex = dicomSeries.imageIdIndex
         this.stack.firstImageLoading = true
         this.stack.visitTaskId = dicomSeries.visitTaskId

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -1038,7 +1038,7 @@ export default {
         this.stack.studyId = dicomSeries.studyId
         this.stack.seriesNumber = dicomSeries.seriesNumber
         this.stack.imageIds = dicomSeries.imageIds
-        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length - 1 ? dicomSeries.imageIdIndex : 0
+        this.stack.currentImageIdIndex = dicomSeries.imageIdIndex && dicomSeries.imageIdIndex < dicomSeries.imageIds.length ? dicomSeries.imageIdIndex : 0
         this.stack.imageIdIndex = dicomSeries.imageIdIndex
         this.stack.firstImageLoading = true
         this.stack.visitTaskId = dicomSeries.visitTaskId

src/views/trials/trials-panel/setting/email-manage/index.vue

@@ -8,7 +8,7 @@
           ref="emailRulesForm"
           v-loading="loading"
           :model="form"
-          style="width:800px;"
+          style="width:800px;margin-top: 10px;"
           :rules="rules"
           label-width="230px"
           size="small"

src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue

@@ -144,9 +144,9 @@ export default {
           { min: 0, max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`, trigger: 'blur' }
         ],
         UserTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
-        Phone: [
+        // Phone: [
-          { required: false, validator: checkPhone, trigger: ['blur'] }
+        //   { required: false, validator: checkPhone, trigger: ['blur'] }
-        ],
+        // ],
         Email: [
           { required: true, validator: validateEmail, trigger: ['blur'] }
         ]

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -439,7 +439,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <div v-if="otherData.length > 0" style="margin-top: 20px;margin-bottom: 10px;">
+          <div v-if="otherData.length > 0 && otherData[0].Value" style="margin-top: 20px;margin-bottom: 10px;">
             <!-- 签名信息: -->
             {{$t('trials:auditRecord:title:signInfo')}}
           </div>
@@ -777,7 +777,7 @@
               </template>
             </el-table-column>
           </el-table>
-          <div v-if="otherData.length > 0" style="margin-top: 20px;margin-bottom: 10px;">
+          <div v-if="otherData.length > 0 && otherData[0].Value" style="margin-top: 20px;margin-bottom: 10px;">
             <!-- 签名信息: -->
             {{$t('trials:auditRecord:title:signInfo')}}
           </div>
@@ -821,39 +821,40 @@ import Pagination from '@/components/Pagination'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
 import { getToken } from '@/utils/auth'
-
+const searchDataDefault = () => {
+  return {
+    SortField: 'CreateTime',
+    Asc: false,
+    PageIndex: 1,
+    PageSize: 20,
+    ModuleType: null,
+    BlindName: null,
+    TrialId: '',
+    TrialSiteId: null,
+    SubjectId: null,
+    SubjectInfo: null,
+    SubjectVisitId: null,
+    VisitPlanInfo: null,
+    OptType: null,
+    ChildrenType: null,
+    Reason: null,
+    IsSign: null,
+    StartTime: null,
+    EndTime: null,
+    Description: null,
+    OpByUserName: null,
+    BatchId: null,
+    TrialReadingCriterionId: null,
+    RoleName:null,
+    TaskName: '',
+    CreateUserRealName: ''
+  }
+}
 export default {
   components: { BaseContainer, Pagination, BaseModel },
   dicts: ['OptType', 'ModuleType', 'ChildrenType'],
   data() {
-    const searchDataDefault = () => {
+    
-      return {
-        SortField: 'CreateTime',
-        Asc: false,
-        PageIndex: 1,
-        PageSize: 20,
-        ModuleType: null,
-        BlindName: null,
-        TrialId: this.$route.query.trialId,
-        TrialSiteId: null,
-        SubjectId: null,
-        SubjectInfo: null,
-        SubjectVisitId: null,
-        VisitPlanInfo: null,
-        OptType: null,
-        ChildrenType: null,
-        Reason: null,
-        IsSign: null,
-        StartTime: null,
-        EndTime: null,
-        Description: null,
-        OpByUserName: null,
-        BatchId: null,
-        TrialReadingCriterionId: null,
-        RoleName:null,
-        TaskName: null
-      }
-    }
     return {
       isViewer: true,
       otherData:[],
@@ -1295,30 +1296,7 @@ export default {
       })
     },
     handleReset() {
-      this.searchData = Object.assign(this.searchData, {
+      this.searchData = searchDataDefault()
-        SortField: '',
-        Asc: false,
-        PageIndex: 1,
-        PageSize: 20,
-        ModuleType: null,
-        BlindName: null,
-        TrialId: this.$route.query.trialId,
-        TrialSiteId: null,
-        SubjectId: null,
-        SubjectInfo: null,
-        SubjectVisitId: null,
-        VisitPlanInfo: null,
-        OptType: null,
-        ChildrenType: null,
-        Reason: null,
-        IsSign: null,
-        StartTime: null,
-        EndTime: null,
-        Description: null,
-        OpByUserName: null,
-        BatchId: null,
-        RoleName: null
-      })
       this.timeList = []
       this.getList()
     },
@@ -1328,6 +1306,7 @@ export default {
     },
     getList() {
       this.loading = true
+      this.searchData.TrialId = this.$route.query.trialId
       getInspectionList(this.searchData).then((res) => {
         this.list = res.CurrentPageData
         // this.list = this.list.map(v => {

src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue

@@ -213,6 +213,7 @@
             name="file"
             ref="pathClear"
             :disabled="btnLoading"
+            title=""
             webkitdirectory
             multiple
             @change="beginScanFiles($event)"
@@ -2015,6 +2016,7 @@ export default {
     opacity: 0;
     cursor: pointer;
   }
+  
 
   #inputForm #listWrapper {
     margin-top: 10px;

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -85,11 +85,11 @@
           <el-date-picker
             v-model="timeList"
             value-format="yyyy-MM-dd HH:mm:ss"
-            format="yyyy-MM-dd"
+            format="yyyy-MM-dd HH:mm:ss"
             type="datetimerange"
             :default-time="['00:00:00', '23:59:59']"
             @change="changeTimeList"
-            style="width:250px"
+            style="width:240px"
           />
         </el-form-item>
         <el-form-item>