袁野 2 months ago
parent 28f93f9a92
commit dce6544e92
  1. 2
      src/app/pages/audit/audit-list/audit-list.component.html
  2. 7
      src/app/pages/trade/goods-list/goods-list.component.html
  3. 10
      src/app/pages/trade/order-after-sales/order-after-sales.component.html
  4. 16
      src/app/pages/trade/order-after-sales/order-after-sales.component.ts
  5. 7
      src/app/services/trade/order-goods.service.ts

@ -23,7 +23,7 @@
<nz-form-control>
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="status">
<nz-option nzLabel="驳回" nzValue="0"></nz-option>
<nz-option nzLabel="1通过" nzValue="1"></nz-option>
<nz-option nzLabel="通过" nzValue="1"></nz-option>
<nz-option nzLabel="待审批" nzValue="2"></nz-option>
</nz-select>
</nz-form-control>

@ -176,7 +176,8 @@
<td>{{data.goodsName}} - {{data.goodsSpecsName}}</td>
<td>{{data.merName}}</td>
<td>
<img nz-image width="60px" height="60px" nzSrc="{{imageUrl + data.img }}" [nzFallback]="fallbackImg" alt="" />
<img *ngIf="data.thirdOrderNo == null" nz-image width="60px" height="60px" nzSrc="{{imageUrl + data.img }}" [nzFallback]="fallbackImg" alt="" />
<img *ngIf="data.thirdOrderNo != null" nz-image width="60px" height="60px" nzSrc="{{data.img }}" [nzFallback]="fallbackImg" alt="" />
</td>
<td>{{data.goodsTypeName}}</td>
<td>{{data.goodsBrandName}}</td>
@ -235,7 +236,8 @@
<nz-descriptions-item nzTitle="商品数量">{{ orderGoodsData?.goodsCount }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="图片" [nzSpan]="3">
<nz-image-group>
<img nz-image width="80px" [nzFallback]="fallbackImg" nzSrc="{{imageUrl + orderGoodsData.img }}" alt="" />
<img *ngIf="orderGoodsData.thirdOrderNo == null" nz-image width="80px" [nzFallback]="fallbackImg" nzSrc="{{imageUrl + orderGoodsData.img }}" alt="" />
<img *ngIf="orderGoodsData.thirdOrderNo != null" nz-image width="80px" [nzFallback]="fallbackImg" nzSrc="{{orderGoodsData.img }}" alt="" />
</nz-image-group>
</nz-descriptions-item>
<nz-descriptions-item nzTitle="物流状态" [nzSpan]="3">
@ -283,7 +285,6 @@
</ng-container>
</nz-modal>
<nz-modal [(nzVisible)]="orderDetailModalChild" nzTitle="物流详情" (nzOnCancel)="orderDetailModalChild = false" [nzFooter]="null"
nzWidth="1000px" [nzBodyStyle]=" { padding: '20px 20px 30px 20px'}">
<ng-container *nzModalContent>

@ -230,6 +230,16 @@
</nz-select>
</nz-form-control>
</nz-form-item>
<nz-form-item *ngIf="goodsOrderData['thirdOrderNo'] != null">
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>京东售后类型</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请选择京东售后类型!">
<nz-radio-group formControlName="jdAuditStatus" >
<label nz-radio nzValue="10">退货</label>
<label nz-radio nzValue="20">换货</label>
<label nz-radio nzValue="30">维修</label>
</nz-radio-group>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>审核</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请选择审核状态!">

@ -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;
});
}
/**
*

@ -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);
});
}
}

Loading…
Cancel
Save