diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index b0509152..ede06660 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -261,9 +261,8 @@ tabs = { isRiskSheet: { type: 'string', title: '是否风险单', - default: '0', enum: [ - { label: '全部', value: '0' }, + { label: '全部', value: '' }, { label: '是', value: '1' }, { label: '否', value: '2' } ], diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index d8e6c6b0..04897e01 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -275,9 +275,8 @@ resourceStatus: any; isRiskSheet: { type: 'string', title: '是否风险单', - default: '0', enum: [ - { label: '全部', value: '0' }, + { label: '全部', value: '' }, { label: '是', value: '1' }, { label: '否', value: '2' } ], diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 50941381..634059c2 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -657,12 +657,12 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } } if(this.PageStatus === '大宗修改') { - this.requests(this.service.$api_set_bulkModify, params); + this.requests(this.service.$api_set_bulkModify, params, 1); } else if(this.PageStatus === '大宗下一单') { - this.requests(this.service.$api_set_saveAnotherBulkOrder, params); + this.requests(this.service.$api_set_saveAnotherBulkOrder, params, 2); } } - requests(url: any, params: any) { + requests(url: any, params: any, change?: any) { this.service.request(url, params).subscribe((res: any) => { if (res) { this.modalService.create({ @@ -670,7 +670,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { nzContent: PublishSuccessComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { type: 'onecar' } + nzComponentParams: { type: 'onecar', change: change } }); } else { this.service.msgSrv.error(res.msg); diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 84e6e8cb..50bb1a77 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -710,13 +710,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }); } // 打开下单完成页面 - openFinishPage(resourceObj: any = null) { + openFinishPage(resourceObj: any = null, change?: any) { this.modalService.create({ nzTitle: '', nzContent: PublishSuccessComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { type: 'onecar', resourceObj } + nzComponentParams: { type: 'onecar', resourceObj , change: change} }); } // 提交前确认,委托运输协议弹窗 @@ -808,9 +808,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } } if (this.PageStatus === '整车修改') { - this.requests(this.service.$api_set_WholeModify, params); + this.requests(this.service.$api_set_WholeModify, params, 1); } else if (this.PageStatus === '整车下一单') { - this.requests(this.service.$api_set_saveAnotherWholeOrder, params); + this.requests(this.service.$api_set_saveAnotherWholeOrder, params,2); } } addPreZero(num: any) { @@ -821,7 +821,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } } // 下单成功提示弹窗 - requests(url: any, params: any) { + requests(url: any, params: any, change?: any) { this.service.request(url, params).subscribe((res: any) => { if (res) { this.modalService.create({ @@ -829,7 +829,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { nzContent: PublishSuccessComponent, nzWidth: 900, nzFooter: null, - nzComponentParams: { type: 'onecar' } + nzComponentParams: { type: 'onecar', change: change } }); } else { this.service.msgSrv.error(res.msg); diff --git a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html index 78d34769..53354275 100644 --- a/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/publish-success/publish-success.component.html @@ -7,7 +7,7 @@ * @FilePath: \tms-obc-web\src\app\routes\supply-management\components\onecar-publish\publish-success\publish-success.component.html -->