From fd0099fb640509f6a2775a05681c5f679f67ee1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Mon, 28 Mar 2022 11:04:43 +0800 Subject: [PATCH 01/25] =?UTF-8?q?=E7=BB=99=E5=8F=B8=E6=9C=BA=E5=8F=91?= =?UTF-8?q?=E9=80=81=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assigned-car/assigned-car.component.ts | 16 +++++++++++++++- .../choose-famifiar.component.ts | 17 ++++++++++++++++- .../services/supply-management.service.ts | 6 ++++-- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts index 929c2973..1793c83e 100644 --- a/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts +++ b/src/app/routes/supply-management/components/assigned-car/assigned-car.component.ts @@ -119,7 +119,15 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit { nzContent: '该司机还未注册，是否邀请他注册？点击"是"系统将发送邀请短信给司机', nzOkText: '确定', nzCancelText: '取消', - nzOnOk: () => console.log('OK') + nzOnOk: () => { + this.sendMsg(this.sf?.value?.nameOrPhone).subscribe((res => { + if (res.code === '1') { + this.service.msgSrv.success('发送成功'); + } else { + this.service.msgSrv.success('发送失败'); + } + })); + } }); return []; } @@ -256,5 +264,11 @@ export class SupplyManagementVehicleAssignedCarComponent implements OnInit { }); } + /** +* 发送邀请司机注册短信 +*/ + sendMsg(phoneNumber: string) { + return this.service.request(this.service.$api_send_msg_code, phoneNumber) + } } diff --git a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts index 9b9d33c0..3b5ada90 100644 --- a/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts +++ b/src/app/routes/supply-management/components/choose-famifiar/choose-famifiar.component.ts @@ -246,7 +246,15 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit { nzContent: '该司机还未注册，是否邀请他注册？点击"是"系统将发送邀请短信给司机', nzOkText: '确定', nzCancelText: '取消', - nzOnOk: () => console.log('OK') + nzOnOk: () => { + this.sendMsg(this.sf?.value?.nameOrPhone).subscribe((res => { + if (res.code === '1') { + this.service.msgSrv.success('发送成功'); + } else { + this.service.msgSrv.success('发送失败'); + } + })); + } }); return []; } @@ -327,4 +335,11 @@ export class PublishGoodsChooseFamifiarComponent implements OnInit { } }); } + + /** +* 发送邀请司机注册短信 +*/ + sendMsg(phoneNumber: string) { + return this.service.request(this.service.$api_send_msg_code, phoneNumber) + } } diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index 1d30559b..10cbc648 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -119,8 +119,8 @@ export class SupplyManagementService extends BaseService { public $api_getContractContent = '/api/sdc/contractTemplate/getContractContent'; // 获取运价 public $api_getFreight = '/api/mdc/cuc/freightConfig/getFreight'; - // 从业资格证 - $api_recognizeQualificationCertificate = '/api/mdc/pbc/hwc/ocr/recognizeQualificationCertificate'; + // 从业资格证 + $api_recognizeQualificationCertificate = '/api/mdc/pbc/hwc/ocr/recognizeQualificationCertificate'; /** * 获取车型、车长字典数据 * @returns @@ -177,6 +177,8 @@ export class SupplyManagementService extends BaseService { $api_asyncExportWholeList = '/api/sdc/goodsResourceOperate/asyncExportWholeList'; // 根据货主ID查询合同签署属性 public $api_getContractAtr = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getContractAtr'; + // 发送邀请司机短信 + $api_send_msg_code = `/api/mdc/pbc/smsSend/sendInviteDriver`; getDictByKey(dictKey: string) { const params = { dictKey: dictKey }; From 74befaef51924bc5925f431306b87a8249ffc83c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 11:15:27 +0800 Subject: [PATCH 02/25] fix bug --- .../components/bulk/bulk.component.html | 2 +- .../components/bulk/bulk.component.ts | 8 +++ .../components/vehicle/vehicle.component.html | 4 +- .../components/vehicle/vehicle.component.ts | 8 +++ .../services/order-management.service.ts | 8 ++- .../components/bulk/bulk.component.html | 2 +- .../components/bulk/bulk.component.ts | 8 +++ .../components/vehicle/vehicle.component.html | 4 +- .../components/vehicle/vehicle.component.ts | 53 ++++++++++--------- .../services/waybill-management.service.ts | 7 ++- 10 files changed, 72 insertions(+), 32 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index 3a746c56..bab3a570 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -35,7 +35,7 @@ - + - + diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 22bdb5c3..5b7f1fb1 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -862,4 +862,12 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme } }); } + // 导出 + exprot() { + this.service.request(this.service.$api_get_asyncExportWholeList, this.reqParams).subscribe((res: any) => { + if (res) { + this.service.msgSrv.success('导出成功，请去下载中心下载！'); + } + }); + } } 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 0292cef2..4955b61e 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-03-25 15:27:40 + * @LastEditTime : 2022-03-28 11:07:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -176,6 +176,12 @@ export class OrderManagementService extends ShipperBaseService { $api_get_getAppDriverPosition = `/api/sdc/billShipper/getAppDriverPosition`; // 查看申述记录 $api_get_getOrderComplaintDetail = `/api/sdc/billOperate/getOrderComplaintDetail`; + + + // 异步导出运营后台大宗订单列表 + $api_get_asyncExportBulkList = `/api/sdc/billOperate/asyncExportBulkList`; + // 异步导出运营后台整车订单列表 + $api_get_asyncExportWholeList = `/api/sdc/billOperate/asyncExportWholeList`; /** * 根据企业ID，获取企业历史网络货运人 * @returns diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.html b/src/app/routes/waybill-management/components/bulk/bulk.component.html index 851fa149..ae67a978 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.html +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.html @@ -31,7 +31,7 @@
- + + + +
+ + + + + + + + + + + diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.less b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.less new file mode 100644 index 00000000..e87948ce --- /dev/null +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.less @@ -0,0 +1,20 @@ +:host::ng-deep{ + .search-box{ + .ant-card-body{ + padding-bottom: 18px; + } + } + + .content-box{ + .ant-card-body{ + padding-top: 14px; + } + } + .imgBox { + display: flex; + img { + width: 60px !important; + } + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..6e7c094b --- /dev/null +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts @@ -0,0 +1,220 @@ +import { Component, OnInit, ViewChild, Type } from '@angular/core'; +import { STComponent, STColumn, STChange } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { of } from 'rxjs'; +import { map } from 'rxjs/operators'; +import { RebateManagementService } from '../../../services/rebate-management.service'; + +@Component({ + selector: 'app-add-partnerlist', + templateUrl: './add-partnerlist.component.html', + styleUrls: ['./add-partnerlist.component.less'] +}) +export class ParterRebateManageMentAddPartnerListComponent implements OnInit { + @ViewChild('st', { static: true }) + st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + ui: SFUISchema = {}; + i: any; + schema: SFSchema = {}; + addSchema: SFSchema = {}; + _$expand = false; + editText = ''; + formData: any; + isVisible = false; + edit = false; + editId = false; + selectedIndex = 0; + + + + columns: STColumn[] = [ + { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, + { title: '异常编号', index: 'exceptionCode', width: '140px', className: 'text-left', }, + { title: '订单号', index: 'billCode', width: '160px', className: 'text-left', }, + { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left', }, + { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left', }, + { title: '承运司机', index: 'driver', width: '180px', className: 'text-left', }, + { title: '异常信息', index: 'exceptionContent', width: '100px', className: 'text-left', }, + { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '150px', className: 'text-left', }, + { title: '上报时间', index: 'createTime', width: '140px', className: 'text-left', }, + { + title: '操作', index: 'createTime', width: '90px', className: 'text-left', + buttons: [ + { + text: '回复', + click: _record => this.reply(_record), + acl: { ability: ['AbnormalAppear-reply'] } + }, + ] + }, + ]; + columns2: STColumn[] = [ + { title: '异常编号', index: 'exceptionCode', width: '140px', className: 'text-left' }, + { title: '订单号', index: 'billCode', width: '160px', className: 'text-left' }, + { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' }, + { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' }, + { title: '承运司机', index: 'driver', width: '180px', className: 'text-left' }, + { title: '异常信息', index: 'exceptionContent', width: '100px', className: 'text-left' }, + { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '150px', className: 'text-left' }, + { title: '上报时间', index: 'createTime', width: '140px', className: 'text-left' }, + { title: '回复内容', index: 'replyContent', width: '150px', className: 'text-left' }, + { title: '回复人', index: 'replyAppUserName', width: '90px', className: 'text-left' }, + { title: '回复时间', index: 'replyTime', width: '140px', className: 'text-left' }, + ]; + + get reqParams() { + let params: any = { ...this.sf?.value }; + if (params.reportingTime) { + const reportingTime = { start: this.sf?.value?.reportingTime?.[0], end: this.sf?.value?.reportingTime?.[1] } + params.reportingTime = reportingTime; + } + return params; + } + + get selectedRows() { + return this.st?.list.filter(item => item.checked) || []; + } + + constructor( + public service: RebateManagementService, + private nzModalService: NzModalService, + public shipperSrv: ShipperBaseService, + private modal: NzModalService, + + ) { } + + ngOnInit(): void { + this.initSF() + } + + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + exceptionCode: { + type: 'string', + title: '异常编号', + ui: { placeholder: '请输入' } + }, + billCode: { + type: 'string', + title: '订单号', + ui: { + placeholder: '最多100个订单，空号隔开', + } + }, + exceptionType: { + title: '异常类型', + type: 'string', + ui: { + widget: 'dict-select', + containsAllLabel: true, + params: { dictKey: 'exception:report:type' }, + } as SFSelectWidgetSchema + }, + driverName: { + title: '承运司机', + type: 'string', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + carNo: { + title: '车牌号', + type: 'string', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + reportingTime: { + title: '上报时间', + type: 'string', + ui: { + widget: 'date', + mode: 'range', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFDateWidgetSchema + } + } + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + + search() { + if (this.selectedIndex === 0) { + this.st?.load(1) + } + } + + selectedIndexChange(event: any) { + if (this.selectedIndex === 0) { + this.st?.load(1) + } + } + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + } + // 回复操作 + reply(item: any) { + // const modalRef = this.modal.create({ + // nzTitle: '回复', + // nzWidth: 700, + // nzContent: AbnormalReplyComponent, + // nzComponentParams: { + // i: item + // }, + // nzFooter: null + // }); + // modalRef.afterClose.subscribe((res) => { + // if (res) { + // this.resetSF; + // this.st.load(); + // } + // }); + } + // 批量回复操作 + batchReply() { + // if (this.selectedRows.length === 0) { + // this.service.msgSrv.warning('请勾选数据！') + // return; + // } + // const modalRef = this.modal.create({ + // nzTitle: '批量回复', + // nzContent: AbnormalreplyBatchComponent, + // nzComponentParams: { + // selectedRows: this.selectedRows + // }, + // nzFooter: null + // }); + // modalRef.afterClose.subscribe(() => { + // this.resetSF; + // this.st.load(); + // }); + } +} 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 9dc5b6f9..1256170c 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,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-21 13:53:31 + * @LastEditTime : 2022-03-28 15:39:27 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -33,7 +33,7 @@ -   添加 +   添加    @@ -49,6 +49,17 @@ - +
+ + +
+ +
+ + +
+ 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 3edd7ef2..3821b57f 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 @@ -1,10 +1,10 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-03-21 13:44:34 + * @LastEditTime : 2022-03-28 14:45:41 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -16,6 +16,7 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/fo import { processSingleSort, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { RebateManagementService } from '../../../services/rebate-management.service'; +import { ParterRebateManageMentAddPartnerListComponent } from '../add-partnerlist/add-partnerlist.component'; @Component({ selector: 'app-parter-channel-rebate-management-add', styleUrls: ['./add.component.less'], @@ -26,7 +27,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { toFixedValue: Number = 2; radioValue = 'A'; precision = 2; - inputValue= ''; + inputValue = ''; @ViewChild('sf', { static: false }) sf!: SFComponent; schema1!: SFSchema; constructor( @@ -34,7 +35,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { public ar: ActivatedRoute, public service: RebateManagementService, private modal: NzModalService, - public shipperservice: ShipperBaseService, + public shipperservice: ShipperBaseService ) {} initSF(data?: any) { this.schema1 = { @@ -55,6 +56,28 @@ export class ParterRebateManageMentAddComponent implements OnInit { }; } ngOnInit() { - this.initSF() + this.initSF(); + } + submit() {} + goBack() { + window.history.go(-1); + } + /** + *申请退款 + */ + add(item?: any) { + const modalRef = this.modal.create({ + nzTitle: '申请退款', + nzContent: ParterRebateManageMentAddPartnerListComponent, + nzComponentParams: { + i: item, + }, + nzFooter: null + }); + modalRef.afterClose.subscribe((res: boolean) => { + if (res) { + + } + }); } } From cb50d0c36b57574aa345a1d5d8ae355d001b2dd3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 16:03:35 +0800 Subject: [PATCH 09/25] fix bug --- .../components/vehicle/vehicle.component.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 0bcc6731..37d2336c 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -98,7 +98,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme if (this.resourceStatus) { a.billStatus = this.resourceStatus; } - const params: any = Object.assign({}, this.sf?.value || {}); + const params: any = Object.assign({}, this.sf?.value || this.paramsList); delete params._$expand; return { ...a, @@ -109,14 +109,8 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme const a: any = {}; if (this.resourceStatus) { a.billStatus = this.resourceStatus; - // Object.assign(requestOptions.body, { - // ...a - // }); } - const params: any = Object.assign({}, this.sf?.value || this.paramsList); - console.log(this.sf?.value); - console.log(this.paramsList); delete params._$expand; this.paramsList = params Object.assign(requestOptions.body, { From 30143b24bf72a9a84a8a4e224ccb8a43df4f3db1 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 17:36:09 +0800 Subject: [PATCH 10/25] e --- proxy.conf.js | 2 +- .../express-detail-modal/express-detail-modal.component.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 10071e14..67c15ee2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, 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 13ba19ed..22e0f733 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 @@ -34,11 +34,11 @@ export class ExpressDetailModalComponent implements OnInit { }, { title: '金额', - index: 'vatnotax', + index: 'vatmoney', width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatmoney }) } }, { title: '税率', @@ -53,7 +53,7 @@ export class ExpressDetailModalComponent implements OnInit { width: 90, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vatnotax }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.vattax }) } }, { title: '开票日期', index: 'invoicedate', type: 'date', width: 150, className: 'text-center' } ]; From 6bb5f3808e3d38a4d07e6f2f30d8a2b48601ab83 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 17:47:04 +0800 Subject: [PATCH 11/25] e --- .../driver-account-detail.component.ts | 9 +++++++-- .../driver-account/driver-account.component.ts | 5 +++-- .../recharge-record/recharge-record.component.ts | 3 ++- .../transaction-flow/transaction-flow.component.ts | 3 ++- .../withdrawals-detail/withdrawals-detail.component.ts | 3 ++- .../withdrawals-record/withdrawals-record.component.ts | 3 ++- .../withdrawals-detail/withdrawals-detail.component.ts | 6 +++--- .../withdrawals-record/withdrawals-record.component.ts | 3 ++- 8 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts index 0a384b6c..679bd575 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts @@ -165,7 +165,9 @@ export class DriverAccountDetailComponent implements OnInit { { title: '交易时间', index: 'createTime', type: 'date' }, { title: '流水号', index: 'channelPaySn' }, { title: '交易类型', index: 'tradeTypeLabel', className: 'text-center' }, - { title: '关联单号', index: 'businessNumber' }, + { title: '交易单号', index: 'businessNumber' }, + { title: '订单号', index: 'orderSn' }, + { title: '运单号', index: 'transportSn' }, { title: '收支类型', index: 'incomeTypeLabel', className: 'text-center' }, { title: '交易金额', @@ -182,7 +184,10 @@ export class DriverAccountDetailComponent implements OnInit { type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.accountBalance }) } - } + }, + { title: '付款方', index: 'payName'}, + { title: '收款方', index: 'payeeName' }, + { title: '备注', index: 'tradeContent' }, ]; } } diff --git a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts index 6ab9883f..7861fd50 100644 --- a/src/app/routes/financial-management/components/driver-account/driver-account.component.ts +++ b/src/app/routes/financial-management/components/driver-account/driver-account.component.ts @@ -164,7 +164,7 @@ export class DriverAccountComponent implements OnInit { { title: '司机姓名', width: 140, index: 'name' }, { title: '证件号码', width: 140, index: 'idNo' }, { title: '手机号', width: 140, index: 'phone' }, - { title: '网络货运人', width: 140, index: 'ltdName' }, + { title: '网络货运人', width: 180, index: 'ltdName' }, { title: '银行类型', width: 120, index: 'bankTypeLabel' }, { title: '虚拟账户', width: 140, index: 'virtualAccount' }, { @@ -186,13 +186,14 @@ export class DriverAccountComponent implements OnInit { { title: '本月累计提现金额', index: 'withdrawBalance', - width: 150, + width: 160, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.withdrawBalance }) } }, { title: '账户总余额', render: 'availableBalance', className: 'text-right', width: 180 }, { title: '创建时间', index: 'createTime', type: 'date', width: 150 }, + { title: '状态', index: 'stateDeletedLabel', width: 120 }, { title: '操作', width: 120, diff --git a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts index c73b8833..85e4899b 100644 --- a/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts +++ b/src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts @@ -190,7 +190,8 @@ export class RechargeRecordComponent implements OnInit { rmYll: item.roleId, snglFlgCd: item.paySerialNumber2, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts index 92cb10f7..98465648 100644 --- a/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts +++ b/src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts @@ -253,7 +253,8 @@ export class TransactionFlowComponent { rmYll: item.roleId, snglFlgCd: item.channelPaySn, bussType: item.tradeType === '7' ? '05' : item.tradeType === '8' ? '06' : '07', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index 77f2cfd9..85144954 100644 --- a/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -99,7 +99,8 @@ export class WithdrawalsDetailComponent implements OnInit { rmYll: this.formData.userId, snglFlgCd: this.formData.coreSerNo, bussType: '06', - ltdId: this.formData.ltdId + ltdId: this.formData.ltdId, + accountType: this.formData.accountType }); } 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 42734ac9..907c9ad5 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 @@ -297,7 +297,8 @@ export class WithdrawalsRecordComponent { rmYll: item.userId, snglFlgCd: item.coreSerNo, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) } ] diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts index 95657e1e..baf83686 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts @@ -2,7 +2,6 @@ import { Component, OnInit } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { FreightAccountService } from 'src/app/routes/financial-management/services/freight-account.service'; - @Component({ selector: 'app-partner-account-management-withdrawals-detail', templateUrl: './withdrawals-detail.component.html', @@ -18,7 +17,7 @@ export class PartnerAccountManagementWithdralDetailComponent implements OnInit { this.loadRefundDetail(id); } - ngOnInit(): void { } + ngOnInit(): void {} loadRefundDetail(id: string) { this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => { @@ -77,7 +76,8 @@ export class PartnerAccountManagementWithdralDetailComponent implements OnInit { rmYll: this.formData.userId, snglFlgCd: this.formData.coreSerNo, bussType: '06', - ltdId: this.formData.ltdId + ltdId: this.formData.ltdId, + accountType: this.formData.accountType }); } diff --git a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts index 4bb0a0d9..ad7c8ead 100644 --- a/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts +++ b/src/app/routes/partner/account-management/components/withdrawals-record/withdrawals-record.component.ts @@ -311,7 +311,8 @@ export class PartnerAccountManagementWithdrawalsRecordComponent implements OnIni rmYll: item.userId, snglFlgCd: item.coreSerNo, bussType: '06', - ltdId: item.ltdId + ltdId: item.ltdId, + accountType: item.accountType }) }, { From afd993db5125becc247ed7593d1cf8b58bd6ed60 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 17:55:49 +0800 Subject: [PATCH 12/25] e --- .../cancellation-invoice.component.ts | 9 +++++++++ .../routes/ticket-management/services/ticket.service.ts | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index be6850ef..5911e06b 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -205,6 +205,10 @@ export class CancellationInvoiceComponent implements OnInit { }); } + downLoadDetail(item: any) { + this.service.exportStart({ id: item.id }, this.service.$api_export_invoic_detail); + } + /** * 推送发票 * @param item @@ -387,6 +391,11 @@ export class CancellationInvoiceComponent implements OnInit { queryParams: { type: 1, expressno: item.expressno, ltdId: item.shipperId } }) }, + { + text: '销货清单
', + iif: item => item.isdetail, + click: item => this.downLoadDetail(item) + }, { text: '手工开票
', iif: item => item.sts != '3', diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index a3629120..932f19c9 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -46,6 +46,8 @@ export class TicketService extends ShipperBaseService { $api_batch_push_invoic = '/api/fcc/ficoVatinvH/crmPushInvoBath'; // 发票作废 $api_cancel_invoic = '/api/fcc/ficoVatinvH/inpinvHCancel'; + // 运营端销票处理导出销售清单 + $api_export_invoic_detail = '/api/fcc/ficoVatinvH/reportVatinvHByOperator'; // 获取汇总下单路径 $api_get_order_summary_path = '/api/fcc/ficoExpressH/getSummaryOrderAddress'; @@ -60,7 +62,7 @@ export class TicketService extends ShipperBaseService { $api_get_invoice_page = '/api/fcc/ficoVatinvH/list/page'; // 更新快递信息 - $api_update_Express= '/api/fcc/ficoVatinvH/updateExpress'; + $api_update_Express = '/api/fcc/ficoVatinvH/updateExpress'; // 发票作废 $api_cancel_invoice = '/api/fcc/ficoVatinvH/inpinvHCancel'; @@ -121,7 +123,7 @@ export class TicketService extends ShipperBaseService { // 根据地区code查询列表 $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; - + constructor(public injector: Injector) { super(injector); } From f2c9ad8982114a2327e70f1cc10a0770f3ff3ea3 Mon Sep 17 00:00:00 2001 From: heqinghang Date: Mon, 28 Mar 2022 17:59:42 +0800 Subject: [PATCH 13/25] 666 --- .../components/edit/edit.component.html | 2 +- .../components/edit/edit.component.ts | 25 +++++++++++++------ .../components/list/list.component.ts | 16 ++---------- .../services/channel-sales.service.ts | 4 +++ 4 files changed, 25 insertions(+), 22 deletions(-) diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.html b/src/app/routes/partner/channel-sales/components/edit/edit.component.html index ba3e7981..7386c7af 100644 --- a/src/app/routes/partner/channel-sales/components/edit/edit.component.html +++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.html @@ -1,4 +1,4 @@ - +
diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts index 891e45e3..6b143413 100644 --- a/src/app/routes/partner/channel-sales/components/edit/edit.component.ts +++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.ts @@ -17,7 +17,8 @@ export class ParterChannelSalesEditComponent implements OnInit { ui!: SFUISchema; i: any; type: any; - + record:any; + currentOAItem:any; constructor( public http: _HttpClient, private cdr: ChangeDetectorRef, @@ -28,7 +29,14 @@ export class ParterChannelSalesEditComponent implements OnInit { ) {} ngOnInit(): void { - this.initSF(); + + this.service.request(this.service.$api_getChannelSalesInfo, {id:this.i?.id}).subscribe(res => { + if(res){ + this.record = res; + } + this.initSF(); + }); + } initSF() { this.schema = { @@ -62,10 +70,14 @@ export class ParterChannelSalesEditComponent implements OnInit { placeholder:'请选择', asyncData: (input:string) => this.service.request(this.service.$api_fuzzyQuery,{name:input}).pipe( map((res: any) => { - console.log('111',res) - return []; + return res.map((item:any)=>{ + return {label: item.empName+"/"+item.empNo, value: item.empNo, obj: item} + }) }) - ) + ), + change:(item:any, org:any)=>{ + this.currentOAItem = org.obj; + } } as SFAutoCompleteWidgetSchema, }, isAuthorization: { @@ -89,7 +101,6 @@ export class ParterChannelSalesEditComponent implements OnInit { mode: 'multiple', maxMultipleCount: 5, asyncData: () => { - return this.service.request(this.service.$api_getAppRoleList).pipe( map((res: any) => { return res @@ -134,7 +145,7 @@ export class ParterChannelSalesEditComponent implements OnInit { save() { this.sf.validator({ emitError: true }); if(!this.sf.valid) return; - this.service.request(this.service.$api_save, { ...this.sf.value }).subscribe(res => { + this.service.request(this.service.$api_save, { ...this.sf.value, employeeVO: this.currentOAItem}).subscribe(res => { if (res) { this.modalRef.destroy(true); } else { diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts index 25cb97c5..ba7097ec 100644 --- a/src/app/routes/partner/channel-sales/components/list/list.component.ts +++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts @@ -98,10 +98,6 @@ export class ParterChannelSalesListComponent implements OnInit { text: '编辑', click: (_record, _modal, _instance) => this.edit(_record), }, - { - text: '查看', - click: (_record, _modal, _instance) => this.view(_record), - }, { text: '冻结', click: (_record, _modal, _instance) => this.stop(_record.id), @@ -116,7 +112,6 @@ export class ParterChannelSalesListComponent implements OnInit { nzWidth:600, nzTitle: '新增', nzContent: ParterChannelSalesEditComponent, - nzComponentParams: { type: this.spuStatus } }); modalRef.afterClose.subscribe(res => { if (res) { @@ -131,7 +126,7 @@ export class ParterChannelSalesListComponent implements OnInit { nzWidth:600, nzTitle: '编辑', nzContent: ParterChannelSalesEditComponent, - nzComponentParams: { i: record, type: this.spuStatus } + nzComponentParams: { i: record } }); modalRef.afterClose.subscribe(res => { if (res) { @@ -140,14 +135,7 @@ export class ParterChannelSalesListComponent implements OnInit { }); } - // 编辑 - view(record: STData) { - const modalRef = this.modalService.create({ - nzTitle: '查看', - nzContent: ParterChannelSalesEditComponent, - nzComponentParams: { i: record } - }); - } + stop(id: any) { this.modalService.confirm({ diff --git a/src/app/routes/partner/channel-sales/services/channel-sales.service.ts b/src/app/routes/partner/channel-sales/services/channel-sales.service.ts index 358ef4f2..9382c6a9 100644 --- a/src/app/routes/partner/channel-sales/services/channel-sales.service.ts +++ b/src/app/routes/partner/channel-sales/services/channel-sales.service.ts @@ -15,6 +15,10 @@ export class ChannelSalesService extends BaseService { $api_fuzzyQuery = '/api/mdc/channelSalesManagement/fuzzyQuery'; // 获取角色列表 $api_getAppRoleList = '/api/mdc/cuc/roleInfo/getRoleList'; + // 获取渠道销售管理详情 + $api_listChannelSalesManagement = '/api/mdc/channelSalesManagement/list/listChannelSalesManagement'; + // 根据渠道销售id获取渠道信息 + $api_getChannelSalesInfo = '/api/mdc/channelSalesManagement/getChannelSalesInfo'; constructor(public injector: Injector) { From ac7eb6e3db44af16a28eb672452fdd7f29845e92 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 20:29:22 +0800 Subject: [PATCH 14/25] fix bug --- .../add-partnerlist.component.html | 34 ++-- .../add-partnerlist.component.ts | 157 ++++-------------- .../rebate-setting/add/add.component.html | 46 ++--- .../rebate-setting/add/add.component.less | 6 + .../rebate-setting/add/add.component.ts | 68 +++++++- .../rebate-setting.component.ts | 2 +- .../services/rebate-management.service.ts | 4 + .../rebate-table/rebate-table.component.html | 10 +- .../rebate-table/rebate-table.component.ts | 104 +++++------- 9 files changed, 191 insertions(+), 240 deletions(-) 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 a7dd9b7c..a537892f 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 @@ -1,38 +1,30 @@ +
-
+
- - - -
- -
-
- - - -
-
- + [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 6e7c094b..e78d09ef 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 @@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild, Type } from '@angular/core'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ShipperBaseService } from '@shared'; -import { NzModalService } from 'ng-zorro-antd/modal'; +import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { RebateManagementService } from '../../../services/rebate-management.service'; @@ -32,45 +32,30 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { columns: STColumn[] = [ { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, - { title: '异常编号', index: 'exceptionCode', width: '140px', className: 'text-left', }, - { title: '订单号', index: 'billCode', width: '160px', className: 'text-left', }, - { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left', }, - { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left', }, - { title: '承运司机', index: 'driver', width: '180px', className: 'text-left', }, - { title: '异常信息', index: 'exceptionContent', width: '100px', className: 'text-left', }, - { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '150px', className: 'text-left', }, - { title: '上报时间', index: 'createTime', width: '140px', className: 'text-left', }, { - title: '操作', index: 'createTime', width: '90px', className: 'text-left', + title: '合伙人名称', + index: 'enterpriseName', + width: 180, + format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '') + }, + { title: '联系人', index: 'contactName', width: 150, format: item => (item.partnerType ? `${item.contactName}` : '') }, + { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 }, + { title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } }, + { + title: '操作', width: '90px', fixed: 'right', buttons: [ { - text: '回复', - click: _record => this.reply(_record), + text: '添加', + click: _record => this.add(_record), acl: { ability: ['AbnormalAppear-reply'] } }, ] }, ]; - columns2: STColumn[] = [ - { title: '异常编号', index: 'exceptionCode', width: '140px', className: 'text-left' }, - { title: '订单号', index: 'billCode', width: '160px', className: 'text-left' }, - { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' }, - { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' }, - { title: '承运司机', index: 'driver', width: '180px', className: 'text-left' }, - { title: '异常信息', index: 'exceptionContent', width: '100px', className: 'text-left' }, - { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '150px', className: 'text-left' }, - { title: '上报时间', index: 'createTime', width: '140px', className: 'text-left' }, - { title: '回复内容', index: 'replyContent', width: '150px', className: 'text-left' }, - { title: '回复人', index: 'replyAppUserName', width: '90px', className: 'text-left' }, - { title: '回复时间', index: 'replyTime', width: '140px', className: 'text-left' }, - ]; get reqParams() { - let params: any = { ...this.sf?.value }; - if (params.reportingTime) { - const reportingTime = { start: this.sf?.value?.reportingTime?.[0], end: this.sf?.value?.reportingTime?.[1] } - params.reportingTime = reportingTime; - } + // signStatus固定传20 代表签约完成 + let params: any = { ...this.sf?.value,signStatus: 20 }; return params; } @@ -80,93 +65,46 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { constructor( public service: RebateManagementService, - private nzModalService: NzModalService, public shipperSrv: ShipperBaseService, private modal: NzModalService, + private modals: NzModalRef, ) { } ngOnInit(): void { this.initSF() } - - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } initSF() { this.schema = { properties: { - _$expand: { type: 'boolean', ui: { hidden: true } }, - exceptionCode: { + enterpriseName: { type: 'string', - title: '异常编号', - ui: { placeholder: '请输入' } + title: '合伙人名称' }, - billCode: { - type: 'string', - title: '订单号', - ui: { - placeholder: '最多100个订单，空号隔开', - } - }, - exceptionType: { - title: '异常类型', - type: 'string', - ui: { - widget: 'dict-select', - containsAllLabel: true, - params: { dictKey: 'exception:report:type' }, - } as SFSelectWidgetSchema - }, - driverName: { - title: '承运司机', + partnerType: { type: 'string', + title: '类型', + enum: [ + { value: '', label: '全部' }, + { value: 1, label: '企业' }, + { value: 2, label: '个人' } + ], ui: { + widget: 'select', + placeholder: '请选择', visibleIf: { - _$expand: (value: boolean) => value + expand: (value: boolean) => value } - } + }, + default: '' }, - carNo: { - title: '车牌号', - type: 'string', - ui: { - visibleIf: { - _$expand: (value: boolean) => value - } - } - }, - reportingTime: { - title: '上报时间', - type: 'string', - ui: { - widget: 'date', - mode: 'range', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value - } - } as SFDateWidgetSchema } - } - }; + } this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } search() { - if (this.selectedIndex === 0) { this.st?.load(1) - } } selectedIndexChange(event: any) { @@ -181,22 +119,10 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { this.sf.reset(); } // 回复操作 - reply(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '回复', - // nzWidth: 700, - // nzContent: AbnormalReplyComponent, - // nzComponentParams: { - // i: item - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe((res) => { - // if (res) { - // this.resetSF; - // this.st.load(); - // } - // }); + add(item: any) { + console.log(item); + this.modals.destroy(item) + } // 批量回复操作 batchReply() { @@ -204,17 +130,6 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { // this.service.msgSrv.warning('请勾选数据！') // return; // } - // const modalRef = this.modal.create({ - // nzTitle: '批量回复', - // nzContent: AbnormalreplyBatchComponent, - // nzComponentParams: { - // selectedRows: this.selectedRows - // }, - // nzFooter: null - // }); - // modalRef.afterClose.subscribe(() => { - // this.resetSF; - // this.st.load(); - // }); + this.modals.destroy(this.selectedRows) } } 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 1256170c..e0092a17 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,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 15:39:27 + * @LastEditTime : 2022-03-28 19:46: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. --> @@ -14,26 +14,34 @@ -    +    固定结算费率配置 -     % +     % 业务量和管理费比例配置    - - - + + + -    +    + 关联合伙人配置    - + + +   添加 + +    @@ -49,17 +57,11 @@ -
- - -
+
+ + +
 - -
- - -
- diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.less b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.less index 0c812cac..fe7d3fd2 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.less +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.less @@ -7,4 +7,10 @@ font-weight: 700; } } + .align-center { + display: flex; + align-items: center; + justify-content: center; + } + } 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 3821b57f..8cec166a 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-28 14:45:41 + * @LastEditTime : 2022-03-28 19:47:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -17,17 +17,23 @@ import { processSingleSort, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { RebateManagementService } from '../../../services/rebate-management.service'; import { ParterRebateManageMentAddPartnerListComponent } from '../add-partnerlist/add-partnerlist.component'; +import { inRange } from '@delon/util'; @Component({ selector: 'app-parter-channel-rebate-management-add', styleUrls: ['./add.component.less'], templateUrl: './add.component.html' }) export class ParterRebateManageMentAddComponent implements OnInit { - setValue: string = ''; - toFixedValue: Number = 2; - radioValue = 'A'; + configName: string = ''; + accountingRate: Number = 2; + partnerPeople: any; + partnerPeopleList: any; + peopleStatus: boolean = true; + configType = '1'; precision = 2; inputValue = ''; + @ViewChild('st', { static: true }) + st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; schema1!: SFSchema; constructor( @@ -37,6 +43,27 @@ export class ParterRebateManageMentAddComponent implements OnInit { private modal: NzModalService, public shipperservice: ShipperBaseService ) {} + columns: STColumn[] = [ + { + title: '合伙人名称', + index: 'enterpriseName', + width: 180, + format: item => (item.partnerType ? `${item.enterpriseName || item.contactName}` : '') + }, + { title: '联系人', index: 'contactName', width: 150, format: item => (item.partnerType ? `${item.contactName}` : '') }, + { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 }, + { title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } }, + { + title: '操作', width: '90px', fixed: 'right', + buttons: [ + { + text: '移除', + click: _record => this.delete(_record), + acl: { ability: ['AbnormalAppear-reply'] } + }, + ] + }, + ]; initSF(data?: any) { this.schema1 = { properties: { @@ -63,21 +90,46 @@ export class ParterRebateManageMentAddComponent implements OnInit { window.history.go(-1); } /** - *申请退款 + *合伙人选择 */ add(item?: any) { const modalRef = this.modal.create({ - nzTitle: '申请退款', + nzTitle: '合伙人选择', + nzWidth: 1000, nzContent: ParterRebateManageMentAddPartnerListComponent, nzComponentParams: { i: item, }, nzFooter: null }); - modalRef.afterClose.subscribe((res: boolean) => { + modalRef.afterClose.subscribe((res: any) => { if (res) { - + console.log(Array.isArray(res)); + console.log(res); + if(Array.isArray(res)) { + this.partnerPeopleList = res; + this.peopleStatus = false + } else { + this.partnerPeople = res?.enterpriseName; + } } }); } + delete(item: any) { + console.log(item); + } + save () { + const params = { + accountingRate: this.accountingRate, + configName: this.configName, + configType: this.configType, + rebateConfigLineDTO: {} + } + this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { + if(res) { + console.log(res); + + } + }) + } } diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index 3c4cd8df..7baea11d 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts @@ -166,7 +166,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { }); } configAction() { - this.router.navigate(['/partner/rebate/setting/add', '']) + this.router.navigate(['/partner/rebate/setting/add/', 1]) } /** * 重置表单 diff --git a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts index c7dd9b2e..2049cbba 100644 --- a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts +++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts @@ -19,6 +19,10 @@ export class RebateManagementService extends BaseService { public $api_get_listCompliancePage = '/api/sdc/billRiskOperate/listRiskPage'; // 查询返佣配置表 public $api_get_rebateConfig = '/api/mdc/rebateConfig/list/page'; + // 保存返佣配置表 + public $api_save_rebateConfig = '/api/mdc/rebateConfig/save'; +   // 查询合伙人信息-分页 + public $api_get_partner_page = '/api/mdc/partner/list/page'; 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 d8912be8..2e0c766c 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-03-21 14:14:06 + * @LastEditTime : 2022-03-28 20:26:30 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -37,7 +37,7 @@
- + @@ -46,7 +46,7 @@
- @@ -56,7 +56,7 @@
- +
@@ -64,7 +64,7 @@
- diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts index e8699d14..5274f3b1 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.ts +++ b/src/app/shared/components/rebate-table/rebate-table.component.ts @@ -10,7 +10,14 @@ import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; styleUrls: ['./rebate-table.component.less'] }) export class RebateTableComponent implements OnInit { - data: any[] = []; + data: any[] = [ + { + gradeConfigId: '', + startAmount: 0, + endAmount: 0, + managementFeeRatio: 0, + } + ]; headers: any[] = []; formatterDollar = (value: number): string => `${value}`; changeSub = new Subject(); @@ -18,70 +25,57 @@ export class RebateTableComponent implements OnInit { ngOnInit(): void { this.loadData(); - this.changeEndKmAction(); + this.changeendAmountAction(); } loadData() { - this.service.request('/api/mdc/cuc/insuranceConfig/list').subscribe(res => { - if (res) { - console.log(res); - this.data = res; - this.cdr.detectChanges(); - } - }); - this.service.request('/api/mdc/pbc/sysConfigItem/findItemValueByItemKeys', [ - "rebate.config.minrebatePrice" - ]).subscribe(res => { - if (res) { - console.log(res); - } - }); + // this.service.request('/api/mdc/cuc/insuranceConfig/list').subscribe(res => { + // if (res) { + // console.log(res); + // this.data = res; + // this.cdr.detectChanges(); + // } + // }); + // this.service.request('/api/mdc/pbc/sysConfigItem/findItemValueByItemKeys', [ + // "rebate.config.minrebatePrice" + // ]).subscribe(res => { + // if (res) { + // console.log(res); + // } + // }); } - /** - * 修改结束车长 - * @param event 车长 - * @param i 下标 - */ - changeEndLength(event: any, i: number) { - if (event <= this.headers[i].startLength) { - this.headers[i].endLength = this.headers[i].startLength + 1; - this.changeNextStartLength(event, i + 1); - return; - } - this.headers[i].endLength = event; - this.changeNextStartLength(event, i + 1); - } + /** * 修改结束公里数 * @param event 车长 * @param i 下标 */ - changeEndKm(event: any, i: number) { + changeendAmount(event: any, i: number) { if (event) { console.log(event); this.changeSub.next(`${event},${i}`); } } - changeEndKmAction() { + changeendAmountAction() { this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { if (res) { const paras = res.split(','); const num = Number(paras[0]); const i = Number(paras[1]); - if (num <= this.data[i].startKm) { - this.data[i].endKm = null; + if (num <= this.data[i].startAmount) { + this.data[i].endAmount = null; setTimeout(() => { - this.data[i].endKm = this.data[i].startKm + 1 ; + this.data[i].endAmount = this.data[i].startAmount + 1 ; }, 0); - this.changeNextStartKm(this.data[i].startKm + 1, i + 1); + this.changeNextstartAmount(this.data[i].startAmount + 1, i + 1); return; } - this.data[i].endKm = num; - this.changeNextStartKm(num, i + 1); + this.data[i].endAmount = num; + this.changeNextstartAmount(num, i + 1); } }); } @@ -90,14 +84,14 @@ export class RebateTableComponent implements OnInit { console.log(this.data); const tem = this.data[this.data?.length - 1]; - if (tem && tem.endKm) { + if (tem) { this.data.push({ - endKm: '', - startKm: tem.endKm + gradeConfigId: '', + startAmount: 0, + endAmount: 0, + managementFeeRatio: 0, }); this.data = [...this.data]; - } else { - this.service.msgSrv.warning('请填写完整公里数'); } } @@ -125,32 +119,18 @@ export class RebateTableComponent implements OnInit { }); } - /** - * 遍历同步后置位车长 - * @param event 车长 - * @param i 下标 - */ - private changeNextStartLength(event: number, i: number) { - if (this.headers[i]) { - this.headers[i].startLength = event; - if (this.headers[i].endLength <= event) { - this.headers[i].endLength = this.headers[i].startLength + 0.5; - this.changeNextStartLength(event + 0.5, i + 1); - } - } - } /** * 遍历同步后置位公里数 * @param event 车长 * @param i 下标 */ - private changeNextStartKm(event: number, i: number) { + private changeNextstartAmount(event: number, i: number) { if (this.data[i]) { - this.data[i].startKm = event; - if (this.data[i].endKm <= event) { - this.data[i].endKm = this.data[i].startKm + 1; - this.changeNextStartKm(event + 1, i + 1); + this.data[i].startAmount = event; + if (this.data[i].endAmount <= event) { + this.data[i].endAmount = this.data[i].startAmount + 1; + this.changeNextstartAmount(event + 1, i + 1); } } } From 414cfedb3eefcd0ca0e88f90c6e68446521b2b24 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 20:32:18 +0800 Subject: [PATCH 15/25] fix bug --- .../components/bulk-detail/bulk-detail.component.html | 3 +-- .../components/vehicle-detail/vehicle-detail.component.html | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index e2b95634..bc0f83bd 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-24 14:08:55 + * @LastEditTime : 2022-03-28 20:30:13 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -45,7 +45,6 @@ {{ i?.goodsResource?.serviceTypeLabel }} {{ i?.createUserName }} /{{ i?.createUserPhone }} {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} - {{ i?.externalBillCode }} {{ i?.goodsResource?.resourceCode }} {{ i?.wayBill?.wayBillCode }} {{ i?.goodsResource?.paymentDays }} diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 1d8427aa..bba736fc 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-21 14:43:57 + * @LastEditTime : 2022-03-28 20:31:30 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -47,7 +47,7 @@ {{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} {{ i?.externalBillCode }} {{ i?.goodsResource?.resourceCode }} - {{ i?.wayBillId }} + {{ i?.wayBill?.wayBillCode }} {{ i?.goodsResource?.paymentDays }}
From d6fb98752c6cbba2e3a465ffc0383bcbe97d173b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 20:40:18 +0800 Subject: [PATCH 16/25] fix bug --- .../routes/waybill-management/components/bulk/bulk.component.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index 51176b02..3cf71479 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -372,6 +372,8 @@ export class WaybillManagementBulkComponent implements OnInit { console.log(e); if (e >= 1) { this.resourceStatus = e + 1; + } else { + this.resourceStatus = 0 } this.initST(); setTimeout(() => { From a6340fc43bb43079aa60a9fe5bd01b250cc4d02c Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 20:42:15 +0800 Subject: [PATCH 17/25] fix bug --- .../routes/order-management/components/risk/risk.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 20c05ddc..e33769f2 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -334,7 +334,7 @@ export class OrderManagementRiskComponent implements OnInit { { text: '审核', click: _record => this.audit(_record), - iif: item => item.auditStatus == '1' , + iif: item => item.representationsStatus == '2' , acl: { ability: ['ORDER-RISK-audit'] }, }, { From b87e2f68987a8f1075a977a3dcb33df398e27132 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 28 Mar 2022 20:47:28 +0800 Subject: [PATCH 18/25] fix bug --- .../routes/order-management/components/risk/risk.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index e33769f2..22805f6f 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -340,6 +340,7 @@ export class OrderManagementRiskComponent implements OnInit { { text: '详情', click: _record => this.viewEvaluate(_record), + iif: item => item.representationsStatus !== '1' , acl: { ability: ['ORDER-RISK-riskDetail'] }, } ] From 4439f949568543010bc6f9b35ea1f5e6c9dd73f0 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 29 Mar 2022 09:29:56 +0800 Subject: [PATCH 19/25] fix bug --- .../routes/order-management/components/risk/risk.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index 22805f6f..768350d9 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -133,7 +133,7 @@ export class OrderManagementRiskComponent implements OnInit { type: 'string', title: '订单号', ui: { - placeholder: '最多100个单号，空号隔开' + placeholder: '请输入订单号' } }, resourceCode: { From dd60f6c1f32a86f8c5e83db433008c378feeaaf5 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 29 Mar 2022 10:19:35 +0800 Subject: [PATCH 20/25] edit --- .../invoice-detail/invoice-detail.component.ts | 14 +++++++------- .../invoice-requested.component.ts | 2 ++ .../requested-invoice-modal.component.ts | 2 ++ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts index 1ae799ba..b4bedae1 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.ts @@ -154,13 +154,13 @@ export class InvoiceDetailComponent implements OnInit { { title: '卸货地', index: 'loadingto', width: 220 }, { title: '货物信息', index: 'goodsinfo', width: 140 }, { title: '承运司机', index: 'driverinfo', width: 280 }, - { - title: '税额', - index: 'billvatrate', - width: 120, - className: 'text-right', - format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%` - }, + // { + // title: '税额', + // index: 'billvatrate', + // width: 120, + // className: 'text-right', + // format: item => `${item.billvatrate ? ((item.billvatrate as number) * 100).toFixed(2) : 0}%` + // }, { title: '申请金额', index: 'billkpnotax', diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index a21104a4..525c984a 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -55,6 +55,8 @@ export class InvoiceRequestedComponent { }; afterRes = (data: any[], rawData?: any) => { + this.totalCallNo = 0; + this.selectedRows = []; return data.map(item => ({ ...item, disabled: item.expressHSts diff --git a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts index ed1d8ae9..4a536279 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.ts @@ -47,6 +47,8 @@ export class RequestedInvoiceModalComponent { if (res) { this.service.msgSrv.success('移除成功'); this.modal.destroy(true); + } else { + this.service.msgSrv.warning('移除失败'); } }); } From 696ad9847bff62d87e666b77006d33ee32df56fa Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 29 Mar 2022 10:23:40 +0800 Subject: [PATCH 21/25] edit --- .../invoice-requested/invoice-requested.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 525c984a..04de18fb 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -438,7 +438,10 @@ export class InvoiceRequestedComponent { width: 150, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoicedMoney }) } + widget: { + type: 'currency-chy', + params: ({ record }) => ({ value: record.sts === '3' ? record.applyAmount : record.invoicedMoney }) + } }, { title: '开户行', index: 'bankName', width: 160 }, { title: '银行账户', index: 'bankAccount', width: 140 }, From f4aa043eed2f0a926b2297c71429a17c07a9fd53 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 29 Mar 2022 10:47:46 +0800 Subject: [PATCH 22/25] edit --- .../invoice-requested/invoice-requested.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 04de18fb..5ca09fc3 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -434,13 +434,13 @@ export class InvoiceRequestedComponent { }, { title: '已开票金额', - index: 'invoicedMoney', + index: 'vatmoney', width: 150, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', - params: ({ record }) => ({ value: record.sts === '3' ? record.applyAmount : record.invoicedMoney }) + params: ({ record }) => ({ value: record.vatmoney }) } }, { title: '开户行', index: 'bankName', width: 160 }, From 3c4f2251d22c029b93d594aabd4e4e5b8b95b580 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Tue, 29 Mar 2022 10:55:09 +0800 Subject: [PATCH 23/25] edit --- .../invoice-requested/invoice-requested.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index 5ca09fc3..d3e34775 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -434,13 +434,13 @@ export class InvoiceRequestedComponent { }, { title: '已开票金额', - index: 'vatmoney', + index: 'invoicedMoney', width: 150, type: 'widget', className: 'text-right', widget: { type: 'currency-chy', - params: ({ record }) => ({ value: record.vatmoney }) + params: ({ record }) => ({ value: record.invoicedMoney }) } }, { title: '开户行', index: 'bankName', width: 160 }, From 7fd86fde99b6d7fd73227f7f6b21ea897d80f774 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Tue, 29 Mar 2022 11:00:15 +0800 Subject: [PATCH 24/25] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datatable/datatable-routing.module.ts | 4 +- src/app/routes/datatable/datatable.module.ts | 4 +- .../order-reporting.component.html | 85 ++++ .../order-reporting.component.spec.ts | 24 + .../order-reporting.component.ts | 416 ++++++++++++++++++ .../reporting/services/reporting.service.ts | 15 + .../dict-select/dict-select.component.ts | 3 +- src/assets/mocks/menu-data.json | 11 +- 8 files changed, 555 insertions(+), 7 deletions(-) create mode 100644 src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html create mode 100644 src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.spec.ts create mode 100644 src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts create mode 100644 src/app/routes/datatable/reporting/services/reporting.service.ts diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts index 76a62af8..6f84e112 100644 --- a/src/app/routes/datatable/datatable-routing.module.ts +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -1,10 +1,12 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { DatatableDataindexComponent } from './dataindex/dataindex.component'; +import { DatatableOrderReportingComponent } from './reporting/components/order-reporting/order-reporting.component'; const routes: Routes = [ - { path: 'dataindex', component: DatatableDataindexComponent }]; + { path: 'dataindex', component: DatatableDataindexComponent }, + { path: 'reporting/order', component: DatatableOrderReportingComponent }]; @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index f996d3b5..e6b0e997 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -2,9 +2,11 @@ import { NgModule, Type } from '@angular/core'; import { SharedModule, SHARED_G2_MODULES } from '@shared'; import { DatatableRoutingModule } from './datatable-routing.module'; import { DatatableDataindexComponent } from './dataindex/dataindex.component'; +import { DatatableOrderReportingComponent } from './reporting/components/order-reporting/order-reporting.component'; const COMPONENTS: Type[] = [ - DatatableDataindexComponent]; + DatatableDataindexComponent, + DatatableOrderReportingComponent]; @NgModule({ imports: [ diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html new file mode 100644 index 00000000..7724c122 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -0,0 +1,85 @@ + + + + +
+
+ +
+
+ + + + +
+
+ + + + + + + + + + + {{item.billCode}} + + +
+
{{item.expenseName}}:{{item.price | currency}}
+
+ + +
{{ address }}
+ + +
{{ address }}
+ + +
+
货物名称 : {{item.goodsName}}
+
重量/体积 : {{item.weight}}/{{item.volume}}
+
车型/车长 :{{item.carModelLabel}}/{{item.carLengthLabel}}
+
+ + +
{{item.driverName}}
+
{{item.driverPhone}}
+
{{item.carNo}}
+ + +
{{item.payeeName}}
+
{{item.payeePhone}}
+ + +
创建时间:{{item.createTime}}
+
装货时间:{{item.loadTime}}
+
卸货时间:{{item.unloadTime}}
+ + +
{{item?.complianceName}}
+ + +
{{item?.billTypeLabel}} （{{item?.serviceTypeLabel}}）
+ + + + +
+
+ 已选择 + {{ selectedRows.length }} 条数据 +
+ + + +
+ diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.spec.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.spec.ts new file mode 100644 index 00000000..2c07610f --- /dev/null +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableOrderReportingComponent } from './order-reporting.component'; + +describe('DatatableOrderReportingComponent', () => { + let component: DatatableOrderReportingComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableOrderReportingComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableOrderReportingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts new file mode 100644 index 00000000..28e93168 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -0,0 +1,416 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router, ActivatedRoute } from '@angular/router'; +import { STColumn, STComponent, STData } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { ShipperBaseService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { ReportingService } from '../../services/reporting.service'; + +@Component({ + selector: 'app-datatable-order-reporting', + templateUrl: './order-reporting.component.html', +}) +export class DatatableOrderReportingComponent implements OnInit { + _$expand = false; + ui!: SFUISchema; + schema!: SFSchema; + columns!: STColumn[]; + @ViewChild('st', { static: false }) st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + tabType!: string; + tabs: any[] = [ + { name: '待上传', value: '1' }, + { name: '上传中', value: '2' }, + { name: '已上传', value: '3' }, + { name: '异常', value: '4' }, + { name: '全部', value: '' } + ]; + selectedIndex = ''; //选择的项目 + serviceTel = ''; + constructor( + public service: ReportingService, + private router: Router, + private ar: ActivatedRoute, + private modal: NzModalService, + public shipperSrv: ShipperBaseService + ) { + } + + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + + /** + * 查询参数 + */ + get reqParams() { + const params = Object.assign({}, this.sf?.value || {}, { + representationsStatus: this.selectedIndex, + }); + delete params._$expand; + return { ...params }; + } + + /** + * 选中行 + */ + get selectedRows() { + return this.st?.list.filter((item: any) => item.checked) || []; + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + /** + * 程序初始化入口 + */ + ngOnInit() { + this.initSF(); + this.initST(); + } + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, + resourceCode: { + type: 'string', + title: '运单号', + ui: { + placeholder: '请输入', + }, + }, + enterpriseInfoId: { + title: '网络货运人', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'select', + asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), + + allowClear: true + } + }, + externalResourceCode: { + title: '货主', + type: 'string', + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + driverName: { + title: '承运司机', + type: 'string', + ui: { + placeholder: '请输入司机姓名/手机号', visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + carNo: { + title: '车牌号', + type: 'string', + maxLength: 9, + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + serviceType: { + title: '上传状态', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + serviceType1: { + title: '本地校验', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + createTime: { + title: '上传时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + createTime1: { + title: '运单生成时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + createTime2: { + title: '发货时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + createTime3: { + title: '收货时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + + loadingPlace: { + title: '车辆轨迹', + type: 'string', + enum: [ + { label: '全部', value: '' }, + { label: '有', value: '1' }, + { label: '无', value: '0' } + ], + ui: { + placeholder: '请选择', + + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + loadingPlace1: { + title: '司机轨迹', + type: 'string', + enum: [ + { label: '全部', value: '' }, + { label: '有', value: '1' }, + { label: '无', value: '0' } + ], + ui: { + placeholder: '请选择', + + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + }, + }; + this.ui = { + '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, + $time: { grid: { span: 24 } }, + }; + } + + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { title: '', type: 'checkbox', className: 'text-center', width: '80px', }, + { title: '订单状态', index: 'name', className: 'text-center', width: '120px', }, + { title: '司机状态', index: 'name', className: 'text-center', width: '120px', }, + { title: '车辆状态', index: 'name', className: 'text-center', width: '120px', }, + { title: '本地校验', render: 'orderSn', className: 'text-center', width: '180px', }, + { + title: '订单号', + render: 'billComplianceVOS', + className: 'text-center', + width: '150px', + }, + { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, + + { + title: '网络货运人', + render: 'serviceType', + className: 'text-center', + width: '120px', + }, + { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '300px' }, + { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '300px' }, + { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '200px' }, + { title: '发货时间', render: 'driver', className: 'text-center', width: '150px' }, + { title: '收货时间', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '300px' }, + { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '300px' }, + { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '200px' }, + { title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' }, + { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '运费金额', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '车牌颜色', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '司机姓名', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '司机手机号码', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '250px' }, + { + title: '操作', + width: '200px', + className: 'text-center', + buttons: [ + // { text: '编辑', click: (_record: any) => this.appeal(_record) }, + { + text: '申诉', + // click: (record) => this.appeal(record), + iif: (_record) => _record.representationsStatus === '1', + acl: { 'ability': ['RiskOrder-Appeal'] } + }, + { + text: '撤销申诉', + pop: { + title: '是否确定立即撤销申诉？', + okType: 'danger', + }, + click: (record) => this.recall(record), + iif: (_record) => _record.representationsStatus === '2', + acl: { 'ability': ['RiskOrder-CancleAppeal'] } + }, + { text: '详情', click: (_record: any) => this.view(_record), acl: { 'ability': ['RiskOrder-Detail'] } }, + ], + }, + ]; + } + + + + /** + * 删除单个实例 + * @param record 记录实例 + */ + recall(record: STData) { + this.service.request(this.service.$api_recall_reporting, { id: record?.id }).subscribe((res: any) => { + if (res) { + this.search({ representationsStatus: '' }); + } + }) + + } + + selectChange(item: any) { + this.selectedIndex = item?.representationsStatus || ''; + setTimeout(() => { + this.st.load(1); + }) + } + + /** + * 查看当行数据 + */ + view(record: STData) { + // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); + this.router.navigate(['../detail'], { + queryParams: { + id: record.id, + }, + relativeTo: this.ar + }); + } + + // appeal(item: any) { + // const modalRef = this.modal.create({ + // nzTitle: '申诉', + // nzWidth: '40%', + // nzContent: CtcAppealComponent, + // nzComponentParams: { + // i: item, + // status: 'add' + // }, + // nzFooter: null + // }); + // modalRef.afterClose.subscribe(res => { + // if (res) { + // this.search({ representationsStatus: '' }); + // } + // }) + // } + + /** + * 上传 + */ + upload() { + + } + + + /** + * + * @param params 上传设置 + */ + uploadSetting() { + + } + + search(params = {}) { + this.st.load(1); + } + + /** + * 异步导出 + */ + export() { + this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); + } + +} diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts new file mode 100644 index 00000000..99a1cad7 --- /dev/null +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -0,0 +1,15 @@ +import { Injectable, Injector } from '@angular/core'; +import { BaseService } from '@shared'; + +@Injectable({ + providedIn: 'root' +}) +export class ReportingService extends BaseService { + + $api_order_reporting_page = ``; // 订单上报列表 + $api_recall_reporting = ``; // 撤回 + $api_async_export_order_reporting_list = ``; // 导出订单上报 + constructor(public injector: Injector) { + super(injector); + } +} diff --git a/src/app/shared/components/dict-select/dict-select.component.ts b/src/app/shared/components/dict-select/dict-select.component.ts index 4639fb0a..e1f1aef1 100644 --- a/src/app/shared/components/dict-select/dict-select.component.ts +++ b/src/app/shared/components/dict-select/dict-select.component.ts @@ -29,7 +29,7 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor { @Input() containsAllLabel = true; // 是否包含全部这一选项 @Input() mode: 'multiple' | 'tags' | 'default' = 'default'; - constructor(public service: DictSelectService, public cdr: ChangeDetectorRef) {} + constructor(public service: DictSelectService, public cdr: ChangeDetectorRef) { } writeValue(geo: string): void { if (geo == null) { @@ -56,7 +56,6 @@ export class DictSelectComponent implements OnInit, ControlValueAccessor { if (this.dictList.length > 0 && this.containsAllLabel !== false) { const obj = { label: '全部', value: '' }; this.dictList.unshift(obj); - console.log(this.dictList); } this.cdr.markForCheck(); } diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 25563c4a..824190d8 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -640,9 +640,14 @@ "icon": "iconfont icon-hetong-copy", "group": true, "children": [{ - "text": "数据报表", - "link": "/regulatory-data/dashboard" - }] + "text": "数据报表", + "link": "/regulatory-data/dashboard" + }, + { + "text": "订单上报", + "link": "/datatable/reporting/order" + } + ] } ] }] From ed90f4090a8aeabd72118abe684cbe08e723c9ee Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 29 Mar 2022 11:10:12 +0800 Subject: [PATCH 25/25] fix bug --- .../bulk-detail-change.component.html | 2 +- .../bulk-detail/bulk-detail.component.html | 4 +- .../vehicle-detail-change.component.html | 2 +- .../vehicle-detail.component.html | 2 +- .../add-partnerlist.component.ts | 44 ++++++++++------- .../rebate-setting/add/add.component.html | 31 ++++++------ .../rebate-setting/add/add.component.ts | 38 +++++++++----- .../rebate-setting.component.html | 15 ++++-- .../rebate-setting.component.ts | 47 +++++++++++++----- .../services/rebate-management.service.ts | 2 + .../bulk-detail/bulk-detail.component.html | 2 +- .../vehicle-detail.component.html | 4 +- .../rebate-table/rebate-table.component.html | 9 ++-- .../rebate-table/rebate-table.component.ts | 49 +++++++++++-------- 14 files changed, 159 insertions(+), 92 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index a76a0439..7be8c803 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -360,7 +360,7 @@
- +
暂无附件信息
diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index bc0f83bd..50746e93 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 20:30:13 + * @LastEditTime : 2022-03-29 11:09:00 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -247,7 +247,7 @@ - +
暂无附件信息
diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index bffdaa4c..4bdf02bd 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -333,7 +333,7 @@
- +
暂无附件信息
diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index bba736fc..ccb172f1 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -230,7 +230,7 @@
- +
暂无附件信息
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 e78d09ef..65ce3f8c 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 @@ -1,6 +1,14 @@ import { Component, OnInit, ViewChild, Type } from '@angular/core'; import { STComponent, STColumn, STChange } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { + SFComponent, + SFDateWidgetSchema, + SFRadioWidgetSchema, + SFSchema, + SFSchemaEnum, + SFSelectWidgetSchema, + SFUISchema +} from '@delon/form'; import { ShipperBaseService } from '@shared'; import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; @@ -28,8 +36,6 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { editId = false; selectedIndex = 0; - - columns: STColumn[] = [ { title: '', type: 'checkbox', width: '50px', className: 'text-center' }, { @@ -42,20 +48,22 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { { title: '手机号', index: 'contactMobile', className: 'text-center', width: 150 }, { title: '类型', index: 'partnerType', className: 'text-center', width: 130, type: 'enum', enum: { 1: '企业', 2: '个人' } }, { - title: '操作', width: '90px', fixed: 'right', + title: '操作', + width: '90px', + fixed: 'right', buttons: [ { text: '添加', click: _record => this.add(_record), acl: { ability: ['AbnormalAppear-reply'] } - }, + } ] - }, + } ]; get reqParams() { - // signStatus固定传20 代表签约完成 - let params: any = { ...this.sf?.value,signStatus: 20 }; + // signStatus固定传20 代表签约完成 signStatus: 20 + let params: any = { ...this.sf?.value, }; return params; } @@ -67,12 +75,11 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { public service: RebateManagementService, public shipperSrv: ShipperBaseService, private modal: NzModalService, - private modals: NzModalRef, - - ) { } + private modals: NzModalRef + ) {} ngOnInit(): void { - this.initSF() + this.initSF(); } initSF() { this.schema = { @@ -97,19 +104,19 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { } }, default: '' - }, } - } + } + }; this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; } search() { - this.st?.load(1) + this.st?.load(1); } selectedIndexChange(event: any) { if (this.selectedIndex === 0) { - this.st?.load(1) + this.st?.load(1); } } /** @@ -121,8 +128,7 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { // 回复操作 add(item: any) { console.log(item); - this.modals.destroy(item) - + this.modals.destroy(item); } // 批量回复操作 batchReply() { @@ -130,6 +136,6 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { // this.service.msgSrv.warning('请勾选数据！') // return; // } - this.modals.destroy(this.selectedRows) + this.modals.destroy(this.selectedRows); } } 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 e0092a17..65cd23f9 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,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-28 19:46:23 + * @LastEditTime : 2022-03-29 10:47:02 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -26,17 +26,17 @@    - + 关联合伙人配置    - - + + + + +   添加 -    - - - + + 1 + 2 + 3 + 4 + 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 8cec166a..958809db 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-28 19:47:56 + * @LastEditTime : 2022-03-29 10:53:39 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -24,13 +24,17 @@ import { inRange } from '@delon/util'; templateUrl: './add.component.html' }) export class ParterRebateManageMentAddComponent implements OnInit { + @ViewChild('table') table!: any; + tabelData: any; configName: string = ''; - accountingRate: Number = 2; - partnerPeople: any; + partnerType: string = ''; + remarke: string = ''; + accountingRate: Number = 0; + priority: string = ''; partnerPeopleList: any; - peopleStatus: boolean = true; configType = '1'; precision = 2; + partnerId :Array =[]; inputValue = ''; @ViewChild('st', { static: true }) st!: STComponent; @@ -67,7 +71,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { initSF(data?: any) { this.schema1 = { properties: { - content: { + ruleDescription: { type: 'string', title: '', ui: { @@ -77,7 +81,7 @@ export class ParterRebateManageMentAddComponent implements OnInit { height: 650 } }, - default: data?.agreementContent || '' + // default: data?.agreementContent || '' } } }; @@ -85,7 +89,6 @@ export class ParterRebateManageMentAddComponent implements OnInit { ngOnInit() { this.initSF(); } - submit() {} goBack() { window.history.go(-1); } @@ -103,15 +106,19 @@ export class ParterRebateManageMentAddComponent implements OnInit { nzFooter: null }); modalRef.afterClose.subscribe((res: any) => { + this.partnerId = []; if (res) { console.log(Array.isArray(res)); console.log(res); if(Array.isArray(res)) { this.partnerPeopleList = res; - this.peopleStatus = false + res.forEach((ele: any) => { + this.partnerId.push(ele?.id); + }) } else { - this.partnerPeople = res?.enterpriseName; - } + this.partnerPeopleList = [res]; + this.partnerId.push(res?.id); + } } }); } @@ -123,12 +130,19 @@ export class ParterRebateManageMentAddComponent implements OnInit { accountingRate: this.accountingRate, configName: this.configName, configType: this.configType, - rebateConfigLineDTO: {} + rebateConfigLineDTO: this.table.data, + priority: this.priority,// 优先级 + partnerId: this.partnerId.join(','), + ruleDescription: this.sf.value.ruleDescription, + remarke: this.remarke, + partnerType: this.partnerType } + console.log(params); this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => { if(res) { console.log(res); - + this.service.msgSrv.success('新增成功！') + this.router.navigate(['/partner/rebate/setting']) } }) } diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html index efa2e94f..251f9c00 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-22 14:42:27 + * @LastEditTime : 2022-03-29 10:51:52 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -47,8 +47,17 @@ [loadingDelay]="500" [loading]="service.http.loading" > - -
1223
+ +
按全部等级配置
+
按不同等级配置
+ + +
全部合伙人
+
新注册合伙人
+
自定义合伙人
+ + +
{{item?.stateLocked ? '启用' : '禁用'}}
 diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index 7baea11d..795f64ee 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts @@ -69,12 +69,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit { _$expand: { type: 'boolean', ui: { hidden: true } }, month: { type: 'string', - title: '时间月份', - format: 'month', + title: '配置名称', + format: 'configName', }, - partnerId: { + stateLocked: { type: 'string', - title: '合伙人名称' + title: '状态' }, } }; @@ -89,12 +89,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit { initST() { this.columns = [ { - title: '月份', - index: '配置名称' + title: '配置名称', + index: 'configName' }, { title: '配置类型', - index: 'configType' + render: 'configType' }, { title: '备注', @@ -102,7 +102,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { }, { title: '关联合伙人范围', - index: 'partnerType' + render: 'partnerType' }, { title: '创建时间', @@ -118,7 +118,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { }, { title: '状态', - index: 'stateLocked' + render: 'stateLocked' }, { title: '操作', @@ -132,6 +132,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit { }, { text: '禁用', + iif: (_record) =>{ return _record.stateLocked == true}, + click: _record => this.viewEvaluate(_record), + }, + { + text: '启用', + iif: (_record) =>{ return _record.stateLocked == false}, click: _record => this.viewEvaluate(_record), }, ] @@ -142,10 +148,29 @@ export class ParterRebateManageMentSettingComponent implements OnInit { *禁用 */ viewEvaluate(item: any) { + console.log(item.stateLocked); + let title = '' + let stateLocked: boolean; + if(item.stateLocked) { + title = '是否禁用该配置？' + stateLocked = false + } else { + title = '是否启用该配置？' + stateLocked = true + } this.modal.confirm({ - nzTitle: '是否禁用该配置？', + nzTitle: title, nzOnOk: () => { - + const params = { + id: item?.id, + stateLocked: stateLocked, + } + this.service.request(this.service.$api_set_updateRebateConfig,params).subscribe((res: any) => { + if(res) { + this.service.msgSrv.success('设置成功！') + this.st.reload(); + } + }) } }); } diff --git a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts index 2049cbba..2e68c860 100644 --- a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts +++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts @@ -21,6 +21,8 @@ export class RebateManagementService extends BaseService { public $api_get_rebateConfig = '/api/mdc/rebateConfig/list/page'; // 保存返佣配置表 public $api_save_rebateConfig = '/api/mdc/rebateConfig/save'; + // 启用/禁用返佣配置 + public $api_set_updateRebateConfig = '/api/mdc/rebateConfig/updateRebateConfig';   // 查询合伙人信息-分页 public $api_get_partner_page = '/api/mdc/partner/list/page'; constructor(public injector: Injector) { diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index 4a638401..b41651d5 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -247,7 +247,7 @@ - +
暂无附件信息
diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 352f900e..2a2d1380 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,7 +1,7 @@ @@ -37,10 +37,9 @@
- - - - + + +
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts index 5274f3b1..d2b3fa09 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.ts +++ b/src/app/shared/components/rebate-table/rebate-table.component.ts @@ -1,41 +1,49 @@ import { debounceTime } from 'rxjs/operators'; import { Subject } from 'rxjs'; -import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core'; +import { ChangeDetectionStrategy, ChangeDetectorRef, Component, Input, OnInit, Output, ViewChild } from '@angular/core'; import { BaseService } from '@shared'; import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; - +import { EventEmitter} from '@angular/core' @Component({ selector: 'app-rebate-table', templateUrl: './rebate-table.component.html', styleUrls: ['./rebate-table.component.less'] }) export class RebateTableComponent implements OnInit { - data: any[] = [ - { - gradeConfigId: '', - startAmount: 0, - endAmount: 0, - managementFeeRatio: 0, - } - ]; + @Input() data: any =[]; + @Output() + private dataChange: EventEmitter = new EventEmitter(); + emit() { + this.dataChange.emit(this.data) + } headers: any[] = []; + gradeConfigId: string =''; + grage: any[] = []; formatterDollar = (value: number): string => `${value}`; changeSub = new Subject(); constructor(public service: BaseService, private cdr: ChangeDetectorRef) {} ngOnInit(): void { + this.data = [ + { + gradeConfigId: '', + startAmount: 0, + endAmount: 0, + managementFeeRatio: 0, + } + ]; this.loadData(); this.changeendAmountAction(); } loadData() { - // this.service.request('/api/mdc/cuc/insuranceConfig/list').subscribe(res => { - // if (res) { - // console.log(res); - // this.data = res; - // this.cdr.detectChanges(); - // } - // }); + this.service.request('/api/mdc/partnerGradeConfig/listPartnerGradeConfig').subscribe(res => { + if (res) { + console.log(res); + this.grage = res; + this.cdr.detectChanges(); + } + }); // this.service.request('/api/mdc/pbc/sysConfigItem/findItemValueByItemKeys', [ // "rebate.config.minrebatePrice" // ]).subscribe(res => { @@ -66,12 +74,13 @@ export class RebateTableComponent implements OnInit { const num = Number(paras[0]); const i = Number(paras[1]); - if (num <= this.data[i].startAmount) { + if (num <= this.data[i]?.startAmount) { + console.log(this.data[i].endAmount); this.data[i].endAmount = null; setTimeout(() => { - this.data[i].endAmount = this.data[i].startAmount + 1 ; + this.data[i].endAmount = this.data[i]?.startAmount + 1 ; }, 0); - this.changeNextstartAmount(this.data[i].startAmount + 1, i + 1); + this.changeNextstartAmount(this.data[i]?.startAmount + 1, i + 1); return; } this.data[i].endAmount = num;