@kmkf-fe-packages/kmkf-utils 2.2.13-beta.45 → 2.2.13-beta.48
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -3,17 +3,11 @@ export declare const WDT_SYSTEM_ORDER_CONFIG: {
|
|
|
3
3
|
key: string;
|
|
4
4
|
name: string;
|
|
5
5
|
selectId: string;
|
|
6
|
-
columns:
|
|
6
|
+
columns: {
|
|
7
7
|
title: string;
|
|
8
8
|
dataIndex: string;
|
|
9
9
|
width: number;
|
|
10
|
-
|
|
11
|
-
} | {
|
|
12
|
-
title: string;
|
|
13
|
-
dataIndex: string;
|
|
14
|
-
width: number;
|
|
15
|
-
ellipsis?: undefined;
|
|
16
|
-
})[];
|
|
10
|
+
}[];
|
|
17
11
|
};
|
|
18
12
|
export declare const WDT_ORDER_TYPE_MAP: {
|
|
19
13
|
1: string;
|
|
@@ -63,6 +63,20 @@ export var tradeStatusMap = {
|
|
|
63
63
|
105: "部分打款",
|
|
64
64
|
110: "已完成",
|
|
65
65
|
113: "异常发货"
|
|
66
|
+
},
|
|
67
|
+
web: {
|
|
68
|
+
4: "已取消（可恢复）",
|
|
69
|
+
5: "已取消",
|
|
70
|
+
25: "特殊单",
|
|
71
|
+
29: "预订单",
|
|
72
|
+
30: "待审核（已支付）",
|
|
73
|
+
35: "待财审",
|
|
74
|
+
50: "待发货",
|
|
75
|
+
51: "待推送",
|
|
76
|
+
52: "推送中",
|
|
77
|
+
53: "推送失败",
|
|
78
|
+
55: "已推送",
|
|
79
|
+
95: "已发货"
|
|
66
80
|
}
|
|
67
81
|
};
|
|
68
82
|
export var WDT_SYSTEM_ORDER_CONFIG = {
|
|
@@ -72,18 +86,15 @@ export var WDT_SYSTEM_ORDER_CONFIG = {
|
|
|
72
86
|
columns: [{
|
|
73
87
|
title: "订单类型",
|
|
74
88
|
dataIndex: "billType",
|
|
75
|
-
width: 150
|
|
76
|
-
ellipsis: true
|
|
89
|
+
width: 150
|
|
77
90
|
}, {
|
|
78
91
|
title: "系统订单号",
|
|
79
92
|
dataIndex: "billNo",
|
|
80
|
-
width: 150
|
|
81
|
-
ellipsis: true
|
|
93
|
+
width: 150
|
|
82
94
|
}, {
|
|
83
95
|
title: "订单状态",
|
|
84
96
|
dataIndex: "tradeStatusValue",
|
|
85
|
-
width: 150
|
|
86
|
-
ellipsis: true
|
|
97
|
+
width: 150
|
|
87
98
|
}, {
|
|
88
99
|
title: "订单标签",
|
|
89
100
|
dataIndex: "billTag",
|
|
@@ -91,33 +102,27 @@ export var WDT_SYSTEM_ORDER_CONFIG = {
|
|
|
91
102
|
}, {
|
|
92
103
|
title: "物流公司名称",
|
|
93
104
|
dataIndex: "logisticsName",
|
|
94
|
-
width: 150
|
|
95
|
-
ellipsis: true
|
|
105
|
+
width: 150
|
|
96
106
|
}, {
|
|
97
107
|
title: "物流公司名称",
|
|
98
108
|
dataIndex: "logisticsName",
|
|
99
|
-
width: 200
|
|
100
|
-
ellipsis: true
|
|
109
|
+
width: 200
|
|
101
110
|
}, {
|
|
102
111
|
title: "物流公司编码",
|
|
103
112
|
dataIndex: "logisticsCode",
|
|
104
|
-
width: 200
|
|
105
|
-
ellipsis: true
|
|
113
|
+
width: 200
|
|
106
114
|
}, {
|
|
107
115
|
title: "物流单号",
|
|
108
116
|
dataIndex: "logisticsNo",
|
|
109
|
-
width: 200
|
|
110
|
-
ellipsis: true
|
|
117
|
+
width: 200
|
|
111
118
|
}, {
|
|
112
119
|
title: "发货仓名称",
|
|
113
120
|
dataIndex: "warehouseName",
|
|
114
|
-
width: 200
|
|
115
|
-
ellipsis: true
|
|
121
|
+
width: 200
|
|
116
122
|
}, {
|
|
117
123
|
title: "发货仓编码",
|
|
118
124
|
dataIndex: "warehouseNo",
|
|
119
|
-
width: 200
|
|
120
|
-
ellipsis: true
|
|
125
|
+
width: 200
|
|
121
126
|
}]
|
|
122
127
|
};
|
|
123
128
|
export var WDT_ORDER_TYPE_MAP = {
|
|
@@ -147,6 +152,7 @@ export var updateWdtGoodsHandle = function updateWdtGoodsHandle() {
|
|
|
147
152
|
item.goodId = item.goodsId;
|
|
148
153
|
item.goodName = item.goodsName;
|
|
149
154
|
item.goodNo = item.goodsNo;
|
|
155
|
+
item.orderPrice = item.orderPrice || item.price;
|
|
150
156
|
item.canDelete = true;
|
|
151
157
|
item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
|
|
152
158
|
item.systemOrderNo = cur === null || cur === void 0 ? void 0 : cur.tradeNo;
|
|
@@ -386,9 +392,10 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
|
|
|
386
392
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
387
393
|
billNo: item.tradeNo,
|
|
388
394
|
billType: WDT_ORDER_TYPE_MAP[item.tradeType],
|
|
389
|
-
billTag: item.tagName
|
|
395
|
+
billTag: item.tagName || item.tags // 网页版取tags，其他版本用tagName
|
|
390
396
|
});
|
|
391
397
|
}),
|
|
398
|
+
|
|
392
399
|
selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
|
|
393
400
|
return item.tradeNo;
|
|
394
401
|
}) : [],
|
|
@@ -396,7 +403,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
|
|
|
396
403
|
return {
|
|
397
404
|
billNo: item.tradeNo,
|
|
398
405
|
billType: WDT_ORDER_TYPE_MAP[item.tradeType],
|
|
399
|
-
billTag: item.tagName,
|
|
406
|
+
billTag: item.tagName || item.tags,
|
|
407
|
+
// 网页版取tags，其他版本用tagName
|
|
400
408
|
tradeStatusValue: item.tradeStatusValue
|
|
401
409
|
};
|
|
402
410
|
})
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-utils",
|
|
3
|
-
"version": "2.2.13-beta.
|
|
3
|
+
"version": "2.2.13-beta.48",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "658243ef0a62d53ef3dac5516d820ef07f12bf74",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|