Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'st_ui' into develop

Browse Source
This commit is contained in:
Taric Xin
2022-03-22 14:28:18 +08:00
parent a85946fad0 b468bf197f
commit 2c996dae05
7 changed files with 606 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
src/app/routes/commom/less/commom-table.less Normal file
View File

@ -0,0 +1,71 @@
:host {
::ng-deep {
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;
}
}
}

143
src/app/routes/order-management/components/vehicle/vehicle.component.html
View File

@ -9,30 +9,16 @@
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
<!-- 搜索表单 --> <!-- 搜索表单 -->
<page-header-wrapper [title]="''"> </page-header-wrapper> <!-- <page-header-wrapper [title]="''"> </page-header-wrapper> -->
<nz-card> <!-- <nz-card class="search-box">
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="false"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4"> <ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18"> <div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf> <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div> </div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right"> <div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right" [class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="loading" (click)="search()" acl [acl-ability]="['ORDER-VEHICLE-search']">查询</button> <button nz-button nzType="primary" [nzLoading]="loading" (click)="search()" acl
[acl-ability]="['ORDER-VEHICLE-search']">查询</button>
<button nz-button nzType="primary" [disabled]="loading">导出</button> <button nz-button nzType="primary" [disabled]="loading">导出</button>
<button nz-button [disabled]="loading" (click)="resetSF()">重置</button> <button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
@ -42,10 +28,14 @@
</div> </div>
</ng-container> </ng-container>
</div> </div>
</nz-card> </nz-card> -->
<nz-card> <nz-card class="table-box">
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate"> <div style="display: flex;align-items: center;">
<label style="font-weight: bold;font-size: 17px;">
<label style="color: #ff4d4f;margin-left: 17px;margin-right: 6px;">|</label>
整车订单</label>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate" style="flex: 1;">
<nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab> <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
<nz-tab [nzTitle]="'待接单(' + tabs?.receivedQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待发车(' + tabs?.stayQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待发车(' + tabs?.stayQuantity + ')'"></nz-tab>
@ -54,18 +44,13 @@
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
</nz-tabset> </nz-tabset>
<div style="margin-top: 15px"> </div>
<st
#st <div>
[bordered]="true" <st #st [bordered]="true" multiSort [scroll]="{ x:'1200px',y:scrollY }" [data]="service.$api_get_listWholePage"
multiSort [columns]="columns" [req]="{ process: beforeReq }"
[scroll]="{ x: '1200px' }"
[data]="service.$api_get_listWholePage"
[columns]="columns"
[req]="{ process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}" [res]="{ reName: { list: 'data.records', total: 'data.total' } , process: afterRes}"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }">
>
<ng-template st-row="billCode" let-item let-index="index"> <ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'vehicle-detail/' + item.id">{{ item.billCode }}</a> <a [routerLink]="'vehicle-detail/' + item.id">{{ item.billCode }}</a>
<div> <div>
@ -98,7 +83,8 @@
<div *ngIf="item.mybidDetailInfo.length > 0"> <div *ngIf="item.mybidDetailInfo.length > 0">
<div *ngFor="let data of item.mybidDetailInfo"> <div *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}：{{ data.price | currency }} {{ data.expenseName }}：{{ data.price | currency }}
<span *ngIf="data.paymentStatus && data.paymentStatus === '1' && data.price>0" style="color: #f59a63">待申请</span> <span *ngIf="data.paymentStatus && data.paymentStatus === '1' && data.price>0"
style="color: #f59a63">待申请</span>
<span *ngIf="data.paymentStatus && data.paymentStatus === '2'" style="color: #f59a63">已支付</span> <span *ngIf="data.paymentStatus && data.paymentStatus === '2'" style="color: #f59a63">已支付</span>
<span *ngIf="data.paymentStatus && data.paymentStatus === '3'" style="color: #f59a63">已拒绝</span> <span *ngIf="data.paymentStatus && data.paymentStatus === '3'" style="color: #f59a63">已拒绝</span>
<span *ngIf="data.paymentStatus && data.paymentStatus === '4'" style="color: #f59a63">申请中</span> <span *ngIf="data.paymentStatus && data.paymentStatus === '4'" style="color: #f59a63">申请中</span>
@ -124,20 +110,18 @@
</ng-template> </ng-template>
</st> </st>
</div> </div>
<div class="footer-page">
</div>
</nz-card> </nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnCancel)="handleCancel('0')"> <nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录"
(nzOnCancel)="handleCancel('0')">
<ng-container *nzModalContent> <ng-container *nzModalContent>
<st <st #stFloat multiSort size="small" [bordered]="true" [data]="service.$api_get_listChangeApply"
#stFloat
multiSort
size="small"
[bordered]="true"
[data]="service.$api_get_listChangeApply"
[columns]="columnsFloat" [columns]="columnsFloat"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
[res]="{ reName: { list: 'data', total: 'data.total' } }" [res]="{ reName: { list: 'data', total: 'data.total' } }">
>
<ng-template st-row="order" let-item let-index="index"> <ng-template st-row="order" let-item let-index="index">
{{ index + 1 }} {{ index + 1 }}
</ng-template> </ng-template>
@ -149,31 +133,23 @@
</ng-template> </ng-template>
</nz-modal> </nz-modal>
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnCancel)="handleCancel('1')"> <nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看"
(nzOnCancel)="handleCancel('1')">
<ng-container *nzModalContent> <ng-container *nzModalContent>
<st <st #stFloatView size="small" [bordered]="true" [data]="service.$api_getChangeRecordWholeDetail"
#stFloatView [columns]="columnsFloatView" [req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
size="small" [res]="{ reName: { list: 'data.list', total: 'data.total' } }">
[bordered]="true"
[data]="service.$api_getChangeRecordWholeDetail"
[columns]="columnsFloatView"
[req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
[res]="{ reName: { list: 'data.list', total: 'data.total' } }"
>
<ng-template st-row="amountBeforeChange" let-item let-index="index"> <ng-template st-row="amountBeforeChange" let-item let-index="index">
{{ item.amountBeforeChange | currency }} {{ item.amountBeforeChange | currency }}
</ng-template> </ng-template>
<ng-template st-row="amountchangeValue" let-item let-index="index"> ￥{{ item.amountchangeValue | number: '0.2-2' }} </ng-template> <ng-template st-row="amountchangeValue" let-item let-index="index"> ￥{{ item.amountchangeValue | number: '0.2-2'
}} </ng-template>
<ng-template st-row="amountAfterChange" let-item let-index="index"> <ng-template st-row="amountAfterChange" let-item let-index="index">
{{ item.amountAfterChange | currency }} {{ item.amountAfterChange | currency }}
</ng-template> </ng-template>
</st> </st>
<div <div><span>变更原因：{{ ViewCause?.changeCause }}</span></div>
><span>变更原因：{{ ViewCause?.changeCause }}</span></div <div><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div>
>
<div
><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div
>
<div><span>注：附加费依据调整后的运输费用重新计算</span></div> <div><span>注：附加费依据调整后的运输费用重新计算</span></div>
</ng-container> </ng-container>
<ng-template #nzModalFooterview> <ng-template #nzModalFooterview>
@ -182,7 +158,8 @@
</ng-template> </ng-template>
</nz-modal> </nz-modal>
<nz-modal [(nzVisible)]="isVisibleEvaluate" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnCancel)="handleCancel('2')"> <nz-modal [(nzVisible)]="isVisibleEvaluate" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate"
(nzOnCancel)="handleCancel('2')">
<ng-container *nzModalContent> <ng-container *nzModalContent>
<nz-tabset> <nz-tabset>
<nz-tab nzTitle="货主评价"> <nz-tab nzTitle="货主评价">
@ -208,31 +185,43 @@
<button nz-button nzType="primary" (click)="handleCancel('2')">确定</button> <button nz-button nzType="primary" (click)="handleCancel('2')">确定</button>
</ng-template> </ng-template>
</nz-modal> </nz-modal>
<nz-drawer [nzBodyStyle]="{ overflow: 'auto' }" [nzMaskClosable]="false" [nzWidth]="420" [nzVisible]="visible"
[nzMaskClosable]="true" nzTitle="筛选" [nzFooter]="footerTpl" (nzOnClose)="visible=false">
<div *nzDrawerContent>
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<ng-template #footerTpl>
<div style="float: right">
<button nz-button (click)="visible=false">关闭</button>
<button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
<button nz-button nzType="primary" (click)="search();;">搜索</button>
</div>
</ng-template>
</nz-drawer>
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div> <div>
<button nz-button nzType="primary" (click)="modifyRate()" acl [acl-ability]="['ORDER-VEHICLE-modificationAdditional']"> 修改附加费率 </button> <button nz-button nzType="primary" (click)="modifyRate()" acl
<button nz-button nzType="primary" (click)="modifyFreightPeople()" acl [acl-ability]="['ORDER-VEHICLE-modificationNetworkFreight']"> 修改网络货运人 </button> [acl-ability]="['ORDER-VEHICLE-modificationAdditional']"> 修改附加费率 </button>
<button nz-button nzType="primary" (click)="modifycaptain()" acl [acl-ability]="['ORDER-VEHICLE-modificationCarCaptain']"> 修改车队长 </button> <button nz-button nzType="primary" (click)="modifyFreightPeople()" acl
<button [acl-ability]="['ORDER-VEHICLE-modificationNetworkFreight']"> 修改网络货运人 </button>
*ngIf="resourceStatus == 4" <button nz-button nzType="primary" (click)="modifycaptain()" acl
nz-button [acl-ability]="['ORDER-VEHICLE-modificationCarCaptain']"> 修改车队长 </button>
nzType="primary" <button *ngIf="resourceStatus == 4" nz-button nzType="primary" nzGhost nz-popconfirm [nzPopconfirmTitle]="enable"
nzGhost (nzOnConfirm)="userAction()" nzPopconfirmPlacement="bottomRight" acl
nz-popconfirm [acl-ability]="['ORDER-VEHICLE-batchSignWholeOrder']">
[nzPopconfirmTitle]="enable"
(nzOnConfirm)="userAction()"
nzPopconfirmPlacement="bottomRight"
acl [acl-ability]="['ORDER-VEHICLE-batchSignWholeOrder']"
>
批量签收 批量签收
</button> </button>
<button nz-button nzType="primary" [disabled]="loading">导出</button>
<button nz-button nzType="primary" (click)="visible=true;" class="mr-sm">筛选</button>
</div> </div>
</ng-template> </ng-template>
<ng-template #enable> <ng-template #enable>
<div class="ant-popover-message"> <div class="ant-popover-message">
<i nz-icon nzType="info-circle" nzTheme="fill"></i> <i nz-icon nzType="info-circle" nzTheme="fill"></i>
<div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px" <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">已选择{{
>已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？ selectedRows?.length || 0 }}条订单，确认批量签收吗？
</div> </div>
<div class="ant-popover-message-title ng-star-inserted"> 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。 </div> <div class="ant-popover-message-title ng-star-inserted"> 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。 </div>
</div> </div>

