From b91095ed9a645ed4b9e674564650d1c034e1a0fe Mon Sep 17 00:00:00 2001 From: heqinghang Date: Tue, 29 Mar 2022 17:57:06 +0800 Subject: [PATCH 1/8] 666 --- .../customer/customer.component.html | 6 + .../compliance/customer/customer.component.ts | 45 +++++++ .../compliance/index/index.component.html | 66 +++++++++ .../compliance/index/index.component.less | 17 +++ .../compliance/index/index.component.ts | 125 ++++++++++++++++++ .../salesman/salesman.component.html | 6 + .../compliance/salesman/salesman.component.ts | 45 +++++++ .../financetable/financetable.component.html | 6 + .../financetable/financetable.component.ts | 45 +++++++ .../invoicetable/invoicetable.component.html | 14 ++ .../invoicetable/invoicetable.component.ts | 70 ++++++++++ .../datatable/datatable-routing.module.ts | 14 +- src/app/routes/datatable/datatable.module.ts | 14 +- src/assets/mocks/menu-data.json | 26 +++- 14 files changed, 494 insertions(+), 5 deletions(-) create mode 100644 src/app/routes/datatable/components/compliance/customer/customer.component.html create mode 100644 src/app/routes/datatable/components/compliance/customer/customer.component.ts create mode 100644 src/app/routes/datatable/components/compliance/index/index.component.html create mode 100644 src/app/routes/datatable/components/compliance/index/index.component.less create mode 100644 src/app/routes/datatable/components/compliance/index/index.component.ts create mode 100644 src/app/routes/datatable/components/compliance/salesman/salesman.component.html create mode 100644 src/app/routes/datatable/components/compliance/salesman/salesman.component.ts create mode 100644 src/app/routes/datatable/components/financetable/financetable.component.html create mode 100644 src/app/routes/datatable/components/financetable/financetable.component.ts create mode 100644 src/app/routes/datatable/components/invoicetable/invoicetable.component.html create mode 100644 src/app/routes/datatable/components/invoicetable/invoicetable.component.ts diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html new file mode 100644 index 00000000..56092666 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.ts b/src/app/routes/datatable/components/compliance/customer/customer.component.ts new file mode 100644 index 00000000..1546a048 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-compliance-customer', + templateUrl: './customer.component.html', +}) +export class DatatableComplianceCustomerComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/components/compliance/index/index.component.html b/src/app/routes/datatable/components/compliance/index/index.component.html new file mode 100644 index 00000000..dbcfc3c0 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/index/index.component.html @@ -0,0 +1,66 @@ + + + + +
+
+ +
+
+
+
+ + + + +
+ +
+
+
+
+
+ + +
+
+ + +
+ 合格：12423 不合格：12423 +
+ + +
+
+ + +
+ 货源单：12423 合同单：12423 +
+ + +
+
+ + +
+ 司机：12423 车队长：12423 +
+ + +
+
+ + +
+ 准时：12423 逾期：12423 +
+ + +
+
+ + + + diff --git a/src/app/routes/datatable/components/compliance/index/index.component.less b/src/app/routes/datatable/components/compliance/index/index.component.less new file mode 100644 index 00000000..3d0d3e63 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/index/index.component.less @@ -0,0 +1,17 @@ +.card-f{ + color: #5a5a5a; + .card-f-l{ + margin-right: 24px; + } +} +.chooseBox{ + display: flex; +} +.timeBox{ + display: flex; + margin: 0 0 0 10px; +} +.dateBox{ + display: inline-block; + margin: 0 0 0 10px; +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/compliance/index/index.component.ts b/src/app/routes/datatable/components/compliance/index/index.component.ts new file mode 100644 index 00000000..b50e7764 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/index/index.component.ts @@ -0,0 +1,125 @@ +import { Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; +import { DatePipe, ModalHelper, _HttpClient } from '@delon/theme'; +import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area'; +import { format } from 'date-fns'; +import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { G2TimelineData, G2TimelineMap } from '@delon/chart/timeline'; +import { Chart } from '@antv/g2'; +const DataSet = require('@antv/data-set'); +@Component({ + selector: 'app-datatable-compliance-index', + templateUrl: './index.component.html', + styleUrls: ['./index.component.less'], + providers: [DatePipe] +}) +export class DatatableComplianceIndexComponent implements OnInit { + @ViewChild('sf', { static: false }) + sf!: SFComponent; + ui!: SFUISchema; + schema: SFSchema = {}; + + mode = 'year'; + date: any = null; + dateFormat = 'yyyy-MM-dd'; + time: any = ['2022-01-01 00:00:00'] + constructor(private http: _HttpClient, private modal: ModalHelper, private ngZone: NgZone, private datePipe: DatePipe) {} + + ngOnInit(): void { + this.initSF(); + } + + changeData(){ + if(this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if(this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } else { + this.dateFormat = 'yyyy-MM-dd' + } + } + + onChange(result: any) { + if(this.mode === 'year') { + this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'] + } else if(this.mode === 'month') { + this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'] + } + } + + initSF() { + this.schema = { + properties: { + name: { + type: 'string', + title: '', + ui: { + widget: 'select', + placeholder: '网络货运人' + } + }, + name2: { + type: 'string', + title: '', + ui: { + widget: 'select', + placeholder: '部门' + } + }, + name3: { + type: 'string', + title: '', + ui: { + placeholder: '业务员' + } + } + } + }; + this.ui = { + '*': { + grid: { span: 4 } + } + }; + + } + + data = [ + { Date: '22 February', 订单合格率: 50000, 付款及时率: 125000 }, + { Date: '28 February', 订单合格率: 60000, 付款及时率: 150000 }, + { Date: '3 March', 订单合格率: 100000, 付款及时率: 250000 }, + { Date: '20 March', 订单合格率: 200000, 付款及时率: 500000 }, + { Date: '7 April', 订单合格率: 250000, 付款及时率: 625000 }, + { Date: '13 June', 订单合格率: 210000, 付款及时率: 525000 } + ]; + render(el: ElementRef) { + this.ngZone.runOutsideAngular(() => this.init(el.nativeElement)); + } + + private init(el: HTMLElement): void { + const chart = new Chart({ + container: el, + autoFit: true, + height: 400 + }); + // 以三组数据为例, 需要展示 91/92/93年中a/b/c数据走势 + const data = [ + {x: '1991', z: 'a', y: 1}, + {x: '1991', z: 'b', y: 2}, + {x: '1991', z: 'c', y: 3}, + + {x: '1992', z: 'a', y: 11}, + {x: '1992', z: 'b', y: 22}, + {x: '1992', z: 'c', y: 33}, + + {x: '1993', z: 'a', y: 1}, + {x: '1993', z: 'b', y: 2}, + {x: '1993', z: 'c', y: 3} + ]; + + chart.data(data); + // 在x*y的坐标点上按z值绘制线条, 如果z值相同将使用直线连接 + chart.line().position('x*y').color('z'); + // 在x*y的坐标上按z值绘制圆点 + chart.point().position('x*y').size(4).color('z').shape('circle'); + chart.render(); + } +} diff --git a/src/app/routes/datatable/components/compliance/salesman/salesman.component.html b/src/app/routes/datatable/components/compliance/salesman/salesman.component.html new file mode 100644 index 00000000..56092666 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/salesman/salesman.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts b/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts new file mode 100644 index 00000000..3b6cd019 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-compliance-salesman', + templateUrl: './salesman.component.html', +}) +export class DatatableComplianceSalesmanComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/components/financetable/financetable.component.html b/src/app/routes/datatable/components/financetable/financetable.component.html new file mode 100644 index 00000000..56092666 --- /dev/null +++ b/src/app/routes/datatable/components/financetable/financetable.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts new file mode 100644 index 00000000..00e0f1b3 --- /dev/null +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-financetable', + templateUrl: './financetable.component.html', +}) +export class DatatableFinancetableComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html new file mode 100644 index 00000000..13411ab5 --- /dev/null +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts new file mode 100644 index 00000000..9916e4c4 --- /dev/null +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts @@ -0,0 +1,70 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-invoicetable', + templateUrl: './invoicetable.component.html', +}) +export class DatatableInvoicetableComponent implements OnInit { + @ViewChild('st', { static: false }) + st!: STComponent; + columns!: STColumn[]; + + data=[{name1:1111}] + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + /** + * 查询参数 + */ + get reqParams() { + return { }; + } + ngOnInit(): void { + this.initST(); + } + initST() { + this.columns = [ + { + title: '运营主体', + index: 'name1' + }, + { + title: '已开票总金额', + index: 'name1' + }, + { + title: '当月已开票金额', + index: 'name1' + }, + { + title: '已申请待开金额', + index: 'name1' + }, + { + title: '未申请开票金额（历史）', + index: 'name1' + }, + { + title: '未申请开票金额（当月）', + index: 'name1' + }, + { + title: '当月发票张数', + index: 'name1' + }, + { + title: '剩余发票张数', + index: 'name1' + }, + + ]; + } + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts index c71ba4c6..2bea9ee5 100644 --- a/src/app/routes/datatable/datatable-routing.module.ts +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -7,6 +7,11 @@ import { DatatableDriverComponent } from './components/customtable/driver/driver import { DatatableOperationtableComponent } from './components/operationtable/operationtable.component'; import { DatatableOrderReportingComponent } from './reporting/components/order-reporting/order-reporting.component'; import { DatatableDataindexComponent } from './components/dataindex/dataindex.component'; +import { DatatableComplianceIndexComponent } from './components/compliance/index/index.component'; +import { DatatableFinancetableComponent } from './components/financetable/financetable.component'; +import { DatatableInvoicetableComponent } from './components/invoicetable/invoicetable.component'; +import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component'; +import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component'; const routes: Routes = [ { path: 'dataindex', component: DatatableDataindexComponent }, @@ -15,9 +20,14 @@ const routes: Routes = [ { path: 'owner', component: DatatableOwnerComponent }, { path: 'driver', component: DatatableDriverComponent }, { path: 'operationtable', component: DatatableOperationtableComponent }, - { path: 'reporting/order', component: DatatableOrderReportingComponent }]; + { path: 'reporting/order', component: DatatableOrderReportingComponent }, + { path: 'compliancetabel/index', component: DatatableComplianceIndexComponent }, + { path: 'compliancetabel/salesman', component: DatatableComplianceSalesmanComponent }, + { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent }, + { path: 'financetable', component: DatatableFinancetableComponent }, + { path: 'invoicetable', component: DatatableInvoicetableComponent }, +]; - @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index d37e1e6b..6516ec67 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -9,6 +9,11 @@ import { DatatableOperationtableComponent } from './components/operationtable/op import { OperationtablePieComponent } from './components/operationtable/pie/pie.component'; import { DatatableOrderReportingComponent } from './reporting/components/order-reporting/order-reporting.component'; import { DatatableDataindexComponent } from './components/dataindex/dataindex.component'; +import { DatatableComplianceIndexComponent } from './components/compliance/index/index.component'; +import { DatatableFinancetableComponent } from './components/financetable/financetable.component'; +import { DatatableInvoicetableComponent } from './components/invoicetable/invoicetable.component'; +import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component'; +import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -18,8 +23,13 @@ const COMPONENTS: Type[] = [ DatatableDriverComponent, DatatableOperationtableComponent, OperationtablePieComponent, - DatatableOrderReportingComponent -]; + DatatableOrderReportingComponent, + DatatableComplianceIndexComponent, + DatatableFinancetableComponent, + DatatableInvoicetableComponent, + DatatableComplianceSalesmanComponent, + DatatableComplianceCustomerComponent +] @NgModule({ imports: [ diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 824190d8..69601b29 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -646,8 +646,32 @@ { "text": "订单上报", "link": "/datatable/reporting/order" + }, + { + "text": "合规监控报表", + "children": [{ + "text": "合规监控报表", + "link": "/datatable/compliancetabel/index" + }, + { + "text": "业务员-合规报表", + "link": "/datatable/compliancetabel/salesman" + }, + { + "text": "客户-合规报表", + "link": "/datatable/compliancetabel/customer" + } + ] + }, + { + "text": "财务报表", + "link": "/datatable/financetable" + }, + { + "text": "开票数据报表", + "link": "/datatable/invoicetable" } - ] + ] } ] }] From 26e3893f3a8a322b386b204b65dce88f10ba9cf1 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 30 Mar 2022 09:44:33 +0800 Subject: [PATCH 2/8] edit --- .../cancellation-invoice/cancellation-invoice.component.html | 2 +- .../invoice-requested-detail.component.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index c31db228..80d1837f 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -65,7 +65,7 @@

开户行： {{openInfo?.artobank}}

- {{openInfo?.vatnameLable}} + {{openInfo?.vatnameLabel}} {{openInfo?.vatremarks}} diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index fc9c0897..ee8858b6 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -50,6 +50,8 @@ export class InvoiceRequestedDetailComponent implements OnInit { } beforeReq = (requestOptions: STRequestOptions) => { + this.totalCallNo = '0'; + this.selectedRows = []; Object.assign(requestOptions.body, { vatappHId: this.id }); if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); @@ -58,7 +60,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { }; afterRes = (data: any[], rawData?: any) => { - this.totalCallNo = data.reduce((total, cv) => total + cv.billkpmoney, 0).toFixed(2); + // this.totalCallNo = data.reduce((total, cv) => total + cv.billkpmoney, 0).toFixed(2); return data.map(item => ({ ...item })); From 18c571dd973740440bbdcc4e32aa410f14d55917 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 09:58:02 +0800 Subject: [PATCH 3/8] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 4 ++-- .../components/vehicle-detail/vehicle-detail.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 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 464766ad..19c73767 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-03-29 14:30:12 + * @LastEditTime : 2022-03-30 09:35:49 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -222,7 +222,7 @@ - + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 8a89ec51..c05f1bcc 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 20:31:30 + * @LastEditTime : 2022-03-30 09:36:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -229,7 +229,7 @@ - + From dafe2a811fd8b4616cfb8cb0fc87a5a01c71ad05 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 10:09:12 +0800 Subject: [PATCH 4/8] fix bug --- .../components/complaint/complaint.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index ff32fbd7..b4149368 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -55,9 +55,9 @@ export class OrderManagementComplaintComponent implements OnInit { private modal: NzModalService, private router: Router ) { if (this.selectedIndex === 0) { - this.selectedMainTabStatus = '1'; - } else if (this.selectedIndex === 1) { this.selectedMainTabStatus = '2'; + } else if (this.selectedIndex === 1) { + this.selectedMainTabStatus = '1'; }} /** @@ -69,7 +69,7 @@ export class OrderManagementComplaintComponent implements OnInit { a.complaintStatus = this.resourceStatus } if(this.selectedMainTabStatus) { - a.complaintType = this.selectedMainTabStatus + a.complainantParty = this.selectedMainTabStatus } console.log( this.sf?.value); From 48b2345a98f004978b70e4dd3fa8364f8d376ced Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 10:45:28 +0800 Subject: [PATCH 5/8] fix bug --- .../contract-template-detail.component.ts | 6 ++++-- .../components/order-reporting/order-reporting.component.ts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts index f74c02e8..a942aff9 100644 --- a/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts +++ b/src/app/routes/contract-management/components/contract-template-detail/contract-template-detail.component.ts @@ -5,7 +5,7 @@ import { OnChanges } from '@angular/core'; * @Author : Shiming * @Date : 2022-01-05 11:01:55 * @LastEditors : Shiming - * @LastEditTime : 2022-02-28 20:22:46 + * @LastEditTime : 2022-03-30 10:45:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\contract-management\\components\\contract-template-detail\\contract-template-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -95,7 +95,9 @@ export class ContractManagementTemplateTextComponent implements OnInit { { label: '订单补充协议', value: '2' }, { label: '运单合同', value: '3' }, { label: '运单补充协议', value: '4' }, - { label: '委托代收合同', value: '5' } + { label: '委托代收合同', value: '5' }, + { label: '电子提货单', value: '10' }, + { label: '电子卸货单', value: '11' }, ]; this.sf.getProperty('/contractType')!.schema.enum = this.Types; this.sf.getProperty('/contractType')!.widget.reset(this.Types); diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index 0c7ef2c2..9870dda5 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -267,7 +267,7 @@ export class DatatableOrderReportingComponent implements OnInit { { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', }, { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', }, { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, + { title: '本地校验66', render: 'localValid', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billComplianceVOS', From 31923bec62d1e60ee373d9aad354cd62028d7222 Mon Sep 17 00:00:00 2001 From: heqinghang Date: Wed, 30 Mar 2022 10:45:30 +0800 Subject: [PATCH 6/8] 666 --- .../compliance/index/index.component.ts | 115 ++++++++++++++---- 1 file changed, 94 insertions(+), 21 deletions(-) diff --git a/src/app/routes/datatable/components/compliance/index/index.component.ts b/src/app/routes/datatable/components/compliance/index/index.component.ts index b50e7764..162d6391 100644 --- a/src/app/routes/datatable/components/compliance/index/index.component.ts +++ b/src/app/routes/datatable/components/compliance/index/index.component.ts @@ -82,14 +82,6 @@ export class DatatableComplianceIndexComponent implements OnInit { } - data = [ - { Date: '22 February', 订单合格率: 50000, 付款及时率: 125000 }, - { Date: '28 February', 订单合格率: 60000, 付款及时率: 150000 }, - { Date: '3 March', 订单合格率: 100000, 付款及时率: 250000 }, - { Date: '20 March', 订单合格率: 200000, 付款及时率: 500000 }, - { Date: '7 April', 订单合格率: 250000, 付款及时率: 625000 }, - { Date: '13 June', 订单合格率: 210000, 付款及时率: 525000 } - ]; render(el: ElementRef) { this.ngZone.runOutsideAngular(() => this.init(el.nativeElement)); } @@ -102,24 +94,105 @@ export class DatatableComplianceIndexComponent implements OnInit { }); // 以三组数据为例, 需要展示 91/92/93年中a/b/c数据走势 const data = [ - {x: '1991', z: 'a', y: 1}, - {x: '1991', z: 'b', y: 2}, - {x: '1991', z: 'c', y: 3}, + { data: '1月', label: '订单合格率', value: 5 }, + { data: '2月', label: '订单合格率', value: 10 }, + { data: '3月', label: '订单合格率', value: 25 }, + { data: '4月', label: '订单合格率', value: 35 }, + { data: '5月', label: '订单合格率', value: 15 }, + { data: '6月', label: '订单合格率', value: 5 }, + { data: '7月', label: '订单合格率', value: 95 }, + { data: '8月', label: '订单合格率', value: 45 }, - {x: '1992', z: 'a', y: 11}, - {x: '1992', z: 'b', y: 22}, - {x: '1992', z: 'c', y: 33}, - - {x: '1993', z: 'a', y: 1}, - {x: '1993', z: 'b', y: 2}, - {x: '1993', z: 'c', y: 3} - ]; + { data: '1月', label: '付款及时率', value: 10 }, + { data: '2月', label: '付款及时率', value: 15 }, + { data: '3月', label: '付款及时率', value: 30 }, + { data: '4月', label: '付款及时率', value: 8 }, + { data: '5月', label: '付款及时率', value: 9 }, + { data: '6月', label: '付款及时率', value: 5 }, + { data: '7月', label: '付款及时率', value: 80 }, + { data: '8月', label: '付款及时率', value: 55 }, + + { data: '1月', label: '货源占比率', value: 90 }, + { data: '2月', label: '货源占比率', value: 30 }, + { data: '3月', label: '货源占比率', value: 45 }, + { data: '4月', label: '货源占比率', value: 35 }, + { data: '5月', label: '货源占比率', value: 95 }, + { data: '6月', label: '货源占比率', value: 35 }, + { data: '7月', label: '货源占比率', value: 65 }, + { data: '8月', label: '货源占比率', value: 63 }, + + { data: '1月', label: '运费直付占比', value: 30 }, + { data: '2月', label: '运费直付占比', value: 60 }, + { data: '3月', label: '运费直付占比', value: 25 }, + { data: '4月', label: '运费直付占比', value: 35 }, + { data: '5月', label: '运费直付占比', value: 15 }, + { data: '6月', label: '运费直付占比', value: 55 }, + { data: '7月', label: '运费直付占比', value: 50 }, + { data: '8月', label: '运费直付占比', value: 30 }, + ]; chart.data(data); + //刻度自定义 + chart.scale({ + data: { + range: [0, 1], + }, + value: { + min: 0, + nice: true, + }, + }); + // 图表下方图形文字自定义 + chart.legend({ + items:[ + { + name: '订单合格率', + value: 'node_load1', + marker: { + symbol: 'circle', + style: {fill: '#6193f7'} + }, + }, + { + name: '付款及时率', + value: 'node_load2', + marker: {symbol: 'circle',style: {fill: '#58d3a2'}}, + }, + { + name: '货源占比率', + value: 'node_load13', + marker: {symbol: 'circle',style: {fill: '#5b6d8f'}}, + }, + { + name: '运费直付占比', + value: 'node_load13', + marker: {symbol: 'circle',style: {fill: '#f0b915'}}, + }, + ] + }); + // 提示自定义 + chart.tooltip({ + showCrosshairs: true, + shared: true, + }); + + //数据格式化 + chart.axis('value', { + label: { + formatter: (val) => { + return val + ' %'; + }, + }, + }); // 在x*y的坐标点上按z值绘制线条, 如果z值相同将使用直线连接 - chart.line().position('x*y').color('z'); + chart.line().position('data*value').color('label').tooltip('label*value', (name:any, value:any) => { + return { + name: name, + value: value + '%' + }; + });; // 在x*y的坐标上按z值绘制圆点 - chart.point().position('x*y').size(4).color('z').shape('circle'); + chart.point().position('data*value').size(4).color('label').shape('circle'); chart.render(); } } From b817782b9baa39c981deb44f452c819e434f5c3e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 11:04:11 +0800 Subject: [PATCH 7/8] fix bug --- .../routes/vehicle/components/list/carauth/carauth.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts index 245f172c..49342fda 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts @@ -717,6 +717,8 @@ export class CarSettleCarauthComponent implements OnInit { params.roadTransportPhoto = this.detailData.roadTransportPhoto delete params.titleA delete params.titleB + console.log(params); + this.service.request(this.service.$api_saveUpdateShipperCar, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('添加成功') From 6de4675aa943115023ed18738a4870d9577797ef Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 30 Mar 2022 11:23:42 +0800 Subject: [PATCH 8/8] fix bug --- .../complaint/complaint.component.ts | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index b4149368..a42d1148 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -54,11 +54,14 @@ export class OrderManagementComplaintComponent implements OnInit { public service: OrderManagementService, private modal: NzModalService, private router: Router - ) { if (this.selectedIndex === 0) { - this.selectedMainTabStatus = '2'; - } else if (this.selectedIndex === 1) { - this.selectedMainTabStatus = '1'; - }} + ) { + // console.log(this.selectedIndex); + // if (this.selectedIndex === 0) { + // this.selectedMainTabStatus = '2'; + // } else if (this.selectedIndex === 1) { + // this.selectedMainTabStatus = '1'; + // } + } /** * 查询参数 @@ -68,11 +71,18 @@ export class OrderManagementComplaintComponent implements OnInit { if(this.resourceStatus) { a.complaintStatus = this.resourceStatus } - if(this.selectedMainTabStatus) { - a.complainantParty = this.selectedMainTabStatus - } - console.log( this.sf?.value); + console.log(this.selectedMainTabStatus); + if(this.selectedMainTabStatus) { + switch(this.selectedMainTabStatus) { + case '1': + a.complainantParty = '2' + break; + case '2': + a.complainantParty = '1' + break; + } + } const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; return { @@ -264,6 +274,7 @@ export class OrderManagementComplaintComponent implements OnInit { * 切换投诉与被投诉tab */ selectMainTab(e: any) { + console.log(e); console.log(this.selectedIndex); this.selectedMainTabStatus = e?.status; this.initST();