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-13 20:57:26 +08:00
parent c4b249fe94
commit 5c7a303abc
14 changed files with 800 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
}); });
// 获取驾驶证信息 // 获取驾驶证信息
this.service this.service
.request(this.service.$api_get_driver_license, { appUserId: this.route.snapshot.params.id }, 'POST', false) .request(this.service.$api_get_driver_license, { appUserId: this.route.snapshot.params.id })
.subscribe(res => { .subscribe(res => {
if (res) { if (res) {
this.driverDetail = res; this.driverDetail = res;
@ -61,7 +61,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
}); });
// 获取从业资格证信息 // 获取从业资格证信息
this.service this.service
.request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id }, 'POST', false) .request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id })
.subscribe(res => { .subscribe(res => {
if (res) { if (res) {
this.licenseDetail = res; this.licenseDetail = res;
@ -69,7 +69,7 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
}); });
// 获取载具信息 // 获取载具信息
this.service this.service
.request(this.service.$api_get_driver_car_license, { appUserId: this.route.snapshot.params.id }, 'POST', false) .request(this.service.$api_get_driver_car_license, { appUserId: this.route.snapshot.params.id })
.subscribe(res => { .subscribe(res => {
if (res) { if (res) {
this.carList = res; this.carList = res;

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

@ -1,4 +1,4 @@
<sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'"> <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema">
<ng-template sf-template="creditPhoto" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="creditPhoto" let-me let-ui="ui" let-schema="schema">
<img [src]="i.creditPhoto" alt="" /> <img [src]="i.creditPhoto" alt="" />
</ng-template> </ng-template>

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

@ -38,7 +38,6 @@ export class AuditAdminComponent implements OnInit {
} }
initSF(user?: any) { initSF(user?: any) {
console.log(user);
this.schema = { this.schema = {
properties: { properties: {
oldAdminName: { oldAdminName: {
@ -89,7 +88,7 @@ export class AuditAdminComponent implements OnInit {
ui: { ui: {
placeholder: '审核不通过需要说明原因', placeholder: '审核不通过需要说明原因',
widget: 'textarea', widget: 'textarea',
autosize: { minRows: 2, maxRows: 6 } autosize: { minRows: 3, maxRows: 6 }
} }
} }
} }

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

@ -75,7 +75,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
/** /**
* 查看详情 * 查看详情
*/ */
View(record: any) { ViewAdimin(record: any) {
const modal = this.modal.create({ const modal = this.modal.create({
nzContent: AuditAdminComponent, nzContent: AuditAdminComponent,
nzComponentParams: { i: { ...record } }, nzComponentParams: { i: { ...record } },
@ -119,6 +119,12 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
}); });
} }
View(record: any) {
this.router.navigate(['./view', record.id], {
relativeTo: this.ar
});
}
// 切换Tab // 切换Tab
changeTab(item: any) { changeTab(item: any) {
this.tabType = item.type; this.tabType = item.type;
@ -201,7 +207,7 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
fixed: 'right', fixed: 'right',
width: '180px', width: '180px',
className: 'text-center', className: 'text-center',
buttons: [{ text: '审核', click: _record => this.View(_record) }] buttons: [{ text: '审核', click: _record => this.ViewAdimin(_record) }]
} }
]; ];
} }

41
src/app/routes/usercenter/components/freight/list/new/new.component.html
View File

@ -1,13 +1,10 @@
<page-header-wrapper [title]="'新增企业'"></page-header-wrapper> <page-header-wrapper [title]="'新增企业'"></page-header-wrapper>
<nz-card> <nz-card>
<ng-container> <ng-container>
<sf #sf1 [compact]="true" [ui]="ui" [schema]="schema1" [button]="'none'" [formData]="infoData1"> <sf #sf1 [ui]="ui" [schema]="schema1" [button]="'none'" [formData]="infoData1">
<ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
<div class="form-title">企业基本信息</div> <div class="form-title">企业基本信息</div>
</ng-template> </ng-template>
<ng-template sf-template="title2" let-me let-ui="ui" let-schema="schema">
<div class="form-title" style="margin-top: 40px">营业执照法人信息</div>
</ng-template>
<ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema">
<div class="pr"> <div class="pr">
请上传营业执照原件的高清照片，若上传复印件，则需加盖公司印章； 请上传营业执照原件的高清照片，若上传复印件，则需加盖公司印章；
@ -18,35 +15,38 @@
<div class="pr">万元</div> <div class="pr">万元</div>
</ng-template> </ng-template>
<ng-template sf-template="tipsC" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="legalPersonIdentityDTO/title2" let-me let-ui="ui" let-schema="schema">
<div class="form-title" style="margin-top: 40px;margin-left: -180px;">营业执照法人信息</div>
</ng-template>
<ng-template sf-template="legalPersonIdentityDTO/tipsC" let-me let-ui="ui" let-schema="schema">
<div class="pr"> <div class="pr">
<div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div> <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
<div>上传后系统会自动识别并填写</div> <div>上传后系统会自动识别并填写</div>
</div> </div>
</ng-template> </ng-template>
<ng-template sf-template="tipsA" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="legalPersonIdentityDTO/tipsA" let-me let-ui="ui" let-schema="schema">
<div class="pr"> <div class="pr">
<dl class="tips"> <dl class="tips">
<dt>正面照（人像面）</dt> <dt>正面照（人像面）</dt>
<dd>示例</dd> <dd>示例</dd>
</dl> </dl>
<div class="pa"><img width="190" src="/assets/images/eg01.png" /></div> <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
</div> </div>
</ng-template> </ng-template>
<ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="legalPersonIdentityDTO/tipsB" let-me let-ui="ui" let-schema="schema">
<div class="pr"> <div class="pr">
<dl class="tips"> <dl class="tips">
<dt>背面照（国徽面）</dt> <dt>背面照（国徽面）</dt>
<dd>示例</dd> <dd>示例</dd>
</dl> </dl>
<div class="pa"><img width="190" src="/assets/images/eg02.png" /></div> <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
</div> </div>
</ng-template> </ng-template>
</sf> </sf>
<sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" [formData]="infoData">
<sf #sf [ui]="ui" [schema]="schema" [button]="'none'" [formData]="infoData">
<ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="title1" let-me let-ui="ui" let-schema="schema">
<div class="form-title">公司其他补充信息</div> <div class="form-title">企业开票信息</div>
</ng-template> </ng-template>
<ng-template sf-template="title99" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="title99" let-me let-ui="ui" let-schema="schema">
<div class="form-title">企业管理员信息</div> <div class="form-title">企业管理员信息</div>
@ -57,22 +57,9 @@
<div>请上传该企业授权您成为本系统企业管理员的文件的高清照片，需加盖公司印章</div> <div>请上传该企业授权您成为本系统企业管理员的文件的高清照片，需加盖公司印章</div>
<div>上传后系统会自动识别并填写</div> <div>上传后系统会自动识别并填写</div>
<div></div> <div></div>
</div>
</ng-template>
<ng-template sf-template="tipsE" let-me let-ui="ui" let-schema="schema">
<div class="pr">
<dl class="tips">
<dt></dt>
<dd>示例</dd>
</dl>
<div class="pa"><img width="190" src="/assets/images/eg02.png" /></div> <div class="pa"><img width="190" src="/assets/images/eg02.png" /></div>
</div> </div>
</ng-template> </ng-template>
<ng-template sf-template="telephone" let-me let-ui="ui" let-schema="schema">
<div class="pr">
<div>{{ telephone }} <span>默认当前登录账号绑定的手机号</span></div>
</div>
</ng-template>
<ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="tips" let-me let-ui="ui" let-schema="schema">
<div class="pr"> <div class="pr">
<div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div> <div>请上传身份证原件的高清照片，若上传复印件，则需申请人签字；</div>
@ -85,7 +72,7 @@
<dt>正面照（人像面）</dt> <dt>正面照（人像面）</dt>
<dd>示例</dd> <dd>示例</dd>
</dl> </dl>
<div class="pa"><img width="190" src="/assets/images/eg01.png" /></div> <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-front.png" /></div>
</div> </div>
</ng-template> </ng-template>
<ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema"> <ng-template sf-template="tipsB" let-me let-ui="ui" let-schema="schema">
@ -94,7 +81,7 @@
<dt>背面照（国徽面）</dt> <dt>背面照（国徽面）</dt>
<dd>示例</dd> <dd>示例</dd>
</dl> </dl>
<div class="pa"><img width="190" src="/assets/images/eg02.png" /></div> <div class="pa"><img width="190" src="./assets/images/usercenter/certificate-demo-back.png" /></div>
</div> </div>
</ng-template> </ng-template>

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

@ -35,7 +35,7 @@
.pa { .pa {
position: absolute; position: absolute;
top : 35px; top : 50px;
left : 150px; left : 150px;
} }
@ -102,8 +102,29 @@
} }
} }
.ant-row { .ant-form-item {
margin-left: 100px; margin-left: 180px;
}
nz-date-picker,
nz-input-number {
width: 100% !important;
}
.input-back {
nz-form-item {
margin-left: 0px;
.ant-form-item-label {
flex: 0 !important;
}
.ant-form-item-control {
margin-left: 20px !important;
} }
} }
} }
}
}

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