5
src/app/routes/order-management/components/vehicle/vehicle.component.less
View File

@ -1,5 +0,0 @@
:host {
p{
margin-bottom: 0
}
}

367
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -4,8 +4,8 @@ import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
import { ShipperBaseService } from '@shared'; import { ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs'; import { fromEvent, of } from 'rxjs';
import { map } from 'rxjs/operators'; import { debounceTime, map } from 'rxjs/operators';
import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component'; import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component';
import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receipt/confir-receipt.component'; import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receipt/confir-receipt.component';
import { VehicleFreightPeopleComponent } from '../../modal/vehicle/freight-people/freight-people.component'; import { VehicleFreightPeopleComponent } from '../../modal/vehicle/freight-people/freight-people.component';
@ -15,11 +15,10 @@ import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freigh
import { OneCarOrderViewtrackComponent } from '../../modal/vehicle/view-track/view-track.component'; import { OneCarOrderViewtrackComponent } from '../../modal/vehicle/view-track/view-track.component';
import { OrderManagementService } from '../../services/order-management.service'; import { OrderManagementService } from '../../services/order-management.service';
@Component({ @Component({
selector: 'app-supply-management-vehicle', selector: 'app-supply-management-vehicle',
templateUrl: './vehicle.component.html', templateUrl: './vehicle.component.html',
styleUrls: ['./vehicle.component.less'] styleUrls: ['../../../commom/less/commom-table.less']
}) })
export class OrderManagementVehicleComponent implements OnInit { export class OrderManagementVehicleComponent implements OnInit {
ui: SFUISchema = {}; ui: SFUISchema = {};
@ -55,7 +54,7 @@ export class OrderManagementVehicleComponent implements OnInit {
two: '2', two: '2',
three: '2', three: '2',
id: 2 id: 2
}, }
]; ];
tabs = { tabs = {
cancelQuantity: 0, cancelQuantity: 0,
@ -67,12 +66,15 @@ tabs = {
totalCount: 0 totalCount: 0
}; };
resourceStatus: any; resourceStatus: any;
scrollY = '400px';
visible = false;
constructor( constructor(
public service: OrderManagementService, public service: OrderManagementService,
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
public router: Router, public router: Router,
public ar: ActivatedRoute, public ar: ActivatedRoute
) {} ) {}
/** /**
@ -100,51 +102,80 @@ resourceStatus: any;
...params, ...params,
createTime: { createTime: {
start: this.sf?.value?.createTime?.[0] || '', start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '', end: this.sf?.value?.createTime?.[1] || ''
}, }
}; };
} }
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
const a: any = {}; const a: any = {};
if (this.resourceStatus) { if (this.resourceStatus) {
a.billStatus = this.resourceStatus; a.billStatus = this.resourceStatus;
Object.assign(requestOptions.body, {
...a
});
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand; delete params._$expand;
if (this.sf) { if (this.sf) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
...a,
...params, ...params,
createTime: { createTime: {
start: this.sf?.value?.createTime?.[0] || '', start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '', end: this.sf?.value?.createTime?.[1] || ''
}, }
}); });
} }
this.loading = true; this.loading = true;
return requestOptions; return requestOptions;
}; };
afterRes = (data: any[], rawData?: any) => { afterRes = (data: any[], rawData?: any) => {
console.log(data) console.log(data);
this.loading = false this.loading = false;
return data.map(item => ({ return data.map(item => ({
...item, ...item,
disabled: item.billStatus == '6' disabled: item.billStatus == '6'
})); }));
}; };
get selectedRows() { get selectedRows() {
return this.st?.list.filter((item) => item.checked) || []; return this.st?.list.filter(item => item.checked) || [];
} }
ngOnInit(): void { ngOnInit(): void {
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
this.initSF(); this.initSF();
this.initST(); this.initST();
this.initSTFloat(); this.initSTFloat();
this.initSTFloatView(); this.initSTFloatView();
setTimeout(() => {
this.getScrollY();
}, 100);
fromEvent(window, 'resize')
.pipe(debounceTime(100))
.subscribe(event => {
this.getScrollY();
});
} }
getScrollY() {
const windowHeight = window.innerHeight || Math.max(document.documentElement.clientHeight, document.body.clientHeight);
const header = document.getElementsByTagName('layout-pro-header')?.[0];
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';
}
}
search() { search() {
this.st?.load(1); this.st?.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
getGoodsSourceStatistical() { getGoodsSourceStatistical() {
this.tabs = { this.tabs = {
@ -157,29 +188,29 @@ resourceStatus: any;
totalCount: 0 totalCount: 0
}; };
const params: any = Object.assign({}, this.reqParams || {}); const params: any = Object.assign({}, this.reqParams || {});
delete params.billStatus delete params.billStatus;
this.service.request(this.service.$api_statisticalStatus, params).subscribe(res => { this.service.request(this.service.$api_statisticalStatus, params).subscribe(res => {
if (res) { if (res) {
let totalCount = 0; let totalCount = 0;
res.forEach((element: any) => { res.forEach((element: any) => {
if (element.billStatusLabel === '待发车') { if (element.billStatusLabel === '待发车') {
this.tabs.stayQuantity = element.quantity this.tabs.stayQuantity = element.quantity;
} else if (element.billStatusLabel === '待接单') { } else if (element.billStatusLabel === '待接单') {
this.tabs.receivedQuantity = element.quantity this.tabs.receivedQuantity = element.quantity;
} else if (element.billStatusLabel === '运输中') { } else if (element.billStatusLabel === '运输中') {
this.tabs.GoingQuantity = element.quantity this.tabs.GoingQuantity = element.quantity;
} else if (element.billStatusLabel === '待签收') { } else if (element.billStatusLabel === '待签收') {
this.tabs.signQuantity = element.quantity this.tabs.signQuantity = element.quantity;
} else if (element.billStatusLabel === '已完成') { } else if (element.billStatusLabel === '已完成') {
this.tabs.compolatelQuantity = element.quantity this.tabs.compolatelQuantity = element.quantity;
} else if (element.billStatusLabel === '已取消') { } else if (element.billStatusLabel === '已取消') {
this.tabs.cancelQuantity = element.quantity this.tabs.cancelQuantity = element.quantity;
} }
totalCount += element.quantity totalCount += element.quantity;
}); });
this.tabs.totalCount = totalCount this.tabs.totalCount = totalCount;
} }
}) });
} }
/** /**
@ -193,7 +224,7 @@ resourceStatus: any;
type: 'string', type: 'string',
title: '订单号', title: '订单号',
ui: { ui: {
placeholder: '最多100个单号，空号隔开', placeholder: '最多100个单号，空号隔开'
} }
}, },
resourceCode: { resourceCode: {
@ -210,11 +241,11 @@ resourceStatus: any;
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
onSearch: (q: any) => { onSearch: (q: any) => {
let str =q.replace(/^\s+|\s+$/g,""); let str = q.replace(/^\s+|\s+$/g, '');
if (str) { if (str) {
return this.service return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: str }) .request(this.service.$api_enterpriceList, { enterpriseName: str })
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise(); .toPromise();
} else { } else {
return of([]); return of([]);
@ -223,64 +254,41 @@ resourceStatus: any;
change: (q: any) => { change: (q: any) => {
this.getRegionCode(q); this.getRegionCode(q);
} }
} as SFSelectWidgetSchema, } as SFSelectWidgetSchema
}, },
enterpriseProjectId: { enterpriseProjectId: {
type: 'string', type: 'string',
title: '所属项目', title: '所属项目',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择'
visibleIf: {
_$expand: (value: boolean) => value
},
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
loadingPlace: { loadingPlace: {
type: 'string', type: 'string',
title: '装货地', title: '装货地',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
dischargePlace: { dischargePlace: {
type: 'string', type: 'string',
title: '卸货地', title: '卸货地',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
driverName: { driverName: {
title: '承运司机', title: '承运司机',
type: 'string', type: 'string',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carNo: { carNo: {
title: '车牌号', title: '车牌号',
type: 'string', type: 'string',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carCaptainName: { carCaptainName: {
title: '车队长', title: '车队长',
type: 'string', type: 'string',
ui: { ui: {}
visibleIf: {
_$expand: (value: boolean) => value,
},
}
}, },
paymentStatus: { paymentStatus: {
title: '支付状态', title: '支付状态',
@ -288,11 +296,8 @@ resourceStatus: any;
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLable: true, containsAllLable: true
visibleIf: { } as SFSelectWidgetSchema
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
}, },
createTime: { createTime: {
title: '创建时间', title: '创建时间',
@ -300,10 +305,7 @@ resourceStatus: any;
ui: { ui: {
widget: 'date', widget: 'date',
mode: 'range', mode: 'range',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd'
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, },
riskStatus: { riskStatus: {
@ -316,11 +318,8 @@ resourceStatus: any;
], ],
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择'
visibleIf: { }
_$expand: (value: boolean) => value,
},
},
}, },
enterpriseInfoId: { enterpriseInfoId: {
type: 'string', type: 'string',
@ -328,12 +327,9 @@ resourceStatus: any;
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
allowClear: true, allowClear: true,
asyncData: () => this.shipperservice.getNetworkFreightForwarder(), asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}, }
}, },
// goodsNameId: { // goodsNameId: {
// type: 'string', // type: 'string',
@ -362,16 +358,13 @@ resourceStatus: any;
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containsAllLable: true, containsAllLable: true
visibleIf: { } as SFSelectWidgetSchema
_$expand: (value: boolean) => value, }
},
} as SFSelectWidgetSchema,
},
}, },
type: 'object' type: 'object'
}; };
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; this.ui = { '*': { spanLabelFixed: 95, grid: { span: 24, gutter: 4 } } };
} }
/** /**
@ -391,7 +384,7 @@ resourceStatus: any;
title: '运费明细', title: '运费明细',
width: '250px', width: '250px',
className: 'text-right', className: 'text-right',
render: 'mybidDetailInfo', render: 'mybidDetailInfo'
}, },
{ title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' }, { title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
@ -410,7 +403,8 @@ resourceStatus: any;
className: 'text-left', className: 'text-left',
width: '170px', width: '170px',
render: 'goodsName' render: 'goodsName'
}, { },
{
title: '承运司机', title: '承运司机',
className: 'text-left', className: 'text-left',
width: '250px', width: '250px',
@ -420,7 +414,7 @@ resourceStatus: any;
title: '收款人', title: '收款人',
className: 'text-left', className: 'text-left',
render: 'payeeName', render: 'payeeName',
width: '180px', width: '180px'
}, },
{ {
title: '装卸货时间', title: '装卸货时间',
@ -432,7 +426,7 @@ resourceStatus: any;
title: '创建时间', title: '创建时间',
className: 'text-left', className: 'text-left',
index: 'createTime', index: 'createTime',
width: '170px', width: '170px'
}, },
{ {
title: '操作', title: '操作',
@ -440,65 +434,68 @@ resourceStatus: any;
width: '130px', width: '130px',
className: 'text-center block-td', className: 'text-center block-td',
buttons: [ buttons: [
{ {
text: '运费变更记录', text: '运费变更记录',
click: (_record) => this.OpenPrice(_record), click: _record => this.OpenPrice(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6', iif: item =>
acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] }, item.billStatus == '4' ||
}, item.billStatus == '5' ||
{ item.billStatus == '2' ||
text: '查看详情', item.billStatus == '3' ||
click: (item: any) => { item.billStatus == '6',
this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar }); acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] }
},
acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
}, },
// {
// text: '查看详情',
// click: (item: any) => {
// this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar });
// },
// acl: { ability: ['USERCENTER-FREIGHT-USER-view'] }
// },
{ {
text: '查看评价', text: '查看评价',
click: (_record) => this.viewEvaluate(_record), click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5', iif: item => item.billStatus == '5',
acl: { ability: ['ORDER-VEHICLE-evaluation'] }, acl: { ability: ['ORDER-VEHICLE-evaluation'] }
}, },
{ {
text: '变更运费', text: '变更运费',
click: (_record) => this.updateFreight(_record), click: _record => this.updateFreight(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2', iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] }, acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] }
}, },
{ {
text: '确认签收', text: '确认签收',
click: (_record) => this.confirmReceipt(_record), click: _record => this.confirmReceipt(_record),
iif: item => item.billStatus == '4', iif: item => item.billStatus == '4',
acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] }, acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] }
}, },
{ {
text: '取消订单', text: '取消订单',
click: (_record) => this.cancellation(_record), click: _record => this.cancellation(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2', iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2',
acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] }, acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] }
}, },
{ {
text: '修改订单', text: '修改订单',
click: (_record) => this.changeOrder(_record), click: _record => this.changeOrder(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3', iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }, acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }
}, },
{ {
text: '申请退款', text: '申请退款',
click: (_record) => this.applyRefund(_record), click: _record => this.applyRefund(_record),
iif: item => item.isApplyForRefund, iif: item => item.isApplyForRefund,
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }, acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }
}, },
{ {
text: '查看轨迹', text: '查看轨迹',
click: (_record) => this.viewTrack(_record), click: _record => this.viewTrack(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6', iif: item => item.billStatus !== '1' && item.billStatus !== '6'
// acl: { ability: ['VEHICLE-LIST-view'] }, // acl: { ability: ['VEHICLE-LIST-view'] },
}, }
]
], }
},
]; ];
} }
initSTFloat() { initSTFloat() {
@ -526,15 +523,15 @@ resourceStatus: any;
buttons: [ buttons: [
{ {
text: '查看', text: '查看',
click: (_record) => this.FloatView(_record), click: _record => this.FloatView(_record)
}, },
{ {
text: '撤销', text: '撤销',
click: (_record) => this.revoke(_record), click: _record => this.revoke(_record),
iif: item => item.handleStatus === '1' || item.handleStatus === 1, iif: item => item.handleStatus === '1' || item.handleStatus === 1
}, }
], ]
}, }
]; ];
} }
initSTFloatView() { initSTFloatView() {
@ -552,16 +549,8 @@ resourceStatus: any;
index: 'amountAfterChange', index: 'amountAfterChange',
render: 'amountAfterChange' render: 'amountAfterChange'
}, },
{ title: '变更值', { title: '变更值', index: 'amountchangeValue', render: 'amountchangeValue', width: '120px', className: 'text-center' },
index: 'amountchangeValue', { title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
render: 'amountchangeValue',
width: '120px',
className: 'text-center' },
{ title: '变更后',
index: 'amountBeforeChange',
render: 'amountBeforeChange',
width: '120px',
className: 'text-center' }
]; ];
} }
// 获取城市列表 // 获取城市列表
@ -599,7 +588,7 @@ resourceStatus: any;
this.sf?.setValue('/_$expand', this._$expand); this.sf?.setValue('/_$expand', this._$expand);
} }
tabChange(item: any) { tabChange(item: any) {
console.log(item) console.log(item);
} }
/** /**
* 重置表单 * 重置表单
@ -618,11 +607,8 @@ resourceStatus: any;
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() { importGoodsSource() {}
audit(item: any) {}
}
audit(item: any) {
}
/* /*
* 审核关闭弹窗 * 审核关闭弹窗
@ -631,59 +617,58 @@ resourceStatus: any;
查看评价： 3 查看评价： 3
*/ */
handleCancel(type: string) { handleCancel(type: string) {
console.log(type) console.log(type);
if (type === '0') { if (type === '0') {
this.isVisible = false this.isVisible = false;
} else if (type === '1') { } else if (type === '1') {
this.isVisibleView = false this.isVisibleView = false;
} else if (type === '2') { } else if (type === '2') {
this.isVisibleEvaluate = false this.isVisibleEvaluate = false;
} }
} }
OpenPrice(value: any) { OpenPrice(value: any) {
this.changeId = value.id; this.changeId = value.id;
this.isVisible = true this.isVisible = true;
} }
/** /**
* 浮动费用查看 * 浮动费用查看
*/ */
FloatView(item: any) { FloatView(item: any) {
console.log(item) console.log(item);
this.changeViewId = item.id; this.changeViewId = item.id;
this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => { this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe(res => {
this.ViewCause = res; this.ViewCause = res;
}) });
this.isVisibleView = true this.isVisibleView = true;
} }
/** /**
*查看评价 *查看评价
*/ */
viewEvaluate(item: any) { viewEvaluate(item: any) {
console.log(item) console.log(item);
this.isVisibleEvaluate = true this.isVisibleEvaluate = true;
const params = { const params = {
businessCode: item.billCode, businessCode: item.billCode,
evaluateUserId: item.shipperAppUserId, evaluateUserId: item.shipperAppUserId
} };
const params2 = { const params2 = {
businessCode: item.billCode, businessCode: item.billCode,
evaluateUserId: item.shipperAppUserId, evaluateUserId: item.shipperAppUserId
} };
this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => { this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => {
console.log(res) console.log(res);
this.shipList = res.evaluateInfos this.shipList = res.evaluateInfos;
}); });
this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => { this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => {
console.log(res) console.log(res);
this.diverList = res.evaluateInfos this.diverList = res.evaluateInfos;
}); });
} }
/** /**
*变更运费 *变更运费
*/ */
updateFreight(item: any) { updateFreight(item: any) {
console.log(item?.isFreightChangeApplication) console.log(item?.isFreightChangeApplication);
this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => { this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => {
if (data) { if (data) {
const modal = this.modal.create({ const modal = this.modal.create({
@ -691,12 +676,12 @@ resourceStatus: any;
nzWidth: 580, nzWidth: 580,
nzContent: VehicleUpdateFreightComponent, nzContent: VehicleUpdateFreightComponent,
nzComponentParams: { data: { ...data, id: item.id, isFreightChangeApplication: item?.isFreightChangeApplication } }, nzComponentParams: { data: { ...data, id: item.id, isFreightChangeApplication: item?.isFreightChangeApplication } },
nzFooter: null, nzFooter: null
}); });
modal.afterClose.subscribe((res: Boolean) => { modal.afterClose.subscribe((res: Boolean) => {
if (res) { if (res) {
this.st.load(); this.st.load();
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
}); });
} }
@ -711,20 +696,20 @@ resourceStatus: any;
params.push(item.id); params.push(item.id);
}); });
if (params.length === 0) { if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！') this.service.msgSrv.error('请先选择订单！');
return return;
} }
const modal = this.modal.create({ const modal = this.modal.create({
nzTitle: '修改附加费率', nzTitle: '修改附加费率',
nzWidth: 600, nzWidth: 600,
nzContent: VehicleModifyRateComponent, nzContent: VehicleModifyRateComponent,
nzComponentParams: { data: { ids: params } }, nzComponentParams: { data: { ids: params } },
nzFooter: null, nzFooter: null
}); });
modal.afterClose.subscribe((result) => { modal.afterClose.subscribe(result => {
if (result) { if (result) {
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
}); });
} }
@ -741,20 +726,20 @@ resourceStatus: any;
params2.push(item.enterpriseInfoId); params2.push(item.enterpriseInfoId);
}); });
if (params.length === 0) { if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！') this.service.msgSrv.error('请先选择订单！');
return return;
} }
const modal = this.modal.create({ const modal = this.modal.create({
nzTitle: '修改网络货运人', nzTitle: '修改网络货运人',
nzWidth: 600, nzWidth: 600,
nzContent: VehicleFreightPeopleComponent, nzContent: VehicleFreightPeopleComponent,
nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2, } }, nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2 } },
nzFooter: null, nzFooter: null
}); });
modal.afterClose.subscribe((result) => { modal.afterClose.subscribe(result => {
if (result) { if (result) {
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
}); });
} }
@ -767,15 +752,15 @@ resourceStatus: any;
params.push(item.id); params.push(item.id);
}); });
if (params.length === 0) { if (params.length === 0) {
this.service.msgSrv.error('请先选择订单！') this.service.msgSrv.error('请先选择订单！');
return return;
} }
const modal = this.modal.create({ const modal = this.modal.create({
nzTitle: '修改车队长', nzTitle: '修改车队长',
nzWidth: 900, nzWidth: 900,
nzContent: VehicleModifyCaptainComponent, nzContent: VehicleModifyCaptainComponent,
nzComponentParams: { data: { ids: params, } }, nzComponentParams: { data: { ids: params } },
nzFooter: null, nzFooter: null
// nzOnOk: sin => { // nzOnOk: sin => {
// this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => { // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
// if (res) { // if (res) {
@ -787,10 +772,10 @@ resourceStatus: any;
// return false; // return false;
// } // }
}); });
modal.afterClose.subscribe((result) => { modal.afterClose.subscribe(result => {
if (result) { if (result) {
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
}); });
} }
@ -813,11 +798,11 @@ resourceStatus: any;
this.modal.confirm({ this.modal.confirm({
nzTitle: '是否确定立即撤销费用变更！</i>', nzTitle: '是否确定立即撤销费用变更！</i>',
nzOnOk: () => nzOnOk: () =>
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => { this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => {
console.log(res) console.log(res);
if (res) { if (res) {
this.service.msgSrv.success('撤销成功！') this.service.msgSrv.success('撤销成功！');
this.stFloat.reload() this.stFloat.reload();
} }
}) })
}); });
@ -829,26 +814,26 @@ resourceStatus: any;
nzTitle: '<b>确定取消该订单吗?</b>', nzTitle: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复，请确认</b>`, nzContent: `<b>取消后无法恢复，请确认</b>`,
nzOnOk: () => nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => { this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe(res => {
if (res === true) { if (res === true) {
this.service.msgSrv.success('操作成功！'); this.service.msgSrv.success('操作成功！');
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
this.initST(); this.initST();
} }
}),
}) })
});
} }
userAction() { userAction() {
let params: any[] = []; let params: any[] = [];
if (this.selectedRows.length <= 0) { if (this.selectedRows.length <= 0) {
this.service.msgSrv.warning("请选择需要签收的订单！") this.service.msgSrv.warning('请选择需要签收的订单！');
return; return;
} }
let flag = true; let flag = true;
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
if (item.billStatus !== '4') { if (item.billStatus !== '4') {
this.service.msgSrv.warning("存在非待签收状态订单，无法签收！") this.service.msgSrv.warning('存在非待签收状态订单，无法签收！');
flag = false; flag = false;
} }
params.push(item.id); params.push(item.id);
@ -858,7 +843,7 @@ resourceStatus: any;
if (res) { if (res) {
console.log(res); console.log(res);
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
}); });
} }
@ -895,7 +880,7 @@ resourceStatus: any;
nzContent: OneCarOrderViewtrackComponent, nzContent: OneCarOrderViewtrackComponent,
nzWidth: '800px', nzWidth: '800px',
nzComponentParams: { nzComponentParams: {
i: item, i: item
}, },
nzFooter: null nzFooter: null
}); });

4
src/app/shared/shared-zorro.module.ts
View File

@ -47,6 +47,7 @@ import { NzAffixModule } from 'ng-zorro-antd/affix';
import { NzTypographyModule } from 'ng-zorro-antd/typography'; import { NzTypographyModule } from 'ng-zorro-antd/typography';
import { NzSwitchModule } from 'ng-zorro-antd/switch'; import { NzSwitchModule } from 'ng-zorro-antd/switch';
import { NzImageModule } from 'ng-zorro-antd/image'; import { NzImageModule } from 'ng-zorro-antd/image';
import { NzDrawerModule } from 'ng-zorro-antd/drawer';
export const SHARED_ZORRO_MODULES = [ export const SHARED_ZORRO_MODULES = [
NzButtonModule, NzButtonModule,
NzGridModule, NzGridModule,
@ -87,5 +88,6 @@ export const SHARED_ZORRO_MODULES = [
NzAffixModule, NzAffixModule,
NzTypographyModule, NzTypographyModule,
NzSwitchModule, NzSwitchModule,
NzImageModule NzImageModule,
NzDrawerModule
]; ];

5
src/styles.less
View File

@ -48,6 +48,7 @@ input[type="number"] {
word-break: break-all; word-break: break-all;
word-wrap : break-word; word-wrap : break-word;
} }
st { st {
.block-td { .block-td {
.ant-divider-vertical { .ant-divider-vertical {
@ -63,3 +64,7 @@ st {
} }
} }
} }
nz-range-picker {
width: 100%;
}

36
src/styles/compact.less
View File

@ -1,13 +1,15 @@
.alain-pro__sider-logo h1 { .alain-pro__sider-logo h1 {
font-size: 15px !important; font-size: 15px !important;
} }
.page-header__title { .page-header__title {
font-size: 14px !important; font-size: 14px !important;
} }
.alain-pro__body { .alain-pro__body {
margin: 12px 12px 0px !important; margin: 12px 12px 0px !important;
} }
.alain-pro__page-header-content { .alain-pro__page-header-content {
margin: 8px 8px 0 !important; margin: 8px 8px 0 !important;
} }
@ -15,66 +17,96 @@
.ant-card { .ant-card {
margin-bottom: 8px !important; 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; padding: 6px 10px;
} }
.alain-pro__page-header-wrapper { .alain-pro__page-header-wrapper {
margin: 0 !important margin: 0 !important
} }
.alain-pro__menu-icon { .alain-pro__menu-icon {
margin : 3px 5px 0 0; margin : 3px 5px 0 0;
font-size: 14px !important; font-size: 14px !important;
} }
.sf__compact .ant-form-item { .sf__compact .ant-form-item {
margin-top : 4px !important; margin-top : 4px !important;
margin-bottom: 4px !important; margin-bottom: 4px !important;
} }
.body-box { .body-box {
max-width: 760px !important; max-width: 760px !important;
.box-content { .box-content {
height: 77% !important; height: 77% !important;
} }
} }
.login-logo { .login-logo {
width : 250px !important; width : 250px !important;
height: 100% !important; height: 100% !important;
} }
.ant-tabs-tab-btn { .ant-tabs-tab-btn {
font-size: 18px !important; font-size: 18px !important;
} }
.login-box-content { .login-box-content {
max-width: 300px !important; max-width: 300px !important;
height : 100% !important; height : 100% !important;
padding : 58px 0 38px !important; padding : 58px 0 38px !important;
} }
.total-footer { .total-footer {
bottom: 10px !important; bottom: 10px !important;
} }
.ant-layout-header { .ant-layout-header {
height : 44px; height : 44px;
padding : 0 25px; padding : 0 25px;
line-height: 44px; line-height: 44px;
img { img {
width: 22px width: 22px
} }
.title { .title {
font-size: 14px; font-size: 14px;
} }
} }
.ant-tabs-tab-btn { .ant-tabs-tab-btn {
font-size: 14px !important; font-size: 14px !important;
} }
.ant-row { .ant-row {
margin-left : 0px !important; margin-left : 0px !important;
margin-right: 0px !important; margin-right: 0px !important;
} }
h2 { h2 {
font-size: 16px !important; font-size: 16px !important;
} }
.sv__container { .sv__container {
padding: 0 !important; padding: 0 !important;
} }
.alain-pro__menu-side .alain-pro__main .affix { .alain-pro__menu-side .alain-pro__main .affix {
top : 0 !important; top : 0 !important;
left: 215px !important; left: 215px !important;
} }
.table-box {
margin: -12px -12px 0 !important;
.ant-tabs-tab {
padding: 12px 0px !important;
margin : 0 0 0 16px !important;
}
}