审批签署、受试者、访视与中心调研表等模块项目中心字段维护
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2024-06-03 16:05:53 +08:00
parent 3212f0cde2
commit d94d864b9e
28 changed files with 85 additions and 84 deletions

View File

@ -17,9 +17,9 @@
<el-input v-model="form.IndicationType" disabled /> <el-input v-model="form.IndicationType" disabled />
</el-form-item> </el-form-item>
<!-- 中心名称 --> <!-- 中心名称 -->
<el-form-item :label="$t('trials:researchForm:form:siteName')" prop="SiteId"> <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="TrialSiteId">
<el-select <el-select
v-model="form.SiteId" v-model="form.TrialSiteId"
filterable filterable
style="width:100%;" style="width:100%;"
:disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory" :disabled="!(state === 0 && userTypeEnumInt === 0) || isHistory"
@ -29,12 +29,12 @@
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteAliasName" :label="item.TrialSiteAliasName"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item v-if="form.SiteId" :label="$t('trials:researchForm:form:siteId')"> <el-form-item v-if="form.TrialSiteId" :label="$t('trials:researchForm:form:siteId')">
<el-input v-model="form.TrialSiteCode" disabled /> <el-input v-model="form.TrialSiteCode" disabled />
</el-form-item> </el-form-item>
<!-- 联系人 --> <!-- 联系人 -->
@ -162,7 +162,7 @@ export default {
TrialSiteCode: '', TrialSiteCode: '',
TrialSiteAliasName: '', TrialSiteAliasName: '',
IndicationType: '', // IndicationType: '', //
SiteId: '', // TrialSiteId: '', //
UserName: '', // UserName: '', //
Phone: '', // Phone: '', //
Email: '', // Email: '', //
@ -174,7 +174,7 @@ export default {
NotFollowReson: '' NotFollowReson: ''
}, },
rules: { rules: {
SiteId: [ TrialSiteId: [
{ required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' } { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: 'blur' }
], ],
UserName: [ UserName: [
@ -202,7 +202,7 @@ export default {
const param = { const param = {
id: this.form.Id, id: this.form.Id,
trialId: this.$route.query.trialId, trialId: this.$route.query.trialId,
siteId: this.form.SiteId, trialSiteId: this.form.TrialSiteId,
userName: this.form.UserName, userName: this.form.UserName,
phone: this.form.Phone, phone: this.form.Phone,
email: this.form.Email, email: this.form.Email,
@ -246,7 +246,7 @@ export default {
this.form.TrialSiteCode = trialSiteSurvey.TrialSiteCode this.form.TrialSiteCode = trialSiteSurvey.TrialSiteCode
this.form.TrialSiteAliasName = trialSiteSurvey.TrialSiteAliasName // this.form.TrialSiteAliasName = trialSiteSurvey.TrialSiteAliasName //
this.form.IndicationType = trialInfo.IndicationType // this.form.IndicationType = trialInfo.IndicationType //
this.form.SiteId = trialSiteSurvey.SiteId this.form.TrialSiteId = trialSiteSurvey.TrialSiteId
this.form.UserName = trialSiteSurvey.UserName // this.form.UserName = trialSiteSurvey.UserName //
this.form.Phone = trialSiteSurvey.Phone // this.form.Phone = trialSiteSurvey.Phone //
this.form.Email = trialSiteSurvey.Email // this.form.Email = trialSiteSurvey.Email //
@ -260,7 +260,7 @@ export default {
this.isShow = true this.isShow = true
}, },
handleSiteChange(val) { handleSiteChange(val) {
var selected = this.siteOptions.find(item => item.SiteId === val) var selected = this.siteOptions.find(item => item.TrialSiteId === val)
if (selected) { if (selected) {
this.form.TrialSiteCode = selected.TrialSiteCode this.form.TrialSiteCode = selected.TrialSiteCode
} }

View File

@ -49,7 +49,7 @@ export default {
this.loading = true this.loading = true
var param = { var param = {
trialId: this.trialId, trialId: this.trialId,
siteId: this.siteId, trialSiteId: this.siteId,
trialSiteSurveyId: this.trialSiteSurveyId trialSiteSurveyId: this.trialSiteSurveyId
} }
getTrialSiteSurveySelectList(param).then(res => { getTrialSiteSurveySelectList(param).then(res => {

View File

@ -175,7 +175,7 @@ export default {
} }
}) })
this.state = res.Result.TrialSiteSurvey.State this.state = res.Result.TrialSiteSurvey.State
this.siteId = res.Result.TrialSiteSurvey.SiteId this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey) this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey)
this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey) this.$refs['historicalParticipant'].initList(historicalArr, res.Result.TrialSiteSurvey)
this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey) this.$refs['researchParticipants'].initList(newArr, res.Result.TrialSiteSurvey)

View File

@ -222,7 +222,7 @@ export default {
// this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType // this.trialSiteSurveyEquipmentType = res.Result.TrialInfo.TrialSiteSurveyEquipmentType
// this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles // this.trialSiteSurveyUserRoles = res.Result.TrialInfo.TrialSiteSurveyUserRoles
this.state = res.Result.TrialSiteSurvey.State this.state = res.Result.TrialSiteSurvey.State
this.siteId = res.Result.TrialSiteSurvey.SiteId this.siteId = res.Result.TrialSiteSurvey.TrialSiteId
this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey) this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey)
var historicalArr = [] var historicalArr = []
var newArr = [] var newArr = []

View File

@ -35,20 +35,20 @@
</el-form-item> </el-form-item>
<!-- 中心名称 --> <!-- 中心名称 -->
<el-form-item :label="$t('trials:researchForm:form:siteName')" prop="SiteId"> <el-form-item :label="$t('trials:researchForm:form:siteName')" prop="SiteId">
<el-select v-model="form.SiteId" filterable style="width:100%;" @change="handleSiteChange"> <el-select v-model="form.TrialSiteId" filterable style="width:100%;" @change="handleSiteChange">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteAliasName" :label="item.TrialSiteAliasName"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item v-if="form.SiteId" :label="$t('trials:researchForm:form:siteId')"> <el-form-item v-if="form.TrialSiteId" :label="$t('trials:researchForm:form:siteId')">
<el-input v-model="form.TrialSiteCode" disabled /> <el-input v-model="form.TrialSiteCode" disabled />
</el-form-item> </el-form-item>
<el-form-item v-if="form.SiteId && isHaveSiteSurveyRecord" label="" style="text-align:right;"> <el-form-item v-if="form.TrialSiteId && isHaveSiteSurveyRecord" label="" style="text-align:right;">
<!-- 更新调研表 --> <!-- 更新调研表 -->
<el-link v-if="!form.IsUpdate" type="primary" @click="form.IsUpdate = true"> <el-link v-if="!form.IsUpdate" type="primary" @click="form.IsUpdate = true">
{{ $t('trials:researchForm:button:updateQsForm') }} {{ $t('trials:researchForm:button:updateQsForm') }}
@ -160,7 +160,7 @@ export default {
TrialCode: null, // TrialCode: null, //
IndicationType: null, // IndicationType: null, //
ExperimentName: '', ExperimentName: '',
SiteId: null, // TrialSiteId: null, //
UserName: null, // UserName: null, //
Phone: '', // Phone: '', //
EmailOrPhone: '', EmailOrPhone: '',
@ -170,7 +170,7 @@ export default {
VerificationCode: '' VerificationCode: ''
}, },
rules: { rules: {
SiteId: [ TrialSiteId: [
{ required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] } { required: true, message: this.$t('trials:researchForm:formRule:specify'), trigger: ['blur'] }
], ],
UserName: [ UserName: [
@ -243,7 +243,7 @@ export default {
this.form.ReplaceUserEmailOrPhone = '' this.form.ReplaceUserEmailOrPhone = ''
} }
const param = { const param = {
siteId: this.form.SiteId, trialSiteId: this.form.TrialSiteId,
userName: this.form.UserName, userName: this.form.UserName,
phone: this.form.Phone, phone: this.form.Phone,
verificationType: 0, verificationType: 0,
@ -276,7 +276,7 @@ export default {
}, },
handleSiteChange(val) { handleSiteChange(val) {
this.isHaveSiteSurveyRecord = false this.isHaveSiteSurveyRecord = false
var selected = this.siteOptions.find(item => item.SiteId === val) var selected = this.siteOptions.find(item => item.TrialSiteId === val)
if (selected) { if (selected) {
this.form.TrialSiteCode = selected.TrialSiteCode this.form.TrialSiteCode = selected.TrialSiteCode
this.isHaveSiteSurveyRecord = selected.IsHaveSiteSurveyRecord this.isHaveSiteSurveyRecord = selected.IsHaveSiteSurveyRecord

View File

@ -5,12 +5,12 @@
<el-form :inline="true"> <el-form :inline="true">
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item :label="$t('trials:researchStaff:table:siteId')"> <el-form-item :label="$t('trials:researchStaff:table:siteId')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -260,7 +260,7 @@ const searchDataDefault = () => {
Asc: true, Asc: true,
PageIndex: 1, PageIndex: 1,
PageSize: 20, PageSize: 20,
SiteId: '', TrialSiteId: '',
UserTypeId: '', UserTypeId: '',
IsGenerateAccount: null, IsGenerateAccount: null,
TrialRoleCode: '', TrialRoleCode: '',

View File

@ -5,12 +5,12 @@
<el-form :inline="true"> <el-form :inline="true">
<!-- 中心 --> <!-- 中心 -->
<el-form-item :label="$t('trials:researchRecord:table:siteId')"> <el-form-item :label="$t('trials:researchRecord:table:siteId')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -301,7 +301,7 @@ const searchDataDefault = () => {
Asc: true, Asc: true,
PageIndex: 1, PageIndex: 1,
PageSize: 20, PageSize: 20,
SiteId: '', TrialSiteId: '',
UserKeyInfo: '', UserKeyInfo: '',
State: null, State: null,
IsDeleted: '', IsDeleted: '',

View File

@ -5,12 +5,12 @@
<el-form :inline="true"> <el-form :inline="true">
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item :label="$t('trials:reviewAssign:readingTask:table:siteCode')"> <el-form-item :label="$t('trials:reviewAssign:readingTask:table:siteCode')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -271,7 +271,7 @@ const searchDataDefault = () => {
Asc: true, Asc: true,
SortField: '', SortField: '',
TrialId: null, TrialId: null,
SiteId: null, TrialSiteId: null,
SubjectId: null, SubjectId: null,
SubjectCode: null, SubjectCode: null,
IsUrgent: null, IsUrgent: null,
@ -292,7 +292,7 @@ const taskSearchDataDefault = () => {
Asc: true, Asc: true,
SortField: '', SortField: '',
TrialId: null, TrialId: null,
SiteId: null, TrialSiteId: null,
SubjectId: null, SubjectId: null,
SubjectCode: null, SubjectCode: null,
DoctorUserId: null, DoctorUserId: null,

View File

@ -38,7 +38,7 @@
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>

View File

@ -439,7 +439,7 @@ export default {
handleAdd(row, type) { handleAdd(row, type) {
this.param = {} this.param = {}
this.param.SubjectId = row.SubjectId this.param.SubjectId = row.SubjectId
this.param.SiteId = row.SiteId this.param.TrialSiteId = row.TrialSiteId
this.param.SubjectCode = row.SubjectCode this.param.SubjectCode = row.SubjectCode
this.param.TrialSiteCode = row.TrialSiteCode this.param.TrialSiteCode = row.TrialSiteCode
this.param.TrialId = this.trialId this.param.TrialId = this.trialId

View File

@ -130,7 +130,7 @@ export default {
this.btnLoading = true this.btnLoading = true
this.form.TrialId = this.trialId this.form.TrialId = this.trialId
this.form.SiteId = this.data.SiteId this.form.TrialSiteId = this.data.TrialSiteId
updateSubjectStatus(this.form).then(res => { updateSubjectStatus(this.form).then(res => {
this.btnLoading = false this.btnLoading = false
this.$emit('getList') this.$emit('getList')

View File

@ -9,9 +9,9 @@
> >
<div class="base-dialog-body"> <div class="base-dialog-body">
<!-- Site --> <!-- Site -->
<el-form-item :label="$t('trials:subject:table:site')" prop="SiteId"> <el-form-item :label="$t('trials:subject:table:site')" prop="TrialSiteId">
<el-select <el-select
v-model="form.SiteId" v-model="form.TrialSiteId"
clearable clearable
filterable filterable
style="width:100%" style="width:100%"
@ -21,7 +21,7 @@
v-for="item of siteOptions" v-for="item of siteOptions"
:key="item.Id" :key="item.Id"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -117,7 +117,7 @@ export default {
Age: '', Age: '',
Sex: '', Sex: '',
BirthDate: '', BirthDate: '',
SiteId: '', TrialSiteId: '',
MedicalNo: '', MedicalNo: '',
Status: 1, Status: 1,
FirstGiveMedicineTime: '', FirstGiveMedicineTime: '',
@ -140,7 +140,7 @@ export default {
// Sex: [ // Sex: [
// { required: true, message: 'Please specify', trigger: 'blur' } // { required: true, message: 'Please specify', trigger: 'blur' }
// ], // ],
SiteId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }], TrialSiteId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
Reason: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }] Reason: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }]
}, },
pickerOption: { pickerOption: {

View File

@ -5,12 +5,12 @@
<el-form :inline="true"> <el-form :inline="true">
<!-- Site --> <!-- Site -->
<el-form-item :label="$t('trials:subject:table:site')"> <el-form-item :label="$t('trials:subject:table:site')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:130px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:130px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -295,7 +295,7 @@ const searchDataDefault = () => {
return { return {
Code: '', Code: '',
Status: '', Status: '',
SiteId: '', TrialSiteId: '',
ShortName: '', ShortName: '',
PageIndex: 1, PageIndex: 1,
PageSize: 20, PageSize: 20,

View File

@ -10,12 +10,12 @@
</el-form-item> </el-form-item>
<!-- 中心 --> <!-- 中心 -->
<el-form-item :label="$t('trials:auditRecord:table:siteNo')"> <el-form-item :label="$t('trials:auditRecord:table:siteNo')">
<el-select v-model="searchData.SiteId" clearable filterable> <el-select v-model="searchData.TrialSiteId" clearable filterable>
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -836,7 +836,7 @@ export default {
ModuleType: null, ModuleType: null,
BlindName: null, BlindName: null,
TrialId: this.$route.query.trialId, TrialId: this.$route.query.trialId,
SiteId: null, TrialSiteId: null,
SubjectId: null, SubjectId: null,
SubjectInfo: null, SubjectInfo: null,
SubjectVisitId: null, SubjectVisitId: null,
@ -1304,7 +1304,7 @@ export default {
ModuleType: null, ModuleType: null,
BlindName: null, BlindName: null,
TrialId: this.$route.query.trialId, TrialId: this.$route.query.trialId,
SiteId: null, TrialSiteId: null,
SubjectId: null, SubjectId: null,
SubjectInfo: null, SubjectInfo: null,
SubjectVisitId: null, SubjectVisitId: null,

View File

@ -33,7 +33,7 @@
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('trials:trials-list:form:declarationType')"> <el-descriptions-item :label="$t('trials:trials-list:form:declarationType')">
{{trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ')}} <span v-if="trialInfo.DeclarationTypeEnumList">{{trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ')}}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('trials:trials-list:form:phase')"> <el-descriptions-item :label="$t('trials:trials-list:form:phase')">
{{ trialInfo.Phase }} {{ trialInfo.Phase }}
@ -82,7 +82,8 @@
{{trialInfo.TotalReviewers}} {{trialInfo.TotalReviewers}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('trials:trials-list:form:typeofReviewers')"> <el-descriptions-item :label="$t('trials:trials-list:form:typeofReviewers')">
{{trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ')}} <span v-if="trialInfo.AttendedReviewerTypeEnumList">{{trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ')}}</span>
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>

View File

@ -5,12 +5,12 @@
<el-form :inline="true"> <el-form :inline="true">
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item :label="$t('trials:consistencyCheck:table:siteId')"> <el-form-item :label="$t('trials:consistencyCheck:table:siteId')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -414,7 +414,7 @@ import Pagination from '@/components/Pagination'
import const_ from '@/const/sign-code' import const_ from '@/const/sign-code'
const searchDataDefault = () => { const searchDataDefault = () => {
return { return {
SiteId: '', TrialSiteId: '',
SubjectInfo: '', SubjectInfo: '',
VisitPlanArray: [], VisitPlanArray: [],
CheckState: null, CheckState: null,

View File

@ -120,7 +120,7 @@
</el-tab-pane> </el-tab-pane>
<!-- 非DICOM影像上传 --> <!-- 非DICOM影像上传 -->
<el-tab-pane :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')" name="non-dicom"> <el-tab-pane :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')" name="non-dicom">
<upload-non-dicom-files v-if="activeName==='non-dicom'" :data="data" :site-id="data.SiteId" :subject-id="data.SubjectId" :allow-add-or-edit="true" :body-parts="bodyParts" :modalities="modalities" :subject-visit-id="data.SubjectVisitId" @getList="reFreshList" /> <upload-non-dicom-files v-if="activeName==='non-dicom'" :data="data" :site-id="data.TrialSiteId" :subject-id="data.SubjectId" :allow-add-or-edit="true" :body-parts="bodyParts" :modalities="modalities" :subject-visit-id="data.SubjectVisitId" @getList="reFreshList" />
</el-tab-pane> </el-tab-pane>
<!-- 临床数据采集 --> <!-- 临床数据采集 -->
<el-tab-pane v-if="data.IsBaseLine && clinicalEnum>0" :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')" name="clinical-data"> <el-tab-pane v-if="data.IsBaseLine && clinicalEnum>0" :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')" name="clinical-data">

View File

@ -5,12 +5,12 @@
<el-form :inline="true"> <el-form :inline="true">
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item :label="$t('trials:crcQuestion:table:siteId')"> <el-form-item :label="$t('trials:crcQuestion:table:siteId')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -272,7 +272,7 @@ const searchDataDefault = () => {
return { return {
IsOverTime: null, IsOverTime: null,
SubjectCode: '', SubjectCode: '',
SiteId: '', TrialSiteId: '',
VisitPlanArray: [], VisitPlanArray: [],
IsClosed: null, IsClosed: null,
PageIndex: 1, PageIndex: 1,

View File

@ -11,7 +11,7 @@
<!-- Site --> <!-- Site -->
<el-form-item :label="$t('trials:subject:table:site')" prop="SiteId"> <el-form-item :label="$t('trials:subject:table:site')" prop="SiteId">
<el-select <el-select
v-model="form.SiteId" v-model="form.TrialSiteId"
clearable clearable
filterable filterable
style="width:100%" style="width:100%"
@ -21,7 +21,7 @@
v-for="item of siteOptions" v-for="item of siteOptions"
:key="item.Id" :key="item.Id"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -92,7 +92,7 @@ export default {
Age: '', Age: '',
Sex: '', Sex: '',
BirthDate: '', BirthDate: '',
SiteId: '', TrialSiteId: '',
MedicalNo: '', MedicalNo: '',
Status: 1, Status: 1,
FirstGiveMedicineTime: '', FirstGiveMedicineTime: '',

View File

@ -906,7 +906,7 @@ export default {
var fileNum = scope.uploadQueues[index].fileList.length var fileNum = scope.uploadQueues[index].fileList.length
dicomInfo.seriesNum = seriesNum dicomInfo.seriesNum = seriesNum
dicomInfo.fileNum = fileNum dicomInfo.fileNum = fileNum
dicomInfo.siteId = scope.data.SiteId dicomInfo.siteId = scope.data.TrialSiteId
dicomInfo.subjectId = scope.data.SubjectId dicomInfo.subjectId = scope.data.SubjectId
dicomInfo.subjectVisitId = scope.subjectVisitId dicomInfo.subjectVisitId = scope.subjectVisitId
var params = { var params = {

View File

@ -1479,7 +1479,7 @@ export default {
try { try {
preArchiveDicomStudy({ preArchiveDicomStudy({
trialId: scope.trialId, trialId: scope.trialId,
siteId: scope.data.SiteId, trialSiteId: scope.data.TrialSiteId,
subjectId: scope.subjectId, subjectId: scope.subjectId,
subjectVisitId: scope.subjectVisitId, subjectVisitId: scope.subjectVisitId,
// failedFileCount: scope.uploadQueues[index].dicomInfo.failedFileCount, // failedFileCount: scope.uploadQueues[index].dicomInfo.failedFileCount,
@ -1498,7 +1498,7 @@ export default {
let fileList = scope.uploadQueues[index].fileList; let fileList = scope.uploadQueues[index].fileList;
dicomInfo.seriesNum = seriesNum; dicomInfo.seriesNum = seriesNum;
dicomInfo.fileNum = fileNum; dicomInfo.fileNum = fileNum;
dicomInfo.siteId = scope.data.SiteId; dicomInfo.trialSiteId = scope.data.TrialSiteId;
dicomInfo.subjectId = scope.data.SubjectId; dicomInfo.subjectId = scope.data.SubjectId;
dicomInfo.subjectVisitId = scope.subjectVisitId; dicomInfo.subjectVisitId = scope.subjectVisitId;
let t = setInterval(() => { let t = setInterval(() => {
@ -1516,7 +1516,7 @@ export default {
}; };
let params = { let params = {
trialId: scope.trialId, trialId: scope.trialId,
siteId: scope.data.SiteId, trialSiteId: scope.data.TrialSiteId,
subjectId: scope.subjectId, subjectId: scope.subjectId,
subjectVisitId: scope.subjectVisitId, subjectVisitId: scope.subjectVisitId,
studyMonitorId: res.Result, studyMonitorId: res.Result,
@ -1583,7 +1583,7 @@ export default {
Record.FileCount++; Record.FileCount++;
} else { } else {
let path = `/${params.trialId}/Image/${ let path = `/${params.trialId}/Image/${
params.siteId params.trialSiteId
}/${params.subjectId}/${params.subjectVisitId}/${ }/${params.subjectId}/${params.subjectVisitId}/${
dicomInfo.studyUid dicomInfo.studyUid
}/${scope.getGuid( }/${scope.getGuid(
@ -1607,7 +1607,7 @@ export default {
o.imageColumns, o.imageColumns,
o.imageRows o.imageRows
); );
let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`; let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`;
let OSSclient = scope.OSSclient; let OSSclient = scope.OSSclient;
let seriesRes = await OSSclient.put( let seriesRes = await OSSclient.put(
thumbnailPath, thumbnailPath,
@ -1688,7 +1688,7 @@ export default {
} }
let text = JSON.stringify(Record); let text = JSON.stringify(Record);
let logJsonBlob = scope.generateTxtFile(text); let logJsonBlob = scope.generateTxtFile(text);
let logJsonObjectName = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`; let logJsonObjectName = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`;
let logRes; let logRes;
try { try {
logRes = await scope.OSSclient.put( logRes = await scope.OSSclient.put(
@ -1716,7 +1716,7 @@ export default {
v.instanceList[0].imageColumns, v.instanceList[0].imageColumns,
v.instanceList[0].imageRows v.instanceList[0].imageRows
); );
let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`; let thumbnailPath = `/${params.trialId}/Image/${params.trialSiteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`;
let OSSclient = scope.OSSclient; let OSSclient = scope.OSSclient;
try { try {
let seriesRes = await OSSclient.put(thumbnailPath, blob); let seriesRes = await OSSclient.put(thumbnailPath, blob);

View File

@ -484,7 +484,7 @@ export default {
this.btnLoading = true this.btnLoading = true
this.form.BodyPart = this.form.BodyParts.join(', ') this.form.BodyPart = this.form.BodyParts.join(', ')
this.form.TrialId = this.trialId this.form.TrialId = this.trialId
this.form.SiteId = this.data.SiteId this.form.TrialSiteId = this.data.TrialSiteId
this.form.SubjectId = this.data.SubjectId this.form.SubjectId = this.data.SubjectId
this.form.SubjectVisitId = this.subjectVisitId this.form.SubjectVisitId = this.subjectVisitId
addOrUpdateNoneDicomStudy(this.form).then(res => { addOrUpdateNoneDicomStudy(this.form).then(res => {

View File

@ -5,7 +5,7 @@
<el-form-item :label="$t('trials:crcUpload:form:siteId')" prop="SiteId"> <el-form-item :label="$t('trials:crcUpload:form:siteId')" prop="SiteId">
<el-select <el-select
v-if="form.Id===''" v-if="form.Id===''"
v-model="form.SiteId" v-model="form.TrialSiteId"
clearable clearable
filterable filterable
style="width:100%" style="width:100%"
@ -15,7 +15,7 @@
v-for="item of siteOptions" v-for="item of siteOptions"
:key="item.Id" :key="item.Id"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
<el-input v-else v-model="form.TrialSiteCode" disabled /> <el-input v-else v-model="form.TrialSiteCode" disabled />
@ -168,7 +168,7 @@ export default {
btnLoading: false, btnLoading: false,
form: { form: {
Id: '', Id: '',
SiteId: '', TrialSiteId: '',
SubjectId: '', SubjectId: '',
VisitName: '', VisitName: '',
VisitNum: '', VisitNum: '',
@ -183,7 +183,7 @@ export default {
IsFinalVisit: false IsFinalVisit: false
}, },
rules: { rules: {
SiteId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }], TrialSiteId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
SubjectId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }], SubjectId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
VisitName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }], VisitName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }],
LastVisit: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }], LastVisit: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
@ -250,7 +250,7 @@ export default {
}, },
// //
getSubjectList() { getSubjectList() {
getSubjectListBySiteId(this.form.SiteId, this.trialId).then((res) => { getSubjectListBySiteId(this.form.TrialSiteId, this.trialId).then((res) => {
this.subjectOptions = res.Result this.subjectOptions = res.Result
} }
) )

View File

@ -11,12 +11,12 @@
</el-form-item> </el-form-item>
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:siteId')"> <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:siteId')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -1023,7 +1023,7 @@ import clinicalDataQuestions from '@/components/clinicalDataQuestions'
const searchDataDefault = () => { const searchDataDefault = () => {
return { return {
SubjectInfo: '', SubjectInfo: '',
SiteId: '', TrialSiteId: '',
PageIndex: 1, PageIndex: 1,
PageSize: 20, PageSize: 20,
VisitPlanArray: [], VisitPlanArray: [],

View File

@ -5,12 +5,12 @@
<el-form :inline="true"> <el-form :inline="true">
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item :label="$t('trials:dicomForward:table:siteId')"> <el-form-item :label="$t('trials:dicomForward:table:siteId')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -166,7 +166,7 @@ import BaseContainer from '@/components/BaseContainer'
import Pagination from '@/components/Pagination' import Pagination from '@/components/Pagination'
const searchDataDefault = () => { const searchDataDefault = () => {
return { return {
SiteId: '', TrialSiteId: '',
SubjectInfo: '', SubjectInfo: '',
VisitPlanArray: [], VisitPlanArray: [],
ForwardState: null, ForwardState: null,

View File

@ -2073,7 +2073,7 @@ export default {
this.btnLoading = true; this.btnLoading = true;
this.noneDicomForm.BodyPart = this.noneDicomForm.BodyParts.join(", "); this.noneDicomForm.BodyPart = this.noneDicomForm.BodyParts.join(", ");
this.noneDicomForm.TrialId = this.trialId; this.noneDicomForm.TrialId = this.trialId;
this.noneDicomForm.SiteId = this.data.SiteId; this.noneDicomForm.TrialSiteId = this.data.TrialSiteId;
this.noneDicomForm.SubjectId = this.data.SubjectId; this.noneDicomForm.SubjectId = this.data.SubjectId;
this.noneDicomForm.SubjectVisitId = this.data.Id; this.noneDicomForm.SubjectVisitId = this.data.Id;
addOrUpdateNoneDicomStudy(this.noneDicomForm) addOrUpdateNoneDicomStudy(this.noneDicomForm)

View File

@ -11,12 +11,12 @@
</el-form-item> </el-form-item>
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item :label="$t('trials:qcCheck:table:siteId')"> <el-form-item :label="$t('trials:qcCheck:table:siteId')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="(item,index) of siteOptions" v-for="(item,index) of siteOptions"
:key="index" :key="index"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -646,7 +646,7 @@ import { getToken } from '@/utils/auth'
const searchDataDefault = () => { const searchDataDefault = () => {
return { return {
TrialId: '', TrialId: '',
SiteId: '', TrialSiteId: '',
SubjectInfo: '', SubjectInfo: '',
VisitPlanArray: [], VisitPlanArray: [],
IsUrgent: null, IsUrgent: null,

View File

@ -5,12 +5,12 @@
<el-form :inline="true"> <el-form :inline="true">
<!-- 中心编号 --> <!-- 中心编号 -->
<el-form-item :label="$t('trials:qcQuality:table:siteId')"> <el-form-item :label="$t('trials:qcQuality:table:siteId')">
<el-select v-model="searchData.SiteId" clearable filterable style="width:120px;"> <el-select v-model="searchData.TrialSiteId" clearable filterable style="width:120px;">
<el-option <el-option
v-for="item of siteOptions" v-for="item of siteOptions"
:key="item.Id" :key="item.Id"
:label="item.TrialSiteCode" :label="item.TrialSiteCode"
:value="item.SiteId" :value="item.TrialSiteId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -388,7 +388,7 @@ import Pagination from '@/components/Pagination'
import { changeURLStatic } from '@/utils/history.js' import { changeURLStatic } from '@/utils/history.js'
const searchDataDefault = () => { const searchDataDefault = () => {
return { return {
SiteId: '', TrialSiteId: '',
SubjectCode: '', SubjectCode: '',
NeedReUpload: null, NeedReUpload: null,
IsOverTime: null, IsOverTime: null,