File diff suppressed because it is too large Load Diff

26
src/app/routes/usercenter/components/freight/user/detail/detail.component.html
View File

@ -10,22 +10,22 @@
<nz-skeleton [nzLoading]="service.http.loading"> <nz-skeleton [nzLoading]="service.http.loading">
<div class="user-info" nz-row> <div class="user-info" nz-row>
<div nz-col nzSpan="24" class="d-flex"> <div nz-col nzSpan="24" class="d-flex">
<img [src]="detailData?.enterpriseLogo" /> <img [src]="userDetail?.avatar" />
<div style="flex: 1;"> <div style="flex: 1;">
<div nz-row> <div nz-row>
<div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24"> <div nz-col [nzLg]="12" [nzSm]="24" [nzXs]="24">
<p style="margin-bottom: 0;">{{ detailData?.enterpriseName }} <p style="margin-bottom: 0;">{{ userDetail?.name }}
<nz-badge nzStatus="success" nzText="正常" *ngIf="detailData?.stateLocked" class="ml-sm"></nz-badge> <nz-badge nzStatus="success" nzText="正常" *ngIf="!userDetail?.stateLocked" class="ml-sm"></nz-badge>
<nz-badge nzStatus="error" nzText="冻结" *ngIf="!detailData?.stateLocked" class="ml-sm"></nz-badge> <nz-badge nzStatus="error" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-sm"></nz-badge>
</p> </p>
</div> </div>
</div> </div>
<div nz-row> <div nz-row>
<div nz-col [nzLg]="8" [nzSm]="24" [nzXs]="24"> <div nz-col [nzLg]="8" [nzSm]="24" [nzXs]="24">
<p>手机号：{{ detailData?.phone }}</p> <p>手机号：{{ userDetail?.phone }}</p>
</div> </div>
<div nz-col [nzLg]="8" [nzSm]="24" [nzXs]="24"> <div nz-col [nzLg]="8" [nzSm]="24" [nzXs]="24">
申请时间：{{detailData?.createTime}} 申请时间：{{userDetail?.createTime}}
</div> </div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="24" [nzXs]="24" class="d-flex" <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="24" [nzXs]="24" class="d-flex"
style="justify-content: flex-end;"> style="justify-content: flex-end;">
@ -47,6 +47,12 @@
<nz-card [nzLoading]="service.http.loading"> <nz-card [nzLoading]="service.http.loading">
<sv-container col="2"> <sv-container col="2">
<sv-title>个人信息 <sv-title>个人信息
<label *ngIf="userIdentityDetail?.certificationStatus===1" style="color: #52c41a;"><i nz-icon
nzType="check-circle" nzTheme="fill" class="mr-xs"></i>审核通过
</label>
<label *ngIf="userIdentityDetail?.certificationStatus===2" style="color: #ff4d4f;"><i nz-icon
nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回
</label>
<div style="float: right;"> <div style="float: right;">
<button nz-button nzType="default" nzDanger (click)="auditPass()">审核通过</button> <button nz-button nzType="default" nzDanger (click)="auditPass()">审核通过</button>
<button nz-button nzType="default" nzDanger (click)="auditNo()">驳回审核</button> <button nz-button nzType="default" nzDanger (click)="auditNo()">驳回审核</button>
@ -54,14 +60,14 @@
</div> </div>
</sv-title> </sv-title>
<sv label="姓名"> <sv label="姓名">
{{ detailData?.contactsName }} {{ userIdentityDetail?.name }}
</sv> </sv>
<sv label="身份证号码"> <sv label="身份证号码">
{{ detailData?.contactsPhone }} {{ userIdentityDetail?.certificateNumber }}
</sv> </sv>
<sv label="身份证照"> <sv label="身份证照">
<app-imagelist <app-imagelist
[imgList]="[detailData?.legalPersonIdentityVO?.certificatePhotoFrontWatermark,detailData?.legalPersonIdentityVO?.certificatePhotoBackWatermark]"> [imgList]="[userIdentityDetail?.certificatePhotoFrontWatermark,userIdentityDetail?.certificatePhotoBackWatermark]">
</app-imagelist> </app-imagelist>
</sv> </sv>
</sv-container> </sv-container>
@ -80,7 +86,7 @@
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="120"> <div nz-col nzSpan="24" se-container [labelWidth]="120">
<se [col]="1" label="姓名"> <se [col]="1" label="姓名">
{{ detailData?.enterpriseName }} {{ userIdentityDetail?.enterpriseName }}
</se> </se>
<se [col]="1" label="备注" required> <se [col]="1" label="备注" required>
<textarea nz-input rows="3" style="width: 325px;margin-left: 14px;" <textarea nz-input rows="3" style="width: 325px;margin-left: 14px;"

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

