@kmkf-fe-packages/kmkf-utils 2.7.3-beta.4 → 2.7.4
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 -2
- package/dist/esm/servers/WLN/index.d.ts +0 -1
- package/dist/esm/servers/WLN/index.js +1 -2
- package/dist/esm/utils/SendData.js +4 -5
- package/dist/esm/utils/orderBackFormValues.d.ts +2 -3
- package/dist/esm/utils/orderBackFormValues.js +2 -4
- package/dist/esm/utils/wdtOrderBackFormValues.js +2 -8
- package/dist/esm/utils/wlnOrderBackFormValues.d.ts +2 -8
- package/dist/esm/utils/wlnOrderBackFormValues.js +31 -214
- package/package.json +2 -2
- package/dist/esm/servers/WLN/warehouseData.d.ts +0 -7
- package/dist/esm/servers/WLN/warehouseData.js +0 -32
package/README.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
112311112
|
|
@@ -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", "
|
|
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"];
|
|
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,2 +1 @@
|
|
|
1
|
-
export * from "./logisticsData";
|
|
2
|
-
export * from "./warehouseData";
|
|
1
|
+
export * from "./logisticsData";
|
|
@@ -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
|
|
11
|
+
import { BSE3, WDT, KM, GY, JST, JY, JKY } from "../servers/index";
|
|
12
12
|
var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
|
|
13
13
|
var _this = this;
|
|
14
14
|
_classCallCheck(this, SendData);
|
|
@@ -22,7 +22,8 @@ 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
|
-
console.log("发货仓数据---",
|
|
25
|
+
// console.log("发货仓数据---", this.platform, list);
|
|
26
|
+
|
|
26
27
|
_this.sendData = list;
|
|
27
28
|
});
|
|
28
29
|
case 2:
|
|
@@ -71,8 +72,7 @@ var SendData = /*#__PURE__*/_createClass(function SendData(platform) {
|
|
|
71
72
|
gy: GY,
|
|
72
73
|
jst: JST,
|
|
73
74
|
jy: JY,
|
|
74
|
-
jky: JKY
|
|
75
|
-
wln: WLN
|
|
75
|
+
jky: JKY
|
|
76
76
|
}[this.platform];
|
|
77
77
|
});
|
|
78
78
|
export var SendDataCenter = /*#__PURE__*/function () {
|
|
@@ -90,7 +90,6 @@ 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";
|
|
94
93
|
if (!this.instanceMap.has(platform)) {
|
|
95
94
|
this.instanceMap.set(platform, new SendData(platform));
|
|
96
95
|
}
|
|
@@ -17,10 +17,9 @@ interface OrderBackFormValuesI {
|
|
|
17
17
|
formValue?: Record<string, unknown>;
|
|
18
18
|
order_no?: string | null;
|
|
19
19
|
detail: Record<string, unknown>;
|
|
20
|
-
fromQNCreateWorkOrderByOrderNo
|
|
21
|
-
skipOrderBackUniqueKeys?: string[];
|
|
20
|
+
fromQNCreateWorkOrderByOrderNo: boolean;
|
|
22
21
|
_get_order_fail_?: boolean;
|
|
23
22
|
shopId?: string;
|
|
24
23
|
}
|
|
25
|
-
declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo,
|
|
24
|
+
declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, }: OrderBackFormValuesI) => any;
|
|
26
25
|
export default _default;
|
|
@@ -86,9 +86,7 @@ export default (function (_ref) {
|
|
|
86
86
|
_ref$type = _ref.type,
|
|
87
87
|
type = _ref$type === void 0 ? "add" : _ref$type,
|
|
88
88
|
_ref$fromQNCreateWork = _ref.fromQNCreateWorkOrderByOrderNo,
|
|
89
|
-
fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork
|
|
90
|
-
_ref$skipOrderBackUni = _ref.skipOrderBackUniqueKeys,
|
|
91
|
-
skipOrderBackUniqueKeys = _ref$skipOrderBackUni === void 0 ? [] : _ref$skipOrderBackUni;
|
|
89
|
+
fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork;
|
|
92
90
|
var orderValues = !_get_order_fail_ ? ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
|
|
93
91
|
var _next$componentConfig, _ref2, _detail$expressLogist, _detail$returnLogisti, _next$componentConfig2, _next$componentConfig3, _next$componentConfig4;
|
|
94
92
|
var uniqueKey = next.uniqueKey;
|
|
@@ -96,7 +94,7 @@ export default (function (_ref) {
|
|
|
96
94
|
var city = null,
|
|
97
95
|
town = null;
|
|
98
96
|
// console.log("--订单返填数据重组", next.workOrderComponentType);
|
|
99
|
-
|
|
97
|
+
|
|
100
98
|
switch (next.workOrderComponentType) {
|
|
101
99
|
case "TRADE_ID_INPUT":
|
|
102
100
|
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"];
|
|
@@ -521,8 +521,7 @@ 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
|
|
525
|
-
matchLogisticsNo = detail.matchLogisticsNo;
|
|
524
|
+
wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde;
|
|
526
525
|
var wdtGoodsCom = (componentList || []).find(function (com) {
|
|
527
526
|
return com.workOrderComponentType === "WDT_GOODS";
|
|
528
527
|
});
|
|
@@ -533,11 +532,6 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
|
|
|
533
532
|
var isStrict = wdtGoodsCom ? (_form$getFieldValue = form.getFieldValue(wdtGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
|
|
534
533
|
var onlyOneSystemOrder = (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1;
|
|
535
534
|
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
|
-
}) : [];
|
|
541
535
|
return {
|
|
542
536
|
wdtSystemOrder: {
|
|
543
537
|
//标记通过请求获取的值
|
|
@@ -552,7 +546,7 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
|
|
|
552
546
|
logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
|
|
553
547
|
});
|
|
554
548
|
}),
|
|
555
|
-
selectIds:
|
|
549
|
+
selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
|
|
556
550
|
return item.tradeNo;
|
|
557
551
|
}) : [],
|
|
558
552
|
showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
|
|
@@ -9,15 +9,9 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
|
|
|
9
9
|
width: number;
|
|
10
10
|
}[];
|
|
11
11
|
};
|
|
12
|
-
export declare const
|
|
13
|
-
export declare const updateWlnGoodsHandle: (orders?: any[], options?: {
|
|
14
|
-
canEdit?: boolean;
|
|
15
|
-
orderBackGoodsLevel?: string;
|
|
16
|
-
}) => any;
|
|
12
|
+
export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
|
|
17
13
|
export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
|
|
18
|
-
export declare const wlnOrderTransform: (detail: any
|
|
19
|
-
jstReissueGoods: any;
|
|
20
|
-
wlnReissueGoods: any;
|
|
14
|
+
export declare const wlnOrderTransform: (detail: any) => {
|
|
21
15
|
wlnSystemOrder: {
|
|
22
16
|
orderNo: any;
|
|
23
17
|
orders: any;
|
|
@@ -15,7 +15,6 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
|
|
|
15
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; }
|
|
16
16
|
import ExpressData from "../expressData";
|
|
17
17
|
import uuid from "./getUUid";
|
|
18
|
-
import isNull from "./isNull";
|
|
19
18
|
export var WLN_SYSTEM_ORDER_CONFIG = {
|
|
20
19
|
key: "wlnSystemShowOrder",
|
|
21
20
|
name: "万里牛",
|
|
@@ -33,172 +32,44 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
|
|
|
33
32
|
title: "标记",
|
|
34
33
|
dataIndex: "billTag",
|
|
35
34
|
width: 150
|
|
36
|
-
}, {
|
|
37
|
-
title: "是否拆分订单",
|
|
38
|
-
dataIndex: "splitTrade",
|
|
39
|
-
width: 150
|
|
40
|
-
}, {
|
|
41
|
-
title: "是否售后订单",
|
|
42
|
-
dataIndex: "exchangeTrade",
|
|
43
|
-
width: 150
|
|
44
|
-
}, {
|
|
45
|
-
title: "是否有退款",
|
|
46
|
-
dataIndex: "hasRefund",
|
|
47
|
-
width: 150
|
|
48
|
-
}, {
|
|
49
|
-
title: "是否预售订单",
|
|
50
|
-
dataIndex: "preSale",
|
|
51
|
-
width: 150
|
|
52
|
-
}, {
|
|
53
|
-
title: "合并前系统单号",
|
|
54
|
-
dataIndex: "mergeUids",
|
|
55
|
-
width: 150
|
|
56
|
-
}, {
|
|
57
|
-
title: "快递公司名称",
|
|
58
|
-
dataIndex: "logisticName",
|
|
59
|
-
width: 150
|
|
60
|
-
}, {
|
|
61
|
-
title: "快递公司编码",
|
|
62
|
-
dataIndex: "logisticCode",
|
|
63
|
-
width: 150
|
|
64
|
-
}, {
|
|
65
|
-
title: "快递单号",
|
|
66
|
-
dataIndex: "expressCode",
|
|
67
|
-
width: 150
|
|
68
|
-
}, {
|
|
69
|
-
title: "发货仓名称",
|
|
70
|
-
dataIndex: "storageName",
|
|
71
|
-
width: 150
|
|
72
|
-
}, {
|
|
73
|
-
title: "发货仓编码",
|
|
74
|
-
dataIndex: "storageCode",
|
|
75
|
-
width: 150
|
|
76
|
-
}, {
|
|
77
|
-
title: "单据处理状态",
|
|
78
|
-
dataIndex: "processStatus",
|
|
79
|
-
width: 150
|
|
80
|
-
}, {
|
|
81
|
-
title: "线上单号",
|
|
82
|
-
dataIndex: "tpTid",
|
|
83
|
-
width: 150
|
|
84
35
|
}]
|
|
85
36
|
};
|
|
86
|
-
export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
|
|
87
|
-
var getSortedList = function getSortedList(str) {
|
|
88
|
-
try {
|
|
89
|
-
var parts = str.split(";");
|
|
90
|
-
var bigInts = parts.map(BigInt);
|
|
91
|
-
var sortedBigInts = bigInts.sort(function (a, b) {
|
|
92
|
-
if (a < b) return -1;
|
|
93
|
-
if (a > b) return 1;
|
|
94
|
-
return 0;
|
|
95
|
-
});
|
|
96
|
-
return sortedBigInts.map(String).join(";");
|
|
97
|
-
} catch (error) {
|
|
98
|
-
return "";
|
|
99
|
-
}
|
|
100
|
-
};
|
|
101
|
-
var platformCodesSortStr = getSortedList(platformCodes || "");
|
|
102
|
-
var orderNosSortStr = getSortedList(orderNos || "");
|
|
103
|
-
return platformCodesSortStr.includes(orderNosSortStr);
|
|
104
|
-
};
|
|
105
37
|
export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
|
|
106
38
|
var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
|
|
107
|
-
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
|
|
108
|
-
canEdit: false,
|
|
109
|
-
orderBackGoodsLevel: "1"
|
|
110
|
-
};
|
|
111
|
-
console.log('*** updateWlnGoodsHandle');
|
|
112
|
-
var wrapItem = function wrapItem(item, systemOrderNo) {
|
|
113
|
-
item.uuid = item.uuid || uuid();
|
|
114
|
-
item.systemOrderNo = systemOrderNo;
|
|
115
|
-
item.canDelete = true;
|
|
116
|
-
item.canEdit = !!options.canEdit;
|
|
117
|
-
var picPath = item.picPath,
|
|
118
|
-
itemId = item.itemId,
|
|
119
|
-
itemName = item.itemName,
|
|
120
|
-
skuId = item.skuId,
|
|
121
|
-
skuName = item.skuName,
|
|
122
|
-
isGift = item.isGift,
|
|
123
|
-
size = item.size,
|
|
124
|
-
payment = item.payment,
|
|
125
|
-
price = item.price,
|
|
126
|
-
others = _objectWithoutProperties(item, _excluded);
|
|
127
|
-
return _objectSpread(_objectSpread({}, others), {}, {
|
|
128
|
-
skuName: skuName,
|
|
129
|
-
pic: picPath,
|
|
130
|
-
name: itemName,
|
|
131
|
-
code: itemId,
|
|
132
|
-
sku: skuId,
|
|
133
|
-
money: payment || 0,
|
|
134
|
-
number: size,
|
|
135
|
-
share: price,
|
|
136
|
-
type: isGift
|
|
137
|
-
});
|
|
138
|
-
};
|
|
139
39
|
var list = orders.reduce(function (prv, next) {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
40
|
+
var goods = next.items.map(function (item) {
|
|
41
|
+
item.uuid = item.uuid || uuid();
|
|
42
|
+
item.systemOrderNo = next === null || next === void 0 ? void 0 : next.tradeNo;
|
|
43
|
+
var picPath = item.picPath,
|
|
44
|
+
itemId = item.itemId,
|
|
45
|
+
itemName = item.itemName,
|
|
46
|
+
skuId = item.skuId,
|
|
47
|
+
skuName = item.skuName,
|
|
48
|
+
isGift = item.isGift,
|
|
49
|
+
size = item.size,
|
|
50
|
+
payment = item.payment,
|
|
51
|
+
price = item.price,
|
|
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
|
|
156
64
|
});
|
|
157
|
-
}
|
|
158
|
-
|
|
159
|
-
// 反填组合商品
|
|
160
|
-
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) {
|
|
161
|
-
return wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo);
|
|
162
|
-
})) || [];
|
|
163
|
-
prv.push.apply(prv, _toConsumableArray(goods));
|
|
164
|
-
}
|
|
65
|
+
});
|
|
66
|
+
prv.push.apply(prv, _toConsumableArray(goods));
|
|
165
67
|
return prv;
|
|
166
68
|
}, []);
|
|
167
69
|
return list;
|
|
168
70
|
};
|
|
169
|
-
var updateWlnItemListHandle = function updateWlnItemListHandle(list, type
|
|
71
|
+
var updateWlnItemListHandle = function updateWlnItemListHandle(list, type) {
|
|
170
72
|
var _newList;
|
|
171
|
-
if (type === "logistics") {
|
|
172
|
-
var _comList$find, _currentCom$component;
|
|
173
|
-
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) {
|
|
174
|
-
return item.workOrderComponentType === "WLN_LOGISTICS";
|
|
175
|
-
});
|
|
176
|
-
var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
|
|
177
|
-
if (notOrderBack) {
|
|
178
|
-
var _currentValue;
|
|
179
|
-
var currentValue = form.getFieldValue(currentCom.uniqueKey);
|
|
180
|
-
currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
|
|
181
|
-
logisticsCode: "",
|
|
182
|
-
logisticsCompany: ""
|
|
183
|
-
}];
|
|
184
|
-
return currentValue;
|
|
185
|
-
}
|
|
186
|
-
} else if (type === "send") {
|
|
187
|
-
var _comList$find2, _currentCom$component2;
|
|
188
|
-
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) {
|
|
189
|
-
return item.workOrderComponentType === "WLN_SEND_GOOD";
|
|
190
|
-
});
|
|
191
|
-
var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
|
|
192
|
-
if (_notOrderBack) {
|
|
193
|
-
var _currentValue3;
|
|
194
|
-
var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
|
|
195
|
-
_currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
|
|
196
|
-
sendId: "",
|
|
197
|
-
sendName: ""
|
|
198
|
-
}];
|
|
199
|
-
return _currentValue2;
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
73
|
var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
|
|
203
74
|
var items = (next.items || []).map(function (t) {
|
|
204
75
|
return {
|
|
@@ -276,17 +147,6 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
|
|
|
276
147
|
case "WLN_SYSTEM_ORDER":
|
|
277
148
|
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder;
|
|
278
149
|
break;
|
|
279
|
-
case "WLN_REISSUE_GOODS":
|
|
280
|
-
{
|
|
281
|
-
var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
|
|
282
|
-
prv[uniqueKey] = {
|
|
283
|
-
wlnSystemOrder: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder,
|
|
284
|
-
wlnReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.wlnReissueGoods,
|
|
285
|
-
wlnSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrderNo,
|
|
286
|
-
wlnReissueType: [initReason]
|
|
287
|
-
};
|
|
288
|
-
}
|
|
289
|
-
break;
|
|
290
150
|
case "WLN_GOODS":
|
|
291
151
|
prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnGoods;
|
|
292
152
|
break;
|
|
@@ -301,52 +161,9 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
|
|
|
301
161
|
}, {});
|
|
302
162
|
};
|
|
303
163
|
//wln订单信息转换
|
|
304
|
-
export var wlnOrderTransform = function wlnOrderTransform(detail
|
|
305
|
-
var
|
|
306
|
-
console.log("\uD83D\uDE80 ~ wlnOrderBackFormValues.ts:265 ~ wlnOrderTransform ~ detail:", detail);
|
|
307
|
-
var _detail$allOrders = detail.allOrders,
|
|
308
|
-
allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
|
|
309
|
-
orderNo = detail.orderNo,
|
|
310
|
-
_detail$trades = detail.trades,
|
|
311
|
-
currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
|
|
312
|
-
componentList = detail.componentList;
|
|
313
|
-
var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
|
|
314
|
-
return !trade.cancel;
|
|
315
|
-
});
|
|
316
|
-
var wlnGoodsCom = (componentList || []).find(function (com) {
|
|
317
|
-
return com.workOrderComponentType === "WLN_GOODS";
|
|
318
|
-
});
|
|
319
|
-
var wlnReissueCom = (componentList || []).find(function (com) {
|
|
320
|
-
return com.workOrderComponentType === "WLN_REISSUE_GOODS";
|
|
321
|
-
});
|
|
322
|
-
var isStrict = wlnGoodsCom ? (_form$getFieldValue = form.getFieldValue(wlnGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
|
|
323
|
-
var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
|
|
324
|
-
var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
|
|
325
|
-
var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
|
|
326
|
-
var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
|
|
327
|
-
var newOrderList = filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.map(function (item) {
|
|
328
|
-
return _objectSpread({}, item);
|
|
329
|
-
});
|
|
330
|
-
var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
|
|
331
|
-
console.log("**** ", {
|
|
332
|
-
isStrict: isStrict,
|
|
333
|
-
onlyOneSystemOrder: onlyOneSystemOrder,
|
|
334
|
-
isReissueDefaultSelect: isReissueDefaultSelect,
|
|
335
|
-
wlnGoodsOrderBackGoodsLevel: wlnGoodsOrderBackGoodsLevel,
|
|
336
|
-
wlnReissueGoodsOrderBackGoodsLevel: wlnReissueGoodsOrderBackGoodsLevel
|
|
337
|
-
});
|
|
164
|
+
export var wlnOrderTransform = function wlnOrderTransform(detail) {
|
|
165
|
+
var _detail$orders, _ref, _detail$orders2, _detail$orders2$;
|
|
338
166
|
return {
|
|
339
|
-
jstReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
|
|
340
|
-
orderBackGoodsLevel: wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon3 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon3 === void 0 ? void 0 : _wlnReissueCom$compon3.orderBackGoodsLevel,
|
|
341
|
-
canEdit: true
|
|
342
|
-
}).filter(function (good) {
|
|
343
|
-
return !isStrict || !orderNo || good.originalDealCode === orderNo;
|
|
344
|
-
}) : [],
|
|
345
|
-
wlnReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
|
|
346
|
-
canEdit: true
|
|
347
|
-
}).filter(function (good) {
|
|
348
|
-
return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
|
|
349
|
-
}) : [],
|
|
350
167
|
wlnSystemOrder: {
|
|
351
168
|
orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
|
|
352
169
|
orders: ((detail === null || detail === void 0 ? void 0 : detail.orders) || []).map(function (item) {
|
|
@@ -372,7 +189,7 @@ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
|
|
|
372
189
|
wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders),
|
|
373
190
|
allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders
|
|
374
191
|
},
|
|
375
|
-
wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics"
|
|
376
|
-
wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send"
|
|
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")
|
|
377
194
|
};
|
|
378
195
|
};
|
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.4",
|
|
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": "950e70d696e58b3340e24e8c4a44b53029036922",
|
|
45
45
|
"gitHooks": {
|
|
46
46
|
"pre-commit": "lint-staged"
|
|
47
47
|
}
|
|
@@ -1,32 +0,0 @@
|
|
|
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;
|