From 8802b49c959693ca4c167996e631b8e81043ab08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Mon, 16 May 2022 15:21:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../list/detail/detail.component.html | 430 ++++++++++++------ 1 file changed, 279 insertions(+), 151 deletions(-) diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.html b/src/app/routes/vehicle/components/list/detail/detail.component.html index 9ec011b5..eb675607 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.html +++ b/src/app/routes/vehicle/components/list/detail/detail.component.html @@ -1,6 +1,6 @@ - + + + 车牌号: {{ detailData?.carNo }} + +
+ + + + + + + +
+ + + +
+
+ + 车辆基础信息 +
+ + + +
+ + +
- - - - - - - - - - - + + + + + + + + - - - {{detailData?.driverLicenseSigningOrg }} - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + 行驶证信息 +
+ + + + + + + + + + + {{detailData?.carBrand }} + + + + - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + {{detailData?.driverLicenseSigningOrg }} + + + + + + + + + + + + - - - {{detailData?.carOwner }} - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{detailData?.carOwner }} + + + + + + - - - - - - - - + + + +
+
+
+ + 道路运输证信息 + + +
+ + + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - + + + +
+
+
+ + 认证司机 +
+ + + +
+ 未上传 + 草稿 + 待审核 + 已审核 + 已驳回 + 证件过期 +
+ + +
+ - \ No newline at end of file + From 33e55f471e112c1041043802007da510434b58cb Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 16 May 2022 15:36:37 +0800 Subject: [PATCH 2/5] edit --- proxy.conf.js | 2 +- .../components/audit/audit.component.ts | 3 +- .../audit/detail/detail.component.html | 109 +++++++++--------- .../vehicle/components/list/list.component.ts | 3 +- 4 files changed, 60 insertions(+), 57 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index e671177b..831a8d49 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -30,7 +30,7 @@ module.exports = { // }, '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index b6d1a88d..26f8beaf 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -165,7 +165,8 @@ export class VehicleComponentsAuditComponent extends BasicTableComponent impleme this.columns = [ // { title: '', type: 'checkbox', className: 'text-center' }, { title: '车牌号', width: '180px', className: 'text-center', index: 'carNo' }, - { title: '车牌颜色', width: '180px', className: 'text-center', index: 'carNoColorLabel' }, + { title: '车牌颜色', width: '140px', className: 'text-center', index: 'carNoColorLabel' }, + { title: '车辆品牌', width: '140px', className: 'text-center', index: 'carBrand' }, { title: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' }, { title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' }, { title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' }, 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 b135d6ad..1087a637 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -73,19 +73,20 @@

车辆基础信息 + nzTheme="fill" class="mr-xs">验证通过 +

@@ -100,8 +101,8 @@ [nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> --> - + + + + + + + {{detailData?.carBrand }} + + @@ -165,32 +175,27 @@

行驶证信息 -

- + - -
{{ item?.carModel ? item?.carModel + '-' : ''}}{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{ +
{{ item?.carModel ? item?.carModel + '-' : ''}}{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' + }}-{{ item?.carLoad ? item?.carLoad + '吨' : '' }}
diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index 2f8ef98d..031d235c 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -23,6 +23,7 @@ export class VehicleComponentsListComponent extends BasicTableComponent implemen public searchDrawerService: SearchDrawerService ) { super(searchDrawerService); + this.sfValue = { enterpriseName: '', contactName: '' }; } /** @@ -30,11 +31,11 @@ export class VehicleComponentsListComponent extends BasicTableComponent implemen */ get reqParams() { const params: any = { - ...(this.sf && this.sf?.value) + ...(this.sfValue) }; - if (this.sf?.value.effectiveDate) { - params.effectiveDateStart = this.sf?.value.effectiveDate[0]; - params.effectiveDateEnd = this.sf?.value.effectiveDate[1]; + if (this.sfValue?.effectiveDate) { + params.effectiveDateStart =this.sfValue?.effectiveDate[0]; + params.effectiveDateEnd = this.sfValue?.effectiveDate[1]; } delete params.effectiveDate; delete params.expand; From 11e8805c94c096709079142d6a4d7453fba271a7 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Mon, 16 May 2022 17:21:41 +0800 Subject: [PATCH 5/5] edit --- .../routes/vehicle/components/audit/detail/detail.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 cafffa17..211feb0f 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.ts @@ -165,7 +165,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime); - this.detailData.driverLicenseGetTime = EADateUtil.yearToDateTime(this.detailData?.driverLicenseGetTime); + this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime); if (this.detailData.scrapTime) { this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss'); }