fix bug
This commit is contained in:
@ -125,6 +125,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
|
|||||||
{
|
{
|
||||||
title: '合同模板名称',
|
title: '合同模板名称',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
|
width: '300px',
|
||||||
render: 'templateName'
|
render: 'templateName'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -135,7 +136,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '合同类型',
|
title: '合同类型',
|
||||||
width: '100px',
|
width: '200px',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
index: 'contractTypeLabel'
|
index: 'contractTypeLabel'
|
||||||
},
|
},
|
||||||
|
|||||||
@ -125,6 +125,7 @@ export class ContractManagementTemplatePartnerComponent implements OnInit {
|
|||||||
{
|
{
|
||||||
title: '合同模板名称',
|
title: '合同模板名称',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
|
width: '300px',
|
||||||
render: 'templateName'
|
render: 'templateName'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -135,7 +136,7 @@ export class ContractManagementTemplatePartnerComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '合同类型',
|
title: '合同类型',
|
||||||
width: '100px',
|
width: '200px',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
index: 'contractTypeLabel'
|
index: 'contractTypeLabel'
|
||||||
},
|
},
|
||||||
|
|||||||
@ -125,6 +125,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
|
|||||||
{
|
{
|
||||||
title: '合同模板名称',
|
title: '合同模板名称',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
|
width: '300px',
|
||||||
render: 'templateName'
|
render: 'templateName'
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -135,7 +136,7 @@ export class ContractManagementTemplateDetailComponent implements OnInit {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: '合同类型',
|
title: '合同类型',
|
||||||
width: '100px',
|
width: '200px',
|
||||||
className: 'text-center',
|
className: 'text-center',
|
||||||
index: 'contractTypeLabel'
|
index: 'contractTypeLabel'
|
||||||
},
|
},
|
||||||
|
|||||||
@ -761,6 +761,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
|
|||||||
fuelCardAmount: oilCardPay,
|
fuelCardAmount: oilCardPay,
|
||||||
resourcetype: '1'
|
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 => {
|
this.service.request(this.service.$api_getCalculatedSurcharge, params).subscribe(res => {
|
||||||
if (res) {
|
if (res) {
|
||||||
this.sf7.setValue('/appendFee', res.surcharge);
|
this.sf7.setValue('/appendFee', res.surcharge);
|
||||||
@ -994,18 +1001,18 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
|
|||||||
goodsValue: this.sf4.value.goodsValue
|
goodsValue: this.sf4.value.goodsValue
|
||||||
};
|
};
|
||||||
console.log(params);
|
console.log(params);
|
||||||
const modalRef = this.modalService.create({
|
// const modalRef = this.modalService.create({
|
||||||
nzTitle: '运输协议',
|
// nzTitle: '运输协议',
|
||||||
nzContent: TranAgreementComponent,
|
// nzContent: TranAgreementComponent,
|
||||||
nzWidth: 900,
|
// nzWidth: 900,
|
||||||
nzFooter: null,
|
// nzFooter: null,
|
||||||
nzComponentParams: { object: params, shipperName: this.shipperName, type: 'onecar' }
|
// nzComponentParams: { object: params, shipperName: this.shipperName, type: 'onecar' }
|
||||||
});
|
// });
|
||||||
modalRef.afterClose.subscribe(result => {
|
// modalRef.afterClose.subscribe(result => {
|
||||||
if (result) {
|
// if (result) {
|
||||||
this.submit(submitType, params);
|
// this.submit(submitType, params);
|
||||||
}
|
// }
|
||||||
});
|
// });
|
||||||
}
|
}
|
||||||
// 提交
|
// 提交
|
||||||
submit(submitType?: string, params?: any): void {
|
submit(submitType?: string, params?: any): void {
|
||||||
|
|||||||
Reference in New Issue
Block a user