@kmkf-fe-packages/kmkf-utils 2.7.6 → 2.7.7-beta.12
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.js +1 -1
- package/dist/esm/constants/msgTypeMapping.js +1 -0
- 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 +5 -4
- package/dist/esm/utils/index.d.ts +1 -2
- package/dist/esm/utils/index.js +1 -2
- package/dist/esm/utils/jstOrderBackFormValues.d.ts +1 -1
- package/dist/esm/utils/jstOrderBackFormValues.js +22 -9
- package/dist/esm/utils/transformList.js +1 -1
- package/dist/esm/utils/unTransField.js +1 -1
- package/dist/esm/utils/wlnOrderBackFormValues.d.ts +32 -4
- package/dist/esm/utils/wlnOrderBackFormValues.js +412 -39
- package/package.json +2 -2
- package/dist/esm/utils/dist/gyOrderBackFormValues.js +0 -285
package/README.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
112311112311
|
|
@@ -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", "ERP_REMARK", "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
|
// 表单默认值
|
|
@@ -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 () {
|
|
@@ -90,6 +90,7 @@ export var SendDataCenter = /*#__PURE__*/function () {
|
|
|
90
90
|
if (platform === "JST_SEND_GOOD") platform = "jst";
|
|
91
91
|
if (platform === "JY_SEND_GOOD") platform = "jy";
|
|
92
92
|
if (platform === "JKY_SEND_GOOD") platform = "jky";
|
|
93
|
+
if (platform === "WLN_SEND_GOOD") platform = "wln";
|
|
93
94
|
if (!this.instanceMap.has(platform)) {
|
|
94
95
|
this.instanceMap.set(platform, new SendData(platform));
|
|
95
96
|
}
|
|
@@ -11,7 +11,7 @@ export * from "./finalFormData";
|
|
|
11
11
|
export * from "./transformList";
|
|
12
12
|
export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform, } from "./bsOrderBackFormValues";
|
|
13
13
|
export { bsE3OrderBackFormValues, bsE3OrderTransform, updateBsE3GoodsHandle, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_SYSTEM_ORDER_CONFIG, } from "./bsE3OrderBackFormValues";
|
|
14
|
-
export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, } from "./wlnOrderBackFormValues";
|
|
14
|
+
export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, updateWlnGoodsHandle, } 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
17
|
export * from './platformAfterSalesOrderBackFormValues';
|
|
@@ -22,7 +22,6 @@ export { jkyOrderBackFormValues, jkyOrderTransform, updateJkyGoodsHandle, JKY_SY
|
|
|
22
22
|
export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues, } from "./skxOrderBackFormValues";
|
|
23
23
|
export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform, } from "./orderSubFormOrderBackFormValues";
|
|
24
24
|
export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues, } from "./skxReturnOrderBackFormValues";
|
|
25
|
-
export { updateWlnGoodsHandle } from "./wlnOrderBackFormValues";
|
|
26
25
|
export { default as uuid } from "./getUUid";
|
|
27
26
|
export * as filterFn from "./filterFn";
|
|
28
27
|
export * as templateFn from "./template";
|
package/dist/esm/utils/index.js
CHANGED
|
@@ -11,7 +11,7 @@ export * from "./finalFormData";
|
|
|
11
11
|
export * from "./transformList";
|
|
12
12
|
export { BS_SYSTEM_ORDER_CONFIG, bsOrderBackFormValues, bsOrderTransform } from "./bsOrderBackFormValues";
|
|
13
13
|
export { bsE3OrderBackFormValues, bsE3OrderTransform, updateBsE3GoodsHandle, filterBsE3Orders, BS_E3_ORDER_STATUS_MAP, BS_E3_BOOLEAN_STATUS_MAP, BS_E3_SYSTEM_ORDER_CONFIG } from "./bsE3OrderBackFormValues";
|
|
14
|
-
export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform } from "./wlnOrderBackFormValues";
|
|
14
|
+
export { WLN_SYSTEM_ORDER_CONFIG, wlnOrderBackFormValues, wlnOrderTransform, updateWlnGoodsHandle } 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 { default as jstOrderBackFormValues } from "./jstOrderBackFormValues";
|
|
17
17
|
export * from "./jstOrderBackFormValues";
|
|
@@ -23,7 +23,6 @@ export { jkyOrderBackFormValues, jkyOrderTransform, updateJkyGoodsHandle, JKY_SY
|
|
|
23
23
|
export { formatTrade, skxOrderBackFormValues, updateSkxGoodsHandle, skxOrderTransform, skxSystemOrderBackValues } from "./skxOrderBackFormValues";
|
|
24
24
|
export { updateOrderSubFormGoodsHandle, orderSubFormOrderBackFormValues, orderSubFormOrderTransform } from "./orderSubFormOrderBackFormValues";
|
|
25
25
|
export { formatReturnTrade, skxReturnOrderBackFormValues, updateSkxReturnGoodsHandle, skxReturnOrderTransform, skxReturnSystemOrderBackValues } from "./skxReturnOrderBackFormValues";
|
|
26
|
-
export { updateWlnGoodsHandle } from "./wlnOrderBackFormValues";
|
|
27
26
|
export { default as uuid } from "./getUUid";
|
|
28
27
|
import * as _filterFn from "./filterFn";
|
|
29
28
|
export { _filterFn as filterFn };
|
|
@@ -33,7 +33,7 @@ export declare const jstOrderTransform: (detail: any, form: any) => {
|
|
|
33
33
|
jstReissueGoods: any;
|
|
34
34
|
jstReturnGoods: any;
|
|
35
35
|
jstSystemOrderBillType: any;
|
|
36
|
-
|
|
36
|
+
shopCode: any;
|
|
37
37
|
jstGoods: {
|
|
38
38
|
isRequest: boolean;
|
|
39
39
|
allOrders: any;
|
|
@@ -54,6 +54,7 @@ export var updateJstGoodsHandle = function updateJstGoodsHandle() {
|
|
|
54
54
|
item.canEdit = !!options.canEdit;
|
|
55
55
|
item.uuid = (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid();
|
|
56
56
|
item.systemOrderNo = systemOrderNo;
|
|
57
|
+
item.saleAmount = ((item.qty || 0) * (item.salePrice || 0)).toFixed(2);
|
|
57
58
|
return _objectSpread({}, item);
|
|
58
59
|
};
|
|
59
60
|
var list = orders.reduce(function (prv, next) {
|
|
@@ -237,7 +238,7 @@ export var jstMergeIdenticalGoods = function jstMergeIdenticalGoods() {
|
|
|
237
238
|
export var jstOrderBackFormValues = function jstOrderBackFormValues() {
|
|
238
239
|
var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
239
240
|
var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
240
|
-
|
|
241
|
+
var res = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
241
242
|
var uniqueKey = next.uniqueKey;
|
|
242
243
|
var config = next.componentConfig;
|
|
243
244
|
switch (next.workOrderComponentType) {
|
|
@@ -266,10 +267,13 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
|
|
|
266
267
|
jstSystemOrder: detail === null || detail === void 0 ? void 0 : detail.jstSystemOrder,
|
|
267
268
|
jstSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.jstReturnSystemOrderNo,
|
|
268
269
|
jstReturnType: [_initReason],
|
|
269
|
-
|
|
270
|
-
|
|
270
|
+
shopCode: detail === null || detail === void 0 ? void 0 : detail.shopCode,
|
|
271
|
+
jstReturnGoods: _initReason === "2" ? [] : jstMergeIdenticalGoods((detail === null || detail === void 0 ? void 0 : detail.jstReturnGoods) || [])
|
|
272
|
+
// jstSystemOrderBillType:
|
|
273
|
+
// detail?.jstReturnSystemOrderBillType || "",
|
|
271
274
|
};
|
|
272
275
|
}
|
|
276
|
+
|
|
273
277
|
break;
|
|
274
278
|
case "JST_ITEM_SELECT_THIRD":
|
|
275
279
|
prv[uniqueKey] = updateJstItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.jstItemSelectThird, "itemList", config);
|
|
@@ -286,10 +290,11 @@ export var jstOrderBackFormValues = function jstOrderBackFormValues() {
|
|
|
286
290
|
}
|
|
287
291
|
return prv;
|
|
288
292
|
}, {});
|
|
293
|
+
return res;
|
|
289
294
|
};
|
|
290
295
|
//jst订单信息转换
|
|
291
296
|
export var jstOrderTransform = function jstOrderTransform(detail, form) {
|
|
292
|
-
var _form$getFieldValue, _jstReissueCom$compon,
|
|
297
|
+
var _form$getFieldValue, _jstReissueCom$compon, _newOrderList$, _newOrderList$2, _jstReissueCom$compon2, _jstReturnCom$compone, _newOrderList$3, _orderList$find, _orderList$find$call, _orderList$find2, _orderList$find2$call, _jstGoodsCom$componen;
|
|
293
298
|
var orderNo = detail.orderNo,
|
|
294
299
|
_detail$orderList = detail.orderList,
|
|
295
300
|
orderList = _detail$orderList === void 0 ? [] : _detail$orderList,
|
|
@@ -311,7 +316,8 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
|
|
|
311
316
|
});
|
|
312
317
|
var onlyOneSystemOrder = (newOrderList === null || newOrderList === void 0 ? void 0 : newOrderList.length) === 1;
|
|
313
318
|
var isReissueDefaultSelect = !!(jstReissueCom !== null && jstReissueCom !== void 0 && (_jstReissueCom$compon = jstReissueCom.componentConfig) !== null && _jstReissueCom$compon !== void 0 && _jstReissueCom$compon.showDefaultSelect);
|
|
314
|
-
|
|
319
|
+
// 退货商品不用选择系统订单号,所以当做固定选中默认值
|
|
320
|
+
var isReturnDefaultSelect = true;
|
|
315
321
|
var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
|
|
316
322
|
return {
|
|
317
323
|
jstSystemOrder: {
|
|
@@ -334,12 +340,19 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
|
|
|
334
340
|
return !isStrict || !orderNo || good.originalDealCode === orderNo;
|
|
335
341
|
}) : [],
|
|
336
342
|
jstReturnGoods: onlyOneSystemOrder || isReturnDefaultSelect ? updateJstGoodsHandle(defaultOrder, {
|
|
343
|
+
orderBackGoodsLevel: jstReturnCom === null || jstReturnCom === void 0 ? void 0 : (_jstReturnCom$compone = jstReturnCom.componentConfig) === null || _jstReturnCom$compone === void 0 ? void 0 : _jstReturnCom$compone.orderBackGoodsLevel,
|
|
337
344
|
canEdit: true
|
|
338
345
|
}).filter(function (good) {
|
|
339
346
|
return !isStrict || !orderNo || good.originalDealCode === orderNo;
|
|
340
347
|
}) : [],
|
|
341
348
|
jstSystemOrderBillType: onlyOneSystemOrder || isReissueDefaultSelect ? (_newOrderList$3 = newOrderList[0]) === null || _newOrderList$3 === void 0 ? void 0 : _newOrderList$3.orderType : "",
|
|
342
|
-
jstReturnSystemOrderBillType:
|
|
349
|
+
// jstReturnSystemOrderBillType:
|
|
350
|
+
// onlyOneSystemOrder || isReturnDefaultSelect
|
|
351
|
+
// ? newOrderList[0]?.orderType
|
|
352
|
+
// : "",
|
|
353
|
+
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) {
|
|
354
|
+
return item.shopId;
|
|
355
|
+
})) === null || _orderList$find$call === void 0 ? void 0 : _orderList$find$call.shopId) || null,
|
|
343
356
|
jstGoods: {
|
|
344
357
|
//标记通过请求获取的值
|
|
345
358
|
isRequest: true,
|
|
@@ -347,9 +360,9 @@ export var jstOrderTransform = function jstOrderTransform(detail, form) {
|
|
|
347
360
|
// 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
|
|
348
361
|
orders: orderList || [],
|
|
349
362
|
orderNo: orderNo,
|
|
350
|
-
shopCode: (orderList === null || orderList === void 0 ? void 0 : (_orderList$
|
|
351
|
-
return item.
|
|
352
|
-
})) === null || _orderList$
|
|
363
|
+
shopCode: (orderList === null || orderList === void 0 ? void 0 : (_orderList$find2 = orderList.find) === null || _orderList$find2 === void 0 ? void 0 : (_orderList$find2$call = _orderList$find2.call(orderList, function (item) {
|
|
364
|
+
return item.shopId;
|
|
365
|
+
})) === null || _orderList$find2$call === void 0 ? void 0 : _orderList$find2$call.shopId) || null,
|
|
353
366
|
jstGoods: updateJstGoodsHandle(orderList, {
|
|
354
367
|
orderBackGoodsLevel: jstGoodsCom === null || jstGoodsCom === void 0 ? void 0 : (_jstGoodsCom$componen = jstGoodsCom.componentConfig) === null || _jstGoodsCom$componen === void 0 ? void 0 : _jstGoodsCom$componen.orderBackGoodsLevel
|
|
355
368
|
}).filter(function (good) {
|
|
@@ -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", "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) {
|
|
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", "wlnInStockStatusItemList", "wlnInStockStatusList", "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", "wlnReissueType", "wlnReissueGoods"].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", "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) {
|
|
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", "wlnInStockStatusItemList", "wlnInStockStatusList", "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", "wlnReissueType", "wlnReissueGoods"].reduce(function (cur, nxt) {
|
|
3
3
|
return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
|
|
4
4
|
}, false);
|
|
5
5
|
});
|
|
@@ -3,15 +3,41 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
|
|
|
3
3
|
name: string;
|
|
4
4
|
selectId: string;
|
|
5
5
|
orderNo: string;
|
|
6
|
-
columns: {
|
|
6
|
+
columns: ({
|
|
7
7
|
title: string;
|
|
8
8
|
dataIndex: string;
|
|
9
9
|
width: number;
|
|
10
|
-
|
|
10
|
+
render?: undefined;
|
|
11
|
+
renderExport?: undefined;
|
|
12
|
+
} | {
|
|
13
|
+
title: string;
|
|
14
|
+
dataIndex: string;
|
|
15
|
+
width: number;
|
|
16
|
+
render: (val: boolean) => "否" | "是";
|
|
17
|
+
renderExport: (val: boolean) => "否" | "是";
|
|
18
|
+
} | {
|
|
19
|
+
title: string;
|
|
20
|
+
dataIndex: string;
|
|
21
|
+
width: number;
|
|
22
|
+
render: (val: string[]) => string;
|
|
23
|
+
renderExport: (val: string[]) => string;
|
|
24
|
+
} | {
|
|
25
|
+
title: string;
|
|
26
|
+
dataIndex: string;
|
|
27
|
+
width: number;
|
|
28
|
+
render: (val: any, record: any, _?: any, parent?: any, index?: number) => any;
|
|
29
|
+
renderExport: (val: any, record: any, _?: any, parent?: any, index?: number) => any;
|
|
30
|
+
})[];
|
|
11
31
|
};
|
|
12
|
-
export declare const
|
|
32
|
+
export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
|
|
33
|
+
export declare const updateWlnGoodsHandle: (orders?: any[], options?: {
|
|
34
|
+
canEdit?: boolean;
|
|
35
|
+
orderBackGoodsLevel?: string;
|
|
36
|
+
}) => any;
|
|
13
37
|
export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
14
|
-
export declare const wlnOrderTransform: (detail: any) => {
|
|
38
|
+
export declare const wlnOrderTransform: (detail: any, form: any) => {
|
|
39
|
+
wlnSystemOrderNo: any;
|
|
40
|
+
wlnReissueGoods: any;
|
|
15
41
|
wlnSystemOrder: {
|
|
16
42
|
orderNo: any;
|
|
17
43
|
orders: any;
|
|
@@ -19,9 +45,11 @@ export declare const wlnOrderTransform: (detail: any) => {
|
|
|
19
45
|
showOrderInfo: any;
|
|
20
46
|
};
|
|
21
47
|
wlnGoods: {
|
|
48
|
+
orderNo: any;
|
|
22
49
|
shopCode: any;
|
|
23
50
|
wlnGoods: any;
|
|
24
51
|
allOrders: any;
|
|
52
|
+
orders: any;
|
|
25
53
|
};
|
|
26
54
|
wlnLogistics: any;
|
|
27
55
|
wlnSendGood: any;
|
|
@@ -1,5 +1,4 @@
|
|
|
1
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
|
-
var _excluded = ["picPath", "itemId", "itemName", "skuId", "skuName", "isGift", "size", "payment", "price"];
|
|
3
2
|
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
4
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."); }
|
|
5
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); }
|
|
@@ -11,10 +10,44 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
|
|
|
11
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; }
|
|
12
11
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
13
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); }
|
|
14
|
-
|
|
15
|
-
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
13
|
+
import React from 'react';
|
|
16
14
|
import ExpressData from "../expressData";
|
|
17
15
|
import uuid from "./getUUid";
|
|
16
|
+
import isNull from "./isNull";
|
|
17
|
+
var renderBoolean = function renderBoolean(val) {
|
|
18
|
+
return typeof val === 'boolean' ? val ? "是" : "否" : val;
|
|
19
|
+
};
|
|
20
|
+
var getRenderOptions = function getRenderOptions(options) {
|
|
21
|
+
return function (val) {
|
|
22
|
+
var option = options.find(function (o) {
|
|
23
|
+
return o.value === val;
|
|
24
|
+
});
|
|
25
|
+
return option ? option.label : val;
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
var renderPackageInfos = function renderPackageInfos(val, record, key) {
|
|
29
|
+
var _record$packageInfos;
|
|
30
|
+
var isExport = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
|
|
31
|
+
var res = val;
|
|
32
|
+
if (((_record$packageInfos = record.packageInfos) === null || _record$packageInfos === void 0 ? void 0 : _record$packageInfos.length) > 1) {
|
|
33
|
+
if (isExport) {
|
|
34
|
+
res = record.packageInfos.map(function (packageInfo, index) {
|
|
35
|
+
return "\u5305\u88F9".concat(index + 1, ": ").concat(packageInfo[key], ";");
|
|
36
|
+
}).join('\n');
|
|
37
|
+
} else {
|
|
38
|
+
res = record.packageInfos.map(function (packageInfo, index) {
|
|
39
|
+
return /*#__PURE__*/React.createElement('div', {
|
|
40
|
+
key: index
|
|
41
|
+
}, "\u5305\u88F9".concat(index + 1, ": ").concat(packageInfo[key]));
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
// console.log(`**** renderPackageInfos ${key}, ${isExport ? '导出' : '不是导出'}`, {
|
|
46
|
+
// record,
|
|
47
|
+
// res,
|
|
48
|
+
// })
|
|
49
|
+
return res;
|
|
50
|
+
};
|
|
18
51
|
export var WLN_SYSTEM_ORDER_CONFIG = {
|
|
19
52
|
key: "wlnSystemShowOrder",
|
|
20
53
|
name: "万里牛",
|
|
@@ -32,45 +65,331 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
|
|
|
32
65
|
title: "标记",
|
|
33
66
|
dataIndex: "billTag",
|
|
34
67
|
width: 150
|
|
68
|
+
}, {
|
|
69
|
+
title: "是否拆分订单",
|
|
70
|
+
dataIndex: "splitTrade",
|
|
71
|
+
width: 150,
|
|
72
|
+
render: renderBoolean,
|
|
73
|
+
renderExport: renderBoolean
|
|
74
|
+
}, {
|
|
75
|
+
title: "是否售后订单",
|
|
76
|
+
dataIndex: "exchangeTrade",
|
|
77
|
+
width: 150,
|
|
78
|
+
render: renderBoolean,
|
|
79
|
+
renderExport: renderBoolean
|
|
80
|
+
}, {
|
|
81
|
+
title: "是否有退款",
|
|
82
|
+
dataIndex: "hasRefund",
|
|
83
|
+
width: 150,
|
|
84
|
+
render: function render(value) {
|
|
85
|
+
return renderBoolean(!!value);
|
|
86
|
+
},
|
|
87
|
+
renderExport: function renderExport(value) {
|
|
88
|
+
return renderBoolean(!!value);
|
|
89
|
+
}
|
|
90
|
+
},
|
|
91
|
+
// {
|
|
92
|
+
// title: "是否预售订单",
|
|
93
|
+
// dataIndex: "preSale",
|
|
94
|
+
// width: 150,
|
|
95
|
+
// render: renderBoolean,
|
|
96
|
+
// renderExport: renderBoolean,
|
|
97
|
+
// },
|
|
98
|
+
{
|
|
99
|
+
title: "合并前系统单号",
|
|
100
|
+
dataIndex: "mergeUids",
|
|
101
|
+
width: 150,
|
|
102
|
+
render: function render(val) {
|
|
103
|
+
return val !== null && val !== void 0 && val.length ? val.join(",") : "";
|
|
104
|
+
},
|
|
105
|
+
renderExport: function renderExport(val) {
|
|
106
|
+
return val !== null && val !== void 0 && val.length ? val.join(",") : "";
|
|
107
|
+
}
|
|
108
|
+
}, {
|
|
109
|
+
title: "快递公司名称",
|
|
110
|
+
dataIndex: "logisticName",
|
|
111
|
+
width: 150,
|
|
112
|
+
render: function render(val, record, _, parent, index) {
|
|
113
|
+
var _record$parent$formFi;
|
|
114
|
+
var item = (parent === null || parent === void 0 ? void 0 : parent.formField) && typeof index === 'number' && ((_record$parent$formFi = record[parent === null || parent === void 0 ? void 0 : parent.formField]) === null || _record$parent$formFi === void 0 ? void 0 : _record$parent$formFi[index]);
|
|
115
|
+
return renderPackageInfos(val, item || record, 'logisticName');
|
|
116
|
+
},
|
|
117
|
+
renderExport: function renderExport(val, record, _, parent, index) {
|
|
118
|
+
var _record$parent$formFi2;
|
|
119
|
+
var item = (parent === null || parent === void 0 ? void 0 : parent.formField) && typeof index === 'number' && ((_record$parent$formFi2 = record[parent === null || parent === void 0 ? void 0 : parent.formField]) === null || _record$parent$formFi2 === void 0 ? void 0 : _record$parent$formFi2[index]);
|
|
120
|
+
return renderPackageInfos(val, item || record, 'logisticName', true);
|
|
121
|
+
}
|
|
122
|
+
}, {
|
|
123
|
+
title: "快递公司编码",
|
|
124
|
+
dataIndex: "logisticCode",
|
|
125
|
+
width: 150,
|
|
126
|
+
render: function render(val, record, _, parent, index) {
|
|
127
|
+
var _record$parent$formFi3;
|
|
128
|
+
var item = (parent === null || parent === void 0 ? void 0 : parent.formField) && typeof index === 'number' && ((_record$parent$formFi3 = record[parent === null || parent === void 0 ? void 0 : parent.formField]) === null || _record$parent$formFi3 === void 0 ? void 0 : _record$parent$formFi3[index]);
|
|
129
|
+
return renderPackageInfos(val, item || record, 'logisticCode');
|
|
130
|
+
},
|
|
131
|
+
renderExport: function renderExport(val, record, _, parent, index) {
|
|
132
|
+
var _record$parent$formFi4;
|
|
133
|
+
var item = (parent === null || parent === void 0 ? void 0 : parent.formField) && typeof index === 'number' && ((_record$parent$formFi4 = record[parent === null || parent === void 0 ? void 0 : parent.formField]) === null || _record$parent$formFi4 === void 0 ? void 0 : _record$parent$formFi4[index]);
|
|
134
|
+
return renderPackageInfos(val, item || record, 'logisticCode', true);
|
|
135
|
+
}
|
|
136
|
+
}, {
|
|
137
|
+
title: "快递单号",
|
|
138
|
+
dataIndex: "expressCode",
|
|
139
|
+
width: 150,
|
|
140
|
+
render: function render(val, record, _, parent, index) {
|
|
141
|
+
var _record$parent$formFi5;
|
|
142
|
+
var item = (parent === null || parent === void 0 ? void 0 : parent.formField) && typeof index === 'number' && ((_record$parent$formFi5 = record[parent === null || parent === void 0 ? void 0 : parent.formField]) === null || _record$parent$formFi5 === void 0 ? void 0 : _record$parent$formFi5[index]);
|
|
143
|
+
return renderPackageInfos(val, item || record, 'expressCode');
|
|
144
|
+
},
|
|
145
|
+
renderExport: function renderExport(val, record, _, parent, index) {
|
|
146
|
+
var _record$parent$formFi6;
|
|
147
|
+
var item = (parent === null || parent === void 0 ? void 0 : parent.formField) && typeof index === 'number' && ((_record$parent$formFi6 = record[parent === null || parent === void 0 ? void 0 : parent.formField]) === null || _record$parent$formFi6 === void 0 ? void 0 : _record$parent$formFi6[index]);
|
|
148
|
+
return renderPackageInfos(val, item || record, 'expressCode', true);
|
|
149
|
+
}
|
|
150
|
+
}, {
|
|
151
|
+
title: "发货仓名称",
|
|
152
|
+
dataIndex: "storageName",
|
|
153
|
+
width: 150
|
|
154
|
+
}, {
|
|
155
|
+
title: "发货仓编码",
|
|
156
|
+
dataIndex: "storageCode",
|
|
157
|
+
width: 150
|
|
158
|
+
}, {
|
|
159
|
+
title: "单据处理状态",
|
|
160
|
+
dataIndex: "processStatus",
|
|
161
|
+
width: 150,
|
|
162
|
+
render: getRenderOptions([{
|
|
163
|
+
label: "分销商审核",
|
|
164
|
+
value: -3
|
|
165
|
+
}, {
|
|
166
|
+
label: "到账管理",
|
|
167
|
+
value: -2
|
|
168
|
+
}, {
|
|
169
|
+
label: "未付款",
|
|
170
|
+
value: -1
|
|
171
|
+
}, {
|
|
172
|
+
label: "审核",
|
|
173
|
+
value: 0
|
|
174
|
+
}, {
|
|
175
|
+
label: "打单配货",
|
|
176
|
+
value: 1
|
|
177
|
+
}, {
|
|
178
|
+
label: "验货",
|
|
179
|
+
value: 2
|
|
180
|
+
}, {
|
|
181
|
+
label: "称重",
|
|
182
|
+
value: 3
|
|
183
|
+
}, {
|
|
184
|
+
label: "待发货",
|
|
185
|
+
value: 4
|
|
186
|
+
}, {
|
|
187
|
+
label: "财审",
|
|
188
|
+
value: 5
|
|
189
|
+
}, {
|
|
190
|
+
label: "已发货",
|
|
191
|
+
value: 8
|
|
192
|
+
}, {
|
|
193
|
+
label: "成功",
|
|
194
|
+
value: 9
|
|
195
|
+
}, {
|
|
196
|
+
label: "关闭",
|
|
197
|
+
value: 10
|
|
198
|
+
}, {
|
|
199
|
+
label: "异常结束",
|
|
200
|
+
value: 11
|
|
201
|
+
}, {
|
|
202
|
+
label: "异常处理",
|
|
203
|
+
value: 12
|
|
204
|
+
}, {
|
|
205
|
+
label: "外部系统配货中",
|
|
206
|
+
value: 13
|
|
207
|
+
}, {
|
|
208
|
+
label: "预售",
|
|
209
|
+
value: 14
|
|
210
|
+
}, {
|
|
211
|
+
label: "打包",
|
|
212
|
+
value: 15
|
|
213
|
+
}, {
|
|
214
|
+
label: "拣货",
|
|
215
|
+
value: 19
|
|
216
|
+
}]),
|
|
217
|
+
renderExport: getRenderOptions([{
|
|
218
|
+
label: "分销商审核",
|
|
219
|
+
value: -3
|
|
220
|
+
}, {
|
|
221
|
+
label: "到账管理",
|
|
222
|
+
value: -2
|
|
223
|
+
}, {
|
|
224
|
+
label: "未付款",
|
|
225
|
+
value: -1
|
|
226
|
+
}, {
|
|
227
|
+
label: "审核",
|
|
228
|
+
value: 0
|
|
229
|
+
}, {
|
|
230
|
+
label: "打单配货",
|
|
231
|
+
value: 1
|
|
232
|
+
}, {
|
|
233
|
+
label: "验货",
|
|
234
|
+
value: 2
|
|
235
|
+
}, {
|
|
236
|
+
label: "称重",
|
|
237
|
+
value: 3
|
|
238
|
+
}, {
|
|
239
|
+
label: "待发货",
|
|
240
|
+
value: 4
|
|
241
|
+
}, {
|
|
242
|
+
label: "财审",
|
|
243
|
+
value: 5
|
|
244
|
+
}, {
|
|
245
|
+
label: "已发货",
|
|
246
|
+
value: 8
|
|
247
|
+
}, {
|
|
248
|
+
label: "成功",
|
|
249
|
+
value: 9
|
|
250
|
+
}, {
|
|
251
|
+
label: "关闭",
|
|
252
|
+
value: 10
|
|
253
|
+
}, {
|
|
254
|
+
label: "异常结束",
|
|
255
|
+
value: 11
|
|
256
|
+
}, {
|
|
257
|
+
label: "异常处理",
|
|
258
|
+
value: 12
|
|
259
|
+
}, {
|
|
260
|
+
label: "外部系统配货中",
|
|
261
|
+
value: 13
|
|
262
|
+
}, {
|
|
263
|
+
label: "预售",
|
|
264
|
+
value: 14
|
|
265
|
+
}, {
|
|
266
|
+
label: "打包",
|
|
267
|
+
value: 15
|
|
268
|
+
}, {
|
|
269
|
+
label: "拣货",
|
|
270
|
+
value: 19
|
|
271
|
+
}])
|
|
272
|
+
}, {
|
|
273
|
+
title: "线上单号",
|
|
274
|
+
dataIndex: "tpTid",
|
|
275
|
+
width: 150
|
|
35
276
|
}]
|
|
36
277
|
};
|
|
278
|
+
export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
|
|
279
|
+
var getSortedList = function getSortedList(str) {
|
|
280
|
+
try {
|
|
281
|
+
var parts = str.split(";");
|
|
282
|
+
var bigInts = parts.map(BigInt);
|
|
283
|
+
var sortedBigInts = bigInts.sort(function (a, b) {
|
|
284
|
+
if (a < b) return -1;
|
|
285
|
+
if (a > b) return 1;
|
|
286
|
+
return 0;
|
|
287
|
+
});
|
|
288
|
+
return sortedBigInts.map(String).join(";");
|
|
289
|
+
} catch (error) {
|
|
290
|
+
return "";
|
|
291
|
+
}
|
|
292
|
+
};
|
|
293
|
+
var platformCodesSortStr = getSortedList(platformCodes || "");
|
|
294
|
+
var orderNosSortStr = getSortedList(orderNos || "");
|
|
295
|
+
return platformCodesSortStr.includes(orderNosSortStr);
|
|
296
|
+
};
|
|
37
297
|
export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
|
|
38
298
|
var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
299
|
+
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
|
|
300
|
+
canEdit: false,
|
|
301
|
+
orderBackGoodsLevel: "1"
|
|
302
|
+
};
|
|
303
|
+
var wrapItem = function wrapItem(item, systemOrderNo) {
|
|
304
|
+
item.uuid = item.uuid || uuid();
|
|
305
|
+
item.systemOrderNo = systemOrderNo;
|
|
306
|
+
item.canDelete = true;
|
|
307
|
+
item.canEdit = !!options.canEdit;
|
|
308
|
+
var picPath = item.picPath,
|
|
309
|
+
itemId = item.itemId,
|
|
310
|
+
itemName = item.itemName,
|
|
311
|
+
skuId = item.skuId,
|
|
312
|
+
skuName = item.skuName,
|
|
313
|
+
isGift = item.isGift,
|
|
314
|
+
size = item.size,
|
|
315
|
+
payment = item.payment;
|
|
316
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
317
|
+
skuName: skuName,
|
|
318
|
+
pic: picPath,
|
|
319
|
+
name: itemName,
|
|
320
|
+
code: itemId,
|
|
321
|
+
sku: skuId,
|
|
322
|
+
money: payment || 0,
|
|
323
|
+
number: size,
|
|
324
|
+
type: isGift
|
|
325
|
+
});
|
|
326
|
+
};
|
|
39
327
|
var list = orders.reduce(function (prv, next) {
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
others = _objectWithoutProperties(item, _excluded);
|
|
53
|
-
return _objectSpread(_objectSpread({}, others), {}, {
|
|
54
|
-
skuName: skuName,
|
|
55
|
-
pic: picPath,
|
|
56
|
-
name: itemName,
|
|
57
|
-
code: itemId,
|
|
58
|
-
sku: skuId,
|
|
59
|
-
money: payment || 0,
|
|
60
|
-
number: size,
|
|
61
|
-
share: price,
|
|
62
|
-
type: isGift,
|
|
63
|
-
canDelete: true
|
|
328
|
+
if (options.orderBackGoodsLevel !== "2") {
|
|
329
|
+
var _next$items;
|
|
330
|
+
// 反填子商品
|
|
331
|
+
next === null || next === void 0 ? void 0 : (_next$items = next.items) === null || _next$items === void 0 ? void 0 : _next$items.forEach(function (item) {
|
|
332
|
+
if (item.isPackage) {
|
|
333
|
+
item.subItems.forEach(function (subItem) {
|
|
334
|
+
var newSubItem = wrapItem(subItem, next === null || next === void 0 ? void 0 : next.tradeNo);
|
|
335
|
+
prv.push(newSubItem);
|
|
336
|
+
});
|
|
337
|
+
} else {
|
|
338
|
+
prv.push(wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo));
|
|
339
|
+
}
|
|
64
340
|
});
|
|
65
|
-
}
|
|
66
|
-
|
|
341
|
+
} else {
|
|
342
|
+
var _next$items2;
|
|
343
|
+
// 反填组合商品
|
|
344
|
+
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) {
|
|
345
|
+
return wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo);
|
|
346
|
+
})) || [];
|
|
347
|
+
prv.push.apply(prv, _toConsumableArray(goods));
|
|
348
|
+
}
|
|
67
349
|
return prv;
|
|
68
350
|
}, []);
|
|
69
351
|
return list;
|
|
70
352
|
};
|
|
71
|
-
var updateWlnItemListHandle = function updateWlnItemListHandle(list, type) {
|
|
353
|
+
var updateWlnItemListHandle = function updateWlnItemListHandle(list, type, comList, form) {
|
|
72
354
|
var _newList;
|
|
73
|
-
|
|
355
|
+
if (type === "logistics") {
|
|
356
|
+
var _comList$find, _currentCom$component;
|
|
357
|
+
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) {
|
|
358
|
+
return item.workOrderComponentType === "WLN_LOGISTICS";
|
|
359
|
+
});
|
|
360
|
+
var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
|
|
361
|
+
if (notOrderBack) {
|
|
362
|
+
var _currentValue;
|
|
363
|
+
var currentValue = form.getFieldValue(currentCom.uniqueKey);
|
|
364
|
+
currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
|
|
365
|
+
logisticsCode: "",
|
|
366
|
+
logisticsCompany: ""
|
|
367
|
+
}];
|
|
368
|
+
return currentValue;
|
|
369
|
+
}
|
|
370
|
+
} else if (type === "send") {
|
|
371
|
+
var _comList$find2, _currentCom$component2;
|
|
372
|
+
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) {
|
|
373
|
+
return item.workOrderComponentType === "WLN_SEND_GOOD";
|
|
374
|
+
});
|
|
375
|
+
var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
|
|
376
|
+
if (_notOrderBack) {
|
|
377
|
+
var _currentValue3;
|
|
378
|
+
var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
|
|
379
|
+
_currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
|
|
380
|
+
sendId: "",
|
|
381
|
+
sendName: ""
|
|
382
|
+
}];
|
|
383
|
+
return _currentValue2;
|
|
384
|
+
}
|
|
385
|
+
}
|
|
386
|
+
var packageInfos = [];
|
|
387
|
+
(list || []).map(function (item) {
|
|
388
|
+
item.packageInfos.forEach(function (packageInfo) {
|
|
389
|
+
packageInfos.push(_objectSpread(_objectSpread({}, item), packageInfo));
|
|
390
|
+
});
|
|
391
|
+
});
|
|
392
|
+
var newList = packageInfos === null || packageInfos === void 0 ? void 0 : packageInfos.reduce(function (prv, next) {
|
|
74
393
|
var items = (next.items || []).map(function (t) {
|
|
75
394
|
return {
|
|
76
395
|
title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
|
|
@@ -147,6 +466,17 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
|
|
|
147
466
|
case "WLN_SYSTEM_ORDER":
|
|
148
467
|
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder;
|
|
149
468
|
break;
|
|
469
|
+
case "WLN_REISSUE_GOODS":
|
|
470
|
+
{
|
|
471
|
+
var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
|
|
472
|
+
prv[uniqueKey] = {
|
|
473
|
+
wlnSystemOrder: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder,
|
|
474
|
+
wlnReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.wlnReissueGoods,
|
|
475
|
+
wlnSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrderNo,
|
|
476
|
+
wlnReissueType: [initReason]
|
|
477
|
+
};
|
|
478
|
+
}
|
|
479
|
+
break;
|
|
150
480
|
case "WLN_GOODS":
|
|
151
481
|
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnGoods;
|
|
152
482
|
break;
|
|
@@ -161,9 +491,48 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
|
|
|
161
491
|
}, {});
|
|
162
492
|
};
|
|
163
493
|
//wln订单信息转换
|
|
164
|
-
export var wlnOrderTransform = function wlnOrderTransform(detail) {
|
|
165
|
-
var _detail$orders, _ref, _detail$orders2, _detail$orders2
|
|
494
|
+
export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
|
|
495
|
+
var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _currentTrades$, _wlnReissueCom$compon3, _detail$orders, _ref, _detail$orders2, _detail$orders2$, _wlnGoodsCom$componen2;
|
|
496
|
+
var _detail$allOrders = detail.allOrders,
|
|
497
|
+
allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
|
|
498
|
+
orderNo = detail.orderNo,
|
|
499
|
+
_detail$trades = detail.trades,
|
|
500
|
+
currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
|
|
501
|
+
componentList = detail.componentList;
|
|
502
|
+
var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
|
|
503
|
+
return !trade.cancel;
|
|
504
|
+
});
|
|
505
|
+
var wlnGoodsCom = (componentList || []).find(function (com) {
|
|
506
|
+
return com.workOrderComponentType === "WLN_GOODS";
|
|
507
|
+
});
|
|
508
|
+
var wlnReissueCom = (componentList || []).find(function (com) {
|
|
509
|
+
return com.workOrderComponentType === "WLN_REISSUE_GOODS";
|
|
510
|
+
});
|
|
511
|
+
var isStrict = wlnReissueCom ? (_form$getFieldValue = form.getFieldValue(wlnReissueCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
|
|
512
|
+
var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
|
|
513
|
+
var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
|
|
514
|
+
var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
|
|
515
|
+
var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
|
|
516
|
+
var newOrderList = filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.map(function (item) {
|
|
517
|
+
return _objectSpread({}, item);
|
|
518
|
+
});
|
|
519
|
+
var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
|
|
520
|
+
|
|
521
|
+
// console.log("**** ", {
|
|
522
|
+
// isStrict,
|
|
523
|
+
// onlyOneSystemOrder,
|
|
524
|
+
// isReissueDefaultSelect,
|
|
525
|
+
// wlnGoodsOrderBackGoodsLevel,
|
|
526
|
+
// wlnReissueGoodsOrderBackGoodsLevel,
|
|
527
|
+
// });
|
|
166
528
|
return {
|
|
529
|
+
wlnSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
|
|
530
|
+
wlnReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
|
|
531
|
+
orderBackGoodsLevel: wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon3 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon3 === void 0 ? void 0 : _wlnReissueCom$compon3.orderBackGoodsLevel,
|
|
532
|
+
canEdit: true
|
|
533
|
+
}).filter(function (good) {
|
|
534
|
+
return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
|
|
535
|
+
}) : [],
|
|
167
536
|
wlnSystemOrder: {
|
|
168
537
|
orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
|
|
169
538
|
orders: ((detail === null || detail === void 0 ? void 0 : detail.orders) || []).map(function (item) {
|
|
@@ -177,19 +546,23 @@ export var wlnOrderTransform = function wlnOrderTransform(detail) {
|
|
|
177
546
|
return item.tradeNo;
|
|
178
547
|
}) : [],
|
|
179
548
|
showOrderInfo: (_ref = (detail === null || detail === void 0 ? void 0 : detail.orders) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
|
|
180
|
-
return {
|
|
549
|
+
return _objectSpread(_objectSpread({}, item), {}, {
|
|
181
550
|
billNo: item.tradeNo,
|
|
182
551
|
billType: item.tradeType,
|
|
183
552
|
billTag: item.mark
|
|
184
|
-
};
|
|
553
|
+
});
|
|
185
554
|
})
|
|
186
555
|
},
|
|
187
556
|
wlnGoods: {
|
|
557
|
+
orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
|
|
188
558
|
shopCode: (detail === null || detail === void 0 ? void 0 : detail.shopCode) || (detail === null || detail === void 0 ? void 0 : (_detail$orders2 = detail.orders) === null || _detail$orders2 === void 0 ? void 0 : (_detail$orders2$ = _detail$orders2[0]) === null || _detail$orders2$ === void 0 ? void 0 : _detail$orders2$.shopNick),
|
|
189
|
-
wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders
|
|
190
|
-
|
|
559
|
+
wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders, {
|
|
560
|
+
orderBackGoodsLevel: wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen2 = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen2 === void 0 ? void 0 : _wlnGoodsCom$componen2.orderBackGoodsLevel
|
|
561
|
+
}),
|
|
562
|
+
allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders,
|
|
563
|
+
orders: detail === null || detail === void 0 ? void 0 : detail.orders
|
|
191
564
|
},
|
|
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")
|
|
565
|
+
wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
|
|
566
|
+
wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
|
|
194
567
|
};
|
|
195
568
|
};
|
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.7-beta.12",
|
|
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": "8d0c1e9dd97c19700b86a22e901524cf6393e9df",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|
|
@@ -1,285 +0,0 @@
|
|
|
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
|
-
};
|