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:35:53 +08:00
parent cbecaeaa15
commit 5fc5dd07a7
13 changed files with 899 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,7 +122,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.initSF3();
this.initSF4();
this.initSF5();
this.initSF55();
this.initSF6();
this.initSF7();
this.initdata();
@ -386,21 +385,17 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
};
}
initSF55() {
this.schema55 = {
initSF5() {
this.schema5 = {
properties: {
insuranceType: {
type: 'string',
title: '增值服务套餐',
enum: [
{ label: '不购买', value: '0' },
{ label: '套餐一', value: '1' },
{ label: '套餐二', value: '2' }
],
ui: {
widget: 'select'
widget: 'dict-select',
params: { dictKey: 'bill:insurance:type' },
},
default: '0'
default: '3'
},
type1: {
type: 'string',
@ -423,34 +418,46 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
visibleIf: { insuranceType: (value: string) => value === '2' }
} as SFCheckboxWidgetSchema,
default: ['车辆实时定位', '轨迹查询', '数据保护', '专属技术服务', '赠送综合险']
}
}
};
this.ui55 = {
'*': {
spanLabelFixed: 100,
grid: { span: 24 }
},
$insuranceType: {
grid: { span: 12 }
}
};
}
initSF5() {
this.schema5 = {
properties: {
},
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: {
@ -460,15 +467,108 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
hidden: true
}
}
}
},
required: ['insurancePackagedGoods']
};
this.ui5 = {
'*': {
spanLabelFixed: 115,
grid: { span: 12 }
},
$type1:{
grid: { span: 24 }
},
$type2:{
grid: { span: 24 }
},
$freeInsurance:{
grid: { span: 24 }
}
};
}
// 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: {
@ -871,7 +971,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
loadingTime: this.validateForm1?.value?.loadingTime,
unloadingTime: this.validateForm1?.value?.unloadingTime,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo],
insuranceType: this.sf55.value.insuranceType,
goodsInfoDTOList: [
{
...this.sf4.value,
@ -1111,13 +1210,20 @@ 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 = {
goodsValue: res?.goodsValue,
insuranceType: res?.insuranceType || '',
goodsValue: res?.goodsValue || '',
insurancePremium: res?.insurancePremium || '',
insuranceRate: res?.insuranceRate || ''
};
this.sf55data = {
insuranceType: res?.insuranceType || ''
insuranceRate: res?.insuranceRate || '',
insurancePackagedGoods: res?.insurancePackagedGoods || '',
};
this.sf6data = {
stateReceipt: res?.stateReceipt,