From 6f3ca769a675c057bf68fbb2f862875d24871ea4 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 25 Dec 2025 15:38:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A2=AB=E8=9E=8D=E5=90=88=E7=9A=84=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E7=8A=B6=E6=80=81=E4=B8=8D=E5=8F=AF=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/IRecist/QuestionForm.vue          | 2 +-
 .../reading/dicoms/components/Recist/QuestionForm.vue           | 2 +-
 .../reading/dicoms/components/RecistBM/QuestionForm.vue         | 2 +-
 .../dicoms3D/components/Recist/TableQuestionFormItem.vue        | 2 +-
 .../dicoms3D/components/mRecist/TableQuestionFormItem.vue       | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index c1badfd8..02db661e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -63,7 +63,7 @@
         <!-- 下拉框 -->
         <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
-          :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && isFirstChangeTask) || (qs.QuestionMark === 8 && isFirstChangeTask)"
+          :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (answers.SplitOrMergeType === '3' || answers.SplitOrMergeType === '1')) || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && isFirstChangeTask) || (qs.QuestionMark === 8 && isFirstChangeTask)"
           @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.QuestionMark === 8" #prefix>
             <span style="padding-left: 5px;">
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index 27e52181..c72b70c9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -44,7 +44,7 @@
         <template v-if="qs.Type === 'input' || qs.Type === 'number'">
           <div style="display: flex;justify-content: space-between;">
             <el-input v-if="qs.Type === 'input' || qs.Type === 'number'" v-model="questionForm[qs.Id]"
-              :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
+              :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (answers.SplitOrMergeType === '3' || answers.SplitOrMergeType === '1')) || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
               @change="((val) => { formItemChange(val, qs) })">
               <template v-if="(qs.QuestionMark === 0 || qs.QuestionMark === 1) && qs.Unit" slot="append">
                 {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index 9a44ca37..ac3df227 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -63,7 +63,7 @@
 
         <el-select v-if="qs.Type === 'select'" v-model="questionForm[qs.Id]" filterable
           :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
-          :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
+          :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (answers.SplitOrMergeType === '3' || answers.SplitOrMergeType === '1')) || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))"
           @change="((val) => { formItemChange(val, qs) })">
           <template v-if="qs.QuestionMark === 8" #prefix>
             <span style="padding-left: 5px;">
diff --git a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
index 8d2fb470..af1ce32f 100644
--- a/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
@@ -58,7 +58,7 @@
       <!-- 下拉框 -->
       <el-select v-if="qs.Type === 'select'" v-model="qsForm[qs.Id]" filterable
         :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : qs.QuestionMark === 2 ? '' : $t('common:placeholder:select')"
-        :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName))"
+        :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (qsForm.SplitOrMergeType === '3' || qsForm.SplitOrMergeType === '1')) || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName))"
         @change="((val) => { formItemChange(val, qs) })">
         <template v-if="qs.QuestionMark === 8" #prefix>
           <span style="padding-left: 5px;">
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 81d42831..3e05bae9 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
@@ -68,7 +68,7 @@
       <!-- 下拉框 -->
       <el-select v-if="qs.Type === 'select'" v-model="qsForm[qs.Id]" filterable
         :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : qs.QuestionMark === 2 ? '' : $t('common:placeholder:select')"
-        :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (questionForm.LesionOrgan && questionForm.LesionOrgan !== '肝脏' && questionForm.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
+        :disabled="!isCurrentTask || readingTaskState >= 2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 7 && (qsForm.SplitOrMergeType === '3' || qsForm.SplitOrMergeType === '1')) || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answer.SplitOrMergeLesionName)) || (qs.QuestionMark === 21 && (isCurrentTaskAdd === 'False' || !!answer.SplitOrMergeLesionName)) || (questionForm.LesionOrgan && questionForm.LesionOrgan !== '肝脏' && questionForm.LesionOrgan !== 'Liver' && qs.QuestionMark === 21)"
         @change="((val) => { formItemChange(val, qs) })">
         <template v-if="qs.QuestionMark === 8" #prefix>
           <span style="padding-left: 5px;">