@kmkf-fe-packages/kmkf-utils 2.7.2-rc.0 → 2.7.3-beta.0
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 +1 -1
- package/dist/esm/constants/constant.d.ts +1 -0
- package/dist/esm/constants/constant.js +2 -1
- package/dist/esm/constants/msgTypeMapping.js +2 -1
- package/dist/esm/servers/WLN/index.d.ts +1 -0
- package/dist/esm/servers/WLN/index.js +2 -1
- package/dist/esm/servers/WLN/warehouseData.d.ts +7 -0
- package/dist/esm/servers/WLN/warehouseData.js +32 -0
- package/dist/esm/utils/SendData.js +4 -4
- package/dist/esm/utils/afterSalesOrder.d.ts +50 -0
- package/dist/esm/utils/afterSalesOrder.js +380 -0
- package/dist/esm/utils/index.d.ts +1 -0
- package/dist/esm/utils/index.js +1 -0
- package/dist/esm/utils/orderBackFormValues.d.ts +4 -2
- package/dist/esm/utils/orderBackFormValues.js +9 -4
- package/dist/esm/utils/platformAfterSalesOrderBackFormValues.d.ts +19 -0
- package/dist/esm/utils/platformAfterSalesOrderBackFormValues.js +153 -0
- package/dist/esm/utils/transformList.js +1 -1
- package/dist/esm/utils/unTransField.js +1 -1
- package/dist/esm/utils/wdtOrderBackFormValues.js +8 -2
- package/dist/esm/utils/wlnOrderBackFormValues.d.ts +1 -1
- package/dist/esm/utils/wlnOrderBackFormValues.js +112 -5
- package/package.json +2 -2
package/README.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
1123111123
|
|
@@ -72,6 +72,7 @@ export declare const DATA_SPLIT_COMPONENT_FIELDS_MAP: {
|
|
|
72
72
|
BS_RETURN_GOODS: string[];
|
|
73
73
|
BS_SYSTEM_ORDER: string[];
|
|
74
74
|
KM_SYSTEM_ORDER: string[];
|
|
75
|
+
PLATFORM_AFTER_SALES_ORDER: string[];
|
|
75
76
|
BS_E3_SYSTEM_ORDER: string[];
|
|
76
77
|
WLN_SYSTEM_ORDER: string[];
|
|
77
78
|
WLN_GOODS: string[];
|
|
@@ -124,7 +124,7 @@ export var SYMBOL = {
|
|
|
124
124
|
BETWEEN: "between",
|
|
125
125
|
EQ: "eq"
|
|
126
126
|
};
|
|
127
|
-
export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
|
|
127
|
+
export var hasAddNullComponent = ["RADIO", "SELECT", "CHECKBOX", "BASIC_MULT_SELECT", "FLOW_TAG", "WAREHOUSING_STATUS", "BS_E3_WAREHOUSING_STATUS", "ADJUST_WORK_ORDER_STATUS", "ERP_REMARK", "REISSUE_STATUS", "INVOICE_STATUS", "INVOICING_STATUS", "MSG_STATUS", "AGREE_REFUND_STATUS", "REPAIR_ORDER_STATUS", "ERP_AFTER_SALE_STATUS", "ERP_AFTER_SALES_ORDER_REVIEW_STATUS", "REJECT_REFUND_STATUS", "LOGISTICS_INTERCEPTION", "AGREE_RETURN_GOODS_STATUS", "REJECT_RETURN_GOODS_STATUS", "RETURN_EXCHANGE_GOODS_REVIEW_STATUS", "GY_PAYMENT_METHOD"];
|
|
128
128
|
export var SelectInputComponent = ["INPUT", "TEXTAREA", "SHOP_NAME_INPUT", "BUYER_NICK_INPUT", "RECEIVER_NAME_INPUT", "REMARK_INPUT", "RETURN_GOODS_STATUS", "EXCHANGE_STATUS", "BS_LOGISTICS", "WLN_LOGISTICS", "WDT_LOGISTICS", "KM_LOGISTICS", "GY_LOGISTICS", "JST_LOGISTICS", "AFTER_SALES_ORDER_ID"];
|
|
129
129
|
|
|
130
130
|
// 表单默认值
|
|
@@ -145,6 +145,7 @@ export var DATA_SPLIT_COMPONENT_FIELDS_MAP = {
|
|
|
145
145
|
BS_RETURN_GOODS: ["bsReturnGoods"],
|
|
146
146
|
BS_SYSTEM_ORDER: ["bsSystemShowOrder"],
|
|
147
147
|
KM_SYSTEM_ORDER: ["kmSystemShowOrder"],
|
|
148
|
+
PLATFORM_AFTER_SALES_ORDER: ["platformAfaterSalesShowOrder"],
|
|
148
149
|
BS_E3_SYSTEM_ORDER: ["bsE3SystemShowOrder"],
|
|
149
150
|
WLN_SYSTEM_ORDER: ["wlnSystemShowOrder"],
|
|
150
151
|
WLN_GOODS: ["wlnGoods"],
|
|
@@ -1 +1,2 @@
|
|
|
1
|
-
export * from "./logisticsData";
|
|
1
|
+
export * from "./logisticsData";
|
|
2
|
+
export * from "./warehouseData";
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import { fetchAll } from "../../utils";
|
|
2
|
+
import request from "../../request";
|
|
3
|
+
var queryWarehouseList = function queryWarehouseList(_ref) {
|
|
4
|
+
var pageNo = _ref.pageNo,
|
|
5
|
+
pageSize = _ref.pageSize;
|
|
6
|
+
return request({
|
|
7
|
+
url: "/qy/gdfw/wln/erp/warehouse/list",
|
|
8
|
+
method: "post",
|
|
9
|
+
data: {
|
|
10
|
+
pageNo: pageNo,
|
|
11
|
+
pageSize: pageSize
|
|
12
|
+
}
|
|
13
|
+
});
|
|
14
|
+
};
|
|
15
|
+
export var getWarehouseDataAsync = function getWarehouseDataAsync() {
|
|
16
|
+
return fetchAll("WLN_WAREHOUSE_DATA", queryWarehouseList, function (data) {
|
|
17
|
+
var list = [];
|
|
18
|
+
var warehouses = data || [];
|
|
19
|
+
warehouses.map(function (_ref2) {
|
|
20
|
+
var storageCode = _ref2.storageCode,
|
|
21
|
+
storageName = _ref2.storageName,
|
|
22
|
+
status = _ref2.status;
|
|
23
|
+
list.push({
|
|
24
|
+
label: storageName,
|
|
25
|
+
value: storageCode,
|
|
26
|
+
disabled: [0, 2].includes(status)
|
|
27
|
+
});
|
|
28
|
+
});
|
|
29
|
+
return list;
|
|
30
|
+
});
|
|
31
|
+
};
|
|
32
|
+
export default getWarehouseDataAsync;
|
|
@@ -8,7 +8,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
|
|
|
8
8
|
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
9
9
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
10
10
|
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); }
|
|
11
|
-
import { BSE3, WDT, KM, GY, JST, JY, JKY } from "../servers/index";
|
|
11
|
+
import { BSE3, WDT, KM, GY, JST, JY, JKY, WLN } from "../servers/index";
|
|
12
12
|
var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
|
|
13
13
|
var _this = this;
|
|
14
14
|
_classCallCheck(this, SendData);
|
|
@@ -22,8 +22,7 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
|
|
|
22
22
|
case 0:
|
|
23
23
|
_context.next = 2;
|
|
24
24
|
return (_this$service = _this.service) === null || _this$service === void 0 ? void 0 : _this$service.getWarehouseDataAsync().then(function (list) {
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
console.log("发货仓数据---", _this.platform, list);
|
|
27
26
|
_this.sendData = list;
|
|
28
27
|
});
|
|
29
28
|
case 2:
|
|
@@ -72,7 +71,8 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
|
|
|
72
71
|
gy: GY,
|
|
73
72
|
jst: JST,
|
|
74
73
|
jy: JY,
|
|
75
|
-
jky: JKY
|
|
74
|
+
jky: JKY,
|
|
75
|
+
wln: WLN
|
|
76
76
|
}[this.platform];
|
|
77
77
|
});
|
|
78
78
|
export var SendDataCenter = /*#__PURE__*/function () {
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
export declare const JST_SYSTEM_ORDER_CONFIG: {
|
|
2
|
+
key: string;
|
|
3
|
+
name: string;
|
|
4
|
+
selectId: string;
|
|
5
|
+
orderNo: string;
|
|
6
|
+
columns: {
|
|
7
|
+
dataIndex: string;
|
|
8
|
+
title: string;
|
|
9
|
+
width: number;
|
|
10
|
+
}[];
|
|
11
|
+
};
|
|
12
|
+
export declare const JST_ORDER_STATUS_MAP: Record<number, string>;
|
|
13
|
+
export declare const updateJstGoodsHandle: (orders?: any[], options?: {
|
|
14
|
+
canEdit?: boolean;
|
|
15
|
+
orderBackGoodsLevel?: string;
|
|
16
|
+
}) => any;
|
|
17
|
+
export declare const jstMergeIdenticalGoods: <T extends {
|
|
18
|
+
skuId: string;
|
|
19
|
+
qty: number;
|
|
20
|
+
systemOrderNo: string;
|
|
21
|
+
}>(goodDetails?: T[]) => T[];
|
|
22
|
+
export declare const jstOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
23
|
+
export declare const jstOrderTransform: (detail: any, form: any) => {
|
|
24
|
+
jstSystemOrder: {
|
|
25
|
+
isRequest: boolean;
|
|
26
|
+
orderNo: any;
|
|
27
|
+
orders: any;
|
|
28
|
+
selectIds: any;
|
|
29
|
+
showOrderInfo: any;
|
|
30
|
+
};
|
|
31
|
+
jstReturnSystemOrderNo: any;
|
|
32
|
+
jstSystemOrderNo: any;
|
|
33
|
+
jstReissueGoods: any;
|
|
34
|
+
jstReturnGoods: any;
|
|
35
|
+
jstSystemOrderBillType: any;
|
|
36
|
+
jstReturnSystemOrderBillType: any;
|
|
37
|
+
jstGoods: {
|
|
38
|
+
isRequest: boolean;
|
|
39
|
+
allOrders: any;
|
|
40
|
+
orders: any;
|
|
41
|
+
orderNo: any;
|
|
42
|
+
shopCode: any;
|
|
43
|
+
jstGoods: any;
|
|
44
|
+
};
|
|
45
|
+
jstLogistics: any;
|
|
46
|
+
jstSendGood: any;
|
|
47
|
+
jstSupply: any;
|
|
48
|
+
jstItemSelectThird: any;
|
|
49
|
+
};
|
|
50
|
+
export declare const filterJstOrders: (detail: any, order_no: string) => any;
|
|
@@ -0,0 +1,380 @@
|
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
3
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
5
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
6
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
7
|
+
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; }
|
|
8
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
9
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
10
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
11
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
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
|
+
import uuid from "./getUUid";
|
|
14
|
+
import { SendDataCenter } from "./SendData";
|
|
15
|
+
import isNull from "./isNull";
|
|
16
|
+
export var JST_SYSTEM_ORDER_CONFIG = {
|
|
17
|
+
key: "jstSystemShowOrder",
|
|
18
|
+
name: "聚水潭",
|
|
19
|
+
selectId: "jstSystemSelectIds",
|
|
20
|
+
orderNo: "jstSystemOrderNo",
|
|
21
|
+
columns: [{
|
|
22
|
+
dataIndex: "orderType",
|
|
23
|
+
title: "订单类型",
|
|
24
|
+
width: 150
|
|
25
|
+
}, {
|
|
26
|
+
dataIndex: "oId",
|
|
27
|
+
title: "系统订单号",
|
|
28
|
+
width: 160
|
|
29
|
+
}, {
|
|
30
|
+
dataIndex: "labels",
|
|
31
|
+
title: "订单标签",
|
|
32
|
+
width: 150
|
|
33
|
+
}, {
|
|
34
|
+
dataIndex: "mergeSoId",
|
|
35
|
+
title: "合并订单号",
|
|
36
|
+
width: 160
|
|
37
|
+
}]
|
|
38
|
+
};
|
|
39
|
+
export var JST_ORDER_STATUS_MAP = {
|
|
40
|
+
0: "未确认",
|
|
41
|
+
1: "已确认",
|
|
42
|
+
3: "已作废",
|
|
43
|
+
5: "已完成"
|
|
44
|
+
};
|
|
45
|
+
export var updateJstGoodsHandle = function updateJstGoodsHandle() {
|
|
46
|
+
var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
47
|
+
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
|
|
48
|
+
canEdit: false,
|
|
49
|
+
orderBackGoodsLevel: "1"
|
|
50
|
+
};
|
|
51
|
+
var wrapItem = function wrapItem(item, systemOrderNo) {
|
|
52
|
+
var _item$uuid;
|
|
53
|
+
item.canDelete = true;
|
|
54
|
+
item.canEdit = !!options.canEdit;
|
|
55
|
+
item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
|
|
56
|
+
item.systemOrderNo = systemOrderNo;
|
|
57
|
+
return _objectSpread({}, item);
|
|
58
|
+
};
|
|
59
|
+
var list = orders.reduce(function (prv, next) {
|
|
60
|
+
if (options.orderBackGoodsLevel !== "2") {
|
|
61
|
+
var _next$items;
|
|
62
|
+
// 反填子商品
|
|
63
|
+
next === null || next === void 0 ? void 0 : (_next$items = next.items) === null || _next$items === void 0 ? void 0 : _next$items.forEach(function (item) {
|
|
64
|
+
if (item.skuType === 'combine') {
|
|
65
|
+
item.subItems.forEach(function (subItem) {
|
|
66
|
+
var newSubItem = wrapItem(subItem, next === null || next === void 0 ? void 0 : next.oId);
|
|
67
|
+
newSubItem.batchId = item.batchId;
|
|
68
|
+
newSubItem.isGift = item.isGift;
|
|
69
|
+
newSubItem.qty = subItem.qty * item.qty;
|
|
70
|
+
prv.push(newSubItem);
|
|
71
|
+
});
|
|
72
|
+
} else {
|
|
73
|
+
prv.push(wrapItem(item, next === null || next === void 0 ? void 0 : next.oId));
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
} else {
|
|
77
|
+
var _next$items2;
|
|
78
|
+
// 反填组合商品
|
|
79
|
+
var goods = (next === null || next === void 0 ? void 0 : (_next$items2 = next.items) === null || _next$items2 === void 0 ? void 0 : _next$items2.map(function (item) {
|
|
80
|
+
return wrapItem(item, next === null || next === void 0 ? void 0 : next.oId);
|
|
81
|
+
})) || [];
|
|
82
|
+
prv.push.apply(prv, _toConsumableArray(goods));
|
|
83
|
+
}
|
|
84
|
+
return prv;
|
|
85
|
+
}, []);
|
|
86
|
+
return list;
|
|
87
|
+
};
|
|
88
|
+
var updateJstItemListHandle = function updateJstItemListHandle(list, type, comList, form) {
|
|
89
|
+
var _newList;
|
|
90
|
+
if (type === "logistics") {
|
|
91
|
+
var _comList$find, _currentCom$component;
|
|
92
|
+
var currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find = comList.find) === null || _comList$find === void 0 ? void 0 : _comList$find.call(comList, function (item) {
|
|
93
|
+
return item.workOrderComponentType === "JST_LOGISTICS";
|
|
94
|
+
});
|
|
95
|
+
var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
|
|
96
|
+
if (notOrderBack) {
|
|
97
|
+
var _currentValue;
|
|
98
|
+
var currentValue = form.getFieldValue(currentCom.uniqueKey);
|
|
99
|
+
currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
|
|
100
|
+
logisticsCode: "",
|
|
101
|
+
logisticsCompany: ""
|
|
102
|
+
}];
|
|
103
|
+
return currentValue;
|
|
104
|
+
}
|
|
105
|
+
} else if (type === "send") {
|
|
106
|
+
var _comList$find2, _currentCom$component2;
|
|
107
|
+
var _currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find2 = comList.find) === null || _comList$find2 === void 0 ? void 0 : _comList$find2.call(comList, function (item) {
|
|
108
|
+
return item.workOrderComponentType === "JST_SEND_GOOD";
|
|
109
|
+
});
|
|
110
|
+
var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
|
|
111
|
+
if (_notOrderBack) {
|
|
112
|
+
var _currentValue3;
|
|
113
|
+
var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
|
|
114
|
+
_currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
|
|
115
|
+
sendId: "",
|
|
116
|
+
sendName: ""
|
|
117
|
+
}];
|
|
118
|
+
return _currentValue2;
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
|
|
122
|
+
var items = ((next === null || next === void 0 ? void 0 : next.items) || []).map(function (t) {
|
|
123
|
+
return _objectSpread({
|
|
124
|
+
title: (t === null || t === void 0 ? void 0 : t.name) || "",
|
|
125
|
+
picUrl: (t === null || t === void 0 ? void 0 : t.pic) || "",
|
|
126
|
+
platform: "jst"
|
|
127
|
+
}, type === "itemList" ? {
|
|
128
|
+
itemId: t === null || t === void 0 ? void 0 : t.supplierId,
|
|
129
|
+
supplierName: t === null || t === void 0 ? void 0 : t.supplierName
|
|
130
|
+
} : {
|
|
131
|
+
skuId: (t === null || t === void 0 ? void 0 : t.skuId) || ""
|
|
132
|
+
});
|
|
133
|
+
});
|
|
134
|
+
var params = {
|
|
135
|
+
items: items
|
|
136
|
+
};
|
|
137
|
+
if (type === "logistics") {
|
|
138
|
+
params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticsCompany;
|
|
139
|
+
params.logisticsCode = next === null || next === void 0 ? void 0 : next.lId;
|
|
140
|
+
} else if (type === "send") {
|
|
141
|
+
var wmsCoId = (next === null || next === void 0 ? void 0 : next.wmsCoId) === "0" ? SendDataCenter.getInstance("jst").getMainWmsCoId() : "".concat(next === null || next === void 0 ? void 0 : next.wmsCoId);
|
|
142
|
+
params.sendId = wmsCoId;
|
|
143
|
+
params.sendName = wmsCoId && SendDataCenter.getInstance("jst").getSendNameByCode(wmsCoId);
|
|
144
|
+
params.sendSnapshotId = wmsCoId;
|
|
145
|
+
} else if (type === "supply") {
|
|
146
|
+
params.supplyId = next === null || next === void 0 ? void 0 : next.drpCoIdTo;
|
|
147
|
+
params.supplyName = next === null || next === void 0 ? void 0 : next.drpCoName;
|
|
148
|
+
}
|
|
149
|
+
if (type === "itemList") {
|
|
150
|
+
prv.push.apply(prv, _toConsumableArray(items.map(function (itemListItem) {
|
|
151
|
+
return _objectSpread({}, itemListItem);
|
|
152
|
+
})));
|
|
153
|
+
} else {
|
|
154
|
+
prv.push(params);
|
|
155
|
+
}
|
|
156
|
+
return prv;
|
|
157
|
+
}, []);
|
|
158
|
+
if (!((_newList = newList) !== null && _newList !== void 0 && _newList.length)) {
|
|
159
|
+
switch (type) {
|
|
160
|
+
case "logistics":
|
|
161
|
+
newList = [{
|
|
162
|
+
logisticsCode: ""
|
|
163
|
+
}];
|
|
164
|
+
break;
|
|
165
|
+
case "supply":
|
|
166
|
+
newList = [{
|
|
167
|
+
supplyName: "",
|
|
168
|
+
supplyId: ""
|
|
169
|
+
}];
|
|
170
|
+
break;
|
|
171
|
+
case "send":
|
|
172
|
+
newList = [{
|
|
173
|
+
sendId: "",
|
|
174
|
+
sendName: ""
|
|
175
|
+
}];
|
|
176
|
+
break;
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
return newList;
|
|
180
|
+
};
|
|
181
|
+
var updateJstItemListByConfigHandle = function updateJstItemListByConfigHandle(list, type) {
|
|
182
|
+
var config = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
183
|
+
var showField = config.showField,
|
|
184
|
+
enableItemId = config.enableItemId,
|
|
185
|
+
enableSupplierName = config.enableSupplierName;
|
|
186
|
+
return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
|
|
187
|
+
if (type === "logistics") {
|
|
188
|
+
if (!["logisticsCompany", ""].includes(showField || "")) {
|
|
189
|
+
next.logisticsCompany = undefined;
|
|
190
|
+
}
|
|
191
|
+
if (!["logisticsCode", ""].includes(showField || "")) {
|
|
192
|
+
next.logisticsCode = undefined;
|
|
193
|
+
}
|
|
194
|
+
} else if (type === "send") {
|
|
195
|
+
if (!["sendId", "all"].includes(showField || "")) {
|
|
196
|
+
next.sendId = undefined;
|
|
197
|
+
}
|
|
198
|
+
if (!["sendName", "all"].includes(showField || "")) {
|
|
199
|
+
next.sendName = undefined;
|
|
200
|
+
}
|
|
201
|
+
} else if (type === "supply") {
|
|
202
|
+
if (!["supplyId", "all"].includes(showField || "")) {
|
|
203
|
+
next.supplyId = undefined;
|
|
204
|
+
}
|
|
205
|
+
if (!["supplyName", "all"].includes(showField || "")) {
|
|
206
|
+
next.supplyName = undefined;
|
|
207
|
+
}
|
|
208
|
+
} else if (type === "itemList") {
|
|
209
|
+
if (!enableItemId) {
|
|
210
|
+
next.itemId = undefined;
|
|
211
|
+
}
|
|
212
|
+
if (!enableSupplierName) {
|
|
213
|
+
next.supplierName = undefined;
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
prv.push(next);
|
|
217
|
+
return prv;
|
|
218
|
+
}, []);
|
|
219
|
+
};
|
|
220
|
+
export var jstMergeIdenticalGoods = function jstMergeIdenticalGoods() {
|
|
221
|
+
var goodDetails = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
222
|
+
var list = [];
|
|
223
|
+
if (goodDetails.length) {
|
|
224
|
+
var obj = {};
|
|
225
|
+
goodDetails.forEach(function (goods) {
|
|
226
|
+
var goodIndex = obj["".concat(goods.systemOrderNo, "_").concat(goods.skuId)];
|
|
227
|
+
if (typeof goodIndex !== "number") {
|
|
228
|
+
obj["".concat(goods.systemOrderNo, "_").concat(goods.skuId)] = list.length;
|
|
229
|
+
list.push(goods);
|
|
230
|
+
} else {
|
|
231
|
+
list[goodIndex].qty = (list[goodIndex].qty || 0) + (goods.qty || 0);
|
|
232
|
+
}
|
|
233
|
+
});
|
|
234
|
+
}
|
|
235
|
+
return list;
|
|
236
|
+
};
|
|
237
|
+
export var jstOrderBackFormValues = function jstOrderBackFormValues() {
|
|
238
|
+
var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
239
|
+
var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
240
|
+
return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
241
|
+
var uniqueKey = next.uniqueKey;
|
|
242
|
+
var config = next.componentConfig;
|
|
243
|
+
switch (next.workOrderComponentType) {
|
|
244
|
+
case "JST_SYSTEM_ORDER":
|
|
245
|
+
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder;
|
|
246
|
+
break;
|
|
247
|
+
case "JST_GOODS":
|
|
248
|
+
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.jstGoods;
|
|
249
|
+
break;
|
|
250
|
+
case "JST_REISSUE_GOODS":
|
|
251
|
+
{
|
|
252
|
+
var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
|
|
253
|
+
prv[uniqueKey] = {
|
|
254
|
+
jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
|
|
255
|
+
jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderNo,
|
|
256
|
+
jstReissueType: [initReason],
|
|
257
|
+
jstReissueGoods: initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReissueGoods) || []),
|
|
258
|
+
jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstSystemOrderBillType) || ""
|
|
259
|
+
};
|
|
260
|
+
}
|
|
261
|
+
break;
|
|
262
|
+
case "JST_RETURN_GOODS":
|
|
263
|
+
{
|
|
264
|
+
var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
|
|
265
|
+
prv[uniqueKey] = {
|
|
266
|
+
jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
|
|
267
|
+
jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderNo,
|
|
268
|
+
jstReturnType: [_initReason],
|
|
269
|
+
jstReturnGoods: _initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || []),
|
|
270
|
+
jstSystemOrderBillType: (detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderBillType) || ""
|
|
271
|
+
};
|
|
272
|
+
}
|
|
273
|
+
break;
|
|
274
|
+
case "JST_ITEM_SELECT_THIRD":
|
|
275
|
+
prv[uniqueKey] = updateJstItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jstItemSelectThird, "itemList", config);
|
|
276
|
+
break;
|
|
277
|
+
case "JST_SUPPLY":
|
|
278
|
+
prv[uniqueKey] = updateJstItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jstSupply, "supply", config);
|
|
279
|
+
break;
|
|
280
|
+
case "JST_LOGISTICS":
|
|
281
|
+
prv[uniqueKey] = updateJstItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jstLogistics, "logistics", config);
|
|
282
|
+
break;
|
|
283
|
+
case "JST_SEND_GOOD":
|
|
284
|
+
prv[uniqueKey] = updateJstItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jstSendGood, "send", config);
|
|
285
|
+
break;
|
|
286
|
+
}
|
|
287
|
+
return prv;
|
|
288
|
+
}, {});
|
|
289
|
+
};
|
|
290
|
+
//jst订单信息转换
|
|
291
|
+
export var jstOrderTransform = function jstOrderTransform(detail, form) {
|
|
292
|
+
var _form$getFieldValue, _jstReissueCom$compon, _jstReturnCom$compone, _newOrderList$, _newOrderList$2, _jstReissueCom$compon2, _newOrderList$3, _newOrderList$4, _orderList$find, _orderList$find$call, _jstGoodsCom$componen;
|
|
293
|
+
var orderNo = detail.orderNo,
|
|
294
|
+
_detail$orderList = detail.orderList,
|
|
295
|
+
orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
|
|
296
|
+
componentList = detail.componentList,
|
|
297
|
+
_detail$allOrders = detail.allOrders,
|
|
298
|
+
allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders;
|
|
299
|
+
var jstGoodsCom = (componentList || []).find(function (com) {
|
|
300
|
+
return com.workOrderComponentType === "JST_GOODS";
|
|
301
|
+
});
|
|
302
|
+
var jstReissueCom = (componentList || []).find(function (com) {
|
|
303
|
+
return com.workOrderComponentType === "JST_REISSUE_GOODS";
|
|
304
|
+
});
|
|
305
|
+
var jstReturnCom = (componentList || []).find(function (com) {
|
|
306
|
+
return com.workOrderComponentType === "JST_RETURN_GOODS";
|
|
307
|
+
});
|
|
308
|
+
var isStrict = jstGoodsCom ? (_form$getFieldValue = form.getFieldValue(jstGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
|
|
309
|
+
var newOrderList = orderList === null || orderList === void 0 ? void 0 : orderList.map(function (item) {
|
|
310
|
+
return _objectSpread({}, item);
|
|
311
|
+
});
|
|
312
|
+
var onlyOneSystemOrder = (newOrderList === null || newOrderList === void 0 ? void 0 : newOrderList.length) === 1;
|
|
313
|
+
var isReissueDefaultSelect = !!(jstReissueCom !== null && jstReissueCom !== void 0 && (_jstReissueCom$compon = jstReissueCom.componentConfig) !== null && _jstReissueCom$compon !== void 0 && _jstReissueCom$compon.showDefaultSelect);
|
|
314
|
+
var isReturnDefaultSelect = !!(jstReturnCom !== null && jstReturnCom !== void 0 && (_jstReturnCom$compone = jstReturnCom.componentConfig) !== null && _jstReturnCom$compone !== void 0 && _jstReturnCom$compone.showDefaultSelect);
|
|
315
|
+
var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
|
|
316
|
+
return {
|
|
317
|
+
jstSystemOrder: {
|
|
318
|
+
//标记通过请求获取的值
|
|
319
|
+
isRequest: true,
|
|
320
|
+
orderNo: orderNo,
|
|
321
|
+
orders: newOrderList,
|
|
322
|
+
selectIds: onlyOneSystemOrder ? orderList.map(function (item) {
|
|
323
|
+
return item.oId;
|
|
324
|
+
}) : [],
|
|
325
|
+
showOrderInfo: newOrderList
|
|
326
|
+
},
|
|
327
|
+
jstReturnSystemOrderNo: onlyOneSystemOrder || isReturnDefaultSelect ? (_newOrderList$ = newOrderList[0]) === null || _newOrderList$ === void 0 ? void 0 : _newOrderList$.oId : undefined,
|
|
328
|
+
// TODO: 当只有一条系统单时默认选中该系统单
|
|
329
|
+
jstSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$2 = newOrderList[0]) === null || _newOrderList$2 === void 0 ? void 0 : _newOrderList$2.oId : undefined,
|
|
330
|
+
jstReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateJstGoodsHandle(defaultOrder, {
|
|
331
|
+
orderBackGoodsLevel: jstReissueCom === null || jstReissueCom === void 0 ? void 0 : (_jstReissueCom$compon2 = jstReissueCom.componentConfig) === null || _jstReissueCom$compon2 === void 0 ? void 0 : _jstReissueCom$compon2.orderBackGoodsLevel,
|
|
332
|
+
canEdit: true
|
|
333
|
+
}).filter(function (good) {
|
|
334
|
+
return !isStrict || !orderNo || good.originalDealCode === orderNo;
|
|
335
|
+
}) : [],
|
|
336
|
+
jstReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJstGoodsHandle(defaultOrder, {
|
|
337
|
+
canEdit: true
|
|
338
|
+
}).filter(function (good) {
|
|
339
|
+
return !isStrict || !orderNo || good.originalDealCode === orderNo;
|
|
340
|
+
}) : [],
|
|
341
|
+
jstSystemOrderBillType: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$3 = newOrderList[0]) === null || _newOrderList$3 === void 0 ? void 0 : _newOrderList$3.orderType : "",
|
|
342
|
+
jstReturnSystemOrderBillType: onlyOneSystemOrder || isReturnDefaultSelect ? (_newOrderList$4 = newOrderList[0]) === null || _newOrderList$4 === void 0 ? void 0 : _newOrderList$4.orderType : "",
|
|
343
|
+
jstGoods: {
|
|
344
|
+
//标记通过请求获取的值
|
|
345
|
+
isRequest: true,
|
|
346
|
+
allOrders: allOrders,
|
|
347
|
+
// 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
|
|
348
|
+
orders: orderList || [],
|
|
349
|
+
orderNo: orderNo,
|
|
350
|
+
shopCode: (orderList === null || orderList === void 0 ? void 0 : (_orderList$find = orderList.find) === null || _orderList$find === void 0 ? void 0 : (_orderList$find$call = _orderList$find.call(orderList, function (item) {
|
|
351
|
+
return item.sdCode;
|
|
352
|
+
})) === null || _orderList$find$call === void 0 ? void 0 : _orderList$find$call.sdCode) || null,
|
|
353
|
+
jstGoods: updateJstGoodsHandle(orderList, {
|
|
354
|
+
orderBackGoodsLevel: jstGoodsCom === null || jstGoodsCom === void 0 ? void 0 : (_jstGoodsCom$componen = jstGoodsCom.componentConfig) === null || _jstGoodsCom$componen === void 0 ? void 0 : _jstGoodsCom$componen.orderBackGoodsLevel
|
|
355
|
+
}).filter(function (good) {
|
|
356
|
+
return !isStrict || !orderNo || good.originalDealCode === orderNo;
|
|
357
|
+
})
|
|
358
|
+
},
|
|
359
|
+
jstLogistics: updateJstItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orderList, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
|
|
360
|
+
jstSendGood: updateJstItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orderList, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
|
|
361
|
+
jstSupply: updateJstItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orderList, "supply", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
|
|
362
|
+
jstItemSelectThird: updateJstItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orderList, "itemList", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
|
|
363
|
+
};
|
|
364
|
+
};
|
|
365
|
+
|
|
366
|
+
// TODO: 确定合并单,例如: WDT根据订单号请求返回的srcTid会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
|
|
367
|
+
export var filterJstOrders = function filterJstOrders(detail, order_no) {
|
|
368
|
+
var currentTrades = ((detail === null || detail === void 0 ? void 0 : detail.orderList) || []).map(function (item) {
|
|
369
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
370
|
+
oId: String(item.oId)
|
|
371
|
+
});
|
|
372
|
+
});
|
|
373
|
+
// .filter(
|
|
374
|
+
// (item: Record<string, any>) => item?.dealCode === order_no
|
|
375
|
+
// );
|
|
376
|
+
if (currentTrades.length) {
|
|
377
|
+
return currentTrades;
|
|
378
|
+
}
|
|
379
|
+
return [];
|
|
380
|
+
};
|
|
@@ -14,6 +14,7 @@ export { bsE3OrderBackFormValues, bsE3OrderTransform, updateBsE3GoodsHandle, fil
|
|
|
14
14
|
export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, } from "./wlnOrderBackFormValues";
|
|
15
15
|
export { WDT_RETURN_BILL_NO_CONFIG, WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders, updateWdtGoodsHandle, updateWdtAftersaleGoodsHandle, tradeStatusMap, } from "./wdtOrderBackFormValues";
|
|
16
16
|
export * from "./jstOrderBackFormValues";
|
|
17
|
+
export * from './platformAfterSalesOrderBackFormValues';
|
|
17
18
|
export { kmOrderBackFormValues, kmOrderTransform, KM_SYSTEM_ORDER_CONFIG, filterKmOrders, updateKmGoodsHandle, handleKmAddressIdentify, kmSkuTypeMap, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS, } from "./kmOrderBackFormValues";
|
|
18
19
|
export { getIsPlatformCodesIncludeOrderNos, GY_DELIVERY_STATE_MAPPING, GY_SYSTEM_ORDER_CONFIG, updateGyGoodsHandle, gyOrderTransform, gyOrderBackFormValues, filterGyOrders, } from "./gyOrderBackFormValues";
|
|
19
20
|
export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP, } from "./jyOrderBackFormValues";
|
package/dist/esm/utils/index.js
CHANGED
|
@@ -15,6 +15,7 @@ export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform } fr
|
|
|
15
15
|
export { WDT_RETURN_BILL_NO_CONFIG, WDT_SYSTEM_ORDER_CONFIG, wdtOrderBackFormValues, wdtOrderTransform, WDT_ORDER_TYPE_MAP, filterWdtOrders, updateWdtGoodsHandle, updateWdtAftersaleGoodsHandle, tradeStatusMap } from "./wdtOrderBackFormValues";
|
|
16
16
|
// export { default as jstOrderBackFormValues } from "./jstOrderBackFormValues";
|
|
17
17
|
export * from "./jstOrderBackFormValues";
|
|
18
|
+
export * from "./platformAfterSalesOrderBackFormValues";
|
|
18
19
|
export { kmOrderBackFormValues, kmOrderTransform, KM_SYSTEM_ORDER_CONFIG, filterKmOrders, updateKmGoodsHandle, handleKmAddressIdentify, kmSkuTypeMap, KM_ORDER_TYPE_MAP, KM_ORDER_STATUS } from "./kmOrderBackFormValues";
|
|
19
20
|
export { getIsPlatformCodesIncludeOrderNos, GY_DELIVERY_STATE_MAPPING, GY_SYSTEM_ORDER_CONFIG, updateGyGoodsHandle, gyOrderTransform, gyOrderBackFormValues, filterGyOrders } from "./gyOrderBackFormValues";
|
|
20
21
|
export { filterJyOrders, jyOrderBackFormValues, jyOrderTransform, updateJyGoodsHandle, JY_SYSTEM_ORDER_CONFIG, JY_ORDER_TYPE_MAP, JY_ORDER_STATUS_MAP } from "./jyOrderBackFormValues";
|
|
@@ -17,8 +17,10 @@ interface OrderBackFormValuesI {
|
|
|
17
17
|
formValue?: Record<string, unknown>;
|
|
18
18
|
order_no?: string | null;
|
|
19
19
|
detail: Record<string, unknown>;
|
|
20
|
-
fromQNCreateWorkOrderByOrderNo
|
|
20
|
+
fromQNCreateWorkOrderByOrderNo?: boolean;
|
|
21
|
+
skipOrderBackUniqueKeys?: string[];
|
|
21
22
|
_get_order_fail_?: boolean;
|
|
23
|
+
shopId?: string;
|
|
22
24
|
}
|
|
23
|
-
declare const _default: ({ _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, }: OrderBackFormValuesI) => any;
|
|
25
|
+
declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, skipOrderBackUniqueKeys, }: OrderBackFormValuesI) => any;
|
|
24
26
|
export default _default;
|
|
@@ -13,6 +13,7 @@ import { kmOrderBackFormValues } from "./kmOrderBackFormValues";
|
|
|
13
13
|
import { bsOrderBackFormValues } from "./bsOrderBackFormValues";
|
|
14
14
|
import { wlnOrderBackFormValues } from "./wlnOrderBackFormValues";
|
|
15
15
|
import { jstOrderBackFormValues } from "./jstOrderBackFormValues";
|
|
16
|
+
import { platformAfterSalesOrderBackFormValues } from "./platformAfterSalesOrderBackFormValues";
|
|
16
17
|
import { wdtOrderBackFormValues } from "./wdtOrderBackFormValues";
|
|
17
18
|
import { bsE3OrderBackFormValues } from "./bsE3OrderBackFormValues";
|
|
18
19
|
import { gyOrderBackFormValues } from "./gyOrderBackFormValues";
|
|
@@ -72,7 +73,8 @@ var taobaoGoodHandle = function taobaoGoodHandle() {
|
|
|
72
73
|
};
|
|
73
74
|
//订单返填数据重组
|
|
74
75
|
export default (function (_ref) {
|
|
75
|
-
var
|
|
76
|
+
var shopId = _ref.shopId,
|
|
77
|
+
_get_order_fail_ = _ref._get_order_fail_,
|
|
76
78
|
_ref$detail = _ref.detail,
|
|
77
79
|
detail = _ref$detail === void 0 ? {} : _ref$detail,
|
|
78
80
|
_ref$order_no = _ref.order_no,
|
|
@@ -84,7 +86,9 @@ export default (function (_ref) {
|
|
|
84
86
|
_ref$type = _ref.type,
|
|
85
87
|
type = _ref$type === void 0 ? "add" : _ref$type,
|
|
86
88
|
_ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
|
|
87
|
-
fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork
|
|
89
|
+
fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork,
|
|
90
|
+
_ref$skipOrderBackUni = _ref.skipOrderBackUniqueKeys,
|
|
91
|
+
skipOrderBackUniqueKeys = _ref$skipOrderBackUni === void 0 ? [] : _ref$skipOrderBackUni;
|
|
88
92
|
var orderValues = !_get_order_fail_ ? ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
89
93
|
var _next$componentConfig, _ref2, _detail$expressLogist, _detail$returnLogisti, _next$componentConfig2, _next$componentConfig3, _next$componentConfig4;
|
|
90
94
|
var uniqueKey = next.uniqueKey;
|
|
@@ -92,7 +96,7 @@ export default (function (_ref) {
|
|
|
92
96
|
var city = null,
|
|
93
97
|
town = null;
|
|
94
98
|
// console.log("--订单返填数据重组", next.workOrderComponentType);
|
|
95
|
-
|
|
99
|
+
if (skipOrderBackUniqueKeys.includes(uniqueKey)) return prv;
|
|
96
100
|
switch (next.workOrderComponentType) {
|
|
97
101
|
case "TRADE_ID_INPUT":
|
|
98
102
|
prv[uniqueKey] = (_next$componentConfig = next.componentConfig) !== null && _next$componentConfig !== void 0 && _next$componentConfig.toUpperCase ? (_ref2 = order_no || detail["orderNo"]) === null || _ref2 === void 0 ? void 0 : _ref2.toUpperCase() : order_no || detail["orderNo"];
|
|
@@ -245,6 +249,7 @@ export default (function (_ref) {
|
|
|
245
249
|
}
|
|
246
250
|
return prv;
|
|
247
251
|
}, {}) : {};
|
|
252
|
+
var afterSalesValues = detail["afterSaleOrders"] ? platformAfterSalesOrderBackFormValues(detail["afterSaleOrders"], templateDetail) : {};
|
|
248
253
|
var jstValues = detail["jstOrder"] ? jstOrderBackFormValues(detail["jstOrder"], templateDetail) : {};
|
|
249
254
|
var bsValues = detail["bsOrder"] ? bsOrderBackFormValues(detail["bsOrder"], templateDetail) : {};
|
|
250
255
|
var wlnValues = detail["wlnOrder"] ? wlnOrderBackFormValues(detail["wlnOrder"], templateDetail) : {};
|
|
@@ -261,5 +266,5 @@ export default (function (_ref) {
|
|
|
261
266
|
pushGyLog("gyValues", gyValues);
|
|
262
267
|
// console.log("bsE3Values", bsE3Values);
|
|
263
268
|
|
|
264
|
-
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues), jyValues), skxValues), skxReturnValues), jkyValues);
|
|
269
|
+
return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, orderValues), afterSalesValues), jstValues), bsValues), wlnValues), wdtValues), bsE3Values), kmValues), gyValues), jyValues), skxValues), skxReturnValues), jkyValues);
|
|
265
270
|
});
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { FormInstance } from "antd";
|
|
2
|
+
export declare const PLATFORM_AFTER_SALES_ORDER_CONFIG: {
|
|
3
|
+
key: string;
|
|
4
|
+
name: string;
|
|
5
|
+
selectId: string;
|
|
6
|
+
orderNo: string;
|
|
7
|
+
columns: any[];
|
|
8
|
+
};
|
|
9
|
+
export declare function getAfterSaleOrdersBackValues(selectOrder: any): {
|
|
10
|
+
[key: string]: any;
|
|
11
|
+
};
|
|
12
|
+
export declare function afterSaleOrderBack(form: FormInstance, templateDetail: any): void;
|
|
13
|
+
export declare const platformAfterSalesOrderTransform: ({ orderNo, shopId, allOrders, selectOrders, }: {
|
|
14
|
+
orderNo?: string | undefined;
|
|
15
|
+
shopId?: string | undefined;
|
|
16
|
+
allOrders?: any[] | undefined;
|
|
17
|
+
selectOrders?: any[] | undefined;
|
|
18
|
+
}) => any;
|
|
19
|
+
export declare const platformAfterSalesOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
@@ -0,0 +1,153 @@
|
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
3
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
4
|
+
function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
|
|
5
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
6
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
7
|
+
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; }
|
|
8
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
9
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
10
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
11
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
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
|
+
import moment from "moment";
|
|
14
|
+
import ExpressData from "../expressData";
|
|
15
|
+
var renderTime = function renderTime(value) {
|
|
16
|
+
return value && value !== "--" ? moment(value).format("YYYY-MM-DD HH:mm:ss") : value !== null && value !== void 0 ? value : "";
|
|
17
|
+
};
|
|
18
|
+
export var PLATFORM_AFTER_SALES_ORDER_CONFIG = {
|
|
19
|
+
key: "platformAfaterSalesShowOrder",
|
|
20
|
+
name: "平台售后单",
|
|
21
|
+
selectId: "platformAfaterSalesSelectIds",
|
|
22
|
+
orderNo: "platformAfaterSalesOrderNo",
|
|
23
|
+
columns: [{
|
|
24
|
+
dataIndex: "afterSaleOrderId",
|
|
25
|
+
title: "\u552E\u540E\u5355\u53F7",
|
|
26
|
+
width: 200
|
|
27
|
+
}, {
|
|
28
|
+
dataIndex: "afterSaleType",
|
|
29
|
+
title: "\u552E\u540E\u7C7B\u578B"
|
|
30
|
+
}, {
|
|
31
|
+
dataIndex: "platformStatus",
|
|
32
|
+
title: "\u5E73\u53F0\u552E\u540E\u72B6\u6001"
|
|
33
|
+
}, {
|
|
34
|
+
dataIndex: "buyerNick",
|
|
35
|
+
title: "\u4E70\u5BB6\u6635\u79F0"
|
|
36
|
+
}, {
|
|
37
|
+
dataIndex: "refundAmount",
|
|
38
|
+
title: "\u9000\u6B3E\u91D1\u989D"
|
|
39
|
+
}, {
|
|
40
|
+
dataIndex: "refundPostFee",
|
|
41
|
+
title: "\u5E94\u9000\u8FD0\u8D39"
|
|
42
|
+
}, {
|
|
43
|
+
dataIndex: "reason",
|
|
44
|
+
title: "\u552E\u540E\u539F\u56E0"
|
|
45
|
+
}, {
|
|
46
|
+
dataIndex: "explains",
|
|
47
|
+
title: "\u552E\u540E\u8BF4\u660E"
|
|
48
|
+
}, {
|
|
49
|
+
dataIndex: "applyTime",
|
|
50
|
+
title: "\u552E\u540E\u7533\u8BF7\u65F6\u95F4",
|
|
51
|
+
render: renderTime,
|
|
52
|
+
renderExport: renderTime,
|
|
53
|
+
width: 180
|
|
54
|
+
}, {
|
|
55
|
+
dataIndex: "updateTime",
|
|
56
|
+
title: "\u552E\u540E\u66F4\u65B0\u65F6\u95F4",
|
|
57
|
+
render: renderTime,
|
|
58
|
+
renderExport: renderTime,
|
|
59
|
+
width: 180
|
|
60
|
+
}, {
|
|
61
|
+
dataIndex: "returnExpressCompany",
|
|
62
|
+
title: "\u9000\u8D27\u7269\u6D41\u516C\u53F8"
|
|
63
|
+
}, {
|
|
64
|
+
dataIndex: "returnExpressNo",
|
|
65
|
+
title: "\u9000\u8D27\u7269\u6D41\u5355\u53F7"
|
|
66
|
+
}].map(function (item) {
|
|
67
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
68
|
+
align: "center",
|
|
69
|
+
ellipsis: true,
|
|
70
|
+
width: item.width || 150
|
|
71
|
+
});
|
|
72
|
+
})
|
|
73
|
+
};
|
|
74
|
+
export function getAfterSaleOrdersBackValues(selectOrder) {
|
|
75
|
+
var values = {};
|
|
76
|
+
var returnExpressCompany = selectOrder.returnExpressCompany,
|
|
77
|
+
returnExpressNo = selectOrder.returnExpressNo;
|
|
78
|
+
var expressCode = ExpressData.getInstance().getExpressCodeByName(returnExpressCompany);
|
|
79
|
+
values.returnLogistics = {
|
|
80
|
+
company: expressCode,
|
|
81
|
+
order: returnExpressNo
|
|
82
|
+
};
|
|
83
|
+
values.logisticsTrajectory = {
|
|
84
|
+
trajectoryCompany: expressCode,
|
|
85
|
+
trajectoryCode: returnExpressNo
|
|
86
|
+
};
|
|
87
|
+
return values;
|
|
88
|
+
}
|
|
89
|
+
export function afterSaleOrderBack(form, templateDetail) {
|
|
90
|
+
var platformAfterSalesField = [].concat(_toConsumableArray(templateDetail.componentDtoList), _toConsumableArray(templateDetail.preNodeComponentDtoList)).find(function (item) {
|
|
91
|
+
return item.workOrderComponentType === "PLATFORM_AFTER_SALES_ORDER";
|
|
92
|
+
});
|
|
93
|
+
if (platformAfterSalesField) {
|
|
94
|
+
var _orders$showOrderInfo;
|
|
95
|
+
var orders = form.getFieldValue(platformAfterSalesField.uniqueKey);
|
|
96
|
+
if (orders !== null && orders !== void 0 && (_orders$showOrderInfo = orders.showOrderInfo) !== null && _orders$showOrderInfo !== void 0 && _orders$showOrderInfo[0]) {
|
|
97
|
+
var _orders$showOrderInfo2;
|
|
98
|
+
var details = getAfterSaleOrdersBackValues(orders === null || orders === void 0 ? void 0 : (_orders$showOrderInfo2 = orders.showOrderInfo) === null || _orders$showOrderInfo2 === void 0 ? void 0 : _orders$showOrderInfo2[0]);
|
|
99
|
+
var values = platformAfterSalesOrderBackFormValues(details, {
|
|
100
|
+
componentDtoList: templateDetail.componentDtoList
|
|
101
|
+
});
|
|
102
|
+
form.setFieldsValue(values);
|
|
103
|
+
}
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
export var platformAfterSalesOrderTransform = function platformAfterSalesOrderTransform(_ref) {
|
|
107
|
+
var orderNo = _ref.orderNo,
|
|
108
|
+
shopId = _ref.shopId,
|
|
109
|
+
allOrders = _ref.allOrders,
|
|
110
|
+
selectOrders = _ref.selectOrders;
|
|
111
|
+
var values = {};
|
|
112
|
+
var otherValues = {};
|
|
113
|
+
var onlyOneOrder = (allOrders === null || allOrders === void 0 ? void 0 : allOrders.length) === 1;
|
|
114
|
+
if (allOrders && shopId && orderNo) {
|
|
115
|
+
values.afterSalesOrder = {
|
|
116
|
+
//标记通过请求获取的值
|
|
117
|
+
isRequest: true,
|
|
118
|
+
orderNo: orderNo,
|
|
119
|
+
orders: allOrders,
|
|
120
|
+
selectIds: onlyOneOrder ? allOrders.map(function (item) {
|
|
121
|
+
return item.afterSaleOrderId;
|
|
122
|
+
}) : [],
|
|
123
|
+
shopId: shopId,
|
|
124
|
+
showOrderInfo: allOrders
|
|
125
|
+
};
|
|
126
|
+
if (onlyOneOrder) {
|
|
127
|
+
otherValues = getAfterSaleOrdersBackValues(allOrders[0]);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
if (selectOrders !== null && selectOrders !== void 0 && selectOrders[0]) {
|
|
131
|
+
otherValues = getAfterSaleOrdersBackValues(selectOrders[0]);
|
|
132
|
+
}
|
|
133
|
+
return _objectSpread(_objectSpread({}, values), otherValues);
|
|
134
|
+
};
|
|
135
|
+
export var platformAfterSalesOrderBackFormValues = function platformAfterSalesOrderBackFormValues() {
|
|
136
|
+
var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
137
|
+
var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
138
|
+
return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
139
|
+
var uniqueKey = next.uniqueKey;
|
|
140
|
+
switch (next.workOrderComponentType) {
|
|
141
|
+
case "RETURN_LOGISTICS_SELECT":
|
|
142
|
+
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.returnLogistics;
|
|
143
|
+
break;
|
|
144
|
+
case "LOGISTICS_TRAJECTORY":
|
|
145
|
+
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.logisticsTrajectory;
|
|
146
|
+
break;
|
|
147
|
+
case "PLATFORM_AFTER_SALES_ORDER":
|
|
148
|
+
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.afterSalesOrder;
|
|
149
|
+
break;
|
|
150
|
+
}
|
|
151
|
+
return prv;
|
|
152
|
+
}, {});
|
|
153
|
+
};
|
|
@@ -21,7 +21,7 @@ import { BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP } from "@kmkf-fe-packa
|
|
|
21
21
|
import ExpressInterceptData from "../expressInterceptData";
|
|
22
22
|
var interceptExpress = ExpressInterceptData.getInstance();
|
|
23
23
|
export var unTransField = function unTransField(key) {
|
|
24
|
-
return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "orderRefundType", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "erpAfterSaleTradeItemList", "erpAfterSaleTradeIdList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "flowTags", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "msgStatusValues", "msgStatus4Search", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "trajectoryMoreStatus", "trajectoryMoreLastLogisticsInfo", "trajectoryMoreLastUpdateTime", "trajectoryApiStatus", "wdtGoods", "wdtSendGood", "wdtReissueType", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSystemOrderNo", "wdtLogisticsList", "wdtSystemShowOrder", "kmSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsE3Goods", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptApiStatusList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptSnapshotList", "interceptLogisticsApiStatus", "productList", "label", "kmSendGood", "kmReturnWarehouse", "kmGoods", "bsE3ReissueType", "bsE3ReissueGoods", "gyGoods", "gySendGood", "gyReissueType", "gyReissueGoods", "gySystemOrderNo", "gyLogisticsList", "gySystemShowOrder", "gySystemSelectIds", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmExchangeGoods", "wdtTags", "kmVideo", "jstAftersaleGoods"].reduce(function (cur, nxt) {
|
|
24
|
+
return ["itemList", "jstItemList", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "orderRefundType", "checkbox", "multSelect", "rate", "picture", "file", "bsSendGood", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsSystemShowOrder", "bsSystemSelectIds", "reissueLogisticsList", "deliveryNoList", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "erpAfterSaleTradeItemList", "erpAfterSaleTradeIdList", "wlnLogisticsList", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "flowTags", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "msgStatusValues", "msgStatus4Search", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "trajectoryMoreStatus", "trajectoryMoreLastLogisticsInfo", "trajectoryMoreLastUpdateTime", "trajectoryApiStatus", "wdtGoods", "wdtSendGood", "wdtReissueType", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSystemOrderNo", "wdtLogisticsList", "wdtSystemShowOrder", "kmSystemShowOrder", "platformAfaterSalesShowOrder", "platformAfaterSalesSelectIds", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsE3Goods", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptApiStatusList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptSnapshotList", "interceptLogisticsApiStatus", "productList", "label", "kmSendGood", "kmReturnWarehouse", "kmGoods", "bsE3ReissueType", "bsE3ReissueGoods", "gyGoods", "gySendGood", "gyReissueType", "gyReissueGoods", "gySystemOrderNo", "gyLogisticsList", "gySystemShowOrder", "gySystemSelectIds", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmExchangeGoods", "wdtTags", "kmVideo", "jstAftersaleGoods"].reduce(function (cur, nxt) {
|
|
25
25
|
return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
|
|
26
26
|
}, false);
|
|
27
27
|
};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export default (function (key) {
|
|
2
|
-
return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "erpOrderStatus", "jstOutboundStatus", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "wdtInStockStatusItemList", "wdtInStockStatusList", "jkyInStockStatusItemList", "jkyInStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "subOrderList", "label", "kmSendGood", "kmReturnWarehouse", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "jyGoods", "jySystemOrderNo", "jySystemShowOrder", "jySystemSelectIds", "jySendGood", "jySendId", "jySendName", "jyLogisticsList", "jyLogisticsCompany", "jyLogisticsCode", "jkyGoods", "jkySystemOrderNo", "jkySystemSelectIds", "jkySystemShowOrder", "jkySendGood", "jkySendId", "jkySendName", "jkyLogisticsList", "jkyLogisticsCompany", "jkyLogisticsCode", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmExchangeGoods", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics", "jyReissueGoods", "jyReissueType", "jstAftersaleGoods"].reduce(function (cur, nxt) {
|
|
2
|
+
return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "erpOrderStatus", "jstOutboundStatus", "orderRefundType", "executeActionType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtAftersaleGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtReturnBillNo", "wdtReturnBillSelectIds", "wdtReturnBillShowOrder", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "platformAfaterSalesShowOrder", "platformAfaterSalesSelectIds", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "wdtInStockStatusItemList", "wdtInStockStatusList", "jkyInStockStatusItemList", "jkyInStockStatusList", "reissueStatusValue", "reissueReason", "adjustWorkOrderStatusValue", "adjustWorkOrderReason", "msgStatusValues", "msgStatus4Search", "createStatusValue", "createReason", "invoiceStatusValue", "invoiceReason", "invoicingStatusValue", "invoicingReason", "trajectoryList", "trajectoryMoreCompany", "trajectoryMoreCode", "trajectoryMoreSnapshot", "logisticsInterceptList", "logisticsInterceptCompanyList", "logisticsInterceptCodeList", "logisticsInterceptTypeList", "logisticsInterceptStatusList", "logisticsInterceptApiStatusList", "interceptLogisticsApiStatus", "logisticsInterceptSnapshotList", "productList", "subOrderList", "label", "kmSendGood", "kmReturnWarehouse", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "jyGoods", "jySystemOrderNo", "jySystemShowOrder", "jySystemSelectIds", "jySendGood", "jySendId", "jySendName", "jyLogisticsList", "jyLogisticsCompany", "jyLogisticsCode", "jkyGoods", "jkySystemOrderNo", "jkySystemSelectIds", "jkySystemShowOrder", "jkySendGood", "jkySendId", "jkySendName", "jkyLogisticsList", "jkyLogisticsCompany", "jkyLogisticsCode", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType", "kmExchangeGoods", "kmVideo", "wdtTags", "skxGoods", "skxReturnGoods", "skxLogisticsList", "skxReturnLogistics", "jyReissueGoods", "jyReissueType", "jstAftersaleGoods"].reduce(function (cur, nxt) {
|
|
3
3
|
return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
|
|
4
4
|
}, false);
|
|
5
5
|
});
|
|
@@ -521,7 +521,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
|
|
|
521
521
|
_detail$allOrders = detail.allOrders,
|
|
522
522
|
allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
|
|
523
523
|
_detail$wdtReturnOrde = detail.wdtReturnOrders,
|
|
524
|
-
wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde
|
|
524
|
+
wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde,
|
|
525
|
+
matchLogisticsNo = detail.matchLogisticsNo;
|
|
525
526
|
var wdtGoodsCom = (componentList || []).find(function (com) {
|
|
526
527
|
return com.workOrderComponentType === "WDT_GOODS";
|
|
527
528
|
});
|
|
@@ -532,6 +533,11 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
|
|
|
532
533
|
var isStrict = wdtGoodsCom ? (_form$getFieldValue = form.getFieldValue(wdtGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
|
|
533
534
|
var onlyOneSystemOrder = (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1;
|
|
534
535
|
var defaultOrder = currentTrades !== null && currentTrades !== void 0 && currentTrades[0] ? [currentTrades[0]] : [];
|
|
536
|
+
var matchedSystemOrderIds = matchLogisticsNo ? currentTrades.filter(function (item) {
|
|
537
|
+
return "".concat((item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
|
|
538
|
+
}).map(function (item) {
|
|
539
|
+
return item.tradeNo;
|
|
540
|
+
}) : [];
|
|
535
541
|
return {
|
|
536
542
|
wdtSystemOrder: {
|
|
537
543
|
//标记通过请求获取的值
|
|
@@ -546,7 +552,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
|
|
|
546
552
|
logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
|
|
547
553
|
});
|
|
548
554
|
}),
|
|
549
|
-
selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
|
|
555
|
+
selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
|
|
550
556
|
return item.tradeNo;
|
|
551
557
|
}) : [],
|
|
552
558
|
showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
|
|
@@ -11,7 +11,7 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
|
|
|
11
11
|
};
|
|
12
12
|
export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
|
|
13
13
|
export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
14
|
-
export declare const wlnOrderTransform: (detail: any) => {
|
|
14
|
+
export declare const wlnOrderTransform: (detail: any, form: any) => {
|
|
15
15
|
wlnSystemOrder: {
|
|
16
16
|
orderNo: any;
|
|
17
17
|
orders: any;
|
|
@@ -32,6 +32,54 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
|
|
|
32
32
|
title: "标记",
|
|
33
33
|
dataIndex: "billTag",
|
|
34
34
|
width: 150
|
|
35
|
+
}, {
|
|
36
|
+
title: "是否拆分订单",
|
|
37
|
+
dataIndex: "splitTrade",
|
|
38
|
+
width: 150
|
|
39
|
+
}, {
|
|
40
|
+
title: "是否售后订单",
|
|
41
|
+
dataIndex: "exchangeTrade",
|
|
42
|
+
width: 150
|
|
43
|
+
}, {
|
|
44
|
+
title: "是否有退款",
|
|
45
|
+
dataIndex: "hasRefund",
|
|
46
|
+
width: 150
|
|
47
|
+
}, {
|
|
48
|
+
title: "是否预售订单",
|
|
49
|
+
dataIndex: "preSale",
|
|
50
|
+
width: 150
|
|
51
|
+
}, {
|
|
52
|
+
title: "合并前系统单号",
|
|
53
|
+
dataIndex: "mergeUids",
|
|
54
|
+
width: 150
|
|
55
|
+
}, {
|
|
56
|
+
title: "快递公司名称",
|
|
57
|
+
dataIndex: "logisticName",
|
|
58
|
+
width: 150
|
|
59
|
+
}, {
|
|
60
|
+
title: "快递公司编码",
|
|
61
|
+
dataIndex: "logisticCode",
|
|
62
|
+
width: 150
|
|
63
|
+
}, {
|
|
64
|
+
title: "快递单号",
|
|
65
|
+
dataIndex: "expressCode",
|
|
66
|
+
width: 150
|
|
67
|
+
}, {
|
|
68
|
+
title: "发货仓名称",
|
|
69
|
+
dataIndex: "storageName",
|
|
70
|
+
width: 150
|
|
71
|
+
}, {
|
|
72
|
+
title: "发货仓编码",
|
|
73
|
+
dataIndex: "storageCode",
|
|
74
|
+
width: 150
|
|
75
|
+
}, {
|
|
76
|
+
title: "单据处理状态",
|
|
77
|
+
dataIndex: "processStatus",
|
|
78
|
+
width: 150
|
|
79
|
+
}, {
|
|
80
|
+
title: "线上单号",
|
|
81
|
+
dataIndex: "tpTid",
|
|
82
|
+
width: 150
|
|
35
83
|
}]
|
|
36
84
|
};
|
|
37
85
|
export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
|
|
@@ -68,8 +116,39 @@ export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
|
|
|
68
116
|
}, []);
|
|
69
117
|
return list;
|
|
70
118
|
};
|
|
71
|
-
var updateWlnItemListHandle = function updateWlnItemListHandle(list, type) {
|
|
119
|
+
var updateWlnItemListHandle = function updateWlnItemListHandle(list, type, comList, form) {
|
|
72
120
|
var _newList;
|
|
121
|
+
if (type === "logistics") {
|
|
122
|
+
var _comList$find, _currentCom$component;
|
|
123
|
+
var currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find = comList.find) === null || _comList$find === void 0 ? void 0 : _comList$find.call(comList, function (item) {
|
|
124
|
+
return item.workOrderComponentType === "WLN_LOGISTICS";
|
|
125
|
+
});
|
|
126
|
+
var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
|
|
127
|
+
if (notOrderBack) {
|
|
128
|
+
var _currentValue;
|
|
129
|
+
var currentValue = form.getFieldValue(currentCom.uniqueKey);
|
|
130
|
+
currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
|
|
131
|
+
logisticsCode: "",
|
|
132
|
+
logisticsCompany: ""
|
|
133
|
+
}];
|
|
134
|
+
return currentValue;
|
|
135
|
+
}
|
|
136
|
+
} else if (type === "send") {
|
|
137
|
+
var _comList$find2, _currentCom$component2;
|
|
138
|
+
var _currentCom = comList === null || comList === void 0 ? void 0 : (_comList$find2 = comList.find) === null || _comList$find2 === void 0 ? void 0 : _comList$find2.call(comList, function (item) {
|
|
139
|
+
return item.workOrderComponentType === "WLN_SEND_GOOD";
|
|
140
|
+
});
|
|
141
|
+
var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
|
|
142
|
+
if (_notOrderBack) {
|
|
143
|
+
var _currentValue3;
|
|
144
|
+
var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
|
|
145
|
+
_currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
|
|
146
|
+
sendId: "",
|
|
147
|
+
sendName: ""
|
|
148
|
+
}];
|
|
149
|
+
return _currentValue2;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
73
152
|
var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
|
|
74
153
|
var items = (next.items || []).map(function (t) {
|
|
75
154
|
return {
|
|
@@ -161,8 +240,36 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
|
|
|
161
240
|
}, {});
|
|
162
241
|
};
|
|
163
242
|
//wln订单信息转换
|
|
164
|
-
export var wlnOrderTransform = function wlnOrderTransform(detail) {
|
|
165
|
-
var _detail$orders, _ref, _detail$orders2, _detail$orders2$;
|
|
243
|
+
export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
|
|
244
|
+
var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
|
|
245
|
+
console.log("\uD83D\uDE80 ~ wlnOrderBackFormValues.ts:265 ~ wlnOrderTransform ~ detail:", detail);
|
|
246
|
+
var _detail$allOrders = detail.allOrders,
|
|
247
|
+
allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
|
|
248
|
+
orderNo = detail.orderNo,
|
|
249
|
+
_detail$trades = detail.trades,
|
|
250
|
+
currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
|
|
251
|
+
componentList = detail.componentList;
|
|
252
|
+
var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
|
|
253
|
+
return !trade.cancel;
|
|
254
|
+
});
|
|
255
|
+
var wlnGoodsCom = (componentList || []).find(function (com) {
|
|
256
|
+
return com.workOrderComponentType === "WLN_GOODS";
|
|
257
|
+
});
|
|
258
|
+
var wlnReissueCom = (componentList || []).find(function (com) {
|
|
259
|
+
return com.workOrderComponentType === "WLN_REISSUE_GOODS";
|
|
260
|
+
});
|
|
261
|
+
var isStrict = wlnGoodsCom ? (_form$getFieldValue = form.getFieldValue(wlnGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
|
|
262
|
+
var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
|
|
263
|
+
var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
|
|
264
|
+
var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
|
|
265
|
+
var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
|
|
266
|
+
console.log('**** ', {
|
|
267
|
+
isStrict: isStrict,
|
|
268
|
+
onlyOneSystemOrder: onlyOneSystemOrder,
|
|
269
|
+
isReissueDefaultSelect: isReissueDefaultSelect,
|
|
270
|
+
wlnGoodsOrderBackGoodsLevel: wlnGoodsOrderBackGoodsLevel,
|
|
271
|
+
wlnReissueGoodsOrderBackGoodsLevel: wlnReissueGoodsOrderBackGoodsLevel
|
|
272
|
+
});
|
|
166
273
|
return {
|
|
167
274
|
wlnSystemOrder: {
|
|
168
275
|
orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
|
|
@@ -189,7 +296,7 @@ export var wlnOrderTransform = function wlnOrderTransform(detail) {
|
|
|
189
296
|
wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders),
|
|
190
297
|
allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders
|
|
191
298
|
},
|
|
192
|
-
wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics"),
|
|
193
|
-
wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send")
|
|
299
|
+
wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
|
|
300
|
+
wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
|
|
194
301
|
};
|
|
195
302
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-utils",
|
|
3
|
-
"version": "2.7.
|
|
3
|
+
"version": "2.7.3-beta.0",
|
|
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": "8c80641421cc67b5f77f17fbe4db443014610338",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|