Compare commits

...

3 Commits

3 changed files with 16 additions and 6 deletions

View File

@ -364,6 +364,15 @@ export default {
this.lesionName = this.getLesionInfo(this.orderMark, this.rowIndex) this.lesionName = this.getLesionInfo(this.orderMark, this.rowIndex)
this.isCurrentTaskAdd = this.answers.IsCurrentTaskAdd ? this.answers.IsCurrentTaskAdd : 'True' this.isCurrentTaskAdd = this.answers.IsCurrentTaskAdd ? this.answers.IsCurrentTaskAdd : 'True'
this.lesionMark = this.getLesionName(this.orderMark, this.questionForm.RowIndex) this.lesionMark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
var isLymphLesion = this.getQuestionVal(2)
isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
var lesionOrgan = this.getQuestionVal(6)
const lesionPart = this.getQuestionVal(8)
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, saveTypeEnum: this.questionForm.saveTypeEnum, lesionState, lesionNum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
this.isRender = true this.isRender = true
}, },
getLesionName(orderMark, rowIndex) { getLesionName(orderMark, rowIndex) {

View File

@ -98,11 +98,11 @@
<div <div
style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px"> style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
<template <template
v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))"> v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
{{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
</template> </template>
<template <template
v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))"> v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
{{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
</template> </template>
</div> </div>

View File

@ -123,10 +123,10 @@
</span> </span>
</div> </div>
<div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px"> <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
<template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))"> <template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
{{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
</template> </template>
<template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))"> <template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
{{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
</template> </template>
</div> </div>
@ -536,7 +536,7 @@ export default {
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0) this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
} }
if (!(innerForm.IsCurrentTaskAdd === 'True')) { if (!(innerForm.IsCurrentTaskAdd === 'True') && lesionType !== 2) {
// 线>=10mm>=10mm // 线>=10mm>=10mm
if (!this.isBaseLineTask && ((obj.toolName === 'Length' && length >= 10) || (obj.toolName === 'Bidirectional' && short >= 10))) { if (!this.isBaseLineTask && ((obj.toolName === 'Length' && length >= 10) || (obj.toolName === 'Bidirectional' && short >= 10))) {
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0) this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
@ -624,9 +624,10 @@ export default {
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0) this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0) this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
} }
const intrahepaticLesion = this.innerFormData[`${tableId}_${rowIndex}`].IntrahepaticLesion
const isCurrentTaskAdd = this.innerFormData[`${tableId}_${rowIndex}`].IsCurrentTaskAdd const isCurrentTaskAdd = this.innerFormData[`${tableId}_${rowIndex}`].IsCurrentTaskAdd
const isLymphNodes = this.innerFormData[`${tableId}_${rowIndex}`].IsLymphNodes const isLymphNodes = this.innerFormData[`${tableId}_${rowIndex}`].IsLymphNodes
if (!(isCurrentTaskAdd === 'True')) { if (!(isCurrentTaskAdd === 'True') && lesionType !== 2) {
// 线>=10mm>=10mm // 线>=10mm>=10mm
if (!this.isBaseLineTask && ((toolName === 'Length' && length >= 10) || (toolName === 'Bidirectional' && short >= 10))) { if (!this.isBaseLineTask && ((toolName === 'Length' && length >= 10) || (toolName === 'Bidirectional' && short >= 10))) {
this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0) this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)