Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

edit

Browse Source
This commit is contained in:
Taric Xin
2022-03-01 19:48:16 +08:00
parent b61340b451
commit dcfb0e08cb
14 changed files with 55 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/financial-management/components/advance-collection/advance-collection.component.ts
View File

@ -49,7 +49,7 @@ export class AdvanceCollectionComponent implements OnInit {
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
}
private initSF(): SFSchema {

12
src/app/routes/financial-management/components/cost-management/cost-management.component.ts
View File

@ -90,7 +90,7 @@ export class CostManagementComponent implements OnInit {
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
}
routeTo(url: string, params?: any, status?: any) {
@ -188,7 +188,7 @@ export class CostManagementComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,"");
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str })
@ -213,10 +213,10 @@ export class CostManagementComponent implements OnInit {
searchLoadingText: '搜索中...',
allowClear: true,
onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,"");
let str = q.replace(/^\s+|\s+$/g, '');
if (str) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str})
.request(this.service.$api_enterpriceList, { enterpriseName: str })
.pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
@ -302,13 +302,13 @@ export class CostManagementComponent implements OnInit {
{
text: '浏览',
click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id, { status: item?.feetypeLabel }),
acl: { ability: ['FINANCIAL-COST-view'] },
acl: { ability: ['FINANCIAL-COST-view'] }
},
{
text: '审核',
click: item => this.auditAction(item),
iif: item => item.sts === 2,
acl: { ability: ['FINANCIAL-COST-audit'] },
acl: { ability: ['FINANCIAL-COST-audit'] }
}
// {
// text: '修改',

2
src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.ts
View File

