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:
wangshiming
2022-04-25 10:31:24 +08:00
parent d8137c9a7b db6231925e
commit 052e380075
18 changed files with 507 additions and 889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/app/routes/commom/components/basic-table/basic-table.component.ts
View File

@ -60,13 +60,29 @@ export class BasicTableComponent implements AfterViewInit, OnDestroy {
const header = document.getElementsByTagName('layout-pro-header')?.[0]; const header = document.getElementsByTagName('layout-pro-header')?.[0];
if (windowHeight && header) { if (windowHeight && header) {
let scrollY = windowHeight - header.clientHeight - 35 - 49; let scrollY = windowHeight - header.clientHeight - 35 - 49;
// 剔除页头高度
const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0]; const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0];
if (headerWrapper) { if (headerWrapper) {
scrollY -= headerWrapper.clientHeight; scrollY -= headerWrapper.clientHeight;
} }
const tabset = document.getElementsByTagName('nz-tabset')?.[0]; // 计算所有tabs高度
const tabset = document.getElementsByTagName('nz-tabset');
let tabsetHeight = 0;
for (let index = 0; index < tabset.length; index++) {
tabsetHeight += tabset[index].clientHeight;
}
if (tabset) { if (tabset) {
scrollY -= tabset.clientHeight; scrollY -= tabsetHeight;
}
// 剔除高度容器
// 计算所有tabs高度
const headerBox = document.getElementsByClassName('header_box');
let headerBoxHeight = 0;
for (let index = 0; index < headerBox.length; index++) {
headerBoxHeight += headerBox[index].clientHeight;
}
if (headerBox) {
scrollY -= headerBoxHeight;
} }
this.scrollY = scrollY + 'px'; this.scrollY = scrollY + 'px';
} }

1
src/app/routes/commom/index.ts Normal file
View File

@ -0,0 +1 @@
export * from './components/basic-table/basic-table.component';

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

@ -41,6 +41,24 @@
flex: 1; flex: 1;
} }
} }
.header_box {
display : flex;
align-items : center;
justify-content: space-between;
min-height : 47px;
.page_title {
font-weight: bold;
font-size : 17px;
.driver {
color : #ff4d4f;
margin-left : 17px;
margin-right: 6px;
}
}
}
} }
.ant-table-pagination.ant-pagination { .ant-table-pagination.ant-pagination {

62
src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.html
View File

@ -9,41 +9,18 @@
* 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>
<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]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
nz-button [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">查询</button>
nzType="primary" <button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
[nzLoading]="service.http.loading" (click)="exprot()">导出</button>
(click)="search()"
acl
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()"
>导出</button
>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button> <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -52,21 +29,23 @@
</div> </div>
</ng-container> </ng-container>
</div> </div>
</nz-card> </nz-card> -->
<nz-card> <nz-card class="table-box">
<div style="margin-top: 15px"> <div class="header_box">
<st <label class="page_title"> <label class="driver">|</label> 异常预警</label>
#st <div class="mr-sm">
[bordered]="true" <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[scroll]="{ x: '2000px' }" [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button>
[data]="service.$api_get_abnormalWarning" <button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button>
</div>
</div>
<div>
<st #st [bordered]="true" [scroll]="{ x: '2000px' ,y:scrollY }" [data]="service.$api_get_abnormalWarning"
[columns]="columns" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[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] }" [loading]="false">
[loading]="false"
>
<ng-template st-row="driverName" let-item let-index="index"> <ng-template st-row="driverName" let-item let-index="index">
@ -84,11 +63,14 @@
<span>{{ item?.billStatusLabel }}</span> <span>{{ item?.billStatusLabel }}</span>
</div> </div>
<div> <div>
<span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}</span> <span>{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ?
'':item?.serviceTypeLabel}}</span>
</div> </div>
</ng-template> </ng-template>
</st> </st>
</div> </div>
</nz-card> </nz-card>
<ng-template #extraTemplate>
</ng-template>

126
src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts
View File

@ -1,29 +1,24 @@
import { Component, OnInit, ViewChild } from '@angular/core'; import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st'; import { STColumn, STComponent } 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 { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { OrderManagementService } from '../../services/order-management.service'; import { OrderManagementService } from '../../services/order-management.service';
import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { ShipperBaseService } from '@shared'; import { SearchDrawerService, ShipperBaseService } from '@shared';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component'; import { BasicTableComponent } from 'src/app/routes/commom';
@Component({ @Component({
selector: 'app-order-management-abnormal-warning', selector: 'app-order-management-abnormal-warning',
templateUrl: './abnormal-warning.component.html', templateUrl: './abnormal-warning.component.html',
styleUrls: ['./abnormal-warning.component.less'] styleUrls: ['../../../commom/less/commom-table.less', './abnormal-warning.component.less']
}) })
export class OrderManagementAbnormalWarningComponent implements OnInit { export class OrderManagementAbnormalWarningComponent extends BasicTableComponent implements OnInit {
ui: SFUISchema = {};
uiView: SFUISchema = {}; uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {}; schemaView: SFSchema = {};
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
changeViewId: any; // 查看运费变更记录id - 用于查看 changeViewId: any; // 查看运费变更记录id - 用于查看
auditId: any; auditId: any;
auditIdR: any; auditIdR: any;
auditMany = false; auditMany = false;
@ -31,22 +26,23 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
isVisibleEvaluate = false; isVisibleEvaluate = false;
isVisible = false; isVisible = false;
isVisibleRE = false; isVisibleRE = false;
_$expand = false;
@ViewChild('st') private readonly st!: STComponent; @ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent;
@ViewChild('stFloat') private readonly stFloat!: STComponent; @ViewChild('stFloat') private readonly stFloat!: STComponent;
@ViewChild('stFloatView') private readonly stFloatView!: STComponent; @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
columnsFloat: STColumn[] = []; columnsFloat: STColumn[] = [];
columnsFloatView: STColumn[] = []; columnsFloatView: STColumn[] = [];
ViewCause: any; // 变更运费查看数据 ViewCause: any; // 变更运费查看数据
constructor( constructor(
public service: OrderManagementService, public service: OrderManagementService,
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private router: Router private router: Router,
) { } public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
/** /**
* 查询参数 * 查询参数
@ -96,14 +92,12 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
billCode: { billCode: {
type: 'string', type: 'string',
title: '订单号', title: '订单号',
ui: { ui: {}
}
}, },
wayBillCode: { wayBillCode: {
type: 'string', type: 'string',
title: '运单号', title: '运单号',
ui: { ui: {}
}
}, },
serviceType: { serviceType: {
title: '服务类型', title: '服务类型',
@ -112,7 +106,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containsAllLabel: true, containsAllLabel: true
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
resourceType: { resourceType: {
@ -120,12 +114,9 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
type: 'string', type: 'string',
default: '', default: '',
ui: { ui: {
visibleIf: {
_$expand: (value: boolean) => value
},
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'goodresource:type' }, params: { dictKey: 'goodresource:type' },
containsAllLabel: true, containsAllLabel: true
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
shipperId: { shipperId: {
@ -137,11 +128,8 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
searchDebounceTime: 300, searchDebounceTime: 300,
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
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 })
@ -150,44 +138,24 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
} else { } else {
return of([]); return of([]);
} }
}, }
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
loadingPlace: { loadingPlace: {
type: 'string', type: 'string',
title: '装货地', title: '装货地',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
dischargePlace: { dischargePlace: {
type: 'string', type: 'string',
title: '卸货地', title: '卸货地',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
driverName: { driverName: {
title: '承运司机', title: '承运司机',
type: 'string', type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carNo: { carNo: {
title: '车牌号', title: '车牌号',
type: 'string', type: 'string',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
warningTime: { warningTime: {
title: '预警时间', title: '预警时间',
@ -197,15 +165,11 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
mode: 'range', mode: 'range',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, }
}, },
type: 'object' type: 'object'
}; };
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
} }
/** /**
@ -227,13 +191,19 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
className: 'text-left', className: 'text-left',
index: 'wayCode' index: 'wayCode'
}, },
{ title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => { {
return item?.resourceTypeLabel + item?.serviceTypeLabel title: '服务类型',
} }, index: 'serviceTypeLabel',
width: '220px',
className: 'text-left',
format: item => {
return item?.resourceTypeLabel + item?.serviceTypeLabel;
}
},
{ title: '货主', index: 'shipperName', width: '220px', className: 'text-left' }, { title: '货主', index: 'shipperName', width: '220px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' }, { title: '装货地', index: 'loadingAddressArr', width: '220px', className: 'text-left' },
{ title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' }, { title: '卸货地', index: 'unloadingAddressArr', width: '220px', className: 'text-left' },
{ title: '司机', render: 'driverName', width: '180px', className: 'text-left' }, { title: '司机', render: 'driverName', width: '180px', className: 'text-left' },
{ title: '车牌号', index: 'carNo', width: '180px', className: 'text-left' }, { title: '车牌号', index: 'carNo', width: '180px', className: 'text-left' },
{ title: '预警类型', index: 'warningTypeLabel', width: '180px', className: 'text-left' }, { title: '预警类型', index: 'warningTypeLabel', width: '180px', className: 'text-left' },
{ {
@ -252,39 +222,15 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
title: '提醒内容', title: '提醒内容',
className: 'text-left', className: 'text-left',
width: '250px', width: '250px',
index: 'warningContent', index: 'warningContent'
}, }
]; ];
} }
/** tabChange(item: any) {}
* 查询字段个数
*/ // 导出
get queryFieldCount(): number { exprot() {
return Object.keys(this.schema?.properties || {}).length; this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport);
} }
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) { }
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
// 导出
exprot() {
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport);
}
} }

