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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2021-12-16 11:23:38 +08:00
parent fc53095c17 05f3480d80
commit 7150f45b31
7 changed files with 82 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/app/routes/usercenter/components/driver/captain/captain.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/captain/captain.component.spec.ts
View File

@ -1,31 +0,0 @@
/*
* @Author: your name
* @Date: 2021-11-30 16:56:15
* @LastEditTime: 2021-11-30 20:36:30
* @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\driver\driver.component.spec.ts
*/
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { UserCenterComponentsDriverCaptainComponent } from './captain.component';
describe('UserCenterComponentsDriverCaptainComponent', () => {
let component: UserCenterComponentsDriverCaptainComponent;
let fixture: ComponentFixture<UserCenterComponentsDriverCaptainComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [UserCenterComponentsDriverCaptainComponent],
}).compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(UserCenterComponentsDriverCaptainComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

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

@ -7,6 +7,7 @@ import { UsermanageService } from '../../../services/usercenter.service';
@Component({
selector: 'app-usercenter-components-driver-captain',
templateUrl: './captain.component.html',
styleUrls: ['./captain.component.less']
})
export class UserCenterComponentsDriverCaptainComponent implements OnInit {
_$expand = false;
@ -41,8 +42,8 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
unifiedSocialCreditCode3: '常用服务',
unifiedSocialCreditCode2: '正常',
tenantId: 2
},
]
}
];
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ -59,7 +60,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
*/
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];
@ -71,13 +72,13 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
}
get selectedRows() {
return this.st?.list.filter((item) => item.checked) || [];
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);
});
}
@ -93,8 +94,8 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
expand: {
type: 'boolean',
ui: {
hidden: true,
},
hidden: true
}
},
storeName: { title: '司机姓名', type: 'string', ui: { showRequired: false } },
phone: {
@ -103,15 +104,15 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
format: 'mobile',
maxLength: 11,
ui: {
placeholder: '请输入手机号',
},
placeholder: '请输入手机号'
}
},
phon747e: {
title: '银行卡号',
type: 'string',
ui: {
placeholder: '请输入银行卡号',
},
placeholder: '请输入银行卡号'
}
},
phone2: {
@ -124,10 +125,9 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
visibleIf: {
expand: (value: boolean) => value
}
},
},
},
}
}
}
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
}
@ -149,13 +149,13 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
buttons: [
{
text: '查看',
click: (item) => {
click: item => {
this.router.navigate(['/usercenter/driver/detail', item.tenantId], { relativeTo: this.ar });
// this.router.navigate(['./view', item.id], { relativeTo: this.ar, queryParams: { tenantId: item.tenantId } });
},
},
],
},
}
}
]
}
];
}
daoyun(item: any) {
@ -166,7 +166,7 @@ export class UserCenterComponentsDriverCaptainComponent implements OnInit {
this.sf?.setValue('/expand', this._$expand);
}
creat() {
this.router.navigate(['./new',], { relativeTo: this.ar });
this.router.navigate(['./new'], { relativeTo: this.ar });
}
/**
* 重置表单

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

@ -296,7 +296,7 @@
</ng-container>
<div *ngIf="data[key]" (mouseover)="data[hover]=true" (mouseleave)="data[hover]=false"
(click)="$event.cancelBubble=true" class="image-hover">
<img [src]="data[key]" style="width: 200px;height: 160px;" />
<img [src]="data[key]" style="width: 200px;height: 160px;" (click)="showImg(data[key])"/>
<div class="mask" *ngIf="data[hover] && status"></div>
<div class="mask-over" *ngIf="data[hover] && status">
<i nz-icon nzType="close-circle" nzTheme="fill" class="delete-icon" (click)="deleteImg(data,key,key2)"></i>

12
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -35,11 +35,11 @@
</div>
<div nz-col [nzXl]="6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right mt-sm">
<button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="enable"
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked === 1">
(nzOnConfirm)="freezeOrResume(1)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked">
启用
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="frozen"
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="detailData?.stateLocked === 0">
(nzOnConfirm)="freezeOrResume(0)" nzPopconfirmPlacement="bottomRight" *ngIf="!detailData?.stateLocked">
冻结
</button>
<button [nzLoading]="service.http.loading" nz-button nzDanger nz-popconfirm [nzPopconfirmTitle]="Payfrozen"
@ -86,16 +86,14 @@
{{ detailData?.adminUserInfo?.mobile }}
</sv>
<sv label="身份证号">
{{ detailData?.contactadminUserInfo?.certificateNumber }}
{{ detailData?.adminUserInfo?.certificateNumber }}
</sv>
</sv-container>
<sv-container col="2">
<sv label="身份证照">
<sv label="身份证照" col="2">
<app-imagelist
[imgList]="[detailData?.adminUserInfo?.certificatePhotoFrontWatermark,detailData?.adminUserInfo?.certificatePhotoBackWatermark]">
</app-imagelist>
</sv>
<sv label="企业授权函">
<sv label="企业授权函" col="2">
<app-imagelist [imgList]="[detailData?.adminUserInfo?.certificatePhotoBackWatermark]"></app-imagelist>
</sv>
</sv-container>

1
src/app/routes/usercenter/components/freight/list/new/new.component.less
View File

@ -58,6 +58,7 @@
}
.ant-form-item-control {
max-width : 100% !important;
margin-left: 20px !important;
}
}

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

@ -64,15 +64,14 @@ export class FreightComponentsListNewComponent implements OnInit {
},
$registrationCapital: {
spanLabelFixed: 180,
grid: { xxl: 13, xl: 18, lg: 24, md: 24 }
grid: { xxl: 13, xl: 18, lg: 22, md: 22 }
},
$unit: {
spanLabelFixed: 100,
grid: { span: 6 }
grid: { xxl: 6, xl: 6, lg: 2, md: 2 }
},
$isLoingDate: {
spanLabelFixed: 100,
grid: { span: 6 }
grid: { xxl: 6, xl: 6, lg: 4, md: 6 }
}
};
@ -369,7 +368,7 @@ export class FreightComponentsListNewComponent implements OnInit {
minimum: 1,
maximum: 99999999999999999999,
ui: {
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
grid: { xxl: 13, xl: 18, lg: 22, md: 22 },
placeholder: '请输入营业执照上的注册资本',
errors: {
required: '请输入营业执照上的注册资本'
@ -383,28 +382,53 @@ export class FreightComponentsListNewComponent implements OnInit {
type: 'string',
ui: {
...DATECONFIG,
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
errors: {
required: '请选择开始日期'
}
} as SFDateWidgetSchema
},
blank1: {
type: 'string',
ui: { widget: 'text', grid: { xxl: 11, xl: 6, md: 0, sm: 0 }, class: 'input-back' },
default: ' '
},
operatingStartTime: {
title: '营业期限',
type: 'string',
ui: {
...DATECONFIG,
grid: { xxl: 13, xl: 18, lg: 24, md: 24 },
errors: {
required: '请选择开始日期'
}
} as SFDateWidgetSchema
},
operatingEndTime: {
title: '营业期限',
title: '',
type: 'string',
ui: {
...DATECONFIG,
grid: { xxl: 13, xl: 18, lg: 20, md: 18 },
errors: {
required: '请选择截止日期'
},
change: i => {
this.sf1?.setValue('/isLoingDate', false);
setTimeout(() => {
console.log(this.sf1.value);
}, 1000);
}
} as SFDateWidgetSchema
},
isLoingDate: {
title: '长期',
type: 'boolean',
ui: { class: 'input-back', widget: 'checkbox', change: i => this.longTime(i, 'schema11') } as SFCheckboxWidgetSchema
ui: {
class: 'input-back',
widget: 'checkbox',
change: i => this.sf1?.setValue('/operatingEndTime', null)
} as SFCheckboxWidgetSchema
},
businessScope: {
title: '经营范围',
@ -543,7 +567,7 @@ export class FreightComponentsListNewComponent implements OnInit {
grid: { span: 6 },
class: 'input-back',
widget: 'checkbox',
change: i => this.longTime(i, 'schema11')
change: i=> this.sf1?.setValue('/legalPersonIdentityDTO/validEndTime', null),
} as SFCheckboxWidgetSchema
}
},
@ -555,7 +579,6 @@ export class FreightComponentsListNewComponent implements OnInit {
'certificateType',
'certificateNumber',
'validStartTime',
'validEndTime'
]
}
},
@ -568,7 +591,6 @@ export class FreightComponentsListNewComponent implements OnInit {
'enterpriseAddress',
'registrationCapital',
'enterpriseRegistrationTime',
'operatingEndTime',
'operatingStartTime',
'businessScope'
]