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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-04-27 20:38:30 +08:00
parent 6e5f26704b
commit 1045145773
4 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts
View File

@ -125,6 +125,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
{
title: '合同模板名称',
className: 'text-center',
width: '300px',
render: 'templateName'
},
{
@ -135,7 +136,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
},
{
title: '合同类型',
width: '100px',
width: '200px',
className: 'text-center',
index: 'contractTypeLabel'
},

3
src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts
View File

@ -125,6 +125,7 @@ export class ContractManagementTemplatePartnerComponent implements OnInit {
{
title: '合同模板名称',
className: 'text-center',
width: '300px',
render: 'templateName'
},
{
@ -135,7 +136,7 @@ export class ContractManagementTemplatePartnerComponent implements OnInit {
},
{
title: '合同类型',
width: '100px',
width: '200px',
className: 'text-center',
index: 'contractTypeLabel'
},

3
src/app/routes/contract-management/components/contract-template/contract-template.component.ts
View File

@ -125,6 +125,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
{
title: '合同模板名称',
className: 'text-center',
width: '300px',
render: 'templateName'
},
{
@ -135,7 +136,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
},
{
title: '合同类型',
width: '100px',
width: '200px',
className: 'text-center',
index: 'contractTypeLabel'
},

31
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -761,6 +761,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
fuelCardAmount: oilCardPay,
resourcetype: '1'
};
if(!this?.sf1.value?.shipperAppUserId || !this?.sf1.value?.enterpriseInfoName) {
this.service.msgSrv.warning('请先选择货主和网络货运人！');
this.sf7.setValue('/prePay', 0);
this.sf7.setValue('/toPay', 0);
this.sf7.setValue('/receiptPay', 0);
return
}
this.service.request(this.service.$api_getCalculatedSurcharge, params).subscribe(res => {
if (res) {
this.sf7.setValue('/appendFee', res.surcharge);
@ -994,18 +1001,18 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
goodsValue: this.sf4.value.goodsValue
};
console.log(params);
const modalRef = this.modalService.create({
nzTitle: '运输协议',
nzContent: TranAgreementComponent,
nzWidth: 900,
nzFooter: null,
nzComponentParams: { object: params, shipperName: this.shipperName, type: 'onecar' }
});
modalRef.afterClose.subscribe(result => {
if (result) {
this.submit(submitType, params);
}
});
// const modalRef = this.modalService.create({
// nzTitle: '运输协议',
// nzContent: TranAgreementComponent,
// nzWidth: 900,
// nzFooter: null,
// nzComponentParams: { object: params, shipperName: this.shipperName, type: 'onecar' }
// });
// modalRef.afterClose.subscribe(result => {
// if (result) {
// this.submit(submitType, params);
// }
// });
}
// 提交
submit(submitType?: string, params?: any): void {