-
+
+ [loading]="false" [scroll]="{ x:'1200px',y:scrollY }" (change)="stChange($event)">
\ No newline at end of file
diff --git a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
index 54322cb9..f5c9dd9a 100644
--- a/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/input-invoice/input-invoice.component.ts
@@ -1,32 +1,39 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STRequestOptions, STChange } from '@delon/abc/st';
-import { SFComponent, SFDateWidgetSchema, SFSchema } from '@delon/form';
+import { SFDateWidgetSchema, SFSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
import { AddCollectionInvoiceModalComponent } from './add-collection-invoice-modal/add-collection-invoice-modal.component';
@Component({
selector: 'app-input-invoice',
templateUrl: './input-invoice.component.html',
- styleUrls: ['../../../commom/less/box.less', '../../../commom/less/expend-but.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class InputInvoiceComponent implements OnInit {
+export class InputInvoiceComponent extends BasicTableComponent {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
@ViewChild('auditModal', { static: false })
auditModal!: any;
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
-
- _$expand = false;
+ schema: SFSchema = this.initSF();
selectedRows: any[] = [];
- constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(
+ public service: TicketService,
+ private nzModalService: NzModalService,
+ private router: Router,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
- ngOnInit(): void {}
+ search() {
+ this.st?.load(1);
+ }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.sf) {
@@ -66,22 +73,6 @@ export class InputInvoiceComponent implements OnInit {
});
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
private initSF(): SFSchema {
return {
properties: {
@@ -127,10 +118,7 @@ export class InputInvoiceComponent implements OnInit {
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -141,10 +129,7 @@ export class InputInvoiceComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
allowClear: true,
- asyncData: () => this.service.getCRMCustomerId(),
- visibleIf: {
- expand: (value: boolean) => value
- }
+ asyncData: () => this.service.getCRMCustomerId()
}
},
createtime: {
@@ -152,10 +137,7 @@ export class InputInvoiceComponent implements OnInit {
type: 'string',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
sts: {
@@ -168,10 +150,7 @@ export class InputInvoiceComponent implements OnInit {
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -180,40 +159,28 @@ export class InputInvoiceComponent implements OnInit {
title: '发票日期',
ui: {
widget: 'sl-from-to-search',
- format: 'yyyy-MM-dd',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
}
},
remarks: {
type: 'string',
title: '收票备注',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
billCode: {
type: 'string',
title: '订单号',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
},
feecode: {
type: 'string',
title: '费用号',
ui: {
- placeholder: '请输入',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请输入'
}
}
}
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
index f88880f2..2badcf22 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
@@ -1,16 +1,4 @@
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
已选择
@@ -47,17 +40,35 @@
{{ totalCallNo }}
清空
-
-
-
-
+
+
+
+
+
+ -
+ 批量受理
+
+ -
+ 驳回
+
+ -
+ 修改地址
+
+ -
+ 快递下单
+
+
+
+ [page]="{}" [res]="{ process: afterRes }" [loading]="false" [scroll]="{ x: '1200px',y:scrollY }" (change)="stChange($event)">
{{ item.vatappcode }}
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less
deleted file mode 100644
index 370d3cae..00000000
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.less
+++ /dev/null
@@ -1,7 +0,0 @@
-:host::ng-deep {
-
- .ant-tabs-tab-btn {
- padding-left : 16px;
- padding-right: 16px;
- }
-}
\ No newline at end of file
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
index cce37763..ad4c620e 100644
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@@ -1,11 +1,11 @@
-import { query } from '@angular/animations';
-import { CurrencyPipe } from '@angular/common';
import { Component, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { STComponent, STColumn, STChange, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFDateWidgetSchema, SFUISchema } from '@delon/form';
+import { SFSchema, SFDateWidgetSchema } from '@delon/form';
+import { SearchDrawerService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { delay } from 'rxjs/operators';
+import { BasicTableComponent } from 'src/app/routes/commom';
import { TicketService } from '../../services/ticket.service';
import { PrintOrderModalComponent } from './print-order-modal/print-order-modal.component';
@@ -15,26 +15,33 @@ import { UpdateAddressModalComponent } from './update-address-modal/update-addre
@Component({
selector: 'app-invoice-requested',
templateUrl: './invoice-requested.component.html',
- styleUrls: ['./invoice-requested.component.less', '../../../commom/less/box.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
-export class InvoiceRequestedComponent {
+export class InvoiceRequestedComponent extends BasicTableComponent {
@ViewChild('st', { static: true })
st!: STComponent;
- @ViewChild('sf', { static: false })
- sf!: SFComponent;
@ViewChild('rejectModal', { static: false })
rejectModal!: any;
resourceStatus: any = '1';
columns: STColumn[] = this.initST();
- searchSchema: SFSchema = this.initSF();
-
- _$expand = false;
+ schema: SFSchema = this.initSF();
totalCallNo = 0;
selectedRows: any[] = [];
rejectReason = '';
- constructor(public service: TicketService, private nzModalService: NzModalService, private router: Router) {}
+ constructor(
+ public service: TicketService,
+ private nzModalService: NzModalService,
+ private router: Router,
+ public searchDrawerService: SearchDrawerService
+ ) {
+ super(searchDrawerService);
+ }
+
+ search() {
+ this.st?.load(1);
+ }
beforeReq = (requestOptions: STRequestOptions) => {
if (this.resourceStatus) {
@@ -300,22 +307,6 @@ export class InvoiceRequestedComponent {
}
}
- /**
- * 重置表单
- */
- resetSF() {
- this.sf.reset();
- this._$expand = false;
- }
-
- /**
- * 伸缩查询条件
- */
- expandToggle() {
- this._$expand = !this._$expand;
- this.sf?.setValue('/expand', this._$expand);
- }
-
// 导出
exprot() {
this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_invoice_requested_page);
@@ -357,9 +348,6 @@ export class InvoiceRequestedComponent {
default: '',
ui: {
widget: 'select',
- visibleIf: {
- expand: (value: boolean) => value
- },
asyncData: () => this.service.getEnterpriseProject()
}
},
@@ -369,9 +357,6 @@ export class InvoiceRequestedComponent {
ui: {
widget: 'select',
placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- },
allowClear: true,
asyncData: () => this.service.getNetworkFreightForwarder()
},
@@ -379,12 +364,7 @@ export class InvoiceRequestedComponent {
},
otherremarks: {
type: 'string',
- title: '其他需求',
- ui: {
- visibleIf: {
- expand: (value: boolean) => value
- }
- }
+ title: '其他需求'
},
createTime: {
title: '申请时间',
@@ -393,10 +373,7 @@ export class InvoiceRequestedComponent {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
placeholder: '请选择',
- nzShowTime: true,
- visibleIf: {
- expand: (value: boolean) => value
- }
+ nzShowTime: true
} as SFDateWidgetSchema
},
isdetail: {
@@ -409,10 +386,7 @@ export class InvoiceRequestedComponent {
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- expand: (value: boolean) => value
- }
+ placeholder: '请选择'
},
default: ''
},
@@ -425,10 +399,7 @@ export class InvoiceRequestedComponent {
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
allowClear: true,
- onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q }),
- visibleIf: {
- expand: (value: boolean) => value
- }
+ onSearch: (q: any) => this.service.getEnterpriceList({ enterpriseName: q })
}
}
}
diff --git a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
index 1dff8e97..0514aa52 100644
--- a/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
+++ b/src/app/routes/ticket-management/components/invoiced-list/invoiced-list.component.html
@@ -1,14 +1,4 @@
-
-
+