稽查bug修复及国际化等修改
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2024-08-06 16:34:44 +08:00
parent f8837d8cef
commit 3820146acb
4 changed files with 38 additions and 57 deletions

View File

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

View File

@ -144,9 +144,9 @@ export default {
{ min: 0, max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`, trigger: 'blur' } { min: 0, max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`, trigger: 'blur' }
], ],
UserTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), 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: [ Email: [
{ required: true, validator: validateEmail, trigger: ['blur'] } { required: true, validator: validateEmail, trigger: ['blur'] }
] ]

View File

@ -821,39 +821,40 @@ import Pagination from '@/components/Pagination'
import BaseContainer from '@/components/BaseContainer' import BaseContainer from '@/components/BaseContainer'
import BaseModel from '@/components/BaseModel' import BaseModel from '@/components/BaseModel'
import { getToken } from '@/utils/auth' 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 { export default {
components: { BaseContainer, Pagination, BaseModel }, components: { BaseContainer, Pagination, BaseModel },
dicts: ['OptType', 'ModuleType', 'ChildrenType'], dicts: ['OptType', 'ModuleType', 'ChildrenType'],
data() { 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 { return {
isViewer: true, isViewer: true,
otherData:[], otherData:[],
@ -1295,30 +1296,7 @@ export default {
}) })
}, },
handleReset() { 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.timeList = []
this.getList() this.getList()
}, },
@ -1328,6 +1306,7 @@ export default {
}, },
getList() { getList() {
this.loading = true this.loading = true
this.searchData.TrialId = this.$route.query.trialId
getInspectionList(this.searchData).then((res) => { getInspectionList(this.searchData).then((res) => {
this.list = res.CurrentPageData this.list = res.CurrentPageData
// this.list = this.list.map(v => { // this.list = this.list.map(v => {

View File

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