解决冲突

This commit is contained in:
wangshiming
2022-02-24 14:37:59 +08:00
parent 5fc5dd07a7
commit d1b933fc2d
3 changed files with 74 additions and 159 deletions

View File

@ -116,7 +116,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
this.initSF3();
this.initSF4();
this.initSF5();
this.initSF55();
this.initSF6();
this.initSF7();
this.addStartInfo();
@ -399,18 +398,76 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
initSF5() {
this.schema5 = {
properties: {
insuranceType: {
type: 'string',
title: '增值服务套餐',
ui: {
widget: 'dict-select',
params: { dictKey: 'bill:insurance:type' },
},
default: '3'
},
type1: {
type: 'string',
title: '',
enum: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险'],
readOnly: true,
ui: {
widget: 'checkbox',
visibleIf: { insuranceType: (value: string) => value === '1' }
} as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护', '赠送基本险']
},
type2: {
type: 'string',
title: '',
enum: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险'],
readOnly: true,
ui: {
widget: 'checkbox',
visibleIf: { insuranceType: (value: string) => value === '2' }
} as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险']
},
freeInsurance: {
type: 'string',
title: '赠送保险',
ui: {
widget: 'custom',
visibleIf: { insuranceType: (value: string) => value !== '3' }
}
},
insurancePackagedGoods:{
type: 'string',
title: '货物包装',
ui: {
widget: 'dict-select',
params: { dictKey: 'insure:packaged:goods' },
visibleIf: { insuranceType: (value: string) => value !== '3' }
} as SFSelectWidgetSchema
},
hidenField:{
type: 'string',
title: '',
default:' ',
ui: {
widget:'text'
}
},
goodsValue: {
type: 'string',
title: '货物价值',
ui: {
widget: 'custom'
widget: 'custom',
visibleIf: { insuranceType: (value: string) => value !== '3' }
}
},
insurancePremium: {
type: 'string',
title: '',
ui: {
widget: 'custom'
widget: 'custom',
visibleIf: { insuranceType: (value: string) => value !== '3' }
}
},
insuranceRate: {
@ -420,62 +477,22 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
hidden: true
}
}
}
},
required: ['insurancePackagedGoods']
};
this.ui5 = {
'*': {
spanLabelFixed: 115,
grid: { span: 12 }
}
};
}
initSF55() {
this.schema55 = {
properties: {
insuranceType: {
type: 'string',
title: '增值服务套餐',
enum: [
{ label: '不购买', value: '0' },
{ label: '套餐一', value: '1' },
{ label: '套餐二', value: '2' }
],
ui: {
widget: 'select'
},
default:'0'
},
type1: {
type: 'string',
title: '',
enum: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'],
readOnly: true,
ui: {
widget: 'checkbox',
visibleIf: {insuranceType: (value: string) => value ==='1'},
} as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护','赠送基本险'],
},
type2: {
type: 'string',
title: '',
enum: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'],
readOnly: true,
ui: {
widget: 'checkbox',
visibleIf: {insuranceType: (value: string) => value ==='2'},
} as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护','专属技术服务','赠送综合险'],
}
}
};
this.ui55 = {
'*': {
spanLabelFixed: 100,
},
$type1:{
grid: { span: 24 }
},
$insuranceType: {
grid: { span: 12 }
$type2:{
grid: { span: 24 }
},
$freeInsurance:{
grid: { span: 24 }
}
};
}