袁野 6 months ago
parent 2b02d84f72
commit 9564cccf31
  1. 20
      src/app/pages/trade/comp-order/comp-order.component.html
  2. 35
      src/app/pages/trade/goods-list/goods-list.component.html
  3. 14
      src/app/pages/trade/goods-list/goods-list.component.less
  4. 38
      src/app/pages/trade/goods-list/goods-list.component.ts
  5. 14
      src/app/pages/trade/order-after-sales/order-after-sales.component.html
  6. 14
      src/app/pages/trade/order-refund/order-refund.component.html

@ -4,7 +4,7 @@
<nz-form-item>
<nz-form-label>用户手机号</nz-form-label>
<nz-form-control>
<input nz-input formControlName="userPhone" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -12,7 +12,7 @@
<nz-form-item>
<nz-form-label>交易单号</nz-form-label>
<nz-form-control>
<input nz-input formControlName="orderNo" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="orderNo" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -20,7 +20,7 @@
<nz-form-item>
<nz-form-label>支付方式</nz-form-label>
<nz-form-control>
<nz-select formControlName="payType" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-select nzSize="large" formControlName="payType" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-option *ngFor="let item of orderPayTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control>
@ -30,7 +30,7 @@
<nz-form-item>
<nz-form-label>交易状态</nz-form-label>
<nz-form-control>
<nz-select formControlName="tradeStatus" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-select nzSize="large" formControlName="tradeStatus" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-option *ngFor="let item of orderStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control>
@ -40,8 +40,8 @@
<nz-form-item>
<nz-form-label>创建时间</nz-form-label>
<nz-form-control>
<nz-range-picker formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
<nz-radio-group nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
<nz-range-picker nzSize="large" formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
<nz-radio-group nzSize="large" nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
<label nz-radio-button *ngFor="let item of dateTypeSelect" nzValue="{{item.value}}">{{item.name}}</label>
</nz-radio-group>
</nz-form-control>
@ -51,7 +51,7 @@
<nz-form-item>
<nz-form-label>商品名称</nz-form-label>
<nz-form-control>
<input nz-input formControlName="goodsName" placeholder="请输入" />
<input nz-input nzSize="large" formControlName="goodsName" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -59,7 +59,7 @@
<nz-form-item>
<nz-form-label>卡密订单</nz-form-label>
<nz-form-control>
<input nz-input formControlName="channelOrderNo" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="channelOrderNo" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -67,7 +67,7 @@
<nz-form-item>
<nz-form-label>卡密</nz-form-label>
<nz-form-control>
<input nz-input formControlName="couNo" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="couNo" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -75,7 +75,7 @@
<nz-form-item>
<nz-form-label>卡密状态</nz-form-label>
<nz-form-control>
<nz-select formControlName="couStatus" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-select nzSize="large" formControlName="couStatus" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-option *ngFor="let item of orderCouponNoStatus" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control>