@ -74,7 +74,7 @@ export class DriverAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
}
goBack() {

2
src/app/routes/financial-management/components/driver-account/driver-account.component.ts
View File

@ -74,7 +74,7 @@ export class DriverAccountComponent implements OnInit {
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
}
private initSF(): SFSchema {

2
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
View File

@ -74,7 +74,7 @@ export class FreightAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
}
goBack() {

6
src/app/routes/financial-management/components/freight-account/freight-account.component.ts
View File

@ -80,7 +80,7 @@ export class FreightAccountComponent implements OnInit {
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
}
private initSF(): SFSchema {
@ -171,7 +171,7 @@ export class FreightAccountComponent implements OnInit {
{ title: '联系人', width: 120, index: 'name' },
{ title: '联系人电话', width: 140, index: 'phone' },
{ title: '网络货运人', width: 140, index: 'ltdName' },
{ title: '银行类型',width: 120, index: 'bankTypeLabel' },
{ title: '银行类型', width: 120, index: 'bankTypeLabel' },
{ title: '虚拟账户', width: 140, index: 'virtualAccount' },
{
title: '可用余额',
@ -199,7 +199,7 @@ export class FreightAccountComponent implements OnInit {
{
title: '状态',
index: 'stateDeletedLabel',
width: 80,
width: 80
},
{
title: '操作',

2
src/app/routes/financial-management/components/platform-account/platform-account-detail/platform-account-detail.component.ts
View File

@ -65,7 +65,7 @@ export class PlatformAccountDetailComponent implements OnInit {
stChange(e: STChange): void {}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
}
goBack() {

2
src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts
View File

@ -49,7 +49,7 @@ export class RechargeRecordComponent implements OnInit {
}
exportList() {
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageIndex: this.st.pi, pageSize: this.st.ps });
this.service.downloadFile(this.service.$mock_url, { ...this.sf.value, pageSize: -1 });
}
private initSF(): SFSchema {

2
src/app/routes/usercenter/components/driver/captain/captain.component.ts
View File

@ -113,7 +113,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
exportList() {
const params = this.reqParams;
this.service.downloadFile(this.service.$api_export_driver_cap, params);
this.service.downloadFile(this.service.$api_export_driver_cap, {...params, pageSize: -1});
}
private initSF(): SFSchema {

2
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.ts
View File

@ -61,7 +61,7 @@ export class UserCenterComponentsDriverConfigComponent implements OnInit {
exportList() {
const params = this.reqParams;
this.service.downloadFile(this.service.$api_export_driver_cap, params);
this.service.downloadFile(this.service.$api_export_driver_cap, { ...params, pageSize: -1 });
}
private initSF(): SFSchema {

56
src/app/routes/usercenter/components/driver/driver.component.ts
View File

@ -26,7 +26,13 @@ export class UserCenterComponentsDriverComponent implements OnInit {
promotersTelephone = '';
resourceStatus: any = 10;
constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute,private modalHelper: ModalHelper) {}
constructor(
public service: UsermanageService,
private modal: NzModalService,
private router: Router,
private ar: ActivatedRoute,
private modalHelper: ModalHelper
) {}
/**
* 查询参数
@ -134,7 +140,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
exportList() {
const params = this.reqParams;
this.service.downloadFile(this.service.$api_export_driver, params);
this.service.downloadFile(this.service.$api_export_driver, { ...params, pageSize: -1 });
}
private initSF(): SFSchema {
@ -223,7 +229,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
{ label: '全部', value: '' },
{ label: '用户注册', value: 1 },
{ label: '货主添加', value: 2 },
{ label: '运营添加', value: 3 },
{ label: '运营添加', value: 3 }
],
default: '',
ui: {
@ -249,18 +255,18 @@ export class UserCenterComponentsDriverComponent implements OnInit {
};
}
add() {
this.modalHelper.create(CarSettleAddDriverComponent, { size: 900 }).subscribe((res) => {
this.modalHelper.create(CarSettleAddDriverComponent, { size: 900 }).subscribe(res => {
this.st.load();
});
}
private initST(): STColumn[] {
return [
{ title: '司机姓名', className: 'text-center', index: 'name' , width: 150},
{ title: '手机号', className: 'text-center', index: 'mobile',width: 150 },
{ title: '司机姓名', className: 'text-center', index: 'name', width: 150 },
{ title: '手机号', className: 'text-center', index: 'mobile', width: 150 },
{ title: '身份证号码', className: 'text-center', index: 'identityNo', width: 200 },
{ title: '当前车辆', className: 'text-center', render: 'carNo' , width: 200},
{ title: '驾驶证审核人', className: 'text-center', index: 'approvalUserName' , width: 200},
{ title: '审核时间', className: 'text-center', index: 'approvalTime' , width: 200},
{ title: '当前车辆', className: 'text-center', render: 'carNo', width: 200 },
{ title: '驾驶证审核人', className: 'text-center', index: 'approvalUserName', width: 200 },
{ title: '审核时间', className: 'text-center', index: 'approvalTime', width: 200 },
{
title: '实名认证状态',
className: 'text-center',
@ -271,9 +277,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
0: { text: '待审核', color: 'default' },
1: { text: '通过', color: 'success' },
2: { text: '驳回', color: 'warning' }
}
, width: 180
},
width: 180
},
{
title: '驾驶证状态',
@ -286,8 +291,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
20: { text: '审核通过', color: 'success' },
30: { text: '驳回', color: 'warning' },
40: { text: '证件过期', color: 'error' }
}
, width: 180
},
width: 180
},
{
title: '从业资格证状态',
@ -300,24 +305,31 @@ export class UserCenterComponentsDriverComponent implements OnInit {
20: { text: '审核通过', color: 'success' },
30: { text: '驳回', color: 'warning' },
40: { text: '证件过期', color: 'error' }
}
, width: 180
},
width: 180
},
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone', width: 180 },
{
title: '注册渠道',
className: 'text-center',
index: 'source',
type: 'enum',
enum: { 1: '用户注册', 2: '货主添加', 3: '运营添加' },
width: 150
},
{ title: '推广业务员', className: 'text-center', render: 'promotersTelephone' , width: 180},
{ title: '注册渠道', className: 'text-center', index: 'source', type: 'enum', enum: { 1: '用户注册', 2: '货主添加', 3: '运营添加' }, width: 150 },
{ title: '注册时间', className: 'text-center', index: 'createTime', width: 200 },
{
title: '操作',
width: '110px',
className: 'text-center',
fixed:'right',
fixed: 'right',
buttons: [
{
text: '查看<br/>',
click: item => {
this.router.navigate(['./detail', item.appUserId], { relativeTo: this.ar });
},
acl: { ability: ['USERCENTER-DRIVER-LIST-view'] },
acl: { ability: ['USERCENTER-DRIVER-LIST-view'] }
},
// {
// text: '基础设置',
@ -327,13 +339,13 @@ export class UserCenterComponentsDriverComponent implements OnInit {
{
text: '资金账户',
click: item => this.showAccountDetail(item),
acl: { ability: ['USERCENTER-DRIVER-LIST-account'] },
acl: { ability: ['USERCENTER-DRIVER-LIST-account'] }
}
]
}
];
}
viewCar(item: any) {
this.router.navigate(['/vehicle/list/detail/' + item.carId] );
this.router.navigate(['/vehicle/list/detail/' + item.carId]);
}
}

2
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -228,7 +228,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
}
exportList() {
const params = { ...this.sf.value, flag: this.tabType, listSource: 2 };
const params = { ...this.sf.value, flag: this.tabType, listSource: 2, pageSize: -1 };
this.service.downloadFile(this.service.$api_export_enterprise, params);
}

2
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.ts
View File

@ -166,7 +166,7 @@ export class FreightConfigComponent implements OnInit {
}
exportList() {
const params = { listSource: 1, pageIndex: this.st.pi, pageSize: this.st.ps };
const params = { listSource: 1, pageSize: -1 };
if (this.sf) {
Object.assign(params, {
...this.sf.value

4
src/app/routes/usercenter/components/freight/list/list.component.ts
View File

@ -280,7 +280,7 @@ export class FreightComponentsListComponent implements OnInit {
enum: [
{ label: '全部', value: '' },
{ label: '是', value: true },
{ label: '否', value: false },
{ label: '否', value: false }
],
default: '',
ui: {
@ -439,7 +439,7 @@ export class FreightComponentsListComponent implements OnInit {
}
exportList() {
const params = { listSource: 1 };
const params = { listSource: 1, pageSize: -1 };
if (this.sf) {
Object.assign(params, {
...this.sf.value