|
|
|
@ -1,30 +1,60 @@ |
|
|
|
|
<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-label>物流订单号</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<input nzSize="large" nz-input formControlName="goodsName" placeholder="请输入" /> |
|
|
|
|
<input nzSize="large" nz-input formControlName="logisticsNo" placeholder="请输入" /> |
|
|
|
|
</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> |
|
|
|
|
<input nzSize="large" nz-input formControlName="logisticsNo" placeholder="请输入" /> |
|
|
|
|
<input nzSize="large" nz-input formControlName="orderNo" placeholder="请输入" /> |
|
|
|
|
</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> |
|
|
|
|
<input nzSize="large" nz-input formControlName="orderNo" placeholder="请输入" /> |
|
|
|
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="logisticsStatus"> |
|
|
|
|
<nz-option *ngFor="let item of logisticsStatus" nzLabel="{{item['name']}}" nzValue="{{item['key']}}"></nz-option> |
|
|
|
|
</nz-select> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<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]="6" [hidden]="!isCollapse" *ngIf="objectType == 1"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<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> |
|
|
|
|
</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-control> |
|
|
|
|
<input nzSize="large" nz-input formControlName="goodsName" placeholder="请输入" /> |
|
|
|
|
</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-control> |
|
|
|
@ -32,7 +62,7 @@ |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>用户手机号</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
@ -41,7 +71,7 @@ |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="6" > |
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>商品分类</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
@ -54,7 +84,7 @@ |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>商品品牌</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
@ -65,17 +95,7 @@ |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>物流状态</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
|
<nz-select nzSize="large" nzShowSearch nzAllowClear nzPlaceHolder="请选择" formControlName="logisticsStatus"> |
|
|
|
|
<nz-option *ngFor="let item of logisticsStatus" nzLabel="{{item['name']}}" nzValue="{{item['key']}}"></nz-option> |
|
|
|
|
</nz-select> |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<div nz-col [nzSpan]="6" [hidden]="!isCollapse"> |
|
|
|
|
<nz-form-item> |
|
|
|
|
<nz-form-label>支付类型</nz-form-label> |
|
|
|
|
<nz-form-control> |
|
|
|
@ -85,18 +105,15 @@ |
|
|
|
|
</nz-form-control> |
|
|
|
|
</nz-form-item> |
|
|
|
|
</div> |
|
|
|
|
<div nz-col [nzSpan]="6"> |
|
|
|
|
<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> |
|
|
|
|
<a class="collapse" (click)="isCollapse = !isCollapse"> |
|
|
|
|
{{isCollapse ? '收起至简洁查询' : '更多查询条件'}} |
|
|
|
|
<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i> |
|
|
|
|
</a> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</form> |
|
|
|
@ -122,11 +139,11 @@ |
|
|
|
|
<th nzWidth="100px">订单号</th> |
|
|
|
|
<th nzWidth="100px">子订单号</th> |
|
|
|
|
<th nzWidth="100px">物流单号</th> |
|
|
|
|
<th nzWidth="50px">创建时间</th> |
|
|
|
|
<th nzWidth="50px">更新时间</th> |
|
|
|
|
<th nzRight nzWidth="60px">支付类型</th> |
|
|
|
|
<th nzRight nzWidth="60px">支付状态</th> |
|
|
|
|
<th nzRight nzWidth="60px">物流状态</th> |
|
|
|
|
<th nzWidth="60px">创建时间</th> |
|
|
|
|
<th nzWidth="60px">更新时间</th> |
|
|
|
|
<th nzRight nzWidth="70px">支付类型</th> |
|
|
|
|
<th nzRight nzWidth="70px">支付状态</th> |
|
|
|
|
<th nzRight nzWidth="70px">物流状态</th> |
|
|
|
|
<th nzRight nzWidth="80px">操作</th> |
|
|
|
|
</tr> |
|
|
|
|
</thead> |
|
|
|
@ -152,6 +169,7 @@ |
|
|
|
|
{{data.status | orderChildStatus}} |
|
|
|
|
</td> |
|
|
|
|
<td nzRight> |
|
|
|
|
<nz-badge *ngIf="data?.logisticsStatus == null" nzStatus="error" nzText="未发货"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="data?.logisticsStatus == 'DELIVERING'" nzColor="cyan" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="data?.logisticsStatus == 'TRANSPORT'" nzColor="lime" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="data?.logisticsStatus == 'AGENT_SIGN'" nzStatus="success" nzText="{{data.logisticsStatusDesc}}"></nz-badge> |
|
|
|
@ -196,15 +214,14 @@ |
|
|
|
|
</nz-image-group> |
|
|
|
|
</nz-descriptions-item> |
|
|
|
|
<nz-descriptions-item nzTitle="物流状态" [nzSpan]="3"> |
|
|
|
|
<span *ngIf="orderGoodsData?.logisticsStatusDesc != null"> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'DELIVERING'" nzColor="cyan" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'TRANSPORT'" nzColor="lime" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'AGENT_SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'ACCEPT'" nzStatus="processing" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'FAILED'" nzStatus="error" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'WAIT_ACCEPT'" nzStatus="default" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
</span> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == null" nzStatus="error" nzText="未发货"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'DELIVERING'" nzColor="cyan" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'TRANSPORT'" nzColor="lime" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'AGENT_SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'SIGN'" nzStatus="success" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'ACCEPT'" nzStatus="processing" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'FAILED'" nzStatus="error" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
<nz-badge *ngIf="orderGoodsData?.logisticsStatus == 'WAIT_ACCEPT'" nzStatus="default" nzText="{{orderGoodsData.logisticsStatusDesc}}"></nz-badge> |
|
|
|
|
</nz-descriptions-item> |
|
|
|
|
</nz-descriptions> |
|
|
|
|
</nz-tab> |
|
|
|
|