Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
ce565e00ff
|
@ -403,10 +403,8 @@ export default {
|
|||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'LesionOrgan', val)
|
||||
}
|
||||
}
|
||||
if (index === table.TableQuestions.Answers.length - 1) {
|
||||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
|
||||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
|
||||
}
|
||||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
|
||||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
@ -881,7 +879,8 @@ export default {
|
|||
return
|
||||
} else if (measureData && measureData.markTool === 'ArrowAnnotate') {
|
||||
const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
|
||||
this.$set(innerForm, shortId, 5)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], shortId, 5)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionShort', 5)
|
||||
lesionShort = 5
|
||||
}
|
||||
} else {
|
||||
|
@ -897,7 +896,8 @@ export default {
|
|||
return
|
||||
} else if (measureData && measureData.markTool === 'ArrowAnnotate') {
|
||||
const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
|
||||
this.$set(this.questionForm, lengthId, 5)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, 5)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', 5)
|
||||
lesionLength = 5
|
||||
}
|
||||
}
|
||||
|
@ -958,8 +958,9 @@ export default {
|
|||
return
|
||||
} else if (measureData && measureData.markTool === 'ArrowAnnotate') {
|
||||
const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
|
||||
this.$set(innerForm, lengthId, 0)
|
||||
lesionLength = 0
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, null)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', null)
|
||||
lesionLength = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -408,10 +408,8 @@ export default {
|
|||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'IntrahepaticLesion', val)
|
||||
}
|
||||
}
|
||||
if (index === table.TableQuestions.Answers.length - 1) {
|
||||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
|
||||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
|
||||
}
|
||||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'TableId', tableKey)
|
||||
this.$set(this.innerFormData[`${tableKey}_${answer.RowIndex}`], 'RowIndex', answer.RowIndex)
|
||||
})
|
||||
})
|
||||
})
|
||||
|
@ -728,6 +726,7 @@ export default {
|
|||
// 重置保存标志
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'SaveTypeEnum', innerForm.RowId ? 1 : 0)
|
||||
this.$refs[`form_${table.Id}_${rowIndex}`][0].getOrganList()
|
||||
this.$forceUpdate()
|
||||
},
|
||||
// 删除病灶
|
||||
async deleteLesion(table, rowIndex) {
|
||||
|
@ -908,7 +907,8 @@ export default {
|
|||
return
|
||||
} else if (measureData && measureData.markTool === 'ArrowAnnotate') {
|
||||
const shortId = this.getQuestionId(1, table.TableQuestions.Questions)
|
||||
this.$set(innerForm, shortId, 5)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], shortId, 5)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionShort', 5)
|
||||
lesionShort = 5
|
||||
}
|
||||
} else {
|
||||
|
@ -924,7 +924,8 @@ export default {
|
|||
return
|
||||
} else if (measureData && measureData.markTool === 'ArrowAnnotate') {
|
||||
const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
|
||||
this.$set(this.questionForm, lengthId, 5)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, 5)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', 5)
|
||||
lesionLength = 5
|
||||
}
|
||||
}
|
||||
|
@ -985,8 +986,9 @@ export default {
|
|||
return
|
||||
} else if (measureData && measureData.markTool === 'ArrowAnnotate') {
|
||||
const lengthId = this.getQuestionId(0, table.TableQuestions.Questions)
|
||||
this.$set(innerForm, lengthId, 0)
|
||||
lesionLength = 0
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], lengthId, null)
|
||||
this.$set(this.innerFormData[`${table.Id}_${rowIndex}`], 'LesionLength', null)
|
||||
lesionLength = null
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1299,6 +1301,7 @@ export default {
|
|||
}
|
||||
loading.close()
|
||||
} catch(e) {
|
||||
console.log(e)
|
||||
loading.close()
|
||||
}
|
||||
},
|
||||
|
|
|
@ -40,14 +40,19 @@
|
|||
v-for="qs in questions"
|
||||
v-show="qs.ShowQuestion!==2"
|
||||
:key="qs.Id"
|
||||
:label="`${qs.QuestionName}`"
|
||||
:prop="qs.Id"
|
||||
:title="(qs.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2) && questionForm.IntrahepaticLesion) ? $t('trials:mRecist:warnning:msg1') : ''"
|
||||
:rules="[
|
||||
{ required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10) || (qs.QuestionMark === 21 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2)) || (qs.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2))) && qs.Type!=='group' && qs.Type!=='summary',
|
||||
{ required: (qs.IsRequired === 0 || (qs.IsRequired ===1 && qs.RelevanceId && (questionForm[qs.RelevanceId] === qs.RelevanceValue)) || (qs.QuestionMark === 6 && questionForm.IsCanEditPosition === true) || (questionForm.IsCanEditPosition && qs.QuestionMark === 10) || (qs.QuestionMark === 21 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2))) && qs.Type!=='group' && qs.Type!=='summary',
|
||||
message:['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']},
|
||||
]"
|
||||
>
|
||||
<span slot="label" style="display:inline-block;" >
|
||||
<el-tooltip v-if="qs.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2) && questionForm.IntrahepaticLesion" effect="dark" :content="$t('trials:mRecist:warnning:msg1')" placement="bottom">
|
||||
<i class='el-icon-warning' />
|
||||
</el-tooltip>
|
||||
{{ qs.QuestionName }}
|
||||
</span>
|
||||
|
||||
<!-- 输入框 -->
|
||||
<template v-if="qs.Type==='input' || qs.Type==='number'">
|
||||
|
||||
|
|
Loading…
Reference in New Issue