diff --git a/proxy.conf.js b/proxy.conf.js index 592b3ba0..9ee58bfc 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/commom/less/commom-table.less b/src/app/routes/commom/less/commom-table.less index ec058484..b8c64c07 100644 --- a/src/app/routes/commom/less/commom-table.less +++ b/src/app/routes/commom/less/commom-table.less @@ -116,7 +116,7 @@ .text-truncate { white-space: normal; } - + // 强制头部居中 .ant-table-container table>thead>tr>.options { text-align: center !important; @@ -143,4 +143,11 @@ } } -.height_box {} \ No newline at end of file +.height_box {} + +.filter-box { + .com-input { + width : 150px; + height: 32PX; + } +} \ No newline at end of file diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index f51fa90a..5044b976 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -27,10 +27,9 @@
-
- - +
+ +
@@ -92,7 +91,7 @@

- {{ item.partnerName ? item.partnerName: '--'}}/{{item.partnerMobile ? item.partnerMobile :'--'}} + {{ item.partnerName ? item.partnerName: '--'}}/{{item.partnerMobile ? item.partnerMobile :'--'}}

@@ -102,7 +101,7 @@

- {{ item.channelName ? item.channelName: '--'}}/{{item.channelMobile ? item.channelMobile :'--'}} + {{ item.channelName ? item.channelName: '--'}}/{{item.channelMobile ? item.channelMobile :'--'}}

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..aaa5c951 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 @@

行驶证信息 -

- + - + + + 车牌号: {{ detailData?.carNo }} +
+
+ + + + + + + +
+ + + +
+
+ + 车辆基础信息 +
+ + + +
+ + +
- - - - - - - - - - - + + + + + + + + - - - {{detailData?.driverLicenseSigningOrg }} - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + 行驶证信息 +
+ + + + + + + + + + + {{detailData?.carBrand }} + + + + - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + {{detailData?.driverLicenseSigningOrg }} + + + + + + + + + + + + - - - {{detailData?.carOwner }} - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{detailData?.carOwner }} + + + + + + - - - - - - - - + + + +
+
+
+ + 道路运输证信息 + + +
+ + + + + + + + + + + - - - - - - - - - - - + + + + + - - - - - + + + +
+
+
+ + 认证司机 +
+ + + +
+ 未上传 + 草稿 + 待审核 + 已审核 + 已驳回 + 证件过期 +
+
+
+
+ - \ No newline at end of file + diff --git a/src/app/routes/vehicle/components/list/detail/detail.component.ts b/src/app/routes/vehicle/components/list/detail/detail.component.ts index 52d66e59..1aa69b19 100644 --- a/src/app/routes/vehicle/components/list/detail/detail.component.ts +++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts @@ -185,6 +185,15 @@ export class VehicleComponentsListDetailComponent implements OnInit { id: this.route.snapshot?.params?.id }; this.service.request(`${this.service.$api_get_operate_get}`, params).subscribe(res => { + if (res.curbWeight) { + res.curbWeight = res.curbWeight * 1000; + } + if (res.carTotalLoad) { + res.carTotalLoad = res.carTotalLoad * 1000; + } + if (res.carLoad) { + res.carLoad = res.carLoad * 1000; + } this.detailData = res; this.tempalateData = res; }); @@ -267,8 +276,9 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime); this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime); - - this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss'); + if (this.detailData.scrapTime) { + this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss'); + } this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime); @@ -280,8 +290,19 @@ export class VehicleComponentsListDetailComponent implements OnInit { this.service.msgSrv.error('发证日期起始不能大于结束日期!'); return; } - this.service.request(this.service.$api_get_update, this.detailData).subscribe(res => { - console.log(res); + + const params = { ...this.detailData }; + if (params.curbWeight) { + params.curbWeight = params.curbWeight / 1000; + } + if (params.carTotalLoad) { + params.carTotalLoad = params.carTotalLoad / 1000; + } + if (params.carLoad) { + params.carLoad = params.carLoad / 1000; + } + + this.service.request(this.service.$api_get_update, params).subscribe(res => { if (res) { this.getDetailList(); this.isEdit = false; diff --git a/src/app/routes/vehicle/components/list/list.component.html b/src/app/routes/vehicle/components/list/list.component.html index 76411827..7c407d3e 100644 --- a/src/app/routes/vehicle/components/list/list.component.html +++ b/src/app/routes/vehicle/components/list/list.component.html @@ -39,12 +39,14 @@ - -
{{ 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 3ffe25b9..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; @@ -207,7 +208,8 @@ export class VehicleComponentsListComponent extends BasicTableComponent implemen this.columns = [ // { title: '', type: 'checkbox', className: 'text-center' }, { title: '车牌号', width: '150px', className: 'text-center', index: 'carNo' }, - { title: '车牌颜色', width: '150px', 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: '运营状态',