@kmkf-fe-packages/kmkf-utils 2.10.9-beta.44 → 2.10.9-beta.46
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.
|
@@ -15,7 +15,7 @@ export var getJdCustomerCodeOptions = function getJdCustomerCodeOptions() {
|
|
|
15
15
|
}).map(function (item) {
|
|
16
16
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
17
17
|
label: item.remark ? "".concat(item.customerCode, "\uFF08").concat(item.remark, "\uFF09") : "".concat(item.customerCode),
|
|
18
|
-
value: item.
|
|
18
|
+
value: item.uk
|
|
19
19
|
});
|
|
20
20
|
});
|
|
21
21
|
};
|
|
@@ -11,27 +11,12 @@ export declare const TTX_SYSTEM_ORDER_CONFIG: {
|
|
|
11
11
|
width: number;
|
|
12
12
|
render?: undefined;
|
|
13
13
|
renderExport?: undefined;
|
|
14
|
-
conditionOptionsSetting?: undefined;
|
|
15
14
|
} | {
|
|
16
15
|
dataIndex: string;
|
|
17
16
|
title: string;
|
|
18
17
|
width: number;
|
|
19
18
|
render: (value: any) => any;
|
|
20
19
|
renderExport: (value: any) => any;
|
|
21
|
-
conditionOptionsSetting: {
|
|
22
|
-
dataType: string;
|
|
23
|
-
getOptions: () => {
|
|
24
|
-
value: string;
|
|
25
|
-
label: string;
|
|
26
|
-
}[];
|
|
27
|
-
};
|
|
28
|
-
} | {
|
|
29
|
-
dataIndex: string;
|
|
30
|
-
title: string;
|
|
31
|
-
width: number;
|
|
32
|
-
render: (value: any) => "" | "拆单";
|
|
33
|
-
renderExport: (value: any) => "" | "拆单";
|
|
34
|
-
conditionOptionsSetting?: undefined;
|
|
35
20
|
})[];
|
|
36
21
|
};
|
|
37
22
|
export declare const updateTtxGoodsHandle: (orders?: any[], config?: {
|
|
@@ -6,150 +6,118 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
|
|
|
6
6
|
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
7
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
8
8
|
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
9
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
9
10
|
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
10
11
|
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
11
|
-
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
12
|
-
function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
13
|
-
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
14
12
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
15
|
-
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
16
|
-
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
17
13
|
export var TTX_INTERNAL_ORDER_TYPE_MAP = {
|
|
18
|
-
SALES:
|
|
19
|
-
EXCHANGE:
|
|
20
|
-
REISSUE:
|
|
21
|
-
RETURN:
|
|
22
|
-
PURCHASE:
|
|
23
|
-
PURCHASE_RETURN:
|
|
24
|
-
TRANSFER:
|
|
25
|
-
WORK_ORDER:
|
|
26
|
-
OTHER:
|
|
27
|
-
ADJUST:
|
|
28
|
-
INVENTORY_COUNT:
|
|
29
|
-
PRODUCT_SAMPLE:
|
|
30
|
-
INTERNAL_COLLECTION:
|
|
31
|
-
HEADERLESS:
|
|
32
|
-
LOCK:
|
|
33
|
-
SAMPLE_RETURN:
|
|
14
|
+
SALES: "销售出库",
|
|
15
|
+
EXCHANGE: "换货出库",
|
|
16
|
+
REISSUE: "补发出库",
|
|
17
|
+
RETURN: "销退入库",
|
|
18
|
+
PURCHASE: "采购",
|
|
19
|
+
PURCHASE_RETURN: "采退",
|
|
20
|
+
TRANSFER: "调拨",
|
|
21
|
+
WORK_ORDER: "加工",
|
|
22
|
+
OTHER: "其他",
|
|
23
|
+
ADJUST: "调整",
|
|
24
|
+
INVENTORY_COUNT: "盘点",
|
|
25
|
+
PRODUCT_SAMPLE: "产品寄样",
|
|
26
|
+
INTERNAL_COLLECTION: "内部领用",
|
|
27
|
+
HEADERLESS: "无头件退货",
|
|
28
|
+
LOCK: "锁定单",
|
|
29
|
+
SAMPLE_RETURN: "寄样退回"
|
|
34
30
|
};
|
|
35
31
|
export var TTX_STATUS_MAP = {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
32
|
+
"100": "订单池",
|
|
33
|
+
"400": "待合单",
|
|
34
|
+
"500": "待同步",
|
|
35
|
+
"510": "已同步",
|
|
36
|
+
"700": "发货中",
|
|
37
|
+
"900": "已发货",
|
|
38
|
+
"999": "作废",
|
|
39
|
+
"200": "审单中",
|
|
40
|
+
"888": "拦截中",
|
|
41
|
+
"0": "待预审",
|
|
42
|
+
"-100": "待提交",
|
|
43
|
+
"650": "已下沉",
|
|
44
|
+
"450": "待审核追加",
|
|
45
|
+
"455": "审核追加中"
|
|
50
46
|
};
|
|
51
47
|
export var TTX_SYSTEM_ORDER_CONFIG = {
|
|
52
|
-
key:
|
|
53
|
-
name:
|
|
54
|
-
selectId:
|
|
55
|
-
orderNo:
|
|
48
|
+
key: "ttxSystemShowOrder",
|
|
49
|
+
name: "通天晓",
|
|
50
|
+
selectId: "ttxSystemSelectIds",
|
|
51
|
+
orderNo: "ttxSystemOrderNo",
|
|
56
52
|
columns: [{
|
|
57
|
-
dataIndex:
|
|
58
|
-
title:
|
|
53
|
+
dataIndex: "code",
|
|
54
|
+
title: "系统订单编号",
|
|
59
55
|
width: 160
|
|
60
56
|
}, {
|
|
61
|
-
dataIndex:
|
|
62
|
-
title:
|
|
57
|
+
dataIndex: "sourceOrderCode",
|
|
58
|
+
title: "平台订单号",
|
|
63
59
|
width: 160
|
|
64
60
|
}, {
|
|
65
|
-
dataIndex:
|
|
66
|
-
title:
|
|
61
|
+
dataIndex: "storeCode",
|
|
62
|
+
title: "店铺编码",
|
|
67
63
|
width: 150
|
|
68
64
|
}, {
|
|
69
|
-
dataIndex:
|
|
70
|
-
title:
|
|
65
|
+
dataIndex: "internalOrderType",
|
|
66
|
+
title: "系统内单据类型",
|
|
71
67
|
width: 150,
|
|
72
68
|
render: function render(value) {
|
|
73
69
|
return TTX_INTERNAL_ORDER_TYPE_MAP[String(value)] || value;
|
|
74
70
|
},
|
|
75
71
|
renderExport: function renderExport(value) {
|
|
76
72
|
return TTX_INTERNAL_ORDER_TYPE_MAP[String(value)] || value;
|
|
77
|
-
},
|
|
78
|
-
conditionOptionsSetting: {
|
|
79
|
-
dataType: 'weakenArray',
|
|
80
|
-
getOptions: function getOptions() {
|
|
81
|
-
return Object.entries(TTX_INTERNAL_ORDER_TYPE_MAP).map(function (_ref) {
|
|
82
|
-
var _ref2 = _slicedToArray(_ref, 2),
|
|
83
|
-
value = _ref2[0],
|
|
84
|
-
label = _ref2[1];
|
|
85
|
-
return {
|
|
86
|
-
value: value,
|
|
87
|
-
label: label
|
|
88
|
-
};
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
73
|
}
|
|
92
74
|
}, {
|
|
93
|
-
dataIndex:
|
|
94
|
-
title:
|
|
75
|
+
dataIndex: "status",
|
|
76
|
+
title: "状态",
|
|
95
77
|
width: 120,
|
|
96
78
|
render: function render(value) {
|
|
97
79
|
return TTX_STATUS_MAP[String(value)] || value;
|
|
98
80
|
},
|
|
99
81
|
renderExport: function renderExport(value) {
|
|
100
82
|
return TTX_STATUS_MAP[String(value)] || value;
|
|
101
|
-
},
|
|
102
|
-
conditionOptionsSetting: {
|
|
103
|
-
dataType: 'weakenArray',
|
|
104
|
-
getOptions: function getOptions() {
|
|
105
|
-
return Object.entries(TTX_STATUS_MAP).map(function (_ref3) {
|
|
106
|
-
var _ref4 = _slicedToArray(_ref3, 2),
|
|
107
|
-
value = _ref4[0],
|
|
108
|
-
label = _ref4[1];
|
|
109
|
-
return {
|
|
110
|
-
value: value,
|
|
111
|
-
label: label
|
|
112
|
-
};
|
|
113
|
-
});
|
|
114
|
-
}
|
|
115
83
|
}
|
|
116
84
|
}, {
|
|
117
|
-
dataIndex:
|
|
118
|
-
title:
|
|
85
|
+
dataIndex: "split",
|
|
86
|
+
title: "拆单标记",
|
|
119
87
|
width: 100,
|
|
120
88
|
render: function render(value) {
|
|
121
|
-
return value === 1 || value ===
|
|
89
|
+
return value === 1 || value === "1" ? "拆单" : "";
|
|
122
90
|
},
|
|
123
91
|
renderExport: function renderExport(value) {
|
|
124
|
-
return value === 1 || value ===
|
|
92
|
+
return value === 1 || value === "1" ? "拆单" : "";
|
|
125
93
|
}
|
|
126
94
|
}, {
|
|
127
|
-
dataIndex:
|
|
128
|
-
title:
|
|
95
|
+
dataIndex: "masterOrderCode",
|
|
96
|
+
title: "主单编码",
|
|
129
97
|
width: 160
|
|
130
98
|
}, {
|
|
131
|
-
dataIndex:
|
|
132
|
-
title:
|
|
99
|
+
dataIndex: "orderTags",
|
|
100
|
+
title: "订单标签",
|
|
133
101
|
width: 160
|
|
134
102
|
}, {
|
|
135
|
-
dataIndex:
|
|
136
|
-
title:
|
|
103
|
+
dataIndex: "facilityName",
|
|
104
|
+
title: "发货仓名称",
|
|
137
105
|
width: 150
|
|
138
106
|
}, {
|
|
139
|
-
dataIndex:
|
|
140
|
-
title:
|
|
107
|
+
dataIndex: "facilityCode",
|
|
108
|
+
title: "发货仓编码",
|
|
141
109
|
width: 150
|
|
142
110
|
}, {
|
|
143
|
-
dataIndex:
|
|
144
|
-
title:
|
|
111
|
+
dataIndex: "carrierCode",
|
|
112
|
+
title: "物流公司编码",
|
|
145
113
|
width: 150
|
|
146
114
|
}, {
|
|
147
|
-
dataIndex:
|
|
148
|
-
title:
|
|
115
|
+
dataIndex: "primaryWaybillCode",
|
|
116
|
+
title: "主物流单号",
|
|
149
117
|
width: 180
|
|
150
118
|
}, {
|
|
151
|
-
dataIndex:
|
|
152
|
-
title:
|
|
119
|
+
dataIndex: "secondaryWaybillCode",
|
|
120
|
+
title: "其他物流单号",
|
|
153
121
|
width: 180
|
|
154
122
|
}]
|
|
155
123
|
};
|
|
@@ -160,21 +128,21 @@ var arrayValue = function arrayValue() {
|
|
|
160
128
|
return values.find(Array.isArray) || [];
|
|
161
129
|
};
|
|
162
130
|
var getOrderCode = function getOrderCode(order) {
|
|
163
|
-
var
|
|
164
|
-
return (
|
|
131
|
+
var _ref, _ref2, _ref3, _order$code;
|
|
132
|
+
return (_ref = (_ref2 = (_ref3 = (_order$code = order === null || order === void 0 ? void 0 : order.code) !== null && _order$code !== void 0 ? _order$code : order === null || order === void 0 ? void 0 : order.orderCode) !== null && _ref3 !== void 0 ? _ref3 : order === null || order === void 0 ? void 0 : order.systemOrderCode) !== null && _ref2 !== void 0 ? _ref2 : order === null || order === void 0 ? void 0 : order.orderNo) !== null && _ref !== void 0 ? _ref : "";
|
|
165
133
|
};
|
|
166
134
|
var toWaybillList = function toWaybillList(order) {
|
|
167
135
|
var packages = arrayValue(order === null || order === void 0 ? void 0 : order.packages, order === null || order === void 0 ? void 0 : order.packageList, order === null || order === void 0 ? void 0 : order.waybills);
|
|
168
136
|
if (packages.length) return packages;
|
|
169
|
-
var secondary = Array.isArray(order === null || order === void 0 ? void 0 : order.secondaryWaybillCode) ? order.secondaryWaybillCode : String((order === null || order === void 0 ? void 0 : order.secondaryWaybillCode) ||
|
|
137
|
+
var secondary = Array.isArray(order === null || order === void 0 ? void 0 : order.secondaryWaybillCode) ? order.secondaryWaybillCode : String((order === null || order === void 0 ? void 0 : order.secondaryWaybillCode) || "").split(",").map(function (item) {
|
|
170
138
|
return item.trim();
|
|
171
139
|
}).filter(Boolean);
|
|
172
140
|
return [_objectSpread(_objectSpread({}, order), {}, {
|
|
173
|
-
primaryWaybillCode: (order === null || order === void 0 ? void 0 : order.primaryWaybillCode) || (order === null || order === void 0 ? void 0 : order.waybillCode) ||
|
|
174
|
-
secondaryWaybillCode:
|
|
141
|
+
primaryWaybillCode: (order === null || order === void 0 ? void 0 : order.primaryWaybillCode) || (order === null || order === void 0 ? void 0 : order.waybillCode) || "",
|
|
142
|
+
secondaryWaybillCode: ""
|
|
175
143
|
})].concat(_toConsumableArray(secondary.map(function (secondaryWaybillCode) {
|
|
176
144
|
return _objectSpread(_objectSpread({}, order), {}, {
|
|
177
|
-
primaryWaybillCode:
|
|
145
|
+
primaryWaybillCode: "",
|
|
178
146
|
secondaryWaybillCode: secondaryWaybillCode
|
|
179
147
|
});
|
|
180
148
|
}))).filter(function (item) {
|
|
@@ -199,7 +167,7 @@ var getSelectedOrders = function getSelectedOrders(orders, selectedRows, matchLo
|
|
|
199
167
|
if (matchLogisticsNo) {
|
|
200
168
|
return orders.filter(function (order) {
|
|
201
169
|
return toWaybillList(order).some(function (item) {
|
|
202
|
-
return String(item.primaryWaybillCode || item.secondaryWaybillCode ||
|
|
170
|
+
return String(item.primaryWaybillCode || item.secondaryWaybillCode || "").trim() === String(matchLogisticsNo).trim();
|
|
203
171
|
});
|
|
204
172
|
});
|
|
205
173
|
}
|
|
@@ -226,28 +194,28 @@ var getOrderGoods = function getOrderGoods(order) {
|
|
|
226
194
|
var skus = arrayValue(item === null || item === void 0 ? void 0 : item.skus, item === null || item === void 0 ? void 0 : item.skuList);
|
|
227
195
|
var source = skus.length ? skus : [item];
|
|
228
196
|
source.forEach(function (sku, skuIndex) {
|
|
229
|
-
var
|
|
197
|
+
var _ref4, _ref5, _ref6, _sku$skuName, _ref7, _ref8, _ref9, _sku$skuCode, _ref10, _ref11, _sku$sourceSpuId, _ref12, _ref13, _sku$sourceSkuId, _ref14, _ref15, _sku$requestQty, _ref16, _sku$shipQty, _ref17, _sku$returnQty, _ref18, _sku$listPrice, _ref19, _sku$netPrice, _ref20, _sku$msrPrice, _ref21, _sku$itemTotalAmount, _ref22, _sku$totalPayAmount, _sku$isGift, _ref23, _sku$bomType, _ref24, _sku$bomSkuCode, _ref25, _sku$platformSpuCode, _ref26, _sku$platformSkuCode, _ref27, _sku$uuid, _config$canEdit;
|
|
230
198
|
result.push(_objectSpread(_objectSpread(_objectSpread({}, item), sku), {}, {
|
|
231
|
-
skuName: (
|
|
232
|
-
skuCode: (
|
|
233
|
-
sourceSpuId: (
|
|
234
|
-
sourceSkuId: (
|
|
235
|
-
requestQty: (
|
|
236
|
-
shipQty: (
|
|
237
|
-
returnQty: (
|
|
238
|
-
listPrice: (
|
|
239
|
-
netPrice: (
|
|
240
|
-
msrPrice: (
|
|
241
|
-
itemTotalAmount: (
|
|
242
|
-
totalPayAmount: (
|
|
199
|
+
skuName: (_ref4 = (_ref5 = (_ref6 = (_sku$skuName = sku === null || sku === void 0 ? void 0 : sku.skuName) !== null && _sku$skuName !== void 0 ? _sku$skuName : sku === null || sku === void 0 ? void 0 : sku.name) !== null && _ref6 !== void 0 ? _ref6 : item === null || item === void 0 ? void 0 : item.skuName) !== null && _ref5 !== void 0 ? _ref5 : item === null || item === void 0 ? void 0 : item.name) !== null && _ref4 !== void 0 ? _ref4 : "",
|
|
200
|
+
skuCode: (_ref7 = (_ref8 = (_ref9 = (_sku$skuCode = sku === null || sku === void 0 ? void 0 : sku.skuCode) !== null && _sku$skuCode !== void 0 ? _sku$skuCode : sku === null || sku === void 0 ? void 0 : sku.code) !== null && _ref9 !== void 0 ? _ref9 : item === null || item === void 0 ? void 0 : item.skuCode) !== null && _ref8 !== void 0 ? _ref8 : item === null || item === void 0 ? void 0 : item.code) !== null && _ref7 !== void 0 ? _ref7 : "",
|
|
201
|
+
sourceSpuId: (_ref10 = (_ref11 = (_sku$sourceSpuId = sku === null || sku === void 0 ? void 0 : sku.sourceSpuId) !== null && _sku$sourceSpuId !== void 0 ? _sku$sourceSpuId : item === null || item === void 0 ? void 0 : item.sourceSpuId) !== null && _ref11 !== void 0 ? _ref11 : item === null || item === void 0 ? void 0 : item.spuId) !== null && _ref10 !== void 0 ? _ref10 : "",
|
|
202
|
+
sourceSkuId: (_ref12 = (_ref13 = (_sku$sourceSkuId = sku === null || sku === void 0 ? void 0 : sku.sourceSkuId) !== null && _sku$sourceSkuId !== void 0 ? _sku$sourceSkuId : item === null || item === void 0 ? void 0 : item.sourceSkuId) !== null && _ref13 !== void 0 ? _ref13 : item === null || item === void 0 ? void 0 : item.skuId) !== null && _ref12 !== void 0 ? _ref12 : "",
|
|
203
|
+
requestQty: (_ref14 = (_ref15 = (_sku$requestQty = sku === null || sku === void 0 ? void 0 : sku.requestQty) !== null && _sku$requestQty !== void 0 ? _sku$requestQty : item === null || item === void 0 ? void 0 : item.requestQty) !== null && _ref15 !== void 0 ? _ref15 : item === null || item === void 0 ? void 0 : item.quantity) !== null && _ref14 !== void 0 ? _ref14 : 0,
|
|
204
|
+
shipQty: (_ref16 = (_sku$shipQty = sku === null || sku === void 0 ? void 0 : sku.shipQty) !== null && _sku$shipQty !== void 0 ? _sku$shipQty : item === null || item === void 0 ? void 0 : item.shipQty) !== null && _ref16 !== void 0 ? _ref16 : 0,
|
|
205
|
+
returnQty: (_ref17 = (_sku$returnQty = sku === null || sku === void 0 ? void 0 : sku.returnQty) !== null && _sku$returnQty !== void 0 ? _sku$returnQty : item === null || item === void 0 ? void 0 : item.returnQty) !== null && _ref17 !== void 0 ? _ref17 : 0,
|
|
206
|
+
listPrice: (_ref18 = (_sku$listPrice = sku === null || sku === void 0 ? void 0 : sku.listPrice) !== null && _sku$listPrice !== void 0 ? _sku$listPrice : item === null || item === void 0 ? void 0 : item.listPrice) !== null && _ref18 !== void 0 ? _ref18 : 0,
|
|
207
|
+
netPrice: (_ref19 = (_sku$netPrice = sku === null || sku === void 0 ? void 0 : sku.netPrice) !== null && _sku$netPrice !== void 0 ? _sku$netPrice : item === null || item === void 0 ? void 0 : item.netPrice) !== null && _ref19 !== void 0 ? _ref19 : 0,
|
|
208
|
+
msrPrice: (_ref20 = (_sku$msrPrice = sku === null || sku === void 0 ? void 0 : sku.msrPrice) !== null && _sku$msrPrice !== void 0 ? _sku$msrPrice : item === null || item === void 0 ? void 0 : item.msrPrice) !== null && _ref20 !== void 0 ? _ref20 : 0,
|
|
209
|
+
itemTotalAmount: (_ref21 = (_sku$itemTotalAmount = sku === null || sku === void 0 ? void 0 : sku.itemTotalAmount) !== null && _sku$itemTotalAmount !== void 0 ? _sku$itemTotalAmount : item === null || item === void 0 ? void 0 : item.itemTotalAmount) !== null && _ref21 !== void 0 ? _ref21 : 0,
|
|
210
|
+
totalPayAmount: (_ref22 = (_sku$totalPayAmount = sku === null || sku === void 0 ? void 0 : sku.totalPayAmount) !== null && _sku$totalPayAmount !== void 0 ? _sku$totalPayAmount : item === null || item === void 0 ? void 0 : item.totalPayAmount) !== null && _ref22 !== void 0 ? _ref22 : 0,
|
|
243
211
|
isGift: (_sku$isGift = sku === null || sku === void 0 ? void 0 : sku.isGift) !== null && _sku$isGift !== void 0 ? _sku$isGift : item === null || item === void 0 ? void 0 : item.isGift,
|
|
244
|
-
bomType: (
|
|
245
|
-
bomSkuCode: (
|
|
246
|
-
platformSpuCode: (
|
|
247
|
-
platformSkuCode: (
|
|
212
|
+
bomType: (_ref23 = (_sku$bomType = sku === null || sku === void 0 ? void 0 : sku.bomType) !== null && _sku$bomType !== void 0 ? _sku$bomType : item === null || item === void 0 ? void 0 : item.bomType) !== null && _ref23 !== void 0 ? _ref23 : "",
|
|
213
|
+
bomSkuCode: (_ref24 = (_sku$bomSkuCode = sku === null || sku === void 0 ? void 0 : sku.bomSkuCode) !== null && _sku$bomSkuCode !== void 0 ? _sku$bomSkuCode : item === null || item === void 0 ? void 0 : item.bomSkuCode) !== null && _ref24 !== void 0 ? _ref24 : "",
|
|
214
|
+
platformSpuCode: (_ref25 = (_sku$platformSpuCode = sku === null || sku === void 0 ? void 0 : sku.platformSpuCode) !== null && _sku$platformSpuCode !== void 0 ? _sku$platformSpuCode : item === null || item === void 0 ? void 0 : item.platformSpuCode) !== null && _ref25 !== void 0 ? _ref25 : "",
|
|
215
|
+
platformSkuCode: (_ref26 = (_sku$platformSkuCode = sku === null || sku === void 0 ? void 0 : sku.platformSkuCode) !== null && _sku$platformSkuCode !== void 0 ? _sku$platformSkuCode : item === null || item === void 0 ? void 0 : item.platformSkuCode) !== null && _ref26 !== void 0 ? _ref26 : "",
|
|
248
216
|
code: getOrderCode(order),
|
|
249
217
|
systemOrderNo: getOrderCode(order),
|
|
250
|
-
uuid: (
|
|
218
|
+
uuid: (_ref27 = (_sku$uuid = sku === null || sku === void 0 ? void 0 : sku.uuid) !== null && _sku$uuid !== void 0 ? _sku$uuid : item === null || item === void 0 ? void 0 : item.uuid) !== null && _ref27 !== void 0 ? _ref27 : getTtxGoodsUuid(order, itemIndex, skuIndex),
|
|
251
219
|
canDelete: true,
|
|
252
220
|
canEdit: (_config$canEdit = config.canEdit) !== null && _config$canEdit !== void 0 ? _config$canEdit : true
|
|
253
221
|
}));
|
|
@@ -258,10 +226,10 @@ var getOrderGoods = function getOrderGoods(order) {
|
|
|
258
226
|
var makeLogistics = function makeLogistics(orders) {
|
|
259
227
|
return orders.reduce(function (result, order) {
|
|
260
228
|
toWaybillList(order).forEach(function (pkg) {
|
|
261
|
-
var
|
|
229
|
+
var _ref28, _pkg$carrierCode;
|
|
262
230
|
result.push({
|
|
263
|
-
logisticsCompany: (
|
|
264
|
-
logisticsCode: (pkg === null || pkg === void 0 ? void 0 : pkg.primaryWaybillCode) || (pkg === null || pkg === void 0 ? void 0 : pkg.secondaryWaybillCode) ||
|
|
231
|
+
logisticsCompany: (_ref28 = (_pkg$carrierCode = pkg === null || pkg === void 0 ? void 0 : pkg.carrierCode) !== null && _pkg$carrierCode !== void 0 ? _pkg$carrierCode : order.carrierCode) !== null && _ref28 !== void 0 ? _ref28 : "",
|
|
232
|
+
logisticsCode: (pkg === null || pkg === void 0 ? void 0 : pkg.primaryWaybillCode) || (pkg === null || pkg === void 0 ? void 0 : pkg.secondaryWaybillCode) || ""
|
|
265
233
|
});
|
|
266
234
|
});
|
|
267
235
|
return result;
|
|
@@ -285,19 +253,19 @@ var filterComponentList = function filterComponentList(list, type) {
|
|
|
285
253
|
var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
286
254
|
return (list || []).map(function (item) {
|
|
287
255
|
var next = _objectSpread({}, item);
|
|
288
|
-
if (type ===
|
|
289
|
-
if (config.showField && config.showField !==
|
|
256
|
+
if (type === "logistics") {
|
|
257
|
+
if (config.showField && config.showField !== "logisticsCompany") {
|
|
290
258
|
next.logisticsCompany = undefined;
|
|
291
259
|
}
|
|
292
|
-
if (config.showField && config.showField !==
|
|
260
|
+
if (config.showField && config.showField !== "logisticsCode") {
|
|
293
261
|
next.logisticsCode = undefined;
|
|
294
262
|
}
|
|
295
263
|
}
|
|
296
|
-
if (type ===
|
|
297
|
-
if (![
|
|
264
|
+
if (type === "send") {
|
|
265
|
+
if (!["all", "sendId"].includes(config.showField || "")) {
|
|
298
266
|
next.sendId = undefined;
|
|
299
267
|
}
|
|
300
|
-
if (![
|
|
268
|
+
if (!["all", "sendName"].includes(config.showField || "")) {
|
|
301
269
|
next.sendName = undefined;
|
|
302
270
|
next.sendSnapshotName = undefined;
|
|
303
271
|
}
|
|
@@ -318,18 +286,18 @@ export var ttxOrderTransform = function ttxOrderTransform() {
|
|
|
318
286
|
var selectedOrders = getSelectedOrders(orders, detail.selectedRows, detail.matchLogisticsNo);
|
|
319
287
|
var componentList = detail.componentList || [];
|
|
320
288
|
var logisticsComponent = componentList.find(function (item) {
|
|
321
|
-
return item.workOrderComponentType ===
|
|
289
|
+
return item.workOrderComponentType === "TTX_LOGISTICS";
|
|
322
290
|
});
|
|
323
291
|
var sendComponent = componentList.find(function (item) {
|
|
324
|
-
return item.workOrderComponentType ===
|
|
292
|
+
return item.workOrderComponentType === "TTX_SEND_GOOD";
|
|
325
293
|
});
|
|
326
294
|
var logistics = keepCurrentValue(logisticsComponent, form, {
|
|
327
295
|
logisticsCompany: null,
|
|
328
296
|
logisticsCode: null
|
|
329
297
|
}) || makeLogistics(selectedOrders);
|
|
330
298
|
var sendGood = keepCurrentValue(sendComponent, form, {
|
|
331
|
-
sendId:
|
|
332
|
-
sendName:
|
|
299
|
+
sendId: "",
|
|
300
|
+
sendName: ""
|
|
333
301
|
}) || makeSendGoods(selectedOrders);
|
|
334
302
|
var firstOrder = selectedOrders[0] || orders[0] || {};
|
|
335
303
|
return {
|
|
@@ -358,8 +326,8 @@ export var ttxOrderTransform = function ttxOrderTransform() {
|
|
|
358
326
|
logisticsCode: null
|
|
359
327
|
}],
|
|
360
328
|
ttxSendGood: sendGood.length ? sendGood : [{
|
|
361
|
-
sendId:
|
|
362
|
-
sendName:
|
|
329
|
+
sendId: "",
|
|
330
|
+
sendName: ""
|
|
363
331
|
}],
|
|
364
332
|
shopCode: firstOrder.storeCode || detail.shopCode
|
|
365
333
|
};
|
|
@@ -370,17 +338,17 @@ export var ttxOrderBackFormValues = function ttxOrderBackFormValues() {
|
|
|
370
338
|
return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (values, component) {
|
|
371
339
|
var config = component.componentConfig || {};
|
|
372
340
|
switch (component.workOrderComponentType) {
|
|
373
|
-
case
|
|
341
|
+
case "TTX_SYSTEM_ORDER":
|
|
374
342
|
values[component.uniqueKey] = detail.ttxSystemOrder;
|
|
375
343
|
break;
|
|
376
|
-
case
|
|
344
|
+
case "TTX_GOODS":
|
|
377
345
|
values[component.uniqueKey] = detail.ttxGoods;
|
|
378
346
|
break;
|
|
379
|
-
case
|
|
380
|
-
values[component.uniqueKey] = filterComponentList(detail.ttxLogistics,
|
|
347
|
+
case "TTX_LOGISTICS":
|
|
348
|
+
values[component.uniqueKey] = filterComponentList(detail.ttxLogistics, "logistics", config);
|
|
381
349
|
break;
|
|
382
|
-
case
|
|
383
|
-
values[component.uniqueKey] = filterComponentList(detail.ttxSendGood,
|
|
350
|
+
case "TTX_SEND_GOOD":
|
|
351
|
+
values[component.uniqueKey] = filterComponentList(detail.ttxSendGood, "send", config);
|
|
384
352
|
break;
|
|
385
353
|
default:
|
|
386
354
|
break;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-utils",
|
|
3
|
-
"version": "2.10.9-beta.
|
|
3
|
+
"version": "2.10.9-beta.46",
|
|
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": "245beb0ea7f8e6f7c83ddeceefaaf46662c2cf33",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|