diff --git a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html index d073ed7..e6fd084 100644 --- a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html +++ b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.html @@ -50,7 +50,9 @@ 产品类型 - + + + @@ -151,7 +153,7 @@ {{data.goodsType | orderChildGoodsType}} {{data.goodsName}} {{data.refundOrderNo}} - {{data.goodsCount}} + {{data.refundGoodsNum}} ¥{{data.returnTotalPrice}} ¥{{data.refundPrice}} {{data.refundIntegral}} diff --git a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts index 734e48d..6a65e38 100644 --- a/src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts +++ b/src/app/admin/order-manage/order-refund-list/order-refund-list.component.ts @@ -169,13 +169,12 @@ export class OrderRefundListComponent implements OnInit { exportExcel(): void { this.loadingObject.spinning = true; this.loadingObject.msg = '处理中...'; -/* - this.orderIntegralRechargeService.exportOrder(this.whereObject, data => { + this.orderManageService.excelRefund(this.whereObject, data => { this.loadingObject.spinning = false; if (data['return_code'] === '000000') { window.location.href = this.FILE_URL + data['return_data']; } - });*/ + }); } /** diff --git a/src/app/admin/system/system-msg/system-msg.component.ts b/src/app/admin/system/system-msg/system-msg.component.ts index b376b15..d065d65 100644 --- a/src/app/admin/system/system-msg/system-msg.component.ts +++ b/src/app/admin/system/system-msg/system-msg.component.ts @@ -1,11 +1,11 @@ import { Component, OnInit } from '@angular/core'; import {environment} from '../../../../environments/environment'; -import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms'; -import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http'; -import {NzMessageService, NzUploadFile} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; -import {Router} from '_@angular_router@9.0.7@@angular/router'; import {CommonsService} from '../../../services/commons.service'; import {MsgService} from '../../../services/msg.service'; +import {FormBuilder, FormGroup, Validators} from '@angular/forms'; +import {HttpClient} from '@angular/common/http'; +import {NzMessageService, NzUploadFile} from 'ng-zorro-antd'; +import {Router} from '@angular/router'; function getBase64(file: File): Promise { return new Promise((resolve, reject) => { diff --git a/src/app/services/msg.service.ts b/src/app/services/msg.service.ts index d9a59aa..2168ccb 100644 --- a/src/app/services/msg.service.ts +++ b/src/app/services/msg.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@angular/core'; -import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http'; import {CommonsService} from './commons.service'; import {environment} from '../../environments/environment'; +import {HttpClient} from '@angular/common/http'; @Injectable({ providedIn: 'root' diff --git a/src/app/services/order/order-manage.service.ts b/src/app/services/order/order-manage.service.ts index a141a33..f79710d 100644 --- a/src/app/services/order/order-manage.service.ts +++ b/src/app/services/order/order-manage.service.ts @@ -39,7 +39,7 @@ export class OrderManageService { } /** - * 交退款 + * 退款列表 * * @param paramsObject 参数 * @param callBack 回调 @@ -50,4 +50,16 @@ export class OrderManageService { }); } + /** + * 导出退款 + * + * @param paramsObject 参数 + * @param callBack 回调 + */ + public excelRefund(param: object, callBack) { + this.http.get(environment.orderUrl + 'excelRefund?'+this.common.getWhereCondition(param)).subscribe(data => { + callBack(data); + }); + } + }