From 9092299b3dbb536302a94df81a78d53e43362337 Mon Sep 17 00:00:00 2001 From: Lingzi Date: Wed, 23 Mar 2022 20:54:03 +0800 Subject: [PATCH] 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);