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-03-22 15:39:47 +08:00
parent 1e3e5ea830 b6b0529fc0
commit ab86f198e9
7 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
src/app/routes/commom/less/commom-table.less
View File

@ -1,71 +1,70 @@
:host {
::ng-deep {
::ng-deep {
nz-card {
margin: -24px -24px 0;
nz-card {
margin: -24px -24px 0;
.ant-tabs-nav {
margin: 0;
}
}
.ant-tabs-tab {
padding: 12px 0px;
margin : 0 0 0 16px;
}
.ant-table-body {
border-bottom: 1px solid #f0f0f0;
}
.table-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;
}
.ant-tabs-nav {
margin: 0;
}
}
}
.ant-tabs-tab {
margin: 0 0 0 16px;
padding: 12px 0;
}
.ant-table-body {
border-bottom: 1px solid #f0f0f0;
}
.table-box {
.ant-card-body {
padding: 0;
}
}
.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;
}
}
}

5
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -140,7 +140,10 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
_$expand: { type: 'boolean', ui: { hidden: true } },
billCode: {
type: 'string',
title: '订单号'
title: '订单号',
ui: {
placeholder: '最多100个单号，空号隔开'
}
},
resourceCode: {
type: 'string',

5
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -115,7 +115,10 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
_$expand: { type: 'boolean', ui: { hidden: true } },
billCode: {
type: 'string',
title: '订单号'
title: '订单号',
ui: {
placeholder: '最多100个单号，空号隔开'
}
},
resourceCode: {
type: 'string',

5
src/app/routes/order-management/components/risk/risk.component.ts
View File

@ -109,7 +109,10 @@ export class OrderManagementRiskComponent implements OnInit {
_$expand: { type: 'boolean', ui: { hidden: true } },
billCode: {
type: 'string',
title: '订单号'
title: '订单号',
ui: {
placeholder: '最多100个单号，空号隔开'
}
},
resourceCode: {
type: 'string',

1
src/app/routes/usercenter/components/driver/driver.component.ts
View File

@ -77,6 +77,7 @@ export class UserCenterComponentsDriverComponent implements OnInit {
nzContent: this.promoterModal,
nzOnOk: () => {
if (!!!this.promotersTelephone) {
this.service.msgSrv.error('请填写手机号!');
return false;
}
if (typeof this.promotersTelephone === 'string' && !/(^1\d{10}$)/.test(this.promotersTelephone)) {

3
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -80,6 +80,9 @@ tabs = {
wayBillCode: {
type: 'string',
title: '运单号',
ui: {
placeholder: '最多100个运单，空号隔开'
}
},
resourceCode: {
type: 'string',

5
src/app/routes/waybill-management/components/vehicle/vehicle.component.ts
View File

@ -77,7 +77,10 @@ export class WaybillManagementVehicleComponent implements OnInit {
_$expand: { type: 'boolean', ui: { hidden: true } },
wayBillCode: {
type: 'string',
title: '运单号'
title: '运单号',
ui: {
placeholder: '最多100个运单，空号隔开'
}
},
resourceCode: {
type: 'string',