|
|
|
@ -1,6 +1,13 @@ |
|
|
|
|
<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="goodsName" placeholder="请输入" /> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>物流订单号</nz-form-label> |
|
|
|
@ -29,71 +36,67 @@ |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>完成时间</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<nz-range-picker nzSize="large" formControlName="finishTimeArray" [nzFormat]="'yyyy/MM/dd'"></nz-range-picker> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>创建时间</nz-form-label> |
|
|
|
|
<nz-form-label>子订单号</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<nz-range-picker nzSize="large" formControlName="createTimeArray" [nzFormat]="'yyyy/MM/dd'"></nz-range-picker> |
|
|
|
|
<input nzSize="large" nz-input formControlName="childOrderNo" placeholder="请输入" /> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse" *ngIf="objectType == 1"> |
|
|
|
|
<div nz-col [nzSpan]="6" > |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>商户</nz-form-label> |
|
|
|
|
<nz-form-label>支付状态</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="merId"> |
|
|
|
|
<nz-option *ngFor="let item of merData" nzLabel="{{item['merName']}}" nzValue="{{item['id']}}"></nz-option> |
|
|
|
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="status"> |
|
|
|
|
<nz-option *ngFor="let item of orderGoodsChild" nzLabel="{{item['name']}}" nzValue="{{item['key']}}"></nz-option> |
|
|
|
|
</nz-select> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<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="goodsName" placeholder="请输入" /> |
|
|
|
|
<input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" /> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<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="childOrderNo" placeholder="请输入" /> |
|
|
|
|
<nz-tree-select |
|
|
|
|
nzPlaceHolder="请选择" |
|
|
|
|
formControlName="goodsType" |
|
|
|
|
[nzNodes]="nodes" |
|
|
|
|
nzShowSearch |
|
|
|
|
></nz-tree-select> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<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="请输入" /> |
|
|
|
|
<input nzSize="large" nz-input formControlName="goodsSpecsId" placeholder="请输入" /> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse" *ngIf="objectType == 1"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>商品分类</nz-form-label> |
|
|
|
|
<nz-form-label>商户</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<nz-tree-select |
|
|
|
|
nzPlaceHolder="请选择" |
|
|
|
|
formControlName="goodsType" |
|
|
|
|
[nzNodes]="nodes" |
|
|
|
|
nzShowSearch |
|
|
|
|
></nz-tree-select> |
|
|
|
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="merId"> |
|
|
|
|
<nz-option *ngFor="let item of merData" nzLabel="{{item['merName']}}" nzValue="{{item['id']}}"></nz-option> |
|
|
|
|
</nz-select> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>商品品牌</nz-form-label> |
|
|
|
@ -104,8 +107,6 @@ |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>支付类型</nz-form-label> |
|
|
|
@ -118,25 +119,29 @@ |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>支付状态</nz-form-label> |
|
|
|
|
<nz-form-label>完成时间</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="status"> |
|
|
|
|
<nz-option *ngFor="let item of orderGoodsChild" nzLabel="{{item['name']}}" nzValue="{{item['key']}}"></nz-option> |
|
|
|
|
</nz-select> |
|
|
|
|
<nz-range-picker nzSize="large" formControlName="finishTimeArray" [nzFormat]="'yyyy/MM/dd'"></nz-range-picker> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6" > |
|
|
|
|
<a class="collapse" (click)="isCollapse = !isCollapse"> |
|
|
|
|
{{isCollapse ? '收起至简洁查询' : '更多查询条件'}} |
|
|
|
|
<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i> |
|
|
|
|
</a> |
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse" > |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>创建时间</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<nz-range-picker nzSize="large" formControlName="createTimeArray" [nzFormat]="'yyyy/MM/dd'"></nz-range-picker> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="24" class="search-area"> |
|
|
|
|
<button nz-button [nzType]="'primary'" (click)="getRequest()">查询</button> |
|
|
|
|
<button nz-button (click)="reset()">重置</button> |
|
|
|
|
<button nz-button [nzType]="'primary'" (click)="getExport()">导出交易明细</button> |
|
|
|
|
<a class="collapse" (click)="isCollapse = !isCollapse"> |
|
|
|
|
{{isCollapse ? '收起至简洁查询' : '更多查询条件'}} |
|
|
|
|
<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i> |
|
|
|
|
</a> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</form> |
|
|
|
@ -155,6 +160,7 @@ |
|
|
|
|
<tr> |
|
|
|
|
<th nzWidth="200px">商品名称</th> |
|
|
|
|
<th nzWidth="100px">商户名称</th> |
|
|
|
|
<th nzWidth="100px">商品规格编码</th> |
|
|
|
|
<th nzWidth="100px">商品图片</th> |
|
|
|
|
<th nzWidth="100px">商品分类</th> |
|
|
|
|
<th nzWidth="100px">商品品牌</th> |
|
|
|
@ -175,6 +181,7 @@ |
|
|
|
|
<tr *ngFor="let data of basicTable.data"> |
|
|
|
|
<td>{{data.goodsName}} - {{data.goodsSpecsName}}</td> |
|
|
|
|
<td>{{data.merName}}</td> |
|
|
|
|
<td>{{data.goodsSpecsId}}</td> |
|
|
|
|
<td> |
|
|
|
|
<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="" /> |
|
|
|
|