XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

uat_us
caiyiling 2024-04-15 13:50:07 +08:00
parent cb24021c0d 917f95030b
commit df6a1cb412
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/reviewers/ReviewersResearchForm.vue
View File

@ -1,32 +1,33 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-tabs v-model="active" :before-leave="checkLeave" @tab-click="clickTab"> <el-tabs v-model="active" :before-leave="checkLeave" @tab-click="clickTab">
<el-tab-pane label="Basic Info" name="BasicInfo"> <el-tab-pane :label="$t('system:reviewer:tab:BasicInfo')" name="BasicInfo">
<basic-info v-if="load.BasicInfo" /> <basic-info v-if="load.BasicInfo" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Employment" name="Employment"> <el-tab-pane :label="$t('system:reviewer:tab:Employment')" name="Employment">
<Employment v-if="load.Employment" /> <Employment v-if="load.Employment" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Specialty" name="Specialty"> <el-tab-pane :label="$t('system:reviewer:tab:Specialty')" name="Specialty">
<specialty v-if="load.Specialty" /> <specialty v-if="load.Specialty" />
</el-tab-pane> </el-tab-pane>
<!--Education & Training-->
<el-tab-pane label="Education & Training" name="EducationTraining"> <el-tab-pane :label="$t('system:reviewer:tab:Education&Training')" name="EducationTraining">
<education-training v-if="load.EducationTraining" /> <education-training v-if="load.EducationTraining" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Research & Publication" name="ResearchPublication"> <!--Research & Publication-->
<el-tab-pane :label="$t('system:reviewer:tab:Research&Publication')" name="ResearchPublication">
<research-publication v-if="load.ResearchPublication" /> <research-publication v-if="load.ResearchPublication" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Trial Experience" name="TrialExperience"> <el-tab-pane :label="$t('system:reviewer:tab:TrialExperience')" name="TrialExperience">
<trial-experience v-if="load.TrialExperience" /> <trial-experience v-if="load.TrialExperience" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Credentials" name="Credentials"> <el-tab-pane :label="$t('system:reviewer:tab:Credentials')" name="Credentials">
<Credentials v-if="load.Credentials" /> <Credentials v-if="load.Credentials" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Resumes" name="Resumes"> <el-tab-pane :label="$t('system:reviewer:tab:Resumes')" name="Resumes">
<Resumes v-if="load.Resumes" /> <Resumes v-if="load.Resumes" />
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="Agreements" name="Agreements"> <el-tab-pane :label="$t('system:reviewer:tab:Agreements')" name="Agreements">
<Agreements v-if="load.Agreements" /> <Agreements v-if="load.Agreements" />
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -94,7 +95,7 @@ export default {
} }
changeURLStatic('tabActive', tab.name) changeURLStatic('tabActive', tab.name)
const id = getQueryString('Id') const id = getQueryString('Id')
this.$router.push({ path: `/ReviewersResearchForm?Id=${id}&tabActive=${tab.name}&ReviewStatus=${getQueryString('ReviewStatus')}` }) this.$router.push({ path: `/ReviewersResearchForm?Id=${id}&tabActive=${tab.name}&ReviewStatus=${getQueryString('ReviewStatus')}&lang=${this.$i18n.locale}` })
}, },
checkLeave() { checkLeave() {
const id = getQueryString('Id') const id = getQueryString('Id')

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

@ -1746,7 +1746,7 @@ export default {
res.Result === "CT、PT" || res.Result === "CT、PT" ||
res.Result === "PT、CT"; res.Result === "PT、CT";
// let flag = params.study.seriesList.some(item=>item.modality==='PT'); // let flag = params.study.seriesList.some(item=>item.modality==='PT');
if (flag) { if (flag && scope.relationInfo.IsHaveStudyClinicalData) {
scope.confirmFlag = true; scope.confirmFlag = true;
} }
scope.getStudyInfo(); scope.getStudyInfo();