88
src/app/routes/order-management/components/complaint/complaint.component.html
View File

@ -10,59 +10,67 @@
--> -->
<!-- 搜索表单 --> <!-- 搜索表单 -->
<page-header-wrapper title="" [tab]="tpTab"> <!-- <page-header-wrapper title="" [tab]="tpTab">
<ng-template #tpTab> <ng-template #tpTab>
<nz-tabset [nzSelectedIndex]="selectedIndex"> <nz-tabset [nzSelectedIndex]="selectedIndex" [nzTabBarExtraContent]="extraTemplate">
<nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)"> <nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)">
</nz-tab> </nz-tab>
</nz-tabset> </nz-tabset>
</ng-template> </ng-template>
</page-header-wrapper> </page-header-wrapper> -->
<nz-card> <!-- <nz-card>
<div nz-row nzGutter="12"> <div nz-row nzGutter="12">
<!-- 查询字段大于3个时，根据展开状态调整布局 --> <div nz-col [nzSpan]="24">
<div nz-col [nzSpan]="24"> <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]="24" style="display: flex; justify-content: flex-end;">
<div nz-col [nzSpan]="24" style="display: flex; justify-content: flex-end;"> <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading"
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="isLoading && st.loading" (click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
(click)="st?.load(1)" acl [acl-ability]="['ORDER-COMPLAINT-search']">查询</button> <button nz-button nzType="primary" acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()">导出</button>
<button nz-button nzType="primary" acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()" <button nz-button (click)="resetSF()">重置</button>
>导出</button> </div>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div> </div>
</nz-card> </nz-card> -->
<nz-card> <nz-card class="table-box">
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" > <div class="tab_header">
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name" (nzClick)="tabChange(i)"> <label class="page_title"> <label class="driver">|</label> 投诉管理</label>
<nz-tabset [nzSelectedIndex]="selectedIndex" [nzTabBarExtraContent]="extraTemplate">
<nz-tab *ngFor="let tab of mainTabs" [nzTitle]="tab.name" (nzSelect)="selectMainTab(tab)">
</nz-tab>
</nz-tabset>
</div>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)">
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name" (nzClick)="tabChange(i)">
</nz-tab> </nz-tab>
</nz-tabset> </nz-tabset>
<div style="margin-top: 15px;"> <div>
<st <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_operate_listPage"
#st [columns]="columns"
[bordered]="true" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[scroll]="{ x: '2000px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[data]="service.$api_get_operate_listPage" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false">
[columns]="columns" <ng-template st-row="complaintCode" let-item let-index="index">
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" <a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" </ng-template>
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" <ng-template st-row="complaintCauseLabel" let-item let-index="index">
[loading]="false" <div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div>
> <div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div>
<ng-template st-row="complaintCode" let-item let-index="index"> </ng-template>
<a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
</ng-template>
<ng-template st-row="complaintCauseLabel" let-item let-index="index">
<div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div>
<div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div>
</ng-template>
</st> </st>
</div> </div>
</nz-card> </nz-card>
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="处理" (nzOnCancel)="Cancel()"> <ng-template #extraTemplate>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="isLoading && st.loading" (click)="openDrawer()" acl
[acl-ability]="['ORDER-COMPLAINT-search']">筛选</button>
<button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLAINT-export']" (click)="exprot()">导出</button>
</div>
</ng-template>
<nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="处理"
(nzOnCancel)="Cancel()">
<ng-container *nzModalContent> <ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'">
</sf> </sf>
@ -73,5 +81,3 @@
<button nz-button nzType="primary" (click)="handleCancel2()">强制取消</button> <button nz-button nzType="primary" (click)="handleCancel2()">强制取消</button>
</ng-template> </ng-template>
</nz-modal> </nz-modal>

44
src/app/routes/order-management/components/complaint/complaint.component.ts
View File

