diff --git a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts index 0241608e..059d1676 100644 --- a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts +++ b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts @@ -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' }, diff --git a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts index 24d93d4e..8c49f22c 100644 --- a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts +++ b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts @@ -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' }, diff --git a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts index e295eb52..71f198d2 100644 --- a/src/app/routes/contract-management/components/contract-template/contract-template.component.ts +++ b/src/app/routes/contract-management/components/contract-template/contract-template.component.ts @@ -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' }, diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 8b3c3e3a..0b0e5046 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -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 {