@kmkf-fe-packages/kmkf-utils 2.0.64 → 2.0.66

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/README.md CHANGED
@@ -1 +1 @@
1
- 1123111111
1
+ 11231111111
@@ -11,6 +11,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
11
11
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
12
12
  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); }
13
13
  import uuid from "./getUUid";
14
+ import isNull from "./isNull";
14
15
  export var BS_E3_SYSTEM_ORDER_CONFIG = {
15
16
  key: "bsE3SystemShowOrder",
16
17
  name: "百胜",
@@ -296,12 +297,15 @@ export var bsE3OrderBackFormValues = function bsE3OrderBackFormValues() {
296
297
  // prv[uniqueKey] = detail?.bsExchangeGoods;
297
298
  // break;
298
299
  case "BS_E3_REISSUE_GOODS":
299
- prv[uniqueKey] = {
300
- bsE3SystemOrder: detail === null || detail === void 0 ? void 0 : detail.bsE3SystemOrder,
301
- bsE3SystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.bsE3SystemOrderNo,
302
- bsE3ReissueType: ["1"],
303
- bsE3ReissueGoods: (detail === null || detail === void 0 ? void 0 : detail.bsE3ReissueGoods) || []
304
- };
300
+ {
301
+ var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
302
+ prv[uniqueKey] = {
303
+ bsE3SystemOrder: detail === null || detail === void 0 ? void 0 : detail.bsE3SystemOrder,
304
+ bsE3SystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.bsE3SystemOrderNo,
305
+ bsE3ReissueType: [initReason],
306
+ bsE3ReissueGoods: initReason === "2" ? [] : (detail === null || detail === void 0 ? void 0 : detail.bsE3ReissueGoods) || []
307
+ };
308
+ }
305
309
  break;
306
310
  // case "BS_RETURN_GOODS":
307
311
  // prv[uniqueKey] = detail?.bsReturnGoods;
@@ -398,7 +402,7 @@ export var bsE3OrderTransform = function bsE3OrderTransform(detail, form) {
398
402
  },
399
403
  // TODO: 当只有一条系统单时默认选中该系统单
400
404
  bsE3SystemOrderNo: onlyOneSystemOrder ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.billNo : undefined,
401
- bsE3ReissueGoods: onlyOneSystemOrder ? updateBsE3GoodsHandle([newOrderList[0]], 'sharePrice').filter(function (good) {
405
+ bsE3ReissueGoods: onlyOneSystemOrder ? updateBsE3GoodsHandle([newOrderList[0]], "sharePrice").filter(function (good) {
402
406
  return !isStrict || !orderNo || good.originalDealCode === orderNo;
403
407
  }) : [],
404
408
  bsE3Goods: {
@@ -0,0 +1,285 @@
1
+ "use strict";
2
+
3
+ var __assign = this && this.__assign || function () {
4
+ __assign = Object.assign || function (t) {
5
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
6
+ s = arguments[i];
7
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
8
+ }
9
+ return t;
10
+ };
11
+ return __assign.apply(this, arguments);
12
+ };
13
+ exports.__esModule = true;
14
+ exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
15
+ var getUUid_1 = require("./getUUid");
16
+ var deliveryStateMap = {
17
+ 0: "未发货",
18
+ 2: "全部发货"
19
+ };
20
+ exports.GY_SYSTEM_ORDER_CONFIG = {
21
+ key: "gySystemShowOrder",
22
+ name: "管易",
23
+ selectId: "gySystemSelectIds",
24
+ columns: [{
25
+ dataIndex: "billType",
26
+ title: "订单类型",
27
+ width: 150
28
+ }, {
29
+ dataIndex: "billNo",
30
+ title: "系统订单号",
31
+ width: 160
32
+ }, {
33
+ dataIndex: "tradeTagName",
34
+ title: "订单标记名称",
35
+ width: 150
36
+ }, {
37
+ dataIndex: "billTag",
38
+ title: "订单标签",
39
+ width: 150
40
+ }, {
41
+ dataIndex: "deliveryState",
42
+ title: "发货状态",
43
+ width: 150
44
+ }]
45
+ };
46
+ exports.updateGyGoodsHandle = function (orders) {
47
+ if (orders === void 0) {
48
+ orders = [];
49
+ }
50
+ return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
51
+ if (Array.isArray(cur.details)) {
52
+ acc.push.apply(acc, cur.details.map(function (item) {
53
+ var _a;
54
+ item.goodName = item.itemName;
55
+ item.goodShortName = item.itemSimpleName;
56
+ item.goodNo = item.itemCode;
57
+ item.specNo = item.skuCode;
58
+ item.specName = item.skuName;
59
+ item.canDelete = true;
60
+ item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
61
+ return item;
62
+ }));
63
+ }
64
+ return acc;
65
+ }, []);
66
+ };
67
+ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
68
+ var _a, _b;
69
+ if (type === "logistics") {
70
+ //管易物流信息组件先不做
71
+ // const currentCom = comList?.find?.(
72
+ // (item) => item.workOrderComponentType === "GY_LOGISTICS"
73
+ // );
74
+ // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
75
+ // if (notOrderBack) {
76
+ // let currentValue = form.getFieldValue(currentCom.uniqueKey);
77
+ // currentValue = currentValue?.length
78
+ // ? currentValue
79
+ // : [{ logisticsCode: "", logisticsCompany: "" }];
80
+ // return currentValue;
81
+ // }
82
+ } else if (type === "send") {
83
+ var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
84
+ return item.workOrderComponentType === "GY_SEND_GOOD";
85
+ });
86
+ var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
87
+ if (notOrderBack) {
88
+ var currentValue = form.getFieldValue(currentCom.uniqueKey);
89
+ currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
90
+ sendId: "",
91
+ sendName: ""
92
+ }];
93
+ return currentValue;
94
+ }
95
+ }
96
+ var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
97
+ var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
98
+ return {
99
+ title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
100
+ picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
101
+ platform: "gy",
102
+ skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
103
+ };
104
+ });
105
+ var params = {
106
+ items: items
107
+ };
108
+ if (type === "logistics") {
109
+ // params.logisticsCompany = next?.shippingCode;
110
+ // params.logisticsCode = next?.shippingSn;
111
+ } else if (type === "send") {
112
+ params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
113
+ //下拉框,取id
114
+ params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
115
+ params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
116
+ }
117
+ prv.push(params);
118
+ return prv;
119
+ }, []);
120
+ if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
121
+ switch (type) {
122
+ case "logistics":
123
+ newList = [{
124
+ logisticsCode: ""
125
+ }];
126
+ break;
127
+ case "supply":
128
+ newList = [{
129
+ supplyId: ""
130
+ }];
131
+ break;
132
+ case "send":
133
+ newList = [{
134
+ sendId: "",
135
+ sendName: ""
136
+ }];
137
+ break;
138
+ }
139
+ }
140
+ return newList;
141
+ };
142
+ //管易订单信息转换
143
+ exports.gyOrderTransform = function (detail, form) {
144
+ var _a, _b, _c, _d, _e, _f;
145
+ var orderNo = detail.orderNo,
146
+ _g = detail.trades,
147
+ currentTrades = _g === void 0 ? [] : _g,
148
+ componentList = detail.componentList;
149
+ var gyGoodsCom = (componentList || []).find(function (com) {
150
+ return com.workOrderComponentType === "GY_GOODS";
151
+ });
152
+ var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
153
+ var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
154
+ console.log("触发---getGyOrderList--4");
155
+ return {
156
+ gySystemOrder: {
157
+ orderNo: orderNo,
158
+ isTest: 4,
159
+ orders: currentTrades.map(function (item) {
160
+ return __assign(__assign({}, item), {
161
+ billNo: item.code,
162
+ billType: item.orderTypeName,
163
+ billTag: item.tagName,
164
+ tradeTagName: item.tradeTagName,
165
+ deliveryState: deliveryStateMap[item.deliveryState]
166
+ });
167
+ }),
168
+ selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
169
+ return item.code;
170
+ }) : [],
171
+ showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
172
+ return __assign(__assign({}, item), {
173
+ billNo: item.code,
174
+ billType: item.orderTypeName,
175
+ billTag: item.tagName,
176
+ tradeTagName: item.tradeTagName,
177
+ deliveryState: deliveryStateMap[item.deliveryState]
178
+ });
179
+ })
180
+ },
181
+ gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
182
+ gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
183
+ return !isStrict || !orderNo || good.platformCode === orderNo;
184
+ }) : [],
185
+ gyGoods: {
186
+ // 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
187
+ orders: currentTrades,
188
+ orderNo: orderNo,
189
+ shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
190
+ return item.shopCode;
191
+ })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
192
+ vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
193
+ return item.vipCode;
194
+ })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
195
+ gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
196
+ return !isStrict || !orderNo || good.platformCode === orderNo;
197
+ })
198
+ },
199
+ // gyLogistics: updateGyItemListHandle(
200
+ // currentTrades,
201
+ // "logistics",
202
+ // componentList || [],
203
+ // form
204
+ // ),
205
+ gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
206
+ };
207
+ };
208
+ exports.gyOrderBackFormValues = function (detail, templateDetail) {
209
+ if (detail === void 0) {
210
+ detail = {};
211
+ }
212
+ if (templateDetail === void 0) {
213
+ templateDetail = {};
214
+ }
215
+ return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
216
+ var _a, _b;
217
+ var uniqueKey = next.uniqueKey;
218
+ var config = next.componentConfig;
219
+ switch (next.workOrderComponentType) {
220
+ case "GY_SYSTEM_ORDER":
221
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
222
+ break;
223
+ case "GY_GOODS":
224
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
225
+ break;
226
+ case "GY_REISSUE_GOODS":
227
+ prv[uniqueKey] = {
228
+ gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
229
+ gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
230
+ gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
231
+ gyReissueType: ["1"],
232
+ shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
233
+ vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
234
+ };
235
+ break;
236
+ case "GY_LOGISTICS":
237
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
238
+ break;
239
+ case "GY_SEND_GOOD":
240
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
241
+ }
242
+ return prv;
243
+ }, {});
244
+ };
245
+ var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
246
+ if (config === void 0) {
247
+ config = {};
248
+ }
249
+ var showField = config.showField,
250
+ _a = config.notOrderBack,
251
+ notOrderBack = _a === void 0 ? false : _a;
252
+ if (notOrderBack) {
253
+ return list;
254
+ }
255
+ return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
256
+ if (type === "logistics") {
257
+ if (!["logisticsCompany", ""].includes(showField || "")) {
258
+ next.logisticsCompany = undefined;
259
+ }
260
+ if (!["logisticsCode", ""].includes(showField || "")) {
261
+ next.logisticsCode = undefined;
262
+ }
263
+ } else if (type === "send") {
264
+ if (!["sendId", "all"].includes(showField || "")) {
265
+ next.sendId = undefined;
266
+ }
267
+ if (!["sendName", "all"].includes(showField || "")) {
268
+ next.sendName = undefined;
269
+ next.sendSnapshotName = undefined;
270
+ }
271
+ }
272
+ prv.push(next);
273
+ return prv;
274
+ }, []);
275
+ };
276
+ // 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
277
+ exports.filterGyOrders = function (trades, order_no) {
278
+ var currentTrades = (trades || []).filter(function (item) {
279
+ return (item.platformCode || "").split(",").includes(order_no);
280
+ });
281
+ if (currentTrades.length) {
282
+ return currentTrades;
283
+ }
284
+ return [];
285
+ };
@@ -12,6 +12,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
12
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; }
13
13
  import uuid from "./getUUid";
