mrecist新病灶添加选框禁用问题
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
4f9aec017c
commit
bc3f202881
|
|
@ -39,7 +39,7 @@
|
||||||
effect="dark" :content="$t('trials:mRecist:warnning:msg1')" placement="bottom">
|
effect="dark" :content="$t('trials:mRecist:warnning:msg1')" placement="bottom">
|
||||||
<i class='el-icon-warning' />
|
<i class='el-icon-warning' />
|
||||||
</el-tooltip>
|
</el-tooltip>
|
||||||
{{ qs.QuestionName }}
|
{{ qs.QuestionName }}{{ answers.LesionOrgan }}
|
||||||
</span>
|
</span>
|
||||||
<!-- 输入框 -->
|
<!-- 输入框 -->
|
||||||
<template v-if="qs.Type === 'input' || qs.Type === 'number'">
|
<template v-if="qs.Type === 'input' || qs.Type === 'number'">
|
||||||
|
|
@ -63,7 +63,7 @@
|
||||||
|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))
|
|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))
|
||||||
|| (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))
|
|| (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))
|
||||||
|| (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))
|
|| (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))
|
||||||
|| (answers.LesionOrgan && answers.LesionOrgan !== '肝脏' && answers.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
|
|| (answers.LesionOrgan && answers.LesionOrgan !== 'null' && answers.LesionOrgan !== '肝脏' && answers.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
|
||||||
@change="((val) => { formItemChange(val, qs) })">
|
@change="((val) => { formItemChange(val, qs) })">
|
||||||
<template v-if="qs.QuestionMark === 8" #prefix>
|
<template v-if="qs.QuestionMark === 8" #prefix>
|
||||||
<span style="padding-left: 5px;">
|
<span style="padding-left: 5px;">
|
||||||
|
|
@ -296,7 +296,8 @@ export default {
|
||||||
const lesionLength = this.getQuestionVal(0)
|
const lesionLength = this.getQuestionVal(0)
|
||||||
const lesionShort = this.getQuestionVal(1)
|
const lesionShort = this.getQuestionVal(1)
|
||||||
const lesionState = this.getQuestionVal(7)
|
const lesionState = this.getQuestionVal(7)
|
||||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
const LesionOrgan = this.getQuestionVal(5)
|
||||||
|
this.$emit('resetQuestions', { isLymphLesion, lesionPart, LesionOrgan, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||||
}
|
}
|
||||||
this.isRender = true
|
this.isRender = true
|
||||||
loading.close()
|
loading.close()
|
||||||
|
|
@ -491,10 +492,11 @@ export default {
|
||||||
const isLymphLesion = this.getQuestionVal(2)
|
const isLymphLesion = this.getQuestionVal(2)
|
||||||
const lesionPart = this.getQuestionVal(8)
|
const lesionPart = this.getQuestionVal(8)
|
||||||
const lesionOrgan = this.getQuestionVal(6)
|
const lesionOrgan = this.getQuestionVal(6)
|
||||||
|
const LesionOrgan = this.getQuestionVal(5)
|
||||||
const lesionLength = this.getQuestionVal(0)
|
const lesionLength = this.getQuestionVal(0)
|
||||||
const lesionShort = this.getQuestionVal(1)
|
const lesionShort = this.getQuestionVal(1)
|
||||||
const lesionState = this.getQuestionVal(7)
|
const lesionState = this.getQuestionVal(7)
|
||||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
this.$emit('resetQuestions', { isLymphLesion, lesionPart, LesionOrgan, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||||
|
|
||||||
if (question.QuestionMark === 7) {
|
if (question.QuestionMark === 7) {
|
||||||
var status = ''
|
var status = ''
|
||||||
|
|
@ -669,7 +671,8 @@ export default {
|
||||||
const lesionL = this.getQuestionVal(0)
|
const lesionL = this.getQuestionVal(0)
|
||||||
const lesionS = this.getQuestionVal(1)
|
const lesionS = this.getQuestionVal(1)
|
||||||
var lesionState = this.getQuestionVal(7)
|
var lesionState = this.getQuestionVal(7)
|
||||||
this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, lesionShort: lesionS, lesionLength: lesionL, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
const LesionOrgan = this.getQuestionVal(5)
|
||||||
|
this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, LesionOrgan, lesionOrgan, lesionShort: lesionS, lesionLength: lesionL, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||||
this.toolType = measureData.type
|
this.toolType = measureData.type
|
||||||
DicomEvent.$emit('refreshStudyListMeasureData')
|
DicomEvent.$emit('refreshStudyListMeasureData')
|
||||||
resolve()
|
resolve()
|
||||||
|
|
@ -1357,7 +1360,8 @@ export default {
|
||||||
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
this.$set(this.questionForm, 'RowId', res.Result.RowId)
|
||||||
const lesionPart = this.getQuestionVal(8)
|
const lesionPart = this.getQuestionVal(8)
|
||||||
const lesionState = this.getQuestionVal(7)
|
const lesionState = this.getQuestionVal(7)
|
||||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
const LesionOrgan = this.getQuestionVal(5)
|
||||||
|
this.$emit('resetQuestions', { isLymphLesion, lesionPart, LesionOrgan, lesionOrgan, lesionShort, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, lesionState, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||||
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
|
// await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
|
||||||
// DicomEvent.$emit('getMeasureData')
|
// DicomEvent.$emit('getMeasureData')
|
||||||
this.$emit('close')
|
this.$emit('close')
|
||||||
|
|
@ -1405,6 +1409,7 @@ export default {
|
||||||
const lesionLength = ''
|
const lesionLength = ''
|
||||||
const lesionShort = ''
|
const lesionShort = ''
|
||||||
const lesionState = this.getQuestionVal(7)
|
const lesionState = this.getQuestionVal(7)
|
||||||
|
const LesionOrgan = this.getQuestionVal(5)
|
||||||
if (!this.questionForm.IsDicomReading) {
|
if (!this.questionForm.IsDicomReading) {
|
||||||
DicomEvent.$emit('removeNoneDicomMeasureData', this.questionForm.MeasureData)
|
DicomEvent.$emit('removeNoneDicomMeasureData', this.questionForm.MeasureData)
|
||||||
}
|
}
|
||||||
|
|
@ -1417,7 +1422,7 @@ export default {
|
||||||
} else {
|
} else {
|
||||||
anwsers = Object.assign({}, this.questionForm)
|
anwsers = Object.assign({}, this.questionForm)
|
||||||
}
|
}
|
||||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
|
this.$emit('resetQuestions', { isLymphLesion, lesionPart, LesionOrgan, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
|
||||||
DicomEvent.$emit('refreshStudyListMeasureData')
|
DicomEvent.$emit('refreshStudyListMeasureData')
|
||||||
},
|
},
|
||||||
async handleDelete() {
|
async handleDelete() {
|
||||||
|
|
@ -1506,7 +1511,8 @@ export default {
|
||||||
const lesionLength = this.getQuestionVal(0)
|
const lesionLength = this.getQuestionVal(0)
|
||||||
const lesionShort = this.getQuestionVal(1)
|
const lesionShort = this.getQuestionVal(1)
|
||||||
const lesionState = this.getQuestionVal(7)
|
const lesionState = this.getQuestionVal(7)
|
||||||
this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
const LesionOrgan = this.getQuestionVal(5)
|
||||||
|
this.$emit('resetQuestions', { isLymphLesion, lesionPart, LesionOrgan, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
|
||||||
|
|
@ -293,22 +293,36 @@ export default {
|
||||||
questions.forEach(item => {
|
questions.forEach(item => {
|
||||||
if (item.Type === 'table' && item.Id === obj.questionId) {
|
if (item.Type === 'table' && item.Id === obj.questionId) {
|
||||||
var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
|
var idx = item.TableQuestions.Answers.findIndex(i => i.RowIndex === obj.rowIndex)
|
||||||
item.TableQuestions.Answers[idx].isLymphLesion = obj.isLymphLesion
|
this.$set(item.TableQuestions.Answers[idx], 'isLymphLesion', obj.isLymphLesion)
|
||||||
item.TableQuestions.Answers[idx].loctation = obj.lesionOrgan
|
this.$set(item.TableQuestions.Answers[idx], 'loctation', obj.lesionOrgan)
|
||||||
item.TableQuestions.Answers[idx].lesionPart = obj.lesionPart
|
this.$set(item.TableQuestions.Answers[idx], 'LesionOrgan', obj.LesionOrgan)
|
||||||
item.TableQuestions.Answers[idx].lesionLength = obj.lesionLength
|
this.$set(item.TableQuestions.Answers[idx], 'lesionPart', obj.lesionPart)
|
||||||
item.TableQuestions.Answers[idx].lesionShort = obj.lesionShort
|
this.$set(item.TableQuestions.Answers[idx], 'lesionLength', obj.lesionLength)
|
||||||
item.TableQuestions.Answers[idx].lesionState = obj.lesionState
|
this.$set(item.TableQuestions.Answers[idx], 'lesionShort', obj.lesionShort)
|
||||||
item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
|
this.$set(item.TableQuestions.Answers[idx], 'lesionState', obj.lesionState)
|
||||||
|
this.$set(item.TableQuestions.Answers[idx], 'saveTypeEnum', obj.saveTypeEnum)
|
||||||
|
// item.TableQuestions.Answers[idx].isLymphLesion = obj.isLymphLesion
|
||||||
|
// item.TableQuestions.Answers[idx].loctation = obj.lesionOrgan
|
||||||
|
// item.TableQuestions.Answers[idx].LesionOrgan = obj.LesionOrgan
|
||||||
|
// item.TableQuestions.Answers[idx].lesionPart = obj.lesionPart
|
||||||
|
// item.TableQuestions.Answers[idx].lesionLength = obj.lesionLength
|
||||||
|
// item.TableQuestions.Answers[idx].lesionShort = obj.lesionShort
|
||||||
|
// item.TableQuestions.Answers[idx].lesionState = obj.lesionState
|
||||||
|
// item.TableQuestions.Answers[idx].saveTypeEnum = obj.saveTypeEnum
|
||||||
|
|
||||||
for (const i in obj.anwsers) {
|
for (const i in obj.anwsers) {
|
||||||
if (i === 'MeasureData' && obj.anwsers[i]) {
|
if (i === 'MeasureData' && obj.anwsers[i]) {
|
||||||
item.TableQuestions.Answers[idx].InstanceId = obj.anwsers[i].instanceId
|
this.$set(item.TableQuestions.Answers[idx], 'InstanceId', obj.anwsers[i].instanceId)
|
||||||
item.TableQuestions.Answers[idx].SeriesId = obj.anwsers[i].seriesId
|
this.$set(item.TableQuestions.Answers[idx], 'SeriesId', obj.anwsers[i].seriesId)
|
||||||
item.TableQuestions.Answers[idx][i] = JSON.stringify(obj.anwsers[i])
|
this.$set(item.TableQuestions.Answers[idx][i], i, JSON.stringify(obj.anwsers[i]))
|
||||||
item.TableQuestions.Answers[idx].isDicomReading = !(obj.anwsers[i].IsDicomReading === false || obj.anwsers[i].IsDicomReading === 'False')
|
this.$set(item.TableQuestions.Answers[idx], 'isDicomReading', !(obj.anwsers[i].IsDicomReading === false || obj.anwsers[i].IsDicomReading === 'False'))
|
||||||
|
// item.TableQuestions.Answers[idx].InstanceId = obj.anwsers[i].instanceId
|
||||||
|
// item.TableQuestions.Answers[idx].SeriesId = obj.anwsers[i].seriesId
|
||||||
|
// item.TableQuestions.Answers[idx][i] = JSON.stringify(obj.anwsers[i])
|
||||||
|
// item.TableQuestions.Answers[idx].isDicomReading = !(obj.anwsers[i].IsDicomReading === false || obj.anwsers[i].IsDicomReading === 'False')
|
||||||
} else {
|
} else {
|
||||||
item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
|
this.$set(item.TableQuestions.Answers[idx], i, String(obj.anwsers[i]))
|
||||||
|
// item.TableQuestions.Answers[idx][i] = String(obj.anwsers[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue