@@ -25,7 +24,7 @@
-
+
已选择
{{ selectedRows.length }} 条运单
@@ -33,20 +32,16 @@
-
-
-
-
\ No newline at end of file
+ [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
+
+ 张三
13812345678
+
+
+ 粤B88888
张三
+
+
+
\ No newline at end of file
diff --git a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
index 8b4b0eff..d391826b 100644
--- a/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
+++ b/src/app/routes/ticket-management/components/etc-invoiced-requested/etc-invoiced-requested.component.ts
@@ -1,6 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
-import { STComponent, STColumn, STChange } from '@delon/abc/st';
+import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFSchema, SFDateWidgetSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { TicketService } from '../../services/ticket.service';
@@ -8,127 +8,17 @@ import { TicketService } from '../../services/ticket.service';
@Component({
selector: 'app-etc-invoiced-requested',
templateUrl: './etc-invoiced-requested.component.html',
- styleUrls: ['./etc-invoiced-requested.component.less']
+ styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
})
export class ETCInvoicedRequestedComponent implements OnInit {
- url = `/rule?_allow_anonymous=true`;
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
@ViewChild('auditModal', { static: false })
auditModal!: any;
- columns: STColumn[] = [
- { title: '', index: 'key', type: 'checkbox' },
- { title: '运单号', index: 'no' },
- { title: '司机', index: 'callNo' },
- { title: '装货地', index: 'callNo' },
- { title: '卸货地', index: 'callNo' },
- { title: '托运人', index: 'callNo' },
- { title: '无车承运人', index: 'callNo' },
- { title: '派车时间', index: 'updatedAt', type: 'date' },
- { title: '提货时间', index: 'updatedAt', type: 'date' },
- { title: '卸货时间', index: 'updatedAt', type: 'date' },
- { title: '签收时间', index: 'updatedAt', type: 'date' },
- ];
- searchSchema: SFSchema = {
- properties: {
- expand: {
- type: 'boolean',
- ui: {
- hidden: true
- }
- },
- orderSn: {
- type: 'string',
- title: '运单号',
- ui: {
- autocomplete: 'off',
- placeholder: '请输入'
- }
- },
- orderSn1: {
- type: 'string',
- title: '司机',
- ui: {
- autocomplete: 'off',
- placeholder: '姓名/手机'
- }
- },
- orderSn2: {
- type: 'string',
- title: '车牌号',
- ui: {
- autocomplete: 'off',
- placeholder: '请输入'
- }
- },
- orderS3: {
- type: 'string',
- title: '卸货地',
- ui: {
- autocomplete: 'off',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- orderSn4: {
- type: 'string',
- title: '装货地',
- ui: {
- autocomplete: 'off',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- orderSn5: {
- type: 'string',
- title: '托运人',
- enum: [
- { label: '全部', value: '全部' },
- { label: '企业认证审核', value: '企业认证审核' },
- { label: '企业管理员审核', value: '企业管理员审核' }
- ],
- ui: {
- widget: 'select',
- placeholder: '请选择',
- change: (i: any) => {
- this.sf.value.receiveName = i;
- this.sf?.setValue('/receiveName', i);
- },
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- },
- receiveName: {
- type: 'string',
- title: '无车承运人',
- enum: [
- { label: '全部', value: '全部' },
- { label: '企业认证审核', value: '企业认证审核' },
- { label: '企业管理员审核', value: '企业管理员审核' }
- ],
- ui: {
- widget: 'select',
- placeholder: '请选择',
- change: (i: any) => {
- this.sf.value.receiveName = i;
- this.sf?.setValue('/receiveName', i);
- },
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
- }
- }
- };
-
- reqParams = {};
+ columns: STColumn[] = this.initST();
+ searchSchema: SFSchema = this.initSF();
_$expand = false;
@@ -137,64 +27,31 @@ export class ETCInvoicedRequestedComponent implements OnInit {
ngOnInit(): void {}
+ beforeReq = (requestOptions: STRequestOptions) => {
+ if (this.sf) {
+ Object.assign(requestOptions.body, {
+ ...this.sf.value
+ });
+ }
+ return requestOptions;
+ };
+
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
break;
- case 'filter':
- this.st.load();
- break;
}
}
- approval(): void {}
-
- add(): void {}
-
- routeTo(item: any) {
- this.router.navigate(['/ticket/invoice-requested-detail/1']);
- }
-
- auditAction(item: any) {
- const modal = this.nzModalService.create({
- nzTitle: '审核',
- nzContent: this.auditModal,
- nzFooter: [
- {
- label: '拒绝',
- type: 'default',
- onClick: () => {
- modal.destroy();
- }
- },
- {
- label: '通过',
- type: 'primary',
- onClick: () => {
- modal.destroy();
- }
- }
- ]
- });
- modal.afterClose.subscribe(res => {
- this.st.load();
- });
- }
-
- showReason(item: any) {
- const modal = this.nzModalService.create({
- nzTitle: '查看原因',
- nzContent: '运单数据异常，暂时无法开票，请联系客服400-xxxx-xxxx',
- nzFooter: [
- {
- label: '关闭',
- type: 'primary',
- onClick: () => {
- modal.destroy();
- }
- }
- ]
+ auditAction() {
+ if (this.selectedRows?.length <= 0) {
+ this.service.msgSrv.warning('请选择申请记录');
+ return;
+ }
+ const modal = this.nzModalService.warning({
+ nzTitle: '确定对已选运单批量申请开票？',
+ nzOnOk: () => {}
});
}
@@ -213,4 +70,149 @@ export class ETCInvoicedRequestedComponent implements OnInit {
this._$expand = !this._$expand;
this.sf?.setValue('/expand', this._$expand);
}
+
+ private initSF(): SFSchema {
+ return {
+ properties: {
+ expand: {
+ type: 'boolean',
+ ui: {
+ hidden: true
+ }
+ },
+ orderSn: {
+ type: 'string',
+ title: '运单号',
+ ui: {
+ autocomplete: 'off',
+ placeholder: '请输入'
+ }
+ },
+ orderS2n: {
+ type: 'string',
+ title: '订单号',
+ ui: {
+ autocomplete: 'off',
+ placeholder: '请输入'
+ }
+ },
+ order2S2n: {
+ type: 'string',
+ title: '订单类型',
+ ui: {
+ widget: 'dict-select',
+ params: { dictKey: 'refund:apply:status' },
+ placeholder: '请选择'
+ }
+ },
+ orderSn1: {
+ type: 'string',
+ title: '司机姓名',
+ ui: {
+ placeholder: '请输入',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ ord0erSn1: {
+ type: 'string',
+ title: '司机手机',
+ ui: {
+ placeholder: '请输入',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ orderSn2: {
+ type: 'string',
+ title: '车牌号',
+ ui: {
+ placeholder: '请输入',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ orderS1n2: {
+ type: 'string',
+ title: '车辆所有人',
+ ui: {
+ placeholder: '请输入',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ orderS3: {
+ type: 'string',
+ title: '卸货地',
+ ui: {
+ autocomplete: 'off',
+ placeholder: '请选择',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ orderSn4: {
+ type: 'string',
+ title: '装货地',
+ ui: {
+ autocomplete: 'off',
+ placeholder: '请选择',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ orderSn5: {
+ type: 'string',
+ title: '托运人',
+ enum: [{ label: '全部', value: '全部' }],
+ ui: {
+ widget: 'select',
+ placeholder: '请选择',
+ visibleIf: {
+ expand: (value: boolean) => value
+ }
+ }
+ },
+ ltdId: {
+ type: 'string',
+ title: '网络货运人',
+ ui: {
+ widget: 'select',
+ placeholder: '请选择',
+ allowClear: true,
+ visibleIf: {
+ expand: (value: boolean) => value
+ },
+ asyncData: () => this.service.getNetworkFreightForwarder()
+ },
+ default: ''
+ }
+ }
+ };
+ }
+
+ private initST(): STColumn[] {
+ return [
+ { title: '', index: 'key', type: 'checkbox' },
+ { title: '运单号', index: 'no' },
+ { title: '订单号', index: 'no' },
+ { title: '订单类型', index: 'no' },
+ { title: '装货地', index: 'callNo' },
+ { title: '卸货地', index: 'callNo' },
+ { title: '司机信息', render: 'call1No' },
+ { title: '车辆信息', render: 'call1N2o' },
+ { title: '托运人', index: 'callNo' },
+ { title: '网络货运人', index: 'callNo' },
+ { title: '接单时间', index: 'updatedAt', type: 'date' },
+ { title: '装货时间', index: 'updatedAt', type: 'date' },
+ { title: '卸货时间', index: 'updatedAt', type: 'date' },
+ { title: '签收时间', index: 'updatedAt', type: 'date' }
+ ];
+ }
}
diff --git a/src/app/routes/ticket-management/ticket-management.module.ts b/src/app/routes/ticket-management/ticket-management.module.ts
index 0bcbcbca..a5ad88b3 100644
--- a/src/app/routes/ticket-management/ticket-management.module.ts
+++ b/src/app/routes/ticket-management/ticket-management.module.ts
@@ -15,6 +15,8 @@ import { RequestedDetailComponent } from './components/invoice-requested/request
import { InvoiceDetailComponent } from './components/invoice-detail/invoice-detail.component';
import { CancellationInvoiceComponent } from './components/cancellation-invoice/cancellation-invoice.component';
import { PushInvoiceComponent } from './components/cancellation-invoice/push-invoice/push-invoice.component';
+import { AddOwnerComponent } from './components/etc-blacklist/add-owner/add-owner.component';
+import { AddCartComponent } from './components/etc-blacklist/add-cart/add-cart.component';
const COMPONENTS: any = [
ETCInvoicedListComponent,
@@ -25,11 +27,18 @@ const COMPONENTS: any = [
InvoicedListComponent,
InvoiceRequestedDetailComponent,
InvoiceDetailComponent,
- CancellationInvoiceComponent
+ CancellationInvoiceComponent,
+ PushInvoiceComponent
+];
+const NOTROUTECOMPONENTS: any = [
+ TransactionDetailsComponent,
+ RequestedInvoiceModalComponent,
+ RequestedDetailComponent,
+ AddOwnerComponent,
+ AddCartComponent
];
-const NOTROUTECOMPONENTS: any = [TransactionDetailsComponent, RequestedInvoiceModalComponent, RequestedDetailComponent];
@NgModule({
- declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS, PushInvoiceComponent],
+ declarations: [...COMPONENTS, ...NOTROUTECOMPONENTS],
imports: [CommonModule, TicketManagementRoutingModule, SharedModule]
})
export class TicketManagementModule {}
diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json
index 292d338e..c14fe9ef 100644
--- a/src/assets/mocks/menu-data.json
+++ b/src/assets/mocks/menu-data.json
@@ -360,7 +360,7 @@
"link": "/ticket/etc-invoice-requested"
},
{
- "text": "运单开票记录",
+ "text": "开票记录",
"link": "/ticket/etc-invoice-list"
},
{
@@ -368,7 +368,7 @@
"link": "/ticket/etc-invoiced-logs"
},
{
- "text": "黑名单",
+ "text": "ETC白名单",
"link": "/ticket/etc-blacklist"
}
]