@kmkf-fe-packages/kmkf-utils 0.7.15-alpha.52 → 0.7.15-alpha.55
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.
|
@@ -1,11 +1,12 @@
|
|
|
1
|
-
export { default as toTree } from
|
|
2
|
-
export { default as findLabelBySelectValue } from
|
|
3
|
-
export { default as transMultSelectOptions } from
|
|
4
|
-
export { default as imgResize } from
|
|
5
|
-
export { default as isNull } from
|
|
6
|
-
export { default as getExpression } from
|
|
7
|
-
export { default as formatDisplayConfig } from
|
|
8
|
-
export { default as orderBackFormValues } from
|
|
9
|
-
export
|
|
10
|
-
export * as
|
|
11
|
-
export * as
|
|
1
|
+
export { default as toTree } from "./toTree";
|
|
2
|
+
export { default as findLabelBySelectValue } from "./findLabelBySelectValue";
|
|
3
|
+
export { default as transMultSelectOptions } from "./transMultSelectOptions";
|
|
4
|
+
export { default as imgResize } from "./imgResize";
|
|
5
|
+
export { default as isNull } from "./isNull";
|
|
6
|
+
export { default as getExpression } from "./getExpression";
|
|
7
|
+
export { default as formatDisplayConfig } from "./formatDisplayConfig";
|
|
8
|
+
export { default as orderBackFormValues } from "./orderBackFormValues";
|
|
9
|
+
export { default as uuid } from "./getUUid";
|
|
10
|
+
export * as filterFn from "./filterFn";
|
|
11
|
+
export * as templateFn from "./template";
|
|
12
|
+
export * as tree from "./multidimensionalFindChild";
|
package/dist/esm/utils/index.js
CHANGED
|
@@ -6,6 +6,7 @@ export { default as isNull } from "./isNull";
|
|
|
6
6
|
export { default as getExpression } from "./getExpression";
|
|
7
7
|
export { default as formatDisplayConfig } from "./formatDisplayConfig";
|
|
8
8
|
export { default as orderBackFormValues } from "./orderBackFormValues";
|
|
9
|
+
export { default as uuid } from "./getUUid";
|
|
9
10
|
import * as _filterFn from "./filterFn";
|
|
10
11
|
export { _filterFn as filterFn };
|
|
11
12
|
import * as _templateFn from "./template";
|
|
@@ -7,6 +7,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
|
|
|
7
7
|
import moment from "moment";
|
|
8
8
|
import ExpressData from "../expressData";
|
|
9
9
|
import ExpressInterceptData from "../expressInterceptData";
|
|
10
|
+
import uuid from "./getUUid";
|
|
10
11
|
//重组聚水潭商品数据
|
|
11
12
|
var updateJSTItemListHandle = function updateJSTItemListHandle() {
|
|
12
13
|
var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
@@ -112,7 +113,8 @@ var updateBsGoodsHandle = function updateBsGoodsHandle() {
|
|
|
112
113
|
number: qty,
|
|
113
114
|
share: amountShareSettle,
|
|
114
115
|
type: giftType,
|
|
115
|
-
canDelete: true
|
|
116
|
+
canDelete: true,
|
|
117
|
+
uuid: uuid()
|
|
116
118
|
};
|
|
117
119
|
});
|
|
118
120
|
prv.push.apply(prv, _toConsumableArray(goods));
|
|
@@ -137,17 +139,18 @@ var updateBsItemListHandle = function updateBsItemListHandle(list, type) {
|
|
|
137
139
|
};
|
|
138
140
|
if (type === "logistics") {
|
|
139
141
|
if (["logisticsCompany", ""].includes(showField || "")) {
|
|
140
|
-
|
|
142
|
+
console.log(item.logisticCompany, ExpressData.getInstance().getExpressCodeByName(item.logisticCompany));
|
|
143
|
+
params.logisticsCompany = ExpressData.getInstance().getExpressCodeByName(item.logisticCompany);
|
|
141
144
|
}
|
|
142
145
|
if (["logisticsCode", ""].includes(showField || "")) {
|
|
143
|
-
params.logisticsCode = item.
|
|
146
|
+
params.logisticsCode = item === null || item === void 0 ? void 0 : item.deliveryNo;
|
|
144
147
|
}
|
|
145
148
|
} else if (type === "send") {
|
|
146
149
|
if (["sendId", "all"].includes(showField || "")) {
|
|
147
|
-
params.sendId = item.
|
|
150
|
+
params.sendId = item.wareHouseRealCode;
|
|
148
151
|
}
|
|
149
152
|
if (["sendName", "all"].includes(showField || "")) {
|
|
150
|
-
params.sendName = item.
|
|
153
|
+
params.sendName = item.wareHouseRealName;
|
|
151
154
|
}
|
|
152
155
|
}
|
|
153
156
|
return params;
|
|
@@ -235,9 +238,11 @@ export default (function (_ref) {
|
|
|
235
238
|
fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
|
|
236
239
|
var advItem = ((_detail$bsOrder = detail["bsOrder"]) === null || _detail$bsOrder === void 0 ? void 0 : (_detail$bsOrder$order = _detail$bsOrder.orders) === null || _detail$bsOrder$order === void 0 ? void 0 : (_detail$bsOrder$order2 = _detail$bsOrder$order[0]) === null || _detail$bsOrder$order2 === void 0 ? void 0 : (_detail$bsOrder$order3 = _detail$bsOrder$order2.advancedDistributionInfos) === null || _detail$bsOrder$order3 === void 0 ? void 0 : _detail$bsOrder$order3[0]) || {};
|
|
237
240
|
return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
238
|
-
var _detail$bsOrder2, _detail$bsOrder3, _detail$bsOrder3$orde, _detail$bsOrder3$orde2, _detail$bsOrder3$orde3, _detail$
|
|
241
|
+
var _detail$bsOrder2, _detail$bsOrder3, _detail$bsOrder3$orde, _detail$bsOrder3$orde2, _detail$bsOrder3$orde3, _detail$bsOrder4, _detail$bsOrder5, _detail$bsOrder6, _detail$bsOrder7, _detail$bsOrder8, _detail$bsOrder9, _detail$bsOrder10, _detail$bsOrder11, _detail$bsOrder12, _detail$bsOrder13;
|
|
239
242
|
var uniqueKey = next.uniqueKey;
|
|
240
243
|
var config = next.componentConfig;
|
|
244
|
+
var weight = 0;
|
|
245
|
+
var bsPostingAddress = [];
|
|
241
246
|
switch (next.workOrderComponentType) {
|
|
242
247
|
case "TRADE_ID_INPUT":
|
|
243
248
|
prv[uniqueKey] = order_no || detail["orderNo"];
|
|
@@ -360,33 +365,37 @@ export default (function (_ref) {
|
|
|
360
365
|
prv[uniqueKey] = (_detail$bsOrder2 = detail["bsOrder"]) === null || _detail$bsOrder2 === void 0 ? void 0 : _detail$bsOrder2.receiptDate;
|
|
361
366
|
break;
|
|
362
367
|
case "BS_SEND_TIME":
|
|
363
|
-
prv[uniqueKey] = (_detail$bsOrder3 = detail["bsOrder"]) === null || _detail$bsOrder3 === void 0 ? void 0 : (_detail$bsOrder3$orde = _detail$bsOrder3.orders) === null || _detail$bsOrder3$orde === void 0 ? void 0 : (_detail$bsOrder3$orde2 = _detail$bsOrder3$orde
|
|
368
|
+
prv[uniqueKey] = (_detail$bsOrder3 = detail["bsOrder"]) === null || _detail$bsOrder3 === void 0 ? void 0 : (_detail$bsOrder3$orde = _detail$bsOrder3.orders[0]) === null || _detail$bsOrder3$orde === void 0 ? void 0 : (_detail$bsOrder3$orde2 = _detail$bsOrder3$orde.advancedDistributionInfos) === null || _detail$bsOrder3$orde2 === void 0 ? void 0 : (_detail$bsOrder3$orde3 = _detail$bsOrder3$orde2[0]) === null || _detail$bsOrder3$orde3 === void 0 ? void 0 : _detail$bsOrder3$orde3.deliveryDate;
|
|
364
369
|
break;
|
|
365
370
|
case "BS_TRADE_PAYMENT_TIME":
|
|
366
371
|
prv[uniqueKey] = (_detail$bsOrder4 = detail["bsOrder"]) === null || _detail$bsOrder4 === void 0 ? void 0 : _detail$bsOrder4.payDate;
|
|
367
372
|
break;
|
|
373
|
+
case "BS_DEPOSIT":
|
|
374
|
+
prv[uniqueKey] = (_detail$bsOrder5 = detail["bsOrder"]) === null || _detail$bsOrder5 === void 0 ? void 0 : _detail$bsOrder5.amountPaid;
|
|
375
|
+
break;
|
|
368
376
|
case "BS_NET_RECEIPTS":
|
|
369
|
-
prv[uniqueKey] = (_detail$
|
|
377
|
+
prv[uniqueKey] = (_detail$bsOrder6 = detail["bsOrder"]) === null || _detail$bsOrder6 === void 0 ? void 0 : _detail$bsOrder6.merchantRealIncome;
|
|
370
378
|
break;
|
|
371
379
|
case "BS_PACKAGE_WEIGHT":
|
|
372
|
-
|
|
373
|
-
var number = next === null || next === void 0 ? void 0 : next.advancedDistributionInfos.reduce(function (p, n) {
|
|
380
|
+
weight = (((_detail$bsOrder7 = detail["bsOrder"]) === null || _detail$bsOrder7 === void 0 ? void 0 : _detail$bsOrder7.orders) || []).reduce(function (prv, next) {
|
|
381
|
+
var number = ((next === null || next === void 0 ? void 0 : next.advancedDistributionInfos) || []).reduce(function (p, n) {
|
|
374
382
|
p += n.orderWeight || 0;
|
|
375
383
|
return p;
|
|
376
384
|
}, 0);
|
|
377
385
|
prv += number || 0;
|
|
378
386
|
return prv;
|
|
379
387
|
}, 0);
|
|
388
|
+
prv[uniqueKey] = weight || null;
|
|
380
389
|
break;
|
|
381
390
|
case "BS_GOODS":
|
|
382
391
|
prv[uniqueKey] = {
|
|
383
|
-
shopCode: (_detail$
|
|
384
|
-
bsGoods: updateBsGoodsHandle((_detail$
|
|
392
|
+
shopCode: (_detail$bsOrder8 = detail["bsOrder"]) === null || _detail$bsOrder8 === void 0 ? void 0 : _detail$bsOrder8.shopCode,
|
|
393
|
+
bsGoods: updateBsGoodsHandle((_detail$bsOrder9 = detail["bsOrder"]) === null || _detail$bsOrder9 === void 0 ? void 0 : _detail$bsOrder9.orders)
|
|
385
394
|
};
|
|
386
395
|
break;
|
|
387
396
|
case "BS_EXCHANGE_GOODS":
|
|
388
397
|
prv[uniqueKey] = {
|
|
389
|
-
shopCode: (_detail$
|
|
398
|
+
shopCode: (_detail$bsOrder10 = detail["bsOrder"]) === null || _detail$bsOrder10 === void 0 ? void 0 : _detail$bsOrder10.shopCode,
|
|
390
399
|
bsExchangeType: [],
|
|
391
400
|
bsExchangeReturnGoods: [],
|
|
392
401
|
bsExchangeSwapOutGoods: [],
|
|
@@ -395,20 +404,26 @@ export default (function (_ref) {
|
|
|
395
404
|
break;
|
|
396
405
|
case "BS_REISSUE_GOODS":
|
|
397
406
|
prv[uniqueKey] = {
|
|
398
|
-
shopCode: (_detail$
|
|
407
|
+
shopCode: (_detail$bsOrder11 = detail["bsOrder"]) === null || _detail$bsOrder11 === void 0 ? void 0 : _detail$bsOrder11.shopCode,
|
|
399
408
|
bsReissueType: [],
|
|
400
409
|
bsReissueGoods: []
|
|
401
410
|
};
|
|
402
411
|
break;
|
|
403
412
|
case "BS_LOGISTICS":
|
|
404
|
-
prv[uniqueKey] = updateBsItemListHandle((_detail$
|
|
413
|
+
prv[uniqueKey] = updateBsItemListHandle((_detail$bsOrder12 = detail["bsOrder"]) === null || _detail$bsOrder12 === void 0 ? void 0 : _detail$bsOrder12.orders, "logistics", config);
|
|
405
414
|
break;
|
|
406
415
|
case "BS_SEND_GOOD":
|
|
407
|
-
prv[uniqueKey] = updateBsItemListHandle((_detail$
|
|
416
|
+
prv[uniqueKey] = updateBsItemListHandle((_detail$bsOrder13 = detail["bsOrder"]) === null || _detail$bsOrder13 === void 0 ? void 0 : _detail$bsOrder13.orders, "send", config);
|
|
408
417
|
break;
|
|
409
418
|
case "BS_POSTING":
|
|
419
|
+
if (advItem !== null && advItem !== void 0 && advItem.provinceId) {
|
|
420
|
+
bsPostingAddress = [advItem === null || advItem === void 0 ? void 0 : advItem.provinceId, advItem === null || advItem === void 0 ? void 0 : advItem.cityId];
|
|
421
|
+
if (advItem !== null && advItem !== void 0 && advItem.districtId) {
|
|
422
|
+
bsPostingAddress.push(advItem === null || advItem === void 0 ? void 0 : advItem.districtId);
|
|
423
|
+
}
|
|
424
|
+
}
|
|
410
425
|
prv[uniqueKey] = {
|
|
411
|
-
postingAddress:
|
|
426
|
+
postingAddress: bsPostingAddress,
|
|
412
427
|
postingDetail: advItem === null || advItem === void 0 ? void 0 : advItem.address,
|
|
413
428
|
postingReceiverName: advItem === null || advItem === void 0 ? void 0 : advItem.receiver,
|
|
414
429
|
postingReceiverMobile: advItem === null || advItem === void 0 ? void 0 : advItem.receiverTel
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-utils",
|
|
3
|
-
"version": "0.7.15-alpha.
|
|
3
|
+
"version": "0.7.15-alpha.55",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"gitHooks": {
|
|
43
43
|
"pre-commit": "lint-staged"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "3e8246caabdc34f4e330d2bb5b8e127e0c3a69ad"
|
|
46
46
|
}
|