From 30143b24bf72a9a84a8a4e224ccb8a43df4f3db1 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 28 Mar 2022 17:36:09 +0800 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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) {