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-03-02 14:30:37 +08:00
parent 62e15f69ea
commit ab6f1c6865
13 changed files with 232 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ import { VehicleService } from '../../../services/vehicle.service';
import { EADateUtil } from '@shared';
import { VehicleImgViewComponent } from '../../list/img-view/img-view.component';
import { VehicleComponentsListEditComponent } from '../../list/edit/edit.component';
import { NzImageService } from 'ng-zorro-antd/image';
@Component({
selector: 'app-Vehicle-components-Audit-detail',
@ -25,7 +26,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
@ViewChild('redectModal', { static: false }) redectModal!: any;
columns!: STColumn[];
detailData: any = this.initData();
tempalateData :any;
tempalateData: any;
contenCarNoColor: any;
contencarModel: any;
contenCarLength: any;
@ -33,21 +34,26 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
approvalOpinion = '';
uploadURl = apiConf.waterFileUpload;
disabledUpload = false;
constructor(public service: VehicleService, private route: ActivatedRoute, private nzModalService: NzModalService, private modal: ModalHelper,) {}
constructor(
public service: VehicleService,
private route: ActivatedRoute,
private nzModalService: NzModalService,
private modal: ModalHelper,
private nzImageService: NzImageService
) {}
ngOnInit() {
this.getSelectList();
console.log(this.route.snapshot.params)
this.getDetailList();
this.initST();
}
initST() {
this.columns = [
{ title: '司机姓名', index: 'name', className: 'text-center' },
{ title: '司机手机号', index: 'mobile', className: 'text-center' },
{ title: '身份证号', index: 'idCardNo', className: 'text-center' },
{ title: '挂靠协议', render: 'auditStatusEnum', className: 'text-center' },
{ title: '司机姓名', index: 'name', className: 'text-center' },
{ title: '司机手机号', index: 'mobile', className: 'text-center' },
{ title: '身份证号', index: 'idCardNo', className: 'text-center' },
{ title: '挂靠协议', render: 'auditStatusEnum', className: 'text-center' },
{
title: '车主申明/挂靠协议',
fixed: 'right',
@ -56,21 +62,20 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
buttons: [
{
text: '查看协议',
click: (_record) => this.viewEvaluate(_record),
iif: item => item.auditStatusEnum == 10 || item.auditStatusEnum == 20,
click: _record => this.viewEvaluate(_record),
iif: item => item.auditStatusEnum == 10 || item.auditStatusEnum == 20
},
{
text: '上传协议',
click: (_record) => this.updateEvaluate(_record),
iif: item => item.auditStatusEnum == -1,
},
click: _record => this.updateEvaluate(_record),
iif: item => item.auditStatusEnum == -1
}
]
}
];
}
getDetailList() {
console.log(this.route.snapshot.queryParams.carId);
const params = {
id: this.route.snapshot?.params?.id
};
@ -88,7 +93,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
this.adjuctUser(
{
approvalStatus: 20,
id: this.route.snapshot?.params?.id,
id: this.route.snapshot?.params?.id
},
'审核成功'
);
@ -125,23 +130,21 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
save() {
this.isEdit = false;
this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime)
this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime);
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime)
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime);
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime)
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime);
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime)
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime)
console.log(this.detailData)
this.service.request(this.service.$api_get_update_audit, this.detailData).subscribe((res)=>{
console.log(res)
if(res) {
this.getDetailList()
this.service.msgSrv.success('修改成功！')
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
this.service.request(this.service.$api_get_update_audit, this.detailData).subscribe(res => {
if (res) {
this.getDetailList();
this.service.msgSrv.success('修改成功！');
}
})
});
}
ratify() {
@ -149,7 +152,6 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
}
changeUpload({ file, fileList, type }: any, key: string) {
console.log({ file, fileList, type });
if (type === 'success') {
this.detailData[key] = file.response.data.fullFileWatermarkPath;
}
@ -158,18 +160,19 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
goBack() {
window.history.go(-1);
}
/**
/**
* 查询参数
*/
get reqParams() {
return { id: this.route.snapshot.queryParams.carId };
}
get reqParams() {
return { id: this.route.snapshot.queryParams.carId };
}
showImg(url: any) {
const params = {
imgList: [url],
index: 0
};
this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
this.nzImageService.preview([{ src: url }]);
// this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
}
deleteImg(key: string) {
@ -218,38 +221,39 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
carFrontPhotoWatermark: ''
};
}
// 获取录单员
getSelectList() {
this.Serveice("car:color")
this.Serveice("car:model")
this.Serveice("car:length")
}
Serveice(param :any) {
let value: any;
this.service.request(`${this.service.$api_get_getDictValue}`,
{
// 获取录单员
getSelectList() {
this.Serveice('car:color');
this.Serveice('car:model');
this.Serveice('car:length');
}
Serveice(param: any) {
let value: any;
this.service
.request(`${this.service.$api_get_getDictValue}`, {
dictKey: param
}).subscribe((res) => {
if(param === 'car:color') {
})
.subscribe(res => {
if (param === 'car:color') {
this.contenCarNoColor = res;
} else if(param === 'car:model') {
} else if (param === 'car:model') {
this.contencarModel = res;
} else if(param === 'car:length') {
} else if (param === 'car:length') {
this.contenCarLength = res;
}
})
return value;
}
viewEvaluate(item: any) {
this.modal.createStatic(VehicleImgViewComponent, { i: item } ).subscribe((i) => {
this.st.reload();
this.getDetailList()
});
}
updateEvaluate(item: any) {
this.modal.createStatic(VehicleComponentsListEditComponent, { i: item }).subscribe((i) => {
this.st.reload();
this.getDetailList()
});
}
return value;
}
viewEvaluate(item: any) {
this.modal.createStatic(VehicleImgViewComponent, { i: item }).subscribe(i => {
this.st.reload();
this.getDetailList();
});
}
updateEvaluate(item: any) {
this.modal.createStatic(VehicleComponentsListEditComponent, { i: item }).subscribe(i => {
this.st.reload();
this.getDetailList();
});
}
}

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

@ -11,11 +11,12 @@ import { apiConf } from '@conf/api.conf';
import { NzModalService } from 'ng-zorro-antd/modal';
import { ImageViewComponent } from 'src/app/shared/components/imagelist';
import { EADateUtil } from '@shared';
import { NzImageService } from 'ng-zorro-antd/image';
@Component({
selector: 'app-supplier-components-list-view',
templateUrl: './detail.component.html',
styleUrls: ['./detail.component.less'],
styleUrls: ['./detail.component.less']
})
export class VehicleComponentsListDetailComponent implements OnInit {
i: any;
@ -36,7 +37,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
suppliersData: any = {};
disabledUpload = false;
detailData: any = this.initData();
tempalateData :any;
tempalateData: any;
contenCarNoColor: any;
contencarModel: any;
contenCarLength: any;
@ -49,6 +50,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
private modalHelper: ModalHelper,
private msgSrv: NzMessageService,
private nzModalService: NzModalService,
private nzImageService: NzImageService
) {}
ngOnInit() {
@ -57,14 +59,13 @@ export class VehicleComponentsListDetailComponent implements OnInit {
this.initSF();
this.initSF1();
this.initST();
}
/**
/**
* 查询参数
*/
get reqParams() {
return { id: this.route.snapshot?.params?.id };
}
get reqParams() {
return { id: this.route.snapshot?.params?.id };
}
/**
* 初始化查询表单
*/
@ -77,17 +78,17 @@ export class VehicleComponentsListDetailComponent implements OnInit {
type: 'string',
ui: {
widget: 'date',
format: 'yyyy-MM-dd 00:00:00',
format: 'yyyy-MM-dd 00:00:00'
// hidden: this.modalName === 'effectiveDate' ? false : true,
} as SFDateWidgetSchema,
},
} as SFDateWidgetSchema
}
},
required: ['effectiveDate'],
required: ['effectiveDate']
};
this.ui = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
}
initST() {
this.columns =[
this.columns = [
{ title: '司机姓名', index: 'name', width: 300, className: 'text-center' },
{ title: '司机手机号', index: 'mobile', width: 300, className: 'text-center' },
{ title: '挂靠协议', render: 'auditStatusEnum', className: 'text-center' },
@ -100,17 +101,17 @@ export class VehicleComponentsListDetailComponent implements OnInit {
buttons: [
{
text: '查看协议',
click: (_record) => this.viewEvaluate(_record),
iif: item => item.auditStatusEnum == 10 || item.auditStatusEnum == 20,
click: _record => this.viewEvaluate(_record),
iif: item => item.auditStatusEnum == 10 || item.auditStatusEnum == 20
},
{
text: '上传协议',
click: (_record) => this.updateEvaluate(_record),
iif: item => item.auditStatusEnum == -1,
},
],
},
]
click: _record => this.updateEvaluate(_record),
iif: item => item.auditStatusEnum == -1
}
]
}
];
}
initSF1() {
this.schema1 = {
@ -121,7 +122,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
title: '类型',
enum: [
{ label: '非外部供应商', value: 0 },
{ label: '外部供应商', value: 1 },
{ label: '外部供应商', value: 1 }
],
default: '',
ui: {
@ -136,85 +137,81 @@ export class VehicleComponentsListDetailComponent implements OnInit {
this.suppliersData.externalSuppliersId = '';
}
this.initSF1();
},
},
}
}
},
externalSuppliersId: {
title: '外部供应商id',
type: 'string',
default: '',
ui: {
visibleIf: { suppliersType: (value: any) => value === 1 },
},
},
visibleIf: { suppliersType: (value: any) => value === 1 }
}
}
},
required: this.validData,
required: this.validData
};
}
// 获取录单员
// 获取录单员
getSelectList() {
this.Serveice("car:color")
this.Serveice("car:model")
this.Serveice("car:length")
this.Serveice('car:color');
this.Serveice('car:model');
this.Serveice('car:length');
}
Serveice(param :any) {
Serveice(param: any) {
let value: any;
this.service.request(`${this.service.$api_get_getDictValue}`,
{
dictKey: param
}).subscribe((res) => {
if(param === 'car:color') {
this.contenCarNoColor = res;
} else if(param === 'car:model') {
this.contencarModel = res;
} else if(param === 'car:length') {
this.contenCarLength = res;
}
})
this.service
.request(`${this.service.$api_get_getDictValue}`, {
dictKey: param
})
.subscribe(res => {
if (param === 'car:color') {
this.contenCarNoColor = res;
} else if (param === 'car:model') {
this.contencarModel = res;
} else if (param === 'car:length') {
this.contenCarLength = res;
}
});
return value;
}
//
//
getDetailList() {
console.log( this.route.snapshot?.params?.id)
console.log(this.route.snapshot?.params?.id);
const params = {
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 => {
this.detailData = res;
this.tempalateData = res;
})
});
}
goBack() {
window.history.go(-1);
}
handleCancel(name: any) {
}
handleCancel(name: any) {}
/**
*查看评价
*/
*查看评价
*/
viewEvaluate(item: any) {
this.modal.createStatic(VehicleImgViewComponent, { i: item } ).subscribe(() => {
this.modal.createStatic(VehicleImgViewComponent, { i: item }).subscribe(() => {
this.st.reload();
this.getDetailList();
this.getDetailList();
});
}
/**
*查看评价
*/
*查看评价
*/
updateEvaluate(item: any) {
this.modal.createStatic(VehicleComponentsListEditComponent, { i: item }).subscribe(() => {
this.st.reload();
this.getDetailList();
this.getDetailList();
});
}
handleOK() {
}
handleOK() {}
ratify() {
this.isEdit = true;
}
@ -225,7 +222,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
}
}
deleteImg(key: string) {
console.log(key)
console.log(key);
this.nzModalService.warning({
nzTitle: '是否确认删除该图片',
nzOnOk: () => {
@ -242,7 +239,8 @@ export class VehicleComponentsListDetailComponent implements OnInit {
imgList: [url],
index: 0
};
this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
this.nzImageService.preview([{ src: url }]);
// this.nzModalService.create({ nzContent: ImageViewComponent, nzComponentParams: { params } });
}
reset() {
@ -252,26 +250,26 @@ export class VehicleComponentsListDetailComponent implements OnInit {
save() {
this.isEdit = false;
console.log(this.detailData)
this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime)
console.log(this.detailData);
this.detailData.driverLicenseRegisterTime = EADateUtil.yearToDate(this.detailData?.driverLicenseRegisterTime);
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime)
this.detailData.driverLicenseEndTime = EADateUtil.yearToDate(this.detailData?.driverLicenseEndTime);
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime)
this.detailData.driverLicenseGetTime = EADateUtil.yearToDate(this.detailData?.driverLicenseGetTime);
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime)
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime)
console.log(this.detailData)
this.service.request(this.service.$api_get_update, this.detailData).subscribe((res)=>{
console.log(res)
if(res) {
this.getDetailList()
this.service.msgSrv.success('修改成功！')
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
console.log(this.detailData);
this.service.request(this.service.$api_get_update, this.detailData).subscribe(res => {
console.log(res);
if (res) {
this.getDetailList();
this.service.msgSrv.success('修改成功！');
}
})
});
}
private initData() {
return {
carNo: '',