From 02014f4b218e370f1e73236ad3e466f583f4c480 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 7 Mar 2022 14:01:53 +0800 Subject: [PATCH 1/4] 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`; // 发布货源校验司机/车队长的状态 From 70d7746f83d48d22f94fe73004177ec99d5cd51e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 7 Mar 2022 14:17:16 +0800 Subject: [PATCH 2/4] fix bug --- .../bulk-publish/bulk-publish.component.ts | 5 +- .../bulk-release-publish.component.html | 4 - .../onecar-publish.component.less | 106 ++++++++++++------ .../onecar-publish.component.ts | 14 ++- .../release-publish.component.html | 4 - .../release-publish.component.ts | 23 ++-- 6 files changed, 96 insertions(+), 60 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 d31f8e88..d6916a63 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 @@ -213,16 +213,13 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } as SFSelectWidgetSchema } }, - required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoId', 'deadlineTime'] + required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName', 'deadlineTime'] }; this.ui1 = { '*': { spanLabelFixed: 115, grid: { span: 12 } }, - $enterpriseInfoName: { - grid: { span: 24 } - } }; } initSF3() { diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html index 29a70721..c77af698 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.html @@ -7,13 +7,9 @@
货源单设置
-
-
{{ i.value }} -
-
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index f6d4bb4f..a33ce26d 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -1,52 +1,88 @@ +@import '~@delon/theme/index'; :host { + ::ng-deep { - nz-input-number { - width: 100%; + h3 { + margin-bottom: 20px; + font-size: 16px; } - nz-date-picker { - width: 94.3%; + .submit { + width: 50%; + } + .login { + float: right; + line-height: @btn-height-lg; } } - i { - cursor: pointer; +} +::ng-deep { + .register-password-cdk { + .success, + .warning, + .error { + transition: color 0.3s; + } + .success { + color: @success-color; + } + .warning { + color: @warning-color; + } + .error { + color: @error-color; + } + .progress-pass > .progress { + .ant-progress-bg { + background-color: @warning-color; + } + } } } -.tip-font { - margin-left: 16px; - font-weight: 500; - font-size: 12px; +.form-box{ + display: block; + width: 368px; + margin: 0 auto; } -.card-title { - margin-bottom: 24px; - font-weight: bold; - font-size: 16px; +.content { + background-color: #f0f3f7; +} +.main { + max-width: 1200px; + margin: 0 auto; +} +.header { + background: #fff; +} +.layout { + min-height: 100vh; } -.align-center { +.logo { display: flex; - align-items: center; - justify-content: center; + margin: 16px 0; + line-height: 32px; + dt { + width: 95px; + height: 32px; + img { + vertical-align: top; + } + } + dd { + flex: 1; + margin-bottom: 0; + padding: 0 10px; + color: #1890ff; + font-weight: 500; + font-size: 24px; + } +} +.footer { + text-align: center; + background-color: #f0f3f7; } -.swap-icon { - padding: 24px; - color: #7d7d7d; - font-size: 30px; - :hover{color: #52acff;} -} -#container { - width: 300px; - height: 180px; -} -input[type='number'] { - -moz-appearance: textfield; -} -input[type='number']::-webkit-inner-spin-button, -input[type='number']::-webkit-outer-spin-button { - margin: 0; - -webkit-appearance: none; -} 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 798ab331..1fa22d08 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 @@ -188,6 +188,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { widget: 'text' } }, + externalResourceCode: { type: 'string', title: '外部货源号', @@ -231,7 +232,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }, asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema - } + }, }, required: ['shipperAppUserId', 'enterpriseProjectId'] }; @@ -241,7 +242,16 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { grid: { span: 12 } }, $enterpriseInfoName: { - grid: { span: 24 } + grid: { span: 12 } + }, + $shipperAppUserId: { + grid: { span: 12 } + }, + $enterpriseProjectId: { + grid: { span: 12 } + }, + $dispatchId: { + grid: { span: 12 } } }; } diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index e8897d62..5b61cda9 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -7,13 +7,9 @@
货源单设置
-
-
{{ i.value }} -
-
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 baeb9766..cfcd982c 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 @@ -176,14 +176,6 @@ export class SupplyManagementReleasePublishComponent implements OnInit { allowClear: true } as SFSelectWidgetSchema }, - // enterpriseInfoName: { - // type: 'string', - // title: '网络货运人', - // ui: { - // widget: 'custom' - // }, - // default: '天津市怡亚通XXXX有限公司' - // }, enterpriseInfoName: { type: 'string', title: '网络货运人', @@ -238,17 +230,26 @@ export class SupplyManagementReleasePublishComponent implements OnInit { optionalHelp: '选择调度员，司机直接联系调度员 ; 不选择，司机直接联系您', asyncData: () => this.shipperSrv.getStaffList2() } as SFSelectWidgetSchema - } + }, }, required: ['shipperAppUserId', 'enterpriseProjectId', 'enterpriseInfoName'] }; this.ui1 = { '*': { - spanLabelFixed: 110, + spanLabelFixed: 115, grid: { span: 12 } }, $enterpriseInfoName: { - grid: { span: 24 } + grid: { span: 12 } + }, + $shipperAppUserId: { + grid: { span: 12 } + }, + $enterpriseProjectId: { + grid: { span: 12 } + }, + $dispatchId: { + grid: { span: 12 } } }; } From 07c5ba088442f16e4484eab9b48b6e7d9f0a573b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 7 Mar 2022 14:56:54 +0800 Subject: [PATCH 3/4] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 21a1b485..e28c5d69 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -158,6 +158,9 @@ {{ i?.supplementaryInformationVO?.receiptTypeLabel }} + + {{ i?.supplementaryInformationVO?.receiptUserName ? i?.supplementaryInformationVO?.receiptUserName + '/' : '' }} {{ i?.supplementaryInformationVO?.phon }} + {{ i?.supplementaryInformationVO?.area }} From 119408bcf72873b57fd0823e26a7f40f5b09f1af Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 7 Mar 2022 15:16:41 +0800 Subject: [PATCH 4/4] fix bug --- .../bulk-publish/bulk-publish.component.ts | 2 +- .../bulk-release-publish.component.ts | 2 +- .../onecar-publish.component.less | 110 +++++++----------- .../onecar-publish.component.ts | 2 +- 4 files changed, 42 insertions(+), 74 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 d6916a63..98696f4f 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 @@ -289,7 +289,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } } }, - required: ['goodsTypeId', 'goodsName', 'goodsNameId'] + required: ['goodsTypeId', 'goodsName', 'goodsNameId','goodsName1'] }; this.ui3 = { '*': { diff --git a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts index 8ecf1a57..d3190f9d 100644 --- a/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts @@ -315,7 +315,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit { } } }, - required: ['goodsTypeId', 'goodsName', 'goodsNameId'] + required: ['goodsTypeId', 'goodsName', 'goodsNameId','goodsName1'] }; this.ui3 = { '*': { diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index a33ce26d..35b08935 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -1,88 +1,56 @@ -@import '~@delon/theme/index'; :host { - ::ng-deep { - h3 { - margin-bottom: 20px; - font-size: 16px; + nz-input-number { + width: 100%; } - .submit { - width: 50%; - } - .login { - float: right; - line-height: @btn-height-lg; + nz-date-picker { + width: 94.3%; } } -} -::ng-deep { - .register-password-cdk { - .success, - .warning, - .error { - transition: color 0.3s; - } - .success { - color: @success-color; - } - .warning { - color: @warning-color; - } - .error { - color: @error-color; - } - .progress-pass > .progress { - .ant-progress-bg { - background-color: @warning-color; - } - } + i { + cursor: pointer; } } -.form-box{ - display: block; - width: 368px; - margin: 0 auto; +.tip-font { + margin-left: 16px; + font-weight: 500; + font-size: 12px; } -.content { - background-color: #f0f3f7; -} -.main { - max-width: 1200px; - margin: 0 auto; -} -.header { - background: #fff; -} -.layout { - min-height: 100vh; +.card-title { + margin-bottom: 24px; + font-weight: bold; + font-size: 16px; } -.logo { +.align-center { display: flex; - margin: 16px 0; - line-height: 32px; - dt { - width: 95px; - height: 32px; - img { - vertical-align: top; - } - } - dd { - flex: 1; - margin-bottom: 0; - padding: 0 10px; - color: #1890ff; - font-weight: 500; - font-size: 24px; - } -} -.footer { - text-align: center; - background-color: #f0f3f7; + align-items: center; + justify-content: center; } +.swap-icon { + padding: 24px; + color: #7d7d7d; + font-size: 30px; + :hover{color: #52acff;} +} +#container { + width: 300px; + height: 180px; +} +input[type='number'] { + -moz-appearance: textfield; +} +input[type='number']::-webkit-inner-spin-button, +input[type='number']::-webkit-outer-spin-button { + margin: 0; + -webkit-appearance: none; +} +.hides { + margin-left: 10px; + color: aqua; +} 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 1fa22d08..f52e96c3 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 @@ -322,7 +322,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } } }, - required: ['goodsTypeId', 'goodsName', 'goodsNameId'] + required: ['goodsTypeId', 'goodsName', 'goodsNameId','goodsName1'] }; this.ui3 = { '*': {