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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-05-16 15:36:37 +08:00
parent 2798c7fd45
commit 33e55f471e
4 changed files with 60 additions and 57 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': { '//api': {
target: { target: {
host: 'tms-api-test.eascs.com', host: 'tms-api-dev.eascs.com',
protocol: 'https:', protocol: 'https:',
port: 443 port: 443
}, },

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

@ -165,7 +165,8 @@ export class VehicleComponentsAuditComponent extends BasicTableComponent impleme
this.columns = [ this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' }, // { title: '', type: 'checkbox', className: 'text-center' },
{ title: '车牌号', width: '180px', className: 'text-center', index: 'carNo' }, { 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: 'carLength' },
{ title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' }, { title: '是否挂靠', width: '180px', className: 'text-center', render: 'isSelf' },
{ title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' }, { title: '所有人', width: '180px', className: 'text-center', index: 'carOwner' },

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

@ -73,7 +73,8 @@
<p style="margin-bottom: 0"> <p style="margin-bottom: 0">
车辆基础信息 车辆基础信息
<label *ngIf="detailData?.carInfoVerifyResult" style="color: #ff4d4f"><i nz-icon nzType="info-circle" <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"> nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover [nzPopoverTitle]="titleTemplate1"
[nzPopoverContent]="contentTemplate1">
查看原因 查看原因
<ng-template #titleTemplate1> <ng-template #titleTemplate1>
原因 原因
@ -100,8 +101,8 @@
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option> <nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.value"></nz-option>
</nz-select> --> </nz-select> -->
<input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel" [readonly]="!isEdit" [nzBorderless]="!isEdit" <input nz-input type="text" [(ngModel)]="detailData.carModel ? detailData.carModel : detailData.carModelLabel"
[placeholder]="isEdit ? '' : '-'" /> [readonly]="!isEdit" [nzBorderless]="!isEdit" [placeholder]="isEdit ? '' : '-'" />
</sv> </sv>
<sv label="车长"> <sv label="车长">
<nz-select [(ngModel)]="detailData.carLength" [nzPlaceHolder]="isEdit ? '' : '-'" [nzBorderless]="!isEdit" <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" <input nz-input type="text" [(ngModel)]="detailData.archivesNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'" /> [placeholder]="isEdit ? '' : '-'" />
</sv> </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="行驶证注册日期"> <sv label="行驶证注册日期">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseRegisterTime" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseRegisterTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> --> [placeholder]="isEdit?'':'-'"> -->
@ -166,7 +176,8 @@
<p style="margin-bottom: 0"> <p style="margin-bottom: 0">
行驶证信息 行驶证信息
<label *ngIf="detailData?.driverLicenseVerifyResult" style="color: #ff4d4f"><i nz-icon nzType="info-circle" <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"> nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover [nzPopoverTitle]="titleTemplate2"
[nzPopoverContent]="contentTemplate2">
查看原因 查看原因
<ng-template #titleTemplate2> <ng-template #titleTemplate2>
原因 原因
@ -183,14 +194,8 @@
</div> </div>
<sv-container col="3" class="new-sv-container" labelWidth="140"> <sv-container col="3" class="new-sv-container" labelWidth="140">
<sv label="发动机号码"> <sv label="发动机号码">
<input <input nz-input type="text" [(ngModel)]="detailData.engineNo" [readonly]="!isEdit" [nzBorderless]="!isEdit"
nz-input [placeholder]="isEdit ? '' : '-'" />
type="text"
[(ngModel)]="detailData.engineNo"
[readonly]="!isEdit"
[nzBorderless]="!isEdit"
[placeholder]="isEdit ? '' : '-'"
/>
</sv> </sv>
<sv label="行驶证到期日"> <sv label="行驶证到期日">
<!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@ -237,13 +242,8 @@
[placeholder]="isEdit ? '' : '-'" /> [placeholder]="isEdit ? '' : '-'" />
</sv> </sv>
<sv label="报废日期"> <sv label="报废日期">
<nz-date-picker <nz-date-picker [(ngModel)]="detailData.scrapTime" [nzDisabled]="!isEdit" [nzPlaceHolder]="isEdit ? '' : '-'"
[(ngModel)]="detailData.scrapTime" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit ? 'calendar' : ''">
[nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit ? '' : '-'"
[nzBorderless]="!isEdit"
[nzSuffixIcon]="isEdit ? 'calendar' : ''"
>
</nz-date-picker> </nz-date-picker>
</sv> </sv>
<sv label="总质量"> <sv label="总质量">
@ -275,8 +275,9 @@
<a class="sign"></a> <a class="sign"></a>
<p style="margin-bottom: 0"> <p style="margin-bottom: 0">
道路运输证信息 道路运输证信息
<label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon nzType="info-circle" <label *ngIf="!detailData?.roadTransportVerificationStatus" style="color: #ff4d4f"><i nz-icon
nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover [nzPopoverTitle]="titleTemplate3" [nzPopoverContent]="contentTemplate3"> nzType="info-circle" nzTheme="fill" class="mr-xs"></i>验证不通过：<span nz-popover
[nzPopoverTitle]="titleTemplate3" [nzPopoverContent]="contentTemplate3">
查看原因 查看原因
<ng-template #titleTemplate3> <ng-template #titleTemplate3>
原因 原因
@ -286,8 +287,8 @@
</ng-template> </ng-template>
</span> </span>
</label> </label>
<label *ngIf="detailData?.roadTransportVerificationStatus" style="color: #52c41a"><i nz-icon nzType="check-circle" <label *ngIf="detailData?.roadTransportVerificationStatus" style="color: #52c41a"><i nz-icon
nzTheme="fill" class="mr-xs"></i>验证通过 nzType="check-circle" nzTheme="fill" class="mr-xs"></i>验证通过
</label> </label>
</p> </p>
</div> </div>

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

@ -207,7 +207,8 @@ export class VehicleComponentsListComponent extends BasicTableComponent implemen
this.columns = [ this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' }, // { title: '', type: 'checkbox', className: 'text-center' },
{ title: '车牌号', width: '150px', className: 'text-center', index: 'carNo' }, { 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: '车型-车长-载重', width: '180px', className: 'text-center', render: 'carLength' },
{ {
title: '运营状态', title: '运营状态',