edit
This commit is contained in:
Taric Xin
@ -10,29 +10,15 @@
|
||||
-->
|
||||
<!-- 搜索表单 -->
|
||||
<page-header-wrapper [title]="''"> </page-header-wrapper>
|
||||
<nz-card>
|
||||
<!-- <nz-card class="search-box">
|
||||
<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">
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 18">
|
||||
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
|
||||
<button nz-button nzType="primary" [nzLoading]="loading" (click)="search()" acl [acl-ability]="['ORDER-VEHICLE-search']">查询</button>
|
||||
<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" [disabled]="loading">导出</button>
|
||||
<button nz-button [disabled]="loading" (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
@ -42,9 +28,9 @@
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
</nz-card>
|
||||
</nz-card> -->
|
||||
|
||||
<nz-card>
|
||||
<nz-card class="content-box">
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'待接单(' + tabs?.receivedQuantity + ')'"></nz-tab>
|
||||
@ -54,18 +40,11 @@
|
||||
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
|
||||
<nz-tab [nzTitle]="'已取消(' + tabs?.cancelQuantity + ')'"></nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px">
|
||||
<st
|
||||
#st
|
||||
[bordered]="true"
|
||||
multiSort
|
||||
[scroll]="{ x: '1200px' }"
|
||||
[data]="service.$api_get_listWholePage"
|
||||
[columns]="columns"
|
||||
[req]="{ process: beforeReq }"
|
||||
<div>
|
||||
<st #st [bordered]="true" multiSort [scroll]="{ x:'1200px',y:scrollY }" [data]="service.$api_get_listWholePage"
|
||||
[columns]="columns" [req]="{ process: beforeReq }"
|
||||
[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">
|
||||
<a [routerLink]="'vehicle-detail/' + item.id">{{ item.billCode }}</a>
|
||||
<div>
|
||||
@ -98,7 +77,8 @@
|
||||
<div *ngIf="item.mybidDetailInfo.length > 0">
|
||||
<div *ngFor="let data of item.mybidDetailInfo">
|
||||
{{ 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 === '3'" style="color: #f59a63">已拒绝</span>
|
||||
<span *ngIf="data.paymentStatus && data.paymentStatus === '4'" style="color: #f59a63">申请中</span>
|
||||
@ -124,20 +104,18 @@
|
||||
</ng-template>
|
||||
</st>
|
||||
</div>
|
||||
<div class="footer-page">
|
||||
|
||||
</div>
|
||||
</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>
|
||||
<st
|
||||
#stFloat
|
||||
multiSort
|
||||
size="small"
|
||||
[bordered]="true"
|
||||
[data]="service.$api_get_listChangeApply"
|
||||
<st #stFloat multiSort size="small" [bordered]="true" [data]="service.$api_get_listChangeApply"
|
||||
[columns]="columnsFloat"
|
||||
[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">
|
||||
{{ index + 1 }}
|
||||
</ng-template>
|
||||
@ -149,31 +127,23 @@
|
||||
</ng-template>
|
||||
</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>
|
||||
<st
|
||||
#stFloatView
|
||||
size="small"
|
||||
[bordered]="true"
|
||||
[data]="service.$api_getChangeRecordWholeDetail"
|
||||
[columns]="columnsFloatView"
|
||||
[req]="{ method: 'POST', allInBody: true, params: changeViewParams }"
|
||||
[res]="{ reName: { list: 'data.list', total: 'data.total' } }"
|
||||
>
|
||||
<st #stFloatView size="small" [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">
|
||||
{{ item.amountBeforeChange | currency }}
|
||||
</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">
|
||||
{{ item.amountAfterChange | currency }}
|
||||
</ng-template>
|
||||
</st>
|
||||
<div
|
||||
><span>变更原因：{{ ViewCause?.changeCause }}</span></div
|
||||
>
|
||||
<div
|
||||
><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div
|
||||
>
|
||||
<div><span>变更原因：{{ ViewCause?.changeCause }}</span></div>
|
||||
<div><span>拒绝原因：{{ ViewCause?.refuseCause }}</span></div>
|
||||
<div><span>注：附加费依据调整后的运输费用重新计算</span></div>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooterview>
|
||||
@ -182,7 +152,8 @@
|
||||
</ng-template>
|
||||
</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>
|
||||
<nz-tabset>
|
||||
<nz-tab nzTitle="货主评价">
|
||||
@ -208,31 +179,41 @@
|
||||
<button nz-button nzType="primary" (click)="handleCancel('2')">确定</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
|
||||
<nz-drawer [nzBodyStyle]="{ overflow: 'auto' }" [nzMaskClosable]="false" [nzWidth]="500" [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 style="margin-right: 8px;" (click)="visible=false">关闭</button>
|
||||
<button nz-button nzType="primary" (click)="search();;">搜索</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
</nz-drawer>
|
||||
|
||||
<ng-template #extraTemplate>
|
||||
<div>
|
||||
<button nz-button nzType="primary" (click)="modifyRate()" acl [acl-ability]="['ORDER-VEHICLE-modificationAdditional']"> 修改附加费率 </button>
|
||||
<button nz-button nzType="primary" (click)="modifyFreightPeople()" acl [acl-ability]="['ORDER-VEHICLE-modificationNetworkFreight']"> 修改网络货运人 </button>
|
||||
<button nz-button nzType="primary" (click)="modifycaptain()" acl [acl-ability]="['ORDER-VEHICLE-modificationCarCaptain']"> 修改车队长 </button>
|
||||
<button
|
||||
*ngIf="resourceStatus == 4"
|
||||
nz-button
|
||||
nzType="primary"
|
||||
nzGhost
|
||||
nz-popconfirm
|
||||
[nzPopconfirmTitle]="enable"
|
||||
(nzOnConfirm)="userAction()"
|
||||
nzPopconfirmPlacement="bottomRight"
|
||||
acl [acl-ability]="['ORDER-VEHICLE-batchSignWholeOrder']"
|
||||
>
|
||||
<button nz-button nzType="primary" (click)="modifyRate()" acl
|
||||
[acl-ability]="['ORDER-VEHICLE-modificationAdditional']"> 修改附加费率 </button>
|
||||
<button nz-button nzType="primary" (click)="modifyFreightPeople()" acl
|
||||
[acl-ability]="['ORDER-VEHICLE-modificationNetworkFreight']"> 修改网络货运人 </button>
|
||||
<button nz-button nzType="primary" (click)="modifycaptain()" acl
|
||||
[acl-ability]="['ORDER-VEHICLE-modificationCarCaptain']"> 修改车队长 </button>
|
||||
<button *ngIf="resourceStatus == 4" nz-button nzType="primary" nzGhost nz-popconfirm [nzPopconfirmTitle]="enable"
|
||||
(nzOnConfirm)="userAction()" nzPopconfirmPlacement="bottomRight" acl
|
||||
[acl-ability]="['ORDER-VEHICLE-batchSignWholeOrder']">
|
||||
批量签收
|
||||
</button>
|
||||
<button nz-button nzType="primary" (click)="visible=true;" class="mr-sm">搜索</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template #enable>
|
||||
<div class="ant-popover-message">
|
||||
<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"
|
||||
>已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？
|
||||
<div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">已选择{{
|
||||
selectedRows?.length || 0 }}条订单，确认批量签收吗？
|
||||
</div>
|
||||
<div class="ant-popover-message-title ng-star-inserted"> 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。 </div>
|
||||
</div>
|
||||
|
||||
@ -2,4 +2,116 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -4,8 +4,8 @@ import { STColumn, STComponent, STRequestOptions } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { ShipperBaseService } from '@shared';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { of } from 'rxjs';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { fromEvent, of } from 'rxjs';
|
||||
import { debounceTime, map } from 'rxjs/operators';
|
||||
import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component';
|
||||
import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receipt/confir-receipt.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 { OrderManagementService } from '../../services/order-management.service';
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-vehicle',
|
||||
templateUrl: './vehicle.component.html',
|
||||
styleUrls: ['./vehicle.component.less']
|
||||
styleUrls: ['./vehicle.component.less', '../../../commom/less/expend-but.less']
|
||||
})
|
||||
export class OrderManagementVehicleComponent implements OnInit {
|
||||
ui: SFUISchema = {};
|
||||
@ -55,7 +54,7 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
two: '2',
|
||||
three: '2',
|
||||
id: 2
|
||||
},
|
||||
}
|
||||
];
|
||||
tabs = {
|
||||
cancelQuantity: 0,
|
||||
@ -67,12 +66,15 @@ tabs = {
|
||||
totalCount: 0
|
||||
};
|
||||
resourceStatus: any;
|
||||
|
||||
scrollY = '400px';
|
||||
visible = false;
|
||||
constructor(
|
||||
public service: OrderManagementService,
|
||||
private modal: NzModalService,
|
||||
public shipperservice: ShipperBaseService,
|
||||
public router: Router,
|
||||
public ar: ActivatedRoute,
|
||||
public ar: ActivatedRoute
|
||||
) {}
|
||||
|
||||
/**
|
||||
@ -100,8 +102,8 @@ resourceStatus: any;
|
||||
...params,
|
||||
createTime: {
|
||||
start: this.sf?.value?.createTime?.[0] || '',
|
||||
end: this.sf?.value?.createTime?.[1] || '',
|
||||
},
|
||||
end: this.sf?.value?.createTime?.[1] || ''
|
||||
}
|
||||
};
|
||||
}
|
||||
beforeReq = (requestOptions: STRequestOptions) => {
|
||||
@ -117,34 +119,59 @@ resourceStatus: any;
|
||||
...params,
|
||||
createTime: {
|
||||
start: this.sf?.value?.createTime?.[0] || '',
|
||||
end: this.sf?.value?.createTime?.[1] || '',
|
||||
},
|
||||
end: this.sf?.value?.createTime?.[1] || ''
|
||||
}
|
||||
});
|
||||
}
|
||||
this.loading = true;
|
||||
return requestOptions;
|
||||
};
|
||||
afterRes = (data: any[], rawData?: any) => {
|
||||
console.log(data)
|
||||
this.loading = false
|
||||
console.log(data);
|
||||
this.loading = false;
|
||||
return data.map(item => ({
|
||||
...item,
|
||||
disabled: item.billStatus == '6'
|
||||
}));
|
||||
};
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter((item) => item.checked) || [];
|
||||
return this.st?.list.filter(item => item.checked) || [];
|
||||
}
|
||||
ngOnInit(): void {
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
this.initSF();
|
||||
this.initST();
|
||||
this.initSTFloat();
|
||||
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];
|
||||
const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0];
|
||||
if (windowHeight && header && headerWrapper) {
|
||||
let scrollY = windowHeight - header.clientHeight - headerWrapper.clientHeight - 35 - 47
|
||||
const tabset = document.getElementsByTagName('nz-tabset')?.[0];
|
||||
if (tabset) {
|
||||
scrollY -= tabset.clientHeight;
|
||||
}
|
||||
this.scrollY = scrollY + 'px';
|
||||
console.log(scrollY);
|
||||
}
|
||||
}
|
||||
|
||||
search() {
|
||||
this.st?.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
getGoodsSourceStatistical() {
|
||||
this.tabs = {
|
||||
@ -157,29 +184,29 @@ resourceStatus: any;
|
||||
totalCount: 0
|
||||
};
|
||||
const params: any = Object.assign({}, this.reqParams || {});
|
||||
delete params.billStatus
|
||||
delete params.billStatus;
|
||||
this.service.request(this.service.$api_statisticalStatus, params).subscribe(res => {
|
||||
if (res) {
|
||||
let totalCount = 0;
|
||||
res.forEach((element: any) => {
|
||||
if (element.billStatusLabel === '待发车') {
|
||||
this.tabs.stayQuantity = element.quantity
|
||||
this.tabs.stayQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '待接单') {
|
||||
this.tabs.receivedQuantity = element.quantity
|
||||
this.tabs.receivedQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '运输中') {
|
||||
this.tabs.GoingQuantity = element.quantity
|
||||
this.tabs.GoingQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '待签收') {
|
||||
this.tabs.signQuantity = element.quantity
|
||||
this.tabs.signQuantity = element.quantity;
|
||||
} else if (element.billStatusLabel === '已完成') {
|
||||
this.tabs.compolatelQuantity = element.quantity
|
||||
this.tabs.compolatelQuantity = element.quantity;
|
||||
} 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 +220,7 @@ resourceStatus: any;
|
||||
type: 'string',
|
||||
title: '订单号',
|
||||
ui: {
|
||||
placeholder: '最多100个单号，空号隔开',
|
||||
placeholder: '最多100个单号，空号隔开'
|
||||
}
|
||||
},
|
||||
resourceCode: {
|
||||
@ -210,11 +237,11 @@ resourceStatus: any;
|
||||
searchLoadingText: '搜索中...',
|
||||
allowClear: true,
|
||||
onSearch: (q: any) => {
|
||||
let str =q.replace(/^\s+|\s+$/g,"");
|
||||
let str = q.replace(/^\s+|\s+$/g, '');
|
||||
if (str) {
|
||||
return this.service
|
||||
.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();
|
||||
} else {
|
||||
return of([]);
|
||||
@ -223,64 +250,41 @@ resourceStatus: any;
|
||||
change: (q: any) => {
|
||||
this.getRegionCode(q);
|
||||
}
|
||||
} as SFSelectWidgetSchema,
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
enterpriseProjectId: {
|
||||
type: 'string',
|
||||
title: '所属项目',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
},
|
||||
placeholder: '请选择'
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
loadingPlace: {
|
||||
type: 'string',
|
||||
title: '装货地',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
dischargePlace: {
|
||||
type: 'string',
|
||||
title: '卸货地',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
driverName: {
|
||||
title: '承运司机',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
|
||||
carNo: {
|
||||
title: '车牌号',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
carCaptainName: {
|
||||
title: '车队长',
|
||||
type: 'string',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
ui: {}
|
||||
},
|
||||
paymentStatus: {
|
||||
title: '支付状态',
|
||||
@ -288,11 +292,8 @@ resourceStatus: any;
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'overall:payment:status' },
|
||||
containsAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
containsAllLable: true
|
||||
} as SFSelectWidgetSchema
|
||||
},
|
||||
createTime: {
|
||||
title: '创建时间',
|
||||
@ -300,10 +301,7 @@ resourceStatus: any;
|
||||
ui: {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value
|
||||
}
|
||||
format: 'yyyy-MM-dd'
|
||||
} as SFDateWidgetSchema
|
||||
},
|
||||
riskStatus: {
|
||||
@ -316,11 +314,8 @@ resourceStatus: any;
|
||||
],
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
},
|
||||
placeholder: '请选择'
|
||||
}
|
||||
},
|
||||
enterpriseInfoId: {
|
||||
type: 'string',
|
||||
@ -328,12 +323,9 @@ resourceStatus: any;
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
|
||||
},
|
||||
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
|
||||
}
|
||||
},
|
||||
// goodsNameId: {
|
||||
// type: 'string',
|
||||
@ -362,16 +354,13 @@ resourceStatus: any;
|
||||
ui: {
|
||||
widget: 'dict-select',
|
||||
params: { dictKey: 'service:type' },
|
||||
containsAllLable: true,
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
containsAllLable: true
|
||||
} as SFSelectWidgetSchema
|
||||
}
|
||||
},
|
||||
type: 'object'
|
||||
};
|
||||
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
|
||||
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 24, gutter: 4 } } };
|
||||
}
|
||||
|
||||
/**
|
||||
@ -391,7 +380,7 @@ resourceStatus: any;
|
||||
title: '运费明细',
|
||||
width: '250px',
|
||||
className: 'text-right',
|
||||
render: 'mybidDetailInfo',
|
||||
render: 'mybidDetailInfo'
|
||||
},
|
||||
{ title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
|
||||
{ title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
|
||||
@ -410,7 +399,8 @@ resourceStatus: any;
|
||||
className: 'text-left',
|
||||
width: '170px',
|
||||
render: 'goodsName'
|
||||
}, {
|
||||
},
|
||||
{
|
||||
title: '承运司机',
|
||||
className: 'text-left',
|
||||
width: '250px',
|
||||
@ -420,7 +410,7 @@ resourceStatus: any;
|
||||
title: '收款人',
|
||||
className: 'text-left',
|
||||
render: 'payeeName',
|
||||
width: '180px',
|
||||
width: '180px'
|
||||
},
|
||||
{
|
||||
title: '装卸货时间',
|
||||
@ -432,7 +422,7 @@ resourceStatus: any;
|
||||
title: '创建时间',
|
||||
className: 'text-left',
|
||||
index: 'createTime',
|
||||
width: '170px',
|
||||
width: '170px'
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
@ -440,65 +430,68 @@ resourceStatus: any;
|
||||
width: '130px',
|
||||
className: 'text-center block-td',
|
||||
buttons: [
|
||||
|
||||
{
|
||||
text: '运费变更记录',
|
||||
click: (_record) => this.OpenPrice(_record),
|
||||
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
|
||||
acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] },
|
||||
},
|
||||
{
|
||||
text: '查看详情',
|
||||
click: (item: any) => {
|
||||
this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar });
|
||||
},
|
||||
acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
|
||||
click: _record => this.OpenPrice(_record),
|
||||
iif: item =>
|
||||
item.billStatus == '4' ||
|
||||
item.billStatus == '5' ||
|
||||
item.billStatus == '2' ||
|
||||
item.billStatus == '3' ||
|
||||
item.billStatus == '6',
|
||||
acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] }
|
||||
},
|
||||
// {
|
||||
// text: '查看详情',
|
||||
// click: (item: any) => {
|
||||
// this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar });
|
||||
// },
|
||||
// acl: { ability: ['USERCENTER-FREIGHT-USER-view'] }
|
||||
// },
|
||||
{
|
||||
text: '查看评价',
|
||||
click: (_record) => this.viewEvaluate(_record),
|
||||
click: _record => this.viewEvaluate(_record),
|
||||
iif: item => item.billStatus == '5',
|
||||
acl: { ability: ['ORDER-VEHICLE-evaluation'] },
|
||||
acl: { ability: ['ORDER-VEHICLE-evaluation'] }
|
||||
},
|
||||
{
|
||||
text: '变更运费',
|
||||
click: (_record) => this.updateFreight(_record),
|
||||
click: _record => this.updateFreight(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
|
||||
acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] },
|
||||
acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] }
|
||||
},
|
||||
{
|
||||
text: '确认签收',
|
||||
click: (_record) => this.confirmReceipt(_record),
|
||||
click: _record => this.confirmReceipt(_record),
|
||||
iif: item => item.billStatus == '4',
|
||||
acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] },
|
||||
acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] }
|
||||
},
|
||||
{
|
||||
text: '取消订单',
|
||||
click: (_record) => this.cancellation(_record),
|
||||
click: _record => this.cancellation(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2',
|
||||
acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] },
|
||||
acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] }
|
||||
},
|
||||
{
|
||||
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',
|
||||
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
|
||||
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }
|
||||
},
|
||||
{
|
||||
text: '申请退款',
|
||||
click: (_record) => this.applyRefund(_record),
|
||||
click: _record => this.applyRefund(_record),
|
||||
iif: item => item.isApplyForRefund,
|
||||
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
|
||||
acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }
|
||||
},
|
||||
{
|
||||
text: '查看轨迹',
|
||||
click: (_record) => this.viewTrack(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6',
|
||||
click: _record => this.viewTrack(_record),
|
||||
iif: item => item.billStatus !== '1' && item.billStatus !== '6'
|
||||
// acl: { ability: ['VEHICLE-LIST-view'] },
|
||||
},
|
||||
|
||||
],
|
||||
},
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
}
|
||||
initSTFloat() {
|
||||
@ -526,15 +519,15 @@ resourceStatus: any;
|
||||
buttons: [
|
||||
{
|
||||
text: '查看',
|
||||
click: (_record) => this.FloatView(_record),
|
||||
click: _record => this.FloatView(_record)
|
||||
},
|
||||
{
|
||||
text: '撤销',
|
||||
click: (_record) => this.revoke(_record),
|
||||
iif: item => item.handleStatus === '1' || item.handleStatus === 1,
|
||||
},
|
||||
],
|
||||
},
|
||||
click: _record => this.revoke(_record),
|
||||
iif: item => item.handleStatus === '1' || item.handleStatus === 1
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
}
|
||||
initSTFloatView() {
|
||||
@ -552,16 +545,8 @@ resourceStatus: any;
|
||||
index: 'amountAfterChange',
|
||||
render: 'amountAfterChange'
|
||||
},
|
||||
{ title: '变更值',
|
||||
index: 'amountchangeValue',
|
||||
render: 'amountchangeValue',
|
||||
width: '120px',
|
||||
className: 'text-center' },
|
||||
{ title: '变更后',
|
||||
index: 'amountBeforeChange',
|
||||
render: 'amountBeforeChange',
|
||||
width: '120px',
|
||||
className: 'text-center' }
|
||||
{ title: '变更值', index: 'amountchangeValue', render: 'amountchangeValue', width: '120px', className: 'text-center' },
|
||||
{ title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
|
||||
];
|
||||
}
|
||||
// 获取城市列表
|
||||
@ -599,7 +584,7 @@ resourceStatus: any;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
}
|
||||
tabChange(item: any) {
|
||||
console.log(item)
|
||||
console.log(item);
|
||||
}
|
||||
/**
|
||||
* 重置表单
|
||||
@ -618,11 +603,8 @@ resourceStatus: any;
|
||||
/**
|
||||
* 导入货源
|
||||
*/
|
||||
importGoodsSource() {
|
||||
|
||||
}
|
||||
audit(item: any) {
|
||||
}
|
||||
importGoodsSource() {}
|
||||
audit(item: any) {}
|
||||
|
||||
/*
|
||||
* 审核关闭弹窗
|
||||
@ -631,59 +613,58 @@ resourceStatus: any;
|
||||
查看评价： 3
|
||||
*/
|
||||
handleCancel(type: string) {
|
||||
console.log(type)
|
||||
console.log(type);
|
||||
if (type === '0') {
|
||||
this.isVisible = false
|
||||
this.isVisible = false;
|
||||
} else if (type === '1') {
|
||||
this.isVisibleView = false
|
||||
this.isVisibleView = false;
|
||||
} else if (type === '2') {
|
||||
this.isVisibleEvaluate = false
|
||||
this.isVisibleEvaluate = false;
|
||||
}
|
||||
}
|
||||
OpenPrice(value: any) {
|
||||
this.changeId = value.id;
|
||||
this.isVisible = true
|
||||
this.isVisible = true;
|
||||
}
|
||||
/**
|
||||
* 浮动费用查看
|
||||
*/
|
||||
FloatView(item: any) {
|
||||
console.log(item)
|
||||
console.log(item);
|
||||
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.isVisibleView = true
|
||||
});
|
||||
this.isVisibleView = true;
|
||||
}
|
||||
/**
|
||||
*查看评价
|
||||
*/
|
||||
viewEvaluate(item: any) {
|
||||
console.log(item)
|
||||
this.isVisibleEvaluate = true
|
||||
console.log(item);
|
||||
this.isVisibleEvaluate = true;
|
||||
const params = {
|
||||
businessCode: item.billCode,
|
||||
evaluateUserId: item.shipperAppUserId,
|
||||
}
|
||||
evaluateUserId: item.shipperAppUserId
|
||||
};
|
||||
const params2 = {
|
||||
businessCode: item.billCode,
|
||||
evaluateUserId: item.shipperAppUserId,
|
||||
}
|
||||
evaluateUserId: item.shipperAppUserId
|
||||
};
|
||||
this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => {
|
||||
console.log(res)
|
||||
this.shipList = res.evaluateInfos
|
||||
|
||||
console.log(res);
|
||||
this.shipList = res.evaluateInfos;
|
||||
});
|
||||
this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => {
|
||||
console.log(res)
|
||||
this.diverList = res.evaluateInfos
|
||||
console.log(res);
|
||||
this.diverList = res.evaluateInfos;
|
||||
});
|
||||
}
|
||||
/**
|
||||
*变更运费
|
||||
*/
|
||||
updateFreight(item: any) {
|
||||
console.log(item?.isFreightChangeApplication)
|
||||
console.log(item?.isFreightChangeApplication);
|
||||
this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => {
|
||||
if (data) {
|
||||
const modal = this.modal.create({
|
||||
@ -691,12 +672,12 @@ resourceStatus: any;
|
||||
nzWidth: 580,
|
||||
nzContent: VehicleUpdateFreightComponent,
|
||||
nzComponentParams: { data: { ...data, id: item.id, isFreightChangeApplication: item?.isFreightChangeApplication } },
|
||||
nzFooter: null,
|
||||
nzFooter: null
|
||||
});
|
||||
modal.afterClose.subscribe((res: Boolean) => {
|
||||
if (res) {
|
||||
this.st.load();
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -711,20 +692,20 @@ resourceStatus: any;
|
||||
params.push(item.id);
|
||||
});
|
||||
if (params.length === 0) {
|
||||
this.service.msgSrv.error('请先选择订单！')
|
||||
return
|
||||
this.service.msgSrv.error('请先选择订单！');
|
||||
return;
|
||||
}
|
||||
const modal = this.modal.create({
|
||||
nzTitle: '修改附加费率',
|
||||
nzWidth: 600,
|
||||
nzContent: VehicleModifyRateComponent,
|
||||
nzComponentParams: { data: { ids: params } },
|
||||
nzFooter: null,
|
||||
nzFooter: null
|
||||
});
|
||||
modal.afterClose.subscribe((result) => {
|
||||
modal.afterClose.subscribe(result => {
|
||||
if (result) {
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -741,20 +722,20 @@ resourceStatus: any;
|
||||
params2.push(item.enterpriseInfoId);
|
||||
});
|
||||
if (params.length === 0) {
|
||||
this.service.msgSrv.error('请先选择订单！')
|
||||
return
|
||||
this.service.msgSrv.error('请先选择订单！');
|
||||
return;
|
||||
}
|
||||
const modal = this.modal.create({
|
||||
nzTitle: '修改网络货运人',
|
||||
nzWidth: 600,
|
||||
nzContent: VehicleFreightPeopleComponent,
|
||||
nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2, } },
|
||||
nzFooter: null,
|
||||
nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2 } },
|
||||
nzFooter: null
|
||||
});
|
||||
modal.afterClose.subscribe((result) => {
|
||||
modal.afterClose.subscribe(result => {
|
||||
if (result) {
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -767,15 +748,15 @@ resourceStatus: any;
|
||||
params.push(item.id);
|
||||
});
|
||||
if (params.length === 0) {
|
||||
this.service.msgSrv.error('请先选择订单！')
|
||||
return
|
||||
this.service.msgSrv.error('请先选择订单！');
|
||||
return;
|
||||
}
|
||||
const modal = this.modal.create({
|
||||
nzTitle: '修改车队长',
|
||||
nzWidth: 900,
|
||||
nzContent: VehicleModifyCaptainComponent,
|
||||
nzComponentParams: { data: { ids: params, } },
|
||||
nzFooter: null,
|
||||
nzComponentParams: { data: { ids: params } },
|
||||
nzFooter: null
|
||||
// nzOnOk: sin => {
|
||||
// this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
|
||||
// if (res) {
|
||||
@ -787,10 +768,10 @@ resourceStatus: any;
|
||||
// return false;
|
||||
// }
|
||||
});
|
||||
modal.afterClose.subscribe((result) => {
|
||||
modal.afterClose.subscribe(result => {
|
||||
if (result) {
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -813,11 +794,11 @@ resourceStatus: any;
|
||||
this.modal.confirm({
|
||||
nzTitle: '是否确定立即撤销费用变更！</i>',
|
||||
nzOnOk: () =>
|
||||
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
|
||||
console.log(res)
|
||||
this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => {
|
||||
console.log(res);
|
||||
if (res) {
|
||||
this.service.msgSrv.success('撤销成功！')
|
||||
this.stFloat.reload()
|
||||
this.service.msgSrv.success('撤销成功！');
|
||||
this.stFloat.reload();
|
||||
}
|
||||
})
|
||||
});
|
||||
@ -829,26 +810,26 @@ resourceStatus: any;
|
||||
nzTitle: '<b>确定取消该订单吗?</b>',
|
||||
nzContent: `<b>取消后无法恢复，请确认</b>`,
|
||||
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) {
|
||||
this.service.msgSrv.success('操作成功！');
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
this.initST();
|
||||
}
|
||||
}),
|
||||
})
|
||||
});
|
||||
}
|
||||
userAction() {
|
||||
let params: any[] = [];
|
||||
if (this.selectedRows.length <= 0) {
|
||||
this.service.msgSrv.warning("请选择需要签收的订单！")
|
||||
this.service.msgSrv.warning('请选择需要签收的订单！');
|
||||
return;
|
||||
}
|
||||
let flag = true;
|
||||
this.selectedRows.forEach(item => {
|
||||
if (item.billStatus !== '4') {
|
||||
this.service.msgSrv.warning("存在非待签收状态订单，无法签收！")
|
||||
this.service.msgSrv.warning('存在非待签收状态订单，无法签收！');
|
||||
flag = false;
|
||||
}
|
||||
params.push(item.id);
|
||||
@ -858,7 +839,7 @@ resourceStatus: any;
|
||||
if (res) {
|
||||
console.log(res);
|
||||
this.st.load(1);
|
||||
this.getGoodsSourceStatistical()
|
||||
this.getGoodsSourceStatistical();
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -895,7 +876,7 @@ resourceStatus: any;
|
||||
nzContent: OneCarOrderViewtrackComponent,
|
||||
nzWidth: '800px',
|
||||
nzComponentParams: {
|
||||
i: item,
|
||||
i: item
|
||||
},
|
||||
nzFooter: null
|
||||
});
|
||||
|
||||
@ -47,6 +47,7 @@ import { NzAffixModule } from 'ng-zorro-antd/affix';
|
||||
import { NzTypographyModule } from 'ng-zorro-antd/typography';
|
||||
import { NzSwitchModule } from 'ng-zorro-antd/switch';
|
||||
import { NzImageModule } from 'ng-zorro-antd/image';
|
||||
import { NzDrawerModule } from 'ng-zorro-antd/drawer';
|
||||
export const SHARED_ZORRO_MODULES = [
|
||||
NzButtonModule,
|
||||
NzGridModule,
|
||||
@ -87,5 +88,6 @@ export const SHARED_ZORRO_MODULES = [
|
||||
NzAffixModule,
|
||||
NzTypographyModule,
|
||||
NzSwitchModule,
|
||||
NzImageModule
|
||||
NzImageModule,
|
||||
NzDrawerModule
|
||||
];
|
||||
|
||||
@ -48,6 +48,7 @@ input[type="number"] {
|
||||
word-break: break-all;
|
||||
word-wrap : break-word;
|
||||
}
|
||||
|
||||
st {
|
||||
.block-td {
|
||||
.ant-divider-vertical {
|
||||
@ -63,3 +64,7 @@ st {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
nz-range-picker {
|
||||
width: 100%;
|
||||
}
|
||||
Reference in New Issue
Block a user