@ -16,7 +16,8 @@ export class FreightComponentsUserDetailComponent implements OnInit {
@ViewChild('redectModal', { static: false }) @ViewChild('redectModal', { static: false })
redectModal!: any; redectModal!: any;
detailData: any = {}; userDetail: any = {};
userIdentityDetail: any = {};
@ViewChild('st', { static: false }) st!: STComponent; @ViewChild('st', { static: false }) st!: STComponent;
columns: STColumn[] = [ columns: STColumn[] = [
{ title: '企业名称', index: 'perPrice', width: 300, className: 'text-center' }, { title: '企业名称', index: 'perPrice', width: 300, className: 'text-center' },
@ -42,6 +43,27 @@ export class FreightComponentsUserDetailComponent implements OnInit {
id: this.route.snapshot.params.id id: this.route.snapshot.params.id
// tenantId: this.route.snapshot.queryParams.tenantId, // tenantId: this.route.snapshot.queryParams.tenantId,
}; };
// 获取司机头部信息
this.service
.request(this.service.$api_get_user_detail, {
appUserId: this.route.snapshot.params.id
})
.subscribe(res => {
if (res) {
this.userDetail = res;
}
});
// 获取用户个人信息
this.service
.request(this.service.$api_get_user_identity, {
id: this.route.snapshot.params.id
})
.subscribe(res => {
if (res) {
this.userIdentityDetail = res;
}
});
} }
userAction(status: number) { userAction(status: number) {

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

@ -78,7 +78,7 @@ export class FreightComponentsUserComponent implements OnInit {
}); });
} }
userAction(status: number) { userAction(status: number, appUserId: Array<number>) {
this.modal.warning({ this.modal.warning({
nzTitle: status === 1 ? '确定启用该用户吗？' : '确定冻结该用户吗？', nzTitle: status === 1 ? '确定启用该用户吗？' : '确定冻结该用户吗？',
nzContent: nzContent:
@ -86,11 +86,20 @@ export class FreightComponentsUserComponent implements OnInit {
? '停用后，该用户将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作' ? '停用后，该用户将被限制使用，不限于访问受限、无法发布货源等，请谨慎操作'
: '启用后，该用户将恢复正常使用功能，请再次确认', : '启用后，该用户将恢复正常使用功能，请再次确认',
nzOnOk: () => { nzOnOk: () => {
// this.service.request(this.service.$api_lock_user) this.service
.request(this.service.$api_lock_app_user, {
appUserId,
freezeOrResume: !!!status
})
.subscribe(res => {
if (res) {
this.service.msgSrv.success(status === 1 ? '启用成功' : '冻结成功');
this.st.reload(); this.st.reload();
} }
}); });
} }
});
}
expandToggle() { expandToggle() {
this._$expand = !this._$expand; this._$expand = !this._$expand;
@ -213,18 +222,18 @@ export class FreightComponentsUserComponent implements OnInit {
{ {
text: '查看', text: '查看',
click: (item: any) => { click: (item: any) => {
this.router.navigate(['./view', item.id], { relativeTo: this.ar }); this.router.navigate(['./view', item.appUserId], { relativeTo: this.ar });
} }
}, },
{ {
text: '冻结', text: '冻结',
iif: item => item.stateLocked === 0, iif: item => item.stateLocked === 0,
click: (item: any) => this.userAction(0) click: (item: any) => this.userAction(0, [Number(item.appUserId)])
}, },
{ {
text: '启用', text: '启用',
iif: item => item.stateLocked === 1, iif: item => item.stateLocked === 1,
click: (item: any) => this.userAction(1) click: (item: any) => this.userAction(1, [Number(item.appUserId)])
} }
] ]
} }

