From dce6544e9292d2fcf749f991268dca3e57aca77a Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Tue, 3 Dec 2024 10:32:30 +0800
Subject: [PATCH] 1
---
.../audit/audit-list/audit-list.component.html | 2 +-
.../trade/goods-list/goods-list.component.html | 7 ++++---
.../order-after-sales.component.html | 10 ++++++++++
.../order-after-sales.component.ts | 16 ++++++++++++++++
src/app/services/trade/order-goods.service.ts | 7 +++++++
5 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/src/app/pages/audit/audit-list/audit-list.component.html b/src/app/pages/audit/audit-list/audit-list.component.html
index 171770e..1338fe4 100644
--- a/src/app/pages/audit/audit-list/audit-list.component.html
+++ b/src/app/pages/audit/audit-list/audit-list.component.html
@@ -23,7 +23,7 @@
-
+
diff --git a/src/app/pages/trade/goods-list/goods-list.component.html b/src/app/pages/trade/goods-list/goods-list.component.html
index a57d3d1..3bb9324 100644
--- a/src/app/pages/trade/goods-list/goods-list.component.html
+++ b/src/app/pages/trade/goods-list/goods-list.component.html
@@ -176,7 +176,8 @@
{{data.goodsName}} - {{data.goodsSpecsName}} |
{{data.merName}} |
-
+
+
|
{{data.goodsTypeName}} |
{{data.goodsBrandName}} |
@@ -235,7 +236,8 @@
{{ orderGoodsData?.goodsCount }}
-
+
+
@@ -283,7 +285,6 @@
-
diff --git a/src/app/pages/trade/order-after-sales/order-after-sales.component.html b/src/app/pages/trade/order-after-sales/order-after-sales.component.html
index 10328f3..dbb29b4 100644
--- a/src/app/pages/trade/order-after-sales/order-after-sales.component.html
+++ b/src/app/pages/trade/order-after-sales/order-after-sales.component.html
@@ -230,6 +230,16 @@
+
+ 京东售后类型
+
+
+
+
+
+
+
+
审核
diff --git a/src/app/pages/trade/order-after-sales/order-after-sales.component.ts b/src/app/pages/trade/order-after-sales/order-after-sales.component.ts
index 4331ba0..29a1119 100644
--- a/src/app/pages/trade/order-after-sales/order-after-sales.component.ts
+++ b/src/app/pages/trade/order-after-sales/order-after-sales.component.ts
@@ -37,6 +37,7 @@ import {environment} from "../../../../environments/environment";
import {NzSpinComponent} from "ng-zorro-antd/spin";
import {NzAlertComponent} from "ng-zorro-antd/alert";
import {CommunicationService} from "../../../services/common/communication.service";
+import {OrderGoodsService} from "../../../services/trade/order-goods.service";
@Component({
selector: 'app-order-after-sales',
@@ -131,9 +132,11 @@ export class OrderAfterSalesComponent {
applyAuditVisible = false;
// 更多查询条件
isCollapse = false;
+ goodsOrderData: any;
constructor(private fb: NonNullableFormBuilder,
private orderAfterSalesService : OrderAfterSalesService,
private communicationService: CommunicationService,
+ private goodsOrderService: OrderGoodsService,
private message: NzMessageService,
private modal: NzModalService) {
// 初始化搜索框
@@ -156,6 +159,7 @@ export class OrderAfterSalesComponent {
applyNo: [''],
type: [''],
auditStatus: ['', [Validators.required]],
+ jdAuditStatus: [''],
remarks: [''],
});
this.createTimeInit();
@@ -240,6 +244,7 @@ export class OrderAfterSalesComponent {
* @param data
*/
showAudit(data: any) {
+ this.getOrderGoods(data.childOrderNo);
data.type = String(data.type);
data.remarks = '';
this.applyAuditForm.patchValue(data);
@@ -315,6 +320,17 @@ export class OrderAfterSalesComponent {
});
}
+ // 查询实物订单
+ getOrderGoods(childOrderNo: string) {
+ this.goodsOrderService.getOrderGoods(childOrderNo, (data: any) => {
+ if (data['return_code'] == '000000') {
+ this.goodsOrderData = data['return_data'];
+ } else {
+ this.message.create('error', data['return_msg']);
+ }
+ this.isSpinning = false;
+ });
+ }
/**
* 导出订单
diff --git a/src/app/services/trade/order-goods.service.ts b/src/app/services/trade/order-goods.service.ts
index ac3355d..7cff011 100644
--- a/src/app/services/trade/order-goods.service.ts
+++ b/src/app/services/trade/order-goods.service.ts
@@ -55,4 +55,11 @@ export class OrderGoodsService {
});
}
+
+ public getOrderGoods(childOrderNo: string, callBack:any) {
+ this.http.get(environment.orderUrl + 'orderGoods/getOrderGoods?childOrderNo='+childOrderNo).subscribe(data => {
+ callBack(data);
+ });
+ }
+
}