From 901a5f0cdbde07261b24d4db6317767ff7892295 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 21 Feb 2022 20:39:34 +0800 Subject: [PATCH] edit --- .../refund-record.component.html | 50 +++ .../refund-record/refund-record.component.ts | 292 ++++++++++++++++++ .../withdrawals-record.component.less | 41 --- .../withdrawals-record.component.ts | 2 +- .../financial-managemen-routing.module.ts | 2 + .../financial-management.module.ts | 4 +- .../services/freight-account.service.ts | 9 + .../components/vehicle/vehicle.component.ts | 122 ++++---- .../basic-setting.component copy.html | 166 ---------- .../freight-config.component.ts | 23 +- .../components/freight/list/list.component.ts | 10 +- .../dynamic-setting-h5.component.html | 6 +- .../dynamic-setting-modal.component.html | 15 +- .../dynamic-setting-modal.component.ts | 51 ++- .../dynamic-setting/dynamic-setting.module.ts | 4 +- .../services/business/shipper-base.service.ts | 1 - 16 files changed, 500 insertions(+), 298 deletions(-) create mode 100644 src/app/routes/financial-management/components/refund-record/refund-record.component.html create mode 100644 src/app/routes/financial-management/components/refund-record/refund-record.component.ts delete mode 100644 src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less delete mode 100644 src/app/routes/sys-setting/components/basic-setting/basic-setting.component copy.html diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.html b/src/app/routes/financial-management/components/refund-record/refund-record.component.html new file mode 100644 index 00000000..fcd872b1 --- /dev/null +++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.html @@ -0,0 +1,50 @@ + + + + +
+
+ +
+
+ + + + +
+
+ + + + + + + + + + + + + + {{ item.bankName }}
{{ item.bankCardNumber }} + + + + + +
+
+ + + +
+
+ \ No newline at end of file diff --git a/src/app/routes/financial-management/components/refund-record/refund-record.component.ts b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts new file mode 100644 index 00000000..8b4781fd --- /dev/null +++ b/src/app/routes/financial-management/components/refund-record/refund-record.component.ts @@ -0,0 +1,292 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STComponent, STColumn, STRequestOptions, STChange } 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'; + +@Component({ + selector: 'app-refund-record', + templateUrl: './refund-record.component.html', + styleUrls: ['../../../commom/less/box.less'] +}) +export class RefundRecordComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) + sf!: SFComponent; + @ViewChild('auditModal', { static: false }) + auditModal!: any; + columns: STColumn[] = this.initST(); + searchSchema: SFSchema = this.initSF(); + + _$expand = false; + refundStatus: any = ''; + + msg = ''; + constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {} + + ngOnInit(): void {} + + beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, { refundStatus: this.refundStatus || null }); + if (this.sf) { + Object.assign(requestOptions.body, { + ...this.sf.value, + createTime: { + start: this.sf.value.createTime?.[0] || '', + end: this.sf.value.createTime?.[1] || '' + } + }); + } + return requestOptions; + }; + + changeRefundStatus(status?: string) { + this.refundStatus = status || null; + this.st.load(1); + } + + auditAction(item?: any) { + this.msg = ''; + const modal = this.nzModalService.create({ + nzTitle: '审核', + nzContent: this.auditModal, + nzFooter: [ + { + label: '拒绝', + type: 'default', + onClick: () => { + this.service + .request(this.service.$api_disagree_refund_record, { + applicationId: item.id, + remark: this.msg + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('审核拒绝成功'); + modal.destroy(true); + this.st.load(1); + } + }); + return false; + } + }, + { + label: '通过', + type: 'primary', + onClick: () => { + this.service + .request(this.service.$api_agree_refund_record, { + applicationId: item.id, + remark: this.msg + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('审核通过成功'); + modal.destroy(true); + this.st.load(1); + } + }); + return false; + } + } + ] + }); + } + + reApply(item: any) { + const modal = this.nzModalService.warning({ + nzTitle: '确定要重新发起退款？', + nzOnOk: () => { + this.service + .request(this.service.$api_rebulid_refund_record, { + applicationId: item.id + }) + .subscribe(res => { + if (res) { + this.service.msgSrv.success('发起成功'); + modal.destroy(true); + this.st.load(1); + } + }); + return false; + } + }); + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/expand', this._$expand); + } + + private initSF(): SFSchema { + return { + properties: { + expand: { + type: 'boolean', + ui: { + hidden: true + } + }, + orderRefundCode: { + type: 'string', + title: '退款单号', + ui: { + placeholder: '请输入' + } + }, + refundType: { + type: 'string', + title: '退款类型', + enum: [ + { value: '1', label: '平台退款货主' }, + { value: '2', label: '司机退款平' }, + { value: '3', label: '车队长退款司机' }, + { value: '4', label: '车队长退款平台' } + ], + ui: { + widget: 'select', + placeholder: '请选择' + } + }, + shipperId: { + type: 'string', + title: '货主', + ui: { + placeholder: '请输入' + } + }, + billCode: { + type: 'string', + title: '订单号', + ui: { + visibleIf: { + expand: (value: boolean) => value + }, + placeholder: '请输入' + } + }, + enterpriseProjectId: { + type: 'string', + title: '所属项目', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getEnterpriseProject(), + visibleIf: { + expand: (value: boolean) => value + } + } + }, + resourceId: { + type: 'string', + title: '货源号', + ui: { + visibleIf: { + expand: (value: boolean) => value + }, + placeholder: '请输入' + } + }, + refundExecuteTime: { + title: '退款时间', + type: 'string', + ui: { + widget: 'sl-from-to-search', + format: 'yyyy-MM-dd', + placeholder: '请选择', + visibleIf: { + expand: (value: boolean) => value + }, + nzShowTime: true + } as SFDateWidgetSchema + }, + ltdid: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getNetworkFreightForwarder(), + visibleIf: { + expand: (value: boolean) => value + } + } + }, + bankType: { + type: 'string', + title: '银行类型', + ui: { + widget: 'dict-select', + params: { dictKey: 'bankname:type' }, + placeholder: '请输入', + visibleIf: { + expand: (value: boolean) => value + } + } + } + } + }; + } + + private initST(): STColumn[] { + return [ + { title: '退款单号', index: 'orderRefundCode', width: 180 }, + { title: '退款类型', index: 'refundType', width: 120 }, + { + title: '退款金额', + render: 'refundAmount', + width: 120, + type: 'widget', + className: 'text-right', + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.refundAmount }) } + }, + { title: '退款时间', index: 'applyTime', width: 100 }, + { title: '货主', index: 'shipperId', width: 100 }, + { title: '所属项目', index: 'enterpriseProjectName', width: 140 }, + { title: '支付单', index: 'billRefundPaymentVOS.paymentApplicationCode', width: 100 }, + { title: '订单号', index: 'billCode', width: 100 }, + { title: '货源号', index: 'resourceCode', width: 100 }, + { title: '司机', render: ' driver', width: 100 }, + { title: '收款人', render: 'captain', width: 100 }, + { title: '网络货运人', render: 'ltdName', width: 180 }, + { title: '银行类型', index: 'bankTypeLabel', width: 100 }, + { title: '退款原因', index: 'rejectionCause', width: 150 }, + { title: '失败原因', index: 'failCause', width: 150 }, + { + title: '操作', + fixed: 'right', + width: '110px', + buttons: [ + { + text: '审核', + iif: item => item.refundStatus === '1', + click: item => this.auditAction(item) + }, + { + text: '重新发起', + click: item => this.reApply(item) + } + // { + // text: '关闭', + // click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id]) + // } + ] + } + ]; + } +} diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less deleted file mode 100644 index 7f0f8379..00000000 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less +++ /dev/null @@ -1,41 +0,0 @@ -:host::ng-deep { - .search-box { - .ant-card-body { - padding-bottom: 18px; - } - } - - .content-box { - .ant-card-body { - padding-top: 0; - } - } - - nz-range-picker { - width: 100%; - } - - .ant-tabs-tab-btn { - padding-right: 16px; - padding-left : 16px; - } - - .text-truncate { - white-space: normal; - } -} - -.expend-options { - margin-top: 0; -} - - -@media (min-width: 1200px) { - .expend-options { - position : absolute; - right : 0; - bottom : 25px; - max-width: 400px; - } - -} \ No newline at end of file diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts index a372f9f5..e631aea7 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts @@ -8,7 +8,7 @@ import { FreightAccountService } from '../../services/freight-account.service'; @Component({ selector: 'app-withdrawals-record', templateUrl: './withdrawals-record.component.html', - styleUrls: ['./withdrawals-record.component.less'] + styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less'] }) export class WithdrawalsRecordComponent implements OnInit { @ViewChild('st', { static: true }) 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 bcef4941..e1a67109 100644 --- a/src/app/routes/financial-management/financial-managemen-routing.module.ts +++ b/src/app/routes/financial-management/financial-managemen-routing.module.ts @@ -31,6 +31,7 @@ import { PlatformAccountComponent } from './components/platform-account/platform import { PlatformAccountDetailComponent } from './components/platform-account/platform-account-detail/platform-account-detail.component'; import { AdvanceCollectionComponent } from './components/advance-collection/advance-collection.component'; import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component'; +import { RefundRecordComponent } from './components/refund-record/refund-record.component'; const routes: Routes = [ { path: 'freight-account', component: FreightAccountComponent, data: { guard: { ability: ['FINANCIAL-FREIGHT-ACOUNT-list'] } } }, @@ -42,6 +43,7 @@ const routes: Routes = [ { path: 'recharge-record', component: RechargeRecordComponent }, { path: 'withdrawals-record', component: WithdrawalsRecordComponent }, { path: 'withdrawals-record/detail/:id', component: WithdrawalsDetailComponent }, + { path: 'refund-record', component: RefundRecordComponent }, { path: 'voucher-management', component: VoucherManagementComponent }, { path: 'voucher-management/detail/:id', component: VoucherDetailComponent }, { path: 'voucher-summary', component: VoucherSummaryComponent }, diff --git a/src/app/routes/financial-management/financial-management.module.ts b/src/app/routes/financial-management/financial-management.module.ts index 1da0af17..5844f4a2 100644 --- a/src/app/routes/financial-management/financial-management.module.ts +++ b/src/app/routes/financial-management/financial-management.module.ts @@ -34,6 +34,7 @@ import { PlatformAccountComponent } from './components/platform-account/platform import { PlatformAccountDetailComponent } from './components/platform-account/platform-account-detail/platform-account-detail.component'; import { AdvanceCollectionComponent } from './components/advance-collection/advance-collection.component'; import { AdvanceCollectionDetailComponent } from './components/advance-collection/advance-collection-detail/advance-collection-detail.component'; +import { RefundRecordComponent } from './components/refund-record/refund-record.component'; const ROUTESCOMPONENTS = [ FreightAccountComponent, @@ -64,7 +65,8 @@ const ROUTESCOMPONENTS = [ VoucherListComponent, ReceiptOrderDetailComponent, AdvanceCollectionComponent, - AdvanceCollectionDetailComponent + AdvanceCollectionDetailComponent, + RefundRecordComponent ]; const NOTROUTECOMPONENTS = [DriverAccountDetailComponent, FreightAccountDetailComponent, ClearingModalComponent]; diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index 011d19a1..c347df62 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -53,6 +53,15 @@ export class FreightAccountService extends ShipperBaseService { // 拒绝提现 $api_disagree_refund = '/api/fcc/refundApplicationOBC/disagreeRefund'; + // 查询订单退款申请表 + $api_get_refund_record_page = '/api/fcc/billRefundApplication/list/page'; + // 同意退款 + $api_agree_refund_record= '/api/fcc/billRefundApplication/agreeRefund'; + // 不同意退款 + $api_disagree_refund_record = '/api/fcc/billRefundApplication/disagreeRefund'; + // 重新发起 + $api_rebulid_refund_record = '/api/fcc/billRefundApplication/rebulid'; + // 查询充值信息表 $api_get_recharge_page = '/api/fcc/rechargeInfo/list/getPageByOperator'; // 查询异常入金 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 01e8ab3c..1d192fa2 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -35,7 +35,7 @@ export class SupplyManagementVehicleComponent implements OnInit { isVisible = false; freightSchema: SFSchema = {}; auditMany = false; - + resourceStatus: any; auditID: any; constructor( @@ -63,10 +63,9 @@ export class SupplyManagementVehicleComponent implements OnInit { }; } afterRes = (data: any[], rawData?: any) => { - console.log(data) return data.map(item => ({ ...item, - disabled: item.auditStatus !== '1' + disabled: item.auditStatus !== '1' })); }; get selectedRows() { @@ -89,7 +88,7 @@ export class SupplyManagementVehicleComponent implements OnInit { maxLength: 50, ui: { placeholder: '请输入备注', - widget: 'textarea', + widget: 'textarea' } } }, @@ -105,7 +104,7 @@ export class SupplyManagementVehicleComponent implements OnInit { search() { this.st?.load(1); - this.getGoodsSourceStatistical() + this.getGoodsSourceStatistical(); } /** * 伸缩查询条件 @@ -198,9 +197,9 @@ export class SupplyManagementVehicleComponent implements OnInit { console.log(value); console.log(status); if (status === 2) { - if(this.selectedRows.length <= 0) { + if (this.selectedRows.length <= 0) { this.service.msgSrv.error('未选择货源单！'); - return + return; } let list: any[] = []; this.selectedRows.forEach(item => { @@ -209,7 +208,7 @@ export class SupplyManagementVehicleComponent implements OnInit { this.auditID = list; this.auditMany = true; } else { - this.auditID = value.id + this.auditID = value.id; this.auditMany = false; } this.isVisible = true; @@ -224,19 +223,19 @@ export class SupplyManagementVehicleComponent implements OnInit { * 审核通过按钮 */ handleOK(value: any) { - console.log(this.sfFre.valid) - console.log(this.sfFre.value) - if(this.selectedRows.length <= 0) { + console.log(this.sfFre.valid); + console.log(this.sfFre.value); + if (this.selectedRows.length <= 0) { const params: any = { id: this.auditID, - remarks: this.sfFre.value.remarks, - } - if(value == 1) { - params.auditStatus = 2 + remarks: this.sfFre.value.remarks + }; + if (value == 1) { + params.auditStatus = 2; } else { - params.auditStatus = 3 + params.auditStatus = 3; } - console.log(params) + console.log(params); this.service.request(this.service.$api_goodsResourceAudit, params).subscribe(res => { if (res === true) { this.service.msgSrv.success('审核成功！'); @@ -244,18 +243,18 @@ export class SupplyManagementVehicleComponent implements OnInit { this.st?.reload(); this.getGoodsSourceStatistical(); } - }) + }); } else { const params: any = { ids: this.auditID, - remarks: this.sfFre.value.remarks, - } - if(value == 1) { - params.auditStatus = 2 + remarks: this.sfFre.value.remarks + }; + if (value == 1) { + params.auditStatus = 2; } else { - params.auditStatus = 3 + params.auditStatus = 3; } - console.log(params) + console.log(params); this.service.request(this.service.$api_batchGoodsResourceAudit, params).subscribe(res => { if (res === true) { this.service.msgSrv.success('审核成功！'); @@ -263,9 +262,8 @@ export class SupplyManagementVehicleComponent implements OnInit { this.st?.reload(); this.getGoodsSourceStatistical(); } - }) + }); } - } /** * 跳转修改货源 @@ -317,7 +315,7 @@ export class SupplyManagementVehicleComponent implements OnInit { stayQuantity: 0 }; const params: any = Object.assign({}, this.reqParams || {}); - delete params.resourceStatus + delete params.resourceStatus; this.service.request(this.service.$api_get_goods_resource_statistical, { resourceType: 1, ...params }).subscribe(res => { if (res) { console.log(res); @@ -396,7 +394,7 @@ export class SupplyManagementVehicleComponent implements OnInit { placeholder: '请选择', visibleIf: { _$expand: (value: boolean) => value - }, + } } as SFSelectWidgetSchema }, serviceType: { @@ -422,8 +420,7 @@ export class SupplyManagementVehicleComponent implements OnInit { params: { dictKey: 'goodresource:audit:status' }, visibleIf: { _$expand: (value: boolean) => value - }, - + } } as SFSelectWidgetSchema }, enterpriseInfoId: { @@ -442,33 +439,33 @@ export class SupplyManagementVehicleComponent implements OnInit { } }; } - // 获取城市列表 - getRegionCode(regionCode: any) { - console.log(regionCode); - return this.service - .request(this.service.$api_get_enterprise_project, { id: regionCode }) - .pipe( - map(res => - res.map((item: any) => ({ - label: item.projectName, - value: item.id - })) + // 获取城市列表 + getRegionCode(regionCode: any) { + console.log(regionCode); + return this.service + .request(this.service.$api_get_enterprise_project, { id: regionCode }) + .pipe( + map(res => + res.map((item: any) => ({ + label: item.projectName, + value: item.id + })) + ) ) - ) - .subscribe(res => { - this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res; - this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res); - // if (this.enterpriseProjectIds) { - // this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds); - // } - }); -} + .subscribe(res => { + this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res; + this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res); + // if (this.enterpriseProjectIds) { + // this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds); + // } + }); + } /** * 初始化数据列表 */ private initST(): STColumn[] { return [ - { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' }, + { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' }, { title: '货源编号', width: '180px', @@ -476,11 +473,12 @@ export class SupplyManagementVehicleComponent implements OnInit { className: 'text-left', render: 'resourceCode' }, - { - title: '货主', - index: 'shipperAppUserName', - width: '180px', - className: 'text-left' }, + { + title: '货主', + index: 'shipperAppUserName', + width: '180px', + className: 'text-left' + }, { title: '项目名称', index: 'enterpriseProjectName', @@ -542,7 +540,7 @@ export class SupplyManagementVehicleComponent implements OnInit { title: '货源状态', className: 'text-left', index: 'resourceStatusLabel', - width: '120px', + width: '120px' }, { title: '创建时间', @@ -574,13 +572,13 @@ export class SupplyManagementVehicleComponent implements OnInit { text: '货源审核', click: _record => this.audit(_record, 1), iif: item => item.auditStatus === '1', - acl: { ability: ['SUPPLY-INDEX-vehicleBatchAudit'] }, + acl: { ability: ['SUPPLY-INDEX-vehicleBatchAudit'] } }, { text: '修改货源', click: _record => this.amend(_record), iif: item => item.resourceStatus === '1', - acl: { ability: ['SUPPLY-INDEX-vehicleModificationSupply'] }, + acl: { ability: ['SUPPLY-INDEX-vehicleModificationSupply'] } }, // { // text: '修改运费', @@ -591,18 +589,18 @@ export class SupplyManagementVehicleComponent implements OnInit { text: '取消货源', click: _record => this.cancleGoodsSource(_record), iif: item => item.resourceStatus === '1', - acl: { ability: ['SUPPLY-INDEX-vehicleCancelSupply'] }, + acl: { ability: ['SUPPLY-INDEX-vehicleCancelSupply'] } }, { text: '再下一单', click: _record => this.nextOrder(_record), - acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] }, + acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] } }, { text: '重新指派　', click: _record => this.assignedCar(_record), iif: item => item.resourceStatus === '1' && item.serviceType === '2', - acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] }, + acl: { ability: ['SUPPLY-INDEX-vehicleReassign'] } } ] } diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component copy.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component copy.html deleted file mode 100644 index de6dd3ad..00000000 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component copy.html +++ /dev/null @@ -1,166 +0,0 @@ - -
-
-
    -
  • - {{ item.name }} -
    • -
-
- -
- -

货主提现设置

-
-
- - - - - - - - - - - - - - - - - - - -
- - - - -
-
- - - - -
- -
-
- - - -

路桥发票设置

-
-
- - - - - - - -

开启自动申请后，运单完成卸货后会自动根据运单信息申请ETC发票。

- -
-
- - - -

风险单监控

-
-
- - - - - - - - - - -

当前时间与计划时间对比，允许如上合理范围内执行不报异常，差异在范围外则报异常

- - - - - - - - - - - -

当前时间与计划时间对比，允许如上合理范围内执行不报异常，差异在范围外则报异常

- - - - - - - - - - - -

签收量与装运量对比，允许如上合理范围内损耗不报异常，差异在范围外则报异常

- - - - - - - - - - - -

装货地和发货地、签收地和收货地距离对比，允许如上合理范围内执行不报异常，差异在范围外则报异常

- -
-
- - -
- -
-
-
- \ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts index b4e9bbe4..44752699 100644 --- a/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts +++ b/src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts @@ -41,7 +41,28 @@ export class FreightConfigComponent implements OnInit { nzWidth: 900, nzComponentParams: { extendType: '2', - businessId: item.id + businessId: item.id, + formatTypeList: (item: any[]) => [ + ...item, + { + name: '权限配置', + items: [ + { + configType: 1, + itemType: 999 + } + ] + }, + { + name: '费率变更记录', + items: [ + { + configType: 2, + itemType: 999 + } + ] + } + ] }, nzFooter: null }); diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index f1d58782..8106b46d 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -203,11 +203,11 @@ export class FreightComponentsListComponent implements OnInit { // this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } }); } }, - { - acl: { ability: ['USERCENTER-FREIGHT-LIST-basicSetting'] }, - text: '基础设置', - click: item => this.settingAction(item) - }, + // { + // acl: { ability: ['USERCENTER-FREIGHT-LIST-basicSetting'] }, + // text: '基础设置', + // click: item => this.settingAction(item) + // }, { acl: { ability: ['USERCENTER-FREIGHT-LIST-balance'] }, text: '资金账户', diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html index 94a36194..5b292dac 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html @@ -100,8 +100,8 @@ - - + + @@ -112,7 +112,7 @@
+ *ngIf="selectedTab?.configKey!=='freight' && labelWidth!==0">保存
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.html index a57ef84e..3df7b511 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.html +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.html @@ -1,3 +1,16 @@ + (selectedEvent)="changeType($event)" (saveEvent)="saveAction($event)" [tabSpan]="6" [labelWidth]="labelWidth"> + + + + 权限配置 + + + + + 费率变更记录 + + + + \ No newline at end of file diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts index e0b090b1..ca421d89 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting-modal/dynamic-setting-modal.component.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-01-10 16:06:17 @@ -8,9 +8,12 @@ * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-modal\\dynamic-setting-modal.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/compiler'; import { Component, Input, OnInit } from '@angular/core'; import { ModalHelper } from '@delon/theme'; import { NzModalRef } from 'ng-zorro-antd/modal'; +import { Observable, of } from 'rxjs'; +import { map } from 'rxjs/operators'; import { BaseService } from 'src/app/shared/services'; @Component({ @@ -21,41 +24,58 @@ import { BaseService } from 'src/app/shared/services'; export class DynamicSettingModalComponent implements OnInit { tabs: any[] = []; selectedTab: any = null; - configFullKey = 'sys.config' + configFullKey = 'sys.config'; configList: any = []; + // 配置类型数组重组函数 + @Input() + formatTypeList = (item: any[]) => { + return [...item]; + }; @Input() extendType!: string; @Input() businessId!: string; @Input() configvalue!: string; + @Input() + labelWidth = 200; constructor(public service: BaseService, private modalHelp: NzModalRef) {} ngOnInit() { - if(this.configvalue) { - this.configFullKey = this.configvalue + if (this.configvalue) { + this.configFullKey = this.configvalue; } this.getTypeList(); } getTypeList() { - this.service .request('/api/mdc/pbc/sysConfigItemExtend/getSysConfigExtend', { configFullKey: this.configFullKey, extendType: this.extendType, businessId: this.businessId }) - .subscribe((res: Array) => { - if (res?.length > 0) { - const typeData = res.find(config => config.configFullKey === this.configFullKey); - if (typeData) { - this.tabs = typeData.children; - this.selectedTab = typeData.children[0]; - this.configList = this.formatItems(this.selectedTab.items); + .pipe( + map((res: Array) => { + if (res?.length > 0) { + const typeData = res.find(config => config.configFullKey === this.configFullKey); + if (typeData) { + return typeData.children || []; + } } + return []; + }), + map(this.formatTypeList) + ) + .subscribe((res: Array) => { + this.tabs = res; + if (res?.length > 0) { + this.selectedTab = res[0]; + this.configList = this.formatItems(this.selectedTab.items); + const hiddenType = this.configList.find((item: any) => item.itemType === 7 || item.itemType === 999); + this.labelWidth = hiddenType ? 0 : 200; } }); } @@ -63,6 +83,8 @@ export class DynamicSettingModalComponent implements OnInit { changeType(type: any): void { this.selectedTab = type; this.configList = this.formatItems(type.items); + const hiddenType = this.configList.find((item: any) => item.itemType === 7 || item.itemType === 999); + this.labelWidth = hiddenType ? 0 : 200; } saveAction(params: Array) { @@ -93,13 +115,12 @@ export class DynamicSettingModalComponent implements OnInit { itemData: item.extendItemData || item.itemData, itemValue: item.extendItemValue || item.itemValue })) - .map(item => ( - { + .map(item => ({ ...item, remark: item?.remark ? JSON.parse(item?.remark) : null, extend: item?.extend ? JSON.parse(item?.extend) : [], // itemData: item.itemData ? JSON.parse(item.itemData) : item.itemData, - itemValue: item?.itemValue ? item?.itemType !== 8? JSON.parse(item?.itemValue) : item?.itemValue : item?.itemValue + itemValue: item?.itemValue ? (item?.itemType !== 8 ? JSON.parse(item?.itemValue) : item?.itemValue) : item?.itemValue })); } return []; diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts b/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts index e628602b..f774edaa 100644 --- a/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts +++ b/src/app/shared/components/dynamic-setting/dynamic-setting.module.ts @@ -17,10 +17,12 @@ import { FormsModule } from '@angular/forms'; import { DynamicSettingModalComponent } from './dynamic-setting-modal/dynamic-setting-modal.component'; import { FreightTableComponent } from './freight-table/freight-table.component'; import { SEModule } from '@delon/abc/se'; +import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; const COMPONENTS = [DynamicSettingH5Component, DynamicSettingModalComponent, FreightTableComponent]; @NgModule({ declarations: [...COMPONENTS], imports: [CommonModule, FormsModule, SHARED_ZORRO_MODULES, SEModule], - exports: [...COMPONENTS] + exports: [...COMPONENTS], + schemas: [CUSTOM_ELEMENTS_SCHEMA] }) export class DynamicSettingModule {} diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index 0d7df77e..41c9fbf8 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -45,7 +45,6 @@ export class ShipperBaseService extends BaseService { * @returns */ getEnterpriseProject(params?: any) { - console.log(params) return this.request(this.$api_get_enterprise_project, params).pipe( map((res: any) => { if (!res) {