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:
Taric Xin
2022-05-16 11:17:09 +08:00
parent 34150e10f9 ee141d1248
commit 2798c7fd45
4 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts
View File

@ -491,8 +491,8 @@ export class FreightComponentsEnterpriseAuditComponent extends BasicTableCompone
enum: [ enum: [
{ label: '全部', value: '' }, { label: '全部', value: '' },
{ label: '待审核', value: 10 }, { label: '待审核', value: 10 },
{ label: '已撤销', value: 15 }, // { label: '已撤销', value: 15 },
{ label: '已成功', value: 20 }, // { label: '已成功', value: 20 },
{ label: '审核失败', value: 30 } { label: '审核失败', value: 30 }
], ],
default: '', default: '',
@ -548,8 +548,8 @@ export class FreightComponentsEnterpriseAuditComponent extends BasicTableCompone
enum: [ enum: [
{ label: '全部', value: '' }, { label: '全部', value: '' },
{ label: '待审核', value: 10 }, { label: '待审核', value: 10 },
{ label: '已撤销', value: 15 }, // { label: '已撤销', value: 15 },
{ label: '已成功', value: 20 }, // { label: '已成功', value: 20 },
{ label: '审核失败', value: 30 } { label: '审核失败', value: 30 }
], ],
default: '', default: '',

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

@ -44,9 +44,8 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
10: '待审核', 10: '待审核',
20: '已审核', 20: '已审核',
30: '已驳回', 30: '已驳回',
40: '证件过期', 40: '证件过期'
} };
scrollTop = 0; scrollTop = 0;
subscribeScoll!: Subscription; subscribeScoll!: Subscription;
@ -57,7 +56,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
private modal: ModalHelper, private modal: ModalHelper,
private nzImageService: NzImageService, private nzImageService: NzImageService,
private dateTimePickerUtil: DateTimePickerUtil private dateTimePickerUtil: DateTimePickerUtil
) { } ) {}
ngOnDestroy(): void { ngOnDestroy(): void {
this.subscribeScoll.unsubscribe(); this.subscribeScoll.unsubscribe();
} }
@ -86,11 +85,11 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
{ {
text: '查看协议', text: '查看协议',
click: _record => this.viewEvaluate(_record), click: _record => this.viewEvaluate(_record),
iif: item => item.auditStatusEnum == 10 || item.auditStatusEnum == 20 iif: item => (item.auditStatusEnum == 10 || item.auditStatusEnum == 20) && item.carProtocal
}, },
{ {
text: '上传协议', text: '上传协议',
click: _record => this.updateEvaluate(_record), click: _record => this.updateEvaluate(_record)
} }
] ]
} }
@ -130,7 +129,7 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
nzContent: this.redectModal, nzContent: this.redectModal,
nzOnOk: () => { nzOnOk: () => {
if (!this.approvalOpinion) { if (!this.approvalOpinion) {
this.service.msgSrv.error('请填写备注！') this.service.msgSrv.error('请填写备注！');
return false; return false;
} }
this.adjuctUser( this.adjuctUser(
@ -163,9 +162,12 @@ export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime); this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
console.log(this.detailData.roadTransportStartTime) console.log(this.detailData.roadTransportStartTime);
if ((this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime) || (this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime)) { if (
this.service.msgSrv.error('发证日期起始不能大于结束日期！') this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime ||
this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime
) {
this.service.msgSrv.error('发证日期起始不能大于结束日期！');
return; return;
} }
this.service.request(this.service.$api_get_update_audit, this.detailData).subscribe(res => { this.service.request(this.service.$api_get_update_audit, this.detailData).subscribe(res => {

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

@ -273,7 +273,6 @@ export class VehicleComponentsListDetailComponent implements OnInit {
this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime); this.detailData.roadTransportStartTime = EADateUtil.yearToDate(this.detailData?.roadTransportStartTime);
this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime); this.detailData.roadTransportEndTime = EADateUtil.yearToDate(this.detailData?.roadTransportEndTime);
console.log(this.detailData);
if ( if (
this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime || this.detailData.roadTransportStartTime > this.detailData.roadTransportEndTime ||
this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime this.detailData.driverLicenseRegisterTime > this.detailData.driverLicenseEndTime

2
src/app/shared/services/business/shipper-base.service.ts
View File

@ -162,7 +162,7 @@ export class ShipperBaseService extends BaseService {
} }
const list = res.map((item: any) => { const list = res.map((item: any) => {
return { return {
label: item.contactName + '/' + item.contactMobile, label: item.partnerType == 1 ? item.enterpriseName : item.contactName + '/' + item.contactMobile ,
value: item.id value: item.id
}; };
}); });