+ {{item.billStatus}}
+
+ {{item.wayBillStatus}}
+
+ {{item.driverTelephone}}
+ {{item.driverLicencePlate}}
+
+ {{item.captainTelephone}}
已选（0）
', + iif: item => item.id, click: item => { if (item.partnerType === 1) { this.router.navigate([`/partner/partner-list/etp-detail/${item.id}`]); @@ -394,21 +443,20 @@ export class PartnerListComponent { } } }, - { - text: '审核
', - click: item => this.auditPartner(item) - }, { text: '修改返佣模板', + iif: item => item.id, click: item => this.editTemplateAction(item) }, { text: '修改渠道销售', + iif: item => item.id, click: item => this.editCannelAction(item) }, { text: '重发CRM流程', - click: item => this.reSendCRM(item) + click: item => item.id && this.reSendCRM(item), + iif: item => item.crmStatus === 10 } ] } 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 8c2586a8..6e271d70 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 @@ -14,6 +14,7 @@ export class PartnerAuditModalComponent implements OnInit { @Input() info: any; schema!: SFSchema; + sourcePage = ''; constructor(private nzModalService: NzModalService, public service: PartnerListService) {} ngOnInit(): void { @@ -53,13 +54,11 @@ export class PartnerAuditModalComponent implements OnInit { channelId: { title: '渠道销售', type: 'string', - enum: [ - { value: true, label: '通过' }, - { value: false, label: '驳回' } - ], ui: { widget: 'select', placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getChannel(), hidden: this.info.isPass === false, visibleIf: { status: value => value @@ -115,7 +114,8 @@ export class PartnerAuditModalComponent implements OnInit { .request(this.service.$api_audit_partner, { auditStatusEnum: params.auditStatusEnum, id: params.id, - approvalOpinion: params.approvalOpinion + approvalOpinion: params.approvalOpinion, + sourcePage: this.sourcePage }) .subscribe(res => { if (res) { 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 777d019f..c4abbd48 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 @@ -40,7 +40,7 @@
转移客户数：10
-转移客户数：{{changeST?.total}}
+不转移客户数：10
-不转移客户数：{{noChangeST?.total}}
+
客户转移：客户跟着上级合伙人转移一并到新渠道销售下，会同步发起CRM《客户转移》流程；不转移的，客户会与上级合伙人解绑，修改成功后，修改时间也是合伙人与客户的结算结束时间，成为原来渠道销售的直客。
diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
index 94b4c869..61559772 100644
--- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
+++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts
@@ -47,7 +47,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
subscribeScoll!: Subscription;
constructor(
public service: PartnerListService,
- private route: ActivatedRoute,
+ public route: ActivatedRoute,
private nzModalService: NzModalService,
private datePipe: DatePipe
) {}
@@ -138,7 +138,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
const modal = this.nzModalService.create({
nzTitle: '审核',
nzContent: PartnerAuditModalComponent,
- nzComponentParams: { info: { ...this.detailData, isPass } },
+ nzComponentParams: { info: { ...this.detailData, isPass },sourcePage:'合伙人审核详情' },
nzFooter: null
});
}
@@ -366,13 +366,13 @@ export class PartnerDetailComponent implements OnInit, OnDestroy {
private initST(): { logsColumn: STColumn[]; changeColumn: STColumn[]; beChangeColumn: STColumn[] } {
return {
logsColumn: [
- { title: '修改后渠道销售', index: 'newChannelName', width: 180 },
- { title: '修改前渠道销售', index: 'originalChannelName', width: 160 },
+ { title: '修改后渠道销售', index: 'newChannelIdLabel', width: 180 },
+ { title: '修改前渠道销售', index: 'originalChannelIdLabel', width: 160 },
{ title: '转移客户数', index: 'quantity', className: 'text-center', width: 130 },
{ title: '生效节点', index: 'effectiveNode', width: 150, type: 'enum', enum: { 1: '立即生效', 2: 'CRM审核后生效' } },
{ title: '备注', index: 'remark', className: 'text-center', width: 150 },
- { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 130, type: 'date' },
- { title: '操作人', index: 'modifyUserId', width: 130 },
+ { title: '修改时间', index: 'effectiveTime', className: 'text-center', width: 180, type: 'date' },
+ { title: '操作人', index: 'modifyUserIdLabel', width: 180 },
{
title: '操作',
fixed: 'right',
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 aa2b1e32..96041864 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
@@ -40,7 +40,7 @@
开户行： {{openInfo?.artobank}}
',
click: item => this.creat(item)
},
{
- text: '财务设置',
+ text: '财务设置
',
click: item => this.ticket(item)
},
{
- text: '充值账户',
+ text: '充值账户
',
click: item => this.settingPay(item)
},
{
- text: '应用设置',
+ text: '应用设置
',
click: item => this.settingApp(item)
},
{
- text: '系统配置',
+ text: '系统配置
',
click: item => this.settingAction(item)
},
- { type: 'divider' },
-
// {
// text: '合同设置',
// click: item => this.roleAction(item, 2)
@@ -337,9 +344,9 @@ export class NetworkFreightComponent implements OnInit {
'drawer'
]
};
- this.ui3 = {
- '*': { spanLabelFixed: 150, grid: { span: 24 } },
- '$taxClassificationVersion': { spanLabelFixed: 150, grid: { span: 24 } },
+ this.ui3 = {
+ '*': { spanLabelFixed: 150, grid: { span: 24 } },
+ $taxClassificationVersion: { spanLabelFixed: 150, grid: { span: 24 } }
};
}
initSFTax() {
@@ -377,7 +384,7 @@ export class NetworkFreightComponent implements OnInit {
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
console.log(str);
-
+
return this.service
.request(this.service.$api_get_crmCustomer_page, { customerName: str })
.pipe(map((res: any) => (res.records as any[]).map(i => ({ label: i.customerName, value: i.id } as SFSchemaEnum))))
@@ -387,12 +394,11 @@ export class NetworkFreightComponent implements OnInit {
}
}
} as SFSelectWidgetSchema
- },
+ }
},
required: ['crmCustomerId']
};
this.ui5 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
-
}
initSFFre() {
this.addSchema = {
@@ -444,16 +450,16 @@ export class NetworkFreightComponent implements OnInit {
this.formDataNC = [];
this.formDataTax = [];
this.ticketItem = value;
- this.taxStatus = false
- this.TicketStatus = true
- this.NCStatus = false
+ this.taxStatus = false;
+ this.TicketStatus = true;
+ this.NCStatus = false;
this.initSFTax();
this.initSFNC();
this.initSFTicket();
this.NCID = value.id;
- if(this.TicketStatus) {
+ if (this.TicketStatus) {
console.log('9999999');
-
+
this.service.request(this.service.$api_getTicketByNetworkTransporterId, { id: value.id }).subscribe((res: any) => {
console.log(res);
if (res) {
@@ -466,8 +472,8 @@ export class NetworkFreightComponent implements OnInit {
}
});
}
- if(this.NCStatus) {
- this.getNcSetData()
+ if (this.NCStatus) {
+ this.getNcSetData();
}
this.isVisibleTicket = true;
}
@@ -477,12 +483,12 @@ export class NetworkFreightComponent implements OnInit {
this.service.request(this.service.$api_get_crmCustomer, { id: this.ticketItem.crmCustomerId }).subscribe((res: any) => {
console.log(res);
if (res) {
- List.push({ label: res.customerName, value: res.id });
- console.log(List);
-
- this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List;
- this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List);
- this.sfNC.setValue('/crmCustomerId', res?.id);
+ List.push({ label: res.customerName, value: res.id });
+ console.log(List);
+
+ this.sfNC.getProperty('/crmCustomerId')!.schema.enum = List;
+ this.sfNC.getProperty('/crmCustomerId')!.widget.reset(List);
+ this.sfNC.setValue('/crmCustomerId', res?.id);
}
});
}
@@ -493,7 +499,7 @@ export class NetworkFreightComponent implements OnInit {
regioin?.forEach((element: any) => {
enterpriseAddressCode.push(Number(element));
});
- if(this.TicketStatus) {
+ if (this.TicketStatus) {
this.sfTicket.setValue('/senderRegionCode', enterpriseAddressCode);
return enterpriseAddressCode;
}
@@ -587,11 +593,11 @@ export class NetworkFreightComponent implements OnInit {
this.isVisibleTicket = false;
}
handleOKTicket() {
- console.log( this.taxStatus, this.TicketStatus,this.NCStatus);
- if(this.TicketStatus) {
+ console.log(this.taxStatus, this.TicketStatus, this.NCStatus);
+ if (this.TicketStatus) {
console.log(this.sfTicket);
console.log(this.sfTicket.value);
-
+
if (!this.sfTicket.valid) {
this.service.msgSrv.warning('请正确填写完整！');
return;
@@ -611,11 +617,11 @@ export class NetworkFreightComponent implements OnInit {
this.st.reload(1);
}
});
- } else if(this.NCStatus){
+ } else if (this.NCStatus) {
console.log(this.sfNC);
console.log(this.formDataNC);
console.log(this.sfNC?.value);
-
+
if (!this.sfNC.valid) {
this.service.msgSrv.warning('请正确填写完整！');
return;
@@ -636,7 +642,6 @@ export class NetworkFreightComponent implements OnInit {
});
// api_setCrmCustomer
}
-
}
handleOK() {
@@ -674,12 +679,12 @@ export class NetworkFreightComponent implements OnInit {
this.taxStatus = true;
this.TicketStatus = false;
this.NCStatus = false;
- } else if (value.name === '开票设置'){
+ } else if (value.name === '开票设置') {
this.TicketStatus = true;
this.NCStatus = false;
this.taxStatus = false;
- } else if (value.name === 'NC设置'){
- this.getNcSetData()
+ } else if (value.name === 'NC设置') {
+ this.getNcSetData();
this.NCStatus = true;
this.TicketStatus = false;
this.taxStatus = false;
diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
index c2b8daca..c31db228 100644
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
@@ -65,7 +65,7 @@
驾驶证号：${this.driverDetail?.licenseNo}
从业资格证号：${this.licenseDetail?.licenseNo}
是否确认通过审核`, nzOnOk: () => { - this.adjuctDriverLicense( - { - approvalStatus: 20, - appUserId: this.userDetail?.appUserId - }, - '审核成功' - ); + this.changeEndKmAction() } }); } - + changeEndKmAction() { + this.changeSub.pipe(debounceTime(500)).subscribe((res: string) => { + this.adjuctDriverLicense( + { + approvalStatus: 20, + appUserId: this.userDetail?.appUserId + }, + '审核成功' + ); + }) + } /** 驳回驾驶员信息 */ rejectedDriver() { this.approvalOpinion = ''; diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.html b/src/app/routes/vehicle/components/list/carauth/carauth.component.html index 150b90d0..9eda46b1 100644 --- a/src/app/routes/vehicle/components/list/carauth/carauth.component.html +++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.html @@ -2,9 +2,9 @@ * @Description : * @Version : 1.0 * @Author : Shiming - * @Date : 2022-02-16 10:09:23 + * @Date : 2022-03-14 14:17:38 * @LastEditors : Shiming - * @LastEditTime : 2022-02-16 10:14:29 + * @LastEditTime : 2022-03-25 16:22:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\vehicle\\components\\list\\carauth\\carauth.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -32,12 +32,16 @@
+ 
+ 
-
-
-
+
+
\ No newline at end of file
diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.less b/src/app/routes/vehicle/components/list/carauth/carauth.component.less
index e3f1fc3f..ee4cb587 100644
--- a/src/app/routes/vehicle/components/list/carauth/carauth.component.less
+++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.less
@@ -75,7 +75,7 @@
.pa {
position: absolute;
top: 35px;
- left: 150px;
+ left: 140px;
}
.tips {
@@ -96,7 +96,7 @@
.drivercard{
position: absolute;
top: 0;
- left: 330px;
+ left: 325px;
border: solid 1px #ebf0fb;
}
.jopcard{
@@ -113,11 +113,17 @@
}
:host{
::ng-deep {
- .ant-input-borderless{
- padding: 0;
- padding-top: 4px;
- color: black;
- resize:none;
- }
+ .ant-input-borderless{
+ padding: 0;
+ padding-top: 4px;
+ color: black;
+ resize:none;
+ }
+ .setCustom .ant-form-item-control{
+ margin-left: -100px !important
+ }
+ .borderImg{
+ border: solid 1px #ebf0fb;
+ }
}
- }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
index 16e43dcc..bbd91cfb 100644
--- a/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
+++ b/src/app/routes/vehicle/components/list/carauth/carauth.component.ts
@@ -24,38 +24,37 @@ export class CarSettleCarauthComponent implements OnInit {
showJopFlag = false;
companyData: any = {};
detailData: any = {};
- carNo = '';
-
+ carNo = ''
+
constructor(
private modal: NzModalRef,
public service: VehicleService,
private envSrv: EAEnvironmentService,
- private eaCacheSrv: EACacheService
- ) {}
+ private eaCacheSrv: EACacheService,
+ ) { }
ngOnInit(): void {
- console.log(this.i)
- this.initData();
- this.initSF();
+ this.initData()
+ this.initSF()
}
initData() {
- if (this.i?.id) {
- this.companyData = this.eaCacheSrv.get(cacheConf.env);
+ if (this.i.id) {
+ this.companyData = this.eaCacheSrv.get(cacheConf.env)
const params = {
- id: this.i?.id
- };
+ id: this.i.id,
+ }
this.service.request(this.service.$api_shipperCarGet, params).subscribe(res => {
- this.detailData = res;
- this.detailData.isSelf = res.isSelf ? 1 : 0;
- this.detailData.isTrailer = res.isTrailer ? 1 : 0;
+ this.detailData = res
+ this.detailData.isSelf = res.isSelf ? 1 : 0
+ this.detailData.isTrailer = res.isTrailer ? 1 : 0
this.detailData.carFrontPhotoWatermark = [
{
uid: -1,
name: 'LOGO',
status: 'done',
url: this.detailData.carFrontPhotoWatermark,
- response: this.detailData.carFrontPhotoWatermark
- }
+ response: this.detailData.carFrontPhotoWatermark,
+ },
];
this.detailData.carProtocalWatermark = [
{
@@ -63,8 +62,8 @@ export class CarSettleCarauthComponent implements OnInit {
name: 'LOGO',
status: 'done',
url: this.detailData.carProtocalWatermark,
- response: this.detailData.carProtocalWatermark
- }
+ response: this.detailData.carProtocalWatermark,
+ },
];
this.detailData.certificatePhotoFrontWatermark = [
{
@@ -72,8 +71,8 @@ export class CarSettleCarauthComponent implements OnInit {
name: 'LOGO',
status: 'done',
url: this.detailData.certificatePhotoFrontWatermark,
- response: this.detailData.certificatePhotoFrontWatermark
- }
+ response: this.detailData.certificatePhotoFrontWatermark,
+ },
];
this.detailData.certificatePhotoBackWatermark = [
{
@@ -81,8 +80,8 @@ export class CarSettleCarauthComponent implements OnInit {
name: 'LOGO',
status: 'done',
url: this.detailData.certificatePhotoBackWatermark,
- response: this.detailData.certificatePhotoBackWatermark
- }
+ response: this.detailData.certificatePhotoBackWatermark,
+ },
];
this.detailData.roadTransportPhotoWatermark = [
{
@@ -90,10 +89,10 @@ export class CarSettleCarauthComponent implements OnInit {
name: 'LOGO',
status: 'done',
url: this.detailData.roadTransportPhotoWatermark,
- response: this.detailData.roadTransportPhotoWatermark
- }
+ response: this.detailData.roadTransportPhotoWatermark,
+ },
];
- });
+ })
}
}
initSF() {
@@ -104,7 +103,7 @@ export class CarSettleCarauthComponent implements OnInit {
title: '车头照照片',
ui: {
action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
resReName: 'data.fullFileWatermarkPath',
@@ -112,21 +111,21 @@ export class CarSettleCarauthComponent implements OnInit {
widget: 'upload',
descriptionI18n: '请上传车头照照片，支持JPG、PNG格式，文件小于5M。',
data: {
- appId: this.envSrv.env.appId
+ appId: this.envSrv.env.appId,
},
name: 'multipartFile',
multiple: false,
listType: 'picture-card',
change: (args: any) => {
if (args.type === 'success') {
- this.detailData.carFrontPhoto = args.file.response.data.fullFilePath;
+ this.detailData.carFrontPhoto = args.file.response.data.fullFilePath
}
},
beforeUpload: (file: any, _fileList: any) => {
return new Observable((observer: Observer