diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue index 4642b0a8..73310696 100644 --- a/src/components/MFA/index.vue +++ b/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; } \ No newline at end of file diff --git a/src/views/blindResumeInfo/info.vue b/src/views/blindResumeInfo/info.vue index 1790345c..2c2305e2 100644 --- a/src/views/blindResumeInfo/info.vue +++ b/src/views/blindResumeInfo/info.vue @@ -1,14 +1,14 @@ -
+
{{$t('trials:auditRecord:title:signInfo')}}
@@ -777,7 +777,7 @@ -
+
{{$t('trials:auditRecord:title:signInfo')}}
@@ -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, { - 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.searchData = searchDataDefault() 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 => { diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index caa0c99f..e98c8e47 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -221,6 +221,7 @@ :disabled="btnLoading" webkitdirectory multiple + title="" @change="beginScanFiles($event)" />
@@ -2053,6 +2054,7 @@ export default { opacity: 0; cursor: pointer; } + #inputForm #listWrapper { margin-top: 10px;