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

fix bug

Browse Source
This commit is contained in:
wangshiming
2021-12-15 20:24:24 +08:00
parent 7f65ee67ec
commit 3ba6d074cb
11 changed files with 294 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -591,7 +591,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.sf1data.id = res?.id; this.sf1data.id = res?.id;
} }
res?.unLoadingPlaceVOList.forEach((element: any) => { res?.unLoadingPlaceVOList.forEach((element: any) => {
if(element.type === 1) { if(element.type === 1 || element.type === '1') {
const controlId = this.startInfo.length; const controlId = this.startInfo.length;
if(this.PageStatus === '大宗修改') { if(this.PageStatus === '大宗修改') {
this.startInfo.push({ this.startInfo.push({
@ -626,7 +626,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required));
} else if(element.type === 2) { } else if(element.type === 2 || element.type === '2') {
const controlId = this.endInfo.length; const controlId = this.endInfo.length;
if( this.PageStatus === '大宗修改') { if( this.PageStatus === '大宗修改') {
this.endInfo.push({ this.endInfo.push({

4
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -35,7 +35,7 @@
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i ><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
></span> ></span>
<span <span
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)">X</i ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
></span> ></span>
</div> </div>
</nz-form-control> </nz-form-control>
@ -77,7 +77,7 @@
</nz-input-group> </nz-input-group>
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span> <span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
<span <span
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)">X</i ><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
></span> ></span>
</div> </div>
</nz-form-control> </nz-form-control>

26
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -694,25 +694,25 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
nzWidth: 900, nzWidth: 900,
nzOnOk: item => { nzOnOk: item => {
const poi = item.poi; const poi = item.poi;
const locList = poi.location.toString().split(','); const locList = poi.pois;
switch (type) { switch (type) {
case 'start': case 'start':
this.startInfo[index].detailedAddress = poi.district + poi.name; this.startInfo[index].detailedAddress = poi.formattedAddress;
this.startInfo[index].longitude = locList[0]; this.startInfo[index].longitude = locList[0];
this.startInfo[index].latitude = locList[1]; this.startInfo[index].latitude = locList[1];
this.startInfo[index].province = poi.cityInfo.province; this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.cityInfo.city; this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.cityInfo.district; this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.name; this.startInfo[index].address = poi.formattedAddress;
break; break;
case 'end': case 'end':
this.endInfo[index].detailedAddress = poi.district + poi.name; this.endInfo[index].detailedAddress = poi.formattedAddress;
this.endInfo[index].longitude = locList[0]; this.endInfo[index].longitude = locList[0];
this.endInfo[index].latitude = locList[1]; this.endInfo[index].latitude = locList[1];
this.endInfo[index].province = poi.cityInfo.province; this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.cityInfo.city; this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.cityInfo.district; this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.name; this.endInfo[index].address = poi.formattedAddress;
break; break;
default: default:
break; break;
@ -753,7 +753,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.sf1data.id = res?.id; this.sf1data.id = res?.id;
} }
res?.unLoadingPlaceVOList.forEach((element: any) => { res?.unLoadingPlaceVOList.forEach((element: any) => {
if(element.type === 1) { if(element.type === 1 || element.type === '1') {
const controlId = this.startInfo.length; const controlId = this.startInfo.length;
if(this.PageStatus === '整车修改') { if(this.PageStatus === '整车修改') {
this.startInfo.push({ this.startInfo.push({
@ -785,7 +785,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required)); this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required));
} else if(element.type === 2) { } else if(element.type === 2 || element.type === '2') {
const controlId = this.endInfo.length; const controlId = this.endInfo.length;
if(this.PageStatus === '整车修改') { if(this.PageStatus === '整车修改') {
this.endInfo.push({ this.endInfo.push({

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

@ -28,16 +28,47 @@
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="车牌颜色"> <sv label="车牌颜色">
<input nz-input type="text" [(ngModel)]="detailData.carNoColor" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.carNoColor" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="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>
<sv label="车型"> <sv label="车型">
<input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'"> -->
<nz-select [(ngModel)]="detailData.carModel" [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>
<sv label="车长"> <sv label="车长(米)">
<input nz-input type="text" [(ngModel)]="detailData.carLength" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.carLength" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="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.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>
<sv label="是否为挂车"> <sv label="是否为挂车">
<nz-select [(ngModel)]="detailData.isTrailer" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" <nz-select [(ngModel)]="detailData.isTrailer" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
@ -51,7 +82,7 @@
<sv label="车头照"> <sv label="车头照">
<!-- <app-imagelist [imgList]="[detailData?.carFrontPhotoWatermark, detailData?.carFrontPhotoWatermark]"></app-imagelist> --> <!-- <app-imagelist [imgList]="[detailData?.carFrontPhotoWatermark, detailData?.carFrontPhotoWatermark]"></app-imagelist> -->
<ng-container <ng-container
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.carFrontPhotoWatermark,key:'carFrontPhotoWatermark'}"> *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.carFrontPhoto,key:'carFrontPhoto'}">
</ng-container> </ng-container>
</sv> </sv>
</sv-container> </sv-container>
@ -65,19 +96,31 @@
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="准驾车型"> <sv label="准驾车型">
<input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.carModel" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'"> -->
<nz-select [(ngModel)]="detailData.carModel" [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>
<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?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.driverLicenseRegisterTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv> </sv>
</sv-container> </sv-container>
<sv-container col="2"> <sv-container col="2">
<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"
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.driverLicenseEndTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv> </sv>
<sv label="行驶证签发机关"> <sv label="行驶证签发机关">
<input nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit" <input nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@ -87,8 +130,10 @@
<sv-container col="3"> <sv-container col="3">
<sv label="行驶证发证日期"> <sv label="行驶证发证日期">
<input nz-input type="text" [(ngModel)]="detailData.driverLicenseGetTime" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.driverLicenseGetTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.driverLicenseGetTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv> </sv>
<sv label="车辆识别代码"> <sv label="车辆识别代码">
<input nz-input type="text" [(ngModel)]="detailData.carDistinguishCode" [readonly]="!isEdit" [nzBorderless]="!isEdit" <input nz-input type="text" [(ngModel)]="detailData.carDistinguishCode" [readonly]="!isEdit" [nzBorderless]="!isEdit"
@ -97,8 +142,8 @@
<sv label="使用性质"> <sv label="使用性质">
<nz-select [(ngModel)]="detailData.useNature" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" <nz-select [(ngModel)]="detailData.useNature" [nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit"
[nzShowArrow]="isEdit" [nzDisabled]="!isEdit"> [nzShowArrow]="isEdit" [nzDisabled]="!isEdit">
<nz-option [nzValue]="1" nzLabel="营运"></nz-option> <nz-option [nzValue]="'1'" nzLabel="营运"></nz-option>
<nz-option [nzValue]="0" nzLabel="非营运"></nz-option> <nz-option [nzValue]="'0'" nzLabel="非营运"></nz-option>
</nz-select> </nz-select>
</sv> </sv>
</sv-container> </sv-container>
@ -118,14 +163,10 @@
</sv> </sv>
</sv-container> </sv-container>
<sv-container col="1"> <sv-container col="1">
<sv label="自有载具">
<input nz-input type="text" [(ngModel)]="detailData.contactsName" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
</sv>
<sv label="行驶证照片"> <sv label="行驶证照片">
<!-- <app-imagelist [imgList]="[detailData?.certificatePhotoFront,detailData?.certificatePhotoBack,detailData?.certificatePhotoFrontWatermark,detailData?.certificatePhotoBackWatermark]"></app-imagelist> --> <!-- <app-imagelist [imgList]="[detailData?.certificatePhotoFront,detailData?.certificatePhotoBack,detailData?.certificatePhotoFrontWatermark,detailData?.certificatePhotoBackWatermark]"></app-imagelist> -->
<ng-container <ng-container
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoFront,key:'carFrontPhotoWatermark'}"> *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoFront,key:'certificatePhotoFront'}">
</ng-container> </ng-container>
</sv> </sv>
</sv-container> </sv-container>
@ -141,17 +182,21 @@
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'">
</sv> </sv>
<sv label="发证日期"> <sv label="发证日期">
<input nz-input type="text" [(ngModel)]="detailData.roadTransportStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportStartTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.roadTransportStartTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv> </sv>
<sv label="有效期至"> <sv label="有效期至">
<input nz-input type="text" [(ngModel)]="detailData.roadTransportEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit" <!-- <input nz-input type="text" [(ngModel)]="detailData.roadTransportEndTime" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'"> [placeholder]="isEdit?'':'-'"> -->
<nz-date-picker [(ngModel)]="detailData.roadTransportEndTime" [nzDisabled]="!isEdit"
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv> </sv>
<sv label="道路运输证照片"> <sv label="道路运输证照片">
<!-- <app-imagelist [imgList]="[detailData?.roadTransportPhoto,detailData?.roadTransportPhotoWatermark ]"></app-imagelist> --> <!-- <app-imagelist [imgList]="[detailData?.roadTransportPhoto,detailData?.roadTransportPhotoWatermark ]"></app-imagelist> -->
<ng-container <ng-container
*ngTemplateOutlet="uploadTemplate;context:{image:detailData?.certificatePhotoFront,key:'carFrontPhotoWatermark'}"> *ngTemplateOutlet="uploadTemplate;context:{image:detailData?.roadTransportPhoto,key:'roadTransportPhoto'}">
</ng-container> </ng-container>
</sv> </sv>
</sv-container> </sv-container>

145
src/app/routes/vehicle/components/list/detail/detail.component.less
View File

@ -1,40 +1,115 @@
@import '~@delon/theme/index';
:host { :host {
::ng-deep { ::ng-deep {
.ant-steps-dot {
.ant-steps-item-content { .sv__label,
.sv__detail {
line-height: 30px;
}
.edit-box {
input {
max-width: 250px;
}
nz-date-picker {
min-width: 250px;
}
}
.readOnly-box {
input {
padding-left: 0;
color : #000;
}
nz-select-top-control {
padding-left: 0 !important;
}
}
.ant-select {
min-width: 250px;
nz-select-top-control {
color : #000 !important;
cursor: text !important;
}
}
// 图片展示工具样式改造
.ant-upload.ant-upload-disabled {
cursor: pointer;
}
.ant-upload.ant-upload-select-picture-card {
width : 200px;
height: 160px;
}
.ant-upload-picture-card-wrapper {
width: auto;
}
}
}
.image-hover {
.delete-icon {
position : absolute;
top : -15px;
right : -15px;
color : #F55656;
font-size : 28px;
background-color: #fff;
border-radius : 50%;
cursor : pointer;
}
.show-icon {
color : #fff;
font-size: 30px;
cursor : pointer;
}
}
.image-hover:hover .mask {
opacity: 0.8;
}
.mask {
position : absolute;
width : 200px;
height : 160px;
margin-top : -160px;
background-color : #4F4F4F;
// top : 6px;
// left : 12px;
border-radius : 6px;
opacity : 0;
}
.mask-over {
position : absolute;
display : flex;
align-items : center;
justify-content : center;
width : 200px;
height : 160px;
margin-top : -160px;
// top : 6px;
// left : 12px;
border-radius : 6px;
label {
color : #FFF;
font-size : 20px;
line-height : 24px;
letter-spacing: 0.7px;
}
}
input {
width: 200px; width: 200px;
} }
.ant-steps-item-icon { .sv__container {
margin-left: 96px; padding-top: 10px;
}
.ant-steps-item-tail::after {
margin-left: 40px;
}
}
.success {
color: @success-color;
}
.warning {
color: @warning-color;
}
.error {
color: @error-color;
}
}
.mt16 {
margin-top: 16px;
}
.user-info {
display: flex;
font-size: 16px;
.enterprise-name {
margin-right: 15px;
}
.user-info-des {
margin-bottom: 5px;
}
}
} }

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

@ -27,7 +27,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
modalName = ''; modalName = '';
ui!: SFUISchema; ui!: SFUISchema;
columns!: STColumn[]; columns!: STColumn[];
uploadURl = apiConf.waterFileUpload; uploadURl = apiConf.fileUpload;
schema!: SFSchema; schema!: SFSchema;
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
schema1!: SFSchema; schema1!: SFSchema;
@ -35,8 +35,11 @@ export class VehicleComponentsListDetailComponent implements OnInit {
validData: any = ['suppliersType']; validData: any = ['suppliersType'];
suppliersData: any = {}; suppliersData: any = {};
disabledUpload = false; disabledUpload = false;
detailData: any = this.getDetailList(); detailData: any = this.initData();
tempalateData :any; tempalateData :any;
contenCarNoColor: any;
contencarModel: any;
contenCarLength: any;
constructor( constructor(
private http: _HttpClient, private http: _HttpClient,
@ -49,6 +52,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
) {} ) {}
ngOnInit() { ngOnInit() {
this.getSelectList();
this.getDetailList(); this.getDetailList();
this.initSF(); this.initSF();
this.initSF1(); this.initSF1();
@ -145,13 +149,34 @@ export class VehicleComponentsListDetailComponent implements OnInit {
}; };
} }
// 获取录单员 // 获取录单员
getSelectList() {
this.Serveice("CarColor")
this.Serveice("CarModel")
this.Serveice("CarLength")
}
Serveice(param :any) {
let value: any;
this.service.request(`${this.service.$api_get_getDictValue}`,
{
dictKey: param
}).subscribe((res) => {
if(param === 'CarColor') {
this.contenCarNoColor = res;
} else if(param === 'CarModel') {
this.contencarModel = res;
} else if(param === 'CarLength') {
this.contenCarLength = res;
}
})
return value;
}
// 获取录单员
getDetailList() { getDetailList() {
console.log( this.route.snapshot?.params?.id) console.log( this.route.snapshot?.params?.id)
const params = { const params = {
id: this.route.snapshot?.params?.id id: this.route.snapshot?.params?.id
}; };
this.service.request(`${this.service.$api_get_operate_get}`, params).subscribe((res) => { this.service.request(`${this.service.$api_get_operate_get}`, params).subscribe((res) => {
console.log(res)
this.detailData = res; this.detailData = res;
this.tempalateData = res; this.tempalateData = res;
}) })
@ -170,7 +195,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
*查看评价 *查看评价
*/ */
viewEvaluate(item: any) { viewEvaluate(item: any) {
this.modal.createStatic(VehicleImgViewComponent, { i: { imgUrl: item } }).subscribe(() => { this.modal.createStatic(VehicleImgViewComponent, { i: item } ).subscribe(() => {
// this.st.reload(); // this.st.reload();
}); });
} }
@ -178,7 +203,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
*查看评价 *查看评价
*/ */
updateEvaluate(item: any) { updateEvaluate(item: any) {
this.modal.createStatic(VehicleComponentsListEditComponent, { i: { item }, infoData: item }).subscribe(() => { this.modal.createStatic(VehicleComponentsListEditComponent, { i: item }).subscribe(() => {
// this.st.reload(); // this.st.reload();
// this.getInfo(); // this.getInfo();
}); });
@ -192,10 +217,11 @@ export class VehicleComponentsListDetailComponent implements OnInit {
changeUpload({ file, fileList, type }: any, key: string) { changeUpload({ file, fileList, type }: any, key: string) {
console.log({ file, fileList, type }); console.log({ file, fileList, type });
if (type === 'success') { if (type === 'success') {
this.detailData[key] = file.response.data.fullFileWatermarkPath; this.detailData[key] = file.response.data.fullFilePath;
} }
} }
deleteImg(key: string) { deleteImg(key: string) {
console.log(key)
this.nzModalService.warning({ this.nzModalService.warning({
nzTitle: '是否确认删除该图片', nzTitle: '是否确认删除该图片',
nzOnOk: () => { nzOnOk: () => {
@ -222,6 +248,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
save() { save() {
this.isEdit = false; this.isEdit = false;
console.log(this.detailData)
} }
private initData() { private initData() {
return { return {

23
src/app/routes/vehicle/components/list/img-view/img-view.component.html
View File

@ -1,16 +1,31 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-07 17:30:18 * @Date: 2021-12-07 17:30:18
* @LastEditTime: 2021-12-07 17:32:06 * @LastEditTime: 2021-12-15 17:39:01
* @LastEditors: your name * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.html
-->
<!--
* @Author: your name
* @Date: 2021-12-07 17:30:18
* @LastEditTime: 2021-12-15 17:34:07
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.html * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.html
--> -->
<div class="modal-header"> <div class="modal-header">
<div class="modal-title">查看协议</div> <div class="modal-title">查看协议</div>
</div> </div>
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin> <div class="text-center">
<div class="text-center"><img [src]="i.imgUrl" /></div> {{this.i?.carProtocal}}
</div>
<div *nzModalFooter>
<button nz-button nzType="default" (click)="cancel">取消</button>
<button nz-button nzType="primary" (click)="cancel">确定</button>
<button nz-button nzType="default" >驳回</button>
<button nz-button nzType="primary" (click)="cancel">通过</button>
</div>
<style> <style>
.text-center img { .text-center img {
max-width: 100%; max-width: 100%;

4
src/app/routes/vehicle/components/list/img-view/img-view.component.ts
View File

@ -14,12 +14,12 @@ export class VehicleImgViewComponent implements OnInit {
constructor(private modal: NzModalRef, public msgSrv: NzMessageService, public http: _HttpClient) {} constructor(private modal: NzModalRef, public msgSrv: NzMessageService, public http: _HttpClient) {}
ngOnInit(): void { ngOnInit(): void {
console.log(this.i.imgUrl, 66666666666); console.log(this.i?.carProtocal, 66666666666);
// this.http.get(`/user/${this.record.id}`).subscribe(res => this.i = res); // this.http.get(`/user/${this.record.id}`).subscribe(res => this.i = res);
} }
close() { cancel() {
this.modal.destroy(); this.modal.destroy();
} }
} }

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

@ -1,7 +1,7 @@
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-11-29 15:22:34 * @Date: 2021-11-29 15:22:34
* @LastEditTime: 2021-12-10 10:48:13 * @LastEditTime: 2021-12-15 16:38:35
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
@ -60,13 +60,11 @@
[loading]="service.http.loading" [loading]="service.http.loading"
> >
<ng-template st-row="carLength" let-item let-index="index"> <ng-template st-row="carLength" let-item let-index="index">
<div>{{item?.carModel}}-{{item?.carLength? item?.carLength + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div> <div>{{item?.carModelLabel }}-{{item?.carLengthLabel? item?.carLengthLabel + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div>
</ng-template> </ng-template>
<ng-template st-row="contactsPhone" let-item let-index="index"> <ng-template st-row="isSelf" let-item let-index="index">
<div <div>
style="color: #52c41a;" (click)="daoyun(item)" {{ item?.isSelf ? '是' : '否' }}
>
{{ item.contactsPhone }}
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="stateCol" let-item let-index="index"> <ng-template st-row="stateCol" let-item let-index="index">

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

@ -78,12 +78,15 @@ export class VehicleComponentsListComponent implements OnInit {
params: { dictKey: 'CarColor' }, params: { dictKey: 'CarColor' },
}, },
}, },
carLength2: { carStatus: {
title: '运营状态', title: '运营状态',
type: 'string', type: 'string',
enum: [
{ label: '空闲', value: 0 },
{ label: '运输中', value: 1 },
],
ui: { ui: {
widget: 'dict-select', widget: 'select',
params: { dictKey: 'CarColor' },
visibleIf: { visibleIf: {
expand: (value: boolean) => value, expand: (value: boolean) => value,
}, },
@ -94,7 +97,7 @@ export class VehicleComponentsListComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'CarColor' }, params: { dictKey: 'CarModel' },
visibleIf: { visibleIf: {
expand: (value: boolean) => value, expand: (value: boolean) => value,
}, },
@ -105,7 +108,7 @@ export class VehicleComponentsListComponent implements OnInit {
type: 'string', type: 'string',
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'CarColor' }, params: { dictKey: 'CarLength' },
visibleIf: { visibleIf: {
expand: (value: boolean) => value, expand: (value: boolean) => value,
}, },
@ -118,24 +121,27 @@ export class VehicleComponentsListComponent implements OnInit {
expand: (value: boolean) => value, expand: (value: boolean) => value,
}, },
}, },
isTrailer: { isSelf: {
type: 'string', type: 'string',
title: '是否挂靠', title: '是否挂靠',
enum: [
{ label: '是', value: true },
{ label: '否', value: false },
],
ui: { ui: {
widget: 'dict-select', widget: 'select',
params: { dictKey: 'Whether' },
visibleIf: { visibleIf: {
expand: (value: boolean) => value, expand: (value: boolean) => value,
}, },
}, },
}, },
isDriverLicenseExpire: { driverLicenseStatus: {
type: 'string', type: 'string',
title: '行驶证到期状态', title: '行驶证到期状态',
enum: [ enum: [
{ label: '正常', value: 0 }, { label: '正常', value: 1 },
{ label: '冻结', value: 1 }, { label: '即将到期', value: 2 },
{ label: '废弃', value: 2 }, { label: '已到期', value: 3},
], ],
default: '', default: '',
ui: { ui: {
@ -145,12 +151,16 @@ export class VehicleComponentsListComponent implements OnInit {
}, },
}, },
}, },
isRoadTransportExpire: { roadTransportStatus: {
type: 'string', type: 'string',
title: '驾驶证到期状态', title: '驾驶证到期状态',
enum: [
{ label: '正常', value: 1 },
{ label: '即将到期', value: 2 },
{ label: '已到期', value: 3},
],
ui: { ui: {
widget: 'dict-select', widget: 'select',
params: { dictKey: 'CarColor' },
visibleIf: { visibleIf: {
expand: (value: boolean) => value, expand: (value: boolean) => value,
}, },
@ -165,38 +175,39 @@ export class VehicleComponentsListComponent implements OnInit {
this.columns = [ this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' }, // { title: '', type: 'checkbox', className: 'text-center' },
{ title: '车牌号', className: 'text-center', index: 'carNo' }, { title: '车牌号', className: 'text-center', index: 'carNo' },
{ title: '车牌颜色', className: 'text-center', index: 'carNoColor' }, { title: '车牌颜色', className: 'text-center', index: 'carNoColorLabel' },
{ title: '车型-车长-载重', className: 'text-center', render: 'carLength' }, { title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
{ title: '运营状态', className: 'text-center', index: 'effectiveDateStr', { title: '运营状态', className: 'text-center', index: 'carStatus',
type: 'badge', type: 'badge',
badge: { badge: {
正常: { text: '空闲', color: 'success' }, true: { text: '运输中', color: 'success' },
冻结: { text: '运输中', color: 'warning' }, false: { text: '空闲', color: 'default' },
废弃: { text: '废弃', color: 'default' },
}, },
}, },
{ {
title: '行驶证到期状态', title: '行驶证到期状态',
className: 'text-center', className: 'text-center',
index: 'isDriverLicenseExpire', index: 'driverLicenseStatus',
type: 'badge', type: 'badge',
badge: { badge: {
false: { text: '否', color: 'success' }, 1: { text: '正常', color: 'success' },
true: { text: '是', color: 'warning' }, 2: { text: '即将到期', color: 'warning' },
3: { text: '已到期', color: 'error' },
}, },
}, },
{ {
title: '道运证到期状态', title: '道运证到期状态',
className: 'text-center', className: 'text-center',
index: 'isRoadTransportExpire', index: 'roadTransportStatus',
type: 'badge', type: 'badge',
badge: { badge: {
false: { text: '否', color: 'success' }, 1: { text: '正常', color: 'success' },
true: { text: '是', color: 'warning' }, 2: { text: '即将到期', color: 'warning' },
3: { text: '已到期', color: 'error' },
}, },
}, },
{ title: '所有人', className: 'text-center', index: 'carOwner' }, { title: '所有人', className: 'text-center', index: 'carOwner' },
{ title: '是否挂靠', className: 'text-center', index: 'isTrailer', }, { title: '是否挂靠', className: 'text-center', render: 'isSelf', },
{ title: '挂靠协议', className: 'text-center', index: 'carNo' }, { title: '挂靠协议', className: 'text-center', index: 'carNo' },
{ {

4
src/app/routes/vehicle/services/vehicle.service.ts
View File

@ -1,7 +1,7 @@
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-29 15:22:34 * @Date: 2021-11-29 15:22:34
* @LastEditTime: 2021-12-10 15:35:40 * @LastEditTime: 2021-12-15 16:58:21
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts * @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts
@ -24,6 +24,8 @@ export class VehicleService extends BaseService {
$api_get_operate_get = `/api/mdc/cuc/carLicense/operate/get`; $api_get_operate_get = `/api/mdc/cuc/carLicense/operate/get`;
// 获取车辆认证司机列表 // 获取车辆认证司机列表
$api_get_queryDriverByCarId = `/api/mdc/cuc/userCarLicense/operate/queryDriverByCarId`; $api_get_queryDriverByCarId = `/api/mdc/cuc/userCarLicense/operate/queryDriverByCarId`;
// 详情需要的下拉框数据
$api_get_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`;
constructor(public injector: Injector) { constructor(public injector: Injector) {
super(injector); super(injector);