From d2e8926ca60070ed5a5819203bbb053a35a12290 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 15:03:32 +0800 Subject: [PATCH 01/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascreen/curve/map.component.ts | 6 +- .../datascreen/datascreen.component.html | 124 ++++++++++++------ .../datascreen/datascreen.component.less | 3 + .../datascreen/datascreen.component.ts | 102 ++++++++------ .../bulk-detail/bulk-detail.component.html | 14 +- 5 files changed, 157 insertions(+), 92 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/curve/map.component.ts b/src/app/routes/datatable/components/datascreen/curve/map.component.ts index b1f08a74..5a66c684 100644 --- a/src/app/routes/datatable/components/datascreen/curve/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/curve/map.component.ts @@ -49,7 +49,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { this.chart = new Chart({ container: el, autoFit: true, - height: 540, + height: 700, padding: [0, 0] }); this.chart.tooltip({ @@ -88,9 +88,9 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { // 可视化用户数据 this.userData = [ - { name: '山东', value: '21',trend:'#F51D27' }, + { name: '山东', value: 21 }, { name: '山东', value: 22}, - { name: '广东', value: 20,trend:'#0A61D7' }, + { name: '广东', value: 20, }, { name: '广东', value: 20 }, { name: '四川', value: 120 }, { name: '湖南', value: 200 }, diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 624e60f0..0c3e37dc 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,46 +4,68 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 01:26:56 + * @LastEditTime : 2022-04-07 14:59:07 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> +
+

运多星网络货运平台实时交易监控

+
- + - + - + - + - + + [data]="monthData" + [titleMap]="{ y1: '订单数', y2: '运单数' }" + [height]="200" + mask="MM月DD日" + [slider]="false" + > - + [res]="{ reName: { list: 'data' } }" + [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }" + [loading]="service.http.loading" + > + + {{ index }} + + + {{ item.weight ? item.weight + '吨' : '' }} + {{ item.volume ? item.volume + '方' : '' }} + + + {{ item.weight ? item.weight + '吨' : '' }} + {{ item.volume ? item.volume + '方' : '' }} +
@@ -51,20 +73,20 @@ - + - + - + - + - +
@@ -72,59 +94,75 @@ - + - + - + - + - + - + - + - + - - - + + +
+ +
- - + +
+ +
- - + +
+ +
- - + +
+ +
- - + + - \ No newline at end of file + diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.less b/src/app/routes/datatable/components/datascreen/datascreen.component.less index 9bca0f81..69baee23 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.less +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.less @@ -4,5 +4,8 @@ color: #399ffd; font-weight: bold; } + .nz-statistic-number,.ant-statistic-content-value { + font-size: 20px; + } } } \ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index b44238ec..df261bc6 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 09:30:20 + * @LastEditTime : 2022-04-07 14:59:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -32,7 +32,14 @@ export class DatatableDatascreenComponent implements OnInit { columns: STColumn[] = []; chartData: G2TimelineData[] = []; orderColumns: STColumn[] = []; - salesData = this.genData(); + allDeal: any; + headDeal: any; + classifyDeal: any; + todaysDeal: any; + + monthData: G2TimelineData[] = []; + salesData :any; + salesData2 :any = this.genData(); constructor(public service: DataService) { } @@ -49,8 +56,6 @@ export class DatatableDatascreenComponent implements OnInit { get reqParams() { const params = { } - - return { ...params }; } ngOnInit(): void { @@ -61,55 +66,74 @@ export class DatatableDatascreenComponent implements OnInit { } initData(){ this.service.request(this.service.$api_getAnnualTransactions).subscribe((res: any) => { - console.log(res); - + this.allDeal = res }) - } + this.service.request(this.service.$api_getTransactionAmount).subscribe((res: any) => { + this.headDeal = res + }) + this.service.request(this.service.$api_getCustomerStatistics).subscribe((res: any) => { + this.classifyDeal = res + }) + this.service.request(this.service.$api_getTradingToday).subscribe((res: any) => { + this.todaysDeal = res + }) +} initLineData(){ - for (let i = 0; i < 20; i += 1) { - this.chartData.push({ - time: new Date().getTime() + 1000 * 60 * 60 * 24 * i, - y1: Math.floor(Math.random() * 100) + 1000, - y2: Math.floor(Math.random() * 100) + 10, - }); - } + this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { + this.monthData = res + // for (let i = 0; i < 20; i += 1) { + // this.monthData.push({ + // time: new Date().getTime() + 1000 * 60 * 60 * 24 * i, + // y1: Math.floor(Math.random() * 100) + 1000, + // y2: Math.floor(Math.random() * 100) + 10, + // }); + // } + }) + let value: any = [] + this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { + console.log(res); + res.forEach((element: any) => { + value.push({ + x: element.city, + y: element.weight, + }); + }); + this.salesData = value + console.log(this.salesData); + }) } - private genData(): G2MiniAreaData[] { - const beginDay = new Date().getTime(); - const res: G2MiniAreaData[] = []; - for (let i = 0; i < 20; i += 1) { - res.push({ - x: format(new Date(beginDay + 1000 * 60 * 60 * 24 * i), 'yyyy-MM-dd'), - y: Math.floor(Math.random() * 100) + 10, + public genData(): G2MiniAreaData[] { + let value: any = [] + this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { + console.log(res); + res.forEach((element: any) => { + value.push({ + x: element.city, + y: element.weight, }); + }); + }) + console.log(value); + return value; } - return res; - } /** * 初始化数据列表 */ initST() { this.columns = [ - { title: '序号', index: 'carNo', className: 'text-center' }, - { title: '发货地', index: 'carNoColorLabel', className: 'text-center' }, - { title: '卸货地', index: 'carModelLabel', className: 'text-center' }, - { title: '货物', index: 'carStatus', className: 'text-center'}, - { title: '数量', index: 'approvalStatus', className: 'text-center' }, + { 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'}, + { title: '数量', render: 'weight', className: 'text-center',width: '120px' }, ]; - console.log(this.map); - setTimeout(() => { - if(this.map) { - this.map.reRender() - } - }, 500); - } initOrderST() { this.orderColumns = [ - { title: '运单号', index: 'carNo', className: 'text-center' }, - { title: '货主', index: 'carNoColorLabel', className: 'text-center' }, - { title: '时间', index: 'carModelLabel', className: 'text-center' }, - { title: '风险等级', index: 'carStatus', className: 'text-center'} + { title: '运单号', index: 'wayCode', className: 'text-center',width: '120px' }, + { title: '货主', index: 'shipperName', className: 'text-center',width: '70px' }, + { title: '时间', index: 'createTime', className: 'text-center',width: '200px' }, + { title: '风险等级', index: 'warningType', className: 'text-center',width: '90px'} ]; } 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 c264cc4d..ae0c1cfb 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 @@ -1,7 +1,7 @@ -

{{i?.goodsInfos?.[0]?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）

+

{{i?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）

到付 @@ -176,7 +176,7 @@ 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%） -
车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
+
收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
 From a8ca0fa98e7f873d9322700a55ed63cf59c1acb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 7 Apr 2022 15:18:29 +0800 Subject: [PATCH 02/27] =?UTF-8?q?=E8=B5=84=E9=87=91=E4=B8=8A=E6=8A=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund-reporting.component.html | 3 +- .../fund-reporting.component.ts | 41 ++++++--- .../order-reporting.component.html | 8 +- .../order-reporting.component.ts | 85 +++++++++++++++++-- .../reporting/services/reporting.service.ts | 3 +- 5 files changed, 117 insertions(+), 23 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html index 98069a2c..ca872918 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -28,7 +28,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" (change)="changeSt($event)"> {{item?.uploadStatusLabel}} @@ -58,5 +58,6 @@ + diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index e6d1d68a..e7bdf47b 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -7,7 +7,6 @@ import { NzModalService } from 'ng-zorro-antd/modal'; import { ReportingService } from '../../services/reporting.service'; import { DatatableReportingFundInfoComponent } from '../fund-info/fund-info.component'; import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; -import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @Component({ selector: 'app-datatable-fund-reporting', @@ -230,24 +229,24 @@ export class DatatableFundReportingComponent implements OnInit { className: 'text-center', width: '180px', }, - { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', }, + { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '180px', }, { title: '网络货运人', index: 'ltdName', className: 'text-center', width: '180px', }, - { title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '200px' }, - { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '120px' }, + { title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '150px' }, + { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '200px' }, { title: '车牌号', index: 'carNumber', className: 'text-center', width: '180px' }, { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' }, { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' }, - { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '180px' }, - { title: '车队长', index: 'payee', className: 'text-center', width: '250px' }, - { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '200px' }, + { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '150px' }, + { title: '车队长', index: 'payee', className: 'text-center', width: '150px' }, + { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '180px' }, - { title: '收款银行', index: 'bankTypeLabel', className: 'text-center', width: '200px' }, + { title: '收款银行', index: 'bankTypeLabel', className: 'text-center', width: '150px' }, { title: '银行流水号', index: 'bankSerialNumber', className: 'text-center', width: '180px' }, { title: '实际支付金额', render: 'payAmount', className: 'text-center', width: '150px' }, @@ -290,7 +289,9 @@ export class DatatableFundReportingComponent implements OnInit { selectChange(item: any) { this.selectedIndex = item?.value || ''; + setTimeout(() => { + this.selectedRows = []; this.st.load(1); }) } @@ -378,14 +379,34 @@ export class DatatableFundReportingComponent implements OnInit { }) } + + /** * 查看监管审核结果 */ viewAuditResult(record: any) { - if (record?.verifyStatus !== '1') { + if (record?.verifyStatus !== '2') { return; } - this.openWainingModal('监管审核结果', record?.result) + this.openWainingModal('监管审核结果', record?.uploadResult) + } + + /** + * 更新数据 + */ + updateData() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要更新的数据'); + return; + } + const ids = this.selectedRows.map(i => i?.id); + this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => { + if (res) { + this.selectedRows = []; + this.st.reload(); + + } + }) } diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index c500e2d0..117c0795 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -28,7 +28,8 @@ + [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading" + (change)="changeSt($event)"> {{filterStatus(item?.orderCheckStatus)}} @@ -65,10 +66,10 @@ - 查看轨迹 + 查看轨迹 - 查看轨迹 + 查看轨迹 @@ -80,6 +81,7 @@ + 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 6d3fe302..d5b58c12 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 @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STComponent, STData } from '@delon/abc/st'; +import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -31,6 +31,7 @@ export class DatatableOrderReportingComponent implements OnInit { selectedIndex = ''; //选择的项目 serviceTel = ''; isLoading: boolean = false; + selectedRows: any[] = []; constructor( public service: ReportingService, private router: Router, @@ -61,9 +62,9 @@ export class DatatableOrderReportingComponent implements OnInit { /** * 选中行 */ - get selectedRows() { - return this.st?.list.filter((item: any) => item.checked) || []; - } + // get selectedRows() { + // return this.st?.list.filter((item: any) => item.checked) || []; + // } /** * 伸缩查询条件 @@ -293,14 +294,13 @@ export class DatatableOrderReportingComponent implements OnInit { className: 'text-center', width: '180px', }, - - { title: '统一社会信用代码', index: 'unifiedSocialCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '统一社会信用代码', index: 'unifiedSocialCreditCode', className: 'text-center', width: '200px' }, { title: '运单生成时间', index: 'wayBillCreateTime', className: 'text-center', width: '180px' }, { title: '发货时间', index: 'dispatchedDate', className: 'text-center', width: '180px' }, { title: '收货时间', index: 'receivingDate', className: 'text-center', width: '180px' }, { title: '托运人名称', index: 'shipperName', className: 'text-center', width: '250px' }, - { title: '托运人统一社会信用代码', index: 'shipperCreditCode', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '装货地址', index: 'loadingAddress', render: 'dischargePlace', className: 'text-center', width: '200px' }, + { title: '托运人统一社会信用代码', index: 'shipperCreditCode', className: 'text-center', width: '200px' }, + { title: '装货地址', index: 'loadingAddress', className: 'text-center', width: '200px' }, { title: '收货方名称', index: 'receivingName', className: 'text-center', width: '150px' }, { title: '收货地址', index: 'consigneeAddress', className: 'text-center', width: '150px' }, { title: '运费金额', render: 'freightAmount', className: 'text-center', width: '250px' }, @@ -364,9 +364,51 @@ export class DatatableOrderReportingComponent implements OnInit { } + changeSt(e: STChange): void { + + if (e.type === 'checkbox') { + const checkRows = (e.checkbox as STData[]) || []; + //判断当前页是否有选中的行 + if (checkRows.length === 0) { + // 当前页没有存在已勾选的行，移除之前所记录的当前页的行 + const stList = this.st.list; + stList.forEach(item => { + this.selectedRows = this.selectedRows.filter((e: any) => e.id !== item.id); + }) + } else { + //添加新增的行 + checkRows.forEach((item: any) => { + const newSelectedList = this.selectedRows.filter((r: any) => r.id === item.id); + if (newSelectedList.length === 0) { + this.selectedRows.push(item); + + } + }) + // 移除取消选中的行 + const stList = this.st.list; + stList.forEach(item => { + if (!item.checked) { + const index = this.selectedRows.findIndex(_item => item.id === _item.id); + if (index !== -1) this.selectedRows.splice(index, 1); + } + }) + } + } else if (e.type === 'loaded') { + // 页面加载时勾选 + (e?.loaded || []).forEach((r: any) => { + this.selectedRows.forEach((x) => { + if (x.id === r.id) { + r.checked = true; + } + }); + }); + } + } + selectChange(item: any) { this.selectedIndex = item?.representationsStatus || ''; setTimeout(() => { + this.selectedRows = []; this.st.load(1); }) } @@ -465,6 +507,7 @@ export class DatatableOrderReportingComponent implements OnInit { search() { + this.selectedRows = []; this.st.load(1); } @@ -483,6 +526,32 @@ export class DatatableOrderReportingComponent implements OnInit { }) } + /** + * 查看轨迹 + */ + viewTrack(_record: any) { + // const =; + this.router.navigate([]) + } + + /** + * 更新数据 + */ + updateData() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要更新的数据'); + return; + } + const ids = this.selectedRows.map(i => i?.id); + this.service.request(this.service.$api_update_fund_data, ids).subscribe(res => { + if (res) { + this.selectedRows = []; + this.st.reload(); + + } + }) + } + filterStatus(status: number) { switch (status) { case 0: diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index 1cf31e76..155de748 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -6,7 +6,7 @@ import { BaseService } from '@shared'; }) export class ReportingService extends BaseService { - $api_get_order_reporting_page = `/api/sdc/regulation/list/page`; // 订单上报列表 + $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报列表 $api_upload_order_reporting = `/api/sdc/regulation/push`; // 上传订单上报 $api_recall_order_reporting = `/api/sdc/regulation/withdraw`; // 撤回上传订单上报 $api_async_export_order_reporting_list = ``; // 导出订单上报 @@ -17,6 +17,7 @@ export class ReportingService extends BaseService { $api_fund_reporting_upload = `/api/fcc/fundUploadHead/uploadFundNumber`; // 资金批量上传 $api_fund_reporting_recall = `/api/fcc/fundUploadHead/recallUploadFundNumber`; //资金批量撤回 $api_get_fund_valid_result = `/api/fcc/capitalFieldCheck/getCapitalFieldCheckList`; // 查询资金校验表 + $api_update_fund_data = `/api/fcc/fundUploadHead/updateUploadFundNumber`;//资金批量更新数据 constructor(public injector: Injector) { From 5f9f2e38616af9ab4618c831b366d25b936b56fa Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 15:33:04 +0800 Subject: [PATCH 03/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascreen/curve/map.component.ts | 47 ++++++++++--------- .../datascreen/datascreen.component.ts | 30 ++++++++++-- .../routes/datatable/services/data.service.ts | 4 +- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/curve/map.component.ts b/src/app/routes/datatable/components/datascreen/curve/map.component.ts index 5a66c684..5ce91326 100644 --- a/src/app/routes/datatable/components/datascreen/curve/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/curve/map.component.ts @@ -20,7 +20,11 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { constructor(private service: DataService, private ngZone: NgZone) {} ngOnChanges(changes: SimpleChanges): void { - if (this.chartData) { + if (changes.chartData && !changes.chartData.isFirstChange()) { + this.userData = changes.chartData.currentValue; + console.log(this.userView); + + this.userView.source(this.userData) // setTimeout(()=>{ // this.chart.render(true) // }, 1000) @@ -49,7 +53,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { this.chart = new Chart({ container: el, autoFit: true, - height: 700, + height: 680, padding: [0, 0] }); this.chart.tooltip({ @@ -87,17 +91,21 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { }); // 可视化用户数据 - this.userData = [ - { name: '山东', value: 21 }, - { name: '山东', value: 22}, - { name: '广东', value: 20, }, - { name: '广东', value: 20 }, - { name: '四川', value: 120 }, - { name: '湖南', value: 200 }, - { name: '河北', value: 30 }, - - ]; - this.userDv = this.ds.createView().source(this.userData).transform({ + this.userData = this.chartData + console.log(this.userData); + + // let value: any = [] + // this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => { + // if(res) { + // res.forEach((element: any) => { + // value.push({ + // name: element.province, + // value: element.weight, + // }); + // }); + // console.log(value); + // this.userData = value + this.userDv = this.ds.createView().source(this.userData).transform({ geoDataView: this.worldMap, field: 'name', type: 'geo.region', @@ -105,6 +113,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { }).transform({ type: 'map', callback: (obj: { trend: string; value: number }) => { + console.log(this.userData); obj.trend = obj.value > 100 ? '蓝色地区' : '红色地区'; return obj; @@ -117,9 +126,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { // alias: '蓝色地区数量' // } // }); - console.log(this.userView); - console.log('45545'); - this.userView.polygon().position('longitude*latitude').color('trend', ['#000', '#76ddb2']).tooltip('').style({fillOpacity: 0.85 }) // .animate({ // leave: { @@ -128,13 +134,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { // }); this.userView.interaction('element-active'); this.chart.render(); + // } + // }); - - }); - - console.log('9999'); - - + }) } } diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index df261bc6..0c72e06f 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 14:59:12 + * @LastEditTime : 2022-04-07 15:16:53 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ export class DatatableDatascreenComponent implements OnInit { @ViewChild('orderSt') private readonly orderSt!: STComponent; @ViewChild('map') private readonly map!: DatatableCustomindexMapComponent; columns: STColumn[] = []; - chartData: G2TimelineData[] = []; + chartData: any[] = []; orderColumns: STColumn[] = []; allDeal: any; headDeal: any; @@ -77,6 +77,20 @@ export class DatatableDatascreenComponent implements OnInit { this.service.request(this.service.$api_getTradingToday).subscribe((res: any) => { this.todaysDeal = res }) + let value: any = [] + this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => { + if(res) { + res.forEach((element: any) => { + value.push({ + name: element.province, + value: element.weight, + }); + }); + console.log(value); + this.chartData = value + this.map.reRender() + } + }) } initLineData(){ this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { @@ -88,7 +102,17 @@ export class DatatableDatascreenComponent implements OnInit { // y2: Math.floor(Math.random() * 100) + 10, // }); // } - }) + }) + this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { + this.monthData = res + // for (let i = 0; i < 20; i += 1) { + // this.monthData.push({ + // time: new Date().getTime() + 1000 * 60 * 60 * 24 * i, + // y1: Math.floor(Math.random() * 100) + 1000, + // y2: Math.floor(Math.random() * 100) + 10, + // }); + // } + }) let value: any = [] this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { console.log(res); diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index 32f2c4e0..e7443148 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 10:30:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 09:30:16 + * @LastEditTime : 2022-04-07 15:07:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\services\\data.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -82,6 +82,8 @@ export class DataService extends BaseService { $api_getTradingTrend = `/api/sdc/reportDataLargeScreen/getTradingTrend`; // 数据大屏-交易额(今日，本月，累计) $api_getTransactionAmount = `/api/sdc/reportDataLargeScreen/getTransactionAmount`; + // 数据大屏-交易分布 + $api_getTransactionDistribution = `/api/sdc/reportDataLargeScreen/getTransactionDistribution`; From 977e153c5da107cb87bcae3622ce5d3e7ce0272d Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 7 Apr 2022 16:04:21 +0800 Subject: [PATCH 04/27] edit --- .../invoice-requested/invoice-requested.component.ts | 4 ++-- .../requested-invoice-modal.component.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 6b00085b..1978a0f9 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 @@ -224,7 +224,7 @@ export class InvoiceRequestedComponent { }; this.service.request(this.service.$api_get_applyBatchFicoVatinv, params).subscribe((res: any) => { if (res) { - this.service.msgSrv.success('开票成功！'); + this.service.msgSrv.success('提交成功！'); modal.destroy(); this.st.load(1); } @@ -248,7 +248,7 @@ export class InvoiceRequestedComponent { }; this.service.request(this.service.$api_get_applyBatchFicoVatinv, params).subscribe((res: any) => { if (res) { - this.service.msgSrv.success('开票成功！'); + this.service.msgSrv.success('提交成功！'); modal.destroy(); this.st.load(1); } diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index 4a536279..615ed34d 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -133,7 +133,7 @@ export class RequestedInvoiceModalComponent { this.nzModalService.confirm({ nzTitle: '是否进入销票处理页面完成开票', nzOnOk: () => { - this.service.msgSrv.success('开票成功'); + this.service.msgSrv.success('提交成功'); this.modal.destroy(true); this.router.navigate(['/ticket/cancellation-invoice']); }, From a959b4708b85effc4d5bbdc858a35b65a201ae2c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 16:17:34 +0800 Subject: [PATCH 05/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascreen/curve/map.component.html | 12 ++++- .../datascreen/curve/map.component.ts | 45 +++++++++---------- .../datascreen/datascreen.component.html | 13 +++--- .../datascreen/datascreen.component.ts | 36 +++++++++------ 4 files changed, 62 insertions(+), 44 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/curve/map.component.html b/src/app/routes/datatable/components/datascreen/curve/map.component.html index 0640a4d4..4bdcc4de 100644 --- a/src/app/routes/datatable/components/datascreen/curve/map.component.html +++ b/src/app/routes/datatable/components/datascreen/curve/map.component.html @@ -1 +1,11 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/curve/map.component.ts b/src/app/routes/datatable/components/datascreen/curve/map.component.ts index 5ce91326..9775b4a1 100644 --- a/src/app/routes/datatable/components/datascreen/curve/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/curve/map.component.ts @@ -20,11 +20,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { constructor(private service: DataService, private ngZone: NgZone) {} ngOnChanges(changes: SimpleChanges): void { - if (changes.chartData && !changes.chartData.isFirstChange()) { - this.userData = changes.chartData.currentValue; - console.log(this.userView); - - this.userView.source(this.userData) + if (this.chartData) { // setTimeout(()=>{ // this.chart.render(true) // }, 1000) @@ -91,21 +87,17 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { }); // 可视化用户数据 - this.userData = this.chartData - console.log(this.userData); - - // let value: any = [] - // this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => { - // if(res) { - // res.forEach((element: any) => { - // value.push({ - // name: element.province, - // value: element.weight, - // }); - // }); - // console.log(value); - // this.userData = value - this.userDv = this.ds.createView().source(this.userData).transform({ + this.userData = [ + { name: '山东', value: 21 }, + { name: '山东', value: 22}, + { name: '广东', value: 20, }, + { name: '广东', value: 20 }, + { name: '四川', value: 120 }, + { name: '湖南', value: 200 }, + { name: '河北', value: 30 }, + + ]; + this.userDv = this.ds.createView().source(this.userData).transform({ geoDataView: this.worldMap, field: 'name', type: 'geo.region', @@ -113,7 +105,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { }).transform({ type: 'map', callback: (obj: { trend: string; value: number }) => { - console.log(this.userData); obj.trend = obj.value > 100 ? '蓝色地区' : '红色地区'; return obj; @@ -126,6 +117,9 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { // alias: '蓝色地区数量' // } // }); + console.log(this.userView); + console.log('45545'); + this.userView.polygon().position('longitude*latitude').color('trend', ['#000', '#76ddb2']).tooltip('').style({fillOpacity: 0.85 }) // .animate({ // leave: { @@ -134,10 +128,13 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { // }); this.userView.interaction('element-active'); this.chart.render(); - // } - // }); - }) + + }); + + console.log('9999'); + + } } diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 0c3e37dc..939d29dd 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,14 +4,15 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 14:59:07 + * @LastEditTime : 2022-04-07 16:16:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
-

运多星网络货运平台实时交易监控

+
+

运多星网络货运平台

+

实时交易监控

@@ -34,10 +35,12 @@ - @@ -86,7 +89,7 @@ - +
diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index 0c72e06f..a0ff7310 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 15:16:53 + * @LastEditTime : 2022-04-07 15:53:41 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -15,7 +15,7 @@ import { SFSchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; import { DataService } from '../../services/data.service'; import { DatatableCustomindexMapComponent } from './curve/map.component'; -import { G2TimelineData } from '@delon/chart/timeline'; +import { G2TimelineComponent, G2TimelineData } from '@delon/chart/timeline'; import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area'; import { format } from 'date-fns'; @@ -29,6 +29,8 @@ export class DatatableDatascreenComponent implements OnInit { @ViewChild('st') private readonly st!: STComponent; @ViewChild('orderSt') private readonly orderSt!: STComponent; @ViewChild('map') private readonly map!: DatatableCustomindexMapComponent; + @ViewChild('timeline', { static: false }) timeline!: G2TimelineComponent; + columns: STColumn[] = []; chartData: any[] = []; orderColumns: STColumn[] = []; @@ -39,11 +41,14 @@ export class DatatableDatascreenComponent implements OnInit { monthData: G2TimelineData[] = []; salesData :any; - salesData2 :any = this.genData(); + salesData2 :Array = this.genData(); constructor(public service: DataService) { } - + ngOnChanges(changes: any): void { + console.log(changes); + + } /** * 查询参数 */ @@ -95,16 +100,12 @@ export class DatatableDatascreenComponent implements OnInit { initLineData(){ this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { this.monthData = res - // for (let i = 0; i < 20; i += 1) { - // this.monthData.push({ - // time: new Date().getTime() + 1000 * 60 * 60 * 24 * i, - // y1: Math.floor(Math.random() * 100) + 1000, - // y2: Math.floor(Math.random() * 100) + 10, - // }); - // } - }) - this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { - this.monthData = res + if (this.timeline) { + console.log(this.timeline); + + // 等待组件渲染 + setTimeout(() => this.timeline.changeData()); + } // for (let i = 0; i < 20; i += 1) { // this.monthData.push({ // time: new Date().getTime() + 1000 * 60 * 60 * 24 * i, @@ -123,6 +124,13 @@ export class DatatableDatascreenComponent implements OnInit { }); }); this.salesData = value + // if (this.pie) { + // // 等待组件渲染 + // setTimeout(() => { + // console.log('a') + // this.pie.changeData() + // }); + // } console.log(this.salesData); }) } From 465ae51f6c92c9301feb09665eaa13f3c65cc6e0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 16:39:51 +0800 Subject: [PATCH 06/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascreen/datascreen.component.html | 12 +- .../datascreen/datascreen.component.ts | 176 +++++++++--------- src/assets/images/oclock.svg | 6 + 3 files changed, 107 insertions(+), 87 deletions(-) create mode 100644 src/assets/images/oclock.svg diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 939d29dd..34d6aa64 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,15 +4,23 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 16:16:57 + * @LastEditTime : 2022-04-07 16:37:05 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. -->
-

运多星网络货运平台

+
+

运多星网络货运平台

+
+   + {{todayTime}} +
+
+

实时交易监控

+
diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index a0ff7310..bc0dd745 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts @@ -1,11 +1,11 @@ import { map } from 'rxjs/operators'; /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 15:53:41 + * @LastEditTime : 2022-04-07 16:31:17 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -19,7 +19,6 @@ import { G2TimelineComponent, G2TimelineData } from '@delon/chart/timeline'; import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area'; import { format } from 'date-fns'; - @Component({ selector: 'app-datatable-datascreen', templateUrl: './datascreen.component.html', @@ -38,71 +37,78 @@ export class DatatableDatascreenComponent implements OnInit { headDeal: any; classifyDeal: any; todaysDeal: any; - + todayTime: string =''; + monthData: G2TimelineData[] = []; - salesData :any; - salesData2 :Array = this.genData(); - constructor(public service: DataService) { - - } - ngOnChanges(changes: any): void { + salesData: any; + salesData2: Array = this.genData(); + constructor(public service: DataService) {} + ngOnChanges(changes: any): void { console.log(changes); - } /** * 查询参数 */ get reqOrderParams() { - const params = { - - } + const params = {}; return { ...params }; } get reqParams() { - const params = { - } + const params = {}; return { ...params }; } ngOnInit(): void { - this.initST() - this.initOrderST() - this.initData() - this.initLineData() + + setInterval(() => { + this.setTime() + },1000) + this.initST(); + this.initOrderST(); + this.initData(); + this.initLineData(); } - initData(){ + setTime () { + var myDate = new Date(); + var mytime = myDate.toLocaleTimeString(); //获取当前时间 + myDate.getFullYear(); //获取完整的年份(4位,1970-????) + myDate.getMonth(); //获取当前月份(0-11,0代表1月) + myDate.getDate(); //获取当前日(1-31) + this.todayTime = myDate.getFullYear() + '-' + myDate.getMonth() + 1 + '-' + myDate.getDate() + ' ' + mytime; + } + initData() { this.service.request(this.service.$api_getAnnualTransactions).subscribe((res: any) => { - this.allDeal = res - }) + this.allDeal = res; + }); this.service.request(this.service.$api_getTransactionAmount).subscribe((res: any) => { - this.headDeal = res - }) + this.headDeal = res; + }); this.service.request(this.service.$api_getCustomerStatistics).subscribe((res: any) => { - this.classifyDeal = res - }) + this.classifyDeal = res; + }); this.service.request(this.service.$api_getTradingToday).subscribe((res: any) => { - this.todaysDeal = res - }) - let value: any = [] - this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => { - if(res) { - res.forEach((element: any) => { - value.push({ - name: element.province, - value: element.weight, - }); - }); - console.log(value); - this.chartData = value - this.map.reRender() + this.todaysDeal = res; + }); + let value: any = []; + this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => { + if (res) { + res.forEach((element: any) => { + value.push({ + name: element.province, + value: element.weight + }); + }); + console.log(value); + this.chartData = value; + this.map.reRender(); } - }) -} - initLineData(){ + }); + } + initLineData() { this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { - this.monthData = res + this.monthData = res; if (this.timeline) { console.log(this.timeline); - + // 等待组件渲染 setTimeout(() => this.timeline.changeData()); } @@ -113,62 +119,62 @@ export class DatatableDatascreenComponent implements OnInit { // y2: Math.floor(Math.random() * 100) + 10, // }); // } - }) - let value: any = [] - this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { - console.log(res); - res.forEach((element: any) => { - value.push({ - x: element.city, - y: element.weight, }); - }); - this.salesData = value - // if (this.pie) { - // // 等待组件渲染 - // setTimeout(() => { - // console.log('a') - // this.pie.changeData() - // }); - // } - console.log(this.salesData); - }) - } - public genData(): G2MiniAreaData[] { - let value: any = [] + let value: any = []; this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { console.log(res); res.forEach((element: any) => { - value.push({ - x: element.city, - y: element.weight, + value.push({ + x: element.city, + y: element.weight + }); }); + this.salesData = value; + // if (this.pie) { + // // 等待组件渲染 + // setTimeout(() => { + // console.log('a') + // this.pie.changeData() + // }); + // } + console.log(this.salesData); + }); + } + public genData(): G2MiniAreaData[] { + let value: any = []; + this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { + console.log(res); + res.forEach((element: any) => { + value.push({ + x: element.city, + y: element.weight + }); }); - }) + }); console.log(value); return value; - } + } /** -* 初始化数据列表 -*/ + * 初始化数据列表 + */ initST() { this.columns = [ - { 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'}, - { title: '数量', render: 'weight', className: 'text-center',width: '120px' }, + { 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' }, + { title: '数量', render: 'weight', className: 'text-center', width: '120px' } ]; } initOrderST() { this.orderColumns = [ - { title: '运单号', index: 'wayCode', className: 'text-center',width: '120px' }, - { title: '货主', index: 'shipperName', className: 'text-center',width: '70px' }, - { title: '时间', index: 'createTime', className: 'text-center',width: '200px' }, - { title: '风险等级', index: 'warningType', className: 'text-center',width: '90px'} + { title: '运单号', index: 'wayCode', className: 'text-center', width: '120px' }, + { title: '货主', index: 'shipperName', className: 'text-center', width: '70px' }, + { title: '时间', index: 'createTime', className: 'text-center', width: '200px' }, + { title: '风险等级', index: 'warningType', className: 'text-center', width: '90px' } ]; } - + handleClick(data: G2MiniAreaClickItem): void { this.service.msgSrv.info(`${data.item.x} - ${data.item.y}`); } diff --git a/src/assets/images/oclock.svg b/src/assets/images/oclock.svg new file mode 100644 index 00000000..596ea29d --- /dev/null +++ b/src/assets/images/oclock.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From deec1b0bd6d677501d8ede092a1666bafdd8346e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 16:59:19 +0800 Subject: [PATCH 07/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascreen/curve/map.component.ts | 4 +- .../datascreen/datascreen.component.html | 6 +- .../datascreen/datascreen.component.ts | 81 +++++++++---------- 3 files changed, 41 insertions(+), 50 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/curve/map.component.ts b/src/app/routes/datatable/components/datascreen/curve/map.component.ts index 9775b4a1..5702547c 100644 --- a/src/app/routes/datatable/components/datascreen/curve/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/curve/map.component.ts @@ -106,7 +106,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { type: 'map', callback: (obj: { trend: string; value: number }) => { - obj.trend = obj.value > 100 ? '蓝色地区' : '红色地区'; + obj.trend = obj.value > 100 ? '蓝色地区' : '灰色地区'; return obj; } }); @@ -120,7 +120,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { console.log(this.userView); console.log('45545'); - this.userView.polygon().position('longitude*latitude').color('trend', ['#000', '#76ddb2']).tooltip('').style({fillOpacity: 0.85 }) + this.userView.polygon().position('longitude*latitude').color('trend', ['#c7daf3', '#1779f3']).tooltip('').style({fillOpacity: 0.85 }) // .animate({ // leave: { // animation: 'fade-out' diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 34d6aa64..4a4eb567 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 16:37:05 + * @LastEditTime : 2022-04-07 16:57:05 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -44,11 +44,11 @@ diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index bc0dd745..58a942d4 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 16:31:17 + * @LastEditTime : 2022-04-07 16:58:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -37,10 +37,10 @@ export class DatatableDatascreenComponent implements OnInit { headDeal: any; classifyDeal: any; todaysDeal: any; - todayTime: string =''; + todayTime: string = ''; monthData: G2TimelineData[] = []; - salesData: any; + monthData2: Array = this.genData2(); salesData2: Array = this.genData(); constructor(public service: DataService) {} ngOnChanges(changes: any): void { @@ -58,16 +58,15 @@ export class DatatableDatascreenComponent implements OnInit { return { ...params }; } ngOnInit(): void { - setInterval(() => { - this.setTime() - },1000) + this.setTime(); + }, 1000); this.initST(); this.initOrderST(); this.initData(); - this.initLineData(); + // this.initLineData(); } - setTime () { + setTime() { var myDate = new Date(); var mytime = myDate.toLocaleTimeString(); //获取当前时间 myDate.getFullYear(); //获取完整的年份(4位,1970-????) @@ -103,43 +102,16 @@ export class DatatableDatascreenComponent implements OnInit { } }); } - initLineData() { - this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { - this.monthData = res; - if (this.timeline) { - console.log(this.timeline); - - // 等待组件渲染 - setTimeout(() => this.timeline.changeData()); - } - // for (let i = 0; i < 20; i += 1) { - // this.monthData.push({ - // time: new Date().getTime() + 1000 * 60 * 60 * 24 * i, - // y1: Math.floor(Math.random() * 100) + 1000, - // y2: Math.floor(Math.random() * 100) + 10, - // }); - // } - }); - let value: any = []; - this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { - console.log(res); - res.forEach((element: any) => { - value.push({ - x: element.city, - y: element.weight - }); - }); - this.salesData = value; - // if (this.pie) { - // // 等待组件渲染 - // setTimeout(() => { - // console.log('a') - // this.pie.changeData() - // }); - // } - console.log(this.salesData); - }); - } + // initLineData() { + // this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { + // this.monthData = res; + // if (this.timeline) { + // console.log(this.timeline); + // // 等待组件渲染 + // setTimeout(() => this.timeline.changeData(), 100); + // } + // }); + // } public genData(): G2MiniAreaData[] { let value: any = []; this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { @@ -154,6 +126,25 @@ export class DatatableDatascreenComponent implements OnInit { console.log(value); return value; } + private genData2(): G2TimelineData[] { + let ress: G2TimelineData[] = []; + this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { + if (res) { + res.forEach((element: any) => { + ress.push({ + time: element.time, + y1: element.billQuantity, + y2: element.wayBillQuantity + }); + }); + console.log(ress); + } + }); + if(!ress) { + setTimeout(() => {},100) + } + return ress; + } /** * 初始化数据列表 */ From 8b70140c710eb8f1946b8c10f4c231e2431a5881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 7 Apr 2022 17:56:21 +0800 Subject: [PATCH 08/27] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/routes/datatable/datatable.module.ts | 6 +- .../order-reporting.component.html | 4 +- .../order-reporting.component.ts | 22 ++++- .../view-track/view-track.component.html | 5 + .../view-track/view-track.component.spec.ts | 24 +++++ .../view-track/view-track.component.ts | 92 +++++++++++++++++++ 6 files changed, 144 insertions(+), 9 deletions(-) create mode 100644 src/app/routes/datatable/reporting/components/view-track/view-track.component.html create mode 100644 src/app/routes/datatable/reporting/components/view-track/view-track.component.spec.ts create mode 100644 src/app/routes/datatable/reporting/components/view-track/view-track.component.ts diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index bb38fea3..f22e77c3 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-04-06 11:02:17 @@ -41,6 +41,7 @@ import { ComplianceCurveComponent } from './components/compliance/index/curve/cu import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component'; import { DatatableCustomindexCurveComponent } from './components/customtable/customindex/curve/curve.component'; import { DatatableCustomindexMapComponent } from './components/datascreen/curve/map.component'; +import { DatatableReportingvViewTrackComponent } from './reporting/components/view-track/view-track.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -74,7 +75,8 @@ const COMPONENTS: Type[] = [ ComplianceCurveComponent, BusitableCurveComponent, DatatableCustomindexCurveComponent, - DatatableCustomindexMapComponent + DatatableCustomindexMapComponent, + DatatableReportingvViewTrackComponent ] diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index 117c0795..8b14bd1c 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -66,10 +66,10 @@ - 查看轨迹 + 查看轨迹 - 查看轨迹 + 查看轨迹 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 d5b58c12..77b16932 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 @@ -7,6 +7,7 @@ import { NzModalService } from 'ng-zorro-antd/modal'; import { ReportingService } from '../../services/reporting.service'; import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; +import { DatatableReportingvViewTrackComponent } from '../view-track/view-track.component'; @Component({ selector: 'app-datatable-order-reporting', @@ -284,9 +285,9 @@ export class DatatableOrderReportingComponent implements OnInit { title: '订单号', render: 'billCode', className: 'text-center', - width: '150px', + width: '180px', }, - { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '150px', }, + { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '180px', }, { title: '网络货运人', @@ -529,9 +530,20 @@ export class DatatableOrderReportingComponent implements OnInit { /** * 查看轨迹 */ - viewTrack(_record: any) { - // const =; - this.router.navigate([]) + viewTrack(_record: any, trajectory: string) { + const title = trajectory === 'car' ? '车辆' : '司机' + const modalRef = this.modal.create({ + nzTitle: `查看${title}轨迹`, + nzWidth: 1000, + nzContent: DatatableReportingvViewTrackComponent, + nzComponentParams: { + id: _record?.orderId, + trajectory + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + }) } /** diff --git a/src/app/routes/datatable/reporting/components/view-track/view-track.component.html b/src/app/routes/datatable/reporting/components/view-track/view-track.component.html new file mode 100644 index 00000000..cc66c9c3 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/view-track/view-track.component.html @@ -0,0 +1,5 @@ +
+ + + +
diff --git a/src/app/routes/datatable/reporting/components/view-track/view-track.component.spec.ts b/src/app/routes/datatable/reporting/components/view-track/view-track.component.spec.ts new file mode 100644 index 00000000..c32eb107 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/view-track/view-track.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableReportingvViewTrackComponent } from './view-track.component'; + +describe('DatatableReportingvViewTrackComponent', () => { + let component: DatatableReportingvViewTrackComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableReportingvViewTrackComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableReportingvViewTrackComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts b/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts new file mode 100644 index 00000000..1cb10886 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts @@ -0,0 +1,92 @@ +import { Component, OnInit } from '@angular/core'; +import { Router } from '@angular/router'; +import format from 'date-fns/format'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { OrderManagementService } from 'src/app/routes/order-management/services/order-management.service'; + + +@Component({ + selector: 'app-datatable-view-track', + templateUrl: './view-track.component.html', +}) +export class DatatableReportingvViewTrackComponent implements OnInit { + mapList: any[] = []; //地图点位数据组 + addressItems: any[] = []; //打点地址数据组 + trajectory = "car"; + pois: any[] = []; + id = ''; + constructor(public service: OrderManagementService, private modalRef: NzModalRef, public router: Router) { + + } + + ngOnInit(): void { + if (this.trajectory === 'car') { + this.getTrajectory(); + } else if (this.trajectory === 'driver') { + this.getDriverTrajectory(); + } + } + + + + selectTab(e: any) { + + } + + close(): void { + this.modalRef.destroy(); + } + + // 车辆轨迹 + getTrajectory() { + this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { + if (res) { + const points = res.trackArray; + let list: any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + }); + }); + this.mapList = list; + this.addressItems = [...res.cityArray]; + if (this.addressItems && this.addressItems.length > 0) { + this.addressItems.forEach(item => { + item.vinOutTime = this.getLocalTime(item.vinOutTime); + }); + } + } + }); + + + } + + // 获取司机轨迹 + getDriverTrajectory() { + this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => { + if (res) { + const points = res.tracks; + let list: any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + }); + }); + this.mapList = list; + this.addressItems = [...res.enclosureDataAppTrack]; + if (this.addressItems && this.addressItems.length > 0) { + this.addressItems.forEach(item => { + item.vinOutTime = item.vinOutTime ? this.getLocalTime(item.gtm) : ''; + item.cityName = item.appAdress; + }); + } + } + }); + } + getLocalTime(time: any) { + return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); + } + +} From 7b0f2d49b5dabb18720b95108a0b3b42d6905c7d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 18:27:27 +0800 Subject: [PATCH 09/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascreen/curve/curve.component.html | 2 + ...ap.component.less => curve.component.less} | 0 .../datascreen/curve/curve.component.ts | 133 ++++++++++++++++++ .../datascreen/datascreen.component.html | 9 +- .../datascreen/datascreen.component.ts | 60 +++++--- .../{curve => map}/map.component.html | 0 .../datascreen/map/map.component.less | 0 .../{curve => map}/map.component.ts | 32 +++-- src/app/routes/datatable/datatable.module.ts | 6 +- 9 files changed, 209 insertions(+), 33 deletions(-) create mode 100644 src/app/routes/datatable/components/datascreen/curve/curve.component.html rename src/app/routes/datatable/components/datascreen/curve/{map.component.less => curve.component.less} (100%) create mode 100644 src/app/routes/datatable/components/datascreen/curve/curve.component.ts rename src/app/routes/datatable/components/datascreen/{curve => map}/map.component.html (100%) create mode 100644 src/app/routes/datatable/components/datascreen/map/map.component.less rename src/app/routes/datatable/components/datascreen/{curve => map}/map.component.ts (83%) diff --git a/src/app/routes/datatable/components/datascreen/curve/curve.component.html b/src/app/routes/datatable/components/datascreen/curve/curve.component.html new file mode 100644 index 00000000..f47cc41a --- /dev/null +++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.html @@ -0,0 +1,2 @@ + + diff --git a/src/app/routes/datatable/components/datascreen/curve/map.component.less b/src/app/routes/datatable/components/datascreen/curve/curve.component.less similarity index 100% rename from src/app/routes/datatable/components/datascreen/curve/map.component.less rename to src/app/routes/datatable/components/datascreen/curve/curve.component.less diff --git a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts new file mode 100644 index 00000000..36277f6e --- /dev/null +++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts @@ -0,0 +1,133 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-04-07 17:57:23 + * @LastEditors : Shiming + * @LastEditTime : 2022-04-07 18:24:57 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; +import { G2MiniAreaClickItem } from '@delon/chart/mini-area'; +import { DataService } from '../../../services/data.service'; +// import DataSet from '@antv/data-set'; +const DataSet = require('@antv/data-set'); +import { Chart } from '@antv/g2'; +@Component({ + selector: 'app-financetable-curve-min', + templateUrl: './curve.component.html', + styleUrls: ['./curve.component.less'] +}) +export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges { + el: any; + @Input() chartData: any; + chart: any; + data = [ + { time: '01', type: '订单数', temperature: 7 }, + { time: '02', city: '运单数', temperature: 3.9 }, + { time: '03', city: '订单数', temperature: 6.9 }, + { time: '04', city: '订单数', temperature: 4.2 }, + { time: '05', city: '订单数', temperature: 9.5 }, + { time: '06', city: '订单数', temperature: 5.7 }, + { time: '06', city: '运单数', temperature: 5.7 }, + { time: '07', city: '运单数', temperature: 14.5 }, + { time: '08', city: '订单数', temperature: 8.5 }, + { time: '09', city: '订单数', temperature: 18.4 }, + { time: '10', city: '订单数', temperature: 11.9 }, + { time: '11', city: '订单数', temperature: 21.5 }, + { time: '12', city: '订单数', temperature: 15.2 }, + { time: '08', city: '运单数', temperature: 8.5 }, + { time: '09', city: '运单数', temperature: 18.4 }, + { time: '10', city: '运单数', temperature: 11.9 }, + { time: '11', city: '运单数', temperature: 21.5 }, + { time: '12', city: '订单数', temperature: 15.2 }, + ]; + + constructor(private service: DataService, private ngZone: NgZone) { + + } + ngOnChanges(changes: SimpleChanges): void { + if (this.chartData) { + // setTimeout(()=>{ + // this.chart.render(true) + // }, 1000) + + } + } + + ngOnInit(): void { + + } + reRender() { + setTimeout(() => { + this.chart.data(this.chartData); + this.chart.render(); + }, 1000) + } + render(el: ElementRef): void { + this.el = el.nativeElement + setTimeout(() => { + this.ngZone.runOutsideAngular(() => this.init(this.el)); + }, 1000) + } + + private init(el: HTMLElement): void { + this.chart = new Chart({ + container: el, + autoFit: true, + height: 500, + }); + let value: any = [] + this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { + if(res) { + res.forEach((element: any) => { + value.push({ + time: element?.time, + type: element?.type, + temperature: element?.value, + }); + }); + console.log(value); + this.chartData = value + this.chart.data(this.chartData); + this.chart.scale({ + time: { + range: [0, 1], + }, + number: { + nice: true, + }, + }); + + this.chart.tooltip({ + showCrosshairs: true, + shared: true, + }); + + + this.chart.axis('temperature', { + label: { + formatter: (val: any) => { + return val + '万'; + }, + }, + }); + this.chart + .line() + .position('time*temperature') + .color('city') + .shape('smooth'); + + this.chart + .point() + .position('time*temperature') + .color('city') + .shape('circle'); + this.chart.render(); + }; + }); + + + } +} diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index 4a4eb567..2b6dea9b 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 16:57:05 + * @LastEditTime : 2022-04-07 18:02:07 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -43,15 +43,16 @@ - + > --> + = this.genData2(); + monthData2:G2TimelineData[] =[]; salesData2: Array = this.genData(); constructor(public service: DataService) {} ngOnChanges(changes: any): void { @@ -64,6 +67,7 @@ export class DatatableDatascreenComponent implements OnInit { this.initST(); this.initOrderST(); this.initData(); + this.genData2(); // this.initLineData(); } setTime() { @@ -126,24 +130,46 @@ export class DatatableDatascreenComponent implements OnInit { console.log(value); return value; } - private genData2(): G2TimelineData[] { - let ress: G2TimelineData[] = []; - this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { + initPillarData(){ + + this.service.request(this.service.$api_getTradingTrend).subscribe(res => { if (res) { - res.forEach((element: any) => { - ress.push({ - time: element.time, - y1: element.billQuantity, - y2: element.wayBillQuantity + this.chartData2 = res + this.curve.reRender() + } + }) + } + public genData2(): G2TimelineData[] { + let value1: any[] = []; + this.monthData2 =[]; + this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { + if (res) { + // var data1 = new Date('2022.1.1') + // var time1 = data1.getTime(); + // console.log(time1); + + var data2 = new Date('2022.2.1') + var time2 = data2.getTime(); + console.log(time2); + + var data3 = new Date('2022.3.1') + res.forEach((element: any,i:any) => { + console.log(element); + console.log(new Date().getTime() + 1000 * 60 * 60 * 24 * 2); + console.log(time2); + value1.push({ + time:'Feb', + y1: element?.y1, + y2: element?.y2 }); }); - console.log(ress); + this.monthData2 = res; + console.log(this.monthData2); + } }); - if(!ress) { - setTimeout(() => {},100) - } - return ress; + console.log(this.monthData2); + return value1; } /** * 初始化数据列表 diff --git a/src/app/routes/datatable/components/datascreen/curve/map.component.html b/src/app/routes/datatable/components/datascreen/map/map.component.html similarity index 100% rename from src/app/routes/datatable/components/datascreen/curve/map.component.html rename to src/app/routes/datatable/components/datascreen/map/map.component.html diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.less b/src/app/routes/datatable/components/datascreen/map/map.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/datatable/components/datascreen/curve/map.component.ts b/src/app/routes/datatable/components/datascreen/map/map.component.ts similarity index 83% rename from src/app/routes/datatable/components/datascreen/curve/map.component.ts rename to src/app/routes/datatable/components/datascreen/map/map.component.ts index 5702547c..09d7d863 100644 --- a/src/app/routes/datatable/components/datascreen/curve/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -87,16 +87,27 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { }); // 可视化用户数据 - this.userData = [ - { name: '山东', value: 21 }, - { name: '山东', value: 22}, - { name: '广东', value: 20, }, - { name: '广东', value: 20 }, - { name: '四川', value: 120 }, - { name: '湖南', value: 200 }, - { name: '河北', value: 30 }, + // this.userData = [ + // { name: '山东', value: 21 }, + // { name: '山东', value: 22}, + // { name: '广东', value: 20, }, + // { name: '广东', value: 20 }, + // { name: '四川', value: 120 }, + // { name: '湖南', value: 200 }, + // { name: '河北', value: 30 }, - ]; + // ]; + let value: any = [] + this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => { + if(res) { + res.forEach((element: any) => { + value.push({ + name: element.province, + value: element.weight, + }); + }); + console.log(value); + this.userData = value this.userDv = this.ds.createView().source(this.userData).transform({ geoDataView: this.worldMap, field: 'name', @@ -129,7 +140,8 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { this.userView.interaction('element-active'); this.chart.render(); - + } + }) }); console.log('9999'); diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index bb38fea3..9af1cbd2 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -40,7 +40,8 @@ import { FinancetablePillarComponent } from './components/financetable/pillar/pi import { ComplianceCurveComponent } from './components/compliance/index/curve/curve.component'; import { BusitableCurveComponent } from './components/busitable/busiindex/curve/curve.component'; import { DatatableCustomindexCurveComponent } from './components/customtable/customindex/curve/curve.component'; -import { DatatableCustomindexMapComponent } from './components/datascreen/curve/map.component'; +import { DatatableCustomindexMapComponent } from './components/datascreen/map/map.component'; +import { DatatableCustomindexCurveMinComponent } from './components/datascreen/curve/curve.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -74,7 +75,8 @@ const COMPONENTS: Type[] = [ ComplianceCurveComponent, BusitableCurveComponent, DatatableCustomindexCurveComponent, - DatatableCustomindexMapComponent + DatatableCustomindexMapComponent, + DatatableCustomindexCurveMinComponent ] From df9fda105714a30e28e6779151da253baa2852ec Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 19:29:30 +0800 Subject: [PATCH 10/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascreen/curve/curve.component.ts | 43 +++++++++---------- .../datascreen/datascreen.component.ts | 38 ++-------------- 2 files changed, 24 insertions(+), 57 deletions(-) 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 d0f55f8b..dc30343e 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 18:30:46 + * @LastEditTime : 2022-04-07 19:28:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -25,25 +25,24 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges { chart: any; data = [ { time: '01', type: '订单数', temperature: 7 }, - { time: '02', city: '运单数', temperature: 3.9 }, - { time: '03', city: '订单数', temperature: 6.9 }, - { time: '04', city: '订单数', temperature: 4.2 }, - { time: '05', city: '订单数', temperature: 9.5 }, - { time: '06', city: '订单数', temperature: 5.7 }, - { time: '06', city: '运单数', temperature: 5.7 }, - { time: '07', city: '运单数', temperature: 14.5 }, - { time: '08', city: '订单数', temperature: 8.5 }, - { time: '09', city: '订单数', temperature: 18.4 }, - { time: '10', city: '订单数', temperature: 11.9 }, - { time: '11', city: '订单数', temperature: 21.5 }, - { time: '12', city: '订单数', temperature: 15.2 }, - { time: '08', city: '运单数', temperature: 8.5 }, - { time: '09', city: '运单数', temperature: 18.4 }, - { time: '10', city: '运单数', temperature: 11.9 }, - { time: '11', city: '运单数', temperature: 21.5 }, - { time: '12', city: '订单数', temperature: 15.2 }, + { time: '02', type: '运单数', temperature: 3.9 }, + { time: '03', type: '订单数', temperature: 6.9 }, + { time: '04', type: '订单数', temperature: 4.2 }, + { time: '05', type: '订单数', temperature: 9.5 }, + { time: '06', type: '订单数', temperature: 5.7 }, + { time: '06', type: '运单数', temperature: 5.7 }, + { time: '07', type: '运单数', temperature: 14.5 }, + { time: '08', type: '订单数', temperature: 8.5 }, + { time: '09', type: '订单数', temperature: 18.4 }, + { time: '10', type: '订单数', temperature: 11.9 }, + { time: '11', type: '订单数', temperature: 21.5 }, + { time: '12', type: '订单数', temperature: 15.2 }, + { time: '08', type: '运单数', temperature: 8.5 }, + { time: '09', type: '运单数', temperature: 18.4 }, + { time: '10', type: '运单数', temperature: 11.9 }, + { time: '11', type: '运单数', temperature: 21.5 }, + { time: '12', type: '订单数', temperature: 15.2 }, ]; - constructor(private service: DataService, private ngZone: NgZone) { } @@ -84,7 +83,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges { res.forEach((element: any) => { value.push({ time: element?.time, - type: element?.type, + type: element?.type == 'DD' ? '订单数' : '运单数', temperature: element?.value, }); }); @@ -116,13 +115,13 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges { this.chart .line() .position('time*temperature') - .color('city') + .color('type') .shape('smooth'); this.chart .point() .position('time*temperature') - .color('city') + .color('type') .shape('circle'); this.chart.render(); }; diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index ce473caf..dc71ee98 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 18:28:03 + * @LastEditTime : 2022-04-07 19:24:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -67,7 +67,6 @@ export class DatatableDatascreenComponent implements OnInit { this.initST(); this.initOrderST(); this.initData(); - this.genData2(); // this.initLineData(); } setTime() { @@ -123,38 +122,6 @@ export class DatatableDatascreenComponent implements OnInit { initPillarData(){ this.curve.reRender() } - public genData2(): G2TimelineData[] { - let value1: any[] = []; - this.monthData2 =[]; - this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { - if (res) { - // var data1 = new Date('2022.1.1') - // var time1 = data1.getTime(); - // console.log(time1); - - var data2 = new Date('2022.2.1') - var time2 = data2.getTime(); - console.log(time2); - - var data3 = new Date('2022.3.1') - res.forEach((element: any,i:any) => { - console.log(element); - console.log(new Date().getTime() + 1000 * 60 * 60 * 24 * 2); - console.log(time2); - value1.push({ - time:'Feb', - y1: element?.y1, - y2: element?.y2 - }); - }); - this.monthData2 = res; - console.log(this.monthData2); - - } - }); - console.log(this.monthData2); - return value1; - } /** * 初始化数据列表 */ @@ -170,9 +137,10 @@ export class DatatableDatascreenComponent implements OnInit { initOrderST() { this.orderColumns = [ { title: '运单号', index: 'wayCode', className: 'text-center', width: '120px' }, + { title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' }, { title: '货主', index: 'shipperName', className: 'text-center', width: '70px' }, { title: '时间', index: 'createTime', className: 'text-center', width: '200px' }, - { title: '风险等级', index: 'warningType', className: 'text-center', width: '90px' } + { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '90px' } ]; } From f0cfb3b87409ecdfe2f7d1bd14c4e356ef96851b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 19:51:54 +0800 Subject: [PATCH 11/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datascreen/datascreen.component.html | 5 ++- .../datascreen/datascreen.component.ts | 6 ++-- .../datascreen/map/map.component.html | 6 ++-- .../datascreen/map/map.component.ts | 31 +++++++++++-------- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index c0c8f3ab..ee417920 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 18:30:12 + * @LastEditTime : 2022-04-07 19:51:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -165,6 +165,9 @@ [page]="{ show: false, showSize: false, pageSizes: [5, 50, 100] }" [loading]="service.http.loading" > + + {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }} +
diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index dc71ee98..08babea1 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:24:15 + * @LastEditTime : 2022-04-07 19:48:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -136,11 +136,11 @@ export class DatatableDatascreenComponent implements OnInit { } initOrderST() { this.orderColumns = [ - { title: '运单号', index: 'wayCode', className: 'text-center', width: '120px' }, + { 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: 'createTime', className: 'text-center', width: '200px' }, - { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '90px' } + { 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 4bdcc4de..99a40aa8 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 15:48:36 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\map.component.html + * @LastEditTime : 2022-04-07 19:44:32 + * @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 09d7d863..a5b5e05c 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -116,27 +116,32 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { }).transform({ type: 'map', callback: (obj: { trend: string; value: number }) => { - - obj.trend = obj.value > 100 ? '蓝色地区' : '灰色地区'; + if(obj.value < 500) { + obj.trend = '500以下'; + } else if(obj.value >= 500 && obj.value < 1200){ + obj.trend = '500-1000'; + } else if(obj.value >= 1200 ){ + obj.trend = '>1000'; + } return obj; } }); this.userView = this.chart.createView(); this.userView.data(this.userDv.rows); - // this.userView.scale({ - // trend: { - // alias: '蓝色地区数量' - // } - // }); + this.userView.scale({ + trend: { + alias: '蓝色地区数量' + } + }); console.log(this.userView); console.log('45545'); - this.userView.polygon().position('longitude*latitude').color('trend', ['#c7daf3', '#1779f3']).tooltip('').style({fillOpacity: 0.85 }) - // .animate({ - // leave: { - // animation: 'fade-out' - // } - // }); + this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('name*trend*value').style({fillOpacity: 0.85 }) + .animate({ + leave: { + animation: 'fade-out' + } + }); this.userView.interaction('element-active'); this.chart.render(); From 7f012015cd9e125a0b4cead932a427ad842d45c0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 19:52:54 +0800 Subject: [PATCH 12/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatable/components/datascreen/map/map.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a5b5e05c..66c3a677 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -118,9 +118,9 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { callback: (obj: { trend: string; value: number }) => { if(obj.value < 500) { obj.trend = '500以下'; - } else if(obj.value >= 500 && obj.value < 1200){ + } else if(obj.value >= 500 && obj.value < 1000){ obj.trend = '500-1000'; - } else if(obj.value >= 1200 ){ + } else if(obj.value >= 1000 ){ obj.trend = '>1000'; } return obj; From a240d39e19635a36f179596677ee0e71d989eb70 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 7 Apr 2022 20:46:01 +0800 Subject: [PATCH 13/27] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order-reporting.component.html | 50 +++++-- .../order-reporting.component.less | 8 ++ .../order-reporting.component.ts | 127 +++++++++++------- .../verify-result.component.html | 12 +- .../services/tax-management.service.ts | 10 +- 5 files changed, 143 insertions(+), 64 deletions(-) diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index 789d9c54..30b22de8 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-30 14:00:43 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 15:29:14 + * @LastEditTime : 2022-04-07 20:31:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -35,23 +35,53 @@ - - - {{item?.billStatusLabel}} - {{item?.billStatusLabel}} - 异常 + + + {{item?.billStatusLabel}} + 异常 - - + +
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}
+ + + +
+
+ +
+
- -
{{item?.amount | currency :' '}}
+ +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
{{item?.orderAmount | currency :' '}}
 diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less index 59e4c77b..94ec07e0 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.less @@ -11,4 +11,12 @@ /* stylelint-disable-next-line order/properties-order */ fill: currentColor; } + ::ng-deep { + .imgBox { + display: flex; + img { + width: 60px !important; + } + } + } } diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index eae59243..e41596d9 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -102,7 +102,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, - resourceCode: { + wayBillCode: { type: 'string', title: '运单号', ui: { @@ -152,7 +152,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - carNo3: { + collectionUserName: { title: '收款人', type: 'string', maxLength: 9, @@ -163,8 +163,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - - serviceType2: { + putStatus: { title: '上传状态', type: 'string', ui: { @@ -178,7 +177,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { } }, serviceType1: { - title: '本地校验', + title: '精准', type: 'string', ui: { placeholder: '请选择', @@ -190,7 +189,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } }, - enterpriseInfoId: { + networkTransporter: { type: 'string', title: '网络货运人', ui: { @@ -203,7 +202,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { asyncData: () => this.shipperservice.getNetworkFreightForwarder() } }, - createTime: { + recentlyPutTime: { title: '上传时间', type: 'string', ui: { @@ -215,7 +214,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { }, } as SFDateWidgetSchema, }, - createTime3: { + orderPayTime: { title: '结束时间', type: 'string', ui: { @@ -241,57 +240,57 @@ export class TaxManagementOrderReportingComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '上传状态', render: 'orderStatus', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, + { title: '上传状态', index: 'putStatus', className: 'text-center', width: '120px', }, + { title: '精准', index: 'platformCheckStatusLabel', className: 'text-center', width: '120px', }, { title: '订单号', - render: 'billComplianceVOS', + index: 'billCode', className: 'text-center', width: '150px', }, - { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, + { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', }, { title: '网络货运人', render: 'serviceType', className: 'text-center', width: '180px', }, - { title: '装货地', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '装货地详细地址', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '卸货地', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '卸货地详细地址', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '货主名称', render: 'driver', className: 'text-center', width: '180px' }, - { title: '货主纳税人识别号', render: 'payeeName', className: 'text-center', width: '180px' }, - { title: '录单时间', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '接单时间', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '发车时间', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '到车时间', render: 'driver', className: 'text-center', width: '150px' }, - { title: '结束时间', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '订单金额', render: 'amount', className: 'text-center', width: '250px' }, - { title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '司机身份证号', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '装货地', index: 'loadingAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '装货地详细地址', index: 'loadingDetailedAddress', render: 'loadingPlace', className: 'text-center', width: '200px' }, + { title: '卸货地', index: 'unloadAddress', render: 'dischargePlace', className: 'text-center', width: '120px' }, + { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' }, + { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' }, + { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, + { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' }, + { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, + { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, + { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' }, + { title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' }, + { title: '订单金额', render: 'orderAmount', className: 'text-center', width: '120px' }, + { title: '司机姓名', render: 'driverName', className: 'text-center', width: '150px' }, + { title: '司机身份证号', index: 'transpdriverCertificateNumberortInfo', className: 'text-center', width: '180px' }, + { title: '车牌号', index: 'carNo', className: 'text-center', width: '100px' }, { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '运费金额', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '装卸方式', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '支付方式', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '支付账号', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '银行流水号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '收款人姓名', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '收款人身份证号码', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '装货照片', render: 'transportInfo', className: 'text-center', width: '150px' }, - { title: '卸货照片', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '提货单', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '签收单', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '最近上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, + { title: '运费金额', render: 'payeeName', className: 'text-center', width: '100px' }, + { title: '装卸方式', index: 'loadingUnloadWay', className: 'text-center', width: '180px' }, + { title: '支付方式', index: 'payMent', className: 'text-center', width: '150px' }, + { title: '支付账号', index: 'paymentAccount', className: 'text-center', width: '200px' }, + { title: '银行流水号', index: 'bankSerialNumber', className: 'text-center', width: '150px' }, + { title: '收款人姓名', index: 'collectionUserName', className: 'text-center', width: '250px' }, + { title: '收款人身份证号码', index: 'collectionUserCertificateNumber', className: 'text-center', width: '180px' }, + { title: '装货照片', render: 'loadingPicture', className: 'text-center', width: '100px' }, + { title: '卸货照片', render: 'unloadPicture', className: 'text-center', width: '100px' }, + { title: '提货单', render: 'loadingLadingBill', className: 'text-center', width: '100px' }, + { title: '签收单', render: 'signatureForm', className: 'text-center', width: '100px' }, + { title: '上传次数', index: 'putNumber', className: 'text-center', width: '100px' }, + { title: '最近上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' }, ]; } /** - *撤销 + *撤回 * @param record 记录实例 */ recall() { @@ -299,13 +298,17 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要撤回的数据'); return; } + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); this.modal.confirm({ nzTitle: '撤回提示', nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', nzOkText: '确定', nzCancelText: '取消', nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + this.service.request(this.service.$api_get_recessionTaxOrder,params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('撤销成功'); this.search(); @@ -324,10 +327,14 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要更新的数据！'); return; } - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.service.request(this.service.$api_get_renewalOrderById, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('更新成功'); - this.search(); + this.st.load(1); } }) } @@ -336,13 +343,22 @@ export class TaxManagementOrderReportingComponent implements OnInit { * @param record 记录实例 */ unnormal(value: any) { + // if (this.selectedRows.length === 0) { + // this.openWainingModal('请选择需要更新的数据！'); + // return; + // } + console.log(this.selectedRows); + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); this.modal.confirm({ nzTitle: '税务审核结果', nzContent: '订单结算时间所在月份与申报月份不一致', nzOkText: '确定', nzCancelText: '', nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('撤销成功'); this.search(); @@ -356,7 +372,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { selectChange(item: any) { this.selectedIndex = item?.representationsStatus || ''; setTimeout(() => { - this.st.load(1); + this.st.load(); }) } @@ -399,12 +415,16 @@ export class TaxManagementOrderReportingComponent implements OnInit { this.openWainingModal('请选择需要上传的数据'); return; } - // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - // if (res) { - // this.service.msgSrv.success('上传成功'); - // this.search(); - // } - // }) + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.service.request(this.service.$api_get_uploadingTaxOrder, params).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('上传成功'); + this.st.load(); + } + }) } @@ -421,6 +441,9 @@ export class TaxManagementOrderReportingComponent implements OnInit { nzFooter: null }); modalRef.afterClose.subscribe(res => { + if (res) { + this.st.load(); + } }) } diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html index 91c1d871..cd20c559 100644 --- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html @@ -1,3 +1,13 @@ +
@@ -5,7 +15,7 @@
- diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index ed893c38..adc54df3 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-27 10:30:56 * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 14:18:01 + * @LastEditTime : 2022-04-07 20:41:55 * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -27,6 +27,14 @@ export class TaxManagementService extends BaseService { // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; $api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + // 订单上报列表 + $api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`; + // 根据订单Id更新税务订单 + $api_get_renewalOrderById = `/api/sdc/taxOrder/renewalOrderById`; + // 撤回税务订单 + $api_get_recessionTaxOrder = `/api/sdc/tax/recessionTaxOrder`; + // 上传税务订单 + $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`; $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 $api_get_upload_setting = ``; // 修改上传设置 From cc9a1a17607d2aef71d2e30481ff1160796d07d3 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 11:23:15 +0800 Subject: [PATCH 14/27] edit --- .../individual-income.component.html | 34 +- .../individual-income.component.less | 5 - .../individual-income.component.spec.ts | 34 -- .../individual-income.component.ts | 390 ++++++++---------- .../services/tax-management.service.ts | 18 +- 5 files changed, 191 insertions(+), 290 deletions(-) delete mode 100644 src/app/routes/tax-management/components/individual-income/individual-income.component.less delete mode 100644 src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index 0bca625a..3d4d6236 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -10,15 +10,15 @@ --> - +
-
- +
+
- + + - - - {{ item?.billStatusLabel }} - {{ item?.billStatusLabel }} - 异常 - - - - {{ item?.billStatusLabel }} - {{ item?.billStatusLabel }} - - -
{{ item?.amount | currency: ' ' }}
- + @@ -59,7 +45,7 @@ {{ selectedRows.length }} 条数据
- +
@@ -75,4 +61,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.less b/src/app/routes/tax-management/components/individual-income/individual-income.component.less deleted file mode 100644 index 43a47df4..00000000 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .text-black { - color: #000; - } -} diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts deleted file mode 100644 index d90f71c0..00000000 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * @Description : - * @Version : 1.0 - * @Author : Shiming - * @Date : 2022-03-30 14:45:52 - * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 15:33:06 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.spec.ts - * Copyright (C) 2022 huzhenhong. All rights reserved. - */ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TaxManagementIndividualIncomeComponent } from './individual-income.component'; - -describe('TaxManagementIndividualIncomeComponent', () => { - let component: TaxManagementIndividualIncomeComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ TaxManagementIndividualIncomeComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TaxManagementIndividualIncomeComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts index 85ba228c..6fa59757 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts @@ -1,19 +1,15 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STComponent, STData } from '@delon/abc/st'; +import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { of } from 'rxjs'; -import { map } from 'rxjs/operators'; import { TaxManagementService } from '../../services/tax-management.service'; -// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; -// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @Component({ selector: 'app-tax-management-individual-income', templateUrl: './individual-income.component.html', - styleUrls: ['./individual-income.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class TaxManagementIndividualIncomeComponent implements OnInit { _$expand = false; @@ -22,50 +18,38 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { columns!: STColumn[]; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - tabType!: string; isLoading: boolean = false; tabs: any[] = [ - { name: '待申报', value: '1' }, - { name: '待审核', value: '2' }, - { name: '已通过', value: '3' }, - { name: '不通过', value: '4' }, + { name: '待申报', value: '0' }, + { name: '待审核', value: '1' }, + { name: '已通过', value: '2' }, + { name: '不通过', value: '3' }, { name: '全部', value: '' } ]; - selectedIndex = ''; //选择的项目 - serviceTel = ''; - isVisible : boolean = false - constructor( - public service: TaxManagementService, - private router: Router, - private ar: ActivatedRoute, - public shipperservice: ShipperBaseService, - private modal: NzModalService, - public shipperSrv: ShipperBaseService - ) {} + selectedIndex = '0'; //选择的项目 + isVisible: boolean = false; - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } + selectedRows: any[] = []; + + constructor(public service: TaxManagementService) {} /** * 查询参数 */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - representationsStatus: this.selectedIndex + declareStatus: this.selectedIndex }); delete params._$expand; return { ...params }; } - /** - * 选中行 - */ - get selectedRows() { - return this.st?.list.filter((item: any) => item.checked) || []; + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + } } /** @@ -82,7 +66,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { resetSF() { this.sf.reset(); this._$expand = false; - this.isLoading = true + this.isLoading = true; } /** * 程序初始化入口 @@ -99,48 +83,55 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - billCode: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } }, - resourceCode: { + driverName: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入' } }, + telephone: { type: 'string', title: '联系电话', ui: { placeholder: '请输入' } }, - driverName: { + cardNumber: { title: '证件号码', type: 'string', ui: { placeholder: '请输入证件号码' } }, - serviceType2: { + declareStatus: { title: '申报状态', type: 'string', + enum: [ + { value: '', label: '全部' }, + { value: '0', label: '待申报' }, + { value: '1', label: '待审核' }, + { value: '2', label: '已通过' }, + { value: '3', label: '不通过' } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, + widget: 'select', containsAllLabel: true, visibleIf: { _$expand: (value: boolean) => value } - } + }, + default: '' }, - serviceType3: { - title: '申报结果', - type: 'string', - ui: { - placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } - } - }, - serviceType1: { + // declareStatu1s: { + // title: '申报结果', + // type: 'string', + // ui: { + // placeholder: '请选择', + // widget: 'dict-select', + // params: { dictKey: 'service:type' }, + // containsAllLabel: true, + // visibleIf: { + // _$expand: (value: boolean) => value + // } + // } + // }, + isOvertime: { title: '是否逾期', type: 'string', ui: { @@ -153,7 +144,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { } } }, - createTime: { + taxDate: { title: '税款所属期', type: 'string', ui: { @@ -165,7 +156,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { } } as SFDateWidgetSchema }, - createTime3: { + declareDate: { title: '申报日期', type: 'string', ui: { @@ -177,7 +168,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { } } as SFDateWidgetSchema }, - enterpriseInfoId: { + ltdId: { type: 'string', title: '网络货运人', ui: { @@ -187,7 +178,7 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { visibleIf: { _$expand: (value: boolean) => value }, - asyncData: () => this.shipperservice.getNetworkFreightForwarder() + asyncData: () => this.service.getNetworkFreightForwarder() } } } @@ -204,148 +195,149 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px' }, - { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' }, - { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' }, { - title: '税款所属期起', - render: 'billComplianceVOS', + title: '申报状态', + index: 'declareStatus', className: 'text-center', - width: '150px' + width: '120px', + type: 'badge', + badge: { + '0': { text: '待申报', color: 'default' }, + '1': { text: '待审核', color: 'processing' }, + '2': { text: '已通过', color: 'success' }, + '3': { text: '不通过', color: 'error' } + } }, - { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' }, + { title: '是否逾期', index: 'overtime', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } }, + { title: '税款所属期起', index: 'skssqq', className: 'text-center', width: '150px' }, + { title: '税款所属期止', index: 'skssqz', className: 'text-center', width: '150px' }, + { title: '纳税人名称', index: 'nsrmc', className: 'text-center', width: '180px' }, + { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' }, + { title: '行业', index: 'hy', className: 'text-center', width: '200px' }, + { title: '行政区划', index: 'xzqh', className: 'text-center', width: '120px' }, + { title: '街道乡镇', index: 'jdxz', className: 'text-center', width: '350px' }, + { title: '税务机关', index: 'swjg', className: 'text-center', width: '180px' }, + { title: '姓名', index: 'xm', className: 'text-center', width: '180px' }, + { title: '证件类型', index: 'sfzjlx', className: 'text-center', width: '250px' }, + { title: '证件号码', index: 'sfzjhm', className: 'text-center', width: '200px' }, + { title: '联系电话', index: 'lxdh', className: 'text-center', width: '200px' }, + { title: '国籍（地区）', index: 'gjdq', className: 'text-center', width: '150px' }, + { title: '生产经营地行政区划', index: 'scjydxzqh', className: 'text-center', width: '180px' }, { - title: '纳税人名称', - render: 'serviceType', - className: 'text-center', - width: '180px' + title: '当月应税收入', + index: 'dyyssr', + width: '150px', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dyyssr }) } }, - { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '行业', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '行政区划', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, - { title: '街道乡镇', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '税务机关', render: 'driver', className: 'text-center', width: '180px' }, - { title: '姓名', render: 'payeeName', className: 'text-center', width: '180px' }, - { title: '证件类型', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '证件号码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '联系电话', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '国籍（地区）', render: 'driver', className: 'text-center', width: '150px' }, - { title: '生产经营地行政区划', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '当月应税收入', render: 'amount', className: 'text-center', width: '250px' }, - { title: '应税收入', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '应税所得率', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '计税依据', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '税率', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '速算扣除数', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '累计已缴纳税额', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '本期应补退税额', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' }, + { + title: '应税收入', + index: 'yssr', + width: '150px', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yssr }) } + }, + { + title: '应税所得率', + index: 'yssdl', + className: 'text-right', + width: '250px', + format: item => `${item.yssdl ? ((item.yssdl as number) * 100).toFixed(2) : 0}%` + }, + { title: '计税依据', index: 'jsyj', className: 'text-right', width: '150px' }, + { + title: '税率', + index: 'sl', + className: 'text-right', + width: '150px', + format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%` + }, + { title: '速算扣除数', index: 'sskcs', className: 'text-right', width: '150px' }, + { + title: '应纳税额', + index: 'ynse', + width: '150px', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } + }, + { + title: '累计已缴纳税额', + index: 'ljyjnse', + width: '150px', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ljyjnse }) } + }, + { + title: '本期应补退税额', + index: 'bqybtse', + width: '150px', + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.bqybtse }) } + }, + { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' } ]; } /** - *撤销 + *更正 * @param record 记录实例 */ - recall() { - if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要撤回的数据'); - return; - } - this.modal.confirm({ - nzTitle: '撤回提示', - nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', - nzOkText: '确定', - nzCancelText: '取消', - nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('撤销成功'); - this.search(); - } - }); - } - }); + corrections() { + // if (this.selectedRows.length === 0) { + // this.openWainingModal('请选择需要撤回的数据'); + // return; + // } + // this.modal.confirm({ + // nzTitle: '撤回提示', + // nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', + // nzOkText: '确定', + // nzCancelText: '取消', + // nzOnOk: () => { + // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + // if (res) { + // this.service.msgSrv.success('撤销成功'); + // this.search(); + // } + // }); + // } + // }); } /** - *撤销 + *修改起征点 * @param record 记录实例 */ resetData() { - if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要更新的数据！'); - return; - } - this.isVisible = true - - } - /** - *撤销 - * @param record 记录实例 - */ - unnormal(value: any) { - this.modal.confirm({ - nzTitle: '税务审核结果', - nzContent: '订单结算时间所在月份与申报月份不一致', - nzOkText: '确定', - nzCancelText: '', - nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('撤销成功'); - this.search(); - } - }); - } - }); + // if (this.selectedRows.length === 0) { + // this.openWainingModal('请选择需要更新的数据！'); + // return; + // } + // this.isVisible = true; } selectChange(item: any) { - this.selectedIndex = item?.representationsStatus || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(1); }); } - /** - * 查看当行数据 - */ - view(record: STData) { - // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); - this.router.navigate(['../detail'], { - queryParams: { - id: record.id - }, - relativeTo: this.ar - }); - } - - // appeal(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '申诉', - // nzWidth: '40%', - // nzContent: CtcAppealComponent, - // nzComponentParams: { - // i: item, - // status: 'add' - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // if (res) { - // this.search({ representationsStatus: '' }); - // } - // }) - // } - /** * 申报 */ upload() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); + this.service.msgSrv.warning('请选择需要申报的数据'); return; } + // this.modal.warning({ + // nzTitle: '申报提示', + // nzContent: '订单结算时间所在月份与申报月份不一致......' + // }); // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { // if (res) { // this.service.msgSrv.success('申报成功'); @@ -359,43 +351,12 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { * @param params 更新数据 */ uploadSetting() { - if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); - return; - } - // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - // if (res) { - // this.service.msgSrv.success('更新成功'); - // this.search(); - // } - // }) - } - - /** - * 查看校验结果 - */ - viewResult(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '本地校验结果', - // nzWidth: 1200, - // nzContent: TaxManagementOrderVerifyResultComponent, - // nzComponentParams: { - // record: item - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // }) - } - - /** - * 查看监管审核结果 - */ - viewAuditResult(record: any) { - if (record?.billStatus !== '2') { - return; - } - this.openWainingModal('监管审核结果', record?.result); + this.service.request(this.service.$api_update_individual_income_page).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('更新成功'); + this.search(); + } + }); } search() { @@ -409,17 +370,8 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); } - openWainingModal(content: string, title = '提示') { - this.modal.warning({ - nzMask: false, - nzTitle: title, - nzContent: content - }); - } - handleOK() { - - } + handleOK() {} handleCancel() { - this.isVisible = false; + this.isVisible = false; } } diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index adc54df3..1d2ce0d2 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -11,22 +11,24 @@ import { Injectable, Injector } from '@angular/core'; import { _HttpClient } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; -import { map } from 'rxjs/operators'; -import { BaseService } from 'src/app/shared/services/core/base.service'; -import { EAFileUtil } from 'src/app/shared/utils/file.util'; +import { ShipperBaseService } from '@shared'; @Injectable({ - providedIn: 'root', + providedIn: 'root' }) -export class TaxManagementService extends BaseService { +export class TaxManagementService extends ShipperBaseService { // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; public $api_order_reporting_page = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; - + // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; - $api_get_individual_income_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 + + // 查询个税申报明细 + $api_get_individual_income_page = `/api/sdc/taxIncome/list/page`; + // 更新所有数据个税申报明细 + $api_update_individual_income_page = `/api/sdc/taxIncome/updateAll`; + // 订单上报列表 $api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`; // 根据订单Id更新税务订单 From e18cfb89d6c8981d1eeabae009930008dec337e5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 11:24:50 +0800 Subject: [PATCH 15/27] edit --- .../individual-income/individual-income.component.html | 3 ++- .../individual-income/individual-income.component.ts | 5 ----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index 3d4d6236..44f45d7f 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -14,7 +14,8 @@
- +
-

{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）

+

{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）

到付 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 ae0c1cfb..6f5d861b 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 @@ -1,7 +1,7 @@ - +
- +
-
- +
+
- + - - - {{ item?.billStatusLabel }} - {{ item?.billStatusLabel }} - 异常 - - - - {{ item?.billStatusLabel }} - {{ item?.billStatusLabel }} - - -
{{ item?.amount | currency: ' ' }}
- + @@ -76,5 +48,4 @@
- - + \ No newline at end of file diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.less b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.less deleted file mode 100644 index 43a47df4..00000000 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .text-black { - color: #000; - } -} diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts deleted file mode 100644 index 1c0d6328..00000000 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.spec.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * @Description : - * @Version : 1.0 - * @Author : Shiming - * @Date : 2022-03-30 14:45:52 - * @LastEditors : Shiming - * @LastEditTime : 2022-03-30 15:33:06 - * @FilePath : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\individual-income\\individual-income.component.spec.ts - * Copyright (C) 2022 huzhenhong. All rights reserved. - */ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { TaxManagementIndividualCollectComponent } from './individual-collect.component'; - -describe('TaxManagementIndividualCollectComponent', () => { - let component: TaxManagementIndividualCollectComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ TaxManagementIndividualCollectComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(TaxManagementIndividualCollectComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index d794103e..30878968 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -1,71 +1,44 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn, STComponent, STData } from '@delon/abc/st'; +import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; -import { of } from 'rxjs'; -import { map } from 'rxjs/operators'; import { TaxManagementService } from '../../services/tax-management.service'; -// import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; -// import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @Component({ selector: 'app-tax-management-individual-collect', templateUrl: './individual-collect.component.html', - styleUrls: ['./individual-collect.component.less'] + styleUrls: ['../../../commom/less/box.less'] }) export class TaxManagementIndividualCollectComponent implements OnInit { _$expand = false; - ui!: SFUISchema; schema!: SFSchema; columns!: STColumn[]; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - tabType!: string; tabs: any[] = [ - { name: '待申报', value: '1' }, - { name: '待审核', value: '2' }, - { name: '已通过', value: '3' }, - { name: '不通过', value: '4' }, + { name: '待申报', value: '0' }, + { name: '待审核', value: '1' }, + { name: '已通过', value: '2' }, + { name: '不通过', value: '3' }, { name: '全部', value: '' } ]; - selectedIndex = ''; //选择的项目 - serviceTel = ''; - constructor( - public service: TaxManagementService, - private router: Router, - private ar: ActivatedRoute, - public shipperservice: ShipperBaseService, - private modal: NzModalService, - public shipperSrv: ShipperBaseService - ) {} + selectedIndex = '0'; - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } + selectedRows: any[] = []; + constructor(public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, private modal: NzModalService) {} /** * 查询参数 */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - representationsStatus: this.selectedIndex + declareStatus: this.selectedIndex }); delete params._$expand; return { ...params }; } - /** - * 选中行 - */ - get selectedRows() { - return this.st?.list.filter((item: any) => item.checked) || []; - } - /** * 伸缩查询条件 */ @@ -74,6 +47,14 @@ export class TaxManagementIndividualCollectComponent implements OnInit { this.sf?.setValue('/_$expand', this._$expand); } + stChange(e: STChange): void { + switch (e.type) { + case 'checkbox': + this.selectedRows = e.checkbox!; + break; + } + } + /** * 重置表单 */ @@ -96,7 +77,26 @@ export class TaxManagementIndividualCollectComponent implements OnInit { this.schema = { properties: { _$expand: { type: 'boolean', ui: { hidden: true } }, - billCode: { title: '申报状态', type: 'string', ui: { placeholder: '请输入' } }, + declareStatus: { + title: '申报状态', + type: 'string', + enum: [ + { value: '', label: '全部' }, + { value: '0', label: '待申报' }, + { value: '1', label: '待审核' }, + { value: '2', label: '已通过' }, + { value: '3', label: '不通过' } + ], + ui: { + placeholder: '请选择', + widget: 'select', + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } + }, + default: '' + }, resourceCode: { type: 'string', title: '申报结果', @@ -104,18 +104,23 @@ export class TaxManagementIndividualCollectComponent implements OnInit { placeholder: '请输入' } }, - serviceType3: { + overdueStatus: { title: '是否逾期', type: 'string', + enum: [ + { value: '', label: '全部' }, + { value: '0', label: '否' }, + { value: '1', label: '是' } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, + widget: 'select', containsAllLabel: true, visibleIf: { _$expand: (value: boolean) => value } - } + }, + default: '' }, createTime: { title: '税款所属期', @@ -151,15 +156,11 @@ export class TaxManagementIndividualCollectComponent implements OnInit { visibleIf: { _$expand: (value: boolean) => value }, - asyncData: () => this.shipperservice.getNetworkFreightForwarder() + asyncData: () => this.service.getNetworkFreightForwarder() } } } }; - this.ui = { - '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, - $time: { grid: { span: 24 } } - }; } /** @@ -168,121 +169,82 @@ export class TaxManagementIndividualCollectComponent implements OnInit { initST() { this.columns = [ { title: '', type: 'checkbox', className: 'text-center', width: '60px' }, - { title: '申报状态', render: 'orderStatus', className: 'text-center', width: '120px' }, - { title: '是否逾期', render: 'localValid', className: 'text-center', width: '120px' }, + { + title: '申报状态', + index: 'declareStatus', + className: 'text-center', + width: '120px', + type: 'badge', + badge: { + '0': { text: '待申报', color: 'default' }, + '1': { text: '待审核', color: 'processing' }, + '2': { text: '已通过', color: 'success' }, + '3': { text: '不通过', color: 'error' } + } + }, + { title: '是否逾期', index: 'overdueStatus', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } }, { title: '税款所属期起', - render: 'billComplianceVOS', + index: 'skssqq', className: 'text-center', width: '150px' }, - { title: '税款所属期止', render: 'freightDetails', className: 'text-center', width: '150px' }, + { title: '税款所属期止', index: 'skssqz', className: 'text-center', width: '150px' }, { title: '纳税人名称', - render: 'serviceType', + index: 'nsrmc', className: 'text-center', width: '180px' }, - { title: '纳税人识别号', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, - { title: '税率', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '申报人数', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '应税收入', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '应纳税额', render: 'transportInfo', className: 'text-center', width: '180px' }, - { title: '累计已缴纳税额', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '本期应补退税额', render: 'transportInfo', className: 'text-center', width: '200px' }, - { title: '申报日期', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' }, + { title: '税率', index: 'sl', className: 'text-center', width: '150px' }, + { title: '申报人数', index: 'sbrs', className: 'text-center', width: '150px' }, + { title: '应税收入', index: 'yssr', className: 'text-center', width: '150px' }, + { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' }, + { title: '累计已缴纳税额', index: 'ljyjnse', className: 'text-center', width: '150px' }, + { title: '本期应补退税额', index: 'bqybtse', className: 'text-center', width: '150px' }, + { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' } ]; } /** - *撤销 + *更正 * @param record 记录实例 */ recall() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要撤回的数据'); + this.service.msgSrv.warning('请选择需要更正的数据'); return; } - this.modal.confirm({ - nzTitle: '撤回提示', - nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', - nzOkText: '确定', - nzCancelText: '取消', - nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('撤销成功'); - this.search(); - } - }); - } - }); - } - /** - *撤销 - * @param record 记录实例 - */ - unnormal(value: any) { - this.modal.confirm({ - nzTitle: '税务审核结果', - nzContent: '订单结算时间所在月份与申报月份不一致', - nzOkText: '确定', - nzCancelText: '', - nzOnOk: () => { - this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { - if (res) { - this.service.msgSrv.success('撤销成功'); - this.search(); - } - }); - } - }); + // this.modal.confirm({ + // nzTitle: '撤回提示', + // nzContent: ' 撤回后可以重新上传，重新上传会覆盖已上传数据，确定要撤回？', + // nzOkText: '确定', + // nzCancelText: '取消', + // nzOnOk: () => { + // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + // if (res) { + // this.service.msgSrv.success('撤销成功'); + // this.search(); + // } + // }); + // } + // }); } selectChange(item: any) { - this.selectedIndex = item?.representationsStatus || ''; + this.selectedIndex = item?.name || ''; setTimeout(() => { this.st.load(1); }); } - /** - * 查看当行数据 - */ - view(record: STData) { - // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); - this.router.navigate(['../detail'], { - queryParams: { - id: record.id - }, - relativeTo: this.ar - }); - } - - // appeal(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '申诉', - // nzWidth: '40%', - // nzContent: CtcAppealComponent, - // nzComponentParams: { - // i: item, - // status: 'add' - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // if (res) { - // this.search({ representationsStatus: '' }); - // } - // }) - // } - /** * 申报 */ upload() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); + this.service.msgSrv.warning('请选择需要上传的数据'); return; } // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { @@ -298,10 +260,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { * @param params 更新数据 */ uploadSetting() { - if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); - return; - } // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { // if (res) { // this.service.msgSrv.success('更新成功'); @@ -310,33 +268,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { // }) } - /** - * 查看校验结果 - */ - viewResult(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '本地校验结果', - // nzWidth: 1200, - // nzContent: TaxManagementOrderVerifyResultComponent, - // nzComponentParams: { - // record: item - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(res => { - // }) - } - - /** - * 查看监管审核结果 - */ - viewAuditResult(record: any) { - if (record?.billStatus !== '2') { - return; - } - this.openWainingModal('监管审核结果', record?.result); - } - search() { this.st.load(1); } @@ -347,12 +278,4 @@ export class TaxManagementIndividualCollectComponent implements OnInit { export() { this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); } - - openWainingModal(content: string, title = '提示') { - this.modal.warning({ - nzMask: false, - nzTitle: title, - nzContent: content - }); - } } diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts index 8cc0c73f..315d5f47 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts @@ -133,15 +133,20 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { isOvertime: { title: '是否逾期', type: 'string', + enum: [ + { value: '', label: '全部' }, + { value: '0', label: '否' }, + { value: '1', label: '是' } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, + widget: 'select', containsAllLabel: true, visibleIf: { _$expand: (value: boolean) => value } - } + }, + default: '' }, taxDate: { title: '税款所属期', diff --git a/src/app/routes/tax-management/services/tax-management.service.ts b/src/app/routes/tax-management/services/tax-management.service.ts index 1d2ce0d2..728a19ff 100644 --- a/src/app/routes/tax-management/services/tax-management.service.ts +++ b/src/app/routes/tax-management/services/tax-management.service.ts @@ -19,6 +19,7 @@ import { ShipperBaseService } from '@shared'; export class TaxManagementService extends ShipperBaseService { // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + // public $api_order_reporting_page = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; // 查询运营报表 @@ -29,6 +30,11 @@ export class TaxManagementService extends ShipperBaseService { // 更新所有数据个税申报明细 $api_update_individual_income_page = `/api/sdc/taxIncome/updateAll`; + // 查询个税汇总 + $api_get_individual_collect_page = `/api/sdc/taxSummary/list/page`; + // 更新所有数据个税汇总 + $api_update_individual_collect_page = `/api/sdc/taxIncome/updateAll`; + // 订单上报列表 $api_getTaxOrderPage_page = `/api/sdc/taxOrder/getTaxOrderPage`; // 根据订单Id更新税务订单 From 3cdd46cdced79935724accbdf5753e2fc4d246dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 8 Apr 2022 13:46:26 +0800 Subject: [PATCH 20/27] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fund-reporting.component.ts | 23 +++++++++++++------ .../order-reporting.component.ts | 3 +++ 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index c62fca11..fa7ecd77 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -146,11 +146,16 @@ export class DatatableFundReportingComponent implements OnInit { uploadStatus: { title: '上传状态', type: 'string', + default: 0, + enum: [ + { label: '待上传', value: 0 }, + { label: '已上传', value: 1 }, + { label: '异常', value: 2 } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -159,11 +164,15 @@ export class DatatableFundReportingComponent implements OnInit { verifyStatus: { title: '本地校验', type: 'string', + enum: [ + { label: '校验中', value: 0 }, + { label: '通过', value: 1 }, + { label: '不通过', value: 2 } + ], ui: { placeholder: '请选择', - widget: 'dict-select', - params: { dictKey: 'service:type' }, - containsAllLabel: true, + allowClear: true, + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, @@ -242,7 +251,7 @@ export class DatatableFundReportingComponent implements OnInit { { title: '车牌颜色', index: 'carColor', className: 'text-center', width: '180px' }, { title: '总金额', render: 'tolalAmount', className: 'text-center', width: '120px' }, - { title: '付款方式', index: 'payTypeLabel', className: 'text-center', width: '150px' }, + { title: '付款方式', index: 'payType', className: 'text-center', width: '150px' }, { title: '车队长', index: 'payee', className: 'text-center', width: '150px' }, { title: '收款账户', index: 'collectionAccount', className: 'text-center', width: '180px' }, 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 b3ad4682..e10847f0 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 @@ -149,6 +149,7 @@ export class DatatableOrderReportingComponent implements OnInit { putStatus: { title: '上传状态', type: 'string', + default: 0, enum: [ { label: '待上传', value: 0 }, { label: '已上传', value: 1 }, @@ -158,6 +159,7 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -174,6 +176,7 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value, }, From 7b1728622262c5dcb28037177d85e91c5005f4df Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 13:48:52 +0800 Subject: [PATCH 21/27] fix bug --- .../components/busitable/busiindex/busiindex.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts index 1dbf859b..6a27ee0b 100644 --- a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -37,7 +37,9 @@ export class DatatableBusiindexComponent implements OnInit { { title: '客户预存款', index: 'czcgje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.czcgje }) } }, { title: '业绩量', index: 'yisje', className: 'text-center' }, { title: '已收附加费', index: 'yisfjf', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yisfjf }) } }, - { title: '平均附加费率', index: 'fjfl', className: 'text-center' }, + { title: '平均附加费率', index: 'fjfl', className: 'text-center',format: (item)=> { + return item.fjfl + '%' + } }, { title: '已开票金额', index: 'ykpje', className: 'text-right', type: 'widget', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ykpje }) } }, ]; /** From 50beff0bbb1f912b08042ffc7d56a401f1a3d08b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 13:51:50 +0800 Subject: [PATCH 22/27] fix bug --- .../components/risk/risk.component.html | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.html b/src/app/routes/order-management/components/risk/risk.component.html index c7ff2549..9f81f0fe 100644 --- a/src/app/routes/order-management/components/risk/risk.component.html +++ b/src/app/routes/order-management/components/risk/risk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-01 11:02:21 + * @LastEditTime : 2022-04-08 13:51:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -86,8 +86,12 @@
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : ''}}
- -
{{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }}
+ +
+
{{item.payeeName}}
+
{{item.payeePhone}}
+
+
-
From bcba6058e15ab2a0e631cfd024f4d4d8c391d3c5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 14:03:54 +0800 Subject: [PATCH 23/27] edit --- .../individual-collect.component.ts | 71 ++++++++++++++----- 1 file changed, 53 insertions(+), 18 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 30878968..2696463d 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -91,9 +91,6 @@ export class TaxManagementIndividualCollectComponent implements OnInit { placeholder: '请选择', widget: 'select', containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } }, default: '' }, @@ -109,20 +106,17 @@ export class TaxManagementIndividualCollectComponent implements OnInit { type: 'string', enum: [ { value: '', label: '全部' }, - { value: '0', label: '否' }, - { value: '1', label: '是' } + { value: false, label: '否' }, + { value: true, label: '是' } ], ui: { placeholder: '请选择', widget: 'select', containsAllLabel: true, - visibleIf: { - _$expand: (value: boolean) => value - } }, default: '' }, - createTime: { + skss: { title: '税款所属期', type: 'string', ui: { @@ -134,7 +128,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } } as SFDateWidgetSchema }, - createTime3: { + sbrq: { title: '申报日期', type: 'string', ui: { @@ -182,7 +176,14 @@ export class TaxManagementIndividualCollectComponent implements OnInit { '3': { text: '不通过', color: 'error' } } }, - { title: '是否逾期', index: 'overdueStatus', className: 'text-center', width: '120px', type: 'enum', enum: { '0': '否', '1': '是' } }, + { + title: '是否逾期', + index: 'overdueStatus', + className: 'text-center', + width: '120px', + type: 'enum', + enum: { false: '否', true: '是' } + }, { title: '税款所属期起', index: 'skssqq', @@ -197,12 +198,46 @@ export class TaxManagementIndividualCollectComponent implements OnInit { width: '180px' }, { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' }, - { title: '税率', index: 'sl', className: 'text-center', width: '150px' }, - { title: '申报人数', index: 'sbrs', className: 'text-center', width: '150px' }, - { title: '应税收入', index: 'yssr', className: 'text-center', width: '150px' }, - { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' }, - { title: '累计已缴纳税额', index: 'ljyjnse', className: 'text-center', width: '150px' }, - { title: '本期应补退税额', index: 'bqybtse', className: 'text-center', width: '150px' }, + { + title: '税率', + index: 'sl', + className: 'text-right', + width: '150px', + format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%` + }, + { title: '申报人数', index: 'sbrs', className: 'text-right', width: '150px' }, + { + title: '应税收入', + index: 'yssr', + className: 'text-right', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yssr }) } + }, + { + title: '应纳税额', + index: 'ynse', + className: 'text-right', + width: '180px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } + }, + { + title: '累计已缴纳税额', + index: 'ljyjnse', + className: 'text-center', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ljyjnse }) } + }, + { + title: '本期应补退税额', + index: 'bqybtse', + className: 'text-center', + width: '150px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.bqybtse }) } + }, { title: '申报日期', index: 'sbrq', className: 'text-center', width: '150px' } ]; } @@ -233,7 +268,7 @@ export class TaxManagementIndividualCollectComponent implements OnInit { } selectChange(item: any) { - this.selectedIndex = item?.name || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(1); }); From bba13a958d8123b544fc4a94388fb94d07a2eb24 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 8 Apr 2022 14:04:28 +0800 Subject: [PATCH 24/27] fix bug --- .../vehicle-detail/vehicle-detail.component.html | 2 +- .../confir-receipt/confir-receipt.component.html | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) 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 52a85b12..9c1db1d5 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-04-06 15:39:20 + * @LastEditTime : 2022-04-08 14:01:28 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> diff --git a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html index bd2b7f0e..807acb0b 100644 --- a/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html +++ b/src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html @@ -1,4 +1,14 @@ +货物单价 @@ -225,7 +225,6 @@ -
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
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 9c1db1d5..f9519e6c 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-04-08 14:01:28 + * @LastEditTime : 2022-04-08 14:06:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -249,7 +249,6 @@ -
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
    From 2a75dc0dc594d9e6d8ec951ec87a3dccb6aaa8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Fri, 8 Apr 2022 14:08:13 +0800 Subject: [PATCH 26/27] - --- .../components/order-reporting/order-reporting.component.html | 2 +- .../components/verify-result/verify-result.component.html | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index 1d8a4f94..52d5bad7 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -46,7 +46,7 @@ - {{filterCheckStatus(item?.checkStatus)}} + {{filterCheckStatus(item?.checkStatus)}} {{filterCheckStatus(item?.checkStatus)}} diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html index 033b9584..7f0a72d2 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -7,8 +7,8 @@
    + [res]="{ reName: { list: 'data', total: 'data.total' } }" [page]="{ show: false,showSize:false}" [loading]="false" + [bordered]="true"> {{filterCheckStatus(item?.checkStatus)}} From 1d56ba71589373355fa282d706d69759eb9d7250 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 8 Apr 2022 14:32:50 +0800 Subject: [PATCH 27/27] edit --- .../individual-collect.component.ts | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index 2696463d..c4f25510 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -90,15 +90,16 @@ export class TaxManagementIndividualCollectComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - containsAllLabel: true, + containsAllLabel: true }, default: '' }, - resourceCode: { + declareResult: { type: 'string', title: '申报结果', ui: { - placeholder: '请输入' + placeholder: '请选择', + widget: 'select', } }, overdueStatus: { @@ -112,11 +113,11 @@ export class TaxManagementIndividualCollectComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - containsAllLabel: true, + containsAllLabel: true }, default: '' }, - skss: { + taxMonth: { title: '税款所属期', type: 'string', ui: {