@ -6,20 +6,19 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { OrderManagementService } from '../../services/order-management.service'; import { OrderManagementService } from '../../services/order-management.service';
import { SearchDrawerService } from '@shared';
import { BasicTableComponent } from 'src/app/routes/commom/components/basic-table/basic-table.component';
@Component({ @Component({
selector: 'app-supply-management-complaint', selector: 'app-supply-management-complaint',
templateUrl: './complaint.component.html', templateUrl: './complaint.component.html',
styleUrls: ['./complaint.component.less'] styleUrls: ['../../../commom/less/commom-table.less', './complaint.component.less']
}) })
export class OrderManagementComplaintComponent implements OnInit { export class OrderManagementComplaintComponent extends BasicTableComponent implements OnInit {
ui: SFUISchema = {};
uiView: SFUISchema = {}; uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {}; schemaView: SFSchema = {};
auditMany = false; auditMany = false;
isVisibleRE = false; isVisibleRE = false;
_$expand = false;
channelId: any; channelId: any;
resourceStatus: any; resourceStatus: any;
selectedMainTabStatus = '2'; selectedMainTabStatus = '2';
@ -51,7 +50,13 @@ export class OrderManagementComplaintComponent implements OnInit {
type: 3 type: 3
} }
]; ];
constructor(public service: OrderManagementService, private modal: NzModalService, private router: Router) { constructor(
public service: OrderManagementService,
private modal: NzModalService,
private router: Router,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
// console.log(this.selectedIndex); // console.log(this.selectedIndex);
// if (this.selectedIndex === 0) { // if (this.selectedIndex === 0) {
// this.selectedMainTabStatus = '2'; // this.selectedMainTabStatus = '2';
@ -101,8 +106,7 @@ export class OrderManagementComplaintComponent implements OnInit {
wayBillCode: { wayBillCode: {
type: 'string', type: 'string',
title: '运单号', title: '运单号',
ui: { ui: {}
}
}, },
drvComplaintCause: { drvComplaintCause: {
title: '投诉原因', title: '投诉原因',
@ -110,7 +114,7 @@ export class OrderManagementComplaintComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'drvcomplaint:cause' }, params: { dictKey: 'drvcomplaint:cause' },
hidden: this.selectedMainTabStatus == '1', hidden: this.selectedMainTabStatus == '1',
containsAllLabel: true containsAllLabel: true
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
@ -120,7 +124,7 @@ export class OrderManagementComplaintComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'drvcomplaint:cause' }, params: { dictKey: 'drvcomplaint:cause' },
hidden: this.selectedMainTabStatus == '2', hidden: this.selectedMainTabStatus == '2',
containsAllLabel: true containsAllLabel: true
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
@ -132,16 +136,10 @@ export class OrderManagementComplaintComponent implements OnInit {
widget: 'sl-from-to', widget: 'sl-from-to',
type: 'date', type: 'date',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value
},
} as SFDateWidgetSchema } as SFDateWidgetSchema
} }
} }
}; };
this.ui = {
'*': { spanLabelFixed: 110, grid: { span: 8, gutter: 8 } }
};
} }
/** /**
@ -270,21 +268,7 @@ export class OrderManagementComplaintComponent implements OnInit {
get queryFieldCount(): number { get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length; return Object.keys(this.schema?.properties || {}).length;
} }
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {} tabChange(item: any) {}
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this.isLoading = true;
}
selectChange(e: number) { selectChange(e: number) {
this.resourceStatus = e; this.resourceStatus = e;
this.initST(); this.initST();

134
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
View File

@ -9,41 +9,18 @@
* 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>
<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]="_$expand"> <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
nz-button [acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">查询</button>
nzType="primary" <button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']"
[nzLoading]="service.http.loading" (click)="exprot()">导出</button>
(click)="search()"
acl
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()"
>导出</button
>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button> <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -52,27 +29,24 @@
</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 class="tab_header">
<nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab> <label class="page_title"> <label class="driver">|</label> 合规抽查</label>
<nz-tab [nzTitle]="'待抽查(' + tabs?.spotQuantity + ')'"></nz-tab> <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'合格(' + tabs?.qualifiedtity + ')'"></nz-tab> <nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
<nz-tab [nzTitle]="'不合格(' + tabs?.unstayQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待抽查(' + tabs?.spotQuantity + ')'"></nz-tab>
</nz-tabset> <nz-tab [nzTitle]="'合格(' + tabs?.qualifiedtity + ')'"></nz-tab>
<div style="margin-top: 15px"> <nz-tab [nzTitle]="'不合格(' + tabs?.unstayQuantity + ')'"></nz-tab>
<st </nz-tabset>
#st </div>
[bordered]="true" <div>
[scroll]="{ x: '2000px' }" <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_listCompliancePage"
[data]="service.$api_get_listCompliancePage"
[columns]="columns" [columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[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] }" [loading]="false">
[loading]="false"
>
<ng-template st-row="freightPrice" let-item let-index="index"> <ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency }} {{ item.freightPrice | currency }}
</ng-template> </ng-template>
@ -81,20 +55,25 @@
<div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div> <div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
</ng-template> </ng-template>
<ng-template st-row="driverName" let-item let-index="index"> <ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" + item?.carNo : '' }} </div> <div> {{ item?.driverName }}{{ item?.driverPhone ? "/" + item?.driverPhone : '' }}{{ item?.carNo ? "/" +
item?.carNo : '' }} </div>
</ng-template> </ng-template>
<ng-template st-row="payeeName" let-item let-index="index"> <ng-template st-row="payeeName" let-item let-index="index">
<div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }} </div> <div> {{ item?.payeeName }}{{ item?.payeePhone ? "/" + item?.payeePhone : '' }} </div>
</ng-template> </ng-template>
<ng-template st-row="billCode" let-item let-index="index"> <ng-template st-row="billCode" let-item let-index="index">
<a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a> <a *ngIf="item.billType == '1'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{
<a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id" [queryParams]="{ sts :1}">{{ item.billCode }}</a> item.billCode }}</a>
<a *ngIf="item.billType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{ item.billCode }}</a> <a *ngIf="item.billType == '2'" [routerLink]="'/order-management/bulk/bulk-detail/' + item.id"
[queryParams]="{ sts :1}">{{ item.billCode }}</a>
<a *ngIf="item.billType == '3'" [routerLink]="'/order-management/vehicle/vehicle-detail/' + item.id">{{
item.billCode }}</a>
<div> <div>
<span>{{ item?.billStatusLabel }}</span> <span>{{ item?.billStatusLabel }}</span>
</div> </div>
<div> <div>
<span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ? '':item?.serviceTypeLabel}}</span> <span>{{item?.billTypeLabel}}{{item?.serviceTypeLabel === item?.billTypeLabel ?
'':item?.serviceTypeLabel}}</span>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="goodsName" let-item let-index="index"> <ng-template st-row="goodsName" let-item let-index="index">
@ -119,18 +98,16 @@
<ng-template #extraTemplate> <ng-template #extraTemplate>
<div> <div>
<button nz-button nzType="primary" (click)="audit()" acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-updateBillByComplianceBatch']"> 批量抽查 </button> <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-search']">筛选</button>
<button nz-button nzDanger acl [acl-ability]="['ORDER-COMPLIANCE-AUDIT-export']" (click)="exprot()">导出</button>
<button nz-button nzType="primary" (click)="audit()" acl
[acl-ability]="['ORDER-COMPLIANCE-AUDIT-updateBillByComplianceBatch']"> 批量抽查 </button>
</div> </div>
</ng-template> </ng-template>
<nz-modal <nz-modal [(nzVisible)]="isVisibleRE" [nzWidth]="600" [nzFooter]="nzModalFooterview2" (nzOnOk)="handleOK()" nzTitle="抽查"
[(nzVisible)]="isVisibleRE" (nzOnCancel)="handleCancel('1')">
[nzWidth]="600"
[nzFooter]="nzModalFooterview2"
(nzOnOk)="handleOK()"
nzTitle="抽查"
(nzOnCancel)="handleCancel('1')"
>
<ng-container *nzModalContent> <ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> </sf> <sf #sfView [schema]="schemaView" [ui]="uiView" [compact]="true" [button]="'none'"> </sf>
</ng-container> </ng-container>
@ -140,18 +117,13 @@
</ng-template> </ng-template>
</nz-modal> </nz-modal>
<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>
@ -163,31 +135,23 @@
</ng-template> </ng-template>
</nz-modal> </nz-modal>
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnCancel)="handleCancel('2')"> <nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看"
(nzOnCancel)="handleCancel('2')">
<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>

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

@ -8,22 +8,21 @@ import { OrderManagementService } from '../../services/order-management.service'
import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { ShipperBaseService } from '@shared'; import { SearchDrawerService, ShipperBaseService } from '@shared';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component'; import { OneCarOrderAppealComponent } from '../../modal/audit/appeal/appeal.component';
import { BasicTableComponent } from 'src/app/routes/commom';
@Component({ @Component({
selector: 'app-order-management-compliance-audit', selector: 'app-order-management-compliance-audit',
templateUrl: './compliance-audit.component.html', templateUrl: './compliance-audit.component.html',
styleUrls: ['./compliance-audit.component.less'] styleUrls: ['../../../commom/less/commom-table.less', './compliance-audit.component.less']
}) })
export class OrderManagementComplianceAuditComponent implements OnInit { export class OrderManagementComplianceAuditComponent extends BasicTableComponent implements OnInit {
ui: SFUISchema = {};
uiView: SFUISchema = {}; uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {}; schemaView: SFSchema = {};
changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
changeViewId: any; // 查看运费变更记录id - 用于查看 changeViewId: any; // 查看运费变更记录id - 用于查看
auditId: any; auditId: any;
auditIdR: any; auditIdR: any;
auditMany = false; auditMany = false;
@ -31,16 +30,14 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
isVisibleEvaluate = false; isVisibleEvaluate = false;
isVisible = false; isVisible = false;
isVisibleRE = false; isVisibleRE = false;
_$expand = false;
@ViewChild('st') private readonly st!: STComponent; @ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent;
@ViewChild('stFloat') private readonly stFloat!: STComponent; @ViewChild('stFloat') private readonly stFloat!: STComponent;
@ViewChild('stFloatView') private readonly stFloatView!: STComponent; @ViewChild('stFloatView') private readonly stFloatView!: STComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
columnsFloat: STColumn[] = []; columnsFloat: STColumn[] = [];
columnsFloatView: STColumn[] = []; columnsFloatView: STColumn[] = [];
ViewCause: any; // 变更运费查看数据 ViewCause: any; // 变更运费查看数据
resourceStatus: any; resourceStatus: any;
tabs = { tabs = {
totalCount: 0, totalCount: 0,
@ -52,8 +49,11 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
public service: OrderManagementService, public service: OrderManagementService,
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService, public shipperservice: ShipperBaseService,
private router: Router private router: Router,
) { } public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
/** /**
* 查询参数 * 查询参数
@ -99,7 +99,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
unstayQuantity: 0 unstayQuantity: 0
}; };
const params: any = Object.assign({}, this.reqParams || {}); const params: any = Object.assign({}, this.reqParams || {});
delete params.complianceStatus delete params.complianceStatus;
this.service.request(this.service.$api_get_getComplianceStatisticalStatus, params).subscribe(res => { this.service.request(this.service.$api_get_getComplianceStatisticalStatus, params).subscribe(res => {
if (res) { if (res) {
let totalCount = 0; let totalCount = 0;
@ -142,8 +142,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
billCode: { billCode: {
type: 'string', type: 'string',
title: '订单号', title: '订单号',
ui: { ui: {}
}
}, },
resourceCode: { resourceCode: {
type: 'string', type: 'string',
@ -159,7 +158,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
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 })
@ -179,56 +178,28 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
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: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
dischargePlace: { dischargePlace: {
type: 'string', type: 'string',
title: '卸货地', title: '卸货地'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
driverName: { driverName: {
title: '承运司机', title: '承运司机',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carNo: { carNo: {
title: '车牌号', title: '车牌号',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carCaptainName: { carCaptainName: {
title: '车队长', title: '车队长',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
paymentStatus: { paymentStatus: {
title: '支付状态', title: '支付状态',
@ -236,10 +207,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLabel: true, containsAllLabel: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
enterpriseInfoId: { enterpriseInfoId: {
@ -249,9 +217,6 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder() asyncData: () => this.shipperservice.getNetworkFreightForwarder()
} }
}, },
@ -262,10 +227,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' },
containsAllLabel: true, containsAllLabel: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
createTime: { createTime: {
@ -275,16 +237,12 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
widget: 'date', widget: 'date',
mode: 'range', mode: 'range',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
allowClear: true, allowClear: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
}, }
}, },
type: 'object' type: 'object'
}; };
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
} }
// 获取城市列表 // 获取城市列表
getRegionCode(regionCode: any) { getRegionCode(regionCode: any) {
@ -397,21 +355,21 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '查看申诉记录', text: '查看申诉记录',
click: _record => this.appeal(_record), click: _record => this.appeal(_record)
// iif: item => item.billStatus == '5' // iif: item => item.billStatus == '5'
}, },
{ {
text: '运费变更记录', text: '运费变更记录',
click: _record => this.OpenPrice(_record), click: _record => this.OpenPrice(_record),
// iif: item => item.billStatus == '4', // iif: item => item.billStatus == '4',
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] }, acl: { ability: ['ORDER-COMPLIANCE-AUDIT-listChangeApply'] }
}, },
{ {
text: '合规抽查', text: '合规抽查',
click: _record => this.audit(_record), click: _record => this.audit(_record),
iif: item => item.complianceStatus == '0', iif: item => item.complianceStatus == '0',
acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] }, acl: { ability: ['ORDER-COMPLIANCE-AUDIT-updateBillByCompliance'] }
}, }
] ]
} }
]; ];
@ -441,15 +399,15 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
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() {
@ -508,49 +466,38 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this.router.navigate(['/order-management/risk-detail', item.id]); this.router.navigate(['/order-management/risk-detail', item.id]);
} }
/** /**
* 浮动费用查看 * 浮动费用查看
*/ */
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;
} }
revoke(item: any) { revoke(item: 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();
} }
}) })
}); });
} }
/** tabChange(item: any) {}
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) { }
/** /**
* 重置表单 * 重置表单
*/ */
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
/** /**
* 导入货源 * 导入货源
*/ */
importGoodsSource() { } importGoodsSource() {}
OpenPrice(item: any) { OpenPrice(item: any) {
this.changeId = item.id; this.changeId = item.id;
this.isVisible = true; this.isVisible = true;
@ -608,8 +555,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } }; this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } };
} }
/* /*
* 审核关闭弹窗 * 审核关闭弹窗
*/ */
handleCancel(value?: string) { handleCancel(value?: string) {
if (value === '0') { if (value === '0') {
this.isVisible = false; this.isVisible = false;
@ -620,8 +567,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
} }
} }
/** /**
* 审核通过按钮 * 审核通过按钮
*/ */
handleOK() { handleOK() {
let idList: any[] = []; let idList: any[] = [];
if (this.selectedRows.length > 0) { if (this.selectedRows.length > 0) {
@ -629,25 +576,25 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
idList.push(item.id); idList.push(item.id);
}); });
} else { } else {
idList.push(this?.auditIdR) idList.push(this?.auditIdR);
} }
const parms = { const parms = {
ids: idList, ids: idList,
complianceRemark: this.sfView.value.complianceRemark, complianceRemark: this.sfView.value.complianceRemark,
complianceStatus: 1, complianceStatus: 1
}; };
this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => { this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('提交成功！'); this.service.msgSrv.success('提交成功！');
this.isVisibleRE = false; this.isVisibleRE = false;
this.st?.load(1); this.st?.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
}); });
} }
/** /**
* 审核拒绝按钮 * 审核拒绝按钮
*/ */
reject() { reject() {
if (!this.sfView.value.complianceRemark) { if (!this.sfView.value.complianceRemark) {
this.service.msgSrv.error('备注不能为空！'); this.service.msgSrv.error('备注不能为空！');
@ -659,25 +606,25 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
idList.push(item.id); idList.push(item.id);
}); });
} else { } else {
idList.push(this.sfView.value.billCode) idList.push(this.sfView.value.billCode);
} }
const parms = { const parms = {
ids: idList, ids: idList,
complianceRemark: this.sfView.value.complianceRemark, complianceRemark: this.sfView.value.complianceRemark,
complianceStatus: 2, complianceStatus: 2
}; };
this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => { this.service.request(this.service.$api_get_updateBillByCompliance, parms).subscribe(res => {
if (res) { if (res) {
this.service.msgSrv.success('提交成功！'); this.service.msgSrv.success('提交成功！');
this.isVisibleRE = false; this.isVisibleRE = false;
this.st?.load(1); this.st?.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
}); });
} }
/** /**
*合规抽查 *合规抽查
*/ */
audit(item?: any) { audit(item?: any) {
if (item) { if (item) {
this.isVisibleRE = true; this.isVisibleRE = true;
@ -686,7 +633,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
this.initSTAudit(1); this.initSTAudit(1);
} else { } else {
if (this.selectedRows.length <= 0) { if (this.selectedRows.length <= 0) {
this.service.msgSrv.error('请选择订单！') this.service.msgSrv.error('请选择订单！');
return; return;
} else { } else {
this.isVisibleRE = true; this.isVisibleRE = true;
@ -694,8 +641,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
} }
} }
} }
// 导出 // 导出
exprot() { exprot() {
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList); this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList);
} }
} }

