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 bc545f49..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-11 20:46:30 + * @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.less b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.less new file mode 100644 index 00000000..e19df03e --- /dev/null +++ b/src/app/routes/partner/account-management/components/recorded-detail/recorded-detail.component.less @@ -0,0 +1,6 @@ +:host::ng-deep { + + .file-col { + background-color: red; + } +} \ No newline at end of file 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 f159d556..dec67fe0 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,10 +3,12 @@ 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({ selector: 'app-partner-account-management-recorded-detail', + styleUrls: ['./recorded-detail.component.less'], templateUrl: './recorded-detail.component.html' }) export class PartnerAccountManagementRecordedDetailComponent implements OnInit { @@ -41,10 +43,11 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { billDetailColumns: STColumn[] = []; showBillDetail = false; changeAccount = false; + addd = false; billDetailList = []; roleId = ''; - demoValue!: number; - 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; } @@ -145,6 +148,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { smsVerifyCode: { title: '调整金额', type: 'string', + description: '（“+”表示增加待入账金额，“-”表示减少待入账金额 ）', ui: { widget: 'custom', placeholder: '请输入金额', @@ -164,7 +168,7 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { } } }, - required: ['phone', 'remark'], + required: ['smsVerifyCode', 'remark'], }; this.uiView = { '*': { @@ -222,9 +226,24 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { * @param record 当前行 */ changeStalyAccount(record: any) { - this.changeAccount = true; - this.initSFNew(); + this.changeRecord = record; + let params:any = { + partnerId: this.roleId , + ltdId: record.ltdId + } + this.service.request(this.service.$api_get_getPartnerLitAmountSummary, params).subscribe(res => { + if (res) { + this.changeAmount = Math.abs(res.waitRecordedAmount) + if(res.waitRecordedAmount > 0) { + this.addd = true; + } else { + this.addd = false; + } + this.changeAccount = true; + this.initSFNew(); + } + }); // this.getBillDetail(record?.ltdId); } @@ -247,4 +266,45 @@ export class PartnerAccountManagementRecordedDetailComponent implements OnInit { goBack() { window.history.go(-1); } + deletes(value: number) { + this.addd = false + } + add(value: number) { + this.addd = true + } + 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; + this.st.load() + } + }) + } + }); + + } } 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/routes/tax-management/components/order-reporting/order-reporting.component.html b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html index adc012af..c857bbf0 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 @@ -81,7 +81,7 @@ -
货物名称：{{ item.goodsName ? item.goodsName : '--' }}
+
{{ item.goodsName ? item.goodsName : '--' }}
{{ item.loadWeight ? item.loadWeight : '--' }}吨/{{ item.loadVolume ?item.loadVolume: '--' }}方
diff --git a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts index 9efac2ad..6bb43c7b 100644 --- a/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts +++ b/src/app/routes/ticket-management/components/express-info/express-detail-modal/express-detail-modal.component.ts @@ -96,8 +96,8 @@ export class ExpressDetailModalComponent implements OnInit { Object.assign(requestOptions.body, { ...this.sf?.value, createTime: { - start: this.sf?.value.createTime?.[0] || null, - end: this.sf?.value.createTime?.[1] || null + start: this.sf?.value.createTime?.[0] || '', + end: this.sf?.value.createTime?.[1] || '' } }); } 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 @@ 序号 合伙人等级 - 初始业务量（万/月） - 到达业务量（万/月） + 初始业务量 + 到达业务量 管理费比例% 操作