14
14
  import Monitor from "kmkf-monitor";
15
+ import isNull from "./isNull";
15
16
  export var GY_DELIVERY_STATE_MAPPING = {
16
17
  0: "未发货",
17
18
  2: "全部发货"
@@ -250,7 +251,6 @@ export var gyOrderBackFormValues = function gyOrderBackFormValues() {
250
251
  var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
251
252
  var testIndex = arguments.length > 2 ? arguments[2] : undefined;
252
253
  return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
253
- var _detail$gyGoods, _detail$gySystemOrder, _detail$gySystemOrder2, _detail$gySystemOrder3, _detail$gySystemOrder4, _detail$gySystemOrder5, _detail$gySystemOrder6, _detail$gyGoods2, _detail$gySystemOrder7, _detail$gySystemOrder8, _detail$gySystemOrder9, _detail$gySystemOrder10, _detail$gySystemOrder11, _detail$gySystemOrder12, _detail$gyGoods3, _detail$gySystemOrder13, _detail$gySystemOrder14, _detail$gySystemOrder15, _detail$gySystemOrder16, _detail$gySystemOrder17, _detail$gySystemOrder18;
254
254
  var uniqueKey = next.uniqueKey;
255
255
  var config = next.componentConfig;
256
256
  switch (next.workOrderComponentType) {
@@ -261,22 +261,26 @@ export var gyOrderBackFormValues = function gyOrderBackFormValues() {
261
261
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
262
262
  break;
263
263
  case "GY_REISSUE_GOODS":
264
- prv[uniqueKey] = {
265
- gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
266
- gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
267
- gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
268
- gyReissueType: ["1"],
269
- shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods = detail.gyGoods) === null || _detail$gyGoods === void 0 ? void 0 : _detail$gyGoods.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder = detail.gySystemOrder) === null || _detail$gySystemOrder === void 0 ? void 0 : (_detail$gySystemOrder2 = _detail$gySystemOrder.orders) === null || _detail$gySystemOrder2 === void 0 ? void 0 : (_detail$gySystemOrder3 = _detail$gySystemOrder2[0]) === null || _detail$gySystemOrder3 === void 0 ? void 0 : _detail$gySystemOrder3.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder4 = detail.gySystemOrder) === null || _detail$gySystemOrder4 === void 0 ? void 0 : (_detail$gySystemOrder5 = _detail$gySystemOrder4.showOrderInfo) === null || _detail$gySystemOrder5 === void 0 ? void 0 : (_detail$gySystemOrder6 = _detail$gySystemOrder5[0]) === null || _detail$gySystemOrder6 === void 0 ? void 0 : _detail$gySystemOrder6.shopCode),
270
- vipCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods2 = detail.gyGoods) === null || _detail$gyGoods2 === void 0 ? void 0 : _detail$gyGoods2.vipCode) || (detail === null || detail === void 0 ? void 0 : detail.vipCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder7 = detail.gySystemOrder) === null || _detail$gySystemOrder7 === void 0 ? void 0 : (_detail$gySystemOrder8 = _detail$gySystemOrder7.orders) === null || _detail$gySystemOrder8 === void 0 ? void 0 : (_detail$gySystemOrder9 = _detail$gySystemOrder8[0]) === null || _detail$gySystemOrder9 === void 0 ? void 0 : _detail$gySystemOrder9.vipCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder10 = detail.gySystemOrder) === null || _detail$gySystemOrder10 === void 0 ? void 0 : (_detail$gySystemOrder11 = _detail$gySystemOrder10.showOrderInfo) === null || _detail$gySystemOrder11 === void 0 ? void 0 : (_detail$gySystemOrder12 = _detail$gySystemOrder11[0]) === null || _detail$gySystemOrder12 === void 0 ? void 0 : _detail$gySystemOrder12.vipCode)
271
- };
272
- //无vipCode上报日志
273
- if (!prv[uniqueKey].vipCode) {
274
- Monitor.sendClick({
275
- spmClick: "notVipCode",
276
- spmParam: JSON.stringify(Object.prototype.toString.call(detail) === "[object Object]" ? _objectSpread(_objectSpread({}, detail), {}, {
277
- testIndex: testIndex
278
- }) : {})
279
- });
264
+ {
265
+ var _detail$gyGoods, _detail$gySystemOrder, _detail$gySystemOrder2, _detail$gySystemOrder3, _detail$gySystemOrder4, _detail$gySystemOrder5, _detail$gySystemOrder6, _detail$gyGoods2, _detail$gySystemOrder7, _detail$gySystemOrder8, _detail$gySystemOrder9, _detail$gySystemOrder10, _detail$gySystemOrder11, _detail$gySystemOrder12;
266
+ var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
267
+ prv[uniqueKey] = {
268
+ gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
269
+ gyReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
270
+ gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
271
+ gyReissueType: [initReason],
272
+ shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods = detail.gyGoods) === null || _detail$gyGoods === void 0 ? void 0 : _detail$gyGoods.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder = detail.gySystemOrder) === null || _detail$gySystemOrder === void 0 ? void 0 : (_detail$gySystemOrder2 = _detail$gySystemOrder.orders) === null || _detail$gySystemOrder2 === void 0 ? void 0 : (_detail$gySystemOrder3 = _detail$gySystemOrder2[0]) === null || _detail$gySystemOrder3 === void 0 ? void 0 : _detail$gySystemOrder3.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder4 = detail.gySystemOrder) === null || _detail$gySystemOrder4 === void 0 ? void 0 : (_detail$gySystemOrder5 = _detail$gySystemOrder4.showOrderInfo) === null || _detail$gySystemOrder5 === void 0 ? void 0 : (_detail$gySystemOrder6 = _detail$gySystemOrder5[0]) === null || _detail$gySystemOrder6 === void 0 ? void 0 : _detail$gySystemOrder6.shopCode),
273
+ vipCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods2 = detail.gyGoods) === null || _detail$gyGoods2 === void 0 ? void 0 : _detail$gyGoods2.vipCode) || (detail === null || detail === void 0 ? void 0 : detail.vipCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder7 = detail.gySystemOrder) === null || _detail$gySystemOrder7 === void 0 ? void 0 : (_detail$gySystemOrder8 = _detail$gySystemOrder7.orders) === null || _detail$gySystemOrder8 === void 0 ? void 0 : (_detail$gySystemOrder9 = _detail$gySystemOrder8[0]) === null || _detail$gySystemOrder9 === void 0 ? void 0 : _detail$gySystemOrder9.vipCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder10 = detail.gySystemOrder) === null || _detail$gySystemOrder10 === void 0 ? void 0 : (_detail$gySystemOrder11 = _detail$gySystemOrder10.showOrderInfo) === null || _detail$gySystemOrder11 === void 0 ? void 0 : (_detail$gySystemOrder12 = _detail$gySystemOrder11[0]) === null || _detail$gySystemOrder12 === void 0 ? void 0 : _detail$gySystemOrder12.vipCode)
274
+ };
275
+ //无vipCode上报日志
276
+ if (!prv[uniqueKey].vipCode) {
277
+ Monitor.sendClick({
278
+ spmClick: "notVipCode",
279
+ spmParam: JSON.stringify(Object.prototype.toString.call(detail) === "[object Object]" ? _objectSpread(_objectSpread({}, detail), {}, {
280
+ testIndex: testIndex
281
+ }) : {})
282
+ });
283
+ }
280
284
  }
