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/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: '查看',
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);
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
index 425de6a2..083e427b 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
@@ -152,7 +152,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
title: '所属项目',
ui: {
widget: 'select',
- placeholder: '请选择',
+ placeholder: '请先选择货主',
visibleIf: {
_$expand: (value: boolean) => value
}
diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
index fae79518..7e69667e 100644
--- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
@@ -116,7 +116,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
title: '所属项目',
ui: {
widget: 'select',
- placeholder: '请选择',
+ placeholder: '请先选择货主',
visibleIf: {
_$expand: (value: boolean) => value
},