Compare commits

..

No commits in common. 'ebaaf09262d61fb39a26af583bf7e605a44def12' and 'b1bc3d43c7029d1f46813a9e9d62181a89749472' have entirely different histories.

  1. 6
      src/app/app.config.ts
  2. 3
      src/app/pages/trade/comp-order/comp-order.component.html
  3. 13
      src/app/pages/trade/comp-order/comp-order.component.ts
  4. 18
      src/app/pages/trade/order-after-sales/order-after-sales.component.html
  5. 6
      src/app/pages/trade/order-refund/order-refund.component.html
  6. 12
      src/app/services/trade/order-coupon.service.ts

@ -1,5 +1,5 @@
import { ApplicationConfig, importProvidersFrom } from '@angular/core';
import {provideRouter, RouteReuseStrategy} from '@angular/router';
import { provideRouter } from '@angular/router';
import { routes } from './app.routes';
import { provideClientHydration } from '@angular/platform-browser';
@ -11,7 +11,6 @@ import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
import {BrowserAnimationsModule, provideAnimations} from '@angular/platform-browser/animations';
import {InitGuardService} from "./utils/initGuard.service";
import {InterceptorService} from "./utils/Interceptor.service";
import {AiRouteReuseStrategy} from "./utils/routeReuseStrategy";
registerLocaleData(zh);
@ -25,7 +24,6 @@ export const appConfig: ApplicationConfig = {
provideAnimations(),
BrowserAnimationsModule,
InitGuardService, // 校验登录
{ provide: HTTP_INTERCEPTORS, useClass: InterceptorService, multi: true},
{ provide: RouteReuseStrategy, useClass: AiRouteReuseStrategy }
{ provide: HTTP_INTERCEPTORS, useClass: InterceptorService, multi: true}
]
};

@ -85,7 +85,6 @@
<div nz-col [nzSpan]="24" class="search-area">
<button nz-button [nzType]="'primary'" (click)="searchFormSubmit()">查询</button>
<button nz-button (click)="searchFormReset()">重置</button>
<button nz-button [nzType]="'primary'" (click)="export()">导出数据明细</button>
<a class="collapse" (click)="isCollapse = !isCollapse">
更多查询条件
<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i>
@ -165,7 +164,7 @@
</a>
<nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable>
<li nz-menu-item>暂无操作</li>
<li nz-menu-item nzDanger >删除</li>
</ul>
</nz-dropdown-menu>
</td>

@ -32,7 +32,6 @@ import {DateSelectType, DateUtils} from "../../../utils/dateUtils.service";
import {NzTreeComponent} from "ng-zorro-antd/tree";
import {NzDescriptionsModule} from "ng-zorro-antd/descriptions";
import {NzTabComponent, NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tabs";
import {environment} from "../../../../environments/environment";
@Component({
selector: 'app-comp-order',
@ -90,7 +89,6 @@ import {environment} from "../../../../environments/environment";
styleUrl: './comp-order.component.less'
})
export class CompOrderComponent {
imageUrl = environment.imageUrl;
// 表单页数
tablePageNum = 1;
// 表单数据
@ -211,15 +209,4 @@ export class CompOrderComponent {
this.orderDetail = {};
this.orderDetailVisible = false;
}
/**
*
*/
export() {
this.orderService.export(this.searchForm.value, (data: any) => {
if (data['return_code'] == '000000') {
window.location.href = this.imageUrl + 'temporary/' + data['return_data'];
}
});
}
}

@ -1,13 +1,5 @@
<form nz-form [formGroup]="searchForm" class="search_form" [nzLayout]="'vertical'">
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6">
<nz-form-item>
<nz-form-label>用户手机号</nz-form-label>
<nz-form-control>
<input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="6">
<nz-form-item>
<nz-form-label>申请单号</nz-form-label>
@ -26,6 +18,14 @@
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="6">
<nz-form-item>
<nz-form-label>用户手机号</nz-form-label>
<nz-form-control>
<input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="6">
<nz-form-item>
<nz-form-label>商品单号</nz-form-label>
@ -76,7 +76,7 @@
<tr>
<th nzWidth="150px">申请单号</th>
<th nzWidth="100px">申请类型</th>
<th nzWidth="130px">用户手机号</th>
<th nzWidth="130px">客户电话</th>
<th nzWidth="150px">商品单号</th>
<th nzWidth="100px">产品类型</th>
<th nzWidth="200px">产品名称</th>

@ -2,7 +2,7 @@
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6">
<nz-form-item>
<nz-form-label>用户手机号</nz-form-label>
<nz-form-label>用户电话</nz-form-label>
<nz-form-control>
<input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
</nz-form-control>
@ -72,7 +72,7 @@
[nzData]="tableData.list" >
<thead>
<tr>
<th nzWidth="130px">用户手机号</th>
<th nzWidth="130px">用户电话</th>
<th nzWidth="160px">退款单号</th>
<th nzWidth="180px">交易单号</th>
<th nzWidth="130px">商品单号</th>
@ -121,7 +121,7 @@
<nz-tabset nzType="card" nzSize="small">
<nz-tab nzTitle="退款详情">
<nz-descriptions nzBordered [nzColumn]="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 1 }">
<nz-descriptions-item nzTitle="用户手机号">{{refundDetail.refund.userPhone}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="用户电话">{{refundDetail.refund.userPhone}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="退款单号">{{refundDetail.refund.refundOrderNo}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="交易单号">{{refundDetail.refund.orderNo}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="商品单号">{{refundDetail.refund.orderChildNo}}</nz-descriptions-item>

@ -22,18 +22,6 @@ export class OrderCouponService {
});
}
/**
*
* @param param
* @param callBack
*/
public export(param: any, callBack:any) {
param.time = new Date().getTime();
this.http.get(environment.orderUrl + 'coupon/export?'+ObjectData.objectByString(param)).subscribe(data => {
callBack(data);
});
}
/**
*
* @param param

Loading…
Cancel
Save