-
- {{ $t('trials:crcUpload:label:clinicalData') }}
-
+
+
+ {{ $t('trials:crcUpload:label:clinicalData') }}
+
+
-1) {
@@ -281,7 +282,7 @@ export default {
}
var arr = bodyPart.split(separator)
var newArr = arr.map(i => {
- return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name')
+ return this.$fd('Bodypart', i.trim(), 'Code', { Bodypart: this.bp }, 'Name')
})
return newArr.join(' | ')
}
diff --git a/src/views/trials/trials-panel/reading/none-dicoms/index.vue b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
index 442dc086..dfc43b00 100644
--- a/src/views/trials/trials-panel/reading/none-dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/none-dicoms/index.vue
@@ -70,7 +70,7 @@
@@ -87,7 +87,7 @@ import VisitReview from './components/VisitReview'
import GlobalReview from '@/views/trials/trials-panel/reading/global-review'
import AdReview from '@/views/trials/trials-panel/reading/ad-review'
import ClinicalData from '@/views/trials/trials-panel/reading/clinical-data'
-import { getToken } from '@/utils/auth'
+// import { getToken } from '@/utils/auth'
import OncologyReview from '@/views/trials/trials-panel/reading/oncology-review'
export default {
name: 'NoneDicomReading',
@@ -136,7 +136,7 @@ export default {
this.readingTool = this.$router.currentRoute.query.readingTool
this.isNewSubject = this.$router.currentRoute.query.isNewSubject
if (this.isNewSubject && this.isReadingTaskViewInOrder) {
- let message = this.$t('trials:reading:noneDicom:message:startRead').replace("xxx",this.subjectCode);
+ const message = this.$t('trials:reading:noneDicom:message:startRead').replace('xxx', this.subjectCode)
this.$message.success(message)
changeURLStatic('isNewSubject', '')
}
@@ -164,11 +164,11 @@ export default {
this.isShow = false
getNextTask(param).then(res => {
this.readingCategory = res.Result.ReadingCategory
- if (this.subjectId !== res.Result.SubjectId && this.isReadingTaskViewInOrder) {
- store.dispatch('reading/resetVisitTasks')
- var token = getToken()
- window.location.href = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingShowPreviousResults=${this.isReadingShowPreviousResults}&isReadingShowSubjectInfo=${this.isReadingShowSubjectInfo}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&isNewSubject=1&isReadingTaskViewInOrder=${res.Result.IsReadingTaskViewInOrder}&TokenKey=${token}`
- }
+ // if (this.subjectId !== res.Result.SubjectId && this.isReadingTaskViewInOrder) {
+ // store.dispatch('reading/resetVisitTasks')
+ // var token = getToken()
+ // window.location.href = `/noneDicomReading?trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingShowPreviousResults=${this.isReadingShowPreviousResults}&isReadingShowSubjectInfo=${this.isReadingShowSubjectInfo}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&isNewSubject=1&isReadingTaskViewInOrder=${res.Result.IsReadingTaskViewInOrder}&TokenKey=${token}`
+ // }
this.subjectId = res.Result.SubjectId
this.visitTaskId = res.Result.VisitTaskId
this.subjectCode = res.Result.SubjectCode
@@ -190,14 +190,17 @@ export default {
this.loading = false
}).catch(() => { this.loading = false })
},
- handleConfirmCD() {
+ async handleConfirmCD() {
this.loading = true
var visitTaskId = this.visitTaskId
- readClinicalData({ visitTaskId }).then(res => {
+ try {
+ await readClinicalData({ visitTaskId })
this.loading = false
this.dialogVisible = false
this.isReadClinicalData = true
- }).catch(() => { this.loading = false })
+ } catch (e) {
+ this.loading = false
+ }
}
}
}
diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue
index 940dc5a2..07cf129b 100644
--- a/src/views/trials/trials-panel/reading/oncology-review/index.vue
+++ b/src/views/trials/trials-panel/reading/oncology-review/index.vue
@@ -265,7 +265,7 @@ import { setSkipReadingCache } from '@/api/reading'
import { getAutoCutNextTask } from '@/api/user'
import const_ from '@/const/sign-code'
import { getToken } from '@/utils/auth'
-import store from '@/store'
+// import store from '@/store'
import { changeURLStatic } from '@/utils/history.js'
import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
import SignForm from '@/views/trials/components/newSignForm'
@@ -498,8 +498,9 @@ export default {
const res = await getAutoCutNextTask()
var isAutoTask = res.Result.AutoCutNextTask
if (isAutoTask) {
- store.dispatch('reading/resetVisitTasks')
- DicomEvent.$emit('getNextTask')
+ // store.dispatch('reading/resetVisitTasks')
+ // DicomEvent.$emit('getNextTask')
+ window.location.reload()
} else {
// '当前阅片任务已完成，是否进入下一个阅片任务？'
const confirm = await this.$confirm(
@@ -510,8 +511,9 @@ export default {
}
)
if (confirm === 'confirm') {
- store.dispatch('reading/resetVisitTasks')
- DicomEvent.$emit('getNextTask')
+ // store.dispatch('reading/resetVisitTasks')
+ // DicomEvent.$emit('getNextTask')
+ window.location.reload()
} else {
changeURLStatic('visitTaskId', this.visitTaskId)
}