13
src/app/routes/usercenter/services/usercenter.service.ts
View File

@ -37,6 +37,12 @@ export class UsermanageService extends BaseService {
// 货主员工列表(运营后台) // 货主员工列表(运营后台)
$api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserList'; $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserList';
// 冻结或恢复员工
$api_lock_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
// 冻结或恢复应用用户
$api_lock_app_user = '/api/mdc/cuc/userApp/freezeOrResume';
// 冻结/启用用户 // 冻结/启用用户
$api_lock_user = '/api/mdc/cuc/enterpriseInfo/operate/lock'; $api_lock_user = '/api/mdc/cuc/enterpriseInfo/operate/lock';
@ -65,6 +71,13 @@ export class UsermanageService extends BaseService {
$api_get_enterprise_user_by_id = '/api/mdc/cuc/enterpriseAdmin/operate/get'; $api_get_enterprise_user_by_id = '/api/mdc/cuc/enterpriseAdmin/operate/get';
// 审核企业管理员 // 审核企业管理员
$api_audit_enterprise_admin = '/api/mdc/cuc/enterpriseAdmin/operate/audit'; $api_audit_enterprise_admin = '/api/mdc/cuc/enterpriseAdmin/operate/audit';
// 保存企业信息表
$api_save_enterprise_admin = '/api/mdc/cuc/enterpriseInfo/operate/save';
// 根据地区code查询列表
$api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode';
constructor(public injector: Injector) { constructor(public injector: Injector) {
super(injector); super(injector);

BIN
src/assets/images/usercenter/certificate-demo-back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

BIN
src/assets/images/usercenter/certificate-demo-front.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

6
src/conf/api.conf.ts
View File

@ -5,5 +5,9 @@ export const apiConf = {
/** /**
* 文件上传路径 * 文件上传路径
*/ */
fileUpload: ``, fileUpload: `/api/mdc/pbc/upload/multipartFile/file`,
/**
* 文件上传路径(水印)
*/
waterFileUpload: `/api/mdc/pbc/upload/multipartFile/watermarkFile`
}; };