281
285
  break;
282
286
  case "GY_LOGISTICS":
@@ -286,14 +290,17 @@ export var gyOrderBackFormValues = function gyOrderBackFormValues() {
286
290
  prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
287
291
  break;
288
292
  case "GY_RETURN_GOODS":
289
- // prv[uniqueKey] = detail?.gyReturnGoods;
290
- prv[uniqueKey] = {
291
- gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
292
- gyReturnGoods: detail === null || detail === void 0 ? void 0 : detail.gyReturnGoods,
293
- gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
294
- shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods3 = detail.gyGoods) === null || _detail$gyGoods3 === void 0 ? void 0 : _detail$gyGoods3.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder13 = detail.gySystemOrder) === null || _detail$gySystemOrder13 === void 0 ? void 0 : (_detail$gySystemOrder14 = _detail$gySystemOrder13.orders) === null || _detail$gySystemOrder14 === void 0 ? void 0 : (_detail$gySystemOrder15 = _detail$gySystemOrder14[0]) === null || _detail$gySystemOrder15 === void 0 ? void 0 : _detail$gySystemOrder15.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder16 = detail.gySystemOrder) === null || _detail$gySystemOrder16 === void 0 ? void 0 : (_detail$gySystemOrder17 = _detail$gySystemOrder16.showOrderInfo) === null || _detail$gySystemOrder17 === void 0 ? void 0 : (_detail$gySystemOrder18 = _detail$gySystemOrder17[0]) === null || _detail$gySystemOrder18 === void 0 ? void 0 : _detail$gySystemOrder18.shopCode),
295
- gyReturnType: ["1"]
296
- };
293
+ {
294
+ var _detail$gyGoods3, _detail$gySystemOrder13, _detail$gySystemOrder14, _detail$gySystemOrder15, _detail$gySystemOrder16, _detail$gySystemOrder17, _detail$gySystemOrder18;
295
+ var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
296
+ prv[uniqueKey] = {
297
+ gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
298
+ gyReturnGoods: _initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.gyReturnGoods,
299
+ gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
300
+ shopCode: (detail === null || detail === void 0 ? void 0 : (_detail$gyGoods3 = detail.gyGoods) === null || _detail$gyGoods3 === void 0 ? void 0 : _detail$gyGoods3.shopCode) || (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder13 = detail.gySystemOrder) === null || _detail$gySystemOrder13 === void 0 ? void 0 : (_detail$gySystemOrder14 = _detail$gySystemOrder13.orders) === null || _detail$gySystemOrder14 === void 0 ? void 0 : (_detail$gySystemOrder15 = _detail$gySystemOrder14[0]) === null || _detail$gySystemOrder15 === void 0 ? void 0 : _detail$gySystemOrder15.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$gySystemOrder16 = detail.gySystemOrder) === null || _detail$gySystemOrder16 === void 0 ? void 0 : (_detail$gySystemOrder17 = _detail$gySystemOrder16.showOrderInfo) === null || _detail$gySystemOrder17 === void 0 ? void 0 : (_detail$gySystemOrder18 = _detail$gySystemOrder17[0]) === null || _detail$gySystemOrder18 === void 0 ? void 0 : _detail$gySystemOrder18.shopCode),
301
+ gyReturnType: [_initReason]
302
+ };
303
+ }
297
304
  break;
