diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index c9664a9a..3e3da31a 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -486,89 +486,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } }; } - // 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, - // grid: { span: 24 } - // }, - // $insuranceType: { - // grid: { span: 12 } - // } - // }; - // } - // initSF5() { - // this.schema5 = { - // properties: { - // goodsValue: { - // type: 'string', - // title: '货物价值', - // ui: { - // widget: 'custom' - // } - // }, - // insurancePremium: { - // type: 'string', - // title: '', - // ui: { - // widget: 'custom' - // } - // }, - // insuranceRate: { - // type: 'string', - // title: '保险费率', - // ui: { - // hidden: true - // } - // } - // } - // }; - // this.ui5 = { - // '*': { - // spanLabelFixed: 115, - // grid: { span: 12 } - // } - // }; - // } initSF6() { this.schema6 = { properties: { @@ -1210,14 +1127,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.sf4data.id = res?.goodsInfoVOList[0]?.id; } this.totalFees = res?.shippingInformationVO?.totalFee || '0'; - // this.sf5data = { - // goodsValue: res?.goodsValue, - // insurancePremium: res?.insurancePremium || '', - // insuranceRate: res?.insuranceRate || '' - // }; - // this.sf55data = { - // insuranceType: res?.insuranceType || '' - // }; this.sf5data = { insuranceType: res?.insuranceType || '', goodsValue: res?.goodsValue || '', diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index 7218b087..00e854cd 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -219,26 +219,15 @@ -
服务信息
-
- -
-
-
-
-
- 购买货运险 - -
-
-
- 推荐投保,填写货值自动估保费,司机接单后不可退保。详见《投保告知》 -
-
+
+ + + + 推荐投保,填写货值自动估保费,司机接单后不可退保。详见《投保告知》
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 } } }; }