diff --git a/proxy.conf.js b/proxy.conf.js index e6de13f2..6a0a73cf 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-09 16:39:20 + * @LastEditTime : 2022-04-14 14:40:51 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts index 4b746335..5a8be33e 100644 --- a/src/app/core/startup/startup.service.ts +++ b/src/app/core/startup/startup.service.ts @@ -4,10 +4,13 @@ import { cacheConf } from '@conf/cache.conf'; import { sysConf } from '@conf/sys.conf'; import { ACLService } from '@delon/acl'; import { MenuService, SettingsService, TitleService, _HttpClient } from '@delon/theme'; +import { AlainConfigService } from '@delon/util'; import { environment } from '@env/environment'; import { AmapService, EACacheService, EAUserService } from '@shared'; import { NzSafeAny } from 'ng-zorro-antd/core/types'; import { NzIconService } from 'ng-zorro-antd/icon'; +import { NzImageService } from 'ng-zorro-antd/image'; +import { NzUploadFile } from 'ng-zorro-antd/upload'; import { Observable, zip } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; @@ -31,10 +34,22 @@ export class StartupService { private userSrv: EAUserService, private amapService: AmapService, public cacheSrv: EACacheService, - private coreSrv: CoreService + private coreSrv: CoreService, + private nzImageService: NzImageService, + private alainConfigService: AlainConfigService ) { iconSrv.addIcon(...ICONS_AUTO, ...ICONS); this.settingService.setLayout('fixSiderbar', true); + // 全局修改sf图片预览方式 + alainConfigService.set('sf', { + ui: { + preview: (file: NzUploadFile) => { + if (file.url) { + this.nzImageService.preview([{ src: file.url }]); + } + } + } + }); } // TODO: 退出登录时需要清理用户信息 diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index 9dfc91aa..dece86a1 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 13:20:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-06 20:24:20 + * @LastEditTime : 2022-04-14 15:43:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\customtable\\customindex\\customindex.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -12,19 +12,19 @@
- +
- +
- +
- +
diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts index 27b8a1ff..7f9d4954 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts @@ -38,10 +38,12 @@ export class DatatableCustomindexComponent implements OnInit { { title: '未激活用户数', index: 'notActivationTotal', className: 'text-center' }, { title: '沉默用户数', index: 'silentTotal', className: 'text-center' }, { title: '流失用户数', index: 'drainTotal', className: 'text-center' }, - { title: '流失率', index: 'drainRate', className: 'text-center',format: (item: any) => {return (item?.drainRate)*100 + '%' }} + { title: '流失率', index: 'drainRate', className: 'text-center',format: (item: any) => {return ((item?.drainRate)*100).toFixed(2) + '%' }} ]; hzData: any; - hhrData: any; + hhrData: any = { + total: 0 + }; sjData: any; clData: any; reportData: any = []; @@ -114,7 +116,10 @@ export class DatatableCustomindexComponent implements OnInit { }); this.service.request(this.service.$api_statistics_total, { type: 2 }).subscribe(res => { if (res) { + this.hhrData = res; + console.log(this.hhrData); + } }); this.service.request(this.service.$api_statistics_total, { type: 3 }).subscribe(res => { diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index e614479a..27fec9ba 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,23 +4,26 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 15:20:32 + * @LastEditTime : 2022-04-14 15:48:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
-
-

运多星网络货运平台

-
-   - {{todayTime}} +
+
+

运多星网络货运平台

+
+   + {{ todayTime }}
- -

实时交易监控

+

实时交易监控

@@ -42,16 +45,15 @@ - - + + - + +
+
- +
@@ -152,12 +156,11 @@ - + - - {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }} - + + {{ item?.driverName }}{{ item?.carNo ? '/' + item?.carNo : '' }} +
diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.less b/src/app/routes/datatable/components/datascreen/datascreen.component.less index 69baee23..b6591429 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.less +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.less @@ -5,7 +5,11 @@ font-weight: bold; } .nz-statistic-number,.ant-statistic-content-value { - font-size: 20px; + font-size: 14px; + } + .ant-table-thead > tr > th, .ant-table-tbody > tr > td, .ant-table tfoot > tr > th, .ant-table tfoot > tr > td { + padding: 0; + font-size: 12px; } } } \ 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 128e3f9e..26545ef6 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-13 10:25:50 + * @LastEditTime : 2022-04-14 16:21:00 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -44,7 +44,7 @@ export class DatatableDatascreenComponent implements OnInit { monthData: G2TimelineData[] = []; monthData2:G2TimelineData[] =[]; - salesData2: Array = this.genData(); + salesData2: Array = []; constructor(public service: DataService) {} ngOnChanges(changes: any): void { console.log(changes); @@ -81,6 +81,7 @@ export class DatatableDatascreenComponent implements OnInit { this.service.request(this.service.$api_getAnnualTransactions).subscribe((res: any) => { this.allDeal = res; }); + this.initPillarData() this.service.request(this.service.$api_getTransactionAmount).subscribe((res: any) => { this.headDeal = res; }); @@ -105,7 +106,7 @@ export class DatatableDatascreenComponent implements OnInit { } }); } - public genData(): G2MiniAreaData[] { + genData(): any{ let value: any = []; this.service.request(this.service.$api_getShipmentRanking).subscribe((res: any) => { console.log(res); @@ -115,32 +116,32 @@ export class DatatableDatascreenComponent implements OnInit { y: element.weight }); }); + this.salesData2 = value }); - console.log(value); - return value; } initPillarData(){ - this.curve.reRender() + // this.curve.reRender() + this.genData(); } /** * 初始化数据列表 */ 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', }, + { title: '发货地', index: 'loadAddress', className: 'text-center', }, + { title: '卸货地', index: 'dischargeAddress', className: 'text-center',}, + { title: '货物', index: 'goodsName', className: 'text-center', }, + { title: '数量', render: 'weight', className: 'text-center',} ]; } initOrderST() { this.orderColumns = [ - { title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' }, - { title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' }, - { title: '货主', index: 'shipperName', className: 'text-center', width: '200px' }, - { title: '时间', index: 'createTime', className: 'text-center', width: '200px' }, - { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' } + { title: '运单号', index: 'wayCode', className: 'text-center', }, + { title: '司机/车辆', index: 'carNo', className: 'text-center', }, + { title: '货主', index: 'shipperName', className: 'text-center', }, + { title: '时间', index: 'createTime', className: 'text-center', }, + { title: '异常预警', index: 'warningTypeLabel', className: 'text-center',} ]; } 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 23d25d80..90927785 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -22,7 +22,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte constructor(private service: DataService, private ngZone: NgZone) {} ngAfterViewInit(): void { this.map.el.nativeElement.style.height = this.map.el.nativeElement.clientWidth + 'px' - this.chart.render(); + this.chart?.render(); } ngOnChanges(changes: SimpleChanges): void { @@ -35,7 +35,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte ngOnInit(): void {} reRender() { - console.log('5454545'); setTimeout(() => { this.chart.render(); }, 1000); @@ -75,7 +74,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte this.chart.legend('trend', { position: 'left' }); - console.log('8888'); // 绘制世界地图背景 this.ds = new DataSet(); @@ -95,11 +93,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges, Afte if(res) { res.forEach((element: any) => { value.push({ - name: element.province, - value: element.weight, + '省份': element.province, + '订单数': element.weight, }); }); - console.log(value); this.userData = value if (!(this.userData instanceof Array) || this.userData.length === 0) { @@ -107,17 +104,18 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) { } this.userDv = this.ds.createView().source(this.userData).transform({ geoDataView: this.worldMap, - field: 'name', + field: '省份', type: 'geo.region', as: ['longitude', 'latitude'] }).transform({ type: 'map', - callback: (obj: { trend: string; value: number }) => { - if(obj.value < 500) { + callback: (obj: { trend: string; 订单数: number }) => { + + if(obj.订单数 < 500) { obj.trend = '500以下'; - } else if(obj.value >= 500 && obj.value < 1000){ + } else if(obj.订单数 >= 500 && obj.订单数 < 1000){ obj.trend = '500-1000'; - } else if(obj.value >= 1000 ){ + } else if(obj.订单数 >= 1000 ){ obj.trend = '>1000'; } return obj; @@ -127,13 +125,10 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) { this.userView.data(this.userDv.rows); this.userView.scale({ trend: { - alias: '蓝色地区数量' + alias: '订单交易数量' } }); - console.log(this.userView); - console.log('45545'); - - this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('name*trend*value').style({fillOpacity: 0.85 }) + this.userView.polygon().position('longitude*latitude').color('trend', ['#0a3f80', '#1b6aca', '#5d93d4']).tooltip('省份*订单数').style({fillOpacity: 0.85 }) .animate({ leave: { animation: 'fade-out' @@ -145,10 +140,6 @@ if (!(this.userData instanceof Array) || this.userData.length === 0) { } }) }); - - console.log('9999'); - - } } 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 be7285cc..b1d74f18 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 @@ -3,19 +3,19 @@
-
+
-
- - - - -
+
+
+ + + +
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 39fda63a..cae73b65 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 @@ -112,7 +112,6 @@ export class DatatableOrderReportingComponent implements OnInit { placeholder: '请选择', widget: 'select', asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), - allowClear: true } }, @@ -266,8 +265,13 @@ export class DatatableOrderReportingComponent implements OnInit { }, }; this.ui = { - '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, - $time: { grid: { span: 24 } }, + '*': { + spanLabelFixed: 120, + grid: { + lg: 12, + xl: 8 + }, enter: () => this.search() + }, }; } diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts index 0ae727c7..cd63765c 100644 --- a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts @@ -91,14 +91,26 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } update() { - if (this.record?.billType === '1') { - window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`) - - } else if (this.record.billType === '2') { - window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`); + switch (this?.subjectType) { + case 2: + this.openNewPage(`/usercenter/driver/detail/${this.record?.driverId}`); + break; + case 3: + if (this.record?.billType === '1') { + this.openNewPage(`/order-management/vehicle-detailChange/${this.record?.orderId}`); + } else if (this.record.billType === '2') { + this.openNewPage(`/order-management/bulk-detailChange/${this.record?.orderId}`); + } + break; + case 4: + this.openNewPage(`/vehicle/list/detail/${this.record?.carId}`); + break; + default: + break; } + } @@ -119,4 +131,8 @@ export class DatatableReportingVerifyResultComponent implements OnInit { } } + openNewPage(url: string) { + window.open(location.origin + `/#` + url); + } + } diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.html new file mode 100644 index 00000000..f5f453b1 --- /dev/null +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.html @@ -0,0 +1,55 @@ + + + + + + + +
+ + {{formData?.ltdName}} + + + {{formData?.bankTypeLabel}} + + + {{formData?.virtualAccount}} + + + {{formData?.transferBankAccount}} + + + {{formData?.rechargeAmount | currency}} + + + {{formData?.transferBankOpenName}} + + + {{formData?.rechargeStatusLabel}} + + + {{formData?.rechargeRemark}} + + + {{formData?.createTime}} + + + {{formData?.refundTime}} + + + {{formData?.paySerialNumber}} + + + {{formData?.paySerialNumber2}} + + +
+ + \ No newline at end of file diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.less b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts new file mode 100644 index 00000000..af5d81dd --- /dev/null +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { FreightAccountService } from '../../../services/freight-account.service'; + +@Component({ + selector: 'app-abnormal-gold-detail', + templateUrl: './abnormal-gold-detail.component.html', + styleUrls: ['./abnormal-gold-detail.component.less'] +}) +export class AbnormalGoldDetailComponent implements OnInit { + formData: any = {}; + + constructor(public service: FreightAccountService, private route: ActivatedRoute) { + const id = route.snapshot.params.id; + this.loadRefundDetail(id); + } + + ngOnInit(): void {} + + loadRefundDetail(id: string) { + this.service.request(this.service.$api_get_getAbnormalAmount_detail, { id }).subscribe(res => { + if (res) { + this.formData = res; + } + }); + } + + downBack(bussType: string, receiptUrl: string) { + if (this.formData?.refundStatus !== '3') { + return; + } + this.service.getReceiptUrl(receiptUrl, { + bankType: this.formData.bankType, + rmYll: this.formData.userId, + snglFlgCd: this.formData.coreSerNo, + bussType, + ltdId: this.formData.ltdId, + accountType: this.formData.accountType + }); + } + + goBack() { + history.go(-1); + } +} diff --git a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html index 5353f411..593c1e97 100644 --- a/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html +++ b/src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 14:23:35 + * @LastEditTime : 2022-04-14 10:39:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\abnormal-gold\\abnormal-gold.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -16,7 +16,7 @@ @@ -35,10 +35,9 @@ - - - - + + + { + Object.assign(requestOptions.body, { rechargeStatus: this.rechargeStatus }); if (this.sf) { Object.assign(requestOptions.body, { ...this.sf.value }); } return requestOptions; }; + changePaymentStatus(status: string) { + this.rechargeStatus = status; + this.st.load(1); + } + refund(item: any) { this.nzModalService.warning({ nzTitle: '确定要将该笔款项原路退回？', @@ -101,7 +108,7 @@ export class AbnormalGoldComponent implements OnInit { ], ui: { widget: 'select', - placeholder: '请选择', + placeholder: '请选择' }, default: '' }, @@ -154,43 +161,43 @@ export class AbnormalGoldComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '银行流水号', index: 'paySerialNumber', width: 150 }, - { title: '网络货运人', index: 'ltdId', width: 120 }, - { title: '银行类型', index: 'callNo', width: 100, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } }, - { title: '资金总账号', index: 'callNo', width: 120 }, - { title: '充值金额', index: 'rechargeAmount', width: 100 }, - { title: '付款账户', index: 'transferBankAccount', width: 100 }, - { title: '付款账号', index: 'transferBankCardNumber', width: 100 }, - { title: '付款银行', index: 'transferBankOpenName', width: 100 }, - { title: '转账时间', index: 'transferDate', type: 'date', width: 150 }, - { title: '转账备注', index: 'rechargeRemark', width: 100 }, - { title: '操作人', index: 'rechargeName', width: 90 }, - { title: '操作时间', index: 'callNo', type: 'date', width: 150 }, - { title: '状态', index: 'callNo', width: 90 }, + { title: '银行流水号', index: 'paySerialNumber', width: 180 }, + { title: '网络货运人', index: 'ltdName', width: 220 }, + { title: '银行类型', index: 'bankTypeLabel', width: 100 }, + { title: '资金总账号', index: 'virtualAccount', width: 180 }, + { + title: '充值金额', + index: 'rechargeAmount', + width: 140, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.rechargeAmount }) } + }, + { title: '付款账户', index: 'transferBankAccount', width: 180 }, + { title: '付款账号', index: 'transferBankCardNumber', width: 180 }, + { title: '付款银行', index: 'transferBankOpenName', width: 220 }, + { title: '转账时间', index: 'createTime', type: 'date', width: 150 }, + { title: '转账备注', index: 'rechargeRemark', width: 180 }, + { title: '退款时间', index: 'refundTime', type: 'date', width: 150 }, + // { title: '操作人', index: 'rechargeName', width: 140 }, + // { title: '操作时间', index: 'callNo', type: 'date', width: 160 }, + { title: '状态', index: 'rechargeStatusLabel', width: 110 }, { title: '操作', fixed: 'right', className: 'text-center', width: 120, buttons: [ - { - text: '清分', - click: item => this.clearingAction(item) - }, - { - text: '退款', - click: item => this.refund(item) - }, { text: '查看', - click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/1']) + click: item => this.router.navigate(['/financial-management/abnormal-gold/detail/' + item.id]) } ] } ]; } - // 导出 - exprot() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage); - } + // 导出 + exprot() { + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAbnormalAmountPage); + } } diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 3e73fb60..bc954a6c 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -36,7 +36,7 @@ export class DriverAccountDetailComponent implements OnInit { projectId: this.params.projectId, enterpriseId: this.params.enterpriseId, roleId: this.params.roleId, - bankType: this.params.bankType, + bankType: this.params.bankType }); if (this.sf) { Object.assign(requestOptions.body, { @@ -76,7 +76,22 @@ export class DriverAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDriverByOperatorPage,); + this.service.exportStart( + { + ...this.sf.value, + pageSize: -1, + ltdId: this.params.ltdId, + projectId: this.params.projectId, + enterpriseId: this.params.enterpriseId, + roleId: this.params.roleId, + bankType: this.params.bankType, + createTime: { + start: this.sf.value?.createTime?.[0] || '', + end: this.sf.value?.createTime?.[1] || '' + } + }, + this.service.$api_get_exportAccountBalanceDriverByOperatorPage + ); } goBack() { @@ -167,8 +182,8 @@ export class DriverAccountDetailComponent implements OnInit { { title: '交易时间', index: 'createTime', type: 'date', width: 150 }, { title: '流水号', index: 'channelPaySn', width: 170 }, { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center', width: 150 }, - { title: '交易单号', index: 'businessNumber' , width: 190}, - { title: '订单号', index: 'orderSn' , width: 190}, + { title: '交易单号', index: 'businessNumber', width: 190 }, + { title: '订单号', index: 'orderSn', width: 190 }, { title: '运单号', index: 'transportSn', width: 190 }, { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 150 }, { @@ -187,9 +202,9 @@ export class DriverAccountDetailComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } }, - { title: '付款方', index: 'payName', width: 150}, + { title: '付款方', index: 'payName', width: 150 }, { title: '收款方', index: 'incomeName', width: 150 }, - { title: '备注', index: 'tradeContent' , width: 150}, + { title: '备注', index: 'tradeContent', width: 150 } ]; } } diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 99daad10..4892f27a 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -81,6 +81,8 @@ export class DriverAccountComponent implements OnInit { } exportList() { + console.log(this.sf.value); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_driver_account_page); } diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts index 3693361f..dd2fa6ca 100644 --- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts +++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts @@ -83,7 +83,21 @@ export class FreightAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceShipperByOperatorPage,); + this.service.exportStart( + { + ...this.sf.value, + pageSize: -1, + ltdId: this.params.ltdId, + projectId: this.params.projectId, + enterpriseId: this.params.enterpriseId, + roleId: this.params.roleId, + createTime: { + start: this.sf?.value.createTime?.[0] || '', + end: this.sf?.value.createTime?.[1] || '' + } + }, + this.service.$api_get_exportAccountBalanceShipperByOperatorPage + ); } goBack() { @@ -201,8 +215,8 @@ export class FreightAccountDetailComponent implements OnInit { { title: '交易单号', index: 'businessNumber', width: 170 }, { title: '订单号', index: 'orderSn', width: 170 }, { title: '运单号', index: 'transportSn', width: 170 }, - { title: '货主', index: 'enterpriseName' , width: 170}, - { title: '所属项目', index: 'projectName' , width: 170}, + { title: '货主', index: 'enterpriseName', width: 170 }, + { title: '所属项目', index: 'projectName', width: 170 }, { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center', width: 140 }, { title: '交易金额', @@ -220,7 +234,7 @@ export class FreightAccountDetailComponent implements OnInit { className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } }, - { title: '付款方', index: 'payName' , width: 170}, + { title: '付款方', index: 'payName', width: 170 }, { title: '收款方', index: 'incomeName', width: 170 }, { title: '备注', index: 'tradeContent', width: 170 } ]; diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 9c15fa53..21a19041 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -247,7 +247,7 @@ export class PaymentOrderComponent implements OnInit { widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) } }, { title: '付款类型', index: 'payTypeLabel', width: 130 }, - { title: '付款方式', index: 'payModeLabel', width: 130 }, + { title: '付款方式', index: 'payBankTypeLabel', width: 130 }, { title: '结算客户', index: 'cnoName', width: 160 }, { title: '收款人', index: 'hrToLabel', width: 150 }, { title: '应付已核销', index: 'ishrhxLabel', width: 150 }, diff --git a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts index 34a9e8e0..43e46e5b 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts @@ -66,7 +66,18 @@ export class PlatformAccountDetailComponent implements OnInit { stChange(e: STChange): void {} exportList() { - this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceByPage); + this.service.exportStart( + { + ...this.sf.value, + ...this.params, + createTime: { + start: this.sf.value?.createTime?.[0] || '', + end: this.sf.value?.createTime?.[1] || '' + }, + pageSize: -1 + }, + this.service.$api_get_exportAccountBalanceByPage + ); } goBack() { diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index 52015766..f06bc8cb 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -229,7 +229,7 @@ export class RechargeRecordComponent implements OnInit { bankType: item.bankType, rmYll: item.roleId, snglFlgCd: item.paySerialNumber2, - bussType: '06', + bussType: '05', ltdId: item.ltdId, accountType: item.accountType }) diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 7f26b5ca..0e7987e9 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -91,6 +91,16 @@ export class TransactionFlowComponent { placeholder: '请输入' } }, + orderSn: { + type: 'string', + title: '订单号', + ui: { + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + }, tradeType: { type: 'string', title: '交易类型', @@ -216,6 +226,7 @@ export class TransactionFlowComponent { { title: '流水号', index: 'transactionNumber', width: 180 }, { title: '交易类型', index: 'tradeTypeLabel', width: 120 }, { title: '关联单号', index: 'businessNumber', width: 150 }, + { title: '订单号', index: 'orderSn', width: 150 }, { title: '账户类型', index: 'accountTypeLabel', width: 130 }, { title: '账户名称', index: 'roleName', width: 180 }, { title: '所属项目', index: 'projectName', width: 140 }, @@ -262,7 +273,6 @@ export class TransactionFlowComponent { ]; } exportList() { - - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage,); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportAccountBalanceDetailPage); } } diff --git a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html index 0c1d57e9..5f5f53c7 100644 --- a/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html +++ b/src/app/routes/financial-management/components/voucher-summary/voucher-summary.component.html @@ -22,8 +22,8 @@ [class.expend-options]="_$expand"> -
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
    -
  • 系统识别:{{item?.complianceTypeName}}
    • -
  • {{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。
    • +
  • 系统识别:{{item?.complianceTypeName}}
    • +
  • {{item?.determineDetails}}
@@ -241,13 +241,14 @@ [page]="{ show: false, showSize: false }"> - {{item?.operator}}/{{item.telephone}} - + --> + diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index cfe20fdf..33757e8a 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:00:19 + * @LastEditTime : 2022-04-13 19:52:18 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -31,6 +31,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { billExpenses: any[] = []; //运费信息表格信息 pois: any[] = []; abnormalList: any[] = []; + operationList: any; i: any; imges: any; totalObj: any; @@ -116,7 +117,22 @@ export class OrderManagementBulkeDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; - + this.service.request(this.service.$api_get_log_list,{operateObject: this.i?.billCode, operateTypeList: ['3','8']}).subscribe(res => { + if (res) { + console.log('操作日志'); + console.log(res); + let a :any= [] + res.records.forEach((item: any) => { + a.push({ + value: `操作人： ${item.operator}
操作内容： ${ item.operationContent}`, + time: item.operatorTimestamp, + color: 'green' + }) + }) + console.log(a); + this.operationList = a; + } + }); } }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { @@ -126,6 +142,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.abnormalList = res; } }); + this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { if (res) { console.log('异常预警'); @@ -133,9 +150,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.warringList = res } }); - setTimeout(() => { - this.logSt.load(1); - }); + } goBack() { diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 482bb68c..bced8f7d 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 11:30:05 + * @LastEditTime : 2022-04-14 10:53:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -78,6 +78,9 @@
{{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : ''}}
+ +
{{ item.settlementWeight ? item.settlementWeight + '吨/ ': ''}} {{ item.settlementVolume ? item.settlementVolume + '方 ': ''}}
+
{{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }}
diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 6ef8e789..e4944856 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -491,12 +491,12 @@ export class OrderManagementBulkComponent implements OnInit { }, { title: '结算数量', - index: '结算数量', + render: 'settlementWeight', width: '170px', className: 'text-left', - format: (item: any) => - `${item.settlementWeight || '0'}吨/ - ${item.settlementVolume || '0'}方` + // format: (item: any) => + // `${item.settlementWeight || '0'}吨/ + // ${item.settlementVolume || '0'}方` }, { title: '承运司机', @@ -518,6 +518,12 @@ export class OrderManagementBulkComponent implements OnInit { className: 'text-left', render: 'loadingTime' }, + { + title: '录单时间', + className: 'text-left', + index: 'recordTime', + width: '170px' + }, { title: '创建时间', width: '180px', diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts index 1fec3254..0c311e0e 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.ts @@ -37,6 +37,8 @@ export class OrderManagementComplaintDetailComponent implements OnInit { if (this.id) { this.getDetail(this.id); + console.log(this.ar.snapshot.queryParams.sts); + this.initSF(); this.initSTAudit() } @@ -63,11 +65,22 @@ export class OrderManagementComplaintDetailComponent implements OnInit { initSF() { this.schema = { properties: { + shpComplaintCauseLabel: { + title: '投诉原因', + type: 'string', + maxLength: 30, + ui: { + hidden: this.ar.snapshot.queryParams.sts == 2, + widget: 'text', + change: (value, orgData) => console.log(value, orgData), + } as SFSelectWidgetSchema, + }, drvComplaintCauseLabel: { title: '投诉原因', type: 'string', maxLength: 30, ui: { + hidden: this.ar.snapshot.queryParams.sts == 1, widget: 'text', change: (value, orgData) => console.log(value, orgData), } as SFSelectWidgetSchema, diff --git a/src/app/routes/order-management/components/complaint/complaint.component.ts b/src/app/routes/order-management/components/complaint/complaint.component.ts index 82e301a3..2d421c63 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.ts +++ b/src/app/routes/order-management/components/complaint/complaint.component.ts @@ -360,7 +360,8 @@ export class OrderManagementComplaintComponent implements OnInit { view(value: any) { this.router.navigate(['/order-management/complaint-detail/' + value.id], { queryParams: { - detail: JSON.stringify(value) + detail: JSON.stringify(value), + sts: this.selectedMainTabStatus } }); } diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 898ad94a..400d1fb0 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -201,7 +201,7 @@ export class OrderManagementRiskComponent implements OnInit { } } as SFSelectWidgetSchema }, - shipperId: { + shipperAppUserName: { type: 'string', title: '托运人', ui: { @@ -218,7 +218,7 @@ export class OrderManagementRiskComponent implements OnInit { if (str) { return this.service .request(this.service.$api_enterpriceList, { enterpriseName: str }) - .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.enterpriseName } as SFSchemaEnum)))) .toPromise(); } else { return of([]); 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 8fb28115..dba53098 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-13 19:04:48 + * @LastEditTime : 2022-04-14 10:09:03 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -236,8 +236,8 @@
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
@@ -247,13 +247,15 @@ [page]="{ show: false, showSize: false }"> - {{item?.operator}}/{{item.telephone}} - + --> + + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index a113356d..89713968 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 19:06:44 + * @LastEditTime : 2022-04-13 19:52:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -27,6 +27,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { modalcontent: any; modalTitle: string = ''; trajectory = 'car'; + operationList: any; mapList: any[] = []; //地图点位数据组 pois: any[] = []; addressItems: any[] = []; //打点地址数据组 @@ -107,10 +108,25 @@ export class OrderManagementVehicleDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; + this.service.request(this.service.$api_get_log_list,{operateObject: this.i?.billCode, operateTypeList: ['3','8']}).subscribe(res => { + if (res) { + console.log('操作日志'); + console.log(res); + let a :any= [] + res.records.forEach((item: any) => { + a.push({ + value: `操作人： ${item.operator}
操作内容： ${ item.operationContent}`, + time: item.operatorTimestamp, + color: 'green' + }) + }) + console.log(a); + this.operationList = a; + } + }); this.billExpenses = this.i?.billExpenseDetails?.filter( (data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK' ); - this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); } }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { @@ -127,9 +143,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.warringList = res } }); - setTimeout(() => { - this.logSt.load(1); - }); + } // 取消订单 cancellation() { diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 4c380bd6..27494ac4 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -394,6 +394,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme className: 'text-left', render: 'loadingTime' }, + { + title: '录单时间', + className: 'text-left', + index: 'recordTime', + width: '170px' + }, { title: '创建时间', className: 'text-left', diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index 75b71007..b7711049 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -53,7 +53,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit { } // 运单类型 settlementBasis: any = { - 1: '以收获为准', + 1: '以收货为准', 2: '以发货为准' } // 结算依据 diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 4909c270..a570a0d1 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -190,7 +190,7 @@ （运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}） -
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
+
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index 37730ca3..dcaf4062 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -196,6 +196,13 @@ export class SupplyManagementVehicleComponent implements OnInit { }, ] }) + tipsModal.afterClose.subscribe(result => { + this.st?.reload(); + this.getGoodsSourceStatistical(); + }) + } else { + this.st?.reload(); + this.getGoodsSourceStatistical(); } }); } diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html index 17ea49f8..139be577 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html @@ -18,8 +18,8 @@ [compact]="true" [button]="'none'">
- +
- +
- +
司机姓名：张三/13812345678
是否确认要将该司机的起征点同步调整为超过15万？
@@ -88,4 +75,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 4dd8bb7d..0f7c54a0 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -24,15 +24,15 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { @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 = ''; - isVisible : boolean = false + isVisible: boolean = false; constructor( public service: TaxManagementService, private router: Router, @@ -54,7 +54,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - representationsStatus: this.selectedIndex + declareStatus: this.selectedIndex }); delete params._$expand; return { ...params }; @@ -88,16 +88,16 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ngOnInit() { this.initSF(); this.initST(); - const object1 : any = {}; - const object2 : any = {}; - Object.defineProperty(object1, 'name',{ writable: false ,value: 'wang'}); - Object.defineProperty(object2, 'xxoo',{ writable: false ,value: 'wang'}); + const object1: any = {}; + const object2: any = {}; + Object.defineProperty(object1, 'name', { writable: false, value: 'wang' }); + Object.defineProperty(object2, 'xxoo', { writable: false, value: 'wang' }); console.log(object1); console.log(object1.name); console.log(object2); console.log(object2.xxoo); - object1.name = 'ming' - object2.xxoo = 'ming' + object1.name = 'ming'; + object2.xxoo = 'ming'; console.log(object1); console.log(object2); } @@ -161,7 +161,10 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - containsAllLabel: true + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value + } }, default: '' }, @@ -251,60 +254,77 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { width: '180px' }, { title: '纳税人识别号', index: 'nsrsbh', className: 'text-center', width: '200px' }, - { title: '姓名', index: 'xm', className: 'text-center', width: '200px' }, + { title: '姓名', index: 'xm', className: 'text-center', width: '200px' }, { title: '证件类型', index: 'sfzjlx', className: 'text-center', width: '200px' }, - { title: '证件号码', index: 'sfzjhm', className: 'text-center', width: '200px' }, + { title: '证件号码', index: 'sfzjhm', className: 'text-center', width: '200px' }, { title: '联系电话', index: 'lxdh', className: 'text-center', width: '200px' }, - { title: '国家（地区）', index: ' gjdq', className: 'text-center', width: '200px' }, - { title: '所属行业', index: 'hy', className: 'text-center', width: '200px' }, - { title: '征收项目', index: 'zsxm', className: 'text-center', width: '200px' }, + { title: '国家（地区）', index: ' gjdq', className: 'text-center', width: '200px' }, + { title: '所属行业', index: 'hy', className: 'text-center', width: '200px' }, + { title: '征收项目', index: 'zsxm', className: 'text-center', width: '200px' }, { title: '征收品目', index: 'zsmp', className: 'text-center', width: '200px' }, { title: '计税依据', index: 'jsyj', className: 'text-center', width: '200px' }, - { title: '税率', index: 'sl', render: 'sl', className: 'text-center', width: '200px' }, - { title: '应纳税额', index: 'ynse', className: 'text-center', width: '180px' }, - { title: '减免税额', index: 'jmse', className: 'text-center', width: '180px' }, - { title: '已缴纳税额', index: 'yjnse', className: 'text-center', width: '180px' }, - { title: '应代征税额', index: 'dzse', className: 'text-center', width: '180px' }, - { title: '已代征税额', index: 'ydzse', className: 'text-center', width: '150px' }, - { title: '申报日期', render: 'sbrq', className: 'text-center', width: '150px' }, + { + title: '税率', + index: 'sl', + render: 'sl', + className: 'text-center', + width: '200px', + format: item => `${item.sl ? ((item.sl as number) * 100).toFixed(2) : 0}%` + }, + { + title: '应纳税额', + index: 'ynse', + className: 'text-center', + width: '180px', + type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ynse }) } + }, + { title: '减免税额', index: 'jmse', className: 'text-center', width: '180px' , type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.jmse }) } }, + { title: '已缴纳税额', index: 'yjnse', className: 'text-center', width: '180px', type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.yjnse }) } }, + { title: '应代征税额', index: 'dzse', className: 'text-center', width: '180px', type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.dzse }) } }, + { title: '已代征税额', index: 'ydzse', className: 'text-center', width: '150px', type: 'widget', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.ydzse }) } }, + { title: '申报日期', render: 'sbrq', className: 'text-center', width: '150px' } ]; } /** - *撤销 + *更正 * @param record 记录实例 */ recall() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要撤回的数据'); + 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(); - } - }); - } - }); + // 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 记录实例 */ - uploadSetting() { + uploadSetting() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要更新的数据！'); + this.openWainingModal('请选择需要修改的数据！'); return; } - this.isVisible = true - + // this.isVisible = true } /** *撤销 @@ -328,7 +348,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { } selectChange(item: any) { - this.selectedIndex = item?.representationsStatus || ''; + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(1); }); @@ -370,7 +390,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { */ upload() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); + this.openWainingModal('请选择需要申报的数据'); return; } // this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { @@ -385,9 +405,9 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { * * @param params 更新数据 */ - resetData() { + resetData() { if (this.selectedRows.length === 0) { - this.openWainingModal('请选择需要上传的数据'); + this.openWainingModal('请选择需要更新的数据'); return; } let params: any[] = []; @@ -399,7 +419,7 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { this.service.msgSrv.success('更新成功'); this.st.load(1); } - }) + }); } /** @@ -447,10 +467,8 @@ export class TaxManagementIndividualDeclareComponent implements OnInit { nzContent: content }); } - handleOK() { - - } + handleOK() {} handleCancel() { - this.isVisible = false; + this.isVisible = false; } } 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 c2ed91f8..c577b27c 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 @@ -17,8 +17,7 @@
- + @@ -106,14 +106,14 @@ - {{ item.billLType }}: {{ item.vatmoney |currency }} + {{ item.billLTypeLabel }}: {{ item.vatmoney |currency }} - + vatmoney - + diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index ca1c11da..97ab5369 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -278,17 +278,17 @@ export class InvoiceDetailComponent implements OnInit { private initInvoiceST(): STColumn[] { return [ - { title: '服务名称', render: 'vatname', width: 350 }, + { title: '服务名称', render: 'vatnameLabel', width: 350 }, { title: '规格型号', render: 'vatmodel' }, { title: '单位', render: 'vatunit', width: 100 }, { title: '数量', render: 'vatqty', width: 140, className: 'text-right' }, { title: '金额', - index: 'vatnotax', + index: 'vattax', width: 140, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } }, { title: '税率', @@ -299,11 +299,11 @@ export class InvoiceDetailComponent implements OnInit { }, { title: '税额', - index: 'vattax', + index: 'vatnotax', width: 140, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } } ]; } 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 6c411bc0..2a64cece 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 @@ -37,13 +37,16 @@ export class RequestedInvoiceModalComponent { * @returns */ removeOrder(item: any[]) { - console.log(item); + if (this.st1._data?.length <= 1) { + this.service.msgSrv.warning('开票申请记录不能少于一个订单'); + return; + } this.nzModalService.warning({ nzTitle: '确定从当前批次中移除所选订单？', nzContent: '移除后相关订单可以重新提交开票申请', nzOnOk: () => { - const ids = item.map(order => order.billHId); - this.service.request(this.service.$api_remove_bill, { billHIds: ids }).subscribe(res => { + const ids = item.map(order => order.billHCode); + this.service.request(this.service.$api_remove_bill, { billHcodes: ids }).subscribe(res => { if (res) { this.service.msgSrv.success('移除成功'); this.modal.destroy(true); @@ -107,7 +110,8 @@ export class RequestedInvoiceModalComponent { buttons: [ { text: '移除', - click: (item: any) => this.removeOrder([item]) + click: (item: any) => this.removeOrder([item]), + iif: _ => this.st1._data?.length > 1 } ] } diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index df5dd9d9..657091e2 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -25,7 +25,8 @@ export class TicketService extends ShipperBaseService { $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp'; // 删除开票申请订单明细 // $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch'; - $api_remove_bill = '/api/fcc/ficoVatappH/remove'; + // $api_remove_bill = '/api/fcc/ficoVatappH/remove'; + $api_remove_bill = '/api/fcc/ficoVatappBill/removeVatappBill'; // 运营端单个/批量驳回 $api_reject_invoice = '/api/fcc/ficoVatappH/rejectInvoiceApple'; // 运营端修改开票地址 diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html index d4ac94de..393c74d6 100644 --- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html +++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html @@ -1,7 +1,7 @@ - - + + \ No newline at end of file