2
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -126,7 +126,7 @@
<li nz-menu-item (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']"> <li nz-menu-item (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']">
批量通过 批量通过
</li> </li>
<li nz-menu-item a(click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> <li nz-menu-item (click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']">
批量生成电子单据 批量生成电子单据
</li> </li>
</ul> </ul>

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

@ -26,7 +26,6 @@ export class OrderManagementRiskComponent extends BasicTableComponent implements
isVisibleRE = false; isVisibleRE = false;
resourceStatus: any; resourceStatus: any;
@ViewChild('st') private readonly st!: STComponent; @ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
tabs = { tabs = {

112
src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
View File

@ -6,17 +6,10 @@
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html
--> -->
<page-header-wrapper title="异常上报"> </page-header-wrapper> <!-- <page-header-wrapper title="异常上报"> </page-header-wrapper>
<nz-card> <nz-card>
<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)="search()" (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>
@ -32,57 +25,62 @@
</div> </div>
</ng-container> </ng-container>
</div> </div>
</nz-card> -->
<nz-card class="table-box">
<div class="tab_header">
<label class="page_title"> <label class="driver">|</label> 异常上报</label>
<nz-tabset [(nzSelectedIndex)]="selectedIndex" (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'待回复(' + tabs?.stayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已回复(' + tabs?.receivedQuantity + ')'"> </nz-tab>
</nz-tabset>
</div>
<div>
<st #st [data]="service.$api_get_listOperatePage" [columns]="columns" [req]="{ params: reqParams }" [page]="{ }"
[loading]="false" [scroll]="{ x: '2000px' ,y:scrollY }">
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item?.exceptionCertificateFirstFilePath">
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateFirstFilePath]">
</app-imagelist>
</div>
<div *ngIf="item?.exceptionCertificateSecondFilePath">
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateSecondFilePath]">
</app-imagelist>
</div>
<div *ngIf="item?.exceptionCertificateThirdFilePath">
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateThirdFilePath]">
</app-imagelist>
</div>
</div>
</ng-template>
</st>
<!-- <st #st2 *ngIf="selectedIndex===1" [data]="service.$api_get_listOperatePage" [columns]="columns2"
[req]="{ params: reqParams2 }" [page]="{ }" [loading]="false" [scroll]="{ x: '2000px',y:scrollY }">
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item?.exceptionCertificateFirstFilePath">
<app-imagelist [imgList]="[item?.exceptionCertificateFirstFilePath]"> </app-imagelist>
</div>
<div *ngIf="item?.exceptionCertificateSecondFilePath">
<app-imagelist [imgList]="[item?.exceptionCertificateSecondFilePath]"> </app-imagelist>
</div>
<div *ngIf="item?.exceptionCertificateThirdFilePath">
<app-imagelist [imgList]="[item?.exceptionCertificateThirdFilePath]"> </app-imagelist>
</div>
</div>
</ng-template>
</st> -->
</div>
</nz-card> </nz-card>
<nz-card class="content-box"> <ng-template #extraTemplate>
<nz-tabset [(nzSelectedIndex)]="selectedIndex" (nzSelectedIndexChange)="selectChange($event)"> <div class="mr-sm">
<nz-tab [nzTitle]="'待回复(' + tabs?.stayQuantity + ')'"> <button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
<st #st [data]="service.$api_get_listOperatePage" [columns]="columns" [acl-ability]="['WAYBILL-ABNORMAL-search']">筛选</button>
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" </div>
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" </ng-template>
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
[scroll]="{ x: '2000px' }">
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item?.exceptionCertificateFirstFilePath">
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateFirstFilePath]">
</app-imagelist>
</div>
<div *ngIf="item?.exceptionCertificateSecondFilePath">
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateSecondFilePath]">
</app-imagelist>
</div>
<div *ngIf="item?.exceptionCertificateThirdFilePath">
<app-imagelist style="width: 40px;height: 40px" [imgList]="[item?.exceptionCertificateThirdFilePath]">
</app-imagelist>
</div>
</div>
</ng-template>
</st>
</nz-tab>
<nz-tab [nzTitle]="'已回复(' + tabs?.receivedQuantity + ')'">
<st #st2 [data]="service.$api_get_listOperatePage" [columns]="columns2"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams2 }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
[scroll]="{ x: '2000px' }">
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
<div class="imgBox">
<div *ngIf="item?.exceptionCertificateFirstFilePath">
<app-imagelist [imgList]="[item?.exceptionCertificateFirstFilePath]"> </app-imagelist>
</div>
<div *ngIf="item?.exceptionCertificateSecondFilePath">
<app-imagelist [imgList]="[item?.exceptionCertificateSecondFilePath]"> </app-imagelist>
</div>
<div *ngIf="item?.exceptionCertificateThirdFilePath">
<app-imagelist [imgList]="[item?.exceptionCertificateThirdFilePath]"> </app-imagelist>
</div>
</div>
</ng-template>
</st>
</nz-tab>
</nz-tabset>
</nz-card>
<ng-template #detailModal> <ng-template #detailModal>
<div nz-row nzGutter="8"> <div nz-row nzGutter="8">

