From 3b31132616df07938ddbebbbd5a7659b7e9444d3 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 17 Apr 2025 10:22:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?mRecist=E8=A1=A8=E5=8D=95=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dicoms3D/components/mRecist/TableQuestionFormItem.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue index dfbe8d05..b6eb34bd 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue @@ -44,7 +44,7 @@ :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.QuestionMark === 0 && (questionForm.LesionOrgan === '肝脏' || questionForm.LesionOrgan === 'Liver') && (lesionType === 0 || lesionType === 1 || lesionType === 2) && questionForm.IntrahepaticLesion)) && qs.Type!=='group' && qs.Type!=='summary', message:['radio', 'select', 'checkbox'].includes(qs.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur','change']}, ]" > From 8840ddc77a9fe47f67e0a8ff651e194afa890a09 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 17 Apr 2025 11:40:34 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=97=85=E7=81=B6=E6=B8=85=E9=99=A4?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/dicoms3D/components/mRecist/QuestionList.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue index a4999cbf..7fd84d37 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue @@ -728,6 +728,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) { From fc228622e142aafa1abfa5dfe6e515a778ae11b1 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 17 Apr 2025 14:20:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Recist/QuestionList.vue | 17 +++++++++-------- .../components/mRecist/QuestionList.vue | 18 ++++++++++-------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue index a641c2b1..c6accb1b 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue @@ -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 } } } diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue index 7fd84d37..39fdcba9 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue @@ -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) }) }) }) @@ -909,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 { @@ -925,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 } } @@ -986,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 } } } @@ -1300,6 +1301,7 @@ export default { } loading.close() } catch(e) { + console.log(e) loading.close() } }, From 85463ad24017a074e3745298fc05a926b610afbb Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 17 Apr 2025 14:59:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=85=B8=E5=9E=8B=E8=82=9D=E5=86=85?= =?UTF-8?q?=E7=97=85=E7=81=B6=E6=8F=90=E7=A4=BA=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/mRecist/TableQuestionFormItem.vue | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue index b6eb34bd..6af663ff 100644 --- a/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue +++ b/src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/TableQuestionFormItem.vue @@ -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) && questionForm.IntrahepaticLesion)) && 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']}, ]" > + + + + + {{ qs.QuestionName }} + +