袁野 3 months ago
parent 92080b696e
commit 09ec482cd9
  1. 12
      src/app/pages/goods/jd-goods-list/jd-goods-list.component.html
  2. 1
      src/app/pages/goods/jd-goods-list/jd-goods-list.component.ts
  3. 93
      src/app/pages/trade/goods-list/goods-list.component.html
  4. 1
      src/app/pages/trade/goods-list/goods-list.component.ts
  5. 79
      src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html
  6. 4
      src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts

@ -8,6 +8,14 @@
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="8">
<nz-form-item>
<nz-form-label>商品规格编码</nz-form-label>
<nz-form-control>
<input nzSize="large" nz-input formControlName="id" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="8">
<nz-form-item>
<nz-form-label>商品分类</nz-form-label>
@ -74,12 +82,14 @@
[nzData]="tableData.list" >
<thead>
<tr>
<th nzWidth="80px">商品规格编码</th>
<th nzWidth="80px">一级分类</th>
<th nzWidth="100px">二级分类</th>
<th nzWidth="100px">品牌名称</th>
<th nzWidth="100px">商品名称</th>
<th nzWidth="100px">列表图</th>
<th nzWidth="50px">售卖价格</th>
<th nzWidth="50px">成本价</th>
<th nzWidth="50px">京东价</th>
<th nzWidth="50px">原价</th>
<th nzWidth="50px">sku编码</th>
@ -87,6 +97,7 @@
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data">
<td>{{data.id}}</td>
<td>{{data.goodsTypeParentName}}</td>
<td>{{data.goodsTypeName}}</td>
<td>{{data.goodsBrandName}}</td>
@ -95,6 +106,7 @@
<img nz-image width="60px" height="60px" nzSrc="{{data.listImg }}" [nzFallback]="fallbackImg" alt="" />
</td>
<td>¥{{data.salePrice}}</td>
<td>¥{{data.costPrice}}</td>
<td>¥{{data.thirdPrice}}</td>
<td>¥{{data.originalPrice}}</td>
<td>{{data.thirdId}}</td>

@ -127,6 +127,7 @@ export class JdGoodsListComponent {
title: [''],
goodsType: [''],
goodsBrand: [''],
id: [''],
salePriceS: [''],
salePriceE: [''],
});

@ -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="" />

@ -157,6 +157,7 @@ export class GoodsListComponent {
goodsType: [''],
goodsBrand: [''],
merId: [''],
goodsSpecsId: [''],
userPhone: [''],
goodsSpecsName: [''],
createTimeArray: [[]],

@ -1,23 +1,22 @@
<form nz-form [formGroup]="searchForm" class="search_form" [nzLayout]="'vertical'">
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="6">
<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="goodsName" 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="请输入" />
<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>
@ -30,39 +29,32 @@
</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-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>
<input nzSize="large" nz-input formControlName="orderNo" 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="goodsName" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="childOrderNo" 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-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-control>
@ -71,7 +63,7 @@
</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-control>
@ -84,6 +76,28 @@
</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="goodsSpecsId" placeholder="请输入" />
</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>
@ -94,7 +108,6 @@
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="6" [hidden]="!isCollapse">
<nz-form-item>
<nz-form-label>支付类型</nz-form-label>
@ -106,6 +119,16 @@
</nz-form-item>
</div>
<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>
@ -132,6 +155,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>
@ -151,6 +175,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="" />

@ -17,7 +17,7 @@ import {NzImageDirective, NzImageModule} from "ng-zorro-antd/image";
import {NzIconDirective} from "ng-zorro-antd/icon";
import {NzBadgeComponent} from "ng-zorro-antd/badge";
import {fallbackImg, logisticsStatus, orderPayType} from '../../../data/goods/goods.namespace';
import {fallbackImg, logisticsStatus, orderGoodsChild, orderPayType} from '../../../data/goods/goods.namespace';
import {NzDividerComponent} from "ng-zorro-antd/divider";
import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown";
import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu";
@ -147,6 +147,7 @@ export class GoodsLogisticsListComponent {
goodsBrand: [''],
merId: [''],
userPhone: [''],
goodsSpecsId: [''],
goodsSpecsName: [''],
createTimeArray: [[]],
createTimeSelect: ['1'],
@ -322,4 +323,5 @@ export class GoodsLogisticsListComponent {
}
protected readonly orderGoodsChild = orderGoodsChild;
}

Loading…
Cancel
Save