107
src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
View File

@ -10,32 +10,28 @@ import {
SFSelectWidgetSchema, SFSelectWidgetSchema,
SFUISchema SFUISchema
} from '@delon/form'; } from '@delon/form';
import { ShipperBaseService } from '@shared'; import { SearchDrawerService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { BasicTableComponent } from 'src/app/routes/commom';
import { WaybillManagementServe } from '../../services/waybill-management.service'; import { WaybillManagementServe } from '../../services/waybill-management.service';
@Component({ @Component({
selector: 'app-abnormal-appear', selector: 'app-abnormal-appear',
templateUrl: './abnormal-appear.component.html', templateUrl: './abnormal-appear.component.html',
styleUrls: ['./abnormal-appear.component.less'] styleUrls: ['../../../commom/less/commom-table.less', './abnormal-appear.component.less']
}) })
export class WaybillManagementAbnormalAppearComponent implements OnInit { export class WaybillManagementAbnormalAppearComponent extends BasicTableComponent implements OnInit {
@ViewChild('detailModal', { static: true }) @ViewChild('detailModal', { static: true })
detailModal!: any; detailModal!: any;
@ViewChild('replyModal', { static: true }) @ViewChild('replyModal', { static: true })
replyModal!: any; replyModal!: any;
@ViewChild('st', { static: true }) @ViewChild('st', { static: true })
st!: STComponent; st!: STComponent;
@ViewChild('st2', { static: true })
st2!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
ui: SFUISchema = {}; ui: SFUISchema = {};
ui2: SFUISchema = {}; ui2: SFUISchema = {};
schema: SFSchema = {};
addSchema: SFSchema = {}; addSchema: SFSchema = {};
_$expand = false;
editText = ''; editText = '';
formData: any; formData: any;
isVisible = false; isVisible = false;
@ -74,44 +70,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
{ title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' }, { title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '300px', className: 'text-left' }, { title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '300px', className: 'text-left' },
{ title: '上报时间', index: 'createTime', width: '180px', className: 'text-center' }, { title: '上报时间', index: 'createTime', width: '180px', className: 'text-center' },
{ title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left', iif: _ => this.selectedIndex === 1 },
{ title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left', iif: _ => this.selectedIndex === 1 },
{ {
title: '操作', title: '操作',
fixed: 'right', fixed: 'right',
width: '100px', width: '100px',
iif: _ => this.selectedIndex === 0,
className: 'text-center', className: 'text-center',
buttons: [{ text: '回复', click: item => this.replyAction(item) }] buttons: [{ text: '回复', click: item => this.replyAction(item) }]
} }
]; ];
columns2: STColumn[] = [
{
title: '异常编号',
index: 'exceptionCode',
width: '180px',
className: 'text-left',
type: 'link',
click: item => this.reviewDetailAction(item)
},
{ title: '异常类型', index: 'exceptionTypeLabel', width: '180px', className: 'text-left' },
{
title: '关联运单号',
index: 'wayBillCode',
width: '180px',
className: 'text-left',
type: 'link',
click: item => this.routeToBill(item)
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
{ title: '卸货地', index: 'unloadingAddressArr', width: '180px', className: 'text-left' },
{ title: '承运司机', index: 'driver', width: '200px', className: 'text-left' },
{ title: '异常信息', index: 'exceptionContent', width: '250px', className: 'text-left' },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath', width: '220px', className: 'text-left' },
{ title: '上报时间', index: 'createTime', width: '180px', className: 'text-left' },
{ title: '回复内容', index: 'replyContent', width: '180px', className: 'text-left' },
{ title: '回复人', index: 'replyAppUserName', width: '180px', className: 'text-left' },
{ title: '回复时间', index: 'replyTime', width: '180px', className: 'text-left' }
];
resourceStatus: number | undefined; resourceStatus: number | undefined;
get reqParams() { get reqParams() {
@ -140,28 +109,17 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
public service: WaybillManagementServe, public service: WaybillManagementServe,
private nzModalService: NzModalService, private nzModalService: NzModalService,
public shipperSrv: ShipperBaseService, public shipperSrv: ShipperBaseService,
private router: Router private router: Router,
) {} public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
ngOnInit(): void { ngOnInit(): void {
this.initSF(); this.initSF();
this.getGoodsSourceStatistical(); this.getGoodsSourceStatistical();
} }
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
/**
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
reviewDetailAction(item: any) { reviewDetailAction(item: any) {
this.itemInfo = {}; this.itemInfo = {};
this.service.request(`${this.service.$api_get_listOperate_detail}${item.id}`, {}, 'GET').subscribe(res => { this.service.request(`${this.service.$api_get_listOperate_detail}${item.id}`, {}, 'GET').subscribe(res => {
@ -217,7 +175,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
initSF() { initSF() {
this.schema = { this.schema = {
properties: { properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
exceptionCode: { exceptionCode: {
type: 'string', type: 'string',
title: '异常编号', title: '异常编号',
@ -259,9 +216,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
}, },
change: (q: any) => { change: (q: any) => {
this.getRegionCode(q); this.getRegionCode(q);
},
visibleIf: {
_$expand: (value: boolean) => value
} }
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
@ -270,29 +224,16 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
title: '所属项目', title: '所属项目',
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请先选择货主', placeholder: '请先选择货主'
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
driverName: { driverName: {
title: '承运司机', title: '承运司机',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carNo: { carNo: {
title: '车牌号', title: '车牌号',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
reportingTime: { reportingTime: {
title: '上报时间', title: '上报时间',
@ -300,10 +241,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
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
}, },
enterpriseInfoId: { enterpriseInfoId: {
@ -312,9 +250,6 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value
},
allowClear: true, allowClear: true,
asyncData: () => this.shipperSrv.getNetworkFreightForwarder() asyncData: () => this.shipperSrv.getNetworkFreightForwarder()
} }
@ -328,7 +263,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
this.resourceStatus = e; this.resourceStatus = e;
setTimeout(() => { setTimeout(() => {
this?.st?.load(1); this?.st?.load(1);
this?.st2?.load(1); this.st.resetColumns();
}, 0); }, 0);
} }
getGoodsSourceStatistical() { getGoodsSourceStatistical() {
@ -351,11 +286,9 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
}); });
} }
search() { search() {
if (this.selectedIndex === 0) { console.log(this.st);
this.st?.load(1);
} else { this.st?.load(1);
this.st2?.load(1);
}
this.getGoodsSourceStatistical(); this.getGoodsSourceStatistical();
} }
/** /**

74
src/app/routes/waybill-management/components/bulk/bulk.component.html
View File

@ -7,24 +7,9 @@
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
--> -->
<!-- 搜索表单 --> <!-- 搜索表单 -->
<page-header-wrapper [title]="''"> </page-header-wrapper> <!-- <page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card> <nz-card>
<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>
@ -40,32 +25,26 @@
</div> </div>
</ng-container> </ng-container>
</div> </div>
</nz-card> </nz-card> -->
<nz-card> <nz-card class="table-box">
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"> <div class="tab_header">
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab> <label class="page_title"> <label class="driver">|</label> 大宗运单</label>
<nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab> <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
</nz-tabset> <nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
<div style="margin-top: 15px"> <nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
<st </nz-tabset>
#st </div>
[bordered]="true" <div>
[scroll]="{ x: '2000px' }" <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_Bulkpage" [columns]="columns"
[data]="service.$api_get_Bulkpage" [req]="{ params: reqParams }" [page]="{ }" [loading]="false">
[columns]="columns" <ng-template st-row="createUserName" let-item let-index="index">
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" </ng-template>
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="false"
>
<ng-template st-row="createUserName" let-item let-index="index">
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index"> <ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div> <div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div>
</ng-template> </ng-template>
@ -78,7 +57,7 @@
<span>{{item?.wayBillStatusLabel}}</span> <span>{{item?.wayBillStatusLabel}}</span>
</div> </div>
<div> <div>
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span> <span>{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="freightPrice" let-item let-index="index"> <ng-template st-row="freightPrice" let-item let-index="index">
@ -98,7 +77,8 @@
</ng-template> </ng-template>
<ng-template st-row="goodsInfos" let-item let-index="index"> <ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{ item?.goodsInfos?.goodsName }}</div> <div>{{ item?.goodsInfos?.goodsName }}</div>
<div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{ item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div> <div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{
item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
</ng-template> </ng-template>
<ng-template st-row="loadingTime" let-item let-index="index"> <ng-template st-row="loadingTime" let-item let-index="index">
<div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div> <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
@ -107,3 +87,11 @@
</st> </st>
</div> </div>
</nz-card> </nz-card>
<ng-template #extraTemplate>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['WAYBILL-BULK-search']">筛选</button>
<button nz-button nzDanger acl [acl-ability]="['WAYBILL-BULK-export']" (click)="exprot()">导出</button>
</div>
</ng-template>

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

@ -2,29 +2,24 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st'; import { STColumn, STComponent } 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 { ModalHelper, _HttpClient } from '@delon/theme'; import { ModalHelper, _HttpClient } from '@delon/theme';
import { ShipperBaseService } from '@shared'; import { SearchDrawerService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { BasicTableComponent } from 'src/app/routes/commom';
import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component'; import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component'; import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
import { WaybillManagementServe } from '../../services/waybill-management.service'; import { WaybillManagementServe } from '../../services/waybill-management.service';
@Component({ @Component({
selector: 'app-supply-management-bulk', selector: 'app-supply-management-bulk',
templateUrl: './bulk.component.html', templateUrl: './bulk.component.html',
styleUrls: ['./bulk.component.less'] styleUrls: ['../../../commom/less/commom-table.less','./bulk.component.less']
}) })
export class WaybillManagementBulkComponent implements OnInit { export class WaybillManagementBulkComponent extends BasicTableComponent implements OnInit {
ui: SFUISchema = {};
uiView: SFUISchema = {}; uiView: SFUISchema = {};
schema: SFSchema = {};
schemaView: SFSchema = {}; schemaView: SFSchema = {};
isVisibleEvaluate = false;
_$expand = false;
@ViewChild('st') private readonly st!: STComponent; @ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
resourceStatus: any; resourceStatus: any;
tabs = { tabs = {
@ -38,15 +33,19 @@ export class WaybillManagementBulkComponent implements OnInit {
constructor( constructor(
public service: WaybillManagementServe, public service: WaybillManagementServe,
private modal: NzModalService, private modal: NzModalService,
public shipperservice: ShipperBaseService) { } public shipperservice: ShipperBaseService,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
/** /**
* 查询参数 * 查询参数
*/ */
get reqParams() { get reqParams() {
const a: any = {}; const a: any = {};
if (this.resourceStatus) { if (this.resourceStatus) {
a.wayBillStatus = this.resourceStatus a.wayBillStatus = this.resourceStatus;
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand; delete params._$expand;
@ -55,24 +54,22 @@ export class WaybillManagementBulkComponent implements OnInit {
...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] || ''
}, }
}; };
} }
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.initSF(); this.initSF();
this.initST(); this.initST();
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
} }
/** /**
* 初始化查询表单 * 初始化查询表单
*/ */
initSF() { initSF() {
this.schema = { this.schema = {
properties: { properties: {
@ -104,68 +101,39 @@ export class WaybillManagementBulkComponent implements OnInit {
searchDebounceTime: 300, searchDebounceTime: 300,
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => { onSearch: (q: any) => {
console.log(q) console.log(q);
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([]);
} }
}, }
} as SFSelectWidgetSchema
} as SFSelectWidgetSchema,
}, },
loadingPlace: { loadingPlace: {
type: 'string', type: 'string',
title: '装货地', title: '装货地'
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
},
}
}, },
dischargePlace: { dischargePlace: {
type: 'string', type: 'string',
title: '卸货地', title: '卸货地'
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
},
}
}, },
driverName: { driverName: {
title: '承运司机', title: '承运司机',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
licenseCarNo: { licenseCarNo: {
title: '车牌号', title: '车牌号',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carCaptainName: { carCaptainName: {
title: '车队长', title: '车队长',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value,
},
}
}, },
paymentstatus: { paymentstatus: {
title: '支付状态', title: '支付状态',
@ -173,11 +141,8 @@ export class WaybillManagementBulkComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLabel: true, containsAllLabel: true
visibleIf: { } as SFSelectWidgetSchema
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
}, },
serviceType: { serviceType: {
title: '服务类型', title: '服务类型',
@ -185,10 +150,7 @@ export class WaybillManagementBulkComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLabel: true, containsAllLabel: true,
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' }
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
@ -203,11 +165,8 @@ export class WaybillManagementBulkComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
allowClear: true, allowClear: true,
placeholder: '请选择', placeholder: '请选择'
visibleIf: { }
_$expand: (value: boolean) => value,
},
},
}, },
enterpriseInfoId: { enterpriseInfoId: {
type: 'string', type: 'string',
@ -215,12 +174,9 @@ export class WaybillManagementBulkComponent implements OnInit {
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()
}, }
}, },
createTime: { createTime: {
title: '创建时间', title: '创建时间',
@ -229,16 +185,12 @@ export class WaybillManagementBulkComponent implements OnInit {
widget: 'date', widget: 'date',
mode: 'range', mode: 'range',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
allowClear: true, allowClear: true
visibleIf: { } as SFDateWidgetSchema
_$expand: (value: boolean) => value, }
},
} as SFDateWidgetSchema,
},
}, },
type: 'object', type: 'object'
}; };
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
} }
/** /**
@ -288,15 +240,14 @@ export class WaybillManagementBulkComponent implements OnInit {
title: '接单数量', title: '接单数量',
index: 'orderReceivingQuantity', index: 'orderReceivingQuantity',
width: '200px', width: '200px',
className: 'text-left', className: 'text-left'
}, },
{ {
title: '结算数量', title: '结算数量',
index: '结算数量', index: '结算数量',
width: '200px', width: '200px',
className: 'text-left', className: 'text-left',
format: (item: any) => format: (item: any) => `${item.settlementWeight || ''}`
`${item.settlementWeight || ''}`
}, },
{ {
title: '承运司机', title: '承运司机',
@ -308,7 +259,7 @@ export class WaybillManagementBulkComponent implements OnInit {
title: '车队长', title: '车队长',
className: 'text-left', className: 'text-left',
width: '200px', width: '200px',
render: 'payeeName', render: 'payeeName'
}, },
{ {
title: '装卸货时间', title: '装卸货时间',
@ -320,7 +271,7 @@ export class WaybillManagementBulkComponent implements OnInit {
title: '创建时间', title: '创建时间',
width: '180px', width: '180px',
className: 'text-left', className: 'text-left',
index: 'createTime', index: 'createTime'
}, },
{ {
title: '操作', title: '操作',
@ -330,81 +281,36 @@ export class WaybillManagementBulkComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '确认发车', text: '确认发车',
click: (_record) => this.sureDepart(_record), click: _record => this.sureDepart(_record),
iif: item => item.wayBillStatus == '2', iif: item => item.wayBillStatus == '2',
acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] }, acl: { ability: ['WAYBILL-BULK-insertBulkStartCarInfo'] }
}, },
{ {
text: '确认到车', text: '确认到车',
click: (_record) => this.sureArrive(_record), click: _record => this.sureArrive(_record),
iif: item => item.wayBillStatus == '3', iif: item => item.wayBillStatus == '3',
acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] }, acl: { ability: ['WAYBILL-BULK-insertBulkUnloadCarInfo'] }
}, }
], ]
}, }
]; ];
} }
search() { search() {
this.st?.load(1); this.st?.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
}
/**
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {
console.log(item)
}
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
} }
selectChange(e: number) { selectChange(e: number) {
console.log(e);
if (e >= 1) { if (e >= 1) {
this.resourceStatus = e + 1; this.resourceStatus = e + 1;
} else { } else {
this.resourceStatus = 0 this.resourceStatus = 0;
} }
this.initST(); this.initST();
setTimeout(() => { setTimeout(() => {
this.st.load(1); this.st.load(1);
}, 500); }, 500);
} }
/**
* 导入货源
*/
importGoodsSource() {
}
audit(item: any) {
console.log(item)
}
/**
* 审核通过按钮
*/
handleOK() {
}
/**
*查看评价
*/
viewEvaluate(item: any) {
console.log(item)
this.isVisibleEvaluate = true
}
getGoodsSourceStatistical() { getGoodsSourceStatistical() {
this.tabs = { this.tabs = {
signQuantity: 0, signQuantity: 0,
@ -415,7 +321,7 @@ export class WaybillManagementBulkComponent implements OnInit {
deltQuantity: 0 deltQuantity: 0
}; };
const params: any = Object.assign({}, this.reqParams || {}); const params: any = Object.assign({}, this.reqParams || {});
delete params.wayBillStatus delete params.wayBillStatus;
this.service.request(this.service.$api_get_getBulkStatistics, params).subscribe(res => { this.service.request(this.service.$api_get_getBulkStatistics, params).subscribe(res => {
if (res) { if (res) {
let totalCount = 0; let totalCount = 0;
@ -437,11 +343,11 @@ export class WaybillManagementBulkComponent implements OnInit {
this.tabs.deltQuantity = ele?.count; this.tabs.deltQuantity = ele?.count;
break; break;
} }
totalCount += ele.count totalCount += ele.count;
}); });
this.tabs.totalQuantity = totalCount this.tabs.totalQuantity = totalCount;
} }
}) });
} }
// *确认发车 // *确认发车
@ -458,7 +364,7 @@ export class WaybillManagementBulkComponent implements OnInit {
}); });
modalRef.afterClose.subscribe((result: any) => { modalRef.afterClose.subscribe((result: any) => {
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
}); });
} }
// 确认到车 // 确认到车
@ -475,11 +381,11 @@ export class WaybillManagementBulkComponent implements OnInit {
}); });
modalRef.afterClose.subscribe((result: any) => { modalRef.afterClose.subscribe((result: any) => {
this.st.load(1); this.st.load(1);
this.getGoodsSourceStatistical() this.getGoodsSourceStatistical();
}); });
} }
// 导出 // 导出
exprot() { exprot() {
this.service.exportStart(this.reqParams,this.service.$api_asyncExportBulkList) this.service.exportStart(this.reqParams, this.service.$api_asyncExportBulkList);
} }
} }

