diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue index b359e87c..56a4e131 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue @@ -657,7 +657,7 @@ export default { this.$emit('setGlobalReading', res.Result.IsGlobalReading) this.$emit('setOncologyReading', res.Result.IsOncologyReading) this.$emit('setDigitPlaces', res.Result.DigitPlaces) - this.$emit('setReadingTools', res.Result.ReadingToolList) + this.$emit('setReadingTools', { readingTools: res.Result.ReadingToolList, isNoneDicom: this.form.ReadingTool === 1 }) if (res.Result.ReadingType === 1) { this.$emit('setArbitrationReading', false) diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue index a1cd1268..23ceda7d 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/index.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue @@ -3,99 +3,51 @@
@@ -176,7 +107,7 @@ import GlobalReading from "./components/GlobalReading"; import OncologyForm from "./components/OncologyForm"; import SignForm from "@/views/trials/components/newSignForm"; import const_ from "@/const/sign-code"; -import { getCustomizeStandardsTools } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig' +import { getCustomizeStandardsTools, getCustomizeStandardsNoneDicomTools } from '@/views/trials/trials-panel/reading/dicoms3D/components/toolConfig' export default { name: "ReadingUnit", components: { @@ -290,7 +221,7 @@ export default { this.trialCriterionList[0].TrialReadingCriterionId; this.isShow = true; }) - .catch(() => {}); + .catch(() => { }); }, setConfirm(isConfirm) { this.isConfirm = isConfirm; @@ -298,8 +229,14 @@ export default { setDigitPlaces(digitPlaces) { this.digitPlaces = digitPlaces; }, - setReadingTools(readingTools) { - this.readingTools = getCustomizeStandardsTools(readingTools) + setReadingTools(data) { + let { readingTools, isNoneDicom } = data + if (isNoneDicom) { + this.readingTools = getCustomizeStandardsNoneDicomTools(readingTools) + } else { + this.readingTools = getCustomizeStandardsTools(readingTools) + } + }, setIsClinicalReading(isClinicalReading) { this.isClinicalReading = isClinicalReading; @@ -324,11 +261,9 @@ export default { }) .then((res) => { this.$router.push({ - path: `/trials/trials-panel/setting/reading-unit?trialId=${ - this.$route.query.trialId - }&trialCode=${this.$route.query.trialCode}&researchProgramNo=${ - this.$route.query.researchProgramNo - }&t=${new Date().getTime()}`, + path: `/trials/trials-panel/setting/reading-unit?trialId=${this.$route.query.trialId + }&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo + }&t=${new Date().getTime()}`, }); this.loading = false; }) @@ -352,7 +287,7 @@ export default { .then(() => { this.updateCriterions(); }) - .catch((action) => {}); + .catch((action) => { }); } else { try { var isCheckList = []; @@ -468,27 +403,27 @@ export default { this.$refs[ "readingRules" + this.TrialReadingCriterionId ][0].initPage(); - } catch (e) {} + } catch (e) { } try { this.$refs[ "readingCriterions" + this.TrialReadingCriterionId ][0].initPage(); - } catch (e) {} + } catch (e) { } try { this.$refs[ "arbitrationRules" + this.TrialReadingCriterionId ][0].getList(); - } catch (e) {} + } catch (e) { } try { this.$refs[ "globalReading" + this.TrialReadingCriterionId ][0].initForm(); - } catch (e) {} + } catch (e) { } try { this.$refs[ "oncologyForm" + this.TrialReadingCriterionId ][0].initForm(); - } catch (e) {} + } catch (e) { } this.$refs["signForm"].btnLoading = false; this.signVisible = false; } catch (e) { @@ -523,20 +458,25 @@ export default { background-color: #fff; display: flex; flex-direction: column; + .content { flex: 1; overflow-y: auto; } + ::v-deep .el-collapse-item__header { background: #e5ecef; padding-left: 10px; } + ::v-deep .el-tabs--border-card>.el-tabs__content { padding: 0px 15px; } + ::v-deep .el-collapse-item__content { padding: 10px; } + .bottom { height: 50px; display: flex;