-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
+
@@ -206,7 +213,8 @@
[acl-ability]="['ORDER-VEHICLE-batchSignWholeOrder']">
批量签收
-
+
+
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.less b/src/app/routes/order-management/components/vehicle/vehicle.component.less
index 9dcf1b3c..e69de29b 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.less
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.less
@@ -1,117 +0,0 @@
-:host {
- p {
- margin-bottom: 0
- }
-
- ::ng-deep {
- // .ant-table-content {
- // transform: scaleY(-1);
-
- // table {
- // transform: inherit
- // }
- // }
-
- .page-header {
- border : 0;
- padding: 8px 8px 0;
-
- .ant-breadcrumb {
- margin-bottom: 8px;
- }
- }
-
- nz-range-picker {
- width: 100%;
- }
-
- nz-card {
- margin: -24px -24px 0;
-
- .ant-tabs-nav {
- margin: 0;
- }
- }
-
- // .footer-page {
- // position : fixed;
- // bottom : 0px;
- // width : calc(100% - 300px);
- // right : 48px;
- // background-color: #ffffff;
- // height : 56px;
- // }
-
- // nz-pagination {
- // position: fixed;
- // bottom : 0px;
- // width : 800px;
- // right : 48px;
- // z-index : 999;
- // }
- .ant-tabs-tab {
- padding: 12px 0px;
- margin : 0 0 0 16px;
- }
-
- .ant-table-body {
- border-bottom: 1px solid #f0f0f0;
- }
-
- .search-box {
- .ant-card-body {
- padding-bottom: 18px;
- }
- }
-
- .content-box {
- .ant-card-body {
- padding: 0px;
- }
- }
-
- .ant-table-pagination.ant-pagination {
- margin: 8px;
- }
-
- .ant-table-thead>tr>th,
- .ant-table-tbody>tr>td,
- .ant-table tfoot>tr>th,
- .ant-table tfoot>tr>td {
- padding: 8px;
- }
-
- .ant-table.ant-table-bordered>.ant-table-container {
- border-top: 0;
- }
-
- .ant-pagination-item {
- min-width : 24px;
- height : 24px;
- line-height: 21px;
- }
-
- .ant-pagination-total-text {
- height : 24px;
- line-height: 24px;
- }
-
- .ant-pagination-prev,
- .ant-pagination-next,
- .ant-pagination-jump-prev,
- .ant-pagination-jump-next {
- min-width : 24px;
- height : 24px;
- line-height: 21px;
- }
-
- .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
- height: 24px;
- }
-
- .ant-select-single .ant-select-selector .ant-select-selection-item,
- .ant-select-single .ant-select-selector .ant-select-selection-placeholder {
- line-height: 21px;
- }
- }
-}
\ No newline at end of file
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index 7fd8f1e8..75d29b9a 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -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 } } };
}
/**
diff --git a/src/styles/compact.less b/src/styles/compact.less
index 54fead68..1fb4892b 100644
--- a/src/styles/compact.less
+++ b/src/styles/compact.less
@@ -1,80 +1,112 @@
-
-.alain-pro__sider-logo h1{
+.alain-pro__sider-logo h1 {
font-size: 15px !important;
}
-.page-header__title{
+
+.page-header__title {
font-size: 14px !important;
}
-.alain-pro__body{
+
+.alain-pro__body {
margin: 12px 12px 0px !important;
}
-.alain-pro__page-header-content{
+
+.alain-pro__page-header-content {
margin: 8px 8px 0 !important;
}
.ant-card {
margin-bottom: 8px !important;
}
-.ant-table tfoot>tr>td, .ant-table tfoot>tr>th, .ant-table-tbody>tr>td, .ant-table-thead>tr>th{
+
+.ant-table tfoot>tr>td,
+.ant-table tfoot>tr>th,
+.ant-table-tbody>tr>td,
+.ant-table-thead>tr>th {
padding: 6px 10px;
}
-.alain-pro__page-header-wrapper{
+
+.alain-pro__page-header-wrapper {
margin: 0 !important
}
-.alain-pro__menu-icon{
- margin: 3px 5px 0 0 ;
+
+.alain-pro__menu-icon {
+ margin : 3px 5px 0 0;
font-size: 14px !important;
}
+
.sf__compact .ant-form-item {
- margin-top: 4px !important;
+ margin-top : 4px !important;
margin-bottom: 4px !important;
}
-.body-box{
+
+.body-box {
max-width: 760px !important;
- .box-content{
+
+ .box-content {
height: 77% !important;
}
}
-.login-logo{
- width:250px !important;
+
+.login-logo {
+ width : 250px !important;
height: 100% !important;
}
-.ant-tabs-tab-btn{
+
+.ant-tabs-tab-btn {
font-size: 18px !important;
}
-.login-box-content{
+
+.login-box-content {
max-width: 300px !important;
- height: 100% !important;
- padding: 58px 0 38px !important;
+ height : 100% !important;
+ padding : 58px 0 38px !important;
}
+
.total-footer {
bottom: 10px !important;
}
-.ant-layout-header{
- height: 44px;
- padding: 0 25px;
+
+.ant-layout-header {
+ height : 44px;
+ padding : 0 25px;
line-height: 44px;
- img{
+
+ img {
width: 22px
}
- .title{
+
+ .title {
font-size: 14px;
}
}
-.ant-tabs-tab-btn{
+
+.ant-tabs-tab-btn {
font-size: 14px !important;
}
-.ant-row{
- margin-left: 0px !important;
+
+.ant-row {
+ margin-left : 0px !important;
margin-right: 0px !important;
}
-h2{
+
+h2 {
font-size: 16px !important;
}
-.sv__container{
+
+.sv__container {
padding: 0 !important;
}
+
.alain-pro__menu-side .alain-pro__main .affix {
- top: 0 !important;
+ top : 0 !important;
left: 215px !important;
+}
+
+.table-box {
+ margin: -12px -12px 0 !important;
+
+ .ant-tabs-tab {
+ padding: 12px 0px !important;
+ margin : 0 0 0 16px !important;
+ }
}
\ No newline at end of file