diff --git a/proxy.conf.js b/proxy.conf.js index eb92fbd4..2fda5ca7 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 14:01:00 * @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/datatable/components/dataindex/dataindex.component.html b/src/app/routes/datatable/components/dataindex/dataindex.component.html index cdeed077..55bda674 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.html +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.html @@ -25,7 +25,7 @@ - @@ -35,7 +35,7 @@ - @@ -43,13 +43,13 @@
-
- +
+
-
- +
+ @@ -57,16 +57,17 @@
-
- +
+
-
- +
+ + diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.less b/src/app/routes/datatable/components/dataindex/dataindex.component.less index e69de29b..36153e65 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.less +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.less @@ -0,0 +1,9 @@ +.chart_title { + font-size : 16px; + font-weight : 500; + color : #1D2129; + line-height : 24px; + background-clip : text; + -webkit-background-clip: text; + position : absolute; +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/dataindex/dataindex.component.ts b/src/app/routes/datatable/components/dataindex/dataindex.component.ts index 168dc88f..ab6a8528 100644 --- a/src/app/routes/datatable/components/dataindex/dataindex.component.ts +++ b/src/app/routes/datatable/components/dataindex/dataindex.component.ts @@ -82,8 +82,14 @@ export class DatatableDataindexComponent implements OnInit { // 大区业绩完成情况 this.service.request(this.service.$api_getBillAmount).subscribe((res: DataPerformanceTrendVO[]) => { if (res) { - this.regionalPerformanceCompletion = res.map(item => ({ ...item, time: new Date(item.time)?.getTime() })); - this.initRegionalPerformanceChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion); + // this.regionalPerformanceCompletion = res.map(item => ({ ...item, time: new Date(item.time)?.getTime() })); + // this.initRegionalPerformanceChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion); + this.regionalPerformanceCompletion = this.formatBarData(res); + this.initBiaxialChart(this.RegionalPerforman['el'].nativeElement as any, this.regionalPerformanceCompletion, { + y1Title: '业绩量(万)', + y2Title: '业绩完成率', + y3Title: '同期业绩完成率' + }); } }); // 订单类型比例 @@ -97,7 +103,11 @@ export class DatatableDataindexComponent implements OnInit { this.service.request(this.service.$api_get_bill_payment_amount).subscribe(res => { if (res) { this.salesData = this.formatBarData(res); - this.initBiaxialChart(this.SaleProportion['el'].nativeElement as any, this.salesData); + this.initBiaxialChart(this.SaleProportion['el'].nativeElement as any, this.salesData, { + y1Title: '业绩量(万)', + y2Title: '业绩完成率', + y3Title: '同期业绩完成率' + }); } }); } @@ -121,8 +131,8 @@ export class DatatableDataindexComponent implements OnInit { // 新建一个 view 用来单独渲染Annotation const innerView = chart.createView(); chart.coordinate('theta', { - radius: 0.6, - innerRadius: 0.7 + radius: 0.65, + innerRadius: 0.6 }); chart.data(data); @@ -138,17 +148,17 @@ export class DatatableDataindexComponent implements OnInit { // 声明需要进行自定义图例字段： 'item' chart.legend('item', { - position: 'right', // 配置图例显示位置 + position: 'bottom', // 配置图例显示位置 custom: true, // 关键字段，告诉 G2，要使用自定义的图例 items: data.map((obj: any, index: any) => { return { name: obj.item, // 对应 itemName value: obj.percent, // 对应 itemValue marker: { - symbol: 'square', // marker 的形状 + symbol: 'circle', // marker 的形状 style: { r: 5, // marker 图形半径 - fill: chart.getTheme().colors10[index] // marker 颜色，使用默认颜色，同图形对应 + fill: index === 0 ? '#E60012' : '#F09896' // marker 颜色，使用默认颜色，同图形对应 } } // marker 配置 }; @@ -165,7 +175,7 @@ export class DatatableDataindexComponent implements OnInit { .interval() .adjust('stack') .position('percent') - .color('item') + .color('item', ['#E60012', '#F09896']) .style({ fillOpacity: 1, stroke: 'white', @@ -182,6 +192,14 @@ export class DatatableDataindexComponent implements OnInit { }; } } + }) + .label('percent', percent => { + return { + content: data => { + return ` ${percent * 100}%`; + }, + style: { fontSize: 14 } + }; }); innerView @@ -201,7 +219,7 @@ export class DatatableDataindexComponent implements OnInit { content: data[0].count, style: { fontSize: 28, - fill: '#8c8c8c', + fill: '##000', textAlign: 'center' }, offsetY: 20 @@ -253,7 +271,7 @@ export class DatatableDataindexComponent implements OnInit { content: data.count, style: { fontSize: 28, - fill: '#8c8c8c', + fill: '##000', textAlign: 'center' }, offsetY: 20 @@ -271,6 +289,50 @@ export class DatatableDataindexComponent implements OnInit { } } + /** + * 构建面积图 + * @param el + */ + private initAreaMap(el: HTMLElement, datas: any[]): void { + const chart = new Chart({ + container: el, + autoFit: true, + height: 500 + }); + chart.data(datas); + chart.scale('Data', { + range: [0, 1], + tickCount: 10, + type: 'timeCat' + }); + chart.scale('sales', { + nice: true + }); + chart.axis('Data', false); + chart.axis('sales', false); + chart.tooltip({ + showCrosshairs: true + }); + + // chart.annotation().dataMarker({ + // position: ['2014-01', 1750], + // top: true, + // text: { + // content: '因政策调整导致销量下滑', + // style: { + // fontSize: 13 + // } + // }, + // line: { + // length: 30 + // } + // }); + + chart.line().position('Data*sales'); + chart.area().position('Data*sales'); + chart.render(); + } + /** * 构建大区业绩完成情况柱折双轴图 * @param el @@ -308,6 +370,7 @@ export class DatatableDataindexComponent implements OnInit { // 声明需要进行自定义图例字段： 'item' chart.legend({ + title: { text: '1111', spacing: 11 }, offsetY: 10, position: 'bottom', // 配置图例显示位置 custom: true, // 关键字段，告诉 G2，要使用自定义的图例 @@ -333,7 +396,11 @@ export class DatatableDataindexComponent implements OnInit { * @param el * @param data */ - private initBiaxialChart(el: HTMLElement, data: any[]) { + private initBiaxialChart( + el: HTMLElement, + data: any[], + { y1Title, y2Title, y3Title }: { y1Title: string; y2Title: string; y3Title: string } + ) { const chart = new Chart({ container: el, autoFit: true, @@ -342,45 +409,47 @@ export class DatatableDataindexComponent implements OnInit { chart.data(data); // 设置坐标轴 chart.scale({ - pre: { alias: '同期业绩完成率', min: 0, max: 1, formatter: val => val * 100 + '%' }, - pre2: { alias: '业绩完成率', min: 0, max: 1, formatter: val => val * 100 + '%' }, - quantity: { alias: '业绩量 (万)', min: 0, max: 1000000 } + y1: { alias: y1Title, min: 0, max: 1000000 }, + y2: { alias: y2Title, min: 0, max: 1, formatter: val => (val * 100).toFixed(0) + '%' }, + y3: { alias: y3Title, min: 0, max: 1, formatter: val => (val * 100).toFixed(0) + '%' } }); // 设置 chart.legend({ custom: true, + position: 'top-right', + padding: [10, 0, 40, 0], items: [ - { value: 'quantity', name: '业绩量 (万)', marker: { symbol: 'hyphen', style: { stroke: '#3182bd', r: 15, lineWidth: 5 } } }, - { value: 'pre2', name: '业绩完成率', marker: { symbol: 'hyphen', style: { stroke: '#fdae6b', r: 15, lineWidth: 5 } } }, - { value: 'pre', name: '同期业绩完成率', marker: { symbol: 'hyphen', style: { stroke: '#ff4d4f', r: 15, lineWidth: 5 } } } + { value: 'y1', name: y1Title, marker: { symbol: 'circle', style: { fill: '#E60012', r: 5, fontSize: 13 } } }, + { value: 'y3', name: y3Title, marker: { symbol: 'circle', style: { fill: '#6CBFFF', r: 5, fontSize: 13 } } }, + { value: 'y2', name: y2Title, marker: { symbol: 'circle', style: { fill: '#50D4AB', r: 5, fontSize: 13 } } } ] }); - chart.axis('pre', { + chart.axis('y2', { grid: null, title: null, label: { - formatter: val => +val * 100 + '%' + formatter: val => val } }); - chart.axis('pre2', false); + chart.axis('y3', false); chart.tooltip({ shared: true }); - chart.interval().position('time*quantity').label('quantity').color('#3182bd'); + chart.interval().position('x*y1').color('#E60012'); chart .line() - .position('time*pre') - .label('pre', val => ({ content: (val * 100).toFixed(0) + '%' })) - .color('#ff4d4f') + .position('x*y2') + // .label('pre', val => ({ content: (val * 100).toFixed(0) + '%' })) + .color('#6CBFFF') .size(3); - chart.point().position('time*pre').color('#ff4d4f').size(3).shape('circle'); + chart.point().position('x*y2').color('#6CBFFF').size(3).shape('circle'); chart .line() - .position('time*pre2') - .label('pre2', val => ({ content: (val * 100).toFixed(0) + '%' })) - .color('#fdae6b') + .position('x*y3') + // .label('pre2', val => ({ content: (val * 100).toFixed(0) + '%' })) + .color('#50D4AB') .size(3); - chart.point().position('time*pre2').color('#fdae6b').size(3).shape('circle'); + chart.point().position('x*y3').color('#50D4AB').size(3).shape('circle'); chart.interaction('active-region'); chart.removeInteraction('legend-filter'); // 自定义图例，移除默认的分类图例筛选交互 @@ -417,11 +486,10 @@ export class DatatableDataindexComponent implements OnInit { private formatBarData(data: DataPerformanceTrendVO[]): any[] { return data.map(item => ({ - time: item.time, - quantity: item.quantity, - color: undefined, - pre: Math.floor(Math.random() * 100) / 100, - pre2: Math.floor(Math.random() * 100) / 100 + x: item.time, + y1: item.quantity, + y2: Math.floor(Math.random() * 100) / 100, + y3: Math.floor(Math.random() * 100) / 100 })); } diff --git a/src/app/routes/financial-management/components/bank-card-management/add/add.component.html b/src/app/routes/financial-management/components/bank-card-management/add/add.component.html new file mode 100644 index 00000000..c222d73e --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/add/add.component.html @@ -0,0 +1,22 @@ + +
+
+ + + +
+ +
+ + +
+ +
+ +
+ +
+
+ +
diff --git a/src/app/routes/financial-management/components/bank-card-management/add/add.component.less b/src/app/routes/financial-management/components/bank-card-management/add/add.component.less new file mode 100644 index 00000000..6403b5d6 --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/add/add.component.less @@ -0,0 +1,8 @@ +:host { + + .setp, + .content { + width: 40%; + margin: 50px auto; + } +} diff --git a/src/app/routes/financial-management/components/bank-card-management/add/add.component.spec.ts b/src/app/routes/financial-management/components/bank-card-management/add/add.component.spec.ts new file mode 100644 index 00000000..38b2a9a2 --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/add/add.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { CwcBankCardManagementAddComponent } from './add.component'; + +describe('CwcBankCardManagementAddComponent', () => { + let component: CwcBankCardManagementAddComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CwcBankCardManagementAddComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CwcBankCardManagementAddComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/financial-management/components/bank-card-management/add/add.component.ts b/src/app/routes/financial-management/components/bank-card-management/add/add.component.ts new file mode 100644 index 00000000..93d76783 --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/add/add.component.ts @@ -0,0 +1,93 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { cacheConf } from '@conf/cache.conf'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { EACacheService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { BankCardManagementService } from '../../../services/bank-card-management.service'; + +interface EmitType { + success: boolean, + current: number, + value: object +}; +@Component({ + selector: 'app-cwc-bank-card-management-add', + templateUrl: './add.component.html', + styleUrls: ['./add.component.less'] +}) +export class CwcBankCardManagementAddComponent implements OnInit { + schema: SFSchema = {}; + ui: SFUISchema = {}; + record: any; + i: any; + userInfo: any = {}; + bankBranchName = ''; + bankArea = ''; + bankName = ''; + loading = false; + current = 0; // 当前节点 + verifyInfo = {}; + steps: Array = [ + { + id: 1, + title: `绑定银行卡`, + async: false, + percentage: null + }, + { + id: 2, + title: `小额鉴权`, + async: false, + percentage: null + }, + { + id: 3, + title: `完成`, + async: false, + percentage: null + }, + ]; + + @ViewChild('sf', { static: false }) sf!: SFComponent; + networkTransporterId = ''; + bankSfInfo: any = {} // 银行卡信息; + smallAuthentication: any = {}; //小额鉴权信息 + + branchBanks: any[] = []; + constructor(public service: BankCardManagementService, + public modalService: NzModalService, public router: Router, + public ar: ActivatedRoute, public eaCacheSrv: EACacheService) { + this.networkTransporterId = this.eaCacheSrv.get(cacheConf.env)?.networkTransporterId + } + + + ngOnInit() { + + } + + trackById(_: number, item: any): number { + return item.id; + } + + + + formatCard() { + return /[1-9]\d{12,18}/; + } + + changeCurrent(e: EmitType) { + if (e && e?.success) { + this.current = e?.current; + if (this.current === 1) { + this.bankSfInfo = e?.value; + } + } + } + toBandCardPage() { + this.router.navigate(['../index'], { + relativeTo: this.ar + }); + } + +} diff --git a/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.html b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.html new file mode 100644 index 00000000..d0ea577d --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.html @@ -0,0 +1,8 @@ +
+ + +
+ +
+
diff --git a/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.spec.ts b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.spec.ts new file mode 100644 index 00000000..ab7fafb2 --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { CwcBankCardManagementBindComponent } from './bind.component'; + +describe('CwcBankCardManagementBindComponent', () => { + let component: CwcBankCardManagementBindComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CwcBankCardManagementBindComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CwcBankCardManagementBindComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..cea027a7 --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/bind/bind.component.ts @@ -0,0 +1,141 @@ +import { THIS_EXPR } from '@angular/compiler/src/output/output_ast'; +import { Component, EventEmitter, OnInit, Output, ViewChild } from '@angular/core'; +import { cacheConf } from '@conf/cache.conf'; +import { SFComponent, SFSchema, SFStringWidgetSchema, SFUISchema } from '@delon/form'; +import { EACacheService } from '@shared'; +import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; +import { BankCardManagementService } from '../../../services/bank-card-management.service'; + +interface EmitType { + success: boolean, + current: number, + value: object +}; + +@Component({ + selector: 'app-cwc-bank-card-management-bind', + templateUrl: './bind.component.html', +}) + +export class CwcBankCardManagementBindComponent implements OnInit { + schema: SFSchema = {}; + ui: SFUISchema = {}; + record: any; + i: any; + userInfo: any = {}; + bankBranchName = ''; + bankArea = ''; + bankName = ''; + loading = false; + current = 0; // 当前节点 + + @Output() toNextStep = new EventEmitter(); + + @ViewChild('sf', { static: false }) sf!: SFComponent; + enterpriseName = ''; + + branchBanks: any[] = []; + constructor(public service: BankCardManagementService, public modalService: NzModalService, public eaCacheSrv: EACacheService, public modalRef: NzModalRef) { + } + + + ngOnInit() { + this.initSF(); + } + + initSF() { + this.schema = { + properties: { + bankAccountName: { + type: 'string', + title: '企业名称', + default: this.i?.ltdName, + ui: { + widget: 'text' + } + }, + bankCardNumber: { + type: 'string', + title: '银行卡号', + maxLength: 30, + ui: { + showRequired: true, + placeholder: '请输入银行卡号', + autocomplete: 'off' + } as SFStringWidgetSchema, + }, + bankName: { + type: 'string', + title: '开户银行', + // readOnly: true, + ui: { + showRequired: true, + autocomplete: 'off', + placeholder: '请输入开户银行', + } as SFStringWidgetSchema, + }, + ltdId: { + type: 'string', + title: '', + default: this.i?.ltdId, + ui: { + widget: 'text', + hidden: true + } + }, + + // bankBranchName: { + // type: 'string', + // title: '开户支行', + // ui: { + // showRequired: true, + // placeholder: '请输入开户支行', + // autocomplete: 'off' + // }, + // }, + // bankBranchCode: { + // type: 'string', + // title: '联行号', + // ui: { + // placeholder: '请输入联行号' + // }, + // }, + mobile: { + type: 'string', + title: '手机号', + maxLength: 11, + format: 'mobile', + ui: { + placeholder: '请输入手机号' + }, + }, + }, + required: ['bankCardNumber', 'mobile', 'bankName'], + }; + this.ui = { + '*': { + spanLabelFixed: 120, + grid: { span: 18 }, + }, + }; + } + trackById(_: number, item: any): number { + return item.id; + } + + submit() { + if (this.sf.valid) { + this.service.request(this.service.$api_bank_card_add, { ...this.sf.value }).subscribe(res => { + if (res) { + this.modalRef.destroy(true); + } + }) + } + } + + + formatCard() { + return /[1-9]\d{12,18}/; + } + +} diff --git a/src/app/routes/financial-management/components/bank-card-management/index/index.component.html b/src/app/routes/financial-management/components/bank-card-management/index/index.component.html new file mode 100644 index 00000000..ccc1e443 --- /dev/null +++ b/src/app/routes/financial-management/components/bank-card-management/index/index.component.html @@ -0,0 +1,33 @@ + + +
+

{{ltdName}}

+
+ + +
+ +
+ + + + +
+ +
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/routes/order-management/modal/audit/voucher-view/voucher-view.component.html b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html index 9133fdfa..dc423d83 100644 --- a/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html +++ b/src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html @@ -4,27 +4,33 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-04-21 14:41:44 + * @LastEditTime : 2022-04-22 11:03:26 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. -->
- - -
-
电子装货单 + + +
+
电子装货单 + +
+
+ + +
电子卸货单 + +
+ +
- - - + + +
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 3bc73604..c8ae7969 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 @@ -575,99 +575,116 @@ export class orderManagementVoucherViewComponent implements OnInit { } openlaod(value: any) { if (value === 1) { - // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 - let time = 10; - setInterval(function () { - time -= 1; - }, 1000); - const modal = this.modalService.success({ - nzTitle: '电子装货单签署中！', - nzContent: ` - 请等待${time}秒后自动关闭 - ` + this.service.request(this.service.$api_getBillTakeGoods, {id:this.datas?.id}).subscribe(res => { + if (res) { + console.log(res); + window.open(res?.contractFilePath) + } }); - if (!this.datas?.loadingElectronicsLadingBillFilePath) { - this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => { - if (res) { - switch (res[0]?.esignFlowStatus) { - case 1: - case '1': - setTimeout(() => { - this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { - if (res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子装货单已生效！'); - this.modal.destroy(true); - } - }); - modal.destroy(); - }, 10000); - return; - case 2: - modal.destroy(); - return; - case '13': - case 13: - this.service.msgSrv.error('签署异常!'); - modal.destroy(); - return; - } - } - }); - } else { - const a = document.createElement('a'); - a.href = this.datas?.loadingElectronicsLadingBillFilePath; - document.body.appendChild(a); - a.click(); //点击下载 - document.body.removeChild(a); //下载完成移除元素 - } } else { - // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 - let time = 10; - setInterval(function () { - time -= 1; - }, 1000); //反复执行函数本身 - const modal = this.modalService.success({ - nzTitle: '电子卸货单签署中！', - nzContent: ` - 请等待${time}秒后自动关闭 - ` + this.service.request(this.service.$api_getBillDischargeGoods, {id:this.datas?.id}).subscribe(res => { + if (res) { + console.log(res); + window.open(res?.contractFilePath) + } }); - if (!this.datas?.unloadingElectronicsLadingBillFilePath) { - this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => { - if (res) { - switch (res[0]?.esignFlowStatus) { - case 1: - case '1': - setTimeout(() => { - this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { - if (res[0]?.esignFlowStatus == '2') { - this.service.msgSrv.success('电子卸货单已生效！'); - this.modal.destroy(true); - } - }); - modal.destroy(); - }, 10000); - - return; - case 2: - modal.destroy(); - - return; - case '13': - case 13: - this.service.msgSrv.error('签署异常!'); - modal.destroy(); - return; - } - } - }); - } else { - const a = document.createElement('a'); - a.href = this.datas?.unloadingElectronicsLadingBillFilePath; - document.body.appendChild(a); - a.click(); //点击下载 - document.body.removeChild(a); //下载完成移除元素 - } - } } + } + // openlaod2(value: any) { + // if (value === 1) { + // // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 + // let time = 10; + // setInterval(function () { + // time -= 1; + // }, 1000); + // const modal = this.modalService.success({ + // nzTitle: '电子装货单签署中！', + // nzContent: ` + // 请等待${time}秒后自动关闭 + // ` + // }); + // if (!this.datas?.loadingElectronicsLadingBillFilePath) { + // this.service.request(this.service.$api_createBillTakeGoods, [this.datas?.id]).subscribe(res => { + // if (res) { + // switch (res[0]?.esignFlowStatus) { + // case 1: + // case '1': + // setTimeout(() => { + // this.service.request(this.service.$api_getBillTakeEsignFile, [this.datas?.id]).subscribe(res => { + // if (res[0]?.esignFlowStatus == '2') { + // this.service.msgSrv.success('电子装货单已生效！'); + // this.modal.destroy(true); + // } + // }); + // modal.destroy(); + // }, 10000); + // return; + // case 2: + // modal.destroy(); + // return; + // case '13': + // case 13: + // this.service.msgSrv.error('签署异常!'); + // modal.destroy(); + // return; + // } + // } + // }); + // } else { + // const a = document.createElement('a'); + // a.href = this.datas?.loadingElectronicsLadingBillFilePath; + // document.body.appendChild(a); + // a.click(); //点击下载 + // document.body.removeChild(a); //下载完成移除元素 + // } + // } else { + // // 逻辑： 先判断电子提货单是否已生成，文件为空则触发签署文件，再查询是否签署成功，成功则退出，刷新页面，再次点击为预览 + // let time = 10; + // setInterval(function () { + // time -= 1; + // }, 1000); //反复执行函数本身 + // const modal = this.modalService.success({ + // nzTitle: '电子卸货单签署中！', + // nzContent: ` + // 请等待${time}秒后自动关闭 + // ` + // }); + // if (!this.datas?.unloadingElectronicsLadingBillFilePath) { + // this.service.request(this.service.$api_createBillDischargeGoods, [this.datas?.id]).subscribe(res => { + // if (res) { + // switch (res[0]?.esignFlowStatus) { + // case 1: + // case '1': + // setTimeout(() => { + // this.service.request(this.service.$api_getBillDischargeEsignFile, [this.datas?.id]).subscribe(res => { + // if (res[0]?.esignFlowStatus == '2') { + // this.service.msgSrv.success('电子卸货单已生效！'); + // this.modal.destroy(true); + // } + // }); + // modal.destroy(); + // }, 10000); + + // return; + // case 2: + // modal.destroy(); + + // return; + // case '13': + // case 13: + // this.service.msgSrv.error('签署异常!'); + // modal.destroy(); + // return; + // } + // } + // }); + // } else { + // const a = document.createElement('a'); + // a.href = this.datas?.unloadingElectronicsLadingBillFilePath; + // document.body.appendChild(a); + // a.click(); //点击下载 + // document.body.removeChild(a); //下载完成移除元素 + // } + // } + // } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 2c7f4a05..3df90939 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-19 15:16:37 + * @LastEditTime : 2022-04-22 10:54:29 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -209,11 +209,14 @@ export class OrderManagementService extends ShipperBaseService { // 查看补充协议 public $api_getSupplementaryAgreement = `/api/sdc/billShipper/getSupplementaryAgreement`; - // 获取电子提货单签章附件 public $api_getBillTakeEsignFile = `/api/sdc/billOperate/getBillTakeEsignFile`; // 获取电子卸货单签章附件 public $api_getBillDischargeEsignFile = `/api/sdc/billOperate/getBillDischargeEsignFile`; + // 预览卸货单 + public $api_getBillDischargeGoods = `/api/sdc/billOperate/getBillDischargeGoods`; + // 预览提货单 + public $api_getBillTakeGoods = `/api/sdc/billOperate/getBillTakeGoods`; // // 生成卸货单 // public $api_createBillDischargeGoods = `/api/sdc/billOperate/createBillDischargeGoods`; 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..87ef9a27 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 @@ -25,7 +25,7 @@ export class PartnerListComponent { @ViewChild('editTemplate', { static: true }) editTemplate: any; - templateId: any; + templateId: any; templates: any[] = []; @ViewChild('editCannel', { static: true }) @@ -73,7 +73,9 @@ export class PartnerListComponent { nzFooter: null }); modal.afterClose.subscribe(res => { - modal.destroy(); + if (res) { + this.st.load(1); + } }); } diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index f6fbcaac..1c2c4d4f 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -1,5 +1,6 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core'; import { SFComponent, SFSchema, SFValue } from '@delon/form'; +import { ModalHelper } from '@delon/theme'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { PartnerListService } from '../../services/partner-list.service'; @@ -15,7 +16,7 @@ export class PartnerAuditModalComponent implements OnInit { info: any; schema!: SFSchema; sourcePage = ''; - constructor(private nzModalService: NzModalService, public service: PartnerListService) {} + constructor(private nzModalService: NzModalService, public service: PartnerListService, private modal: NzModalRef) {} ngOnInit(): void { this.initSF(this.info); @@ -49,7 +50,7 @@ export class PartnerAuditModalComponent implements OnInit { widget: 'radio', hidden: this.info.isPass !== undefined }, - default: true + default: this.info.isPass !== undefined ? this.info.isPass : true }, channelId: { title: '渠道销售', @@ -121,7 +122,7 @@ export class PartnerAuditModalComponent implements OnInit { .subscribe(res => { if (res) { this.service.msgSrv.success('审核成功！'); - this.close(); + this.modal.destroy(1); } }); } diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts index 80a9aa45..0df4d752 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts @@ -142,6 +142,12 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { nzComponentParams: { info: { ...this.detailData, isPass }, sourcePage: '合伙人审核详情' }, nzFooter: null }); + + modal.afterClose.subscribe(res => { + if (res) { + this.initData(); + } + }); } ratify() { @@ -370,7 +376,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { buttons: [ { text: '详情', - click: (item) => this.service.showChangeDetail(item.id) + click: item => this.service.showChangeDetail(item.id) } ] } diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index ab33519c..29052c55 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -130,6 +130,12 @@ export class PersonalPartnerDetailComponent implements OnInit { }, nzFooter: null }); + + modal.afterClose.subscribe(res => { + if (res) { + this.initData(); + } + }); } ratify() { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html index a537892f..5d060bcc 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-28 14:53:52 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 17:03:21 + * @LastEditTime : 2022-04-22 10:30:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add-partnerlist\\add-partnerlist.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -25,6 +25,6 @@ [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false" [scroll]="{ x: '1000' }"> - + diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts index 65ce3f8c..bf422f94 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts @@ -128,7 +128,7 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { // 回复操作 add(item: any) { console.log(item); - this.modals.destroy(item); + this.modals.destroy([item]); } // 批量回复操作 batchReply() { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index 65cd23f9..8a4b1a3f 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,38 +4,44 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 10:47:02 + * @LastEditTime : 2022-04-22 14:29:23 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
- -    + + 固定结算费率配置 -     % + +  % + 业务量和管理费比例配置 -    + + - -    - + + +
+ +
+ 关联合伙人配置 -    - + + + -   添加 + 添加 -    + + 1 2 @@ -52,19 +59,22 @@ 5 -    - + -    + + + +
-
diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 958809db..cf090af2 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 10:53:39 + * @LastEditTime : 2022-04-22 15:01:43 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -26,12 +26,13 @@ import { inRange } from '@delon/util'; export class ParterRebateManageMentAddComponent implements OnInit { @ViewChild('table') table!: any; tabelData: any; + addStatus: boolean = false; configName: string = ''; partnerType: string = ''; remarke: string = ''; accountingRate: Number = 0; priority: string = ''; - partnerPeopleList: any; + partnerPeopleList: any = []; configType = '1'; precision = 2; partnerId :Array =[]; @@ -78,7 +79,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { widget: 'tinymce', loadingTip: 'loading...', config: { - height: 650 + height: 500, } }, // default: data?.agreementContent || '' @@ -87,6 +88,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { }; } ngOnInit() { + this.addStatus =false this.initSF(); } goBack() { @@ -108,22 +110,25 @@ export class ParterRebateManageMentAddComponent implements OnInit { modalRef.afterClose.subscribe((res: any) => { this.partnerId = []; if (res) { - console.log(Array.isArray(res)); - console.log(res); if(Array.isArray(res)) { - this.partnerPeopleList = res; + console.log(res); + console.log(this.partnerPeopleList); + this.partnerPeopleList = this.partnerPeopleList.concat(res); res.forEach((ele: any) => { this.partnerId.push(ele?.id); }) } else { - this.partnerPeopleList = [res]; + console.log(res); + this.partnerPeopleList = this.partnerPeopleList.concat(res); this.partnerId.push(res?.id); } } }); } delete(item: any) { - console.log(item); + this.partnerPeopleList = this.partnerPeopleList.filter((d:any, i: any) => { + return item.id != d.id + }); } save () { const params = { @@ -146,4 +151,10 @@ export class ParterRebateManageMentAddComponent implements OnInit { } }) } + changePartner(value: any) { + console.log(value); + if(value) { + this.addStatus = true + } + } } diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 9c7e7250..33c7f6e6 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-20 17:18:43 - * @LastEditTime : 2022-04-20 16:48:26 + * @LastEditTime : 2022-04-22 14:50:25 * @LastEditors : Shiming * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\services\\system.service.ts @@ -64,7 +64,7 @@ export class SystemService extends BaseService { $api_deletebatch_crmCustomer = '/api/mdc/cuc/crmCustomer/deletebatch'; // 获取某个应用的所有菜单 - $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppIdNoHide'; + $api_getAllFunctionInfoByAppId: string = '/api/mdc/cuc/functionInfo/getAllFunctionInfoByAppId'; // 查询网络货运信息表 $api_networkTransporter_page = '/api/mdc/cuc/networkTransporter/list/page'; diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html index 90e39e1c..fe7bd829 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html @@ -8,42 +8,30 @@