This commit is contained in:
Taric Xin
2022-03-22 14:27:44 +08:00
parent 9c97943076
commit b468bf197f
5 changed files with 166 additions and 168 deletions

View File

@ -18,7 +18,7 @@ import { OrderManagementService } from '../../services/order-management.service'
@Component({
selector: 'app-supply-management-vehicle',
templateUrl: './vehicle.component.html',
styleUrls: ['./vehicle.component.less', '../../../commom/less/expend-but.less']
styleUrls: ['../../../commom/less/commom-table.less']
})
export class OrderManagementVehicleComponent implements OnInit {
ui: SFUISchema = {};
@ -110,12 +110,14 @@ export class OrderManagementVehicleComponent implements OnInit {
const a: any = {};
if (this.resourceStatus) {
a.billStatus = this.resourceStatus;
Object.assign(requestOptions.body, {
...a
});
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
if (this.sf) {
Object.assign(requestOptions.body, {
...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
@ -157,15 +159,17 @@ export class OrderManagementVehicleComponent implements OnInit {
getScrollY() {
const windowHeight = window.innerHeight || Math.max(document.documentElement.clientHeight, document.body.clientHeight);
const header = document.getElementsByTagName('layout-pro-header')?.[0];
const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0];
if (windowHeight && header && headerWrapper) {
let scrollY = windowHeight - header.clientHeight - headerWrapper.clientHeight - 35 - 47
if (windowHeight && header) {
let scrollY = windowHeight - header.clientHeight - 35 - 49;
const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0];
if (headerWrapper) {
scrollY -= headerWrapper.clientHeight;
}
const tabset = document.getElementsByTagName('nz-tabset')?.[0];
if (tabset) {
scrollY -= tabset.clientHeight;
}
this.scrollY = scrollY + 'px';
console.log(scrollY);
}
}
@ -360,7 +364,7 @@ export class OrderManagementVehicleComponent implements OnInit {
},
type: 'object'
};
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 24, gutter: 4 } } };
this.ui = { '*': { spanLabelFixed: 95, grid: { span: 24, gutter: 4 } } };
}
/**