From 02014f4b218e370f1e73236ad3e466f583f4c480 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 7 Mar 2022 14:01:53 +0800 Subject: [PATCH] fix bug --- .../bulk-publish/bulk-publish.component.ts | 7 +++-- .../onecar-publish.component.ts | 7 +++-- .../components/vehicle/vehicle.component.ts | 27 ++++++++++++++++++- .../import-supply/import-supply.component.ts | 26 +++++++++--------- .../services/supply-management.service.ts | 4 ++- 5 files changed, 52 insertions(+), 19 deletions(-) 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 77178e95..d31f8e88 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 @@ -217,8 +217,11 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }; this.ui1 = { '*': { - spanLabelFixed: 120, - grid: { span: 8 } + spanLabelFixed: 115, + grid: { span: 12 } + }, + $enterpriseInfoName: { + grid: { span: 24 } } }; } 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 d9626b84..798ab331 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 @@ -237,8 +237,11 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }; this.ui1 = { '*': { - spanLabelFixed: 120, - grid: { span: 8 } + spanLabelFixed: 115, + grid: { span: 12 } + }, + $enterpriseInfoName: { + grid: { span: 24 } } }; } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 61f1d02e..4021e4de 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -163,7 +163,32 @@ export class SupplyManagementVehicleComponent implements OnInit { }); modalRef.afterClose.subscribe(result => { if (result) { - this.st.reload(); + const tipsModal = this.modal.create({ + nzTitle: '上传提示', + nzWidth: 600, + nzContent: `
文件上传完成！成功${result?.successNumber}条，失败${result?.failNumber}条！
`, + nzFooter: [ + { + label: '取 消', + type: 'default', + onClick: () => { + tipsModal.destroy(); + } + }, + { + label: '下载失败数据', + type: 'primary', + onClick: () => { + this.service.request(this.service.$api_getFailUploadGoodsOperateResource, result.ids).subscribe((res: any) => { + if(res) { + console.log(res); + } + }) + console.log(111); + } + }, + ] + }) } }); } diff --git a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts index 615e2225..908fcedd 100644 --- a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts +++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-01 15:13:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-07 11:09:33 + * @LastEditTime : 2022-03-07 13:50:55 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -32,6 +32,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { files2: any; schema: SFSchema = {}; ui: SFUISchema = {}; + networkTransporter: any; // 网络货运人id uploadUrl = apiConf.file_upload_url; @ViewChild('sf', { static: false }) sf!: SFComponent; constructor( @@ -78,7 +79,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { } } as SFSelectWidgetSchema }, - netTranName: { + enterpriseInfoId: { type: 'string', title: '网络货运人', ui: { @@ -109,7 +110,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { } }, }, - required: ['shipperAppUserId', 'enterpriseProjectId','netTranName','fileName'], + required: ['shipperAppUserId', 'enterpriseProjectId','enterpriseInfoId','fileName'], }; this.ui = { '*': { @@ -146,23 +147,22 @@ export class SupplyManagementImportSupplyComponent implements OnInit { console.log(regionCode); return this.service .request(this.service.$api_getNetworkTransporter, { id: regionCode }).subscribe((res: any) => { - console.log(res?.netTranName) - console.log(res?.networkTransporter) - this.sf.getProperty('/netTranName')!.widget.reset(res?.netTranName); - this.sf.setValue('/netTranName', res?.netTranName) + console.log(res) + this.networkTransporter = res.networkTransporter + this.sf.getProperty('/enterpriseInfoId')!.widget.reset(res?.netTranName); + this.sf.setValue('/enterpriseInfoId', res?.netTranName) }); } save(): void { - console.log(this.files) - console.log(this.sf.value) - const formData = new FormData(); + const formData : any= new FormData(); this.files.forEach((file: any) => { formData.append('file', file); + formData.append('shipperAppUserId', this.sf.value?.shipperAppUserId); + formData.append('enterpriseInfoId', this?.networkTransporter); + formData.append('enterpriseProjectId', this.sf.value?.enterpriseProjectId); }); console.log(formData) - let params = { file: formData ,...this.sf.value} - console.log(params) - this.service.request(this.service.$api_goodsResourceOperateImport, params).subscribe(res => { + this.service.request(this.service.$api_goodsResourceOperateImport, formData).subscribe(res => { if (res) { this.service.msgSrv.success('导入成功'); this.modal.destroy({ ...res }); diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index b8264c9a..166c3390 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-03-02 14:27:18 + * @LastEditTime : 2022-03-07 13:54:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -161,6 +161,8 @@ export class SupplyManagementService extends BaseService { public $api_exportGoodsResourceOperateTemplate = '/api/sdc/uploadGoodsResource/exportGoodsResourceOperateTemplate'; // 导入货源-运营后台 public $api_goodsResourceOperateImport = '/api/sdc/uploadGoodsResource/goodsResourceOperateImport'; + // 下载失败数据-运营后台 + public $api_getFailUploadGoodsOperateResource = '/api/sdc/uploadGoodsResource/getFailUploadGoodsOperateResource'; // 根据货主ID查询网络货运人信息 public $api_getNetworkTransporter = '/api/mdc/cuc/enterpriseInfo/operate/getNetworkTransporter'; $api_verify_vehicle_status = `/api/sdc/goodsResourceShipper/saveVerify`; // 发布货源校验司机/车队长的状态