diff --git a/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html new file mode 100644 index 0000000..cf2f9a3 --- /dev/null +++ b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html @@ -0,0 +1,179 @@ + + + + + +
+
+
+
+ + 商户号 + + + + + + +
+ +
+ + 清算起始日期 + + + + +
+ +
+ + 清算终止日期 + + + + +
+
+ +
+
+ + +
+
+
+
+ +
+
+

+ 汇总： + 笔数 {{dataObject.totalTradeNum}}、 + 交易金额 {{dataObject.totalTradeAmount}} 元、 + 手续费 {{dataObject.totalShdFeeAmount}} 元、 + 应结算金额 {{dataObject.totalSettleAmount}} 元 + +

+
+ + + + + 清算日期 + 商户号 + 商户名称 + 交易金额 + 清算金额 + 手续费 + 交易笔数 + + + + + + {{data.settleDay}} + {{data.merNo}} + {{data.merName}} + {{data.tradeAmount}} + {{data.settleAmount}} + {{data.shdFeeAmount}} + {{data.tradeNum}} + + + + +
+ + + + + + Name + Age + Address + Action + + + + + {{data.name}} + {{data.age}} + {{data.address}} + + Action 一 {{data.name}} + + Delete + + + + + + + + + + + diff --git a/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.scss b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.spec.ts b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.spec.ts new file mode 100644 index 0000000..5a38163 --- /dev/null +++ b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TradeCheckingDetailComponent } from './trade-checking-detail.component'; + +describe('TradeCheckingDetailComponent', () => { + let component: TradeCheckingDetailComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TradeCheckingDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TradeCheckingDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.ts b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.ts new file mode 100644 index 0000000..b507c62 --- /dev/null +++ b/src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.ts @@ -0,0 +1,161 @@ +import { Component, OnInit } from '@angular/core'; +import {FormBuilder, FormGroup} from '@angular/forms'; +import {NzMessageService, NzModalService} from 'ng-zorro-antd'; +import {PlatformService} from '../../../services/platform.service'; +import {MerService} from '../../../services/mer.service'; +import {TradeCheckingService} from '../../../services/trade-checking.service'; +import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; + +@Component({ + selector: 'app-trade-checking-detail', + templateUrl: './trade-checking-detail.component.html', + styleUrls: ['./trade-checking-detail.component.scss'] +}) +export class TradeCheckingDetailComponent implements OnInit { + tableLoading = true; + searchForm: FormGroup; + pageNum: number; + whereObject: any = {}; + + merArray = []; + + dataObject = { + totalTradeNum: 0, + totalTradeAmount: 0, + totalSettleAmount: 0, + totalShdFeeAmount: 0, + settleDetailList: [] + }; + dataDetailModal = false; + dataDetailObject = false; + currentDate = new Date(); + constructor(private modal: NzModalService, + private message: NzMessageService, + private form: FormBuilder, + private platformService: PlatformService, + private merService: MerService, + private tradeCheckingService: TradeCheckingService) { + } + + ngOnInit(): void { + this.currentDate.setDate(this.currentDate.getDate() - 1); + this.searchForm = this.form.group({ + merNo: [null], + settleTimeS: [ this.currentDate.getTime() ], + settleTimeE: [ this.currentDate.getTime() ], + }); + + this.merService.getMerList({ merStatus: 1, pageNum: 1, pageSize: 9999}, data => { + this.merArray = data['return_data']['list']; + if (this.merArray.length > 0) { + this.searchForm.controls['merNo'].setValue(this.merArray[0]['merNo']); + this.requestData(); + } + }); + } + + /** + * 请求数据 + */ + requestData() { + this.tableLoading = true; + this.tradeCheckingService.queryCheckingDetail(this.searchForm.value, data => { + if (data['return_code'] === '000000') { + this.dataObject = data['return_data']; + } else { + this.modal.error({ + nzTitle: '提示', + nzContent: data['return_msg'] + }); + } + this.tableLoading = false; + }); + } + + /** + * 搜索 + * @param whereObject 条件 + */ + search(whereObject: object) { + whereObject['settleTimeS'] = new Date(whereObject['settleTimeS']).getTime(); + whereObject['settleTimeE'] = new Date(whereObject['settleTimeE']).getTime(); + this.whereObject = whereObject; + this.requestData(); + } + + /** + * 重置 + */ + resetForm(): void { + this.searchForm.reset(); + this.searchForm.controls['merNo'].setValue(this.merArray.length > 0 ? this.merArray[0]['merNo'] : null); + this.searchForm.controls['settleTimeS'].setValue(this.currentDate.getTime()); + this.searchForm.controls['settleTimeE'].setValue(this.currentDate.getTime()); + } + + showDetailModal(settleDay: string) { + this.dataDetailModal = true; + } + + closeDetailModal() { + this.dataDetailModal = false; + } + + disabledDate = (current: Date): boolean => { + // Can not select days before today and today + return differenceInCalendarDays(current, new Date()) > 0; + }; + + + searchSettleTime(dateType: number, selectDate: Date) { + if (new Date().getDate() === selectDate.getDate()) { + this.modal.error({ + nzTitle: '提示', + nzContent: '无法选择当日，当日还未清算' + }); + // 起始时间 + if (dateType === 1) { + this.searchForm.controls['settleTimeS'].setValue(this.currentDate.getTime()); + // 终止时间 + } else if (dateType === 2) { + this.searchForm.controls['settleTimeE'].setValue(this.currentDate.getTime()); + } + } + } + showPrint() { + console.log(document.getElementById('print-content').innerHTML); + const oblHtml = window.document.body.innerHTML; + const bdhtml = document.getElementById('print-content').innerHTML; + window.document.body.innerHTML = bdhtml; + window.print(); + document.body.innerHTML = oblHtml; + window.location.reload(); + } + + + // 此处为图文打印 + printQrCode(idstr) { +/* const imgUrlStr = 'https://weiliicimg9.pstatp.com/weili/l/905526294583705654.jpg'; + let iframe = document.createElement('IFRAME'), + doc = null, + img = new Image(); + img.src = imgUrlStr; + iframe.setAttribute('style', 'position:absolute;width:0px;height:0px;left:-500px;top:-500px;'); + document.body.appendChild(iframe); + doc = iframe.contentWindow.document; + doc.write('

Print Pictures and Words

'); + doc.body.append(img); + console.log(doc.body.innerHTML); + doc.close(); + const newWindow = window.open('', ''); + newWindow.document.write(doc.body.innerHTML); + newWindow.print(); + newWindow.close();*/ + +/* iframe.onload = function() { //解决图片显示不了的问题 + iframe.contentWindow.focus(); + iframe.contentWindow.print(); + document.body.removeChild(iframe); + };*/ + } +} diff --git a/src/app/admin/trade-checking/trade-checking-routing.module.ts b/src/app/admin/trade-checking/trade-checking-routing.module.ts new file mode 100644 index 0000000..e63f778 --- /dev/null +++ b/src/app/admin/trade-checking/trade-checking-routing.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import {TradeCheckingComponent} from './trade-checking/trade-checking.component'; +import {TradeCheckingDetailComponent} from './trade-checking-detail/trade-checking-detail.component'; + + +const routes: Routes = [ + { path: 'tradeChecking', component: TradeCheckingComponent }, + { path: 'tradeCheckingDetail', component: TradeCheckingDetailComponent }, +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class TradeCheckingRoutingModule { } diff --git a/src/app/admin/trade-checking/trade-checking.module.ts b/src/app/admin/trade-checking/trade-checking.module.ts new file mode 100644 index 0000000..fac05dc --- /dev/null +++ b/src/app/admin/trade-checking/trade-checking.module.ts @@ -0,0 +1,25 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { TradeCheckingRoutingModule } from './trade-checking-routing.module'; +import { TradeCheckingComponent } from './trade-checking/trade-checking.component'; +import { TradeCheckingDetailComponent } from './trade-checking-detail/trade-checking-detail.component'; +import {NgZorroAntdModule} from 'ng-zorro-antd'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module'; +import {AppCommonModule} from '../../app-common.module'; + + +@NgModule({ + declarations: [TradeCheckingComponent, TradeCheckingDetailComponent], + imports: [ + CommonModule, + TradeCheckingRoutingModule, + NgZorroAntdModule, + ReactiveFormsModule, + FormsModule, + BreadcrumbModule, + AppCommonModule, + ] +}) +export class TradeCheckingModule { } diff --git a/src/app/admin/trade-checking/trade-checking/trade-checking.component.html b/src/app/admin/trade-checking/trade-checking/trade-checking.component.html new file mode 100644 index 0000000..f75c7c2 --- /dev/null +++ b/src/app/admin/trade-checking/trade-checking/trade-checking.component.html @@ -0,0 +1,132 @@ + + + + + +
+
+
+
+ + 商户号 + + + + + + +
+ +
+ + 清算起始日期 + + + + +
+ +
+ + 清算终止日期 + + + + +
+
+ +
+
+ + +
+
+
+
+ +
+
+

+ 清算日期: {{this.searchForm.value.settleTimeS | date: 'yyyy-MM-dd'}} 至 {{this.searchForm.value.settleTimeE | date: 'yyyy-MM-dd'}} + + +

+
+ + + + + 商户号 + 商户名称 + 交易金额 + 清算金额 + 手续费 + 交易笔数 + + + + + {{data.merNo}} + {{data.merName}} + {{data.totalTradeAmount}} + {{data.totalSettleAmount}} + {{data.totalShdFeeAmount}} + {{data.totalTradeNum}} + + + +
+ + + + + diff --git a/src/app/admin/trade-checking/trade-checking/trade-checking.component.scss b/src/app/admin/trade-checking/trade-checking/trade-checking.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/admin/trade-checking/trade-checking/trade-checking.component.spec.ts b/src/app/admin/trade-checking/trade-checking/trade-checking.component.spec.ts new file mode 100644 index 0000000..0da3bb1 --- /dev/null +++ b/src/app/admin/trade-checking/trade-checking/trade-checking.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TradeCheckingComponent } from './trade-checking.component'; + +describe('TradeCheckingComponent', () => { + let component: TradeCheckingComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TradeCheckingComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TradeCheckingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/admin/trade-checking/trade-checking/trade-checking.component.ts b/src/app/admin/trade-checking/trade-checking/trade-checking.component.ts new file mode 100644 index 0000000..782041d --- /dev/null +++ b/src/app/admin/trade-checking/trade-checking/trade-checking.component.ts @@ -0,0 +1,121 @@ +import { Component, OnInit } from '@angular/core'; +import {FormBuilder, FormGroup} from '@angular/forms'; +import {NzMessageService, NzModalService} from 'ng-zorro-antd'; +import {PlatformService} from '../../../services/platform.service'; +import {TradeCheckingService} from '../../../services/trade-checking.service'; +import {MerService} from '../../../services/mer.service'; +import differenceInCalendarDays from 'date-fns/differenceInCalendarDays'; +@Component({ + selector: 'app-trade-checking', + templateUrl: './trade-checking.component.html', + styleUrls: ['./trade-checking.component.scss'] +}) +export class TradeCheckingComponent implements OnInit { + tableLoading = true; + searchForm: FormGroup; + pageNum: number; + whereObject: any = {}; + + merArray = []; + + dataObjectArray = []; + dataObject = {}; + currentDate = new Date(); + constructor(private modal: NzModalService, + private message: NzMessageService, + private form: FormBuilder, + private platformService: PlatformService, + private merService: MerService, + private tradeCheckingService: TradeCheckingService) { + } + + ngOnInit(): void { + this.currentDate.setDate(this.currentDate.getDate() - 1); + this.searchForm = this.form.group({ + merNo: [null], + settleTimeS: [ this.currentDate.getTime() ], + settleTimeE: [ this.currentDate.getTime() ], + }); + + this.merService.getMerList({ merStatus: 1, pageNum: 1, pageSize: 9999}, data => { + this.merArray = data['return_data']['list']; + if (this.merArray.length > 0) { + this.searchForm.controls['merNo'].setValue(this.merArray[0]['merNo']); + this.requestData(); + } + }); + } + + /** + * 请求数据 + */ + requestData() { + this.tableLoading = true; + this.tradeCheckingService.queryChecking(this.searchForm.value, data => { + if (data['return_code'] === '000000') { + this.dataObjectArray = Array(data['return_data']); + } else { + this.modal.error({ + nzTitle: '提示', + nzContent: data['return_msg'] + }); + } + this.tableLoading = false; + }); + } + + /** + * 搜索 + * @param whereObject 条件 + */ + search(whereObject: object) { + whereObject['settleTimeS'] = new Date(whereObject['settleTimeS']).getTime(); + whereObject['settleTimeE'] = new Date(whereObject['settleTimeE']).getTime(); + this.whereObject = whereObject; + this.requestData(); + } + + /** + * 重置 + */ + resetForm(): void { + this.searchForm.reset(); + this.searchForm.controls['merNo'].setValue(this.merArray.length > 0 ? this.merArray[0]['merNo'] : null); + this.searchForm.controls['settleTimeS'].setValue(this.currentDate.getTime()); + this.searchForm.controls['settleTimeE'].setValue(this.currentDate.getTime()); + } + + + disabledDate = (current: Date): boolean => { + // Can not select days before today and today + return differenceInCalendarDays(current, new Date()) > 0; + }; + + + searchSettleTime(dateType: number, selectDate: Date) { + if (new Date().getDate() === selectDate.getDate()) { + this.modal.error({ + nzTitle: '提示', + nzContent: '无法选择当日，当日还未清算' + }); + // 起始时间 + if (dateType === 1) { + this.searchForm.controls['settleTimeS'].setValue(this.currentDate.getTime()); + // 终止时间 + } else if (dateType === 2) { + this.searchForm.controls['settleTimeE'].setValue(this.currentDate.getTime()); + } + } + } + + showPrint() { + console.log(document.getElementById('print-content').innerHTML); + const oblHtml = window.document.body.innerHTML; + const bdhtml = document.getElementById('print-content').innerHTML; + window.document.body.innerHTML = bdhtml; + window.print(); + document.body.innerHTML = oblHtml; + window.location.reload(); + } + +} diff --git a/src/app/admin/trade-order/trade-order-detail/trade-order-detail.component.html b/src/app/admin/trade-order/trade-order-detail/trade-order-detail.component.html index f61bcaf..58e54cc 100644 --- a/src/app/admin/trade-order/trade-order-detail/trade-order-detail.component.html +++ b/src/app/admin/trade-order/trade-order-detail/trade-order-detail.component.html @@ -11,21 +11,22 @@ + {{dataObject.order['merNo']}} + {{dataObject.order['merName']}} + {{dataObject.order['merAbbreviate']}} {{dataObject.order['storeName']}} - {{dataObject.order['deviceSn']}} - {{dataObject.order['payMode'] | payMode}} - {{dataObject.order['platformType'] | platformType}} + {{dataObject.order['outTradeNo']}} + {{dataObject.order['accTradeNo']}} + {{dataObject.order['tradeAmount']}} + {{dataObject.order['accMdiscountAmount'] ? dataObject.order['accMdiscountAmount'] : 0}} + {{dataObject.order['accDiscountAmount'] ? dataObject.order['accDiscountAmount'] : 0}} + {{dataObject.order['tradeActualAmount']}} + {{dataObject.order['payMode'] | payMode}} {{dataObject.order['status'] | tradeOrderStatus}} - {{dataObject.order['outTradeNo']}} - {{dataObject.order['accTradeNo']}} - {{dataObject.order['tradeAmount']}}元 - {{dataObject.order['tradeActualAmount']}}元 - {{dataObject.order['accMdiscountAmount'] ? dataObject.order['accMdiscountAmount'] : 0}}元 - {{dataObject.order['accDiscountAmount'] ? dataObject.order['accDiscountAmount'] : 0}}元 - {{dataObject.order['cardType'] | cardType}} + {{dataObject.order['platformMerNo']}} + {{dataObject.order['createType'] | createType}} {{dataObject.order['createTime'] | date : 'yyyy-MM-dd HH:mm:ss'}} {{dataObject.order['payTime'] | date : 'yyyy-MM-dd HH:mm:ss'}} - {{dataObject.order['cancelTime'] | date : 'yyyy-MM-dd HH:mm:ss'}} diff --git a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.html b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.html index a1adcce..e630d0f 100644 --- a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.html +++ b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.html @@ -8,28 +8,20 @@
- 商户名称 - - - - -
-
- - 商户订单号 + 商户交易单号
- +
支付模式 @@ -72,6 +64,30 @@
+
+ + 商户号 + + + + +
+
+ + 商户名称 + + + + +
+
+ + 商户简称 + + + + +
门店名称 @@ -107,38 +123,46 @@ [nzScroll]="{ x: '1150px'}"> - 序号 + 商户号 商户名称 + 商户简称 门店名称 - 商户订单号 - 支付方式 + 商户交易单号 + 账户端交易单号 + 交易方式 交易金额 门店优惠 优惠券优惠 实付金额 状态 + 创建方式 创建时间 支付时间 入账商户号 + 特殊字符 业务员 操作 - {{i + 1}} + {{data.merNo}} {{data.merName}} + {{data.merAbbreviate}} {{data.storeName?data.storeName:'无'}} {{data.outTradeNo}} + {{data.accTradeNo}} {{data.payMode | payMode}} ￥{{data.tradeAmount}} ￥{{data.storeDiscountActualPrice?data.storeDiscountActualPrice:0}} ￥{{data.userDiscountActualPrice?data.userDiscountActualPrice:0}} ￥{{data.tradeActualAmount?data.tradeActualAmount:0}} {{data.status | tradeOrderStatus}} + {{data.createType | createType}} {{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}} {{data.payTime | date : 'yyyy-MM-dd HH:mm:ss'}} {{data.platformMerNo}} + {{data.specialField}} {{data.salesmanName}} 详情 diff --git a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts index 77e33b5..afe136c 100644 --- a/src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts +++ b/src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts @@ -47,11 +47,13 @@ export class TradeOrderListComponent implements OnInit { this.searchForm = this.form.group({ salesmanId: [null], + merNo: [null], merId: [null], merName: [null], + merAbbreviate: [null], storeName: [null], outTradeNo: [null], - // accTradeNo: [null], + accTradeNo: [null], payMode: [null], payTime: [null], payTimeS: [null], diff --git a/src/app/app-common.module.ts b/src/app/app-common.module.ts index 84486af..1164743 100644 --- a/src/app/app-common.module.ts +++ b/src/app/app-common.module.ts @@ -22,7 +22,7 @@ import { CardTypePipe, MerStatusPipe, CompleteStatusPipe, - MerTypePipe, DeviceStatusPipe, PlatformTypePipe, DeviceTypePipe, DeviceOrderTypePipe, + MerTypePipe, DeviceStatusPipe, PlatformTypePipe, DeviceTypePipe, DeviceOrderTypePipe, CreateTypePipe, } from './pipes'; import {DeviceOrderStatusPipe} from './pipes/device/device-order-status.pipe'; import {DeviceOrderPayTypePipe} from './pipes/device/device-order-pay-type.pipe'; @@ -46,7 +46,8 @@ const PIPES = [ DeviceOrderTypePipe, DeviceOrderStatusPipe, DeviceOrderPayTypePipe, - PlatformTypePipe + PlatformTypePipe, + CreateTypePipe ]; @NgModule({ diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 6c82736..bd70510 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -53,6 +53,11 @@ const routes: Routes = [ loadChildren: () => import('./admin/trade-order/trade-order.module').then(m => m.TradeOrderModule), canActivate: [InitGuardService] }, + { + path: 'trade-checking', + loadChildren: () => import('./admin/trade-checking/trade-checking.module').then(m => m.TradeCheckingModule), + canActivate: [InitGuardService] + }, { path: 'store-device', loadChildren: () => import('./admin/store-device/store-device.module').then(m => m.StoreDeviceModule), diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts index e575872..c191b94 100644 --- a/src/app/pipes/index.ts +++ b/src/app/pipes/index.ts @@ -8,6 +8,7 @@ export * from './trade-order/pay-mode.pipe'; export * from './trade-order/trade-order-status.pipe'; export * from './trade-order/trade-order-refund-status.pipe'; export * from './trade-order/card-type.pipe'; +export * from './trade-order/create-type.pipe'; export * from './mer/mer-status.pipe'; export * from './mer/mer-type.pipe'; export * from './mer/complete-status.pipe'; diff --git a/src/app/pipes/trade-order/create-type.pipe.ts b/src/app/pipes/trade-order/create-type.pipe.ts new file mode 100644 index 0000000..b7ccb5e --- /dev/null +++ b/src/app/pipes/trade-order/create-type.pipe.ts @@ -0,0 +1,21 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ + name: 'createType' +}) +export class CreateTypePipe implements PipeTransform { + + transform(createType: number): unknown { + switch (createType) { + case 1: + return '扫一扫'; + case 2: + return '被扫'; + case 3: + return 'API'; + default: + return '未知'; + } + } + +} diff --git a/src/app/services/trade-checking.service.ts b/src/app/services/trade-checking.service.ts new file mode 100644 index 0000000..dce8c58 --- /dev/null +++ b/src/app/services/trade-checking.service.ts @@ -0,0 +1,27 @@ +import { Injectable } from '@angular/core'; +import {HttpClient} from '@angular/common/http'; +import {CommonsService} from './commons.service'; +import {environment} from '../../environments/environment'; + +@Injectable({ + providedIn: 'root' +}) +export class TradeCheckingService { + + constructor( + private http: HttpClient, + private commonsService: CommonsService + ) { } + + queryChecking(paramObject: object, callBack) { + this.http.get(environment.baseUrl + 'tradeOrder/queryChecking?' + this.commonsService.getWhereCondition(paramObject)).subscribe(data => { + callBack(data); + }); + } + + queryCheckingDetail(paramObject: object, callBack) { + this.http.get(environment.baseUrl + 'tradeOrder/queryCheckingDetail?' + this.commonsService.getWhereCondition(paramObject)).subscribe(data => { + callBack(data); + }); + } +} diff --git a/src/styles.scss b/src/styles.scss index 0875e64..43effba 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -7,6 +7,11 @@ --main-color: #1890ff; // or any global you wish to share with components --gray: #f0f0f0; } +@media print { + nz-sider { + display: none; + } +} .fl { float: left; }