@kmkf-fe-packages/kmkf-utils 2.0.12-beta.2 → 2.0.12-beta.3
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.
|
@@ -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
|
+
};
|
|
@@ -29,7 +29,9 @@ export declare const gyOrderTransform: (detail: any, form: any) => {
|
|
|
29
29
|
vipCode: any;
|
|
30
30
|
gyGoods: any;
|
|
31
31
|
};
|
|
32
|
+
shopCode: any;
|
|
33
|
+
vipCode: any;
|
|
32
34
|
gySendGood: any;
|
|
33
35
|
};
|
|
34
|
-
export declare const gyOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
36
|
+
export declare const gyOrderBackFormValues: (detail?: any, templateDetail?: any, testIndex?: number) => any;
|
|
35
37
|
export declare const filterGyOrders: (trades: any, order_no: string) => any;
|
|
@@ -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 Monitor from "kmkf-monitor";
|
|
14
15
|
export var GY_DELIVERY_STATE_MAPPING = {
|
|
15
16
|
0: "未发货",
|
|
16
17
|
2: "全部发货"
|
|
@@ -159,7 +160,7 @@ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList
|
|
|
159
160
|
|
|
160
161
|
//管易订单信息转换
|
|
161
162
|
export var gyOrderTransform = function gyOrderTransform(detail, form) {
|
|
162
|
-
var _form$getFieldValue, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$;
|
|
163
|
+
var _form$getFieldValue, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _currentTrades$find2, _currentTrades$find2$, _currentTrades$find3, _currentTrades$find3$, _currentTrades$find4, _currentTrades$find4$;
|
|
163
164
|
var orderNo = detail.orderNo,
|
|
164
165
|
_detail$trades = detail.trades,
|
|
165
166
|
currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
|
|
@@ -174,6 +175,8 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
|
|
|
174
175
|
orderNo: orderNo,
|
|
175
176
|
orders: currentTrades.map(function (item) {
|
|
176
177
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
178
|
+
vipCode: item.vipCode,
|
|
179
|
+
shopCode: item.shopCode,
|
|
177
180
|
billNo: item.code,
|
|
178
181
|
billType: item.orderTypeName,
|
|
179
182
|
billTag: item.tagName,
|
|
@@ -187,6 +190,8 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
|
|
|
187
190
|
}) : [],
|
|
188
191
|
showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
|
|
189
192
|
return _objectSpread(_objectSpread({}, item), {}, {
|
|
193
|
+
vipCode: item.vipCode,
|
|
194
|
+
shopCode: item.shopCode,
|
|
190
195
|
billNo: item.code,
|
|
191
196
|
billType: item.orderTypeName,
|
|
192
197
|
billTag: item.tagName,
|
|
@@ -214,6 +219,12 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
|
|
|
214
219
|
return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
|
|
215
220
|
})
|
|
216
221
|
},
|
|
222
|
+
shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find3 = currentTrades.find) === null || _currentTrades$find3 === void 0 ? void 0 : (_currentTrades$find3$ = _currentTrades$find3.call(currentTrades, function (item) {
|
|
223
|
+
return item.shopCode;
|
|
224
|
+
})) === null || _currentTrades$find3$ === void 0 ? void 0 : _currentTrades$find3$.shopCode) || null,
|
|
225
|
+
vipCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find4 = currentTrades.find) === null || _currentTrades$find4 === void 0 ? void 0 : (_currentTrades$find4$ = _currentTrades$find4.call(currentTrades, function (item) {
|
|
226
|
+
return item.vipCode;
|
|
227
|
+
})) === null || _currentTrades$find4$ === void 0 ? void 0 : _currentTrades$find4$.vipCode) || null,
|
|
217
228
|
// gyLogistics: updateGyItemListHandle(
|
|
218
229
|
// currentTrades,
|
|
219
230
|
// "logistics",
|
|
@@ -226,8 +237,9 @@ export var gyOrderTransform = function gyOrderTransform(detail, form) {
|
|
|
226
237
|
export var gyOrderBackFormValues = function gyOrderBackFormValues() {
|
|
227
238
|
var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
228
239
|
var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
240
|
+
var testIndex = arguments.length > 2 ? arguments[2] : undefined;
|
|
229
241
|
return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
230
|
-
var _detail$gyGoods, _detail$gyGoods2;
|
|
242
|
+
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;
|
|
231
243
|
var uniqueKey = next.uniqueKey;
|
|
232
244
|
var config = next.componentConfig;
|
|
233
245
|
switch (next.workOrderComponentType) {
|
|
@@ -243,9 +255,18 @@ export var gyOrderBackFormValues = function gyOrderBackFormValues() {
|
|
|
243
255
|
gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
|
|
244
256
|
gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
|
|
245
257
|
gyReissueType: ["1"],
|
|
246
|
-
shopCode: detail === null || detail === void 0 ? void 0 : (_detail$gyGoods = detail.gyGoods) === null || _detail$gyGoods === void 0 ? void 0 : _detail$gyGoods.shopCode,
|
|
247
|
-
vipCode: detail === null || detail === void 0 ? void 0 : (_detail$gyGoods2 = detail.gyGoods) === null || _detail$gyGoods2 === void 0 ? void 0 : _detail$gyGoods2.vipCode
|
|
258
|
+
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),
|
|
259
|
+
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)
|
|
248
260
|
};
|
|
261
|
+
//无vipCode上报日志
|
|
262
|
+
if (!prv[uniqueKey].vipCode) {
|
|
263
|
+
Monitor.sendClick({
|
|
264
|
+
spmClick: "notVipCode",
|
|
265
|
+
spmParam: JSON.stringify(Object.prototype.toString.call(detail) === "[object Object]" ? _objectSpread(_objectSpread({}, detail), {}, {
|
|
266
|
+
testIndex: testIndex
|
|
267
|
+
}) : {})
|
|
268
|
+
});
|
|
269
|
+
}
|
|
249
270
|
break;
|
|
250
271
|
case "GY_LOGISTICS":
|
|
251
272
|
prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
|
|
@@ -233,7 +233,7 @@ export default (function (_ref) {
|
|
|
233
233
|
var wdtValues = wdtOrderBackFormValues(detail["wdtOrder"], templateDetail);
|
|
234
234
|
var bsE3Values = bsE3OrderBackFormValues(detail["bsE3Order"], templateDetail);
|
|
235
235
|
var kmValues = kmOrderBackFormValues(detail["kmOrder"], templateDetail);
|
|
236
|
-
var gyValues = gyOrderBackFormValues(detail["gyOrder"], templateDetail);
|
|
236
|
+
var gyValues = gyOrderBackFormValues(detail["gyOrder"], templateDetail, 1);
|
|
237
237
|
console.log("bsE3Values", bsE3Values);
|
|
238
238
|
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues);
|
|
239
239
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-utils",
|
|
3
|
-
"version": "2.0.12-beta.
|
|
3
|
+
"version": "2.0.12-beta.3",
|
|
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": "de663a2d4df54a85b0bcfd2f1fe066781583c5e7",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|