@ -33,7 +33,18 @@
</nz-form-item>
</div>
<div nz-col [nzSpan]="6">
<div nz-col [nzSpan]="24">
<nz-form-item>
<nz-form-label>创建时间</nz-form-label>
<nz-form-control>
<nz-range-picker nzSize="large" formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
<nz-radio-group nzSize="large" nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
<label nz-radio-button *ngFor="let item of dateTypeSelect" nzValue="{{item.value}}">{{item.name}}</label>
</nz-radio-group>
</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>
@ -46,7 +57,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>
@ -57,7 +68,8 @@
</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>
@ -68,14 +80,19 @@
</nz-form-item>
</div>
<div nz-col [nzSpan]="6" class="search-area">
<button nz-button [nzType]="'primary'" (click)="getRequest(true)">查询</button>
<div nz-col [nzSpan]="24" class="search-area">
<button nz-button [nzType]="'primary'" (click)="getRequest()">查询</button>
<button nz-button (click)="searchForm.reset()">重置</button>
<a class="collapse" (click)="isCollapse = !isCollapse">
更多查询条件
<i nz-icon [nzType]="!isCollapse ? 'down' : 'up'"></i>
</a>
</div>
</div>
</form>
<nz-table #basicTable
[nzScroll]="{ x: '1980px' }"
[nzBordered]="true"
[nzFrontPagination]="false"
[nzShowQuickJumper]="true"
@ -95,8 +112,8 @@
<th nzWidth="100px">物流单号</th>
<th nzWidth="50px">创建时间</th>
<th nzWidth="50px">更新时间</th>
<th nzWidth="50px">物流状态</th>
<th nzWidth="70px">操作</th>
<th nzRight nzWidth="50px">物流状态</th>
<th nzRight nzWidth="70px">操作</th>
</tr>
</thead>
<tbody>
@ -112,11 +129,11 @@
<td>{{data.logisticsNo}}</td>
<td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td>{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td>
<td nzRight>
<span *ngIf="data.logisticsStatusDesc == null">{{data.status | orderGoodsStatus}}</span>
<span *ngIf="data.logisticsStatusDesc != null">{{data.logisticsStatusDesc}}</span>
</td>
<td>
<td nzRight>
<a (click)="showDetail(data)">详情</a>
<nz-divider nzType="vertical"></nz-divider>
<a nz-dropdown [nzDropdownMenu]="menu">

@ -1,12 +1,6 @@
[nz-form-label] {
overflow: visible;
}
button {
margin-left: 8px;
}
.submit-btn {
width: 150px;
}
.search-area {
margin-top: 30px;
margin-bottom: 10px;
}
.search-area button {
margin-right: 8px;
}

@ -36,6 +36,9 @@ import {NzTabComponent, NzTabSetComponent, NzTabsModule} from "ng-zorro-antd/tab
import {NzSpinComponent} from "ng-zorro-antd/spin";
import {NzTimelineComponent, NzTimelineItemComponent} from "ng-zorro-antd/timeline";
import {NzResultComponent} from "ng-zorro-antd/result";
import {DateSelectType, DateUtils} from "../../../utils/dateUtils.service";
import {NzDatePickerComponent, NzRangePickerComponent} from "ng-zorro-antd/date-picker";
import {NzRadioButtonDirective, NzRadioComponent, NzRadioGroupComponent} from "ng-zorro-antd/radio";
@Component({
selector: 'app-goods-list',
@ -81,6 +84,11 @@ import {NzResultComponent} from "ng-zorro-antd/result";
NgClass,
NzResultComponent,
NzTimelineComponent,
NzDatePickerComponent,
NzRadioButtonDirective,
NzRadioComponent,
NzRadioGroupComponent,
NzRangePickerComponent,
],
templateUrl: './goods-list.component.html',
@ -112,6 +120,10 @@ export class GoodsListComponent {
logisticsNo: any;
logisticsTraceDetails: any;
goodsOrderId: any;
// 时间类型选择
dateTypeSelect = DateSelectType;
// 更多查询条件
isCollapse = false;
protected readonly fallbackImg = fallbackImg;
protected readonly orderGoodsStatus = orderGoodsStatus;
@ -130,6 +142,10 @@ export class GoodsListComponent {
goodsBrand: [''],
userPhone: [''],
goodsSpecsName: [''],
createTimeArray: [[]],
createTimeSelect: ['1'],
createTimeS: [''],
createTimeE: [''],
goodsName: [''],
payType: [''],
status: [''],
@ -144,6 +160,16 @@ export class GoodsListComponent {
// 查询列表
public getRequest(reset: boolean = false) {
if (this.searchForm.controls['createTimeArray'].value != null
&& this.searchForm.controls['createTimeArray'].value.length > 0) {
this.searchForm.controls['createTimeS'].setValue(this.searchForm.controls['createTimeArray'].value[0]);
this.searchForm.controls['createTimeE'].setValue(this.searchForm.controls['createTimeArray'].value[1]);
} else {
this.searchForm.controls['createTimeS'].setValue(null)
this.searchForm.controls['createTimeE'].setValue(null)
}
this.tableData.loading = true;
if (reset) {
this.tablePageNum = 1;
@ -171,6 +197,17 @@ export class GoodsListComponent {
});
}
/**
*
*/
createTimeInit() {
let createTimeSelect = this.searchForm.controls['createTimeSelect'].value;
if (createTimeSelect != null) {
let timeObj = DateUtils.getDate(new Date(), Number(createTimeSelect));
this.searchForm.controls['createTimeArray'].setValue([timeObj.timeS, timeObj.timeE]);
}
}
// 配置数据
getNode(array: any): any {
array.forEach((item: any) => {
@ -241,4 +278,5 @@ export class GoodsListComponent {
});
}
}

@ -4,7 +4,7 @@
<nz-form-item>
<nz-form-label>申请单号</nz-form-label>
<nz-form-control>
<input nz-input formControlName="applyNo" placeholder="请输入" />
<input nz-input nzSize="large" formControlName="applyNo" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -12,7 +12,7 @@
<nz-form-item>
<nz-form-label>申请类型</nz-form-label>
<nz-form-control>
<nz-select formControlName="type" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-select nzSize="large" formControlName="type" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-option *ngFor="let item of applyTypeArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control>
@ -22,7 +22,7 @@
<nz-form-item>
<nz-form-label>用户手机号</nz-form-label>
<nz-form-control>
<input nz-input formControlName="userPhone" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -30,7 +30,7 @@
<nz-form-item>
<nz-form-label>商品单号</nz-form-label>
<nz-form-control>
<input nz-input formControlName="childOrderNo" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="childOrderNo" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -38,7 +38,7 @@
<nz-form-item>
<nz-form-label>状态</nz-form-label>
<nz-form-control>
<nz-select formControlName="status" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-select nzSize="large" formControlName="status" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-option *ngFor="let item of applyStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control>
@ -48,8 +48,8 @@
<nz-form-item>
<nz-form-label>创建时间</nz-form-label>
<nz-form-control>
<nz-range-picker formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
<nz-radio-group nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
<nz-range-picker nzSize="large" formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
<nz-radio-group nzSize="large" nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
<label nz-radio-button *ngFor="let item of dateTypeSelect" nzValue="{{item.value}}">{{item.name}}</label>
</nz-radio-group>
</nz-form-control>

@ -4,7 +4,7 @@
<nz-form-item>
<nz-form-label>用户电话</nz-form-label>
<nz-form-control>
<input nz-input formControlName="userPhone" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="userPhone" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -12,7 +12,7 @@
<nz-form-item>
<nz-form-label>退款单号</nz-form-label>
<nz-form-control>
<input nz-input formControlName="refundOrderNo" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="refundOrderNo" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -20,7 +20,7 @@
<nz-form-item>
<nz-form-label>交易单号</nz-form-label>
<nz-form-control>
<input nz-input formControlName="orderNo" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="orderNo" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -28,7 +28,7 @@
<nz-form-item>
<nz-form-label>商品单号</nz-form-label>
<nz-form-control>
<input nz-input formControlName="orderChildNo" placeholder="请输入" />
<input nzSize="large" nz-input formControlName="orderChildNo" placeholder="请输入" />
</nz-form-control>
</nz-form-item>
</div>
@ -36,7 +36,7 @@
<nz-form-item>
<nz-form-label>退款状态</nz-form-label>
<nz-form-control>
<nz-select formControlName="refundStatus" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-select nzSize="large" formControlName="refundStatus" nzAllowClear [nzPlaceHolder]="'请选择'">
<nz-option *ngFor="let item of refundStatusArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
</nz-select>
</nz-form-control>
@ -46,8 +46,8 @@
<nz-form-item>
<nz-form-label>创建时间</nz-form-label>
<nz-form-control>
<nz-range-picker formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
<nz-radio-group nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
<nz-range-picker nzSize="large" formControlName="createTimeArray" nzShowTime [nzFormat]="'yyyy/MM/dd HH:mm:ss'"></nz-range-picker>
<nz-radio-group nzSize="large" nzButtonStyle="solid" formControlName="createTimeSelect" (ngModelChange)="createTimeInit()">
<label nz-radio-button *ngFor="let item of dateTypeSelect" nzValue="{{item.value}}">{{item.name}}</label>
</nz-radio-group>
</nz-form-control>

Loading…
Cancel
Save