From d1142fecc1c9fb51ef7147d85394c862208bc8eb Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 13 Dec 2021 21:23:56 +0800 Subject: [PATCH] edit --- .../freight/list/new/new.component.ts | 191 +----------------- .../audit/detail/detail.component.html | 138 +++++++------ .../audit/detail/detail.component.less | 41 +--- .../audit/detail/detail.component.ts | 84 ++++---- 4 files changed, 135 insertions(+), 319 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/new/new.component.ts b/src/app/routes/usercenter/components/freight/list/new/new.component.ts index 47b73c8a..cab54aef 100644 --- a/src/app/routes/usercenter/components/freight/list/new/new.component.ts +++ b/src/app/routes/usercenter/components/freight/list/new/new.component.ts @@ -93,20 +93,10 @@ export class FreightComponentsListNewComponent implements OnInit { enterpriseBusinessAddressCode = ''; regionData: any = []; - constructor( - private routerinfo: ActivatedRoute, - public msg: NzMessageService, - private router: Router, - private modalService: NzModalService, - private service: UsermanageService - ) {} - ngOnInit() { - this.getRegionToThree(''); - } + constructor(public msg: NzMessageService, private router: Router, private service: UsermanageService) {} + ngOnInit() {} submitForm() { - console.log(this.sf.value); - console.log(this.sf1.value); const sfVlaue = this.sf.value; const params = {}; Object.assign( @@ -134,182 +124,13 @@ export class FreightComponentsListNewComponent implements OnInit { ); this.service.request(this.service.$api_save_enterprise_admin, params).subscribe(res => { console.log(res); + if (res) { + this.service.msgSrv.success('企业新增成功'); + this.goBack(); + } }); } - // submitForm() { - // // 营业执照基本信息 - // if (!this.sf.value.contactsName) { - // // this.service.msgSrv.warning('请填写申请人姓名'); - // return; - // } - // if (!this.sf1.value.enterpriseQualificationCertificate) { - // // this.service.msgSrv.warning('请上传营业执照'); - // return; - // } - // if (!this.sf1.value.unifiedSocialCreditCode) { - // // this.service.msgSrv.warning('请填写统一社会信用代码'); - // return; - // } - // if (!this.sf1.value.enterpriseName) { - // // this.service.msgSrv.warning('请填写公司名称'); - // return; - // } - // if (!this.sf1.value.enterpriseType) { - // // this.service.msgSrv.warning('请填写公司类型'); - // return; - // } - // if (!this.sf1.value.region) { - // // this.service.msgSrv.warning('请选择所在地区'); - // return; - // } - // if (!this.sf1.value.enterpriseAddress) { - // // this.service.msgSrv.warning('请填写营业执照详细地址'); - // return; - // } - // if (!this.sf1.value.registrationCapital) { - // // this.service.msgSrv.warning('请填写注册资本'); - // return; - // } - // if (!this.sf1.value.enterpriseRegistrationTime) { - // // this.service.msgSrv.warning('请选择成立日期'); - // return; - // } - // if (!this.sf1.value.operatingStartTime) { - // // this.service.msgSrv.warning('请选择营业期限开始日期'); - // return; - // } - // if (this.sf1.value.dateType !== true) { - // if (!this.sf1.value.operatingEndTime) { - // this.service.msgSrv.warning('请选择营业期限结束日期'); - // return; - // } - // if (this.sf1.value.operatingEndTime <= this.sf1.value.operatingStartTime) { - // this.service.msgSrv.warning('营业期限结束日期不能小于或等于开始日期'); - // return; - // } - // } - // if (!this.sf1.value.businessScope) { - // this.service.msgSrv.warning('请填写经营范围'); - // return; - // } - // if (!this.sf1.value.certificatePhotoFront) { - // this.service.msgSrv.warning('请上传身份证正面照'); - // return; - // } - // if (!this.sf1.value.certificatePhotoBack) { - // this.service.msgSrv.warning('请上传身份证反面照'); - // return; - // } - // if (!this.sf1.value.name) { - // this.service.msgSrv.warning('请填写法定代表人'); - // return; - // } - // if (!this.sf1.value.certificateNumber) { - // this.service.msgSrv.warning('请填写法定代表人身份证号'); - // return; - // } - // if (!this.sf1.value.validStartTime) { - // this.service.msgSrv.warning('请选择身份证有效开始日期'); - // return; - // } - // if (this.sf1.value.dateType1 !== true) { - // if (!this.sf1.value.validEndTime) { - // this.service.msgSrv.warning('请选择身份证有效截止日期'); - // return; - // } - // if (this.sf1.value.validEndTime <= this.sf1.value.validStartTime) { - // this.service.msgSrv.warning('身份证有效截止日期不能小于或等于开始日期'); - // return; - // } - // } - // const params: any = { - // contactsName: this.sf.value.contactsName, - // contactsPhone: this.sf.value.telephone, - // certificateNumber: this.sf1.value.certificateNumber, - // unifiedSocialCreditCode: this.sf1.value.unifiedSocialCreditCode, - // enterpriseAddressCodeStr: this.sf1.value.enterpriseAddressCodeStr, - // enterpriseAddressCode: this.sf1.value.region[2], - // enterpriseAddress: this.sf1.value.enterpriseAddress, - // enterpriseName: this.sf1.value.enterpriseName, - // enterpriseNameAbbreviation: this.sf1.value.enterpriseNameAbbreviation, - // enterpriseQualificationCertificate: this.sf1.value.enterpriseQualificationCertificate, - // enterpriseType: this.sf1.value.enterpriseType, - // enterpriseTelephone: this.sf1.value.enterpriseTelephone, - // enterpriseRegistrationTime: this.sf1.value.enterpriseRegistrationTime, - // businessScope: this.sf1.value.businessScope, - // operatingEndTime: this.sf1.value.operatingEndTime, - // operatingStartTime: this.sf1.value.operatingStartTime, - // organizationCode: this.sf1.value.organizationCode, - // registrationCapital: this.sf1.value.registrationCapital, - // legalPersonIdentity: { - // // ...this.sf1.value, - // validStartTime: this.sf1.value.validStartTime, - // validEndTime: this.sf1.value.validEndTime, - // certificatePhotoBack: this.sf1.value.certificatePhotoBack, - // certificateNumber: this.sf1.value.certificateNumber, - // certificatePhotoFront: this.sf1.value.certificatePhotoFront, - // certificateType: this.sf1.value.certificateType, - // handCertificate: this.sf1.value.handCertificate, - // name: this.sf1.value.name, - // }, - // }; - // if (this.routerinfo.snapshot.queryParams.id) { - // params.id = this.routerinfo.snapshot.queryParams.id; - // } - // delete params?.tips; - // this.service.http.post(this.service.$api_supplierSubmitInfo, params).subscribe((res) => { - // if (res) { - // this.getApplicationInfo(res.data?.id); - // } - // }); - // } - - viewImg(image: any) { - // this.modal.createStatic(AccountComponentsImgViewComponent, { i: { imgUrl: image } }).subscribe(() => { - // // this.st.reload(); - // }); - } - getRegionToThree(regionCode: string) { - // 获取一、二、三级地区详情 - this.service - .request(this.service.$api_get_region_by_code, { regionCode }) - .pipe(map(data => data.map((item: any) => ({ label: item.regionFullName, value: item.regionCode, ...item })))) - .subscribe(res => { - this.regionData = res; - this.schema1 = this.initBasicInfoSF(); - }); - } - - updateArea(parentId: string, target: string, type: number, nextTarget: string, sfObj: SFComponent): any { - // 改变二级数据时，同时清空三级数据 - if (type === 2 && sfObj) { - sfObj.getProperty(nextTarget)!.schema.enum = []; - sfObj.getProperty(nextTarget)!.widget.reset([]); - sfObj.getProperty(nextTarget)!.setValue(null, true); - } - - if (!parentId && sfObj) { - sfObj.getProperty(target)!.schema.enum = []; - sfObj.getProperty(target)!.widget.reset([]); - sfObj.getProperty(target)!.setValue(null, true); - } else { - // return this.service.http - // .get(this.service.$api_getRegionByCode, { regionCode: parentId }) - // .pipe( - // map((res) => { - // return res.data.map((m: { regionFullName: string; name: any; regionCode: any }) => { - // const fullName = m.regionFullName.split(',').reverse().join(''); - // return { label: m.name, value: m.regionCode, fullName }; - // }); - // }), - // ) - // .subscribe((res) => { - // sfObj.getProperty(target)!.schema.enum = res; - // sfObj.getProperty(target)!.widget.reset(res); - // }); - } - } /* * 根据地区code查询地区详情 * code：请求参数 diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html index e6ad73e0..5c496470 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -1,4 +1,4 @@ - + @@ -7,32 +7,56 @@ - - 车辆基础信息 - - {{ detailData?.carNo }} - - - {{ detailData?.carNoColor }} - - - {{ detailData?.carModel }} - - - {{ detailData?.carLength }} - - - {{ detailData?.isTrailer === true ? '是' : '否'}} - - - - - - - + + 待审核 +
+ + + +
+ + + {{ detailData?.carNoColor }} + + + {{ detailData?.carNoColor }} + + - + + + + + + + + 车辆基础信息 + + + + + + {{ detailData?.carNoColor }} + + + {{ detailData?.carModel }} + + + {{ detailData?.carLength }} + + + {{ detailData?.isTrailer === true ? '是' : '否'}} + + + + + + + + + + 行驶证信息 @@ -46,10 +70,10 @@ - - - {{ detailData?.driverLicenseEndTime }} - + + + {{ detailData?.driverLicenseEndTime }} + {{ detailData?.driverLicenseSigningOrg }} @@ -83,7 +107,9 @@ {{ detailData?.contactsName }} - + + @@ -102,49 +128,43 @@ {{detailData?.roadTransportEndTime}} - + + 认证司机 - - -
-
- {{ item?.isSelf ? '是' : '否' }} -
-
- - + + +
+
+ {{ item?.isSelf ? '是' : '否' }} +
+
+ + - + -
- 评分: -
评价内容：
-
+
+ 评分: +
评价内容：
+
-
- 暂无评价内容 -
+
+ 暂无评价内容 +
diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.less b/src/app/routes/vehicle/components/audit/detail/detail.component.less index c77bde67..ddc8dde6 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.less +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.less @@ -1,40 +1,13 @@ @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; - } - .warning { - color: @warning-color; - } - - .error { - color: @error-color; + .readOnly-input { + input { + outline: 0; + border : 0; + } } } - .mt16 { - margin-top: 16px; - } - .user-info { - display: flex; - font-size: 16px; - .enterprise-name { - margin-right: 15px; - } - .user-info-des { - margin-bottom: 5px; - } - } -} +} \ No newline at end of file diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.ts b/src/app/routes/vehicle/components/audit/detail/detail.component.ts index 1b46f35e..6ca1c83e 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts @@ -11,7 +11,7 @@ import { VehicleService } from '../../../services/vehicle.service'; @Component({ selector: 'app-Vehicle-components-Audit-detail', templateUrl: './detail.component.html', - styleUrls: ['./detail.component.less'], + styleUrls: ['./detail.component.less'] }) export class VehicleComponentsAuditDetailComponent implements OnInit { i: any; @@ -23,7 +23,9 @@ export class VehicleComponentsAuditDetailComponent implements OnInit { modalName = ''; ui!: SFUISchema; columns!: STColumn[]; - detailData: any; + detailData: any = { + carNo: '111' + }; schema!: SFSchema; @ViewChild('sf', { static: false }) sf!: SFComponent; schema1!: SFSchema; @@ -31,13 +33,14 @@ export class VehicleComponentsAuditDetailComponent implements OnInit { validData: any = ['suppliersType']; suppliersData: any = {}; + isEdit = false; constructor( private http: _HttpClient, private modal: ModalHelper, public service: VehicleService, private route: ActivatedRoute, private modalHelper: ModalHelper, - private msgSrv: NzMessageService, + private msgSrv: NzMessageService ) {} ngOnInit() { @@ -46,12 +49,12 @@ export class VehicleComponentsAuditDetailComponent implements OnInit { this.initSF1(); this.initST(); } - /** + /** * 查询参数 */ - get reqParams() { - return { id: this.route.snapshot?.params?.id }; - } + get reqParams() { + return { id: this.route.snapshot?.params?.id }; + } /** * 初始化查询表单 */ @@ -64,17 +67,17 @@ export class VehicleComponentsAuditDetailComponent implements OnInit { type: 'string', ui: { widget: 'date', - format: 'yyyy-MM-dd 00:00:00', + format: 'yyyy-MM-dd 00:00:00' // hidden: this.modalName === 'effectiveDate' ? false : true, - } as SFDateWidgetSchema, - }, + } as SFDateWidgetSchema + } }, - required: ['effectiveDate'], + required: ['effectiveDate'] }; this.ui = { '*': { spanLabelFixed: 120, grid: { span: 24 } } }; } initST() { - this.columns =[ + this.columns = [ { title: '认证司机', index: 'name', width: 300, className: 'text-center' }, { title: '司机手机号', index: 'mobile', width: 300, className: 'text-center' }, { title: '是否挂靠', render: 'isSelf', width: 300, className: 'text-center' }, @@ -87,15 +90,15 @@ export class VehicleComponentsAuditDetailComponent implements OnInit { buttons: [ { text: '查看协议', - click: (_record) => this.viewEvaluate(_record), + click: _record => this.viewEvaluate(_record) }, { text: '上传协议', - click: (_record) => this.updateEvaluate(_record), - }, - ], - }, - ] + click: _record => this.updateEvaluate(_record) + } + ] + } + ]; } initSF1() { this.schema1 = { @@ -106,7 +109,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit { title: '类型', enum: [ { label: '非外部供应商', value: 0 }, - { label: '外部供应商', value: 1 }, + { label: '外部供应商', value: 1 } ], default: '', ui: { @@ -121,60 +124,59 @@ export class VehicleComponentsAuditDetailComponent implements OnInit { this.suppliersData.externalSuppliersId = ''; } this.initSF1(); - }, - }, + } + } }, externalSuppliersId: { title: '外部供应商id', type: 'string', default: '', ui: { - visibleIf: { suppliersType: (value: any) => value === 1 }, - }, - }, + visibleIf: { suppliersType: (value: any) => value === 1 } + } + } }, - required: this.validData, + required: this.validData }; } - // 获取录单员 + // 获取录单员 getDetailList() { - console.log( this.route.snapshot?.params?.id) + console.log(this.route.snapshot?.params?.id); const params = { id: this.route.snapshot?.params?.id }; - this.service.request(`${this.service.$api_get_operate_get}`, params).subscribe((res) => { - console.log(res) - this.detailData = res; - }) + this.service.request(`${this.service.$api_get_operate_get}`, params).subscribe(res => { + console.log(res); + // this.detailData = res; + }); } goBack() { window.history.go(-1); } - - handleCancel(name: any) { - - } + handleCancel(name: any) {} /** - *查看评价 - */ + *查看评价 + */ viewEvaluate(item: any) { // this.modal.createStatic(VehicleImgViewComponent, { i: { imgUrl: item } }).subscribe(() => { // // this.st.reload(); // }); } /** - *查看评价 - */ + *查看评价 + */ updateEvaluate(item: any) { // this.modal.createStatic(VehicleComponentsListEditComponent, { i: { item }, infoData: item }).subscribe(() => { // // this.st.reload(); // // this.getInfo(); // }); } - handleOK() { - + handleOK() {} + + ratify() { + this.isEdit = true; } }