From 6338d9bb6fc58cf31bf083fb091e45e5bc153959 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 12 May 2022 14:14:13 +0800 Subject: [PATCH] fix bug --- .../recorded-detail.component.html | 14 ++++-- .../recorded-detail.component.ts | 47 +++++++++++++++---- .../services/account-managemant.service.ts | 2 + .../rebate-table/rebate-table.component.html | 6 +-- 4 files changed, 52 insertions(+), 17 deletions(-) diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html index 19b2e485..86530656 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-28 20:27:07 * @LastEditors : Shiming - * @LastEditTime : 2022-05-12 13:45:07 + * @LastEditTime : 2022-05-12 13:59:31 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\account-management\\components\\recorded-detail\\recorded-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -123,19 +123,23 @@ - +
{{ changeRecord?.ltdName }}
{{ changeRecord?.waitRecordedAmount | currency }}
-
+
-
-
- +
+
+
-
+ 元
+ + + + diff --git a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts index 94dd8252..71d387ee 100644 --- a/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.ts @@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema, Widget } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; +import { NzModalService } from 'ng-zorro-antd/modal'; import { AccountManagemantService } from '../../services/account-managemant.service'; @Component({ @@ -45,8 +46,8 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { addd = false; billDetailList = []; roleId = ''; - demoValue: number = 0; - constructor(public service: AccountManagemantService, public router: Router, public ar: ActivatedRoute) { + changeAmount: number = 0; + constructor(public service: AccountManagemantService, public router: Router, public ar: ActivatedRoute, private nzModalService: NzModalService,) { this.roleId = this.ar.snapshot.params.id; } @@ -167,7 +168,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { } } }, - required: ['phone', 'remark'], + required: ['smsVerifyCode', 'remark'], }; this.uiView = { '*': { @@ -251,15 +252,43 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { window.history.go(-1); } deletes(value: number) { - console.log(value); - console.log(this.demoValue); - this.demoValue -= 1 this.addd = false } add(value: number) { this.addd = true - this.demoValue += 1 - console.log(value); - console.log(this.demoValue); + } + handleOK() { + console.log(this.sfView.value); + + if(!this.sfView.value?.remark || !this.changeAmount) { + this.service.msgSrv.error('请填写必填项！') + return + } + console.log(this.addd); + + let params:any = { + remark: this.sfView.value?.remark, + partnerId: this.roleId , + ltdId: this.changeRecord.ltdId + } + if(!this.addd) { + params.changeAmount = -this.changeAmount + } else { + params.changeAmount = this.changeAmount + } + console.log(params); + this.nzModalService.warning({ + nzTitle: `确定调整“${params.changeAmount > 0 ? '+' + params.changeAmount : params.changeAmount}元”的待入账金额吗？`, + nzOnOk: () => { + this.service.request(this.service.$api_get_saveIncomeChange, params).subscribe((res) => { + if(res) { + console.log(res); + this.service.msgSrv.success('修改成功！') + this.changeAccount = false; + } + }) + } + }); + } } diff --git a/src/app/routes/partner/account-management/services/account-managemant.service.ts b/src/app/routes/partner/account-management/services/account-managemant.service.ts index d78db1bd..848cbba3 100644 --- a/src/app/routes/partner/account-management/services/account-managemant.service.ts +++ b/src/app/routes/partner/account-management/services/account-managemant.service.ts @@ -25,6 +25,8 @@ export class AccountManagemantService extends ShipperBaseService { $api_get_bill_detail = `/api/bpc/partnerIncomeDetail/findPartnerWaitIncomeByOperator`; // 查看账单明细 $api_get_invoice_summary = `/api/bpc/partnerInvoiceEntry/oprationEntrySummary`; // 入账明细汇总 $api_get_invoice_detail_page = `/api/bpc/partnerInvoiceEntry/oprationEntryDetail`; // 待入账明细列表 + $api_get_getPartnerLitAmountSummary = `/api/bpc/partnerInvoiceEntry/getPartnerLitAmountSummary`; // 查询合伙货运人相关金额 + $api_get_saveIncomeChange = `/api/bpc/partnerIncomeChange/saveIncomeChange`; // 调整金额 constructor(public injector: Injector) { super(injector) diff --git a/src/app/shared/components/rebate-table/rebate-table.component.html b/src/app/shared/components/rebate-table/rebate-table.component.html index 2a405050..1028f355 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.html +++ b/src/app/shared/components/rebate-table/rebate-table.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-25 20:18:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 14:09:04 + * @LastEditTime : 2022-05-12 14:10:25 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -20,8 +20,8 @@ 序号 合伙人等级 - 初始业务量（万/月） - 到达业务量（万/月） + 初始业务量 + 到达业务量 管理费比例% 操作