@@ -112,11 +129,11 @@
| {{data.logisticsNo}} |
{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} |
{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} |
-
+ |
{{data.status | orderGoodsStatus}}
{{data.logisticsStatusDesc}}
|
-
+ |
详情
diff --git a/src/app/pages/trade/goods-list/goods-list.component.less b/src/app/pages/trade/goods-list/goods-list.component.less
index 6d5c351..4056a86 100644
--- a/src/app/pages/trade/goods-list/goods-list.component.less
+++ b/src/app/pages/trade/goods-list/goods-list.component.less
@@ -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;
}
diff --git a/src/app/pages/trade/goods-list/goods-list.component.ts b/src/app/pages/trade/goods-list/goods-list.component.ts
index af873f2..229ac47 100644
--- a/src/app/pages/trade/goods-list/goods-list.component.ts
+++ b/src/app/pages/trade/goods-list/goods-list.component.ts
@@ -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 {
});
}
+
}
diff --git a/src/app/pages/trade/order-after-sales/order-after-sales.component.html b/src/app/pages/trade/order-after-sales/order-after-sales.component.html
index 0955dc2..bb19e48 100644
--- a/src/app/pages/trade/order-after-sales/order-after-sales.component.html
+++ b/src/app/pages/trade/order-after-sales/order-after-sales.component.html
@@ -4,7 +4,7 @@
申请单号
-
+
@@ -12,7 +12,7 @@
申请类型
-
+
@@ -22,7 +22,7 @@
用户手机号
-
+
@@ -30,7 +30,7 @@
商品单号
-
+
@@ -38,7 +38,7 @@
状态
-
+
@@ -48,8 +48,8 @@
创建时间
-
-
+
+
diff --git a/src/app/pages/trade/order-refund/order-refund.component.html b/src/app/pages/trade/order-refund/order-refund.component.html
index 608d2eb..c79a954 100644
--- a/src/app/pages/trade/order-refund/order-refund.component.html
+++ b/src/app/pages/trade/order-refund/order-refund.component.html
@@ -4,7 +4,7 @@
用户电话
-
+
@@ -12,7 +12,7 @@
退款单号
-
+
@@ -20,7 +20,7 @@
交易单号
-
+
@@ -28,7 +28,7 @@
商品单号
-
+
@@ -36,7 +36,7 @@
退款状态
-
+
@@ -46,8 +46,8 @@
创建时间
-
-
+
+
|