From 8b4e07a1eab06680714a89e78ad7cba5a5e3fa30 Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 23 Mar 2022 15:57:34 +0800 Subject: [PATCH 1/6] fix bug --- .../freight/list/detail/detail.component.html | 40 +++ .../components/freight/list/list.component.ts | 235 +++++------------- 2 files changed, 100 insertions(+), 175 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 6880be7b..322866ce 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -354,6 +354,46 @@ [placeholder]="isEdit?'':'-'"> + + + 合伙人信息 + + + + + + + + + + + + + + + + 渠道销售信息 + + + + + + + + + + + + + diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index afb394a1..3ddef9e3 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -166,137 +166,6 @@ export class FreightComponentsListComponent implements OnInit { showRequired: false } }, - lockedStatus8: { - type: 'string', - title: '公司所在地', - enum: [ - { label: '全部', value: '' }, - { label: '物流企业', value: 0 } - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - oftenUsedServices: { - type: 'string', - title: '常用服务', - enum: [ - { label: '全部', value: '' }, - { label: '整车服务', value: 0 }, - { label: '大宗服务', value: 1 } - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - customerType: { - type: 'string', - title: '客户类型', - enum: [ - { label: '全部', value: '' }, - { label: '直客', value: 1 }, - { label: '渠道客户', value: 20 } - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, - contactName5: { - title: '渠道销售', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - partnerName: { - title: '合伙人', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - contactName3: { - title: '客服人员', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - contactName2: { - title: '审核人', - type: 'string', - ui: { - placeholder: '请输入', - showRequired: false, - visibleIf: { - expand: (value: boolean) => value - } - } - }, - applyDate: { - type: 'string', - title: '申请时间', - ui: { - widget: 'sl-from-to', - type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema, - }, - applyDate1: { - type: 'string', - title: '审核时间', - ui: { - widget: 'sl-from-to', - type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - expand: (value: boolean) => value - } - } as SFDateWidgetSchema, - }, - lockedStatus3: { - type: 'string', - title: '企业状态', - enum: [ - { label: '全部', value: '' }, - { label: '正常', value: 0 }, - { label: '冻结', value: 1 } - ], - default: '', - ui: { - widget: 'select', - visibleIf: { - expand: (value: boolean) => value - } - } - }, enterpriseType: { type: 'string', title: '企业类型', @@ -322,26 +191,41 @@ export class FreightComponentsListComponent implements OnInit { default: '', ui: { widget: 'select', - placeholder: '请选择', - allowClear: true, - asyncData: () => this.shipperservice.getNetworkFreightForwarder(), visibleIf: { expand: (value: boolean) => value } } }, - // sou1r3ce: { - // type: 'string', - // title: '客户类型', - // enum: [{ label: '全部', value: '' }], - // default: '', - // ui: { - // widget: 'select', - // visibleIf: { - // expand: (value: boolean) => value - // } - // } - // }, + oftenUsedServices: { + type: 'string', + title: '常用服务', + enum: [ + { label: '全部', value: '' }, + { label: '整车发货', value: 10 }, + { label: '大宗发货', value: 20 } + ], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => value + } + } + }, + customerType: { + type: 'string', + title: '客户类型', + enum: [{ label: '全部', value: '' }, + { label: '直客', value: 1 }, + { label: '渠道客户', value: 20 }], + default: '', + ui: { + widget: 'select', + visibleIf: { + expand: (value: boolean) => value + } + } + }, promotersTelephone: { title: '业务员', type: 'string', @@ -353,28 +237,28 @@ export class FreightComponentsListComponent implements OnInit { } } }, - // promotersTe1le3phone: { - // title: '合伙人', - // type: 'string', - // ui: { - // placeholder: '请输入', - // showRequired: false, - // visibleIf: { - // expand: (value: boolean) => value - // } - // } - // }, - // promotersTe1lep1hone: { - // title: '客服人员', - // type: 'string', - // ui: { - // placeholder: '请输入', - // showRequired: false, - // visibleIf: { - // expand: (value: boolean) => value - // } - // } - // }, + partnerNamee: { + title: '合伙人', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false, + visibleIf: { + expand: (value: boolean) => value + } + } + }, + customerServiceId: { + title: '客服人员', + type: 'string', + ui: { + placeholder: '请输入', + showRequired: false, + visibleIf: { + expand: (value: boolean) => value + } + } + }, approvalUserName: { title: '审核人', type: 'string', @@ -442,13 +326,13 @@ export class FreightComponentsListComponent implements OnInit { } } }, - source2: { + isExpired: { type: 'string', title: '证件是否过期', enum: [ { label: '全部', value: '' }, - { label: '是', value: 1 }, - { label: '否', value: 2 } + { label: '是', value: true }, + { label: '否', value: false } ], default: '', ui: { @@ -506,8 +390,8 @@ export class FreightComponentsListComponent implements OnInit { width: 140 }, { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 }, - // { title: '合伙人', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, - // { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 }, + { title: '合伙人', className: 'text-center', render: 'partnerName', width: 150 }, + { title: '客服人员', className: 'text-center', render: 'customerServiceId', width: 150 }, { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 }, { title: '注册渠道', @@ -544,8 +428,9 @@ export class FreightComponentsListComponent implements OnInit { }, { title: '操作', - width: '250px', - className: 'text-center btnBox', + width: '200px', + className: 'text-center block-td', + fixed: 'right', buttons: [ { text: '查看', From b9c099d2836ed6d96462e1ce76124942ccba703e Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 23 Mar 2022 16:58:34 +0800 Subject: [PATCH 2/6] fix bug --- .../freight/list/detail/detail.component.html | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 322866ce..759eb4d3 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -377,22 +377,18 @@ 渠道销售信息 - + - + - + - - - From 9092299b3dbb536302a94df81a78d53e43362337 Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 23 Mar 2022 20:54:03 +0800 Subject: [PATCH 3/6] fix bug --- .../freight/list/detail/detail.component.html | 49 +++++++-- .../freight/list/detail/detail.component.less | 12 ++ .../freight/list/detail/detail.component.ts | 103 ++++++++++++++++-- .../usercenter/services/usercenter.service.ts | 6 + 4 files changed, 152 insertions(+), 18 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 759eb4d3..9e474055 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -269,8 +269,8 @@ - + 合伙人信息 - + + + - - - @@ -378,20 +382,45 @@ 渠道销售信息 - - - - + + + + + + {{ item.remark }} + -- + + + + + + + {{ item.remark }} + -- + + + + +
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.less b/src/app/routes/usercenter/components/freight/list/detail/detail.component.less index 21bf7187..6231c9e2 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.less +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.less @@ -43,4 +43,16 @@ left: 106px; } } + .overflowText { + display: -webkit-box; + max-width: 155px; + height: 40px; + overflow: hidden; + text-align: left; + text-overflow: -o-ellipsis-lastline; + text-overflow: ellipsis; + -webkit-line-clamp: 2; + line-clamp: 2; + -webkit-box-orient: vertical; + } } diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts index da954bab..bbdf2dc3 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts @@ -1,6 +1,7 @@ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { apiConf } from '@conf/api.conf'; +import { STColumn, STComponent } from '@delon/abc/st'; import { DatePipe, _HttpClient } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { fromEvent, Subscription } from 'rxjs'; @@ -13,11 +14,14 @@ import { UsermanageService } from '../../../../services/usercenter.service'; providers: [DatePipe] }) export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { + @ViewChild('st') private readonly st!: STComponent; + @ViewChild('st1') private readonly st1!: STComponent; @ViewChild('approvedModal', { static: false }) approvedModal!: any; @ViewChild('redectModal', { static: false }) redectModal!: any; - + columns: STColumn[] = []; + recordColumns!: STColumn[]; detailData: any = { adminUserInfo: { name: '' }, legalPersonIdentityVO: { name: '' } }; tempalateData = { ...this.detailData }; suppliersData: any = {}; @@ -35,7 +39,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { networkTransporter = null; roleId = null; customerServiceId = null; - + partnerInfo: any = {}; esignCheckStatus: any = { 0: '不通过', 1: '通过', @@ -43,16 +47,31 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { }; billEvaluate = null; - scrollTop = 0; subscribeScoll!: Subscription; + /** + * 查询参数 + */ + get reqParamsCar() { + const params = { + id: this.route.snapshot.params.id, + bindType: 0 + } + return { ...params }; + } + get reqParams() { + const params = { + id: this.route.snapshot.params.id, + } + return { ...params }; + } constructor( public service: UsermanageService, private route: ActivatedRoute, private nzModalService: NzModalService, private router: Router, private datePipe: DatePipe - ) {} + ) { } ngOnDestroy(): void { this.subscribeScoll.unsubscribe(); } @@ -62,12 +81,80 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { this.initData(); this.loadltdId(); this.loadRoles(); + this.initST(); + this.initRecordST() this.loadCustomerServices(); + this.loadPartnerInfo() }); this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => { this.scrollTop = document.documentElement.scrollTop; }); } + /** +* 初始化数据列表 +*/ + initST() { + this.columns = [ + { title: '修改后合伙人', index: 'newPartnerName', className: 'text-center' }, + { title: '修改前合伙人', index: 'originalPartnerNamel', className: 'text-center' }, + { title: '备注', render: 'remark', className: 'text-center' }, + { title: '结算起算日', index: 'settStartTime', className: 'text-center' }, + { title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: { + 1: '立即生效', + 2: 'CRM审核后生效', + 3: '审核通过生效', + } }, + { + title: 'CRM审核状态', index: 'effectiveStatus', + type: 'enum', + enum: { + 0: '已失效', + 1: '未生效', + 2: '已生效', + }, + className: 'text-center' + }, + { title: '修改时间', render: 'modifyTime', className: 'text-center' }, + { title: '生效时间', render: 'effectiveTime', className: 'text-center' }, + { title: '操作人', render: 'approvalUser', className: 'text-center' }, + + ]; + } + /** + * 初始化数据列表 + */ + initRecordST() { + this.recordColumns = [ + { title: '修改后渠道销售', index: 'newChannelName', className: 'text-center' }, + { title: '修改前渠道销售地', index: 'originalChannelName', className: 'text-center' }, + { title: '备注', render: 'remark', className: 'text-center' }, + { title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: { + 1: '立即生效', + 2: 'CRM审核后生效', + 3: '审核通过生效', + } }, + { + title: 'CRM审核状态', index: 'effectiveStatus', + type: 'enum', + enum: { + 0: '已失效', + 1: '未生效', + 2: '已生效', + }, + className: 'text-center' + }, + { title: '修改时间', render: 'mybidDetailInfo', className: 'text-center' }, + { title: '生效时间', index: 'eeffectiveTime', className: 'text-center' }, + { title: '操作人', index: 'approvalUser', className: 'text-center' } + ]; + } + loadPartnerInfo(){ + this.service.request(this.service.$api_getEnterpriceRel, {id: this.route.snapshot.params.id}).subscribe(res => { + if (res) { + this.partnerInfo = res; + } + }); + } loadltdId() { this.service.getNetworkFreightForwarder().subscribe(res => { if (res) { @@ -273,7 +360,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { res => { node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1, value: item.regionCode, label: item.name })); }, - _ => {}, + _ => { }, () => { resolve(node); } @@ -286,17 +373,17 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy { this.isEdit = false; } - save(data: any){ + save(data: any) { const dateil = { ...this.detailData }; Object.assign(dateil.legalPersonIdentityVO, { validStartTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validStartTime, 'yyyy-MM-dd'), validEndTime: this.datePipe.transform(dateil.legalPersonIdentityVO.validEndTime, 'yyyy-MM-dd') }); - if (!this.detailData?.enterpriseName || !this.detailData?.enterpriseAddress) { + if (!this.detailData?.enterpriseName || !this.detailData?.enterpriseAddress) { this.service.msgSrv.error('请完善企业基本信息！') return false; } - if (!this.detailData.legalPersonIdentityVO.name || !this.detailData.legalPersonIdentityVO.certificateNumber) { + if (!this.detailData.legalPersonIdentityVO.name || !this.detailData.legalPersonIdentityVO.certificateNumber) { this.service.msgSrv.error('请完善法人信息！') return false; } diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts index 169752b5..07792f92 100644 --- a/src/app/routes/usercenter/services/usercenter.service.ts +++ b/src/app/routes/usercenter/services/usercenter.service.ts @@ -154,6 +154,12 @@ export class UsermanageService extends ShipperBaseService { $api_batchUpdateEnterpricePartner = '/api/mdc/enterpriceRelLog/batchUpdateEnterpricePartner'; // 渠道销售修改详情 $api_partnerChannelUpdateDetaiList = '/api/mdc/enterpriceRelLog/partnerChannelUpdateDetaiList'; + // 查询企业修改合伙人记录 + $api_findEnterpricePartnerRelLog = '/api/mdc/enterpriceRelLog/findEnterpricePartnerRelLog'; + // 查询企业修改渠道记录 + $api_findEnterpriceChannelRelLog = '/api/mdc/enterpriceRelLog/findEnterpriceChannelRelLog'; + // 查询企业合伙人渠道关系信息 + $api_getEnterpriceRel = '/api/mdc/enterpriceRelLog/getEnterpriceRel'; constructor(public injector: Injector, public nzModalService: NzModalService, private nzImageService: NzImageService) { super(injector); From f38a165c67a6002dc2eb5e2deb8bd5a2bccd002c Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 09:04:07 +0800 Subject: [PATCH 4/6] edit --- .../shared/services/business/user.service.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/app/shared/services/business/user.service.ts b/src/app/shared/services/business/user.service.ts index 7cd940c5..82f6a790 100644 --- a/src/app/shared/services/business/user.service.ts +++ b/src/app/shared/services/business/user.service.ts @@ -152,16 +152,16 @@ export class EAUserService extends BaseService { * 加载用户菜单 */ async loadUserMenus() { - // return this.asyncRequest(this.$api_get_user_menus, { - // appId: this.envSrv.getEnvironment().appId - // }).then(res => { - // this.cacheSrv.set(cacheConf.menu, res); - // this.menuService.add(res); - // }); - this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => { - this.cacheSrv.set(cacheConf.menu, res.menu); - this.menuService.add(res.menu); + return this.asyncRequest(this.$api_get_user_menus, { + appId: this.envSrv.getEnvironment().appId + }).then(res => { + this.cacheSrv.set(cacheConf.menu, res); + this.menuService.add(res); }); + // this.request('assets/mocks/menu-data.json', {}, 'GET').subscribe((res: any) => { + // this.cacheSrv.set(cacheConf.menu, res.menu); + // this.menuService.add(res.menu); + // }); } /** From 559ba3955c3b90cc05910bc669925990df1f56e9 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 09:08:53 +0800 Subject: [PATCH 5/6] edit --- .../transaction-flow/transaction-flow.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 46af35d3..92cb10f7 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 @@ -35,7 +35,7 @@ export class TransactionFlowComponent { Object.assign(requestOptions.body, { ...this.sf.value, createTime: { - start: this.sf.value.tcreateTimeime?.[0] || '', + start: this.sf.value.createTime?.[0] || '', end: this.sf.value.createTime?.[1] || '' } }); @@ -120,9 +120,9 @@ export class TransactionFlowComponent { type: 'string', title: '收支类型', enum: [ - { label: '全部', value: '部' }, - { label: '收入', value: 1 }, - { label: '支出', value: 2 } + { label: '全部', value: '' }, + { label: '收入', value: 2 }, + { label: '支出', value: 1 } ], ui: { widget: 'select', From 5c317813ec8bed1713cdba57c6a2ed6e68d1df25 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 24 Mar 2022 09:28:48 +0800 Subject: [PATCH 6/6] edit --- .../components/payment-order/payment-order.component.ts | 2 ++ .../components/receipt-order/receipt-order.component.ts | 2 ++ .../components/receivable-order/receivable-order.component.ts | 1 + 3 files changed, 5 insertions(+) diff --git a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts index 7287c7bb..646321c1 100644 --- a/src/app/routes/financial-management/components/payment-order/payment-order.component.ts +++ b/src/app/routes/financial-management/components/payment-order/payment-order.component.ts @@ -235,6 +235,8 @@ export class PaymentOrderComponent implements OnInit { { title: '', index: 'key', type: 'checkbox', fixed: 'left', className: 'text-center' }, { title: '付款单号', index: 'payCode', type: 'link', width: 180 }, { title: '网络货运人', index: 'ltdName', width: 180 }, + { title: '运单号', index: 'waybillCode', width: 180 }, + { title: '费用号', index: 'feeCode', width: 180 }, { title: '要求付款日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 }, { title: '付款金额', diff --git a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts index 79ad4c5d..bda876c4 100644 --- a/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts +++ b/src/app/routes/financial-management/components/receipt-order/receipt-order.component.ts @@ -231,6 +231,8 @@ export class ReceiptOrderComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox', width: 60, fixed: 'left', className: 'text-center' }, { title: '收款单号', index: 'brmcode', type: 'link', width: 180, className: 'text-left' }, + { title: '订单号', index: 'billHCode', width: 180, className: 'text-left' }, + { title: '费用号', index: 'feeCode', width: 180, className: 'text-left' }, { title: '网络货运人', index: 'ltdName', width: 200, className: 'text-left' }, { title: '到账日期', index: 'brmdate', type: 'date', width: 200, className: 'text-left' }, { title: '收款账户', index: 'ltdaccountId', width: 200, className: 'text-left' }, diff --git a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts index 26e11de5..809ec0e7 100644 --- a/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts +++ b/src/app/routes/financial-management/components/receivable-order/receivable-order.component.ts @@ -242,6 +242,7 @@ export class ReceivableOrderComponent implements OnInit { return [ { title: '', index: 'key', type: 'checkbox' }, { title: '核销单号', index: 'ahxcode', type: 'link', width: 140 }, + { title: '订单号', index: 'billHCode', type: 'link', width: 140 }, { title: '网络货运人', index: 'ltdName', width: 160 }, { title: '核销日期', index: 'ahxdate', type: 'date', width: 160 }, { title: '付款账户', index: 'shipperaccount', width: 170 },