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

edit

Browse Source
This commit is contained in:
Taric Xin
2021-12-09 16:46:40 +08:00
parent 0c77591af8
commit d4a4b45194
18 changed files with 235 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/routes/contract-management/components/contract-list/contract-list.component.less
View File

@ -29,6 +29,7 @@
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
z-index : -99;
}
}

4
src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.less
View File

@ -23,6 +23,10 @@
@media (min-width: 990px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

6
src/app/routes/financial-management/components/driver-account/driver-account.component.less
View File

@ -24,6 +24,10 @@
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
}
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

5
src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.less
View File

@ -23,6 +23,9 @@
@media (min-width: 990px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

4
src/app/routes/financial-management/components/freight-account/freight-account.component.less
View File

@ -24,6 +24,10 @@
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

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

@ -27,7 +27,7 @@
[ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24"
class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>

11
src/app/routes/financial-management/components/recharge-record/recharge-record.component.less
View File

@ -15,14 +15,3 @@
width: 100%;
}
}
.expend-options {
margin-top: 0px;
}
@media (min-width: 990px) {
.expend-options {
margin-top: -40px;
}
}

6
src/app/routes/ticket-management/components/etc-invoiced-logs/etc-invoiced-logs.component.less
View File

@ -26,9 +26,13 @@
}
@media (min-width: 1200px) {
@media (min-width: 900px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

2
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.html
View File

@ -24,7 +24,7 @@
<nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md">
<div class="d-flex align-items-center mb-md mt-md">
<button nz-button (click)="this.auditAction(null)">申请开票</button>
<div class="ml-md">
已选择

5
src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.less
View File

@ -29,6 +29,9 @@
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

4
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less
View File

@ -29,6 +29,10 @@
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

4
src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.less
View File

@ -25,6 +25,10 @@
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

86
src/app/routes/usercenter/components/driver/driver.component.html
View File

@ -1,83 +1,37 @@
<!--
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime: 2021-11-30 17:38:59
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
-->
<!-- 页头 -->
<page-header-wrapper [title]="'司机列表'"></page-header-wrapper>
<nz-card>
<!-- 搜索区 -->
<!-- 搜索表单 -->
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">导出</button>
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
(click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<!-- [loading]="service.http.loading" -->
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">导出</button>
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>
<nz-card>
<!-- 数据列表 -->
<!-- [data]="service.$api_get_supplier_page" -->
<st
#st
[bordered]="true"
[columns]="columns"
[data]='datalist'
<st #st [bordered]="true" [columns]="columns" [data]='service.$api_get_freight_list'
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loadingDelay]="500"
[loading]="service.http.loading"
>
<ng-template st-row="enterpriseName" let-item let-index="index">
<div nz-tooltip [nzTooltipTitle]="item.enterpriseName">
<div
style="display: inline-block; max-width: 280px; margin: 0 auto; overflow: hidden; white-space: nowrap; text-overflow: ellipsis"
>
{{ item.enterpriseName }}
</div>
</div>
</ng-template>
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loadingDelay]="500"
[loading]="service.http.loading">
<ng-template st-row="contactsPhone" let-item let-index="index">
<div
style="color: #52c41a;" (click)="daoyun(item)"
>
{{ item.contactsPhone }}
<div style="color: #52c41a;" (click)="daoyun(item)">
{{ item.contactsPhone }}
</div>
</ng-template>
<ng-template st-row="stateCol" let-item let-index="index">
<nz-tag *ngIf="item.stateLocked" nzColor="error">冻结</nz-tag>
<nz-tag *elseBlock nzColor="success">正常</nz-tag>
</ng-template>
</st>
</nz-card>
</nz-card>

22
src/app/routes/usercenter/components/driver/driver.component.less Normal file
View File

@ -0,0 +1,22 @@
.expend-options {
margin-top: 0px;
}
@media (min-width: 1200px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}
:host::ng-deep {
nz-range-picker {
width: 100%;
}
}

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

@ -1,31 +0,0 @@
/*
* @Author: your name
* @Date: 2021-11-30 16:56:15
* @LastEditTime: 2021-11-30 17:00:07
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\components\driver\driver.component.spec.ts
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { UserCenterComponentsDriverComponent } from './driver.component';
describe('UserCenterComponentsDriverComponent', () => {
let component: UserCenterComponentsDriverComponent;
let fixture: ComponentFixture<UserCenterComponentsDriverComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [UserCenterComponentsDriverComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(UserCenterComponentsDriverComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

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

@ -1,176 +1,54 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { UsermanageService } from '../../services/usercenter.service';
@Component({
selector: 'app-usercenter-components-driver',
templateUrl: './driver.component.html',
styleUrls: ['./driver.component.less'],
templateUrl: './driver.component.html'
})
export class UserCenterComponentsDriverComponent implements OnInit {
_$expand = false;
url = `/rule?_allow_anonymous=true`;
ui!: SFUISchema;
schema!: SFSchema;
ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
schema: SFSchema = this.initSF();
columns!: STColumn[];
datalist = [
{
storeName: '企业名称',
contactsName: '152746565',
enterpriseName: '湖南',
unifiedSocialCreditCode: '45454',
contactsPhone: '*97889461561',
effectiveDateStr: '废弃eww',
enStatusStr2: '正常',
enStatusStr3: '正常',
unifiedSocialCreditCode3: '常用服务',
unifiedSocialCreditCode2: '正常',
tenantId: 1
},
{
storeName: '企业名称',
contactsName: '152746565',
enterpriseName: '湖南',
unifiedSocialCreditCode: '45454',
contactsPhone: '*97889461561',
effectiveDateStr: '废弃eww',
enStatusStr2: '正常',
enStatusStr3: '正常',
unifiedSocialCreditCode3: '常用服务',
unifiedSocialCreditCode2: '正常',
tenantId: 2
},
]
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
/**
* 查询字段个数navigate
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 查询参数
*/
get reqParams() {
const params: any = {
...(this.sf && this.sf.value),
...(this.sf && this.sf.value)
};
if (this.sf?.value.effectiveDate) {
params.effectiveDateStart = this.sf?.value.effectiveDate[0];
params.effectiveDateEnd = this.sf?.value.effectiveDate[1];
Object.assign(params, {
time: {
start: this.sf?.value.effectiveDate[0],
end: this.sf?.value.effectiveDate[1]
}
});
// params.effectiveDateStart = this.sf?.value.effectiveDate[0];
// params.effectiveDateEnd = this.sf?.value.effectiveDate[1];
}
delete params.effectiveDate;
delete params.expand;
return params;
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
}
ngOnInit() {
this.initSF();
this.initST();
this.ar.url.subscribe((params) => {
this.ar.url.subscribe(params => {
this.st?.load(1);
});
}
dataProcess(data: STData[]): STData[] {
return data.map((i, index) => {
i.showSortFlag = false;
return i;
});
}
initSF() {
this.schema = {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true,
},
},
storeName: { title: '司机姓名', type: 'string', ui: { showRequired: false } },
phone: {
title: '手机号',
type: 'string',
format: 'mobile',
maxLength: 11,
ui: {
placeholder: '请输入手机号',
},
},
enStatus: {
type: 'string',
title: '实名状态',
enum: [
{ label: '全部', value: '' },
{ label: '正常', value: 0 },
{ label: '冻结', value: 1 },
{ label: '废弃', value: 2 },
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value,
},
},
},
enStatus2: {
type: 'string',
title: '驾驶证状态',
enum: [
{ label: '全部', value: '' },
{ label: '正常', value: 0 },
{ label: '冻结', value: 1 },
{ label: '废弃', value: 2 },
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value,
},
},
},
enStatus23: {
type: 'string',
title: '从业资格证状态',
enum: [
{ label: '全部', value: '' },
{ label: '正常', value: 0 },
{ label: '冻结', value: 1 },
{ label: '废弃', value: 2 },
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value,
},
},
},
phone2: {
title: '业务员手机号',
type: 'string',
format: 'mobile',
maxLength: 11,
ui: {
placeholder: '请输入手机号',
},
},
},
};
this.ui = { '*': { spanLabelFixed: 180, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
}
initST() {
this.columns = [
@ -179,14 +57,17 @@ export class UserCenterComponentsDriverComponent implements OnInit {
{ title: '手机号', className: 'text-center', index: 'contactsName' },
{ title: '承运总单量', className: 'text-center', render: 'enterpriseName' },
{ title: '当前车辆', className: 'text-center', index: 'unifiedSocialCreditCode' },
{ title: '实名认证状态', className: 'text-center', index: 'effectiveDateStr',
type: 'badge',
badge: {
正常: { text: '正常', color: 'success' },
冻结: { text: '冻结', color: 'warning' },
废弃: { text: '废弃', color: 'default' },
{
title: '实名认证状态',
className: 'text-center',
index: 'effectiveDateStr',
type: 'badge',
badge: {
正常: { text: '正常', color: 'success' },
冻结: { text: '冻结', color: 'warning' },
废弃: { text: '废弃', color: 'default' }
}
},
},
{
title: '驾驶证状态',
className: 'text-center',
@ -195,8 +76,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
badge: {
正常: { text: '正常', color: 'success' },
冻结: { text: '冻结', color: 'warning' },
废弃: { text: '废弃', color: 'default' },
},
废弃: { text: '废弃', color: 'default' }
}
},
{
title: '从业资格证状态',
@ -206,8 +87,8 @@ export class UserCenterComponentsDriverComponent implements OnInit {
badge: {
正常: { text: '正常', color: 'success' },
冻结: { text: '冻结', color: 'warning' },
废弃: { text: '废弃', color: 'default' },
},
废弃: { text: '废弃', color: 'default' }
}
},
{ title: '推广业务员', className: 'text-center', index: 'unifiedSocialCreditCode2' },
{ title: '注册时间', className: 'text-center', index: 'unifiedSocialCreditCode3' },
@ -218,13 +99,13 @@ export class UserCenterComponentsDriverComponent implements OnInit {
buttons: [
{
text: '查看',
click: (item) => {
click: item => {
this.router.navigate(['./detail', item.tenantId], { relativeTo: this.ar });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
},
},
],
},
}
}
]
}
];
}
daoyun(item: any) {
@ -235,7 +116,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
this.sf?.setValue('/expand', this._$expand);
}
creat() {
this.router.navigate(['./new',], { relativeTo: this.ar });
this.router.navigate(['./new'], { relativeTo: this.ar });
}
/**
* 重置表单
@ -244,4 +125,117 @@ export class UserCenterComponentsDriverComponent implements OnInit {
this.sf.reset();
this._$expand = false;
}
private initSF(): SFSchema {
return {
properties: {
expand: {
type: 'boolean',
ui: {
hidden: true
}
},
name: { title: '司机姓名', type: 'string', ui: { placeholder: '请输入', showRequired: false } },
mobile: {
title: '手机号',
type: 'string',
format: 'mobile',
maxLength: 11,
ui: {
placeholder: '请输入'
}
},
identityStatus: {
type: 'string',
title: '实名状态',
enum: [
{ label: '全部', value: '' },
{ label: '待审核', value: 0 },
{ label: '通过', value: 1 },
{ label: '驳回', value: 2 }
],
default: '',
ui: {
widget: 'select'
}
},
driverLicenseStatus: {
type: 'string',
title: '驾驶证状态',
enum: [
{ label: '全部', value: '' },
{ label: '待审核', value: 10 },
{ label: '审核通过', value: 20 },
{ label: '驳回', value: 30 },
{ label: '证件过期', value: 40 }
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
}
}
},
practiceSenioritLicenseStatus: {
type: 'string',
title: '从业资格证状态',
enum: [
{ label: '全部', value: '' },
{ label: '待审核', value: 10 },
{ label: '审核通过', value: 20 },
{ label: '驳回', value: 30 },
{ label: '证件过期', value: 40 }
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
}
}
},
promotersTelephone: {
title: '推广业务员',
type: 'string',
format: 'mobile',
maxLength: 11,
ui: {
placeholder: '请输入手机号',
visibleIf: {
expand: (value: boolean) => value
}
}
},
source: {
type: 'string',
title: '注册渠道',
enum: [
{ label: '全部', value: '' },
{ label: '自己录入', value: 1 },
{ label: '货主录入', value: 2 }
],
default: '',
ui: {
widget: 'select',
visibleIf: {
expand: (value: boolean) => value
}
}
},
effectiveDate: {
title: '申请时间',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
}
}
};
}
}

6
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.less
View File

@ -15,9 +15,13 @@
}
@media (min-width: 1200px) {
@media (min-width: 990px) {
.expend-options {
margin-top: -40px;
max-width : 400px;
position : absolute;
right : 0;
bottom : 30px;
}
}

6
src/app/routes/usercenter/components/freight/user/user.component.ts
View File

@ -11,7 +11,7 @@ import { UsermanageService } from '../../../services/usercenter.service';
})
export class FreightComponentsUserComponent implements OnInit {
_$expand = false;
ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: {lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } };
schema: SFSchema = this.initSF();
columns: STColumn[] = this.initST();
@ViewChild('st', { static: false }) st!: STComponent;
@ -108,7 +108,7 @@ export class FreightComponentsUserComponent implements OnInit {
this._$expand = false;
}
initSF(): SFSchema {
private initSF(): SFSchema {
return {
properties: {
expand: {
@ -186,7 +186,7 @@ export class FreightComponentsUserComponent implements OnInit {
};
}
initST(): STColumn[] {
private initST(): STColumn[] {
return [
{ title: '用户姓名', className: 'text-center', index: 'name' },
{ title: '手机号', className: 'text-center', index: 'telephone' },