();
facetext: any;
faceStatus: any = 0;
userIdentityDetail: any = {};
@@ -73,6 +76,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
ngOnInit() {
this.initData();
this.initDetailByCode();
+ this.changeEndKmAction()
}
initData() {
// 获取司机头部信息
@@ -209,17 +213,21 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
nzTitle: '审核通过',
nzContent: `驾驶证号：${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/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index 6880be7b..de3a37d1 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 @@
-
+
+
+
+ 服务评级
+ (暂无评级)
+
+
+
+
+
+
+
+ 合伙人信息
+
+ {{partnerInfo.partnerEnterpriseName}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 渠道销售信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ 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..cd82f249 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 = {};
@@ -30,12 +34,12 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
ltdId: any = [];
roles: any = [];
customerServices: any = [];
-
+ billEvaluateList: any = [];
approvalOpinion = '';
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,81 @@ 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) {
@@ -115,6 +203,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => {
if (billEvaluate) {
this.billEvaluate = billEvaluate.totalScore;
+ this.billEvaluateList = res;
}
});
}
@@ -273,7 +362,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 +375,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.html b/src/app/routes/usercenter/components/freight/list/list.component.html
index e2504257..a6d0ea7c 100644
--- a/src/app/routes/usercenter/components/freight/list/list.component.html
+++ b/src/app/routes/usercenter/components/freight/list/list.component.html
@@ -39,6 +39,15 @@
+
+
+
+
+
+
+ 暂无评价
+
+
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..a5c4f017 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: {
@@ -479,7 +363,7 @@ export class FreightComponentsListComponent implements OnInit {
initST() {
this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' },
- { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
+ { title: '企业名称', render: 'enterpriseName', width: 350 },
{ title: '统一社会信用代码', className: 'text-center', render: 'unifiedSocialCreditCode', width: 200 },
{
title: '公司所在地',
@@ -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/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts
index 9b1cbc6e..59359454 100644
--- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts
@@ -715,15 +715,15 @@ export class FreightComponentsListNewComponent implements OnInit {
}
},
promotersTelephone: {
- title: '推广业务员手机号',
+ title: '邀请码',
type: 'string',
minLength: 1,
format: 'mobile',
maxLength: 11,
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
- placeholder: '请输入推广业务员手机号',
- errors: { required: '请输入推广业务员手机号', format: '手机号格式错误' }
+ placeholder: '请输入邀请码',
+ errors: { required: '请输入邀请码', format: '手机号格式错误' }
}
},
networkTransporter: {
diff --git a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html
index 83ae084c..82ea63f2 100644
--- a/src/app/routes/usercenter/components/freight/list/showService/showService.component.html
+++ b/src/app/routes/usercenter/components/freight/list/showService/showService.component.html
@@ -1,15 +1,4 @@
-
-
-
+
+
+ 
+
+
+ 
+
- 
-
-
-
+
+
\ 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..245f172c 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() {
@@ -103,8 +102,8 @@ export class CarSettleCarauthComponent implements OnInit {
type: 'string',
title: '车头照照片',
ui: {
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ action: apiConf.waterFileUpload,
+ accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
resReName: 'data.fullFileWatermarkPath',
@@ -112,29 +111,46 @@ 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;
+ console.log(args);
+ const avatar = [
+ {
+ uid: -1,
+ name: 'LOGO',
+ status: 'done',
+ url: args.file.response.data.fullFileWatermarkPath,
+ response: {
+ url: args.file.response.data.fullFileWatermarkPath,
+ },
+ },
+ ];
+ this.sf?.setValue('/carFrontPhotoWatermark', avatar);
+ this.detailData.carFrontPhoto = args.file.response.data.fullFilePath
}
},
beforeUpload: (file: any, _fileList: any) => {
return new Observable((observer: Observer) => {
- const isLt2M = file.size / 1024 / 1024 < 2;
+ const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
- this.service.msgSrv.warning('图片大小超过2M!');
+ this.service.msgSrv.warning('图片大小超过5M!');
observer.complete();
return;
}
+ console.log(_fileList)
+
observer.next(isLt2M);
observer.complete();
});
},
- // previewFile: (file: NzUploadFile) => of(file.url)
+ // previewFile: (file: NzUploadFile) => of(
+ // file?.response?.data?.fullFilePath
+ // ),
}
},
carNo: {
@@ -142,8 +158,8 @@ export class CarSettleCarauthComponent implements OnInit {
maxLength: 9,
type: 'string',
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
carNoColor: {
title: '车牌颜色',
@@ -151,9 +167,9 @@ export class CarSettleCarauthComponent implements OnInit {
ui: {
widget: 'dict-select',
params: { dictKey: 'car:color' },
- placeholder: '请选择车型',
- containsAllLabel: false
- } as SFSelectWidgetSchema
+ placeholder: '请选择车牌颜色',
+ containsAllLabel:false,
+ } as SFSelectWidgetSchema,
},
carModel: {
title: '车型',
@@ -162,8 +178,8 @@ export class CarSettleCarauthComponent implements OnInit {
widget: 'dict-select',
params: { dictKey: 'car:model' },
placeholder: '请选择车型',
- containsAllLabel: false
- } as SFSelectWidgetSchema
+ containsAllLabel:false,
+ } as SFSelectWidgetSchema,
},
carLength: {
title: '车长',
@@ -172,8 +188,8 @@ export class CarSettleCarauthComponent implements OnInit {
widget: 'dict-select',
params: { dictKey: 'car:length' },
placeholder: '请选择车长',
- containsAllLabel: false
- } as SFSelectWidgetSchema
+ containsAllLabel:false,
+ } as SFSelectWidgetSchema,
},
carLoad: {
title: '载重',
@@ -181,10 +197,11 @@ export class CarSettleCarauthComponent implements OnInit {
maxLength: 6,
ui: {
placeholder: '请输入',
- change: (val: any) => {
- const value = val.replace(/\D/g, '');
- this.sf.setValue('/carLoad', value);
- }
+ addOnAfter: '吨',
+ change: (val: any) =>{
+ const value = val.replace(/\D/g,'')
+ this.sf.setValue('/carLoad', value)
+ },
}
},
isSelf: {
@@ -192,11 +209,11 @@ export class CarSettleCarauthComponent implements OnInit {
type: 'string',
enum: [
{ label: '否', value: 0 },
- { label: '是', value: 1 }
+ { label: '是', value: 1 },
],
ui: {
widget: 'select',
- placeholder: '请选择'
+ placeholder: '请选择',
}
},
isTrailer: {
@@ -204,19 +221,19 @@ export class CarSettleCarauthComponent implements OnInit {
type: 'string',
enum: [
{ label: '否', value: 0 },
- { label: '是', value: 1 }
+ { label: '是', value: 1 },
],
ui: {
widget: 'select',
- placeholder: '请选择'
+ placeholder: '请选择',
}
},
carProtocalWatermark: {
type: 'string',
title: '挂靠协议',
ui: {
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ action: apiConf.waterFileUpload,
+ accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
resReName: 'data.fullFileWatermarkPath',
@@ -224,14 +241,26 @@ 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.certificatePhotoFront = args.file.response.data.fullFilePath;
+ const avatar = [
+ {
+ uid: -1,
+ name: 'LOGO',
+ status: 'done',
+ url: args.file.response.data.fullFileWatermarkPath,
+ response: {
+ url: args.file.response.data.fullFileWatermarkPath,
+ },
+ },
+ ];
+ this.sf?.setValue('/carProtocalWatermark', avatar);
+ this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath
}
},
beforeUpload: (file: any, _fileList: any) => {
@@ -246,31 +275,39 @@ export class CarSettleCarauthComponent implements OnInit {
observer.complete();
});
},
- // previewFile: (file: NzUploadFile) => of(file.url)
+ previewFile: (file: NzUploadFile) => of(file.url),
+ }
+ },
+ agreeImg: {
+ title: '',
+ type: 'boolean',
+ // enum: [{ label: '长期', value: true }],
+ ui: {
+ widget: 'custom',
}
},
titleA: {
title: '行驶证信息(必填）',
type: 'string',
ui: {
- widget: 'text'
+ widget: 'text',
},
- default: '照片上传后会自动识别文字并填充下列内容栏'
+ default: '照片上传后会自动识别文字并填充下列内容栏',
},
tipsA: {
title: '',
type: 'string',
ui: {
widget: 'custom',
- offsetControl: 6
- }
+ offsetControl: 6,
+ },
},
certificatePhotoFrontWatermark: {
type: 'string',
title: '行驶证首页照片',
ui: {
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ action: apiConf.waterFileUpload,
+ accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
resReName: 'data.fullFileWatermarkPath',
@@ -278,24 +315,36 @@ export class CarSettleCarauthComponent implements OnInit {
widget: 'upload',
descriptionI18n: '请上传行驶证首页照片，支持JPG、PNG格式，文件小于5M。照片信息缺失、拼凑、过度PS、模糊不清，都不会通过审核。',
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.certificatePhotoFront = args.file.response.data.fullFilePath;
+ const avatar = [
+ {
+ uid: -1,
+ name: 'LOGO',
+ status: 'done',
+ url: args.file.response.data.fullFileWatermarkPath,
+ response: {
+ url: args.file.response.data.fullFileWatermarkPath,
+ },
+ },
+ ];
+ this.sf?.setValue('/certificatePhotoFrontWatermark', avatar);
+ this.detailData.certificatePhotoFront = args.file.response.data.fullFilePath
this.checkCarCard(args.file.response.data.fullFilePath, 'front');
} else {
- this.detailData.certificatePhotoFront = '';
+ this.detailData.certificatePhotoFront = ''
}
},
beforeUpload: (file: any, _fileList: any) => {
return new Observable((observer: Observer) => {
- const isLt2M = file.size / 1024 / 1024 < 2;
+ const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
- this.service.msgSrv.warning('图片大小超过2M!');
+ this.service.msgSrv.warning('图片大小超过5M!');
observer.complete();
return;
}
@@ -303,7 +352,7 @@ export class CarSettleCarauthComponent implements OnInit {
observer.complete();
});
},
- // previewFile: (file: NzUploadFile) => of(file.url)
+ // previewFile: (file: NzUploadFile) => of(file.url),
}
},
tipsB: {
@@ -311,15 +360,15 @@ export class CarSettleCarauthComponent implements OnInit {
type: 'string',
ui: {
widget: 'custom',
- offsetControl: 6
- }
+ offsetControl: 6,
+ },
},
certificatePhotoBackWatermark: {
type: 'string',
title: '行驶证副页照片',
ui: {
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ action: apiConf.waterFileUpload,
+ accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
resReName: 'data.fullFileWatermarkPath',
@@ -327,24 +376,36 @@ 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.certificatePhotoBack = args.file.response.data.fullFilePath;
+ const avatar = [
+ {
+ uid: -1,
+ name: 'LOGO',
+ status: 'done',
+ url: args.file.response.data.fullFileWatermarkPath,
+ response: {
+ url: args.file.response.data.fullFileWatermarkPath,
+ },
+ },
+ ];
+ this.sf?.setValue('/certificatePhotoBackWatermark', avatar);
+ this.detailData.certificatePhotoBack = args.file.response.data.fullFilePath
this.checkCarCard(args.file.response.data.fullFilePath, 'back');
} else {
- this.detailData.certificatePhotoBack = '';
+ this.detailData.certificatePhotoBack = ''
}
},
beforeUpload: (file: any, _fileList: any) => {
return new Observable((observer: Observer) => {
- const isLt2M = file.size / 1024 / 1024 < 2;
+ const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
- this.service.msgSrv.warning('图片大小超过2M!');
+ this.service.msgSrv.warning('图片大小超过5M!');
observer.complete();
return;
}
@@ -352,7 +413,7 @@ export class CarSettleCarauthComponent implements OnInit {
observer.complete();
});
},
- // previewFile: (file: NzUploadFile) => of(file.url)
+ // previewFile: (file: NzUploadFile) => of(file.url),
}
},
driverLicenseRegisterTime: {
@@ -360,16 +421,16 @@ export class CarSettleCarauthComponent implements OnInit {
type: 'string',
format: 'date',
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
driverLicenseGetTime: {
title: '行驶证发证日期',
type: 'string',
format: 'date',
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
driverLicenseEndTime: {
title: '行驶证到期日期',
@@ -377,24 +438,24 @@ export class CarSettleCarauthComponent implements OnInit {
format: 'date',
maxLength: 30,
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
driverLicenseSigningOrg: {
title: '行驶证签发机关',
type: 'string',
maxLength: 30,
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
carDistinguishCode: {
title: '车辆识别代码',
type: 'string',
maxLength: 30,
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
useNature: {
title: '使用性质',
@@ -402,42 +463,42 @@ export class CarSettleCarauthComponent implements OnInit {
maxLength: 30,
enum: [
{ label: '非营运', value: 0 },
- { label: '营运', value: 1 }
+ { label: '营运', value: 1 },
],
ui: {
widget: 'select',
- placeholder: '请选择'
- }
+ placeholder: '请选择',
+ },
},
curbWeight: {
title: '整备质量',
type: 'string',
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
carOwner: {
title: '所有人',
type: 'string',
maxLength: 30,
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
titleB: {
title: '道运证(选填）',
type: 'string',
ui: {
- widget: 'text'
+ widget: 'text',
},
- default: '照片上传后会自动识别文字并填充下列内容栏'
+ default: '照片上传后会自动识别文字并填充下列内容栏',
},
roadTransportPhotoWatermark: {
type: 'string',
title: '道运证照片',
ui: {
- action: apiConf.fileUpload,
- fileType: 'image/png,image/jpeg,image/jpg,image/gif',
+ action: apiConf.waterFileUpload,
+ accept: 'image/png,image/jpeg,image/jpg,image/gif',
limit: 1,
limitFileCount: 1,
resReName: 'data.fullFileWatermarkPath',
@@ -445,24 +506,36 @@ 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.roadTransportPhoto = args.file.response.data.fullFilePath;
+ const avatar = [
+ {
+ uid: -1,
+ name: 'LOGO',
+ status: 'done',
+ url: args.file.response.data.fullFileWatermarkPath,
+ response: {
+ url: args.file.response.data.fullFileWatermarkPath,
+ },
+ },
+ ];
+ this.sf?.setValue('/roadTransportPhotoWatermark', avatar);
+ this.detailData.roadTransportPhoto = args.file.response.data.fullFilePath
this.checkTransCard(args.file.response.data.fullFilePath);
} else {
- this.detailData.roadTransportPhoto = '';
+ this.detailData.roadTransportPhoto = ''
}
},
beforeUpload: (file: any, _fileList: any) => {
return new Observable((observer: Observer) => {
- const isLt2M = file.size / 1024 / 1024 < 2;
+ const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
- this.service.msgSrv.warning('图片大小超过2M!');
+ this.service.msgSrv.warning('图片大小超过5M!');
observer.complete();
return;
}
@@ -470,7 +543,15 @@ export class CarSettleCarauthComponent implements OnInit {
observer.complete();
});
},
- // previewFile: (file: NzUploadFile) => of(file.url)
+ // previewFile: (file: NzUploadFile) => of(file.url),
+ }
+ },
+ roadImg: {
+ title: '',
+ type: 'boolean',
+ // enum: [{ label: '长期', value: true }],
+ ui: {
+ widget: 'custom',
}
},
roadTransportNo: {
@@ -479,8 +560,8 @@ export class CarSettleCarauthComponent implements OnInit {
maxLength: 30,
ui: {
// widget: this.detailData.commitFlag !== 0 ? 'text' : '',
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
roadTransportLicenceNo: {
title: '经营许可证号',
@@ -488,25 +569,25 @@ export class CarSettleCarauthComponent implements OnInit {
maxLength: 30,
ui: {
// widget: this.detailData.commitFlag !== 0 ? 'text' : '',
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
roadTransportStartTime: {
title: '发证日期',
type: 'string',
format: 'date',
ui: {
- placeholder: '请输入'
- }
+ placeholder: '请输入',
+ },
},
roadTransportEndTime: {
title: '有效期至',
type: 'string',
format: 'date',
ui: {
- placeholder: '请输入'
- }
- }
+ placeholder: '请输入',
+ },
+ },
},
required: [
'carFrontPhotoWatermark',
@@ -526,62 +607,61 @@ export class CarSettleCarauthComponent implements OnInit {
'carDistinguishCode',
'useNature',
'carOwner'
- ]
+ ],
};
this.ui = {
'*': {
spanLabelFixed: 180,
grid: { span: 18 },
- width: 600
+ width: 600,
},
$title1: {
- spanLabelFixed: 0
+ spanLabelFixed: 0,
},
$title2: {
- spanLabelFixed: 0
+ spanLabelFixed: 0,
},
$title3: {
- spanLabelFixed: 0
+ spanLabelFixed: 0,
},
- $enterpriseRegistrationTime: {
- width: 680
+ $isTrailer:{
+ grid: { span: 24 },
},
- $operatingEndTime: {
- grid: { span: 9 }
+ $carProtocalWatermark: {
+ grid: { span:12 },
},
- $dateType: {
- grid: { span: 4 }
+ $agreeImg: {
+ grid: { span: 4 },
+ class: 'setCustom'
},
- $validEndTime: {
- grid: { span: 9 }
+ $titleB:{
+ grid: { span: 24 },
},
- $dateType01: {
- grid: { span: 4 }
+ $roadTransportPhotoWatermark: {
+ grid: { span: 12 },
},
- $registrationCapital: {
- grid: { span: 12 }
+ $roadImg: {
+ grid: { span: 4 },
+ class: 'setCustom'
},
- $unit: {
- spanLabelFixed: 20,
- grid: { span: 3 }
- }
+
};
}
// 道路运输证识别
checkTransCard(imgurl: any) {
const params = {
- transportationLicenseUrl: imgurl
+ transportationLicenseUrl: imgurl,
};
- this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe(res => {
+ this.service.request(this.service.$api_recognizeTransportationLicense, params).subscribe((res: any) => {
if (res) {
this.sf.setValue('/roadTransportNo', res.number);
this.sf.setValue('/roadTransportLicenceNo', res.businessCertificate);
this.sf.setValue('/roadTransportStartTime', res.issueDate);
- if (this.carNo === '') {
- this.carNo = res.number;
- } else if (this.carNo && res.vehicleNumber.indexOf(this.carNo) === -1) {
- this.service.msgSrv.warning('请上传同一认证车辆的相关证件');
+ if(this.carNo === '') {
+ this.carNo = res.number
+ } else if(this.carNo && res.vehicleNumber.indexOf(this.carNo) === -1) {
+ this.service.msgSrv.warning('请上传同一认证车辆的相关证件')
}
}
});
@@ -590,12 +670,11 @@ export class CarSettleCarauthComponent implements OnInit {
checkCarCard(imgurl: any, side: any) {
const params = {
vehicleLicenseUrl: imgurl,
- side
+ side,
};
- this.service.request(this.service.$api_recognizeVehicleLicense, params).subscribe(res => {
+ this.service.request(this.service.$api_recognizeVehicleLicense, params).subscribe((res: any) => {
if (res) {
- if (side === 'front') {
- // 正面
+ if (side === 'front') { // 正面
this.sf.setValue('/driverLicenseRegisterTime', res.registerDate);
this.sf.setValue('/carNo', res.number);
this.sf.setValue('/driverLicenseGetTime', res.issueDate);
@@ -603,49 +682,46 @@ export class CarSettleCarauthComponent implements OnInit {
this.sf.setValue('/carDistinguishCode', res.vin);
this.sf.setValue('/carOwner', res.name);
this.sf.setValue('/useNature', res.useCharacter === '非营运' ? 0 : 1);
+
} else {
this.sf.setValue('/curbWeight', res.unladenMass);
}
- if (this.carNo === '') {
- this.carNo = res.number;
- } else if (this.carNo && this.carNo !== res.number) {
- this.service.msgSrv.warning('请上传同一认证车辆的相关证件');
+ if(this.carNo === '') {
+ this.carNo = res.number
+ } else if(this.carNo && this.carNo !== res.number) {
+ this.service.msgSrv.warning('请上传同一认证车辆的相关证件')
}
}
});
}
close(): void {
- this.modal.destroy();
+ this.modal.close(true);
}
showExample() {
- this.showCardFlag = !this.showCardFlag;
+ this.showCardFlag = !this.showCardFlag
}
showJopExample() {
- this.showJopFlag = !this.showJopFlag;
+ this.showJopFlag = !this.showJopFlag
}
submitForm() {
const params: any = {
appUserId: this.i.appUserId,
- ...this.sf.value
+ ...this.sf.value,
+ bindType: this.i.bindType
};
- params.carFrontPhoto = this.detailData.carFrontPhoto;
- params.carProtocal = this.detailData.carProtocal;
- params.certificatePhotoFront = this.detailData.certificatePhotoFront;
- params.certificatePhotoBack = this.detailData.certificatePhotoBack;
- params.roadTransportPhoto = this.detailData.roadTransportPhoto;
- params.carFrontPhotoWatermark = this.sf.value.carFrontPhotoWatermark?.data?.fullFilePath || this.sf.value.carFrontPhotoWatermark
- params.carProtocalWatermark = this.sf.value.carProtocalWatermark?.data?.fullFilePath || this.sf.value.carProtocalWatermark
- params.certificatePhotoBackWatermark = this.sf.value.certificatePhotoBackWatermark?.data?.fullFilePath || this.sf.value.certificatePhotoBackWatermark
- params.certificatePhotoFrontWatermark = this.sf.value.certificatePhotoFrontWatermark?.data?.fullFilePath || this.sf.value.certificatePhotoFrontWatermark
- params.roadTransportPhotoWatermark = this.sf.value.roadTransportPhotoWatermark?.data?.fullFilePath || this.sf.value.roadTransportPhotoWatermark
- delete params.titleA;
- delete params.titleB;
- this.service.request(this.service.$api_addOrUpdateCarLicenseInfo, params).subscribe(res => {
+ params.carFrontPhoto = this.detailData.carFrontPhoto
+ params.carProtocal = this.detailData.carProtocal
+ params.certificatePhotoFront = this.detailData.certificatePhotoFront
+ params.certificatePhotoBack = this.detailData.certificatePhotoBack
+ params.roadTransportPhoto = this.detailData.roadTransportPhoto
+ delete params.titleA
+ delete params.titleB
+ this.service.request(this.service.$api_saveUpdateShipperCar, params).subscribe((res: any) => {
if (res) {
- this.service.msgSrv.success('添加成功');
- this.modal.close(true);
+ this.service.msgSrv.success('添加成功')
+ this.modal.close(true)
}
- });
+ })
}
}
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts
index ae822729..7f81c557 100644
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@@ -127,6 +127,15 @@ export class VehicleComponentsListComponent implements OnInit {
}
}
},
+ carLoad: {
+ title: '载重',
+ type: 'string',
+ ui: {
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
isSelf: {
type: 'string',
title: '是否挂靠',
@@ -174,7 +183,23 @@ export class VehicleComponentsListComponent implements OnInit {
expand: (value: boolean) => value
}
}
- }
+ },
+ isSelfs: {
+ type: 'string',
+ title: '是否入网',
+ enum: [
+ { label: '全部', value: '' },
+ { label: '是', value: 1 },
+ { label: '否', value: 0 }
+ ],
+ ui: {
+ widget: 'select',
+ allowClear: true,
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
// putOnRecord: {
// type: 'string',
// title: '是否已备案',
@@ -211,8 +236,8 @@ export class VehicleComponentsListComponent implements OnInit {
false: { text: '空闲', color: 'default' }
}
},
- { title: '道运证', width: '150px', className: 'text-center', index: 'roadTransportNo' },
- { title: '审核人', width: '150px', className: 'text-center', index: 'approvalUserName' },
+ // { title: '道运证', width: '150px', className: 'text-center', index: 'roadTransportNo' },
+ // { title: '审核人', width: '150px', className: 'text-center', index: 'approvalUserName' },
{
title: '行驶证到期状态',
@@ -238,11 +263,11 @@ export class VehicleComponentsListComponent implements OnInit {
3: { text: '已到期', color: 'error' }
}
},
+ { title: '是否入网', width: '200px', className: 'text-center', index: 'carOwner' },
{ title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' },
{ title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' },
{ title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' },
// { title: '是否已备案', className: 'text-center', render: 'putOnRecord', },
-
{
title: '操作',
fixed: 'right',
@@ -283,6 +308,11 @@ export class VehicleComponentsListComponent implements OnInit {
}
// 导出
exportFire() {
- this.service.downloadFile(this.service.$api_carLicense_export, this.reqParams);
+ this.service.request(this.service.$api_carLicense_export, this.reqParams).subscribe((res: any) => {
+ if(res) {
+ this.service.msgSrv.success('导出成功,请去右上角下载中心下载')
+ return
+ }
+ });
}
}
diff --git a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
index 13df6295..0b6288ab 100644
--- a/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
+++ b/src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
@@ -1,7 +1,7 @@
-
+
![]()
diff --git a/src/app/shared/components/imagelist/imagelist.component.ts b/src/app/shared/components/imagelist/imagelist.component.ts
index 40bb7f37..6fba4fd0 100644
--- a/src/app/shared/components/imagelist/imagelist.component.ts
+++ b/src/app/shared/components/imagelist/imagelist.component.ts
@@ -1,10 +1,10 @@
/*
* @Author: your name
* @Date: 2021-12-09 17:36:13
- * @LastEditTime: 2021-12-10 14:12:24
- * @LastEditors: Please set LastEditors
+ * @LastEditTime : 2022-03-25 15:43:12
+ * @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- * @FilePath: \tms-obc-web\src\app\shared\components\imagelist\imagelist.component.ts
+ * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\imagelist\\imagelist.component.ts
*/
import { Component, Input, OnInit } from '@angular/core';
import { ModalHelper, _HttpClient } from '@delon/theme';
@@ -26,13 +26,20 @@ export class ImageListComponent implements OnInit {
private nzImageService: NzImageService
) {}
- ngOnInit(): void {}
+ ngOnInit(): void {
+
+ }
showImg(index: any) {
const params = {
imgList: this.imgList,
index
};
- const images = this.imgList.map((url: string) => ({ src: url }));
+ const images = this.imgList.map((url: string) => {
+ if(url) {
+ console.log(url);
+ ({ src: url })
+ }
+ });
this.nzImageService.preview(images);
// this.modal.create(ImageViewComponent, { params }).subscribe(res => {});
}
diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts
index 9d60db0e..bba9056d 100644
--- a/src/app/shared/services/business/shipper-base.service.ts
+++ b/src/app/shared/services/business/shipper-base.service.ts
@@ -23,13 +23,16 @@ export class ShipperBaseService extends BaseService {
$api_get_rebate_config = `/api/mdc/rebateConfig/list/listRebateConfig`;
// 获取渠道销售管理集合
$api_get_channel = `/api/mdc/channelSalesManagement/list/listChannelSalesManagement`;
+
+ // 获取货主企业列表
+ public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
constructor(public injector: Injector) {
super(injector);
}
/**
* 获取无车承运人
- * @returns
+ * @returns
*/
getCarlessCarrier() {
const params = {};
@@ -166,6 +169,33 @@ export class ShipperBaseService extends BaseService {
);
}
+ /**
+ * 获取货主企业列表
+ * @returns
+ */
+ getEnterpriceList(params = { enterpriseName: '' }, containerAll = false) {
+ let str = params.enterpriseName.replace(/^\s+|\s+$/g, '');
+ if (str) {
+ return this.request(this.$api_enterpriceList, params).pipe(
+ map((res: any) => {
+ if (!res) {
+ return [];
+ }
+ const list = res.map((item: any) => {
+ return { label: item.enterpriseName, value: item.id };
+ });
+ const obj = [];
+ if (containerAll) {
+ obj.push({ label: '全部', value: '' });
+ }
+ return [...obj, ...list];
+ })
+ ).toPromise();;
+ } else {
+ return of([]);
+ }
+ }
+
/**
* 获取结算客户
* @returns
@@ -267,7 +297,7 @@ export class ShipperBaseService extends BaseService {
map(res => {
if (res) {
return res.map((m: any) => {
- return { label: m.name, value: m.id };
+ return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.userAppId };
});
} else {
return [];
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);
+ // });
}
/**
diff --git a/src/app/shared/shared-g2.module.ts b/src/app/shared/shared-g2.module.ts
index 685f05bc..93863e08 100644
--- a/src/app/shared/shared-g2.module.ts
+++ b/src/app/shared/shared-g2.module.ts
@@ -2,5 +2,7 @@ import { G2BarModule } from '@delon/chart/bar';
import { G2MiniAreaModule } from '@delon/chart/mini-area';
import { G2PieModule } from '@delon/chart/pie';
import { G2TimelineModule } from '@delon/chart/timeline';
+import { G2CardModule } from '@delon/chart/card';
-export const SHARED_G2_MODULES = [G2BarModule, G2PieModule, G2TimelineModule, G2MiniAreaModule];
+
+export const SHARED_G2_MODULES = [G2BarModule, G2PieModule, G2TimelineModule, G2MiniAreaModule, G2CardModule];
diff --git a/src/app/shared/widget/from-to/from-to.widget.ts b/src/app/shared/widget/from-to/from-to.widget.ts
index e388f426..2724593d 100644
--- a/src/app/shared/widget/from-to/from-to.widget.ts
+++ b/src/app/shared/widget/from-to/from-to.widget.ts
@@ -61,13 +61,12 @@ export class EAFromToWidget extends ControlWidget implements OnInit {
}
onChange(result: Array): void {
- console.log('onChange: ', result);
-
+ // console.log('onChange: ', result);
if (this.type === 'date') {
if (JSON.stringify(result) !== '[]') {
this.setValue({ start: format(result[0], this.format), end: format(result[1], this.format) });
} else {
- this.setValue(null);
+ this.setValue({ start: '', end: '' });
}
} else if (this.type === 'number') {
} else {
@@ -82,4 +81,8 @@ export class EAFromToWidget extends ControlWidget implements OnInit {
_change(value: string): void {
this.setValue(value);
}
+
+ reset(value: string) {
+ this.date = [];
+ }
}
diff --git a/src/app/shared/widget/tinymce/tinymce.widget.ts b/src/app/shared/widget/tinymce/tinymce.widget.ts
index 958643a8..3657a550 100644
--- a/src/app/shared/widget/tinymce/tinymce.widget.ts
+++ b/src/app/shared/widget/tinymce/tinymce.widget.ts
@@ -1,3 +1,13 @@
+/*
+ * @Description :
+ * @Version : 1.0
+ * @Author : Shiming
+ * @Date : 2021-11-29 10:04:12
+ * @LastEditors : Shiming
+ * @LastEditTime : 2022-03-24 18:18:00
+ * @FilePath : \\tms-obc-web\\src\\app\\shared\\widget\\tinymce\\tinymce.widget.ts
+ * Copyright (C) 2022 huzhenhong. All rights reserved.
+ */
import { Component, OnInit } from '@angular/core';
import { ControlWidget } from '@delon/form';
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index a55bcd70..25563c4a 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -1,1025 +1,650 @@
{
"success": true,
"data": {
- "menu": [
- {
- "text": "主导航",
- "hideInBreadcrumb": true,
- "children": [
- {
- "text": "用户中心",
- "icon": "iconfont icon-yonghu-copy",
- "group": true,
- "children": [
- {
- "text": "货主管理",
- "children": [
- {
- "text": "企业列表",
- "link": "/usercenter/freight/list"
- },
- {
- "text": "道运证",
- "hide": true,
- "link": "/usercenter/freight/list/view/:id"
- },
- {
- "text": "货主详情",
- "hide": true,
- "link": "/usercenter/freight/list/detail/:id"
- },
- {
- "text": "企业认证",
- "hide": true,
- "link": "/usercenter/freight/new"
- },
- {
- "text": "企业审核列表",
- "link": "/usercenter/freight/enterprise"
- },
- {
- "text": "企业审核列表详情",
- "hide": true,
- "link": "/usercenter/freight/enterprise/view/:id"
- },
- {
- "text": "货主员工列表",
- "link": "/usercenter/freight/user"
- },
- {
- "text": "货主员工详情",
- "hide": true,
- "link": "/usercenter/freight/user/view/:id"
- }
- ]
- },
- {
- "text": "司机管理",
- "link": "/demo/zorro",
- "children": [
- {
- "text": "司机列表",
- "link": "/usercenter/driver"
- },
- {
- "text": "司机详情",
- "hide": true,
- "link": "/usercenter/driver/detail/:id"
- },
- {
- "text": "车队长列表",
- "link": "/usercenter/driver/captain"
- },
- {
- "text": "司机配置",
- "link": "/usercenter/driver/config"
- }
- ]
- }
- ]
- },
- {
- "text": "运力管理",
- "icon": "iconfont icon-yunli-copy",
- "group": true,
- "children": [
- {
- "text": "车辆列表",
- "link": "/vehicle/list"
- },
- {
- "hide": true,
- "text": "车辆列表详情",
- "link": "/vehicle/list/detail/:id"
- },
- {
- "text": "车辆审核列表",
- "link": "/vehicle/audit"
- },
- {
- "hide": true,
- "text": "车辆审核列表详情",
- "link": "/vehicle/audit/detail/:id"
- }
- ]
- },
- {
- "text": "货源管理",
- "icon": "iconfont icon-huoyuan-copy",
- "group": true,
- "children": [
- {
- "text": "货源管理",
- "link": "/supply-management/index",
- "reuse": true
- },
- {
- "text": "货源详情",
- "link": "/supply-management/bulk-detail",
- "hide": true
- },
- {
- "text": "修改货源",
- "link": "/supply-management/vehicle-amend/:id",
- "hide": true
- },
- {
- "text": "整车代发货源",
- "link": "/supply-management/vehicle-release",
- "hide": true
- },
- {
- "text": "大宗代发货源",
- "link": "/supply-management/bulk-release",
- "hide": true
- },
- {
- "text": "货源详情",
- "link": "/supply-management/vehicle-detail/:id",
- "hide": true
- }
- ]
- },
- {
- "text": "订单管理",
- "icon": "iconfont icon-dingdan-copy",
- "group": true,
- "children": [
- {
- "text": "整车订单",
- "link": "/order-management/vehicle"
- },
- {
- "text": "大宗订单",
- "link": "/order-management/bulk"
- },
- {
- "text": "风险单管理",
- "link": "/order-management/risk"
- },
- {
- "text": "单据审核",
- "link": "/order-management/receipts-audit"
- },
- {
- "text": "投诉管理",
- "link": "/order-management/complaint"
- },
- {
- "text": "合规抽查",
- "link": "/order-management/compliance-audit"
- },
- {
- "text": "整车订单详情",
- "link": "/order-management/vehicle-detail/:id",
- "hide": true
- },
- {
- "text": "大宗订单详情",
- "link": "/order-management/bulk-detail/:id",
- "hide": true
- }
- ]
- },
- {
- "text": "运单管理",
- "icon": "iconfont icon-yundan-copy",
- "group": true,
- "children": [
- {
- "text": "整车运单",
- "link": "/waybill-management/vehicle"
- },
- {
- "hide": true,
- "text": "整车运单详情",
- "link": "/waybill-management/vehicle-detail/:id"
- },
- {
- "text": "大宗运单",
- "link": "/waybill-management/bulk"
- },
- {
- "hide": true,
- "text": "大宗运单详情",
- "link": "/waybill-management/bulk-detail/:id"
- },
- {
- "text": "异常上报",
- "link": "/waybill-management/abnormal-appear"
- }
- ]
- },
- {
- "text": "保险管理",
- "icon": "iconfont icon-yundan-copy",
- "group": true,
- "children": [
- {
- "text": "保险列表",
- "link": "/insurance-management/list"
- }
- ]
- },
- {
- "text": "财务管理",
- "icon": "iconfont icon-caiwu-copy",
- "group": true,
- "children": [
- {
- "text": "费用管理",
- "link": "/financial-management/cost-management"
- },
- {
- "text": "费用浏览",
- "hide": true,
- "link": "/financial-management/cost-management/detail/:id"
- },
- {
- "text": "凭证管理",
- "link": "/financial-management/voucher-management"
- },
- {
- "text": "凭证汇总",
- "link": "/financial-management/voucher-summary"
- },
- {
- "text": "应收费用单",
- "hide": true,
- "link": "/financial-management/cost-management/expenses-receivable/:id"
- },
- {
- "text": "应付费用单",
- "hide": true,
- "link": "/financial-management/cost-management/expenses-payable/:id"
- },
- {
- "text": "付款单",
- "link": "/financial-management/payment-order"
- },
- {
- "text": "收款单",
- "link": "/financial-management/receipt-order"
- },
- {
- "text": "应收核销",
- "link": "/financial-management/receivable-order"
- },
- {
- "text": "应收核销详情",
- "hide": true,
- "link": "/financial-management/receivable-order/detail/:id"
- },
- {
- "text": "应付核销",
- "link": "/financial-management/payable-order"
- },
- {
- "text": "应收核销详情",
- "hide": true,
- "link": "/financial-management/payable-order/detail/:id"
- },
- {
- "text": "货主账户",
- "link": "/financial-management/freight-account"
- },
- {
- "text": "货主账户详情",
- "hide": true,
- "link": "/financial-management/freight-account/detail/:id"
- },
- {
- "text": "平台账户",
- "link": "/financial-management/platform-account"
- },
- {
- "text": "司机账户",
- "link": "/financial-management/driver-account"
- },
- {
- "text": "司机账户详情",
- "hide": true,
- "link": "/financial-management/driver-account/detail/:id"
- },
- {
- "text": "充值记录",
- "link": "/financial-management/recharge-record"
- },
- {
- "text": "提现记录",
- "link": "/financial-management/withdrawals-record"
- },
- {
- "text": "提现详情",
- "hide": true,
- "link": "/financial-management/withdrawals-record/detail/:id"
- },
- {
- "text": "异常入金",
- "link": "/financial-management/abnormal-gold"
- },
- {
- "text": "支付记录",
- "link": "/financial-management/payment-record"
- },
- {
- "text": "交易流水",
- "link": "/financial-management/transaction-flow"
- }
- ]
- },
- {
- "text": "票务管理",
- "icon": "iconfont icon-piaowu-copy",
- "group": true,
- "children": [
- {
- "text": "销项发票",
- "children": [
- {
- "text": "开票申请",
- "link": "/ticket/invoice-requested"
- },
- {
- "text": "开票订单明细",
- "link": "/ticket/invoice-requested/detail/:id",
- "hide": true
- },
- {
- "text": "销票处理",
- "link": "/ticket/cancellation-invoice"
- },
- {
- "text": "销票订单明细",
- "link": "/ticket/cancellation-invoice/detail/:id",
- "hide": true
- },
- {
- "text": "已开发票",
- "link": "/ticket/invoice-list"
- },
- {
- "text": "已开订单明细",
- "link": "/ticket/invoice-list/detail/:id",
- "hide": true
- },
- {
- "text": "快递信息",
- "link": "/ticket/express-info"
- }
- ]
- },
- {
- "text": "ETC发票",
- "children": [
- {
- "text": "申请发票",
- "link": "/ticket/etc-invoice-requested"
- },
- {
- "text": "开票记录",
- "link": "/ticket/etc-invoice-list"
- },
- {
- "text": "已开发票",
- "link": "/ticket/etc-invoiced-logs"
- },
- {
- "text": "ETC白名单",
- "link": "/ticket/etc-blacklist"
- }
- ]
- },
- {
- "text": "进项发票",
- "link": "/ticket/input-invoice"
- },
- {
- "text": "修改收票信息",
- "link": "/ticket/input-invoice/detail/:id",
- "hide": true
- },
- {
- "text": "进项发票",
- "link": "/ticket/input-invoice/edit/:id",
- "hide": true
- }
- ]
- },
- {
- "text": "合同管理",
- "icon": "iconfont icon-hetong-copy",
- "group": true,
- "children": [
- {
- "text": "保单管理",
- "link": "/contract-management/policy"
- },
- {
- "text": "合同管理",
- "link": "/contract-management/index"
- },
- {
- "text": "合同模板",
- "link": "/contract-management/template"
- }
- ]
- },
- {
- "text": "系统设置",
- "icon": "iconfont icon-shezhi-copy",
- "group": true,
- "children": [
- {
- "text": "员工管理",
- "group": true,
- "children": [
- {
- "text": "员工管理",
- "link": "/system/staff-management"
- },
- {
- "text": "角色管理",
- "link": "/system/role-management"
- }
- ]
- },
- {
- "text": "操作日志",
- "group": true,
- "children": [
- {
- "text": "系统操作日志",
- "link": "/logs/system-logs"
- },
- {
- "text": "货源操作日志",
- "link": "/logs/system-supply-logs"
- },
- {
- "text": "订单操作日志",
- "link": "/logs/system-waybill-logs"
- },
- {
- "text": "用户登录日志",
- "link": "/logs/user-logs"
- },
- {
- "text": "版本发布记录",
- "link": "/logs/version-logs"
- }
- ]
- },
- {
- "text": "CRM客户管理",
- "link": "/system/crm-management"
- },
- {
- "text": "结算客户管理",
- "link": "/system/close-account"
- },
- {
- "text": "网络货运人",
- "link": "/system/network-freight"
- },
- {
- "text": "基础设置",
- "link": "/system/basic-setting"
- },
- {
- "text": "保险配置",
- "link": "/system/insurance-set"
- },
- {
- "text": "公告信息管理",
- "link": "/system/announcement-message"
- },
- {
- "text": "车型车长配置",
- "link": "/system/cart-config"
- },
- {
- "text": "基础配置",
- "link": "/system/basic-config"
- },
- {
- "text": "协议配置",
- "link": "/system/agreement-config"
- },
- {
- "text": "菜单管理",
- "link": "/menu-management/index"
- },
- {
- "text": "接口权限",
- "link": "/menu-management/auth"
- },
- {
- "text": "系统配置",
- "link": "/system/system-config"
- },
- {
- "text": "货物名称配置",
- "link": "/system/goods-name-config"
- }
- ]
- },
- {
- "text": "合伙人管理",
- "icon": "anticon anticon-dashboard",
- "children": [
- {
- "text": "合伙人列表",
- "link": "/partner/partner-list"
- },
- {
- "text": "业务统计",
- "link": "/partner/business-statistics/index"
- },
- {
- "text": "返佣管理",
- "group": true,
- "children": [
- {
- "text": "返佣配置",
- "link": "/partner/rebate/setting"
- },
- {
- "text": "返佣明细",
- "link": "/partner/rebate/particulars"
- },
- {
- "text": "返佣记录",
- "link": "/partner/rebate/record"
- }
- ]
- },
- {
- "text": "销售渠道管理",
- "link": "/partner/channel-sales/list"
- },
- {
- "text": "等级配置",
- "link": "/partner/level-config/list"
- },
- {
- "text": "账户管理",
- "group": true,
- "children": [
- {
- "text": "账户管理",
- "link": "/partner/account-management/am/list"
- },
- {
- "text": "账户明细",
- "link": "/partner/account-management/am/detail/:id",
- "hide": true
- },
- {
- "text": "提现记录",
- "link": "/partner/account-management/withdraw-record"
- },
- {
- "text": "提现详情",
- "link": "/partner/account-management/withdraw-record/detail/:id",
- "hide": true
- },
- {
- "text": "待入账明细",
- "link": "/partner/account-management/am/recorded/detail/:id",
- "hide": true
- }
- ]
- },
- {
- "text": "客户认领审核",
- "link": "/partner/claim-audit/list"
- },
- {
- "text": "合伙人客户认领详情",
- "link": "/partner/claim-audit/partner-detail",
- "hide": true
- },
- {
- "text": "渠道销售客户认领详情",
- "link": "/partner/claim-audit/channel-detail",
- "hide": true
- },
- {
- "text": "入账记录",
- "link": "/partner/recorded/record"
- },
- {
- "text": "入账详情",
- "link": "/partner/recorded/record/:id",
- "hide": true
- },
- {
- "text": "轮播图管理",
- "link": "/partner/scroll-img/list"
- },
- {
- "text": "建议反馈管理",
- "link": "/partner/advice-feedback/list"
- },
- {
- "text": "建议反馈管理详情",
- "link": "/partner/advice-feedback/detail",
- "hide": true
- },
- {
- "text": "知识库管理",
- "icon": "iconfont icon-yundan-copy",
- "group": true,
- "children": [
- {
- "text": "banner管理",
- "link": "/partner/knowledge/banner",
- "children": [
- {
- "text": "新增banner",
- "link": "/partner/knowledge/banner/detail"
- }
- ]
- },
- {
- "text": "文章管理",
- "link": "/partner/knowledge/article-management-list"
- },
- {
- "text": "新增文章",
- "link": "/partner/knowledge/article-management-add",
- "hide": true
- },
- {
- "text": "编辑文章",
- "link": "/partner/knowledge/article-management-edit",
- "hide": true
- }
- ]
- },
- {
- "text": "运单管理",
- "icon": "iconfont icon-yundan-copy",
- "group": true,
- "children": [
- {
- "text": "整车运单",
- "link": "/waybill-management/vehicle"
- },
- {
- "hide": true,
- "text": "整车运单详情",
- "link": "/waybill-management/vehicle-detail/:id"
- },
- {
- "text": "大宗运单",
- "link": "/waybill-management/bulk"
- },
- {
- "hide": true,
- "text": "大宗运单详情",
- "link": "/waybill-management/bulk-detail/:id"
- },
- {
- "text": "异常上报",
- "link": "/waybill-management/abnormal-appear"
- }
- ]
- },
- {
- "text": "保险管理",
- "icon": "iconfont icon-yundan-copy",
- "group": true,
- "children": [
- {
- "text": "保险列表",
- "link": "/insurance-management/list"
- }
- ]
- },
- {
- "text": "财务管理",
- "icon": "iconfont icon-caiwu-copy",
- "group": true,
- "children": [
- {
- "text": "费用管理",
- "link": "/financial-management/cost-management"
- },
- {
- "text": "费用浏览",
- "hide": true,
- "link": "/financial-management/cost-management/detail/:id"
- },
- {
- "text": "凭证管理",
- "link": "/financial-management/voucher-management"
- },
- {
- "text": "凭证汇总",
- "link": "/financial-management/voucher-summary"
- },
- {
- "text": "应收费用单",
- "hide": true,
- "link": "/financial-management/cost-management/expenses-receivable/:id"
- },
- {
- "text": "应付费用单",
- "hide": true,
- "link": "/financial-management/cost-management/expenses-payable/:id"
- },
- {
- "text": "付款单",
- "link": "/financial-management/payment-order"
- },
- {
- "text": "收款单",
- "link": "/financial-management/receipt-order"
- },
- {
- "text": "应收核销",
- "link": "/financial-management/receivable-order"
- },
- {
- "text": "应收核销详情",
- "hide": true,
- "link": "/financial-management/receivable-order/detail/:id"
- },
- {
- "text": "应付核销",
- "link": "/financial-management/payable-order"
- },
- {
- "text": "应收核销详情",
- "hide": true,
- "link": "/financial-management/payable-order/detail/:id"
- },
- {
- "text": "货主账户",
- "link": "/financial-management/freight-account"
- },
- {
- "text": "货主账户详情",
- "hide": true,
- "link": "/financial-management/freight-account/detail/:id"
- },
- {
- "text": "平台账户",
- "link": "/financial-management/platform-account"
- },
- {
- "text": "司机账户",
- "link": "/financial-management/driver-account"
- },
- {
- "text": "司机账户详情",
- "hide": true,
- "link": "/financial-management/driver-account/detail/:id"
- },
- {
- "text": "充值记录",
- "link": "/financial-management/recharge-record"
- },
- {
- "text": "提现记录",
- "link": "/financial-management/withdrawals-record"
- },
- {
- "text": "提现详情",
- "hide": true,
- "link": "/financial-management/withdrawals-record/detail/:id"
- },
- {
- "text": "异常入金",
- "link": "/financial-management/abnormal-gold"
- },
- {
- "text": "支付记录",
- "link": "/financial-management/payment-record"
- },
- {
- "text": "交易流水",
- "link": "/financial-management/transaction-flow"
- }
- ]
- },
- {
- "text": "票务管理",
- "icon": "iconfont icon-piaowu-copy",
- "group": true,
- "children": [
- {
- "text": "销项发票",
- "children": [
- {
- "text": "开票申请",
- "link": "/ticket/invoice-requested"
- },
- {
- "text": "开票订单明细",
- "link": "/ticket/invoice-requested/detail/:id",
- "hide": true
- },
- {
- "text": "销票处理",
- "link": "/ticket/cancellation-invoice"
- },
- {
- "text": "销票订单明细",
- "link": "/ticket/cancellation-invoice/detail/:id",
- "hide": true
- },
- {
- "text": "已开发票",
- "link": "/ticket/invoice-list"
- },
- {
- "text": "已开订单明细",
- "link": "/ticket/invoice-list/detail/:id",
- "hide": true
- },
- {
- "text": "快递信息",
- "link": "/ticket/express-info"
- }
- ]
- },
- {
- "text": "ETC发票",
- "children": [
- {
- "text": "申请发票",
- "link": "/ticket/etc-invoice-requested"
- },
- {
- "text": "开票记录",
- "link": "/ticket/etc-invoice-list"
- },
- {
- "text": "已开发票",
- "link": "/ticket/etc-invoiced-logs"
- },
- {
- "text": "ETC白名单",
- "link": "/ticket/etc-blacklist"
- }
- ]
- },
- {
- "text": "进项发票",
- "link": "/ticket/input-invoice"
- },
- {
- "text": "修改收票信息",
- "link": "/ticket/input-invoice/detail/:id",
- "hide": true
- },
- {
- "text": "进项发票",
- "link": "/ticket/input-invoice/edit/:id",
- "hide": true
- }
- ]
- },
- {
- "text": "合同管理",
- "icon": "iconfont icon-hetong-copy",
- "group": true,
- "children": [
- {
- "text": "保单管理",
- "link": "/contract-management/policy"
- },
- {
- "text": "合同管理",
- "link": "/contract-management/index"
- },
- {
- "text": "合同模板",
- "link": "/contract-management/template"
- }
- ]
- },
- {
- "text": "系统设置",
- "icon": "iconfont icon-shezhi-copy",
- "group": true,
- "children": [
- {
- "text": "员工管理",
- "group": true,
- "children": [
- {
- "text": "员工管理",
- "link": "/system/staff-management"
- },
- {
- "text": "角色管理",
- "link": "/system/role-management"
- }
- ]
- },
- {
- "text": "操作日志",
- "group": true,
- "children": [
- {
- "text": "系统操作日志",
- "link": "/logs/system-logs"
- },
- {
- "text": "货源操作日志",
- "link": "/logs/system-supply-logs"
- },
- {
- "text": "订单操作日志",
- "link": "/logs/system-waybill-logs"
- },
- {
- "text": "用户登录日志",
- "link": "/logs/user-logs"
- },
- {
- "text": "版本发布记录",
- "link": "/logs/version-logs"
- }
- ]
- },
- {
- "text": "CRM客户管理",
- "link": "/system/crm-management"
- },
- {
- "text": "短信管理",
- "link": "/system/note-management"
- },
- {
- "text": "结算客户管理",
- "link": "/system/close-account"
- },
- {
- "text": "网络货运人",
- "link": "/system/network-freight"
- },
- {
- "text": "基础设置",
- "link": "/system/basic-setting"
- },
- {
- "text": "保险配置",
- "link": "/system/insurance-set"
- },
- {
- "text": "公告信息管理",
- "link": "/system/announcement-message"
- },
- {
- "text": "车型车长配置",
- "link": "/system/cart-config"
- },
- {
- "text": "基础配置",
- "link": "/system/basic-config"
- },
- {
- "text": "协议配置",
- "link": "/system/agreement-config"
- },
- {
- "text": "菜单管理",
- "link": "/menu-management/index"
- },
- {
- "text": "接口权限",
- "link": "/menu-management/auth"
- },
- {
- "text": "系统配置",
- "link": "/system/system-config"
- },
- {
- "text": "分类管理",
- "link": "/partner/knowledge/classification"
- }
- ]
- }
- ]
- },
- {
- "text": "数据监管",
- "icon": "iconfont icon-hetong-copy",
- "group": true,
- "children": [
- {
- "text": "数据报表",
- "link": "/regulatory-data/dashboard"
- }
- ]
- }
- ]
- }
- ]
+ "menu": [{
+ "text": "主导航",
+ "hideInBreadcrumb": true,
+ "children": [{
+ "text": "用户中心",
+ "icon": "iconfont icon-yonghu-copy",
+ "group": true,
+ "children": [{
+ "text": "货主管理",
+ "children": [{
+ "text": "企业列表",
+ "link": "/usercenter/freight/list"
+ },
+ {
+ "text": "道运证",
+ "hide": true,
+ "link": "/usercenter/freight/list/view/:id"
+ },
+ {
+ "text": "货主详情",
+ "hide": true,
+ "link": "/usercenter/freight/list/detail/:id"
+ },
+ {
+ "text": "企业认证",
+ "hide": true,
+ "link": "/usercenter/freight/new"
+ },
+ {
+ "text": "企业审核列表",
+ "link": "/usercenter/freight/enterprise"
+ },
+ {
+ "text": "企业审核列表详情",
+ "hide": true,
+ "link": "/usercenter/freight/enterprise/view/:id"
+ },
+ {
+ "text": "货主员工列表",
+ "link": "/usercenter/freight/user"
+ },
+ {
+ "text": "货主员工详情",
+ "hide": true,
+ "link": "/usercenter/freight/user/view/:id"
+ }
+ ]
+ },
+ {
+ "text": "司机管理",
+ "link": "/demo/zorro",
+ "children": [{
+ "text": "司机列表",
+ "link": "/usercenter/driver"
+ },
+ {
+ "text": "司机详情",
+ "hide": true,
+ "link": "/usercenter/driver/detail/:id"
+ },
+ {
+ "text": "车队长列表",
+ "link": "/usercenter/driver/captain"
+ },
+ {
+ "text": "司机配置",
+ "link": "/usercenter/driver/config"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "text": "运力管理",
+ "icon": "iconfont icon-yunli-copy",
+ "group": true,
+ "children": [{
+ "text": "车辆列表",
+ "link": "/vehicle/list"
+ },
+ {
+ "hide": true,
+ "text": "车辆列表详情",
+ "link": "/vehicle/list/detail/:id"
+ },
+ {
+ "text": "车辆审核列表",
+ "link": "/vehicle/audit"
+ },
+ {
+ "hide": true,
+ "text": "车辆审核列表详情",
+ "link": "/vehicle/audit/detail/:id"
+ }
+ ]
+ },
+ {
+ "text": "货源管理",
+ "icon": "iconfont icon-huoyuan-copy",
+ "group": true,
+ "children": [{
+ "text": "货源管理",
+ "link": "/supply-management/index",
+ "reuse": true
+ },
+ {
+ "text": "货源详情",
+ "link": "/supply-management/bulk-detail",
+ "hide": true
+ },
+ {
+ "text": "修改货源",
+ "link": "/supply-management/vehicle-amend/:id",
+ "hide": true
+ },
+ {
+ "text": "整车代发货源",
+ "link": "/supply-management/vehicle-release",
+ "hide": true
+ },
+ {
+ "text": "大宗代发货源",
+ "link": "/supply-management/bulk-release",
+ "hide": true
+ },
+ {
+ "text": "货源详情",
+ "link": "/supply-management/vehicle-detail/:id",
+ "hide": true
+ }
+ ]
+ },
+ {
+ "text": "订单管理",
+ "icon": "iconfont icon-dingdan-copy",
+ "group": true,
+ "children": [{
+ "text": "整车订单",
+ "link": "/order-management/vehicle"
+ },
+ {
+ "text": "大宗订单",
+ "link": "/order-management/bulk"
+ },
+ {
+ "text": "风险单管理",
+ "link": "/order-management/risk"
+ },
+ {
+ "text": "单据审核",
+ "link": "/order-management/receipts-audit"
+ },
+ {
+ "text": "投诉管理",
+ "link": "/order-management/complaint"
+ },
+ {
+ "text": "合规抽查",
+ "link": "/order-management/compliance-audit"
+ },
+ {
+ "text": "整车订单详情",
+ "link": "/order-management/vehicle-detail/:id",
+ "hide": true
+ },
+ {
+ "text": "大宗订单详情",
+ "link": "/order-management/bulk-detail/:id",
+ "hide": true
+ }
+ ]
+ },
+ {
+ "text": "运单管理",
+ "icon": "iconfont icon-yundan-copy",
+ "group": true,
+ "children": [{
+ "text": "整车运单",
+ "link": "/waybill-management/vehicle"
+ },
+ {
+ "hide": true,
+ "text": "整车运单详情",
+ "link": "/waybill-management/vehicle-detail/:id"
+ },
+ {
+ "text": "大宗运单",
+ "link": "/waybill-management/bulk"
+ },
+ {
+ "hide": true,
+ "text": "大宗运单详情",
+ "link": "/waybill-management/bulk-detail/:id"
+ },
+ {
+ "text": "异常上报",
+ "link": "/waybill-management/abnormal-appear"
+ }
+ ]
+ },
+ {
+ "text": "保险管理",
+ "icon": "iconfont icon-yundan-copy",
+ "group": true,
+ "children": [{
+ "text": "保险列表",
+ "link": "/insurance-management/list"
+ }]
+ },
+ {
+ "text": "财务管理",
+ "icon": "iconfont icon-caiwu-copy",
+ "group": true,
+ "children": [{
+ "text": "费用管理",
+ "link": "/financial-management/cost-management"
+ },
+ {
+ "text": "费用浏览",
+ "hide": true,
+ "link": "/financial-management/cost-management/detail/:id"
+ },
+ {
+ "text": "凭证管理",
+ "link": "/financial-management/voucher-management"
+ },
+ {
+ "text": "凭证汇总",
+ "link": "/financial-management/voucher-summary"
+ },
+ {
+ "text": "应收费用单",
+ "hide": true,
+ "link": "/financial-management/cost-management/expenses-receivable/:id"
+ },
+ {
+ "text": "应付费用单",
+ "hide": true,
+ "link": "/financial-management/cost-management/expenses-payable/:id"
+ },
+ {
+ "text": "付款单",
+ "link": "/financial-management/payment-order"
+ },
+ {
+ "text": "收款单",
+ "link": "/financial-management/receipt-order"
+ },
+ {
+ "text": "应收核销",
+ "link": "/financial-management/receivable-order"
+ },
+ {
+ "text": "应收核销详情",
+ "hide": true,
+ "link": "/financial-management/receivable-order/detail/:id"
+ },
+ {
+ "text": "应付核销",
+ "link": "/financial-management/payable-order"
+ },
+ {
+ "text": "应收核销详情",
+ "hide": true,
+ "link": "/financial-management/payable-order/detail/:id"
+ },
+ {
+ "text": "货主账户",
+ "link": "/financial-management/freight-account"
+ },
+ {
+ "text": "货主账户详情",
+ "hide": true,
+ "link": "/financial-management/freight-account/detail/:id"
+ },
+ {
+ "text": "平台账户",
+ "link": "/financial-management/platform-account"
+ },
+ {
+ "text": "司机账户",
+ "link": "/financial-management/driver-account"
+ },
+ {
+ "text": "司机账户详情",
+ "hide": true,
+ "link": "/financial-management/driver-account/detail/:id"
+ },
+ {
+ "text": "充值记录",
+ "link": "/financial-management/recharge-record"
+ },
+ {
+ "text": "提现记录",
+ "link": "/financial-management/withdrawals-record"
+ },
+ {
+ "text": "提现详情",
+ "hide": true,
+ "link": "/financial-management/withdrawals-record/detail/:id"
+ },
+ {
+ "text": "异常入金",
+ "link": "/financial-management/abnormal-gold"
+ },
+ {
+ "text": "支付记录",
+ "link": "/financial-management/payment-record"
+ },
+ {
+ "text": "交易流水",
+ "link": "/financial-management/transaction-flow"
+ }
+ ]
+ },
+ {
+ "text": "票务管理",
+ "icon": "iconfont icon-piaowu-copy",
+ "group": true,
+ "children": [{
+ "text": "销项发票",
+ "children": [{
+ "text": "开票申请",
+ "link": "/ticket/invoice-requested"
+ },
+ {
+ "text": "开票订单明细",
+ "link": "/ticket/invoice-requested/detail/:id",
+ "hide": true
+ },
+ {
+ "text": "销票处理",
+ "link": "/ticket/cancellation-invoice"
+ },
+ {
+ "text": "销票订单明细",
+ "link": "/ticket/cancellation-invoice/detail/:id",
+ "hide": true
+ },
+ {
+ "text": "已开发票",
+ "link": "/ticket/invoice-list"
+ },
+ {
+ "text": "已开订单明细",
+ "link": "/ticket/invoice-list/detail/:id",
+ "hide": true
+ },
+ {
+ "text": "快递信息",
+ "link": "/ticket/express-info"
+ }
+ ]
+ },
+ {
+ "text": "ETC发票",
+ "children": [{
+ "text": "申请发票",
+ "link": "/ticket/etc-invoice-requested"
+ },
+ {
+ "text": "开票记录",
+ "link": "/ticket/etc-invoice-list"
+ },
+ {
+ "text": "已开发票",
+ "link": "/ticket/etc-invoiced-logs"
+ },
+ {
+ "text": "ETC白名单",
+ "link": "/ticket/etc-blacklist"
+ }
+ ]
+ },
+ {
+ "text": "进项发票",
+ "link": "/ticket/input-invoice"
+ },
+ {
+ "text": "修改收票信息",
+ "link": "/ticket/input-invoice/detail/:id",
+ "hide": true
+ },
+ {
+ "text": "进项发票",
+ "link": "/ticket/input-invoice/edit/:id",
+ "hide": true
+ }
+ ]
+ },
+ {
+ "text": "合同管理",
+ "icon": "iconfont icon-hetong-copy",
+ "group": true,
+ "children": [{
+ "text": "保单管理",
+ "link": "/contract-management/policy"
+ },
+ {
+ "text": "合同管理",
+ "link": "/contract-management/index"
+ },
+ {
+ "text": "合同模板",
+ "link": "/contract-management/template"
+ }
+ ]
+ },
+ {
+ "text": "系统设置",
+ "icon": "iconfont icon-shezhi-copy",
+ "group": true,
+ "children": [{
+ "text": "员工管理",
+ "group": true,
+ "children": [{
+ "text": "员工管理",
+ "link": "/system/staff-management"
+ },
+ {
+ "text": "角色管理",
+ "link": "/system/role-management"
+ }
+ ]
+ },
+ {
+ "text": "操作日志",
+ "group": true,
+ "children": [{
+ "text": "系统操作日志",
+ "link": "/logs/system-logs"
+ },
+ {
+ "text": "货源操作日志",
+ "link": "/logs/system-supply-logs"
+ },
+ {
+ "text": "订单操作日志",
+ "link": "/logs/system-waybill-logs"
+ },
+ {
+ "text": "用户登录日志",
+ "link": "/logs/user-logs"
+ },
+ {
+ "text": "版本发布记录",
+ "link": "/logs/version-logs"
+ }
+ ]
+ },
+ {
+ "text": "CRM客户管理",
+ "link": "/system/crm-management"
+ },
+ {
+ "text": "结算客户管理",
+ "link": "/system/close-account"
+ },
+ {
+ "text": "网络货运人",
+ "link": "/system/network-freight"
+ },
+ {
+ "text": "基础设置",
+ "link": "/system/basic-setting"
+ },
+ {
+ "text": "保险配置",
+ "link": "/system/insurance-set"
+ },
+ {
+ "text": "公告信息管理",
+ "link": "/system/announcement-message"
+ },
+ {
+ "text": "车型车长配置",
+ "link": "/system/cart-config"
+ },
+ {
+ "text": "基础配置",
+ "link": "/system/basic-config"
+ },
+ {
+ "text": "协议配置",
+ "link": "/system/agreement-config"
+ },
+ {
+ "text": "菜单管理",
+ "link": "/menu-management/index"
+ },
+ {
+ "text": "接口权限",
+ "link": "/menu-management/auth"
+ },
+ {
+ "text": "系统配置",
+ "link": "/system/system-config"
+ },
+ {
+ "text": "货物名称配置",
+ "link": "/system/goods-name-config"
+ }
+ ]
+ },
+ {
+ "text": "合伙人管理",
+ "icon": "anticon anticon-dashboard",
+ "children": [{
+ "text": "合伙人列表",
+ "link": "/partner/partner-list"
+ },
+ {
+ "text": "业务统计",
+ "link": "/partner/business-statistics/index"
+ },
+ {
+ "text": "返佣管理",
+ "group": true,
+ "children": [{
+ "text": "返佣配置",
+ "link": "/partner/rebate/setting"
+ },
+ {
+ "text": "返佣明细",
+ "link": "/partner/rebate/particulars"
+ },
+ {
+ "text": "返佣记录",
+ "link": "/partner/rebate/record"
+ }
+ ]
+ },
+ {
+ "text": "销售渠道管理",
+ "link": "/partner/channel-sales/list"
+ },
+ {
+ "text": "等级配置",
+ "link": "/partner/level-config/list"
+ },
+ {
+ "text": "账户管理",
+ "group": true,
+ "children": [{
+ "text": "账户管理",
+ "link": "/partner/account-management/am/list"
+ },
+ {
+ "text": "账户明细",
+ "link": "/partner/account-management/am/detail/:id",
+ "hide": true
+ },
+ {
+ "text": "提现记录",
+ "link": "/partner/account-management/withdraw-record"
+ },
+ {
+ "text": "提现详情",
+ "link": "/partner/account-management/withdraw-record/detail/:id",
+ "hide": true
+ },
+ {
+ "text": "待入账明细",
+ "link": "/partner/account-management/am/recorded/detail/:id",
+ "hide": true
+ }
+ ]
+ },
+ {
+ "text": "客户认领审核",
+ "link": "/partner/claim-audit/list"
+ },
+ {
+ "text": "合伙人客户认领详情",
+ "link": "/partner/claim-audit/partner-detail",
+ "hide": true
+ },
+ {
+ "text": "渠道销售客户认领详情",
+ "link": "/partner/claim-audit/channel-detail",
+ "hide": true
+ },
+ {
+ "text": "入账记录",
+ "link": "/partner/recorded/record"
+ },
+ {
+ "text": "入账详情",
+ "link": "/partner/recorded/record/:id",
+ "hide": true
+ },
+ {
+ "text": "轮播图管理",
+ "link": "/partner/scroll-img/list"
+ },
+ {
+ "text": "建议反馈管理",
+ "link": "/partner/advice-feedback/list"
+ },
+ {
+ "text": "建议反馈管理详情",
+ "link": "/partner/advice-feedback/detail",
+ "hide": true
+ },
+ {
+ "text": "知识库管理",
+ "icon": "iconfont icon-yundan-copy",
+ "group": true,
+ "children": [{
+ "text": "banner管理",
+ "link": "/partner/knowledge/banner",
+ "children": [{
+ "text": "新增banner",
+ "link": "/partner/knowledge/banner/detail"
+ }]
+ },
+ {
+ "text": "文章管理",
+ "link": "/partner/knowledge/article-management-list"
+ },
+ {
+ "text": "新增文章",
+ "link": "/partner/knowledge/article-management-add",
+ "hide": true
+ },
+ {
+ "text": "编辑文章",
+ "link": "/partner/knowledge/article-management-edit",
+ "hide": true
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "text": "数据监管",
+ "icon": "iconfont icon-hetong-copy",
+ "group": true,
+ "children": [{
+ "text": "数据报表",
+ "link": "/regulatory-data/dashboard"
+ }]
+ }
+ ]
+ }]
}
-}
\ No newline at end of file
+}
diff --git a/src/styles/theme.less b/src/styles/theme.less
index b39a9b01..ae6c6f8c 100644
--- a/src/styles/theme.less
+++ b/src/styles/theme.less
@@ -10,12 +10,12 @@
// ==========Custom brand visual color==========
.error-color {
- color: #ff4d4f;
+ color: #ff4d4f;
}
@primary-color : #F5222D;
@font-size-base: 15px;
-.page-header__title {
- display: none;
-}
\ No newline at end of file
+// .page-header__title {
+// display: none;
+// }
+ 
+ 
+ 