From b75f226b4b201b399ac44404d4d9b7206af2f157 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Wed, 21 Jan 2026 15:53:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/CustomTable.vue                           | 3 +--
 src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue       | 8 ++++++--
 .../business/comps/template/formConfig/paralleAndLadderConfig.js  | 8 +-------
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 434836f..60e3b42 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -201,7 +201,6 @@ export default {
     formData: {
       immediate: true,
       handler(newData) {
-        console.log(newData, "newData")
         const { stepTableFormData = [], headerSelectFields = {} } = newData;
         this.updateDataSource(stepTableFormData);
         this.headerSelectFields = JSON.parse(JSON.stringify(headerSelectFields))
@@ -243,7 +242,7 @@ export default {
     isShowBodySub(col,row) {
       if (col.hasOwnProperty("disabled")) {
         return col.showBodySub
-      }else if(col.bodySubType === 'span'&&row[col.bodySubKey]){//如果是span没有值的话就隐藏
+      }else if(col.bodySubType === 'span'&&!row[col.bodySubKey]){//如果是span没有值的话就隐藏
         return false;
       }
       return col.bodySubType && col.bodySubKey;
diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
index 6020331..f7fc5ed 100644
--- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
@@ -41,7 +41,7 @@
 								</template>
 							</CustomTable>
 
-							<Step class="mt-0" :ref="`ladderStepRef_${ladderIndex}`"
+							<Step class="mt-0 s-container" :ref="`ladderStepRef_${ladderIndex}`"
 								:formData="ladderConfig.ladderStepData" fieldItemLabel="阶梯配制"
 								:prefixKey="'ladder_' + ladderIndex"></Step>
 						</div>
@@ -72,7 +72,7 @@
 								</template>
 							</CustomTable>
 
-							<Step class="mt-0" :ref="`paralleStepRef_${paralleIndex}`"
+							<Step class="mt-0 s-container" :ref="`paralleStepRef_${paralleIndex}`"
 								:formData="paralleConfig.paralleStepData" fieldItemLabel="平行配制"
 								:prefixKey="'paralle' + paralleIndex"></Step>
 						</div>
@@ -418,4 +418,8 @@ export default {
 .mt-0 {
 	margin-top: 0;
 }
+.s-container{
+	box-shadow: none !important;
+	padding:24px 0 !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index 98fb46e..5a9eff9 100644
--- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
+++ b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
@@ -150,16 +150,10 @@ export const getParallelColumnsConfig = ($this) => {
       label: '目标溶液编号',
       prop: 'targetSolutionCode',
       bodyType: 'select',
-      bodyOptions: [
-        {label: '目标溶液1',value:'目标溶液1'},
-        {label: '目标溶液2',value:'目标溶液2'},
-        {label: '其他',value:-1},
-      
-      ],
+      bodyOptions: $this.getDictOptions('business_sp_nbgzy'),
       subType: 'span',
       subKey: 'subTargetSolutionCode',
       bodyFillType: 'preFill',
-      otherCode: 'targetSolutionCodeOther',
       width: 280
     },
     {