From 7553aa7cbfcd42a1bed102d722654b089d84d6e3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 13:40:55 +0800 Subject: [PATCH 01/11] fix bug --- proxy.conf.js | 4 +- .../channel-log-modal.component.html | 47 +++++++++++++++---- .../channel-log-modal.component.ts | 26 ++++++---- 3 files changed, 57 insertions(+), 20 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index e90106bb..b1279fb3 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 10:12:55 + * @LastEditTime : 2022-05-11 13:29:32 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html index a9d9fe7e..c98cb372 100644 --- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html @@ -1,13 +1,40 @@ -

转移客户数：{{changeST?.total}}

- + +

转移客户数：{{ changeST?.total }}

+ -

不转移客户数：{{noChangeST?.total}}

- +

不转移客户数：{{ noChangeST?.total }}

+

- 客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 -

\ No newline at end of file + 客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。 +

diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts index 3f838c47..c081235d 100644 --- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts @@ -1,3 +1,13 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-05-09 10:49:35 + * @LastEditors : Shiming + * @LastEditTime : 2022-05-11 13:40:11 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\channel-log-modal\\channel-log-modal.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ import { Component, OnInit } from '@angular/core'; import { STColumn } from '@delon/abc/st'; import { PartnerListService } from '../../services/partner-list.service'; @@ -16,17 +26,17 @@ export class ChannelLogModalComponent implements OnInit { private initST(): { changeColumn: STColumn[]; beChangeColumn: STColumn[] } { return { changeColumn: [ - { title: '客户名称', index: 'payCode', width: 180 }, - { title: '合伙人', index: 'ltdName', width: 160 }, - { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, + { title: '客户名称', index: 'enterpriceName', width: 180 }, + { title: '合伙人', index: 'enterpriseName', width: 160 }, + { title: '渠道销售', index: 'newChannelId', className: 'text-center', width: 130 }, { title: 'CRM审核状态', index: 'payDate', width: 150 }, - { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } + { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 } ], beChangeColumn: [ - { title: '客户名称', index: 'payCode', width: 180 }, - { title: '合伙人', index: 'ltdName', width: 160 }, - { title: '渠道销售', index: 'payDate', className: 'text-center', width: 130 }, - { title: '生效时间', index: 'payDate', className: 'text-center', width: 130 } + { title: '客户名称', index: 'enterpriceName', width: 180 }, + { title: '合伙人', index: 'enterpriseName', width: 160 }, + { title: '渠道销售', index: 'newChannelId', className: 'text-center', width: 130 }, + { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 } ] }; } From f7b7ccb609dd084d9c4ba070acb4a43dfabd6eb8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 13:47:57 +0800 Subject: [PATCH 02/11] fix bug --- .../partner-detail.component.html | 321 +++++++++++++----- .../personal-partner-detail.component.html | 28 +- 2 files changed, 245 insertions(+), 104 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index 32115fda..9584bb72 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -28,9 +28,7 @@
注册时间：{{ detailData?.createTime }}
-
- 所属城市：{{enterpriseDefaultCityName}} -
+
所属城市：{{ enterpriseDefaultCityName }}
@@ -45,14 +43,32 @@ - - @@ -64,17 +80,24 @@ - + context: { + title: '确定冻结该合伙人吗？', + content: '停用后，该合伙人将被限制使用，不限于访问受限、邀请客户、佣金收益等，请谨慎操作' + } + " + > - + " + > @@ -83,21 +106,34 @@ 企业管理员信息 - + - {{detailData.adminUserInfo.mobile}} + {{ detailData.adminUserInfo.mobile }} - +
- + " + > - + " + >
- + - - + - + - + @@ -144,60 +201,81 @@ - - {{detailData.enterpriseName}} + {{ detailData.enterpriseName }} - {{detailData.unifiedSocialCreditCode}} + {{ detailData.unifiedSocialCreditCode }} - + " + > - + - - + - + @@ -205,33 +283,63 @@ 企业法人信息 - + - + - + - - + - + - +
- + " + > - + " + >
- + @@ -280,20 +400,25 @@ 修改渠道销售记录 - - - - + +
-
{{ title }} -
+
{{ title }}
{{ content }}
@@ -301,18 +426,36 @@ - +
上传
 -
+
- +
diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html index cb8e1f13..deda5ad4 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html @@ -244,23 +244,21 @@ - + 修改渠道销售记录 - - - - + + From 5d7288c822728ac78a196b689b33f99e9122b48f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 13:49:34 +0800 Subject: [PATCH 03/11] fix bug --- .../components/rebate-setting/rebate-setting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 36035584..7efc2a2a 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 @@ -94,7 +94,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { }, { title: '创建时间', - index: 'enableTime', + index: 'createTime', width: '200px' }, { From 1e264be2df08a78046caf78c9638bc3051862daa Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 13:51:52 +0800 Subject: [PATCH 04/11] fix bug --- .../freight/list/editPartner/editPartner.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index d0ebdf71..c518c158 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -90,10 +90,10 @@ export class EditPartnerComponentsAddComponent implements OnInit { remark: { type: 'string', title: '备注', + maxLength: 50, ui: { widget: 'textarea', placeholder: '请不要超过50个字', - maxLength: 50, autosize: { minRows: 2, maxRows: 6 } } }, From a01dda6a57dee160a3dbcc5862769d6efe936a3a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 13:53:11 +0800 Subject: [PATCH 05/11] fix bug --- .../freight/list/editPartner/editPartner.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts index c518c158..e1f914ef 100644 --- a/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts +++ b/src/app/routes/usercenter/components/freight/list/editPartner/editPartner.component.ts @@ -110,7 +110,7 @@ export class EditPartnerComponentsAddComponent implements OnInit { ], }, }, - required: ['channelId', 'remark', 'effectiveNode'] + required: ['partnerId','settStartTime', 'remark', 'effectiveNode'] }; this.ui = { '*': { From d9d3a2e245232a4fad234cffa48e14849f641651 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 13:58:41 +0800 Subject: [PATCH 06/11] fix bug --- .../partner-audit-modal.component.ts | 75 +++++++------------ 1 file changed, 28 insertions(+), 47 deletions(-) diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index 6e169027..d93c1947 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -1,8 +1,7 @@ import { Component, Input, OnInit, ViewChild } from '@angular/core'; -import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFValue } from '@delon/form'; +import { SFComponent, SFSchema, SFValue } from '@delon/form'; import { ModalHelper } from '@delon/theme'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; -import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { PartnerListService } from '../../services/partner-list.service'; @@ -25,6 +24,7 @@ export class PartnerAuditModalComponent implements OnInit { console.log(this.info); this.initSF(this.info); // asyncData: () => this.service.getChannel(), + if(this.info.channelId) { const value = [{ label: this.info.channelIdLabel, @@ -38,26 +38,20 @@ export class PartnerAuditModalComponent implements OnInit { } }) - } - // else { - // console.log() - // this.service.getChannel().pipe(map(data => { - // console.log(data); - - // })) - // this.service.getChannel().subscribe((res) => { - // console.log(res); - // const value :any= res; - // setTimeout(() => { - // if(this.sf) { - // this.sf.getProperty('/channelId2')!.schema.enum = value; - // this.sf.getProperty('/channelId2')!.widget.reset(value); - // this.sf.setValue('/channelId2', value); - // } - // }) - // }) + } else { + this.service.getChannel().subscribe((res) => { + console.log(res); + const value :any= res; + setTimeout(() => { + if(this.sf) { + this.sf.getProperty('/channelId')!.schema.enum = value; + this.sf.getProperty('/channelId')!.widget.reset(value); + this.sf.setValue('/channelId', value); + } + }) + }) - // } + } } initSF(user: any) { @@ -91,36 +85,21 @@ export class PartnerAuditModalComponent implements OnInit { default: this.info.isPass !== undefined ? this.info.isPass : true }, channelId: { - type: 'string', title: '渠道销售', + type: 'string', ui: { widget: 'select', - hidden: this.info.isPass === false, - serverSearch: true, - searchDebounceTime: 300, - searchLoadingText: '搜索中...', + placeholder: '请选择', allowClear: true, - onSearch: (q: any) => { - let str = q.replace(/^\s+|\s+$/g, ''); - let params :any= {} - if (str) { - console.log(+str); - if(+str) { - console.log('数字'); - params.phoneNumber = str - } else { - console.log('中文'); - params.name = str - } - return this.service - .request(this.service.$api_get_channel, params) - .pipe(map((res: any) => (res as any[]).map(i => ({ label: `${i.name}/${i.telephone}`, value: i.id } as SFSchemaEnum)))) - .toPromise(); - } else { - return of([]); - } + hidden: this.info.isPass === false, + visibleIf: { + status: value => value }, - } as SFSelectWidgetSchema + errors: { + required: ' ' + } + }, + default: user.channelId }, approvalOpinion: { title: '备注', @@ -140,8 +119,10 @@ export class PartnerAuditModalComponent implements OnInit { } } }, - required: [ 'approvalOpinion','channelId'] + required: ['channelId', 'approvalOpinion'] }; + console.log('666'); + } sure() { From 571485133ae1db65c5422598285416b8ccc0c50b Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 14:25:49 +0800 Subject: [PATCH 07/11] fix bug --- .../components/record/record.component.html | 16 +- .../components/record/record.component.ts | 153 ++++++++++-------- 2 files changed, 101 insertions(+), 68 deletions(-) diff --git a/src/app/routes/partner/recorded/components/record/record.component.html b/src/app/routes/partner/recorded/components/record/record.component.html index 7bcde4e5..7517efae 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.html +++ b/src/app/routes/partner/recorded/components/record/record.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-29 17:28:23 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 10:11:53 + * @LastEditTime : 2022-05-11 14:25:14 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\recorded\\components\\record\\record.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -34,7 +34,7 @@ - + @@ -68,16 +68,22 @@ {{ item.bankName }}
{{ item.bankCardNumber }} + +
待初审
+
待复核
+
已入账
+
已拒绝
+
合伙人数：合伙人数： 入账笔数：入账笔数： 开票金额：开票金额： 代缴个税： { @@ -60,7 +63,7 @@ export class PartnerRecordedRecordComponent implements OnInit { start: this.sf?.value.createTime?.[0] || '', end: this.sf?.value.createTime?.[1] || '' }, - refundStatus: this.refundStatus || null + sts: this.refundStatus || '' }); } delete requestOptions?.body?.expand; @@ -81,16 +84,15 @@ export class PartnerRecordedRecordComponent implements OnInit { const stList = this.st.list; stList.forEach(item => { this.selectedRows = this.selectedRows.filter((e: any) => e.id !== item.id); - }) + }); } else { //添加新增的行 checkRows.forEach((item: any) => { const newSelectedList = this.selectedRows.filter((r: any) => r.id === item.id); if (newSelectedList.length === 0) { this.selectedRows.push(item); - } - }) + }); // 移除取消选中的行 const stList = this.st.list; stList.forEach(item => { @@ -98,17 +100,17 @@ export class PartnerRecordedRecordComponent implements OnInit { const index = this.selectedRows.findIndex(_item => item.id === _item.id); if (index !== -1) this.selectedRows.splice(index, 1); } - }) + }); } let totalCallNo = 0; - this.selectedRows.forEach((item => { + this.selectedRows.forEach(item => { totalCallNo = new Big(this.totalCallNo).plus(item?.entryAmount).parse(); - })); + }); this.totalCallNo = totalCallNo; } else if (e.type === 'loaded') { // 页面加载时勾选 - (e?.loaded || []).forEach((r) => { - this.selectedRows.forEach((x) => { + (e?.loaded || []).forEach(r => { + this.selectedRows.forEach(x => { if (x.id === r.id) { r.checked = true; } @@ -117,8 +119,27 @@ export class PartnerRecordedRecordComponent implements OnInit { } } - changeRefundStatus(status?: string) { - this.refundStatus = status || null; + changeRefundStatus(status: any) { + let value = ''; + switch (status) { + case '0': + value = ''; + break; + case '1': + value = '0'; + break; + case '2': + value = '1'; + break; + case '3': + value = '2'; + break; + case '4': + value = '3'; + break; + } + + this.refundStatus = value || null; this.st.load(1); } @@ -146,10 +167,14 @@ export class PartnerRecordedRecordComponent implements OnInit { this.service.msgSrv.warning('请填写拒绝原因 '); return; } - this.audit({ ids: params, rejectReason: this.msg, sts: '3' }, () => { - modal.destroy(); - this.st.load(1); - }, '审核拒绝成功'); + this.audit( + { ids: params, rejectReason: this.msg, sts: '3' }, + () => { + modal.destroy(); + this.st.load(1); + }, + '审核拒绝成功' + ); // this.service // .request(this.service.$api_disagree_recorded, { // id: params, @@ -168,10 +193,14 @@ export class PartnerRecordedRecordComponent implements OnInit { label: '通过', type: 'primary', onClick: () => { - this.audit({ ids: params, rejectReason: this.msg, sts: '1' }, () => { - modal.destroy(); - this.st.load(1); - }, '审核通过成功'); + this.audit( + { ids: params, rejectReason: this.msg, sts: '1' }, + () => { + modal.destroy(); + this.st.load(1); + }, + '审核通过成功' + ); } } ] @@ -230,22 +259,22 @@ export class PartnerRecordedRecordComponent implements OnInit { placeholder: '请输入' } }, - sts: { - type: 'string', - title: '入账状态', - default: '', - enum: [ - { label: '全部', value: '' }, - { label: '待初审', value: '0' }, - { label: '待复核', value: '1' }, - { label: '已入账', value: '2' }, - { label: '已拒绝', value: '3' }, - ], - ui: { - widget: 'select', - placeholder: '请选择' - } - }, + // sts: { + // type: 'string', + // title: '入账状态', + // default: '', + // enum: [ + // { label: '全部', value: '' }, + // { label: '待初审', value: '0' }, + // { label: '待复核', value: '1' }, + // { label: '已入账', value: '2' }, + // { label: '已拒绝', value: '3' }, + // ], + // ui: { + // widget: 'select', + // placeholder: '请选择' + // } + // }, ltdId: { type: 'string', title: '网络货运人', @@ -254,7 +283,7 @@ export class PartnerRecordedRecordComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, true), + asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, true) } }, submitTime: { @@ -269,7 +298,7 @@ export class PartnerRecordedRecordComponent implements OnInit { expand: (value: boolean) => value } } as SFDateWidgetSchema - }, + } } }; } @@ -283,11 +312,11 @@ export class PartnerRecordedRecordComponent implements OnInit { { title: '网络货运人', index: 'ltdName', width: 220, className: 'text-center' }, { title: '开票金额', - index: 'amount', + index: 'invoiceAmount', width: 150, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.invoiceAmount }) } }, { title: '代缴个税', @@ -295,7 +324,7 @@ export class PartnerRecordedRecordComponent implements OnInit { width: 150, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.taxPersonal }) } }, { title: '入账金额', @@ -303,11 +332,11 @@ export class PartnerRecordedRecordComponent implements OnInit { width: 150, type: 'widget', className: 'text-right', - widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.amount }) } + widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.entryAmount }) } }, { title: '提交时间', index: 'submitTime', width: 180, className: 'text-center' }, - { title: '入账状态', index: 'stsLabel', width: 120, className: 'text-center' }, + { title: '入账状态', render: 'sts', width: 120, className: 'text-center' }, { title: '操作', fixed: 'right', @@ -336,17 +365,15 @@ export class PartnerRecordedRecordComponent implements OnInit { } /** - * 审核 - */ + * 审核 + */ audit(params: any, callback: Function, msg = '成功') { - this.service - .request(this.service.$api_audit_recored, { ...params }) - .subscribe(res => { - if (res) { - this.service.msgSrv.success(msg); - callback(); - } - }); + this.service.request(this.service.$api_audit_recored, { ...params }).subscribe(res => { + if (res) { + this.service.msgSrv.success(msg); + callback(); + } + }); } search() { @@ -361,6 +388,6 @@ export class PartnerRecordedRecordComponent implements OnInit { if (res) { this.totalInfo = res; } - }) + }); } } From 87e16c05a2e0699fd7c81fa7e9025febe59d125a Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 11 May 2022 14:36:01 +0800 Subject: [PATCH 08/11] edit --- proxy.conf.js | 2 +- .../input-invoice-detail.component.ts | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index b1279fb3..000f97b3 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,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/input-invoice/input-invoice-detail/input-invoice-detail.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts index 05701c15..2df6336f 100644 --- a/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts +++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice-detail/input-invoice-detail.component.ts @@ -105,7 +105,7 @@ export class InputInvoiceDetailComponent implements OnInit { widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.service.getCloseAccount(), + asyncData: () => this.service.getCloseAccount() }, default: '' }, @@ -137,15 +137,15 @@ export class InputInvoiceDetailComponent implements OnInit { private initST(): STColumn[] { return [ - { title: '序号', render: 'billHCode', width: 80 }, - { title: '费用号', index: 'feecode', width: 100 }, - { title: '费用日期', index: 'feedate', type: 'date', width: 150 }, + { title: '序号', render: 'billHCode', width: 40, className: 'text-center' }, + { title: '费用号', index: 'feecode', width: 140 }, + { title: '费用日期', index: 'feedate', width: 150, className: 'text-center' }, { title: '订单号', index: 'billHCode', width: 100 }, - { title: '订单日期', index: 'billTime', width: 150 }, + { title: '订单日期', index: 'billTime', width: 150, className: 'text-center' }, { title: '结算客户', index: 'cnoName', width: 90 }, { title: '费用科目', index: 'feesubname', width: 100 }, - { title: '收票金额', render: 'invmoney', width: 140 }, - { title: '收票税额', render: 'invtax', width: 100 } + { title: '收票金额', render: 'invmoney', width: 120, className: 'text-right' }, + { title: '收票税额', render: 'invtax', width: 100, className: 'text-right' } ]; } } From 80db95843798c7c5085ee98af35eeba690ed984f Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 14:49:07 +0800 Subject: [PATCH 09/11] fix bug --- .../driver-account.component.ts | 2 +- .../channel-log-modal.component.html | 15 ++++++++-- .../channel-log-modal.component.less | 10 +++++++ .../channel-log-modal.component.ts | 30 +++++++++++-------- .../components/record/record.component.ts | 2 +- 5 files changed, 42 insertions(+), 17 deletions(-) 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 1b52b343..0420e091 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 @@ -168,7 +168,7 @@ export class DriverAccountComponent extends BasicTableComponent implements OnIni widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.freezeBalance }) } }, { - title: '本月累计提现金额', + title: '累计提现金额', index: 'withdrawBalance', width: 160, type: 'widget', diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html index c98cb372..6ac91690 100644 --- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.html @@ -4,24 +4,32 @@ * @Author : Shiming * @Date : 2022-04-28 20:27:08 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 13:40:12 + * @LastEditTime : 2022-05-11 14:44:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\channel-log-modal\\channel-log-modal.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -

转移客户数：{{ changeST?.total }}

+
+

转移客户数：{{ changeST?.list?.length }}

+ +
未发起
+
待审核
+
审核通过
+
驳回
+ -

不转移客户数：{{ noChangeST?.total }}

+

不转移客户数：{{ noChangeST?.list?.length }}

客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。

+
diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less index e69de29b..3148fb3e 100644 --- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.less @@ -0,0 +1,10 @@ +/* stylelint-disable-next-line CssSyntaxError */ +:host { + ::ng-deep { + .bbod{ + height: 600px; + overflow-y: hidden; + } + + } +} \ No newline at end of file diff --git a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts index c081235d..16ff04e7 100644 --- a/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/channel-log-modal/channel-log-modal.component.ts @@ -1,41 +1,47 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-05-09 10:49:35 * @LastEditors : Shiming - * @LastEditTime : 2022-05-11 13:40:11 + * @LastEditTime : 2022-05-11 14:47:57 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner-list\\components\\channel-log-modal\\channel-log-modal.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { Component, OnInit } from '@angular/core'; -import { STColumn } from '@delon/abc/st'; +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; import { PartnerListService } from '../../services/partner-list.service'; @Component({ selector: 'app-channel-log-modal', + styleUrls: ['./channel-log-modal.component.less'], templateUrl: './channel-log-modal.component.html' }) export class ChannelLogModalComponent implements OnInit { + @ViewChild('changeST', { static: true }) changeST!: STComponent; + @ViewChild('noChangeST', { static: true }) noChangeST!: STComponent; columns: { changeColumn: STColumn[]; beChangeColumn: STColumn[] } = this.initST(); id = ''; constructor(public service: PartnerListService) {} - ngOnInit(): void {} + ngOnInit(): void { + console.log(this.changeST); + + } private initST(): { changeColumn: STColumn[]; beChangeColumn: STColumn[] } { return { changeColumn: [ - { title: '客户名称', index: 'enterpriceName', width: 180 }, - { title: '合伙人', index: 'enterpriseName', width: 160 }, - { title: '渠道销售', index: 'newChannelId', className: 'text-center', width: 130 }, - { title: 'CRM审核状态', index: 'payDate', width: 150 }, + { title: '客户名称', index: 'enterpriseName', width: 180 }, + { title: '合伙人', index: 'newPartnerName', width: 160 }, + { title: '渠道销售', index: 'newChannelName', className: 'text-center', width: 130 }, + { title: 'CRM审核状态', render: 'crmStatus', width: 150 }, { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 } ], beChangeColumn: [ - { title: '客户名称', index: 'enterpriceName', width: 180 }, - { title: '合伙人', index: 'enterpriseName', width: 160 }, - { title: '渠道销售', index: 'newChannelId', className: 'text-center', width: 130 }, + { title: '客户名称', index: 'enterpriseName', width: 180 }, + { title: '合伙人', index: 'newPartnerName', width: 160 }, + { title: '渠道销售', index: 'newChannelName', className: 'text-center', width: 130 }, { title: '生效时间', index: 'effectiveTime', className: 'text-center', width: 130 } ] }; diff --git a/src/app/routes/partner/recorded/components/record/record.component.ts b/src/app/routes/partner/recorded/components/record/record.component.ts index 08c2af1d..8b1c9fc4 100644 --- a/src/app/routes/partner/recorded/components/record/record.component.ts +++ b/src/app/routes/partner/recorded/components/record/record.component.ts @@ -71,7 +71,7 @@ export class PartnerRecordedRecordComponent implements OnInit { }; afterRes = (data: any[], rawData?: any) => { - // data = data.map(node => ({ ...node, disabled: node.sts !== '0' })); + data = data.map(node => ({ ...node, disabled: node.sts !== '0' })); return data; }; From 0b28bf768e37c562b992dc5394a604ecab8967c8 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 11 May 2022 14:59:01 +0800 Subject: [PATCH 10/11] fix bug --- .../individual-collect.component.html | 2 +- .../individual-collect.component.ts | 10 ++--- .../individual-declare.component.html | 43 +++++++++---------- .../individual-declare.component.ts | 8 ++-- .../individual-income.component.html | 12 +++++- .../individual-income.component.ts | 10 ++--- .../services/tax-management.service.ts | 8 +++- 7 files changed, 51 insertions(+), 42 deletions(-) diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html index b21bb753..b81b2741 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html @@ -39,7 +39,7 @@
- + diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts index a006411a..05582e51 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.ts @@ -257,10 +257,8 @@ export class TaxManagementIndividualCollectComponent extends BasicTableComponent this.st.load(1); } - /** - * 异步导出 - */ - export() { - this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); - } + // 导出 + exprot() { + this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxSummary_export); +} } diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html index daee8554..c0299bc2 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.html @@ -26,8 +26,15 @@
- + {{ item?.billStatusLabel }} {{ item?.billStatusLabel }} @@ -49,33 +56,25 @@ 已选择 {{ selectedRows.length }} 条数据
- - + + + 更多
    -
  • - 申报 -
    • -
  • - 更正 -
    • -
  • - 修改起征点 -
    • -
  • - 更新数据 -
    • +
  • 申报
    • +
  • 更正
    • +
  • 修改起征点
    • +
  • 更新数据
- - +
司机姓名：张三/13812345678
是否确认要将该司机的起征点同步调整为超过15万？
@@ -84,4 +83,4 @@ - \ No newline at end of file + diff --git a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts index 196dbc14..3c70d41c 100644 --- a/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts +++ b/src/app/routes/tax-management/components/individual-declare/individual-declare.component.ts @@ -428,11 +428,9 @@ export class TaxManagementIndividualDeclareComponent extends BasicTableComponent this.st.load(1); } - /** - * 异步导出 - */ - export() { - this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); + // 导出 + exprot() { + this.service.exportStart({ ...this.sfValue, pageSize: -1 }, this.service.$api_taxDeclaration_export); } openWainingModal(content: string, title = '提示') { diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index 021f0ec1..0f3e49be 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -1,3 +1,13 @@ + @@ -40,7 +40,7 @@ {{formData?.entryNumber}} - {{formData?.bankName}} + {{formData?.bankType}} {{formData?.fictitiousAccount}} @@ -58,7 +58,10 @@ {{formData?.recordedAmount | currency}} - {{formData?.stsLabel}} + 待审核 + 待复核 + 已入账 + 已驳回 diff --git a/src/app/routes/partner/recorded/components/detail/detail.component.ts b/src/app/routes/partner/recorded/components/detail/detail.component.ts index 08d5e9bc..479d2daa 100644 --- a/src/app/routes/partner/recorded/components/detail/detail.component.ts +++ b/src/app/routes/partner/recorded/components/detail/detail.component.ts @@ -29,44 +29,44 @@ export class PartnerRecordedDetailComponent implements OnInit { this.formData = res; // 处理流程节点数据 // 流程是否结束 - // let isEnd = false; - // if (res.successTime) { - // isEnd = true; - // if (res.refundStatus === '3') { - // this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' }); - // } else { - // this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' }); - // } - // } - // if (res.agreeTime && res.refundStatus !== '4') { - // this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' }); - // } - // if (res.agreeTime) { - // if (res.refundStatus === '4') { - // isEnd = true; - // this.timeLineData.push({ - // time: res.agreeTime, - // value: `拒绝提现
操作人员：${res.handlerUserIdLabel}`, - // color: 'red' - // }); - // } else { - // this.timeLineData.push({ - // time: res.agreeTime, - // value: `审核通过
操作人员：${res.handlerUserIdLabel}`, - // color: 'gray' - // }); - // } - // } - // if (res.createTime) { - // this.timeLineData.push({ - // time: res.createTime, - // value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员：${res.userIdLabel}`, - // color: 'gray' - // }); - // } - // if (this.timeLineData?.length > 0 && !isEnd) { - // this.timeLineData[0].color = 'green'; - // } + let isEnd = false; + if (res.successTime) { + isEnd = true; + if (res.refundStatus === '3') { + this.timeLineData.push({ time: res.successTime, value: `到账成功`, color: 'green' }); + } else { + this.timeLineData.push({ time: res.successTime, value: `提现失败`, color: 'red' }); + } + } + if (res.agreeTime && res.refundStatus !== '4') { + this.timeLineData.push({ time: res.agreeTime, value: `银行处理中`, color: 'gray' }); + } + if (res.agreeTime) { + if (res.refundStatus === '4') { + isEnd = true; + this.timeLineData.push({ + time: res.agreeTime, + value: `拒绝提现
操作人员：${res.handlerUserIdLabel}`, + color: 'red' + }); + } else { + this.timeLineData.push({ + time: res.agreeTime, + value: `审核通过
操作人员：${res.handlerUserIdLabel}`, + color: 'gray' + }); + } + } + if (res.createTime) { + this.timeLineData.push({ + time: res.createTime, + value: `提交提现申请
提现${res.amount}元至${res.bankName}(${res.bankCardNumber})
操作人员：${res.userIdLabel}`, + color: 'gray' + }); + } + if (this.timeLineData?.length > 0 && !isEnd) { + this.timeLineData[0].color = 'green'; + } } }); } diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 577406c9..93b7dcd7 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -226,7 +226,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' }, { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' }, { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, - { title: '录单时间', index: 'recordTime', className: 'text-center', width: '250px' }, + { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' }, { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },