-
- ![]()
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.less b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.less
index 48f605d9..33632d37 100644
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.less
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.less
@@ -1,46 +1,132 @@
-@import '~@delon/theme/index';
:host {
::ng-deep {
- .ant-steps-dot {
- .ant-steps-item-content {
- width: 200px;
- }
- .ant-steps-item-icon {
- margin-left: 96px;
- }
- .ant-steps-item-tail::after {
- margin-left: 40px;
- }
- }
- .success {
- color: @success-color;
+ sv-title {
+ font-weight: 700;
}
- .warning {
- color: @warning-color;
+ .user-info {
+ display : flex;
+ font-size: 16px;
+
+ .enterprise-name {
+ margin-right: 15px;
+ }
+
+ img {
+ width : 64px;
+ height : 64px;
+ margin-right : 15px;
+ border-radius: 50%;
+ }
+
+ .user-info-des {
+ margin-bottom: 5px;
+ }
}
- .error {
- color: @error-color;
+ .sv__label,
+ .sv__detail {
+ line-height: 30px;
}
- }
- .mt16 {
- margin-top: 16px;
- }
- .user-info {
- display: flex;
- font-size: 16px;
- .enterprise-name {
- margin-right: 15px;
+
+ .edit-box {
+ input {
+ max-width: 250px;
+ }
+
+ nz-date-picker {
+ min-width: 250px;
+ }
}
- img {
- width: 64px;
- height: 64px;
- margin-right: 15px;
- border-radius: 50%;
+
+ .readOnly-box {
+ input {
+ padding-left: 0;
+ color : #000;
+ border : 0;
+ }
+
+ nz-select-top-control {
+ padding-left: 0px !important;
+ }
}
- .user-info-des {
- margin-bottom: 5px;
+
+ .ant-select {
+ min-width: 250px;
+
+ nz-select-top-control {
+ cursor: text !important;
+ color : #000 !important;
+ }
+ }
+
+ // 图片展示工具样式改造
+ .ant-upload.ant-upload-disabled {
+ cursor: pointer;
+ }
+
+ .ant-upload.ant-upload-select-picture-card {
+ width : 200px;
+ height: 160px;
+ }
+
+ .ant-upload-picture-card-wrapper {
+ width: auto;
}
}
}
+
+.image-hover {
+ .delete-icon {
+ border-radius : 50%;
+ color : #F55656;
+ font-size : 28px;
+ position : absolute;
+ top : -15px;
+ right : -15px;
+ background-color: #ffffff;
+ cursor : pointer;
+ }
+
+ .show-icon {
+ color : #ffffff;
+ font-size: 30px;
+ cursor : pointer;
+ }
+}
+
+.image-hover:hover .mask {
+ opacity: 0.8;
+}
+
+.mask {
+ width : 200px;
+ height : 160px;
+ background-color : #4F4F4F;
+ opacity : 0;
+ position : absolute;
+ // top : 6px;
+ // left : 12px;
+ border-radius : 6px;
+ margin-top : -160px;
+}
+
+.mask-over {
+ width : 200px;
+ height : 160px;
+ position : absolute;
+ // top : 6px;
+ // left : 12px;
+ border-radius : 6px;
+ display : flex;
+ justify-content : center;
+ align-items : center;
+ margin-top : -160px;
+
+ label {
+ font-size : 20px;
+ line-height : 24px;
+ letter-spacing: 0.7px;
+ color : #FFFFFF;
+ }
+}
\ No newline at end of file
diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts
index 5dcca082..05d969fe 100644
--- a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts
+++ b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.ts
@@ -16,6 +16,9 @@ import {
} from '@delon/form';
import { Observable, Observer } from 'rxjs';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { apiConf } from '@conf/api.conf';
+import { ImageViewComponent } from 'src/app/shared/components/imagelist';
+import { NzCascaderOption } from 'ng-zorro-antd/cascader';
@Component({
selector: 'app-Freight-components-EnterpriseAudit-view',
templateUrl: './view.component.html',
@@ -30,7 +33,8 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
approvalOpinion = '';
networkTransporter = null;
- detailData: any;
+ detailData: any = this.initDefalutData();
+ tempalateData = { ...this.detailData };
statusE: any = {
10: '待审核',
@@ -40,10 +44,13 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
isEdit = false;
+ uploadURl = apiConf.waterFileUpload;
+ disabledUpload = false;
constructor(private nzModalService: NzModalService, public service: UsermanageService, private route: ActivatedRoute) {}
ngOnInit() {
this.initData();
+ this.loadData({}, 0).then(res => console.log(res));
// this.launchSign();
}
@@ -55,6 +62,7 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
.subscribe(res => {
if (res) {
this.detailData = res;
+ this.tempalateData = { ...this.detailData };
}
});
}
@@ -104,6 +112,78 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
});
}
+ showImg(url: any) {
+ const params = {
+ imgList: [url],
+ index: 0
+ };
+ this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
+ }
+
+ deleteImg(key: string) {
+ this.nzModalService.warning({
+ nzTitle: '是否确认删除该图片',
+ nzOnOk: () => {
+ this.disabledUpload = true;
+ this.detailData[key] = '';
+ setTimeout(() => {
+ this.disabledUpload = false;
+ }, 100);
+ }
+ });
+ }
+
+ changeUpload({ file, fileList, type }: any, key: string) {
+ console.log({ file, fileList, type });
+ if (type === 'success') {
+ this.detailData[key] = file.response.data.fullFileWatermarkPath;
+ }
+ }
+
+ changeTime(event: any) {
+ console.log(event);
+ }
+
+ changeCascader(event: any) {
+ console.log(event);
+ }
+
+ /*
+ * 根据地区code查询地区详情
+ * code：请求参数
+ * type：参数 name：获取省市区名称，fullcode：获取省市区code
+ * num：参数 1：第一个地区选择，2：第二个地区选择
+ */
+ getRegionDetailByCode(regionCode: any) {
+ // 根据地区code查询地区详情
+ return this.service.request(this.service.$api_get_region_by_code, { regionCode });
+ }
+
+ loadData(node: any, index: number): PromiseLike {
+ return new Promise(resolve => {
+ this.getRegionDetailByCode(node?.regionCode || '').subscribe(
+ res => {
+ console.log(1);
+
+ node.children = res.map((item: any) => ({ ...item, isLeaf: index === 1 }));
+ },
+ _ => {},
+ () => {
+ resolve();
+ }
+ );
+ });
+ }
+
+ reset() {
+ this.detailData = { ...this.tempalateData };
+ this.isEdit = false;
+ }
+
+ save() {
+ this.isEdit = false;
+ }
+
ratify() {
this.isEdit = true;
}
@@ -111,4 +191,39 @@ export class FreightComponentsEnterpriseAuditViewComponent implements OnInit {
goBack() {
window.history.go(-1);
}
+
+ private initDefalutData() {
+ return {
+ adminUserInfo: {
+ name: '',
+ mobile: '',
+ certificatePhotoFrontWatermark: '',
+ certificatePhotoBackWatermark: ''
+ },
+ legalPersonIdentityVO: {
+ certificateNumber: ''
+ },
+ enterpriseName: '',
+ enterpriseType: '',
+ unifiedSocialCreditCode: '',
+ registrationCapital: null,
+ enterpriseRegistrationTime: '',
+
+ driverLicenseSigningOrg: '',
+ carDistinguishCode: '',
+ carLoad: '',
+ curbWeight: '',
+ roadTransportNo: '',
+ roadTransportLicenceNo: '',
+ carOwner: '',
+ isTrailer: null,
+ useNature: null,
+ driverLicenseRegisterTime: null,
+ driverLicenseGetTime: null,
+ driverLicenseEndTime: null,
+ roadTransportStartTime: null,
+ roadTransportEndTime: null,
+ carFrontPhotoWatermark: ''
+ };
+ }
}
diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.html b/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
index 78a778c5..dcfcfac4 100644
--- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.html
@@ -54,8 +54,8 @@
nzType="close-circle" nzTheme="fill" class="mr-xs">驳回
- {{ userIdentityDetail?.enterpriseName }}
+ {{ userIdentityDetail?.name }}
-
+
+ (nzCheckedChange)="approvalOpinion=approvalOpinion+'、'+tag">
{{ tag }}
diff --git a/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
index e447f1b4..4b551384 100644
--- a/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/detail/detail.component.ts
@@ -25,10 +25,7 @@ export class FreightComponentsUserDetailComponent implements OnInit {
{ title: '角色', index: 'totalPrice', width: 300, className: 'text-center' }
];
- approvalOpinion = {
- reason: '',
- remark: ''
- };
+ approvalOpinion = '';
reasonTags = ['身份证照片太丑', '姓名与身份证号不匹配'];
constructor(private nzModalService: NzModalService, public service: UsermanageService, private route: ActivatedRoute) {}
@@ -83,27 +80,44 @@ export class FreightComponentsUserDetailComponent implements OnInit {
auditPass() {
this.nzModalService.confirm({
nzTitle: '审核通过',
- nzContent: `是否确认通过(姓名:黄大仙)审核`,
- nzOnOk: () => {}
+ nzContent: `是否确认通过(姓名:${this.userIdentityDetail?.name})审核`,
+ nzOnOk: () => {
+ this.auditEnterprise(0);
+ }
});
}
auditNo() {
- this.approvalOpinion = {
- reason: '',
- remark: ''
- };
+ this.approvalOpinion = '';
this.nzModalService.create({
nzTitle: '审核驳回',
nzContent: this.redectModal,
nzOnOk: () => {
- if (!this.approvalOpinion?.remark) {
+ if (!this.approvalOpinion) {
return false;
}
+ this.auditEnterprise(1);
return;
}
});
}
+
+ private auditEnterprise(auditStatus: number) {
+ this.service
+ .request(this.service.$api_approve_identity, {
+ auditStatus: auditStatus,
+ identityId: this.userIdentityDetail.id,
+ auditType: 0,
+ certificationOpinions: this.approvalOpinion
+ })
+ .subscribe(res => {
+ if (res) {
+ this.service.msgSrv.success(auditStatus === 0 ? '审核通过' : '驳回成功');
+ }
+ this.initData();
+ });
+ }
+
ratify() {}
goBack() {
diff --git a/src/app/shared/shared-zorro.module.ts b/src/app/shared/shared-zorro.module.ts
index 558ba2aa..4bda1445 100644
--- a/src/app/shared/shared-zorro.module.ts
+++ b/src/app/shared/shared-zorro.module.ts
@@ -41,6 +41,7 @@ import { NzStatisticModule } from 'ng-zorro-antd/statistic';
import { NzTimelineModule } from 'ng-zorro-antd/timeline';
import { NzSkeletonModule } from 'ng-zorro-antd/skeleton';
import { NzUploadModule } from 'ng-zorro-antd/upload';
+import { NzCascaderModule } from 'ng-zorro-antd/cascader';
export const SHARED_ZORRO_MODULES = [
NzButtonModule,
NzGridModule,
@@ -75,5 +76,6 @@ export const SHARED_ZORRO_MODULES = [
NzStatisticModule,
NzTimelineModule,
NzSkeletonModule,
- NzUploadModule
+ NzUploadModule,
+ NzCascaderModule
];
diff --git a/src/style-icons-auto.ts b/src/style-icons-auto.ts
index cd71454c..cf0f7334 100644
--- a/src/style-icons-auto.ts
+++ b/src/style-icons-auto.ts
@@ -57,7 +57,8 @@ import {
MenuOutline,
SwapOutline,
EyeFill,
- EyeInvisibleFill
+ EyeInvisibleFill,
+ SolutionOutline
} from '@ant-design/icons-angular/icons';
export const ICONS_AUTO = [
@@ -114,5 +115,6 @@ export const ICONS_AUTO = [
MenuOutline,
EyeFill,
EyeInvisibleFill,
- SwapOutline
+ SwapOutline,
+ SolutionOutline
];
-
- {{ detailData?.enterpriseName }}
-
-
-
+
+
+
+
+ 企业管理员信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{detailData?.registrationCapital}}
+
+ 万元
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
{{ detailData?.fullRegionVO?.provinceName }}{{ detailData?.fullRegionVO?.cityName }}{{
detailData?.fullRegionVO?.areaName }}
-
-
- {{ detailData?.enterpriseAddress }}
-
-
-
-
- {{ detailData?.businessScope }}
-
-
-
-
- {{ detailData?.taxAuthority }}
-
-
-
-
-
- 企业法人信息
-
- {{ detailData?.legalPersonIdentityVO?.name }}
-
-
- {{ detailData?.legalPersonIdentityVO?.certificateNumber }}
-
-
- {{ detailData?.legalPersonIdentityVO?.validStartTime }} -
- {{ detailData?.legalPersonIdentityVO?.validEndTime || '长期' }}
-
-
-
-
-
-
-
- 企业开票信息
-
- {{ detailData?.createBank }}
-
-
- {{ detailData?.bankAccount }}
-
-
- {{ detailData?.registerPhone }}
-
-
- {{ detailData?.registerAddress }}
-
-
-
-
+
+
+
+ {{ detailData?.enterpriseAddress }}
+
+
+
+
+ {{ detailData?.businessScope }}
+
+
+
+
+ {{ detailData?.taxAuthority }}
+
+
+
+
+
+ 企业法人信息
+
+ {{ detailData?.legalPersonIdentityVO?.name }}
+
+
+ {{ detailData?.legalPersonIdentityVO?.certificateNumber }}
+
+
+ {{ detailData?.legalPersonIdentityVO?.validStartTime }} -
+ {{ detailData?.legalPersonIdentityVO?.validEndTime || '长期' }}
+
+
+
+
+
+
+
+ 企业开票信息
+
+ {{ detailData?.createBank }}
+
+
+ {{ detailData?.bankAccount }}
+
+
+ {{ detailData?.registerPhone }}
+
+
+ {{ detailData?.registerAddress }}
+
+
+
+
+ ![]()
+
-
- 企业管理员信息
-
- {{ detailData?.adminUserInfo?.name }}
-
-
- {{ detailData?.adminUserInfo?.mobile }}
-
-
- {{ detailData?.contactadminUserInfo?.certificateNumber }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ detailData?.enterpriseName }}
-
-
- {{ detailData?.unifiedSocialCreditCode }}
-
-
- {{ detailData?.enterpriseType }}
-
-
- {{ detailData?.registrationCapital }}
- 万元
-
-
- {{ detailData?.enterpriseRegistrationTime }}
-
-
+
+
+
+
+
+
+
-
-
-
-
+
+
- {{ detailData?.enterpriseName }}
-
-
- {{ detailData?.unifiedSocialCreditCode }}
-
- 申请时间：{{detailData?.createTime}}
-
-
+
+
+
+
+
+
+
+ {{ detailData?.unifiedSocialCreditCode }}
+
+ 申请时间：{{detailData?.createTime}}
+
+
+
+
+
+
+
@@ -38,135 +46,164 @@
-
+
+
+
+
+
+
+
{{ detailData?.operatingStartTime }} 至 {{ detailData?.operatingEndTime }}
长期
{{ detailData?.operatingStartTime
}} 至 长期
-
@@ -174,7 +211,7 @@
{{ detailData?.enterpriseName }}
-
+
{{ detailData?.enterpriseName }}
-
+
上传
+
+ ![]()
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -86,15 +86,14 @@