diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a23e3b85..512faf72 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -327,7 +327,7 @@ export default {
},
mounted() {
let lang = zzSessionStorage.getItem('lang') || 'zh'
- zzSessionStorage.clear()
+ // zzSessionStorage.clear()
this.loginType = this.$route.query.loginType
this.location = this.$route.query.location
zzSessionStorage.setItem('loginType', this.loginType)
@@ -414,6 +414,8 @@ export default {
)
return
} else if (res.IsMFA) {
+ zzSessionStorage.removeItem('userId')
+ zzSessionStorage.removeItem('identityUserId')
this.$MFA({
UserId: res.BasicInfo.IdentityUserId,
EMail: res.BasicInfo.EMail,
diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue
index f5dda6db..bf9e1e62 100644
--- a/src/views/trials/trials-panel/site/index.vue
+++ b/src/views/trials/trials-panel/site/index.vue
@@ -83,7 +83,18 @@
:label="$t('trials:site:table:subjects')"
show-overflow-tooltip
sortable="custom"
- />
+ >
+
+
+ {{ scope.row.SubjectCount }}
+
+ {{ scope.row.SubjectCount }}
+
+
+ >
+
+
+ {{ scope.row.VisitCount }}
+
+ {{ scope.row.VisitCount }}
+
+
{ return r.name === 'Trials' })
+ const trialsPanelRouter = trialsRouter.children.find(r => { return r.name === 'TrialsPanel' }).children
+ this.hasSubjectRoute = this.hasRoute('subject-list', trialsPanelRouter)
+ this.hasVisitRoute = this.hasRoute('crc-upload', trialsPanelRouter)
this.getList()
},
methods: {
@@ -273,6 +300,26 @@ export default {
this.searchData.PageIndex = 1
this.getList()
},
+ jumpToSubjectList(trialSiteId) {
+ this.$router.push({ path: `/trials/trials-panel/subject/subject-list?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&trialSiteId=${trialSiteId}` })
+ },
+ jumpToVisitList(trialSiteId) {
+ this.$router.push({ path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&trialSiteId=${trialSiteId}` })
+ },
+ hasRoute(name, routeList) {
+ for (let i = 0; i < routeList.length; i++) {
+ if (routeList[i].name === name) {
+ return true
+ }
+ if (routeList[i].children) {
+ const flag = this.hasRoute(name, routeList[i].children)
+ if (flag) {
+ return flag
+ }
+ }
+ }
+ return false
+ }
},
}
diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index 8da20979..dce76874 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -291,6 +291,7 @@ import SubjectsForm from './components/SubjectsForm'
import SubjectStatusForm from './components/SubjectStatusForm'
import MessageTable from './components/MessageTable'
import moment from 'moment'
+import { changeURLStatic } from '@/utils/history.js'
const searchDataDefault = () => {
return {
Code: '',
@@ -339,6 +340,10 @@ export default {
this.hasCrcRoute = this.hasRoute('crc-upload', trialsPanelRouter)
this.hasQCRoute = this.hasRoute('qc-check', trialsPanelRouter)
this.trialId = this.$route.query.trialId
+ if (this.$route.query.trialSiteId) {
+ this.searchData.TrialSiteId = this.$route.query.trialSiteId
+ changeURLStatic('trialSiteId', '')
+ }
this.getSite()
this.getList()
},
@@ -441,7 +446,7 @@ export default {
// 关闭状态编辑框
closeStatusDialog() {
this.statusVisible = false
- },
+ },
handleTotalVisitCount(subjectCode) {
if (this.hasCrcRoute) {
this.$router.push({ path: `/trials/trials-panel/visit/crc-upload?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&subjectCode=${subjectCode}` })
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index bf178718..725cefbb 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -1680,8 +1680,13 @@ export default {
this.getSite()
if (this.$route.query.subjectCode) {
this.searchData.SubjectInfo = this.$route.query.subjectCode
+ changeURLStatic('subjectCode', '')
+ }
+
+ if (this.$route.query.trialSiteId) {
+ this.searchData.TrialSiteId = this.$route.query.trialSiteId
+ changeURLStatic('trialSiteId', '')
}
- changeURLStatic('subjectCode', '')
this.TrialCode = this.$route.query.trialCode
this.getList()
this.getVisitPlanOptions()