86
src/app/routes/waybill-management/components/vehicle/vehicle.component.html
View File

@ -7,31 +7,18 @@
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
--> -->
<!-- 搜索表单 --> <!-- 搜索表单 -->
<page-header-wrapper [title]="''"> </page-header-wrapper> <!-- <page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card> <nz-card>
<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">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['WAYBILL-VEHICLE-search']">查询</button> <button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['WAYBILL-VEHICLE-export']" (click)="exprot()">导出</button> [acl-ability]="['WAYBILL-VEHICLE-search']">查询</button>
<button nz-button nzType="primary" [disabled]="false" acl [acl-ability]="['WAYBILL-VEHICLE-export']"
(click)="exprot()">导出</button>
<button nz-button [disabled]="false" (click)="resetSF()">重置</button> <button nz-button [disabled]="false" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()"> <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }} {{ !_$expand ? '展开' : '收起' }}
@ -40,36 +27,32 @@
</div> </div>
</ng-container> </ng-container>
</div> </div>
</nz-card> </nz-card> -->
<nz-card> <nz-card class="table-box">
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"> <div class="tab_header">
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab> <label class="page_title"> <label class="driver">|</label> 整车运单</label>
<nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab> <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab> <nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
</nz-tabset> <nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
<div style="margin-top: 15px"> <nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
<st </nz-tabset>
#st </div>
[bordered]="true" <div>
[scroll]="{ x: '2000px' }" <st #st [bordered]="true" [scroll]="{ x: '2000px',y:scrollY }" [data]="service.$api_get_wholePage" [columns]="columns"
[data]="service.$api_get_wholePage"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[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] }" [loading]="false">
[loading]="false" <ng-template st-row="createUserName" let-item let-index="index">
> <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
<ng-template st-row="createUserName" let-item let-index="index"> </ng-template>
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div> <ng-template st-row="createUserName" let-item let-index="index">
</ng-template> <div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
<ng-template st-row="createUserName" let-item let-index="index"> </ng-template>
<div> {{ item?.createUserName }}/{{ item?.createUserPhone }} </div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index"> <ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div> <div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </div>
</ng-template> </ng-template>
@ -95,7 +78,7 @@
<span>{{item?.wayBillStatusLabel}}</span> <span>{{item?.wayBillStatusLabel}}</span>
</div> </div>
<div> <div>
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span> <span>{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div> </div>
</ng-template> </ng-template>
<ng-template st-row="wayBill" let-item let-index="index"> <ng-template st-row="wayBill" let-item let-index="index">
@ -103,7 +86,8 @@
</ng-template> </ng-template>
<ng-template st-row="goodsInfos" let-item let-index="index"> <ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{ item?.goodsInfos?.goodsName }}</div> <div>{{ item?.goodsInfos?.goodsName }}</div>
<div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{ item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div> <div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{
item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
</ng-template> </ng-template>
<ng-template st-row="loadingTime" let-item let-index="index"> <ng-template st-row="loadingTime" let-item let-index="index">
<div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div> <div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
@ -112,3 +96,11 @@
</st> </st>
</div> </div>
</nz-card> </nz-card>
<ng-template #extraTemplate>
<div class="mr-sm">
<button nz-button nzDanger [nzLoading]="service.http.loading" (click)="openDrawer()" acl
[acl-ability]="['WAYBILL-VEHICLE-search']">筛选</button>
<button nz-button nzDanger acl [acl-ability]="['WAYBILL-VEHICLE-export']" (click)="exprot()">导出</button>
</div>
</ng-template>

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

@ -2,11 +2,12 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st'; import { STColumn, STComponent } 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 { ModalHelper, _HttpClient } from '@delon/theme'; import { ModalHelper, _HttpClient } from '@delon/theme';
import { ShipperBaseService } from '@shared'; import { SearchDrawerService, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal'; import { NzModalService } from 'ng-zorro-antd/modal';
import { NzUploadChangeParam } from 'ng-zorro-antd/upload'; import { NzUploadChangeParam } from 'ng-zorro-antd/upload';
import { of } from 'rxjs'; import { of } from 'rxjs';
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { BasicTableComponent } from 'src/app/routes/commom';
import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component'; import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component'; import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
import { WaybillManagementServe } from '../../services/waybill-management.service'; import { WaybillManagementServe } from '../../services/waybill-management.service';
@ -14,17 +15,13 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic
@Component({ @Component({
selector: 'app-supply-management-vehicle', selector: 'app-supply-management-vehicle',
templateUrl: './vehicle.component.html', templateUrl: './vehicle.component.html',
styleUrls: ['./vehicle.component.less', '../../../commom/less/expend-but.less', '../../../commom/less/box.less'] styleUrls: ['../../../commom/less/commom-table.less', './vehicle.component.less']
}) })
export class WaybillManagementVehicleComponent implements OnInit { export class WaybillManagementVehicleComponent extends BasicTableComponent implements OnInit {
ui: SFUISchema = {};
schema: SFSchema = {};
isVisibleEvaluate = false; isVisibleEvaluate = false;
isVisible = false; isVisible = false;
_$expand = false;
resourceStatus: any; resourceStatus: any;
@ViewChild('st') private readonly st!: STComponent; @ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
tabs = { tabs = {
signQuantity: 0, signQuantity: 0,
@ -35,7 +32,14 @@ export class WaybillManagementVehicleComponent implements OnInit {
compolatelQuantity: 0, compolatelQuantity: 0,
deltQuantity: 0 deltQuantity: 0
}; };
constructor(public service: WaybillManagementServe, private modal: NzModalService, public shipperservice: ShipperBaseService) {} constructor(
public service: WaybillManagementServe,
private modal: NzModalService,
public shipperservice: ShipperBaseService,
public searchDrawerService: SearchDrawerService
) {
super(searchDrawerService);
}
/** /**
* 查询参数 * 查询参数
@ -99,9 +103,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
searchDebounceTime: 300, searchDebounceTime: 300,
searchLoadingText: '搜索中...', searchLoadingText: '搜索中...',
allowClear: true, allowClear: true,
visibleIf: {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => { onSearch: (q: any) => {
let str = q.replace(/^\s+|\s+$/g, ''); let str = q.replace(/^\s+|\s+$/g, '');
if (str) { if (str) {
@ -123,57 +124,29 @@ export class WaybillManagementVehicleComponent implements OnInit {
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: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
dischargePlace: { dischargePlace: {
type: 'string', type: 'string',
title: '卸货地', title: '卸货地'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
driverName: { driverName: {
title: '承运司机', title: '承运司机',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
licenseCarNo: { licenseCarNo: {
title: '车牌号', title: '车牌号',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
carCaptainName: { carCaptainName: {
title: '车队长', title: '车队长',
type: 'string', type: 'string'
ui: {
visibleIf: {
_$expand: (value: boolean) => value
}
}
}, },
paymentstatus: { paymentstatus: {
title: '支付状态', title: '支付状态',
@ -181,10 +154,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
params: { dictKey: 'overall:payment:status' }, params: { dictKey: 'overall:payment:status' },
containsAllLabel: true, containsAllLabel: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
serviceType: { serviceType: {
@ -193,10 +163,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
ui: { ui: {
widget: 'dict-select', widget: 'dict-select',
containsAllLabel: true, containsAllLabel: true,
params: { dictKey: 'service:type' }, params: { dictKey: 'service:type' }
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema } as SFSelectWidgetSchema
}, },
@ -211,10 +178,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
ui: { ui: {
widget: 'select', widget: 'select',
placeholder: '请选择', placeholder: '请选择',
allowClear: true, allowClear: true
visibleIf: {
_$expand: (value: boolean) => value
}
} }
}, },
enterpriseInfoId: { enterpriseInfoId: {
@ -223,9 +187,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
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()
} }
@ -237,16 +198,12 @@ export class WaybillManagementVehicleComponent implements OnInit {
widget: 'date', widget: 'date',
mode: 'range', mode: 'range',
format: 'yyyy-MM-dd', format: 'yyyy-MM-dd',
allowClear: true, allowClear: true
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFDateWidgetSchema } as SFDateWidgetSchema
} }
}, },
type: 'object' type: 'object'
}; };
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
} }
// 获取城市列表 // 获取城市列表
getRegionCode(regionCode: any) { getRegionCode(regionCode: any) {
@ -364,29 +321,9 @@ export class WaybillManagementVehicleComponent implements OnInit {
} }
]; ];
} }
/**
* 查询字段个数
*/
get queryFieldCount(): number {
return Object.keys(this.schema?.properties || {}).length;
}
/**
* 伸缩查询条件
*/
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) { tabChange(item: any) {
console.log(item); console.log(item);
} }
/**
* 重置表单
*/
resetSF(): void {
this.sf.reset();
this._$expand = false;
}
search() { search() {
this.st?.load(1); this.st?.load(1);
this.getGoodsSourceStatistical(); this.getGoodsSourceStatistical();

1
src/app/shared/components/search-drawer/search-drawer.component.ts
View File

@ -41,6 +41,7 @@ export class SearchDrawerComponent implements OnInit, AfterViewInit {
resetSF(): void { resetSF(): void {
this.sf.reset(); this.sf.reset();
this.defaultValue = {};
} }
search() { search() {