diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue
index 5674f3e1..2a9b9256 100644
--- a/src/views/reviewers/curriculumVitae/preview.vue
+++ b/src/views/reviewers/curriculumVitae/preview.vue
@@ -701,6 +701,10 @@ export default {
type: String,
default: '',
},
+ trialId: {
+ type: String,
+ default: '',
+ },
isEN: {
type: Boolean,
default: false,
@@ -830,7 +834,7 @@ export default {
try {
let id = this.reviewerId
this.loading = true
- let res = await getDetail(id)
+ let res = await getDetail(id, this.trialId)
this.loading = false
if (res.IsSuccess) {
this.reviewerData = res.Result
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
index 00ab3e5d..5dd4dce1 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
@@ -27,7 +27,7 @@
>
- {{ scope.row.LastName }} / {{ scope.row.FirstName }}
+ {{ scope.row.LastName }} / {{ scope.row.FirstName }}
@@ -160,7 +160,7 @@ export default {
},
handleSelectTable(row) { return row.DoctorTrialState !== 8 },
handleDetail(row) {
- const { href } = this.$router.resolve({ path: `/trialsResume?doctorId=${row.Id}` })
+ const { href } = this.$router.resolve({ path: `/trialsResume?doctorId=${row.Id}&trialId=${this.$route.query.trialId}` })
window.open(href, '_blank')
}
}
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
index 9038ac50..e914972b 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
@@ -1,13 +1,13 @@
-
+
@@ -18,7 +18,7 @@
- {{ scope.row.LastName }} / {{ scope.row.FirstName }}
+ {{ scope.row.LastName }} / {{ scope.row.FirstName }}
@@ -64,9 +72,15 @@
min-width="120"
>
- {{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}
- {{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}
- {{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}
+ {{
+ $fd('DoctorTrialState', scope.row.DoctorTrialState)
+ }}
+ {{
+ $fd('DoctorTrialState', scope.row.DoctorTrialState)
+ }}
+ {{
+ $fd('DoctorTrialState', scope.row.DoctorTrialState)
+ }}
@@ -87,7 +101,13 @@
-->
-
+
@@ -108,15 +128,17 @@ export default {
PageIndex: 1,
PageSize: 20,
Asc: false,
- SortField: ''
+ SortField: '',
},
total: 0,
listLoading: false,
confirmIdArr: [],
- token: store.getters.token
+ token: store.getters.token,
}
},
- created() { this.initPage() },
+ created() {
+ this.initPage()
+ },
methods: {
go(path) {
window.open(path)
@@ -127,23 +149,27 @@ export default {
getList() {
this.listLoading = true
this.listQuery.TrialId = this.$route.query.trialId
- getConfirmationReviewerList(this.listQuery).then(res => {
- this.listLoading = false
- this.list = res.Result.CurrentPageData
- this.total = res.Result.TotalCount
- // eslint-disable-next-line handle-callback-err
- }).catch(() => { this.listLoading = false })
+ getConfirmationReviewerList(this.listQuery)
+ .then((res) => {
+ this.listLoading = false
+ this.list = res.Result.CurrentPageData
+ this.total = res.Result.TotalCount
+ // eslint-disable-next-line handle-callback-err
+ })
+ .catch(() => {
+ this.listLoading = false
+ })
},
handleConfirm() {
// Reviewer(s) Confirmed?
this.$confirm(this.$t('trials:seletctedReviews:message:msg2'), {
type: 'warning',
- distinguishCancelAndClose: true
+ distinguishCancelAndClose: true,
})
.then(() => {
this.doctorConfirm(1)
})
- .catch(action => {
+ .catch((action) => {
// if (action === 'cancel') {
// this.doctorConfirm(0)
// }
@@ -157,15 +183,17 @@ export default {
DoctorIdArray: this.confirmIdArr,
ConfirmState: state,
BaseUrl: `${location.protocol}//${location.host}/login`,
- RouteUrl: `${location.protocol}//${location.host}/email-recompose`
+ RouteUrl: `${location.protocol}//${location.host}/email-recompose`,
}
- confirmReviewer(params).then(res => {
- this.loading = false
- this.getList()
- this.$message.success(this.$t('common:message:savedSuccessfully'))
- }).catch(() => {
- this.loading = false
- })
+ confirmReviewer(params)
+ .then((res) => {
+ this.loading = false
+ this.getList()
+ this.$message.success(this.$t('common:message:savedSuccessfully'))
+ })
+ .catch(() => {
+ this.loading = false
+ })
},
handleSelectionChange(val) {
const arr = []
@@ -189,19 +217,23 @@ export default {
return 'selected'
}
},
- handleSelectTable(row) { return row.DoctorTrialState !== 10 },
+ handleSelectTable(row) {
+ return row.DoctorTrialState !== 10
+ },
handleDetail(row) {
- const { href } = this.$router.resolve({ path: `/trialsResume?doctorId=${row.Id}` })
+ const { href } = this.$router.resolve({
+ path: `/trialsResume?doctorId=${row.Id}&trialId=${this.$route.query.trialId}`,
+ })
window.open(href, '_blank')
},
cellColor({ row, column, rowIndex, columnIndex }) {
if (row.DoctorTrialState === 10 && columnIndex === 5) {
return {
- color: '#428bca'
+ color: '#428bca',
}
}
- }
- }
+ },
+ },
}
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 561999f6..e20f2886 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -168,7 +168,9 @@
{{ scope.row.LastName }} / {{ scope.row.FirstName }}
@@ -581,7 +583,7 @@ export default {
},
handleDetail(row) {
const { href } = this.$router.resolve({
- path: `/trialsResume?doctorId=${row.Id}`,
+ path: `/trialsResume?doctorId=${row.Id}&trialId=${this.$route.query.trialId}`,
})
window.open(href, '_blank')
},
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
index 22e268b1..8b56712f 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
@@ -1,11 +1,11 @@
-
+
- {{ scope.row.LastName }} / {{ scope.row.FirstName }}
+ {{ scope.row.LastName }} / {{ scope.row.FirstName }}
@@ -74,8 +82,12 @@
min-width="100"
>
- {{ $fd('DoctorTrialState', scope.row.DoctorTrialState) }}
- {{ $fd('DoctorTrialState', 16) }}
+ {{
+ $fd('DoctorTrialState', scope.row.DoctorTrialState)
+ }}
+ {{
+ $fd('DoctorTrialState', 16)
+ }}
@@ -106,7 +118,13 @@
-
+
中文
@@ -130,11 +152,15 @@
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
index 750d9467..33e8b2c2 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue
@@ -1,7 +1,7 @@