@kmkf-fe-packages/kmkf-utils 2.10.9-beta.15 → 2.10.9-beta.16
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.
|
@@ -221,17 +221,12 @@ export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
|
|
|
221
221
|
if (matchedSystemOrders.length > 0) {
|
|
222
222
|
// 场景1:根据物流单号匹配到订单
|
|
223
223
|
selectedRows = matchedSystemOrders.map(function (order) {
|
|
224
|
-
return {
|
|
225
|
-
orderNo: order.orderNo,
|
|
226
|
-
warehouseCode: order.warehouseCode,
|
|
227
|
-
warehouseName: order.warehouseName,
|
|
228
|
-
logisticsCode: order.logisticsCode,
|
|
229
|
-
logisticsName: order.logisticsName,
|
|
224
|
+
return _objectSpread(_objectSpread({}, order), {}, {
|
|
230
225
|
coldChain: order.coldChain,
|
|
231
226
|
skus: order.skus || [],
|
|
232
227
|
billNo: order.orderNo,
|
|
233
228
|
billType: data !== null && data !== void 0 && data.split ? "拆分订单" : "普通订单"
|
|
234
|
-
};
|
|
229
|
+
});
|
|
235
230
|
});
|
|
236
231
|
} else if (inputSelectedRows) {
|
|
237
232
|
// 场景2:用户手动勾选
|
|
@@ -292,10 +287,10 @@ export var dxdOrderTransform = function dxdOrderTransform(detail, form) {
|
|
|
292
287
|
};
|
|
293
288
|
|
|
294
289
|
// 转换物流信息(检查 notOrderBack;用通用字段名 logisticsCompany/logisticsCode,与 KM/showField 一致)
|
|
295
|
-
var dxdLogistics = updateDxdItemListHandle(doOrders, "logistics", componentList, form);
|
|
290
|
+
var dxdLogistics = updateDxdItemListHandle(matchedSystemOrders.length > 0 ? matchedSystemOrders : doOrders, "logistics", componentList, form);
|
|
296
291
|
|
|
297
292
|
// 转换发货信息(sendName 存编码,sendSnapshotName 存名称快照;检查 notOrderBack)
|
|
298
|
-
var dxdSendGood = updateDxdItemListHandle(doOrders, "send", componentList, form);
|
|
293
|
+
var dxdSendGood = updateDxdItemListHandle(matchedSystemOrders.length > 0 ? matchedSystemOrders : doOrders, "send", componentList, form);
|
|
299
294
|
return {
|
|
300
295
|
dxdSystemOrderNo: doOrders.length > 0 ? (_doOrders$6 = doOrders[0]) === null || _doOrders$6 === void 0 ? void 0 : _doOrders$6.orderNo : null,
|
|
301
296
|
dxdSystemOrder: dxdSystemOrder,
|
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.16",
|
|
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": "ebfcca5054fb50a780b0237155b53f31423cb10b",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|