Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
wangshiming
2022-05-16 17:30:06 +08:00
parent e933f8d855 11e8805c94
commit c803a9743f
10 changed files with 416 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proxy.conf.js
View File

@ -30,7 +30,7 @@ module.exports = {
// },
'//api': {
target: {
host: 'tms-api-test.eascs.com',
host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},

11
src/app/routes/commom/less/commom-table.less
View File

@ -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 {}
.height_box {}
.filter-box {
.com-input {
width : 150px;
height: 32PX;
}
}

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

@ -27,10 +27,9 @@
<div class="header_box">
<label class="page_title"> <label class="driver">|</label> 企业列表</label>
<div class="d-flex align-items-center mr-sm">
<div class="mr-md d-flex align-items-center">
<input nz-input placeholder="请输入企业名称" [(ngModel)]="sfValue.enterpriseName" class=" mr-sm"
style="width: 150px;height: 32PX;" />
<input nz-input placeholder="请输入管理员" [(ngModel)]="sfValue.contactName" style="width: 150px;height: 32PX;" />
<div class="mr-md d-flex align-items-center filter-box">
<input nz-input placeholder="请输入企业名称" [(ngModel)]="sfValue.enterpriseName" class="com-input mr-sm" />
<input nz-input placeholder="请输入管理员" [(ngModel)]="sfValue.contactName" class="com-input" />
</div>
<button nz-button nzDanger [nzLoading]="loadingList" (click)="search()" acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
@ -92,7 +91,7 @@
<p nz-tooltip [nzTooltipTitle]="item.partnerName+'/'+item.partnerMobile" style="cursor: pointer;width: 120px;margin: 0; white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;">
{{ item.partnerName ? item.partnerName: '--'}}/{{item.partnerMobile ? item.partnerMobile :'--'}}
{{ item.partnerName ? item.partnerName: '--'}}/{{item.partnerMobile ? item.partnerMobile :'--'}}
</p>
</ng-template>
<ng-template st-row="promotersTelephone" let-item let-index="index">
@ -102,7 +101,7 @@
<p nz-tooltip [nzTooltipTitle]="item.channelName+'/'+item.channelMobile" style="cursor: pointer;width: 120px;margin: 0; white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;">
{{ item.channelName ? item.channelName: '--'}}/{{item.channelMobile ? item.channelMobile :'--'}}
{{ item.channelName ? item.channelName: '--'}}/{{item.channelMobile ? item.channelMobile :'--'}}
</p>
</ng-template>
</st>

3
src/app/routes/vehicle/components/audit/audit.component.ts
View File

@ -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' },

115
src/app/routes/vehicle/components/audit/detail/detail.component.html
View File

@ -73,19 +73,20 @@
<p style="margin-bottom: 0">
车辆基础信息
<label *ngIf="detailData?.carInfoVerifyResult" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover [nzPopoverTitle]="titleTemplate1" [nzPopoverContent]="contentTemplate1">
查看原因
<ng-template #titleTemplate1>
原因
</ng-template>
<ng-template #contentTemplate1>
{{detailData?.carInfoVerifyResult}}
</ng-template>
</span>
nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover [nzPopoverTitle]="titleTemplate1"
[nzPopoverContent]="contentTemplate1">
查看原因
<ng-template #titleTemplate1>
原因
</ng-template>
<ng-template #contentTemplate1>
{{detailData?.carInfoVerifyResult}}
</ng-template>
</span>
</label>
<label *ngIf="!detailData?.carInfoVerifyResult" style="color: #52c41a"><i nz-icon nzType="check-circle"
nzTheme="fill" class="mr-xs"></i>验证通过
</label>
nzTheme="fill" class="mr-xs"></i>验证通过
</label>
</p>
</div>
<sv-container col="3" labelWidth="140">
@ -100,8 +101,8 @@
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select> -->
<input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
<input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
[readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="车长">
<nz-select [(ngModel)]="detailData.carLength" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
@ -150,6 +151,15 @@
<input nz-input type="text" [(ngModel)]="detailData.archivesNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="车辆品牌">
<ng-container *ngIf="isEdit; else carBrandTemplate">
<input nz-input type="text" [(ngModel)]="detailData.carBrand" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</ng-container>
<ng-template #carBrandTemplate>
{{detailData?.carBrand }}
</ng-template>
</sv>
<sv label="行驶证注册日期">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseRegisterTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
@ -165,32 +175,27 @@
<a class="sign"></a>
<p style="margin-bottom: 0">
行驶证信息
<label *ngIf="detailData?.driverLicenseVerifyResult" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover [nzPopoverTitle]="titleTemplate2" [nzPopoverContent]="contentTemplate2">
查看原因
<ng-template #titleTemplate2>
原因
</ng-template>
<ng-template #contentTemplate2>
{{detailData?.driverLicenseVerifyResult}}
</ng-template>
</span>
<label *ngIf="detailData?.driverLicenseVerifyResult" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover [nzPopoverTitle]="titleTemplate2"
[nzPopoverContent]="contentTemplate2">
查看原因
<ng-template #titleTemplate2>
原因
</ng-template>
<ng-template #contentTemplate2>
{{detailData?.driverLicenseVerifyResult}}
</ng-template>
</span>
</label>
<label *ngIf="!detailData?.driverLicenseVerifyResult" style="color: #52c41a"><i nz-icon nzType="check-circle"
nzTheme="fill" class="mr-xs"></i>验证通过
</label>
nzTheme="fill" class="mr-xs"></i>验证通过
</label>
</p>
</div>
<sv-container col="3" class="new-sv-container" labelWidth="140">
<sv label="发动机号码">
<input
nz-input
type="text"
[(ngModel)]="detailData.engineNo"
[readonly]="!isEdit"
[nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'"
/>
<input nz-input type="text" [(ngModel)]="detailData.engineNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="行驶证到期日">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@ -228,25 +233,20 @@
</sv-container>
<sv-container class="new-sv-container" labelWidth="140" col="3">
<sv label="核定载质量（吨）">
<sv label="核定载质量(kg)">
<input nz-input type="text" [(ngModel)]="detailData.carLoad" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="整备质量">
<sv label="整备质量(kg)">
<input nz-input type="text" [(ngModel)]="detailData.curbWeight" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="报废日期">
<nz-date-picker
[(ngModel)]="detailData.scrapTime"
[nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'"
[nzBorderless]="!isEdit"
[nzSuffixIcon]="isEdit ? 'calendar' : ''"
>
</nz-date-picker>
<nz-date-picker [(ngModel)]="detailData.scrapTime" [nzDisabled]="!isEdit" [nzPlaceHolder]="isEdit ? '' : '-'"
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="总质量">
<sv label="总质量(kg)">
<input nz-input type="text" [(ngModel)]="detailData.carTotalLoad" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
@ -275,19 +275,20 @@
<a class="sign"></a>
<p style="margin-bottom: 0">
道路运输证信息
<label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon nzType="info-circle"
nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover [nzPopoverTitle]="titleTemplate3" [nzPopoverContent]="contentTemplate3">
查看原因
<ng-template #titleTemplate3>
原因
</ng-template>
<ng-template #contentTemplate3>
{{detailData?.roadTransportVerifyResult}}
</ng-template>
</span>
<label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon
nzType="info-circle" nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover
[nzPopoverTitle]="titleTemplate3" [nzPopoverContent]="contentTemplate3">
查看原因
<ng-template #titleTemplate3>
原因
</ng-template>
<ng-template #contentTemplate3>
{{detailData?.roadTransportVerifyResult}}
</ng-template>
</span>
</label>
<label *ngIf="detailData?.roadTransportVerificationStatus" style="color: #52c41a"><i nz-icon nzType="check-circle"
nzTheme="fill" class="mr-xs"></i>验证通过
<label *ngIf="detailData?.roadTransportVerificationStatus" style="color: #52c41a"><i nz-icon
nzType="check-circle" nzTheme="fill" class="mr-xs"></i>验证通过
</label>
</p>
</div>
@ -378,4 +379,4 @@
</div>
</div>
</nz-upload>
</ng-template>
</ng-template>

29
src/app/routes/vehicle/components/audit/detail/detail.component.ts
View File

@ -101,6 +101,15 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
id: this.route.snapshot?.params?.id
};
this.service.request(`${this.service.$api_get_operate_getaudit}`, 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;
});
@ -156,8 +165,10 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime);
this.detailData.driverLicenseGetTime = EADateUtil.yearToDateTime(this.detailData?.driverLicenseGetTime);
this.detailData.scrapTime = this.dateTimePickerUtil.format(this.detailData?.scrapTime, 'yyyy-MM-dd HH:mm:ss');
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');
}
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
@ -170,7 +181,19 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
this.service.msgSrv.error('发证日期起始不能大于结束日期！');
return;
}
this.service.request(this.service.$api_get_update_audit, this.detailData).subscribe(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_audit, params).subscribe(res => {
if (res) {
this.getDetailList();
this.isEdit = false;

430
src/app/routes/vehicle/components/list/detail/detail.component.html
View File

@ -1,6 +1,6 @@
<ng-container>
<!-- 页头 -->
<page-header-wrapper [logo]="logo" title="车辆详情" [content]="content">
<page-header-wrapper [logo]="logo" title="车辆详情">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
@ -22,8 +22,12 @@
</sv-title>
</sv-container>
<div class="font-weight-blod text-md detail-title">
<a class="sign"></a>
<span>车辆基础信息</span>
</div>
<sv-container col="3">
<sv-title style="font-weight: 700">车辆基础信息</sv-title>
<!-- <sv-title style="font-weight: 700">车辆基础信息</sv-title> -->
<sv label="车牌号" col="1">
<div style="display: flex;">
<input nz-input type="text" [(ngModel)]="detailData.carNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@ -48,8 +52,8 @@
</nz-select>
</sv>
<sv label="车辆类型">
<input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
<input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
[readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
<!-- <nz-select *ngIf="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
@ -97,118 +101,235 @@
</ng-template>
</page-header-wrapper>
<nz-card>
<sv-container col="3">
<sv-title style="font-weight: 700">行驶证信息</sv-title>
<sv label="档案编号">
<input nz-input type="text" [(ngModel)]="detailData.archivesNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="车辆品牌">
<ng-container *ngIf="isEdit; else carBrandTemplate">
<input nz-input type="text" [(ngModel)]="detailData.carBrand" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</ng-container>
<ng-template #carBrandTemplate>
{{detailData?.carBrand }}
</ng-template>
</sv>
<sv label="行驶证注册日期">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseRegisterTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.driverLicenseRegisterTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
</sv-container>
<div>
<div class="mb-xs common-order-header" nz-row>
<div style="display: flex;">
<button nz-button nzType="primary" style="background-color: green;" nzSize="small"
*ngIf="detailData.networkStatus">
</button>
<button *ngIf="!detailData.networkStatus" nz-button nzType="primary" nzSize="small" nzDanger>未入网</button>
<b class="ml-md" style="font-size: 18px;padding-right: 10px;">车牌号: {{ detailData?.carNo }}</b>
</div>
<div>
<ng-container *ngIf="!isEdit">
<button nz-button nzType="default" nzDanger (click)="ratify()" acl
acl-ability="VEHICLE-LIST-DETAIL-save">修改</button>
</ng-container>
<ng-container *ngIf="isEdit">
<button nz-button nzType="default" (click)="reset()">取消</button>
<button nz-button nzType="default" (click)="save()" nzDanger>保存</button>
</ng-container>
</div>
</div>
</div>
<nz-divider class="divider-margin"></nz-divider>
<div class="mb-lg">
<div class="font-weight-blod text-md detail-title">
<a class="sign"></a>
<span>车辆基础信息</span>
</div>
<sv-container col="3">
<!-- <sv-title style="font-weight: 700">车辆基础信息</sv-title> -->
<sv label="车牌号" col="1">
<div style="display: flex;">
<input nz-input type="text" [(ngModel)]="detailData.carNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
<!-- <div style="display: flex;">
<div *ngIf="detailData.networkStatus"> <span
style="height: 5px; width: 5px; border-radius: 50%; background-color: green;display: inline-block;"></span>
已入网</div>
<div *ngIf="!detailData.networkStatus"><span
style="height: 5px; width: 5px; border-radius: 50%; background-color: red;display: inline-block;"></span>未入网
</div>
</div> -->
</div>
<sv-container col="3">
<sv label="发动机号码">
<input nz-input type="text" [(ngModel)]="detailData.engineNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="行驶证到期日">
<nz-date-picker [(ngModel)]="detailData.driverLicenseEndTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="行驶证签发机关">
<ng-container *ngIf="isEdit; else driverLicenseSigningOrgTemplate">
<input style="width: '300px'" nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg"
</sv>
<sv label="车牌颜色">
<!-- <input nz-input type="text" [(ngModel)]="detailData.carNoColor" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-select [(ngModel)]="detailData.carNoColor" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contenCarNoColor" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select>
</sv>
<sv label="车辆类型">
<input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
[readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</ng-container>
<ng-template #driverLicenseSigningOrgTemplate>
{{detailData?.driverLicenseSigningOrg }}
</ng-template>
</sv>
</sv-container>
<sv-container col="3">
<sv label="行驶证发证日期">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseGetTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
<!-- <nz-select *ngIf="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select> -->
</sv>
<sv label="车长(米)">
<!-- <input nz-input type="text" [(ngModel)]="detailData.carLength" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-select [(ngModel)]="detailData.carLength" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contenCarLength" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select>
</sv>
<sv label="车辆能源类型">
<nz-select [(ngModel)]="detailData.carEnergyType" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contenCarEnergy" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select>
</sv>
<sv label="是否挂靠">
<nz-select [(ngModel)]="detailData.isSelf" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option [nzValue]="false" nzLabel="否"></nz-option>
<nz-option [nzValue]="true" nzLabel="是"></nz-option>
</nz-select>
</sv>
<sv label="是否为挂车">
<nz-select [(ngModel)]="detailData.isTrailer" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option [nzValue]="false" nzLabel="否"></nz-option>
<nz-option [nzValue]="true" nzLabel="是"></nz-option>
</nz-select>
</sv>
</sv-container>
<sv-container col="1">
<sv label="车头照">
<!-- <app-imagelist [imgList]="[detailData?.carFrontPhotoWatermark, detailData?.carFrontPhotoWatermark]"></app-imagelist> -->
<ng-container *ngTemplateOutlet="
uploadTemplate;
context: { image: detailData?.carFrontPhotoWatermark, key: 'carFrontPhotoWatermark', hover: 'PhotoWatermark2' }
">
</ng-container>
</sv>
</sv-container>
</div>
<div class="mb-lg">
<div class="font-weight-blod text-md detail-title">
<a class="sign"></a>
<span>行驶证信息</span>
</div>
<sv-container col="3">
<!-- <sv-title style="font-weight: 700">行驶证信息</sv-title> -->
<sv label="档案编号">
<input nz-input type="text" [(ngModel)]="detailData.archivesNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="车辆品牌">
<ng-container *ngIf="isEdit; else carBrandTemplate">
<input nz-input type="text" [(ngModel)]="detailData.carBrand" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</ng-container>
<ng-template #carBrandTemplate>
{{detailData?.carBrand }}
</ng-template>
</sv>
<sv label="行驶证注册日期">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseRegisterTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.driverLicenseGetTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="车辆识别代码">
<input nz-input type="text" [(ngModel)]="detailData.carDistinguishCode" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="使用性质">
<nz-select [(ngModel)]="detailData.useNature" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option [nzValue]="'2'" nzLabel="货运"></nz-option>
<nz-option [nzValue]="'1'" nzLabel="营运"></nz-option>
<nz-option [nzValue]="'0'" nzLabel="非营运"></nz-option>
</nz-select>
</sv>
</sv-container>
<nz-date-picker [(ngModel)]="detailData.driverLicenseRegisterTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
</sv-container>
<sv-container col="3">
<sv label="核定载质量（吨）">
<input nz-input type="text" [(ngModel)]="detailData.carLoad" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="整备质量">
<input nz-input type="text" [(ngModel)]="detailData.curbWeight" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="报废日期">
<nz-date-picker [(ngModel)]="detailData.scrapTime" [nzDisabled]="!isEdit" [nzPlaceHolder]="isEdit ? '' : '-'"
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="总质量">
<input nz-input type="text" [(ngModel)]="detailData.carTotalLoad" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="所有人">
<ng-container *ngIf="isEdit; else carOwnerTemplate">
<input style="width: '300px'" nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit"
<sv-container col="3">
<sv label="发动机号码">
<input nz-input type="text" [(ngModel)]="detailData.engineNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="行驶证到期日">
<nz-date-picker [(ngModel)]="detailData.driverLicenseEndTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="行驶证签发机关">
<ng-container *ngIf="isEdit; else driverLicenseSigningOrgTemplate">
<input style="width: '300px'" nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg"
[readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</ng-container>
<ng-template #driverLicenseSigningOrgTemplate>
{{detailData?.driverLicenseSigningOrg }}
</ng-template>
</sv>
</sv-container>
<sv-container col="3">
<sv label="行驶证发证日期">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseGetTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.driverLicenseGetTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="车辆识别代码">
<input nz-input type="text" [(ngModel)]="detailData.carDistinguishCode" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</ng-container>
<ng-template #carOwnerTemplate>
{{detailData?.carOwner }}
</ng-template>
</sv>
</sv-container>
<sv-container col="1">
<sv label="行驶证照片">
<ng-container *ngTemplateOutlet="
</sv>
<sv label="使用性质">
<nz-select [(ngModel)]="detailData.useNature" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option [nzValue]="'2'" nzLabel="货运"></nz-option>
<nz-option [nzValue]="'1'" nzLabel="营运"></nz-option>
<nz-option [nzValue]="'0'" nzLabel="非营运"></nz-option>
</nz-select>
</sv>
</sv-container>
<sv-container col="3">
<sv label="核定载质量(kg)">
<input nz-input type="text" [(ngModel)]="detailData.carLoad" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="整备质量(kg)">
<input nz-input type="text" [(ngModel)]="detailData.curbWeight" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="报废日期">
<nz-date-picker [(ngModel)]="detailData.scrapTime" [nzDisabled]="!isEdit" [nzPlaceHolder]="isEdit ? '' : '-'"
[nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="总质量(kg)">
<input nz-input type="text" [(ngModel)]="detailData.carTotalLoad" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="所有人">
<ng-container *ngIf="isEdit; else carOwnerTemplate">
<input style="width: '300px'" nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</ng-container>
<ng-template #carOwnerTemplate>
{{detailData?.carOwner }}
</ng-template>
</sv>
</sv-container>
<sv-container col="1">
<sv label="行驶证照片">
<ng-container *ngTemplateOutlet="
uploadTemplate;
context: { image: detailData?.certificatePhotoFrontWatermark, key: 'certificatePhotoFrontWatermark', hover: 'FrontWatermark' }
">
</ng-container>
<ng-container *ngTemplateOutlet="
</ng-container>
<ng-container *ngTemplateOutlet="
uploadTemplate;
context: { image: detailData?.certificatePhotoBackWatermark, key: 'certificatePhotoBackWatermark', hover: 'BackWatermark' }
">
</ng-container>
</sv>
</sv-container>
<nz-divider></nz-divider>
<sv-container col="3" class="mt16">
<sv-title style="font-weight: 700">
</ng-container>
</sv>
</sv-container>
</div>
<div class="mb-lg">
<div class="font-weight-blod text-md detail-title">
<a class="sign"></a>
<span>道路运输证信息</span>
<label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon
nzType="info-circle" nzTheme="fill" class="mr-xs"></i>验证不通过
</label>
<label *ngIf="detailData?.roadTransportVerificationStatus" style="color: #52c41a"><i nz-icon
nzType="check-circle" nzTheme="fill" class="mr-xs"></i>验证通过
</label>
</div>
<sv-container col="3" class="mt16">
<!-- <sv-title style="font-weight: 700">
<p style="margin-bottom: 0">
道路运输证信息
<label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon
@ -218,58 +339,65 @@
nzType="check-circle" nzTheme="fill" class="mr-xs"></i>验证通过
</label>
</p>
</sv-title>
<sv label="道路运输证号">
<input nz-input type="text" [(ngModel)]="detailData.roadTransportNo" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="经营许可证号">
<input nz-input type="text" [(ngModel)]="detailData.roadTransportLicenceNo" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="发证日期">
<!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
</sv-title> -->
<sv label="道路运输证号">
<input nz-input type="text" [(ngModel)]="detailData.roadTransportNo" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="经营许可证号">
<input nz-input type="text" [(ngModel)]="detailData.roadTransportLicenceNo" [readonly]="!isEdit"
[nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</sv>
<sv label="发证日期">
<!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.roadTransportStartTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="有效期至">
<!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
<nz-date-picker [(ngModel)]="detailData.roadTransportStartTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="有效期至">
<!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.roadTransportEndTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="道路运输证照片">
<!-- <app-imagelist [imgList]="[detailData?.roadTransportPhoto,detailData?.roadTransportPhotoWatermark ]"></app-imagelist> -->
<ng-container *ngTemplateOutlet="
<nz-date-picker [(ngModel)]="detailData.roadTransportEndTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
</nz-date-picker>
</sv>
<sv label="道路运输证照片">
<!-- <app-imagelist [imgList]="[detailData?.roadTransportPhoto,detailData?.roadTransportPhotoWatermark ]"></app-imagelist> -->
<ng-container *ngTemplateOutlet="
uploadTemplate;
context: { image: detailData?.roadTransportPhotoWatermark, key: 'roadTransportPhotoWatermark', hover: 'Watermark' }
">
</ng-container>
</sv>
</sv-container>
<nz-divider></nz-divider>
<sv-container col="2" class="mt16">
</ng-container>
</sv>
</sv-container>
</div>
<div class="mb-lg">
<div class="font-weight-blod text-md detail-title">
<a class="sign"></a>
<span>认证司机</span>
</div>
<!-- <sv-container col="2" class="mt16">
<sv-title style="font-weight: 700">认证司机</sv-title>
</sv-container>
<st #st [bordered]="true" [columns]="columns" [scroll]="{ x: '1200px' }"
[data]="service.$api_get_queryDriverByCarId" [req]="{ method: 'POST', allInBody: true, params: reqParams }"
[res]="{ reName: { list: 'data', total: 'data' } }" [ngStyle]="{ margin: '1rem 0' }" multiSort size="small"
[page]="{ show: false }">
<ng-template st-row="auditStatusEnum" let-item let-index="index">
<div>
<span *ngIf="item?.auditStatusEnum === -1 || item?.auditStatusEnum === '-1'">未上传</span>
<span *ngIf="item?.auditStatusEnum === 0 || item?.auditStatusEnum === '0'">草稿</span>
<span *ngIf="item?.auditStatusEnum === 10 || item?.auditStatusEnum === '10'">待审核</span>
<span *ngIf="item?.auditStatusEnum === 20 || item?.auditStatusEnum === '20'">已审核</span>
<span *ngIf="item?.auditStatusEnum === 30 || item?.auditStatusEnum === '30'">已驳回</span>
<span *ngIf="item?.auditStatusEnum === 40 || item?.auditStatusEnum === '40'">证件过期</span>
</div>
</ng-template>
</st>
</sv-container> -->
<st #st [bordered]="true" [columns]="columns" [scroll]="{ x: '1200px' }"
[data]="service.$api_get_queryDriverByCarId" [req]="{ method: 'POST', allInBody: true, params: reqParams }"
[res]="{ reName: { list: 'data', total: 'data' } }" [ngStyle]="{ margin: '1rem 0' }" multiSort size="small"
[page]="{ show: false }">
<ng-template st-row="auditStatusEnum" let-item let-index="index">
<div>
<span *ngIf="item?.auditStatusEnum === -1 || item?.auditStatusEnum === '-1'">未上传</span>
<span *ngIf="item?.auditStatusEnum === 0 || item?.auditStatusEnum === '0'">草稿</span>
<span *ngIf="item?.auditStatusEnum === 10 || item?.auditStatusEnum === '10'">待审核</span>
<span *ngIf="item?.auditStatusEnum === 20 || item?.auditStatusEnum === '20'">已审核</span>
<span *ngIf="item?.auditStatusEnum === 30 || item?.auditStatusEnum === '30'">已驳回</span>
<span *ngIf="item?.auditStatusEnum === 40 || item?.auditStatusEnum === '40'">证件过期</span>
</div>
</ng-template>
</st>
</div>
</nz-card>
</ng-container>
<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()"
@ -313,4 +441,4 @@
</div>
</div>
</nz-upload>
</ng-template>
</ng-template>

29
src/app/routes/vehicle/components/list/detail/detail.component.ts
View File

@ -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;

6
src/app/routes/vehicle/components/list/list.component.html
View File

@ -39,12 +39,14 @@
</div>
<!-- 数据列表 -->
<st #st [bordered]="true" [scroll]="{ x: '1200px',y:scrollY }" [columns]="columns" [data]="service.$api_get_operate_list"
<st #st [bordered]="true" [scroll]="{ x: '1200px',y:scrollY }" [columns]="columns"
[data]="service.$api_get_operate_list"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
<ng-template st-row="carLength" let-item let-index="index">
<div>{{ item?.carModel ? item?.carModel + '-' : ''}}{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : '' }}-{{
<div>{{ item?.carModel ? item?.carModel + '-' : ''}}{{ item?.carLengthLabel ? item?.carLengthLabel + '米' : ''
}}-{{
item?.carLoad ? item?.carLoad + '吨' : ''
}}</div>
</ng-template>

12
src/app/routes/vehicle/components/list/list.component.ts
View File

@ -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: '运营状态',