From 9db5f79748be315d82f111e4c7aeffc281f79701 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 21 Apr 2022 17:03:53 +0800 Subject: [PATCH 1/8] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 2 +- .../components/vehicle-detail/vehicle-detail.component.html | 4 ++-- .../modal/audit/voucher-view/voucher-view.component.ts | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 38499ffe..1e7e4c8f 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -230,7 +230,7 @@
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
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 66d633a1..77591f60 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-21 15:32:43 + * @LastEditTime : 2022-04-21 17:03:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -229,7 +229,7 @@
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
diff --git a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts index 0538f015..3bc73604 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts @@ -579,7 +579,7 @@ export class orderManagementVoucherViewComponent implements OnInit { let time = 10; setInterval(function () { time -= 1; - }, 1000); //反复执行函数本身 + }, 1000); const modal = this.modalService.success({ nzTitle: '电子装货单签署中！', nzContent: ` From 1d2a8fd1348f44472d8ca4b6bf058f671a265d11 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 21 Apr 2022 17:09:57 +0800 Subject: [PATCH 2/8] fix bug --- .../components/vehicle/vehicle.component.html | 4 ++-- .../components/vehicle/vehicle.component.less | 24 ++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html index 709cbfcd..9561f324 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.html +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.html @@ -1,7 +1,7 @@ + + + + + diff --git a/src/app/routes/financial-management/components/bank-card-management/index/index.component.less b/src/app/routes/financial-management/components/bank-card-management/index/index.component.less new file mode 100644 index 00000000..f47b31c2 --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/index/index.component.less @@ -0,0 +1,78 @@ +:host { + ::ng-deep { + .ant-card-actions { + border-color: #ccc; + } + + .single-card { + .ant-card-body { + padding: 24px 12px; + } + } + } + + .member-rights-container { + display: flex; + flex-wrap: wrap; + + .single-card { + position: relative; + width: 320px; + height: 150px; + margin-right: 20px; + border-color: #ccc; + overflow: hidden; + + .default-flag { + position: absolute; + top: 20px; + right: 80px; + padding: 0 5px; + color: #fff; + background-color: #52C41A; + border-radius: 1px; + + } + + .bank-account-content { + display: flex; + + .bank-card-right { + flex: 1; + overflow: hidden; + } + + .bank-card-title { + display: flex; + + .bank-card-name { + display: inline-block; + flex: 1; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + } + + .bank-account-txt { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + } + + .del-btn { + padding-top: 0; + padding-bottom: 0; + border-radius: 5px; + height: 30px; + } + } + } + + .bankcard-content { + height: 100%; + background-color: #fff; + } + +} diff --git a/src/app/routes/financial-management/components/bank-card-management/index/index.component.spec.ts b/src/app/routes/financial-management/components/bank-card-management/index/index.component.spec.ts new file mode 100644 index 00000000..ab26d1cc --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/index/index.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { CwcBankCardManagementIndexComponent } from './index.component'; + +describe('CwcBankCardManagementIndexComponent', () => { + let component: CwcBankCardManagementIndexComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CwcBankCardManagementIndexComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CwcBankCardManagementIndexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/financial-management/components/bank-card-management/index/index.component.ts b/src/app/routes/financial-management/components/bank-card-management/index/index.component.ts new file mode 100644 index 00000000..d9883f9b --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/index/index.component.ts @@ -0,0 +1,92 @@ +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { BankCardManagementService } from '../../../services/bank-card-management.service'; +import { CwcBankCardManagementAddComponent } from '../add/add.component'; +import { CwcBankCardManagementBindComponent } from '../bind/bind.component'; + +@Component({ + selector: 'app-cwc-bank-card-management-index', + templateUrl: './index.component.html', + styleUrls: ['./index.component.less'] +}) +export class CwcBankCardManagementIndexComponent implements OnInit { + list: any = []; + ltdId = ''; + ltdName = ''; + constructor(public modal: NzModalService, public service: BankCardManagementService, public router: Router, public ar: ActivatedRoute) { } + + ngOnInit() { + this.ltdId = this.ar.snapshot.queryParams?.ltdId; + this.ltdName = this.ar.snapshot.queryParams?.ltdName; + this.getBankList(this.ltdId); + } + + getBankList(roleId = '') { + this.service.request(this.service.$api_bank_card_list, { roleId, accountType: '3' }).subscribe((res) => { + if (res) { + this.list = res; + } + }); + } + + add() { + const modalRef = this.modal.create({ + nzTitle: '添加银行卡', + nzContent: CwcBankCardManagementBindComponent, + nzWidth: '40%', + nzFooter: null, + nzComponentParams: { + i: { + ltdId: this.ltdId, + ltdName: this?.ltdName + } + } + }); + modalRef.afterOpen.subscribe(() => { }); + modalRef.afterClose.subscribe((result) => { + if (result === true) { + this.getBankList(this.ltdId); + } + }); + } + + edit(record: any) { + const modalRef = this.modal.create({ + nzTitle: '编辑', + nzWidth: '700', + nzContent: CwcBankCardManagementAddComponent, + nzComponentParams: { + record, + }, + nzFooter: null, + nzMaskClosable: false, + }); + modalRef.afterOpen.subscribe(() => { }); + modalRef.afterClose.subscribe((result) => { + if (result) { + this.getBankList(); + } + }); + } + + + // 删除 + del(record: any) { + this.modal.confirm({ + nzTitle: '确认删除该银行账户吗？', + nzContent: `

银行卡号: ${record.bankCardNumber}

`, + nzOnOk: () => + this.service.request(this.service.$api_bank_card_del, { id: record.id, ltdId: this.ltdId }).subscribe((res) => { + if (res === true) { + this.service.msgSrv.success('数据删除成功！'); + this.getBankList(); + } + }), + }); + } + + formatBankCard(value: any) { + return value.replace(/[^\d]/g, '').replace(/(\d{4})(?=\d)/g, '$1 '); + } +} diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.html b/src/app/routes/financial-management/components/platform-account/platform-account.component.html index e1928689..ccbbcf20 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.html +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.html @@ -2,63 +2,62 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + -
-
- -
-
- - - -
+
+
+
+
+ + + +
+
- - -
- 合计 项，收入 - ，支出 - -
+ + +
+ 合计 项，收入 + ，支出 + +
- \ No newline at end of file + diff --git a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts index f6d7c52d..f54f0046 100644 --- a/src/app/routes/financial-management/components/platform-account/platform-account.component.ts +++ b/src/app/routes/financial-management/components/platform-account/platform-account.component.ts @@ -4,6 +4,7 @@ import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form'; import { NzModalService } from 'ng-zorro-antd/modal'; import { FreightAccountService } from '../../services/freight-account.service'; +import { CwcBankCardManagementBindComponent } from '../bank-card-management/bind/bind.component'; @Component({ selector: 'app-platform-account', @@ -21,7 +22,7 @@ export class PlatformAccountComponent implements OnInit { info: any = {}; static: any = {}; - constructor(public service: FreightAccountService, private router: Router, private nzModalService: NzModalService) {} + constructor(public service: FreightAccountService, private router: Router, private nzModalService: NzModalService, public modal: NzModalService) { } ngOnInit(): void { this.loadInfo(); @@ -179,22 +180,63 @@ export class PlatformAccountComponent implements OnInit { }, { title: '操作', - width: 100, - className: 'text-center', + width: 120, + className: 'text-center block-td', fixed: 'right', buttons: [ { - text: '查看明细', + text: '查看明细 ', click: item => this.router.navigate(['/financial-management/platform-account/detail/' + item.id], { queryParams: { ltdId: item.ltdId, bankType: item.bankType, ltdName: `${item.ltdName}(${item.bankTypeLabel})` } }) - } + }, + { + text: '绑定银行卡', + click: item => this.bindBankcard(item) + }, + { + text: '查看银行卡', + click: item => this.viewBankcard(item) + }, ] } ]; } + + /** + * 绑定银行卡 + */ + bindBankcard(item: any) { + const modalRef = this.modal.create({ + nzTitle: '绑定银行卡', + nzContent: CwcBankCardManagementBindComponent, + nzWidth: '40%', + nzFooter: null, + nzComponentParams: { + i: item + } + }); + modalRef.afterOpen.subscribe(() => { }); + modalRef.afterClose.subscribe((result) => { + if (result) this.st.reload(); + + }); + } + + /** + * 查看银行卡 + */ + viewBankcard(item: any) { + this.router.navigate(['/financial-management/bank-card-management/index'], { + queryParams: { + ltdId: item?.ltdId, + ltdName: item?.ltdName + } + }); + } + exportList() { - this.service.exportStart( { ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,); + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_get_exportPlatformAccountBalanceByOperator,); } } diff --git a/src/app/routes/financial-management/financial-managemen-routing.module.ts b/src/app/routes/financial-management/financial-managemen-routing.module.ts index cd54afa6..bcea97b3 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -33,6 +33,7 @@ import { AdvanceCollectionComponent } from './components/advance-collection/adva import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component'; import { RefundRecordComponent } from './components/refund-record/refund-record.component'; import { AbnormalGoldDetailComponent } from './components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component'; +import { CwcBankCardManagementIndexComponent } from './components/bank-card-management/index/index.component'; const routes: Routes = [ { path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } }, @@ -68,11 +69,13 @@ const routes: Routes = [ { path: 'receivable-order', component: ReceivableOrderComponent }, { path: 'receivable-order/detail/:id', component: ReceivableOrderDetailComponent }, { path: 'payable-order', component: PayableOrderComponent }, - { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent } + { path: 'payable-order/detail/:id', component: PayableOrderDetailComponent }, + { path: 'bank-card-management/index', component: CwcBankCardManagementIndexComponent }, + ]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class FinancialManagementRoutingModule {} +export class FinancialManagementRoutingModule { } diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts index c17c335d..63b99337 100644 --- a/src/app/routes/financial-management/financial-management.module.ts +++ b/src/app/routes/financial-management/financial-management.module.ts @@ -36,6 +36,9 @@ import { AdvanceCollectionComponent } from './components/advance-collection/adva import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component'; import { RefundRecordComponent } from './components/refund-record/refund-record.component'; import { AbnormalGoldDetailComponent } from './components/abnormal-gold/abnormal-gold-detail/abnormal-gold-detail.component'; +import { CwcBankCardManagementIndexComponent } from './components/bank-card-management/index/index.component'; +import { CwcBankCardManagementBindComponent } from './components/bank-card-management/bind/bind.component'; +import { CwcBankCardManagementAddComponent } from './components/bank-card-management/add/add.component'; const ROUTESCOMPONENTS = [ FreightAccountComponent, @@ -68,7 +71,10 @@ const ROUTESCOMPONENTS = [ AdvanceCollectionComponent, AdvanceCollectionDetailComponent, RefundRecordComponent, - AbnormalGoldDetailComponent + AbnormalGoldDetailComponent, + CwcBankCardManagementIndexComponent, + CwcBankCardManagementBindComponent, + CwcBankCardManagementAddComponent ]; const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, ClearingModalComponent]; @@ -77,4 +83,4 @@ const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailCo declarations: [...ROUTESCOMPONENTS, ...NOTROUTECOMPONENTS], imports: [CommonModule, FinancialManagementRoutingModule, SharedModule] }) -export class FinancialManagementModule {} +export class FinancialManagementModule { } diff --git a/src/app/routes/financial-management/services/bank-card-management.service.ts b/src/app/routes/financial-management/services/bank-card-management.service.ts new file mode 100644 index 00000000..65db517b --- /dev/null +++ b/src/app/routes/financial-management/services/bank-card-management.service.ts @@ -0,0 +1,14 @@ +import { Injectable, Injector } from '@angular/core'; +import { BaseService } from '@shared'; + +@Injectable({ + providedIn: 'root' +}) +export class BankCardManagementService extends BaseService { + $api_bank_card_list = `/api/fcc/bankInfoOBC/list/myBankInfo`; // 获取银行卡列表 + $api_bank_card_del = `/api/fcc/bankInfoOBC/delete`; // 删除银行卡 + $api_bank_card_add = `/api/fcc/bankInfoOBC/save`;//新增银行卡 + constructor(public injector: Injector) { + super(injector); + } +} diff --git a/src/app/shared/shared-zorro.module.ts b/src/app/shared/shared-zorro.module.ts index 421ebe51..602b8c26 100644 --- a/src/app/shared/shared-zorro.module.ts +++ b/src/app/shared/shared-zorro.module.ts @@ -49,6 +49,7 @@ import { NzSwitchModule } from 'ng-zorro-antd/switch'; import { NzImageModule } from 'ng-zorro-antd/image'; import { NzDrawerModule } from 'ng-zorro-antd/drawer'; import { NzTreeSelectModule } from 'ng-zorro-antd/tree-select'; +import { NzAvatarModule } from 'ng-zorro-antd/avatar'; export const SHARED_ZORRO_MODULES = [ NzButtonModule, @@ -92,5 +93,6 @@ export const SHARED_ZORRO_MODULES = [ NzSwitchModule, NzImageModule, NzDrawerModule, - NzTreeSelectModule + NzTreeSelectModule, + NzAvatarModule ]; diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 85608a75..62c28082 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -322,6 +322,10 @@ { "text": "交易流水", "link": "/financial-management/transaction-flow" + }, + { + "text": "银行卡管理", + "link": "/financial-management/bank-card-management/index" } ] }, @@ -680,14 +684,13 @@ "text": "开票数据报表", "link": "/datatable/invoicetable" } - ] + ] }, { "text": "税务管理", "icon": "iconfont icon-hetong-copy", "group": true, - "children": [ - { + "children": [{ "text": "订单上报", "link": "/tax/orderReport" }, @@ -707,7 +710,7 @@ "text": "发票上传", "link": "/tax/invoiceReport" } - ] + ] } ] }] From 1df272319c52672bcb8ad9be3b90328608cdfc2a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 22 Apr 2022 09:53:24 +0800 Subject: [PATCH 6/8] fix bug --- .../partner-list/components/index/partner-list.component.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 93698e61..b5aca504 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -463,18 +463,15 @@ export class PartnerListComponent { }, { text: '修改返佣模板', - iif: item => item.id, click: item => this.editTemplateAction(item) }, { text: '修改渠道销售', - iif: item => item.id, click: item => this.editCannelAction(item) }, { text: '重发CRM流程', click: item => item.id && this.reSendCRM(item), - iif: item => item.crmStatus === 10 } ] } From 08f1f7b527efdd276db0fc36a63c4613dc192f9d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 22 Apr 2022 10:23:21 +0800 Subject: [PATCH 7/8] fix bug --- proxy.conf.js | 4 ++-- .../partner-list/components/index/partner-list.component.ts | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index eb92fbd4..c2e27015 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-20 14:18:40 + * @LastEditTime : 2022-04-22 10:05:01 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index b5aca504..93698e61 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -463,15 +463,18 @@ export class PartnerListComponent { }, { text: '修改返佣模板', + iif: item => item.id, click: item => this.editTemplateAction(item) }, { text: '修改渠道销售', + iif: item => item.id, click: item => this.editCannelAction(item) }, { text: '重发CRM流程', click: item => item.id && this.reSendCRM(item), + iif: item => item.crmStatus === 10 } ] } From b67401d311f8f2fa64855a2386843d6c802ab361 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Fri, 22 Apr 2022 10:25:57 +0800 Subject: [PATCH 8/8] fix bug --- .../components/bank-card-management/bind/bind.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts index 512d5dc1..cea027a7 100644 --- a/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts +++ b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts @@ -57,7 +57,7 @@ export class CwcBankCardManagementBindComponent implements OnInit { bankCardNumber: { type: 'string', title: '银行卡号', - maxLength: 21, + maxLength: 30, ui: { showRequired: true, placeholder: '请输入银行卡号',