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

被融合病灶不允许画标记
continuous-integration/drone/push Build is passing Details

main
wangxiaoshuang 2025-12-26 14:14:55 +08:00
parent 3dc99d096d
commit 4ee7906dcd
12 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
View File

@ -133,8 +133,9 @@
</div> </div>
<div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer" <div
style="text-align:right;margin-top:10px;"> v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
class="base-dialog-footer" style="text-align:right;margin-top:10px;">
<!-- 清除标记 --> <!-- 清除标记 -->
<el-button <el-button
v-if="questionForm.MeasureData && (!isFirstChangeTask || (isFirstChangeTask && (lesionType === 5 || lesionType === 6)))" v-if="questionForm.MeasureData && (!isFirstChangeTask || (isFirstChangeTask && (lesionType === 5 || lesionType === 6)))"
@ -275,7 +276,7 @@ export default {
this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '') this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '') this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '') this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
// saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整 // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
var lesionState = this.getQuestionVal(7) var lesionState = this.getQuestionVal(7)
if (this.questionForm.RowId) { if (this.questionForm.RowId) {

6
src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue
View File

@ -737,6 +737,9 @@ export default {
var rowIndex = String(this.unSaveTargets[0].rowIndex) var rowIndex = String(this.unSaveTargets[0].rowIndex)
var questionId = this.unSaveTargets[0].questionId var questionId = this.unSaveTargets[0].questionId
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) { if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
return this.checkToolCanActive(toolName) return this.checkToolCanActive(toolName)
} else { } else {
@ -770,6 +773,9 @@ export default {
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
var isLymphNodes = this.$refs[refName][0].getQuestionVal(2) var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (!this.$refs[refName][0].questionForm.MeasureData) { if (!this.$refs[refName][0].questionForm.MeasureData) {
if (this.isBaseLineTask) { if (this.isBaseLineTask) {
if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') { if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {

2
src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
View File

@ -340,7 +340,7 @@ export default {
this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '') this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '') this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '') this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
// saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整 // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
var lesionState = this.getQuestionVal(7) var lesionState = this.getQuestionVal(7)
if (this.questionForm.RowId) { if (this.questionForm.RowId) {

6
src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
View File

@ -735,6 +735,9 @@ export default {
var rowIndex = String(this.unSaveTargets[0].rowIndex) var rowIndex = String(this.unSaveTargets[0].rowIndex)
var questionId = this.unSaveTargets[0].questionId var questionId = this.unSaveTargets[0].questionId
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) { if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
return this.checkToolCanActive(toolName) return this.checkToolCanActive(toolName)
} else { } else {
@ -765,6 +768,9 @@ export default {
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
var isLymphNodes = this.$refs[refName][0].getQuestionVal(2) var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (!this.$refs[refName][0].questionForm.MeasureData) { if (!this.$refs[refName][0].questionForm.MeasureData) {
if (this.isBaseLineTask) { if (this.isBaseLineTask) {
if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') { if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {

4
src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue
View File

@ -340,7 +340,7 @@ export default {
this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '') this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '') this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '') this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
// saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整 // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
var lesionState = this.getQuestionVal(7) var lesionState = this.getQuestionVal(7)
if (this.questionForm.RowId) { if (this.questionForm.RowId) {
@ -1244,7 +1244,7 @@ export default {
// } // }
} else { } else {
// 非淋巴结靶病灶 箭头工具 // 非淋巴结靶病灶 箭头工具
if (!(measureData && (measureData.type === 'ArrowAnnotate' || measureData.type === 'Bidirectional'))) { if (!(measureData && (measureData.type === 'ArrowAnnotate'))) {
// 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！ // 评估状态为消失的非淋巴结靶病灶只能使用箭头工具添加标记！
this.$confirm(this.$t('trials:lugano:warnning:validState7'), { this.$confirm(this.$t('trials:lugano:warnning:validState7'), {
type: 'warning', type: 'warning',

20
src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue
View File

@ -87,11 +87,13 @@
placement="bottom"> placement="bottom">
<div <div
v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'"> v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
<span class="login-cycle" /> <span class="login-cycle"
:style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].MergeRowId)}`" />
</div> </div>
</el-tooltip> </el-tooltip>
<div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'"> <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
<span class="login-cycle" /> <span class="login-cycle"
:style="`background-color:${$GuidToColor(item.TableQuestions.Answers[i].RowId)}`" />
</div> </div>
<el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark"
:content="item.TableQuestions.Answers[i].lesionPart" placement="bottom"> :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
@ -194,7 +196,7 @@
</div> </div>
</template> </template>
<script> <script>
import { splitLesion, getSplitPPdSumNoPet, getCanMergeLesion, mergeLesion } from '@/api/trials' import { splitLesion, getSplitPPdSum, getCanMergeLesion, mergeLesion } from '@/api/trials'
import { resetReadingTask } from '@/api/reading' import { resetReadingTask } from '@/api/reading'
import DicomEvent from './../DicomEvent' import DicomEvent from './../DicomEvent'
import store from '@/store' import store from '@/store'
@ -312,7 +314,7 @@ export default {
}) })
}) })
DicomEvent.$on('refreshSplitTargetLesionPDD', async (callback) => { DicomEvent.$on('refreshSplitTargetLesionPDD', async (callback) => {
const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId }) const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
this.splitTargetLesions = res.Result this.splitTargetLesions = res.Result
if (this.splitTargetLesions && this.splitTargetLesions.length > 0) { if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
this.splitTargetLesions.map(i => { this.splitTargetLesions.map(i => {
@ -369,7 +371,7 @@ export default {
loading.close() loading.close()
} }
if (!this.isBaseLineTask) { if (!this.isBaseLineTask) {
const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId }) const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
this.splitTargetLesions = res.Result this.splitTargetLesions = res.Result
} }
this.questions = this.visitTaskList[i].ReadingQuestions this.questions = this.visitTaskList[i].ReadingQuestions
@ -512,7 +514,7 @@ export default {
this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
} }
if (!this.isBaseLineTask) { if (!this.isBaseLineTask) {
const res = await getSplitPPdSumNoPet({ visitTaskId: this.visitTaskId }) const res = await getSplitPPdSum({ visitTaskId: this.visitTaskId })
this.splitTargetLesions = res.Result this.splitTargetLesions = res.Result
} }
this.getTableQuestions() this.getTableQuestions()
@ -733,6 +735,9 @@ export default {
var rowIndex = String(this.unSaveTargets[0].rowIndex) var rowIndex = String(this.unSaveTargets[0].rowIndex)
var questionId = this.unSaveTargets[0].questionId var questionId = this.unSaveTargets[0].questionId
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) { if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
return this.checkToolCanActive(toolName) return this.checkToolCanActive(toolName)
} else { } else {
@ -763,6 +768,9 @@ export default {
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
var isLymphNodes = this.$refs[refName][0].getQuestionVal(2) var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (!this.$refs[refName][0].questionForm.MeasureData) { if (!this.$refs[refName][0].questionForm.MeasureData) {
if (this.isBaseLineTask) { if (this.isBaseLineTask) {
if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') { if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {

7
src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
View File

@ -127,8 +127,9 @@
</div> </div>
<div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer" <div
style="text-align:right;margin-top:10px;"> v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
class="base-dialog-footer" style="text-align:right;margin-top:10px;">
<!-- 清除标记 --> <!-- 清除标记 -->
<el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData"> <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
@ -254,7 +255,7 @@ export default {
this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '') this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '') this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '') this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
// saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整 // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
var lesionState = this.getQuestionVal(7) var lesionState = this.getQuestionVal(7)
if (this.questionForm.RowId) { if (this.questionForm.RowId) {

6
src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
View File

@ -665,6 +665,9 @@ export default {
var rowIndex = String(this.unSaveTargets[0].rowIndex) var rowIndex = String(this.unSaveTargets[0].rowIndex)
var questionId = this.unSaveTargets[0].questionId var questionId = this.unSaveTargets[0].questionId
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) { if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
return this.checkToolCanActive(toolName) return this.checkToolCanActive(toolName)
} else { } else {
@ -694,6 +697,9 @@ export default {
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
var isLymphNodes = this.$refs[refName][0].getQuestionVal(2) var isLymphNodes = this.$refs[refName][0].getQuestionVal(2)
isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null isLymphNodes = !isNaN(parseInt(isLymphNodes)) ? parseInt(isLymphNodes) : null
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (!this.$refs[refName][0].questionForm.MeasureData) { if (!this.$refs[refName][0].questionForm.MeasureData) {
if (this.isBaseLineTask) { if (this.isBaseLineTask) {
if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') { if (this.$refs[refName][0].lesionType === 0 && isLymphNodes === 1 && toolName !== 'Bidirectional') {

7
src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
View File

@ -117,8 +117,9 @@
</div> </div>
<div v-if="isCurrentTask && readingTaskState < 2" class="base-dialog-footer" <div
style="text-align:right;margin-top:10px;"> v-if="isCurrentTask && readingTaskState < 2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
class="base-dialog-footer" style="text-align:right;margin-top:10px;">
<!-- 清除标记 --> <!-- 清除标记 -->
<el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData"> <el-button v-if="questionForm.MeasureData" size="mini" @click="handleDeleteMeasureData">
@ -243,7 +244,7 @@ export default {
this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '') this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '') this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '') this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
this.$set(this.questionForm, 'SplitOrMergeType', this.answers.SplitOrMergeType ? this.answers.SplitOrMergeType : '')
// saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整 // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
var lesionState = this.getQuestionVal(7) var lesionState = this.getQuestionVal(7)
if (this.questionForm.RowId) { if (this.questionForm.RowId) {

8
src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionList.vue
View File

@ -121,7 +121,7 @@
style="position: absolute;right: 5px;top: 2px;"> style="position: absolute;right: 5px;top: 2px;">
<!-- 分裂 --> <!-- 分裂 -->
<el-tooltip <el-tooltip
v-show="readingTaskState < 2&& item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false" v-show="readingTaskState < 2 && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false"
class="item" :content="$t('trials:reading:button:split')" placement="left"> class="item" :content="$t('trials:reading:button:split')" placement="left">
<i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;"
@click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" /> @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId, item.Id)" />
@ -656,6 +656,9 @@ export default {
var rowIndex = String(this.unSaveTargets[0].rowIndex) var rowIndex = String(this.unSaveTargets[0].rowIndex)
var questionId = this.unSaveTargets[0].questionId var questionId = this.unSaveTargets[0].questionId
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) { if (rowIndex === this.activeItem.activeRowIndex && questionId === this.activeItem.activeCollapseId && !this.$refs[refName][0].questionForm.MeasureData) {
return this.checkToolCanActive(toolName) return this.checkToolCanActive(toolName)
} else { } else {
@ -683,6 +686,9 @@ export default {
checkToolCanActive(toolName) { checkToolCanActive(toolName) {
const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}` const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
if (this.$refs[refName][0].questionForm.SplitOrMergeType === '1' || this.$refs[refName][0].questionForm.SplitOrMergeType === '3') {
return { isCanActiveTool: false, reason: '' }
}
if (!this.$refs[refName][0].questionForm.MeasureData) { if (!this.$refs[refName][0].questionForm.MeasureData) {
if (this.isBaseLineTask) { if (this.isBaseLineTask) {
if (this.$refs[refName][0].lesionType === 0 && toolName !== 'Length') { if (this.$refs[refName][0].lesionType === 0 && toolName !== 'Length') {

6
src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
View File

@ -151,7 +151,7 @@
</el-tooltip> </el-tooltip>
<!-- 融合 --> <!-- 融合 -->
<el-tooltip <el-tooltip
v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))" v-show="readingTaskState < 2 && !isBaseLineTask && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
class="item" :content="$t('trials:reading:button:merge')" placement="bottom"> class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
<i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
@click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" /> @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
@ -168,7 +168,9 @@
:reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask" :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
:is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm" :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
@lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" /> @lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" />
<div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;"> <div
v-if="readingTaskState < 2 && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '1' && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '3'"
style="text-align:right;margin-top:10px;">
<!-- 清除标记 --> <!-- 清除标记 -->
<el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini" <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
@click="clearMeasureData(table, answer.RowIndex)"> @click="clearMeasureData(table, answer.RowIndex)">

6
src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue
View File

@ -149,7 +149,7 @@
</el-tooltip> </el-tooltip>
<!-- 融合 --> <!-- 融合 -->
<el-tooltip <el-tooltip
v-show="readingTaskState < 2 && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))" v-show="readingTaskState < 2 && !isBaseLineTask && !!innerFormData[`${table.Id}_${answer.RowIndex}`].RowId && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '2' && table.LesionType === 0 && [0, 1, 4].includes(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionState))"
class="item" :content="$t('trials:reading:button:merge')" placement="bottom"> class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
<i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;"
@click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" /> @click.stop="handleMerge(innerFormData[`${table.Id}_${answer.RowIndex}`], table.Id, table.OrderMark)" />
@ -166,7 +166,9 @@
:reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask" :reading-task-state="readingTaskState" :organs="organs" :is-base-line-task="isBaseLineTask"
:is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm" :is-current-task="isCurrentTask" @update="innerFormDataUpdate" @close="closeInnerForm"
@lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" /> @lesionTypeChange="lesionTypeChange" @handleReadingChart="handleReadingChart" />
<div v-if="readingTaskState < 2" style="text-align:right;margin-top:10px;"> <div
v-if="readingTaskState < 2 && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '1' && innerFormData[`${table.Id}_${answer.RowIndex}`].SplitOrMergeType !== '3'"
style="text-align:right;margin-top:10px;">
<!-- 清除标记 --> <!-- 清除标记 -->
<el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini" <el-button v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].MeasureData" size="mini"
@click="clearMeasureData(table, answer.RowIndex)"> @click="clearMeasureData(table, answer.RowIndex)">