298
305
  }
299
306
  return prv;
@@ -12,6 +12,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
12
12
  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); }
13
13
  import uuid from "./getUUid";
14
14
  import { SendDataCenter } from "./SendData";
15
+ import isNull from "./isNull";
15
16
  export var JST_SYSTEM_ORDER_CONFIG = {
16
17
  key: "jstSystemShowOrder",
17
18
  name: "聚水潭",
@@ -220,22 +221,28 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
220
221
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.jstGoods;
221
222
  break;
222
223
  case "JST_REISSUE_GOODS":
223
- prv[uniqueKey] = {
224
- jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
225
- jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderNo,
226
- jstReissueType: ["1"],
227
- jstReissueGoods: jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReissueGoods) || []),
228
- jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderBillType) || ""
229
- };
224
+ {
225
+ var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
226
+ prv[uniqueKey] = {
227
+ jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
228
+ jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderNo,
229
+ jstReissueType: [initReason],
230
+ jstReissueGoods: initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReissueGoods) || []),
231
+ jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderBillType) || ""
232
+ };
233
+ }
230
234
  break;
231
235
  case "JST_RETURN_GOODS":
232
- prv[uniqueKey] = {
233
- jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
234
- jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderNo,
235
- jstReturnType: ["1"],
236
- jstReturnGoods: jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || []),
237
- jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderBillType) || ""
238
- };
236
+ {
237
+ var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
238
+ prv[uniqueKey] = {
239
+ jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
240
+ jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderNo,
241
+ jstReturnType: [_initReason],
242
+ jstReturnGoods: _initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || []),
243
+ jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderBillType) || ""
244
+ };
245
+ }
239
246
  break;
