@kmkf-fe-packages/kmkf-utils 0.7.15-alpha.7 → 0.7.15-alpha.71
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.
- package/dist/esm/bsAddressData/index.js +4 -4
- package/dist/esm/utils/getUUid.d.ts +2 -0
- package/dist/esm/utils/getUUid.js +7 -0
- package/dist/esm/utils/index.d.ts +12 -11
- package/dist/esm/utils/index.js +1 -0
- package/dist/esm/utils/orderBackFormValues.js +163 -0
- package/dist/esm/utils/toTree.js +3 -3
- package/package.json +2 -2
|
@@ -7,7 +7,6 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
|
|
|
7
7
|
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); }
|
|
8
8
|
import request from "../request";
|
|
9
9
|
import { toTree } from "../utils";
|
|
10
|
-
import get from "lodash/get";
|
|
11
10
|
var BsAddressData = /*#__PURE__*/function () {
|
|
12
11
|
function BsAddressData() {
|
|
13
12
|
var _this = this;
|
|
@@ -19,20 +18,21 @@ var BsAddressData = /*#__PURE__*/function () {
|
|
|
19
18
|
var _Object$keys;
|
|
20
19
|
if (((_Object$keys = Object.keys(_this.addrData)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) > 0) return;
|
|
21
20
|
request({
|
|
22
|
-
url: "/qy/gdfw/template/
|
|
21
|
+
url: "/qy/gdfw/template/queryBsAreas",
|
|
23
22
|
method: "get",
|
|
24
23
|
data: {}
|
|
25
24
|
}).then(function (resp) {
|
|
26
25
|
var map = {};
|
|
27
26
|
var res = {};
|
|
28
|
-
var
|
|
27
|
+
var _resp$data = resp.data,
|
|
28
|
+
list = _resp$data === void 0 ? [] : _resp$data;
|
|
29
29
|
for (var i = 0; i < list.length; i++) {
|
|
30
30
|
res[list[i]["id"]] = [list[i]["name"], list[i]["parentId"]];
|
|
31
31
|
map[list[i]["name"]] = list[i]["id"];
|
|
32
32
|
}
|
|
33
33
|
_this.addrData = res;
|
|
34
34
|
_this.addrNameMap = map;
|
|
35
|
-
_this.addressOptions =
|
|
35
|
+
_this.addressOptions = toTree(list, 1);
|
|
36
36
|
});
|
|
37
37
|
});
|
|
38
38
|
_defineProperty(this, "parseData", function (addrCode) {
|
|
@@ -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] : [];
|
|
@@ -91,6 +92,95 @@ var updateJSTItemListHandle = function updateJSTItemListHandle() {
|
|
|
91
92
|
}, []);
|
|
92
93
|
}
|
|
93
94
|
};
|
|
95
|
+
var updateBsGoodsHandle = function updateBsGoodsHandle() {
|
|
96
|
+
var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
97
|
+
return orders.reduce(function (prv, next) {
|
|
98
|
+
var goods = next.items.map(function (item) {
|
|
99
|
+
var picPath = item.picPath,
|
|
100
|
+
code = item.code,
|
|
101
|
+
name = item.name,
|
|
102
|
+
skuCode = item.skuCode,
|
|
103
|
+
giftType = item.giftType,
|
|
104
|
+
qty = item.qty,
|
|
105
|
+
amountShareSettle = item.amountShareSettle,
|
|
106
|
+
sharePrice = item.sharePrice;
|
|
107
|
+
return {
|
|
108
|
+
pic: picPath,
|
|
109
|
+
name: name,
|
|
110
|
+
code: code,
|
|
111
|
+
sku: skuCode,
|
|
112
|
+
money: amountShareSettle || 0,
|
|
113
|
+
number: qty,
|
|
114
|
+
share: sharePrice,
|
|
115
|
+
type: giftType,
|
|
116
|
+
canDelete: true,
|
|
117
|
+
uuid: uuid()
|
|
118
|
+
};
|
|
119
|
+
});
|
|
120
|
+
prv.push.apply(prv, _toConsumableArray(goods));
|
|
121
|
+
return prv;
|
|
122
|
+
}, []);
|
|
123
|
+
};
|
|
124
|
+
var updateBsItemListHandle = function updateBsItemListHandle(list, type) {
|
|
125
|
+
var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
126
|
+
var showField = config.showField;
|
|
127
|
+
var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
|
|
128
|
+
var items = (next.items || []).map(function (t) {
|
|
129
|
+
return {
|
|
130
|
+
title: (t === null || t === void 0 ? void 0 : t.name) || "",
|
|
131
|
+
picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
|
|
132
|
+
platform: "bs",
|
|
133
|
+
skuId: (t === null || t === void 0 ? void 0 : t.singleProductId) || ""
|
|
134
|
+
};
|
|
135
|
+
});
|
|
136
|
+
var advList = (next.advancedDistributionInfos || []).map(function (item) {
|
|
137
|
+
var params = {
|
|
138
|
+
items: items
|
|
139
|
+
};
|
|
140
|
+
if (type === "logistics") {
|
|
141
|
+
if (["logisticsCompany", ""].includes(showField || "")) {
|
|
142
|
+
console.log(item.logisticCompany, ExpressData.getInstance().getExpressCodeByName(item.logisticCompany));
|
|
143
|
+
params.logisticsCompany = ExpressData.getInstance().getExpressCodeByName(item.logisticCompany);
|
|
144
|
+
}
|
|
145
|
+
if (["logisticsCode", ""].includes(showField || "")) {
|
|
146
|
+
params.logisticsCode = item === null || item === void 0 ? void 0 : item.deliveryNo;
|
|
147
|
+
}
|
|
148
|
+
} else if (type === "send") {
|
|
149
|
+
if (["sendId", "all"].includes(showField || "")) {
|
|
150
|
+
params.sendId = item.wareHouseRealCode;
|
|
151
|
+
}
|
|
152
|
+
if (["sendName", "all"].includes(showField || "")) {
|
|
153
|
+
params.sendName = item.wareHouseRealName;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
return params;
|
|
157
|
+
});
|
|
158
|
+
prv.push.apply(prv, _toConsumableArray(advList));
|
|
159
|
+
return prv;
|
|
160
|
+
}, []);
|
|
161
|
+
if (!newList.length) {
|
|
162
|
+
switch (type) {
|
|
163
|
+
case "logistics":
|
|
164
|
+
newList = [{
|
|
165
|
+
logisticsCompany: null,
|
|
166
|
+
logisticsCode: ""
|
|
167
|
+
}];
|
|
168
|
+
break;
|
|
169
|
+
case "supply":
|
|
170
|
+
newList = [{
|
|
171
|
+
supplyId: ""
|
|
172
|
+
}];
|
|
173
|
+
break;
|
|
174
|
+
case "send":
|
|
175
|
+
newList = [{
|
|
176
|
+
sendId: "",
|
|
177
|
+
sendName: ""
|
|
178
|
+
}];
|
|
179
|
+
break;
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
return newList;
|
|
183
|
+
};
|
|
94
184
|
|
|
95
185
|
// 淘宝商品组件信息处理
|
|
96
186
|
|
|
@@ -133,6 +223,7 @@ var taobaoGoodHandle = function taobaoGoodHandle() {
|
|
|
133
223
|
};
|
|
134
224
|
//订单返填数据重组
|
|
135
225
|
export default (function (_ref) {
|
|
226
|
+
var _detail$bsOrder, _detail$bsOrder$order, _detail$bsOrder$order2, _detail$bsOrder$order3;
|
|
136
227
|
var _ref$detail = _ref.detail,
|
|
137
228
|
detail = _ref$detail === void 0 ? {} : _ref$detail,
|
|
138
229
|
_ref$order_no = _ref.order_no,
|
|
@@ -145,9 +236,13 @@ export default (function (_ref) {
|
|
|
145
236
|
type = _ref$type === void 0 ? "add" : _ref$type,
|
|
146
237
|
_ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
|
|
147
238
|
fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
|
|
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]) || {};
|
|
148
240
|
return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
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;
|
|
149
242
|
var uniqueKey = next.uniqueKey;
|
|
150
243
|
var config = next.componentConfig;
|
|
244
|
+
var weight = 0;
|
|
245
|
+
var bsPostingAddress = [];
|
|
151
246
|
switch (next.workOrderComponentType) {
|
|
152
247
|
case "TRADE_ID_INPUT":
|
|
153
248
|
prv[uniqueKey] = order_no || detail["orderNo"];
|
|
@@ -266,6 +361,74 @@ export default (function (_ref) {
|
|
|
266
361
|
case "SYSTEM_ORDER_NO":
|
|
267
362
|
prv[uniqueKey] = detail["sid"];
|
|
268
363
|
break;
|
|
364
|
+
case "BS_SIGNING_TIME":
|
|
365
|
+
prv[uniqueKey] = (_detail$bsOrder2 = detail["bsOrder"]) === null || _detail$bsOrder2 === void 0 ? void 0 : _detail$bsOrder2.receiptDate;
|
|
366
|
+
break;
|
|
367
|
+
case "BS_SEND_TIME":
|
|
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;
|
|
369
|
+
break;
|
|
370
|
+
case "BS_TRADE_PAYMENT_TIME":
|
|
371
|
+
prv[uniqueKey] = (_detail$bsOrder4 = detail["bsOrder"]) === null || _detail$bsOrder4 === void 0 ? void 0 : _detail$bsOrder4.payDate;
|
|
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;
|
|
376
|
+
case "BS_NET_RECEIPTS":
|
|
377
|
+
prv[uniqueKey] = (_detail$bsOrder6 = detail["bsOrder"]) === null || _detail$bsOrder6 === void 0 ? void 0 : _detail$bsOrder6.merchantRealIncome;
|
|
378
|
+
break;
|
|
379
|
+
case "BS_PACKAGE_WEIGHT":
|
|
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) {
|
|
382
|
+
p += n.orderWeight || 0;
|
|
383
|
+
return p;
|
|
384
|
+
}, 0);
|
|
385
|
+
prv += number || 0;
|
|
386
|
+
return prv;
|
|
387
|
+
}, 0);
|
|
388
|
+
prv[uniqueKey] = weight || null;
|
|
389
|
+
break;
|
|
390
|
+
case "BS_GOODS":
|
|
391
|
+
prv[uniqueKey] = {
|
|
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)
|
|
394
|
+
};
|
|
395
|
+
break;
|
|
396
|
+
case "BS_EXCHANGE_GOODS":
|
|
397
|
+
prv[uniqueKey] = {
|
|
398
|
+
shopCode: (_detail$bsOrder10 = detail["bsOrder"]) === null || _detail$bsOrder10 === void 0 ? void 0 : _detail$bsOrder10.shopCode,
|
|
399
|
+
bsExchangeType: [],
|
|
400
|
+
bsExchangeReturnGoods: [],
|
|
401
|
+
bsExchangeSwapOutGoods: [],
|
|
402
|
+
bsExchangeGiftGoods: []
|
|
403
|
+
};
|
|
404
|
+
break;
|
|
405
|
+
case "BS_REISSUE_GOODS":
|
|
406
|
+
prv[uniqueKey] = {
|
|
407
|
+
shopCode: (_detail$bsOrder11 = detail["bsOrder"]) === null || _detail$bsOrder11 === void 0 ? void 0 : _detail$bsOrder11.shopCode,
|
|
408
|
+
bsReissueType: [],
|
|
409
|
+
bsReissueGoods: []
|
|
410
|
+
};
|
|
411
|
+
break;
|
|
412
|
+
case "BS_LOGISTICS":
|
|
413
|
+
prv[uniqueKey] = updateBsItemListHandle((_detail$bsOrder12 = detail["bsOrder"]) === null || _detail$bsOrder12 === void 0 ? void 0 : _detail$bsOrder12.orders, "logistics", config);
|
|
414
|
+
break;
|
|
415
|
+
case "BS_SEND_GOOD":
|
|
416
|
+
prv[uniqueKey] = updateBsItemListHandle((_detail$bsOrder13 = detail["bsOrder"]) === null || _detail$bsOrder13 === void 0 ? void 0 : _detail$bsOrder13.orders, "send", config);
|
|
417
|
+
break;
|
|
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
|
+
}
|
|
425
|
+
prv[uniqueKey] = {
|
|
426
|
+
postingAddress: bsPostingAddress,
|
|
427
|
+
postingDetail: advItem === null || advItem === void 0 ? void 0 : advItem.address,
|
|
428
|
+
postingReceiverName: advItem === null || advItem === void 0 ? void 0 : advItem.receiver,
|
|
429
|
+
postingReceiverMobile: advItem === null || advItem === void 0 ? void 0 : advItem.receiverTel
|
|
430
|
+
};
|
|
431
|
+
break;
|
|
269
432
|
}
|
|
270
433
|
return prv;
|
|
271
434
|
}, {});
|
package/dist/esm/utils/toTree.js
CHANGED
|
@@ -12,11 +12,11 @@ export default (function () {
|
|
|
12
12
|
var res = [];
|
|
13
13
|
for (var i = 0; i < len; i++) {
|
|
14
14
|
var item = list[i];
|
|
15
|
-
if (item.parentId === Number(parId)) {
|
|
16
|
-
item.children = loop(item.id);
|
|
15
|
+
if (Number(item.parentId) === Number(parId)) {
|
|
16
|
+
item.children = loop(Number(item.id));
|
|
17
17
|
res.push(_objectSpread(_objectSpread({}, item), {}, {
|
|
18
18
|
label: item.name,
|
|
19
|
-
value: item.id
|
|
19
|
+
value: Number(item.id)
|
|
20
20
|
}));
|
|
21
21
|
}
|
|
22
22
|
}
|
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.71",
|
|
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": "ab3d66cffd03fd0bfe02dfc8bf60212faca21fd5"
|
|
46
46
|
}
|