From b060c0e53cbae2b607ea121aa2c53132d04ef92c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 2 Mar 2022 10:30:11 +0800 Subject: [PATCH] fix bug --- .../bulk-detail/bulk-detail.component.html | 6 +-- .../import-supply/import-supply.component.ts | 53 +++++++------------ .../services/supply-management.service.ts | 4 +- .../bulk-detail/bulk-detail.component.html | 4 +- 4 files changed, 28 insertions(+), 39 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 041f49e8..317580d8 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-02-15 14:52:18 + * @LastEditTime : 2022-03-02 10:30:06 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -95,8 +95,8 @@ {{ i?.unloadPlanTime }} {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 - {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 - {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件 + {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方,{{ i?.acceptNumber }}件 + {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方,{{ i?.acceptNumber }}件

+ res.map((item: any) => ({ + label: item.projectName, + value: item.id + })) + ) + ) + .subscribe(res => { + this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res; + this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res); + }); + } save(): void { console.log(this.files) // this.service.request(this.service.$api_update_price, { id, freightType, freightPrice, resourceCode, rule, resourceId }).subscribe(res => { @@ -184,36 +201,6 @@ export class SupplyManagementImportSupplyComponent implements OnInit { }); }; downFile() { - console.log('78') - // this.service.request(this.service.$api_exportGoodsResourceOperateTemplate).subscribe((res: any)=> { - // console.log('66') - // console.log(res) - // let aLink = document.createElement('a'); - // const content = res; - // let blob = this.base64ToBlob(content); //new Blob([content]); - // let evt = document.createEvent("HTMLEvents"); - // evt.initEvent("click", true, true);//initEvent 不加后两个参数在IE下会报错 事件类型，是否冒泡，是否阻止浏览器的默认行为 - // aLink.download = '模板'; - // aLink.href = URL.createObjectURL(blob); - // // aLink.dispatchEvent(evt); - // aLink.click(); - // this.status = false - // }) this.service.downloadFile(this.service.$api_exportGoodsResourceOperateTemplate); - - - // window.location.href('') } - //base64转blob - base64ToBlob(code: any) { - let parts = code.split(';base64,'); - let contentType = parts[0].split(':')[1]; - let raw = window.atob(parts[1]); - let rawLength = raw.length; - let uInt8Array = new Uint8Array(rawLength); - for (let i = 0; i < rawLength; ++i) { - uInt8Array[i] = raw.charCodeAt(i); - } - return new Blob([uInt8Array], { type: contentType }); - } } 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 959f44fa..54d88132 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-01 14:08:30 + * @LastEditTime : 2022-03-02 10:10:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -159,4 +159,6 @@ export class SupplyManagementService extends BaseService { public $api_getWholeInsuranceInfo = '/api/sdc/goodsResourceShipper/getWholeInsuranceInfo'; // 下载导入货源模板-运营后台 public $api_exportGoodsResourceOperateTemplate = '/api/sdc/uploadGoodsResource/exportGoodsResourceOperateTemplate'; + // 导入货源-运营后台 + public $api_goodsResourceOperateImport = '/api/sdc/uploadGoodsResource/goodsResourceOperateImport'; } diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 47d54679..49d99d29 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -91,10 +91,10 @@ {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 - + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 - + {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件