240
247
  case "JST_ITEM_SELECT_THIRD":
241
248
  prv[uniqueKey] = updateJstItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jstItemSelectThird, "itemList", config);
@@ -11,6 +11,7 @@ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symb
11
11
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
12
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; }
13
13
  import uuid from "./getUUid";
14
+ import isNull from "./isNull";
14
15
  export var tradeStatusMap = {
15
16
  flagship: {
16
17
  4: "线下退款",
@@ -260,12 +261,15 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
260
261
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wdtGoods;
261
262
  break;
262
263
  case "WDT_REISSUE_GOODS":
263
- prv[uniqueKey] = {
264
- wdtSystemOrder: detail === null || detail === void 0 ? void 0 : detail.wdtSystemOrder,
265
- wdtReissueGoods: detail === null || detail === void 0 ? void 0 : detail.wdtReissueGoods,
266
- wdtSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.wdtSystemOrderNo,
267
- wdtReissueType: ["1"]
268
- };
264
+ {
265
+ var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
266
+ prv[uniqueKey] = {
267
+ wdtSystemOrder: detail === null || detail === void 0 ? void 0 : detail.wdtSystemOrder,
268
+ wdtReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.wdtReissueGoods,
269
+ wdtSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.wdtSystemOrderNo,
270
+ wdtReissueType: [initReason]
271
+ };
272
+ }
269
273
  break;
270
274
  case "WDT_LOGISTICS":
271
275
  prv[uniqueKey] = updateWdtItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.wdtLogistics, "logistics", config);
@@ -275,6 +279,18 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
275
279
  break;
276
280
  case "WDT_SHOP":
277
281
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.shopCode;
282
+ break;
283
+ case "WDT_RETURN_GOODS":
284
+ {
285
+ var _detail$wdtGoods;
286
+ var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
287
+ prv[uniqueKey] = {
288
+ wdtReturnGoods: _initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : (_detail$wdtGoods = detail.wdtGoods) === null || _detail$wdtGoods === void 0 ? void 0 : _detail$wdtGoods.wdtGoods,
289
+ wdtReturnType: [_initReason],
290
+ shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode
291
+ };
292
+ }
293
+ break;
278
294
  // case "WDT_SIGNING_TIME":
279
295
  // prv[uniqueKey] = detail?.wdtSingingTime;
280
296
  // break;
@@ -296,9 +312,6 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
296
312
  // case "WDT_EXCHANGE_GOODS":
297
313
  // prv[uniqueKey] = detail?.wdtExchangeGoods;
298
314
  // break;
299
- // case "WDT_RETURN_GOODS":
300
- // prv[uniqueKey] = detail?.wdtReturnGoods;
301
- // break;
302
315
  // break;
303
316
  // case "WDT_DELIVERY_NO":
304
317
  // prv[uniqueKey] = detail?.wdtDeliveryNo;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.0.64",
3
+ "version": "2.0.66",
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": "d2af71326cde542670f96569bb6c028ac7c57bf7",
44
+ "gitHead": "54eab9e0ac1df90812f4e6cd03fa4673711bda1e",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }