diff --git a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts index dc30343e..b6cd6e92 100644 --- a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts +++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-07 17:57:23 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 19:28:24 + * @LastEditTime : 2022-04-13 10:22:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -75,7 +75,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges { this.chart = new Chart({ container: el, autoFit: true, - height: 200, + height: 320, }); let value: any = [] this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index ee417920..1813a271 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 19:51:32 + * @LastEditTime : 2022-04-13 10:33:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -47,11 +47,11 @@ - {{ index }} + {{ index + 1 }} {{ item.weight ? item.weight + '吨' : '' }} @@ -86,10 +86,10 @@ - + - + @@ -157,7 +157,7 @@ #st multiSort bordered - [scroll]="{y: '300px'}" + [scroll]="{y: '290px'}" [columns]="orderColumns" [data]="service.$api_getRealTimeWaybillRiskControl" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }" diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index 08babea1..128e3f9e 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts @@ -5,7 +5,7 @@ import { map } from 'rxjs/operators'; * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 19:48:19 + * @LastEditTime : 2022-04-13 10:25:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -127,7 +127,7 @@ export class DatatableDatascreenComponent implements OnInit { */ initST() { this.columns = [ - { title: '序号', render: 'index', className: 'text-center', width: '70px' }, + { title: '序号', render: 'index', className: 'text-center', width: '70px', }, { title: '发货地', index: 'loadAddress', className: 'text-center', width: '90px' }, { title: '卸货地', index: 'dischargeAddress', className: 'text-center', width: '90px' }, { title: '货物', index: 'goodsName', className: 'text-center', width: '90px' }, @@ -138,7 +138,7 @@ export class DatatableDatascreenComponent implements OnInit { this.orderColumns = [ { title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' }, { title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' }, - { title: '货主', index: 'shipperName', className: 'text-center', width: '70px' }, + { title: '货主', index: 'shipperName', className: 'text-center', width: '200px' }, { title: '时间', index: 'createTime', className: 'text-center', width: '200px' }, { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' } ]; diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.html b/src/app/routes/datatable/components/datascreen/map/map.component.html index 99a40aa8..f82fc220 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.html +++ b/src/app/routes/datatable/components/datascreen/map/map.component.html @@ -4,8 +4,8 @@ * @Author : Shiming * @Date : 2022-04-06 17:57:07 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 19:44:32 + * @LastEditTime : 2022-04-13 10:17:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - \ No newline at end of file + \ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.ts b/src/app/routes/datatable/components/datascreen/map/map.component.ts index 66c3a677..4df67fe2 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -49,7 +49,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { this.chart = new Chart({ container: el, autoFit: true, - height: 680, padding: [0, 0] }); this.chart.tooltip({ @@ -108,6 +107,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { }); console.log(value); this.userData = value + +if (!(this.userData instanceof Array) || this.userData.length === 0) { + return; + } this.userDv = this.ds.createView().source(this.userData).transform({ geoDataView: this.worldMap, field: 'name', 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 e24a5a29..37730ca3 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -172,6 +172,8 @@ export class SupplyManagementVehicleComponent implements OnInit { type: 'default', onClick: () => { tipsModal.destroy(); + this.st?.reload(); + this.getGoodsSourceStatistical(); } }, { @@ -182,10 +184,14 @@ export class SupplyManagementVehicleComponent implements OnInit { if(!result?.failNumber) { this.service.msgSrv.error('没有失败数据！'); tipsModal.destroy(); + this.st?.reload(); + this.getGoodsSourceStatistical(); return; } this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids) tipsModal.destroy(); + this.st?.reload(); + this.getGoodsSourceStatistical(); } }, ] @@ -194,51 +200,6 @@ export class SupplyManagementVehicleComponent implements OnInit { }); } - /** - * 修改运费 - */ - updateFreight(item: any) { - const modalRef = this.modal.create({ - nzTitle: '货源导入', - nzWidth: 600, - nzContent: SupplyManagementImportSupplyComponent, - nzComponentParams: { - // i: item - }, - nzFooter: null - }); - modalRef.afterClose.subscribe(result => { - if (result) { - 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.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids); - // 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.html b/src/app/routes/supply-management/model/import-supply/import-supply.component.html index fd35818d..f06873b6 100644 --- a/src/app/routes/supply-management/model/import-supply/import-supply.component.html +++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 10:35:44 + * @LastEditTime : 2022-04-13 10:41:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -51,5 +51,5 @@
- +
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 3f3a4613..e75aafe1 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-11 10:33:44 + * @LastEditTime : 2022-04-13 10:41:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -31,6 +31,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { status: boolean = true files2: any; schema: SFSchema = {}; + load = false ui: SFUISchema = {}; networkTransporter: any; // 网络货运人id uploadUrl = apiConf.file_upload_url; @@ -154,12 +155,11 @@ export class SupplyManagementImportSupplyComponent implements OnInit { }); } save(): void { - console.log(this?.networkTransporter) - console.log(this.sf.value) if(!this.sf.value?.shipperAppUserId || !this?.networkTransporter || !this.sf.value?.enterpriseProjectId || !this.sf.value?.fileName) { this.service.msgSrv.error('请填写必填项并上传文件！') return } + this.load =true; const formData : any= new FormData(); this.files?.forEach((file: any) => { formData.append('file', file); @@ -172,6 +172,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { this.service.request(this.service.$api_goodsResourceOperateImport, formData).subscribe(res => { if (res) { this.service.msgSrv.success('导入成功'); + this.load =false; this.modal.destroy({ ...res }); } }); diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 37898646..14a3554c 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -212,7 +212,7 @@ export class InvoiceRequestedComponent { label: '手工处理', onClick: () => { const params = { - ficoVatappBillVOList: this.selectedRows.map(item => { + ficoVatappHVOList: this.selectedRows.map(item => { const i = Object.assign({}, { ...item }); delete i._values; delete i._rowClassName; @@ -236,7 +236,7 @@ export class InvoiceRequestedComponent { label: '自动开票', onClick: () => { const params = { - ficoVatappBillVOList: this.selectedRows.map(item => { + ficoVatappHVOList: this.selectedRows.map(item => { const i = Object.assign({}, { ...item }); delete i._values; delete i._rowClassName; diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index 91b2323f..a6bf0fe5 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ModalHelper } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of, Subject } from 'rxjs'; @@ -135,7 +135,7 @@ export class VehicleComponentsAuditComponent implements OnInit { expand: (value: boolean) => value } } - } + }, // approvalStatus: { // type: 'string', // title: '审核状态', @@ -155,9 +155,22 @@ export class VehicleComponentsAuditComponent implements OnInit { // }, // }, // }, + approvalPassTime: { + type: 'string', + title: '审核通过时间', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + placeholder: '请选择', + nzShowTime: true, + visibleIf: { + expand: (value: boolean) => value + } + } as SFDateWidgetSchema + } } }; - this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; + this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; } initST() { @@ -186,6 +199,7 @@ export class VehicleComponentsAuditComponent implements OnInit { } }, { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' }, + { title: '审核通过时间', width: '180px', className: 'text-center', index: 'approvalPassTime' }, { title: '操作', fixed: 'right',