Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
@ -1,7 +1,7 @@
|
|||||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||||
import { ActivatedRoute, Router } from '@angular/router';
|
import { ActivatedRoute, Router } from '@angular/router';
|
||||||
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
|
import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
|
||||||
import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||||
import { ModalHelper } from '@delon/theme';
|
import { ModalHelper } from '@delon/theme';
|
||||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||||
import { of, Subject } from 'rxjs';
|
import { of, Subject } from 'rxjs';
|
||||||
@ -135,7 +135,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
|
|||||||
expand: (value: boolean) => value
|
expand: (value: boolean) => value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
},
|
||||||
// approvalStatus: {
|
// approvalStatus: {
|
||||||
// type: 'string',
|
// type: 'string',
|
||||||
// title: '审核状态',
|
// title: '审核状态',
|
||||||
@ -155,9 +155,22 @@ export class VehicleComponentsAuditComponent implements OnInit {
|
|||||||
// },
|
// },
|
||||||
// },
|
// },
|
||||||
// },
|
// },
|
||||||
|
approvalPassTime: {
|
||||||
|
type: 'string',
|
||||||
|
title: '审核通过时间',
|
||||||
|
ui: {
|
||||||
|
widget: 'sl-from-to-search',
|
||||||
|
format: 'yyyy-MM-dd',
|
||||||
|
placeholder: '请选择',
|
||||||
|
nzShowTime: true,
|
||||||
|
visibleIf: {
|
||||||
|
expand: (value: boolean) => value
|
||||||
|
}
|
||||||
|
} as SFDateWidgetSchema
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
|
this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } };
|
||||||
}
|
}
|
||||||
|
|
||||||
initST() {
|
initST() {
|
||||||
|
|||||||
Reference in New Issue
Block a user