Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

91
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -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 || '',

21
src/app/routes/supply-management/components/release-publish/release-publish.component.html
View File

@ -219,26 +219,15 @@
</div>
</div>
</nz-card>
<nz-card>
<div class="card-title">服务信息</div>
<div nz-row>
<div nz-col nzSpan="18">
<sf #sf55 [schema]="schema55" [button]="'none'" [ui]="ui55" [formData]="sf55data"></sf>
</div>
</div>
<div nz-row [nzGutter]="24" style="margin-bottom: 24px">
<div nz-col [nzSpan]="10">
<div class="align-center">
<span style="font-weight: bolder; margin-right: 12px">购买货运险</span>
<nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
</div>
</div>
</div>
<ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a target="_blank" [queryParams]="{ type: 10 }" [routerLink]="['/passport/agreement']">《投保告知》</a></ng-template>
<div nz-row>
<div nz-col nzSpan="18">
<div nz-col nzSpan="16">
<sf #sf5 [schema]="schema5" [button]="'none'" [ui]="ui5" [formData]="sf5data">
<ng-template sf-template="freeInsurance" let-i let-ui="ui">
<nz-alert nzType="warning" [nzMessage]="template1" nzShowIcon></nz-alert>
</ng-template>
<ng-template #template1>推荐投保，填写货值自动估保费，司机接单后不可退保。详见<a target="_blank" [queryParams]="{ type: 10 }" [routerLink]="['/agreement']">《投保告知》</a></ng-template>
<ng-template sf-template="goodsValue" let-i let-ui="ui">
<div class="align-center">
<nz-input-number

119
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
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 }
}
};
}