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 @@
-
@@ -72,7 +72,7 @@
-
@@ -418,4 +418,8 @@ export default {
.mt-0 {
margin-top: 0;
}
+.s-container{
+ box-shadow: none !important;
+ padding:24px 0 !important;
+}
\ 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
},
{