@kmkf-fe-packages/kmkf-utils 2.7.3-beta.8 → 2.7.6

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 CHANGED
@@ -1 +1 @@
1
- 112311112311
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", "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"];
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
1
  export * from './logisticsData';
2
- export * from './warehouseData';
@@ -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, WLN } from "../servers/index";
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("发货仓数据---", _this.platform, list);
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
  }
@@ -0,0 +1,285 @@
1
+ "use strict";
2
+
3
+ var __assign = this && this.__assign || function () {
4
+ __assign = Object.assign || function (t) {
5
+ for (var s, i = 1, n = arguments.length; i < n; i++) {
6
+ s = arguments[i];
7
+ for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
8
+ }
9
+ return t;
10
+ };
11
+ return __assign.apply(this, arguments);
12
+ };
13
+ exports.__esModule = true;
14
+ exports.filterGyOrders = exports.gyOrderBackFormValues = exports.gyOrderTransform = exports.updateGyGoodsHandle = exports.GY_SYSTEM_ORDER_CONFIG = void 0;
15
+ var getUUid_1 = require("./getUUid");
16
+ var deliveryStateMap = {
17
+ 0: "未发货",
18
+ 2: "全部发货"
19
+ };
20
+ exports.GY_SYSTEM_ORDER_CONFIG = {
21
+ key: "gySystemShowOrder",
22
+ name: "管易",
23
+ selectId: "gySystemSelectIds",
24
+ columns: [{
25
+ dataIndex: "billType",
26
+ title: "订单类型",
27
+ width: 150
28
+ }, {
29
+ dataIndex: "billNo",
30
+ title: "系统订单号",
31
+ width: 160
32
+ }, {
33
+ dataIndex: "tradeTagName",
34
+ title: "订单标记名称",
35
+ width: 150
36
+ }, {
37
+ dataIndex: "billTag",
38
+ title: "订单标签",
39
+ width: 150
40
+ }, {
41
+ dataIndex: "deliveryState",
42
+ title: "发货状态",
43
+ width: 150
44
+ }]
45
+ };
46
+ exports.updateGyGoodsHandle = function (orders) {
47
+ if (orders === void 0) {
48
+ orders = [];
49
+ }
50
+ return orders === null || orders === void 0 ? void 0 : orders.reduce(function (acc, cur) {
51
+ if (Array.isArray(cur.details)) {
52
+ acc.push.apply(acc, cur.details.map(function (item) {
53
+ var _a;
54
+ item.goodName = item.itemName;
55
+ item.goodShortName = item.itemSimpleName;
56
+ item.goodNo = item.itemCode;
57
+ item.specNo = item.skuCode;
58
+ item.specName = item.skuName;
59
+ item.canDelete = true;
60
+ item.uuid = (_a = item.uuid) !== null && _a !== void 0 ? _a : getUUid_1["default"]();
61
+ return item;
62
+ }));
63
+ }
64
+ return acc;
65
+ }, []);
66
+ };
67
+ var updateGyItemListHandle = function updateGyItemListHandle(list, type, comList, form) {
68
+ var _a, _b;
69
+ if (type === "logistics") {
70
+ //管易物流信息组件先不做
71
+ // const currentCom = comList?.find?.(
72
+ // (item) => item.workOrderComponentType === "GY_LOGISTICS"
73
+ // );
74
+ // const notOrderBack = currentCom?.componentConfig?.notOrderBack || false;
75
+ // if (notOrderBack) {
76
+ // let currentValue = form.getFieldValue(currentCom.uniqueKey);
77
+ // currentValue = currentValue?.length
78
+ // ? currentValue
79
+ // : [{ logisticsCode: "", logisticsCompany: "" }];
80
+ // return currentValue;
81
+ // }
82
+ } else if (type === "send") {
83
+ var currentCom = (_a = comList === null || comList === void 0 ? void 0 : comList.find) === null || _a === void 0 ? void 0 : _a.call(comList, function (item) {
84
+ return item.workOrderComponentType === "GY_SEND_GOOD";
85
+ });
86
+ var notOrderBack = ((_b = currentCom === null || currentCom === void 0 ? void 0 : currentCom.componentConfig) === null || _b === void 0 ? void 0 : _b.notOrderBack) || false;
87
+ if (notOrderBack) {
88
+ var currentValue = form.getFieldValue(currentCom.uniqueKey);
89
+ currentValue = (currentValue === null || currentValue === void 0 ? void 0 : currentValue.length) ? currentValue : [{
90
+ sendId: "",
91
+ sendName: ""
92
+ }];
93
+ return currentValue;
94
+ }
95
+ }
96
+ var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
97
+ var items = ((next === null || next === void 0 ? void 0 : next.details) || []).map(function (t) {
98
+ return {
99
+ title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
100
+ picUrl: (t === null || t === void 0 ? void 0 : t.picPath) || "",
101
+ platform: "gy",
102
+ skuId: (t === null || t === void 0 ? void 0 : t.itemCode) || ""
103
+ };
104
+ });
105
+ var params = {
106
+ items: items
107
+ };
108
+ if (type === "logistics") {
109
+ // params.logisticsCompany = next?.shippingCode;
110
+ // params.logisticsCode = next?.shippingSn;
111
+ } else if (type === "send") {
112
+ params.sendId = next === null || next === void 0 ? void 0 : next.warehouseCode;
113
+ //下拉框,取id
114
+ params.sendName = next === null || next === void 0 ? void 0 : next.warehouseCode;
115
+ params.sendSnapshotName = next === null || next === void 0 ? void 0 : next.warehouseName;
116
+ }
117
+ prv.push(params);
118
+ return prv;
119
+ }, []);
120
+ if (!(newList === null || newList === void 0 ? void 0 : newList.length)) {
121
+ switch (type) {
122
+ case "logistics":
123
+ newList = [{
124
+ logisticsCode: ""
125
+ }];
126
+ break;
127
+ case "supply":
128
+ newList = [{
129
+ supplyId: ""
130
+ }];
131
+ break;
132
+ case "send":
133
+ newList = [{
134
+ sendId: "",
135
+ sendName: ""
136
+ }];
137
+ break;
138
+ }
139
+ }
140
+ return newList;
141
+ };
142
+ //管易订单信息转换
143
+ exports.gyOrderTransform = function (detail, form) {
144
+ var _a, _b, _c, _d, _e, _f;
145
+ var orderNo = detail.orderNo,
146
+ _g = detail.trades,
147
+ currentTrades = _g === void 0 ? [] : _g,
148
+ componentList = detail.componentList;
149
+ var gyGoodsCom = (componentList || []).find(function (com) {
150
+ return com.workOrderComponentType === "GY_GOODS";
151
+ });
152
+ var isStrict = gyGoodsCom ? (_a = form.getFieldValue(gyGoodsCom.uniqueKey)) === null || _a === void 0 ? void 0 : _a.isStrict : false;
153
+ var onlyOneSystemOrder = (currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.length) === 1;
154
+ console.log("触发---getGyOrderList--4");
155
+ return {
156
+ gySystemOrder: {
157
+ orderNo: orderNo,
158
+ isTest: 4,
159
+ orders: currentTrades.map(function (item) {
160
+ return __assign(__assign({}, item), {
161
+ billNo: item.code,
162
+ billType: item.orderTypeName,
163
+ billTag: item.tagName,
164
+ tradeTagName: item.tradeTagName,
165
+ deliveryState: deliveryStateMap[item.deliveryState]
166
+ });
167
+ }),
168
+ selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
169
+ return item.code;
170
+ }) : [],
171
+ showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
172
+ return __assign(__assign({}, item), {
173
+ billNo: item.code,
174
+ billType: item.orderTypeName,
175
+ billTag: item.tagName,
176
+ tradeTagName: item.tradeTagName,
177
+ deliveryState: deliveryStateMap[item.deliveryState]
178
+ });
179
+ })
180
+ },
181
+ gySystemOrderNo: onlyOneSystemOrder ? (_b = currentTrades[0]) === null || _b === void 0 ? void 0 : _b.code : undefined,
182
+ gyReissueGoods: onlyOneSystemOrder ? exports.updateGyGoodsHandle([currentTrades[0]]).filter(function (good) {
183
+ return !isStrict || !orderNo || good.platformCode === orderNo;
184
+ }) : [],
185
+ gyGoods: {
186
+ // 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
187
+ orders: currentTrades,
188
+ orderNo: orderNo,
189
+ shopCode: ((_d = (_c = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _c === void 0 ? void 0 : _c.call(currentTrades, function (item) {
190
+ return item.shopCode;
191
+ })) === null || _d === void 0 ? void 0 : _d.shopCode) || null,
192
+ vipCode: ((_f = (_e = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.find) === null || _e === void 0 ? void 0 : _e.call(currentTrades, function (item) {
193
+ return item.vipCode;
194
+ })) === null || _f === void 0 ? void 0 : _f.vipCode) || null,
195
+ gyGoods: exports.updateGyGoodsHandle(currentTrades).filter(function (good) {
196
+ return !isStrict || !orderNo || good.platformCode === orderNo;
197
+ })
198
+ },
199
+ // gyLogistics: updateGyItemListHandle(
200
+ // currentTrades,
201
+ // "logistics",
202
+ // componentList || [],
203
+ // form
204
+ // ),
205
+ gySendGood: updateGyItemListHandle(currentTrades, "send", componentList || [], form)
206
+ };
207
+ };
208
+ exports.gyOrderBackFormValues = function (detail, templateDetail) {
209
+ if (detail === void 0) {
210
+ detail = {};
211
+ }
212
+ if (templateDetail === void 0) {
213
+ templateDetail = {};
214
+ }
215
+ return ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
216
+ var _a, _b;
217
+ var uniqueKey = next.uniqueKey;
218
+ var config = next.componentConfig;
219
+ switch (next.workOrderComponentType) {
220
+ case "GY_SYSTEM_ORDER":
221
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gySystemOrder;
222
+ break;
223
+ case "GY_GOODS":
224
+ prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.gyGoods;
225
+ break;
226
+ case "GY_REISSUE_GOODS":
227
+ prv[uniqueKey] = {
228
+ gySystemOrder: detail === null || detail === void 0 ? void 0 : detail.gySystemOrder,
229
+ gyReissueGoods: detail === null || detail === void 0 ? void 0 : detail.gyReissueGoods,
230
+ gySystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.gySystemOrderNo,
231
+ gyReissueType: ["1"],
232
+ shopCode: (_a = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _a === void 0 ? void 0 : _a.shopCode,
233
+ vipCode: (_b = detail === null || detail === void 0 ? void 0 : detail.gyGoods) === null || _b === void 0 ? void 0 : _b.vipCode
234
+ };
235
+ break;
236
+ case "GY_LOGISTICS":
237
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gyLogistics, "logistics", config);
238
+ break;
239
+ case "GY_SEND_GOOD":
240
+ prv[uniqueKey] = updateGyItemListByConfigHandle(detail === null || detail === void 0 ? void 0 : detail.gySendGood, "send", config);
241
+ }
242
+ return prv;
243
+ }, {});
244
+ };
245
+ var updateGyItemListByConfigHandle = function updateGyItemListByConfigHandle(list, type, config) {
246
+ if (config === void 0) {
247
+ config = {};
248
+ }
249
+ var showField = config.showField,
250
+ _a = config.notOrderBack,
251
+ notOrderBack = _a === void 0 ? false : _a;
252
+ if (notOrderBack) {
253
+ return list;
254
+ }
255
+ return list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
256
+ if (type === "logistics") {
257
+ if (!["logisticsCompany", ""].includes(showField || "")) {
258
+ next.logisticsCompany = undefined;
259
+ }
260
+ if (!["logisticsCode", ""].includes(showField || "")) {
261
+ next.logisticsCode = undefined;
262
+ }
263
+ } else if (type === "send") {
264
+ if (!["sendId", "all"].includes(showField || "")) {
265
+ next.sendId = undefined;
266
+ }
267
+ if (!["sendName", "all"].includes(showField || "")) {
268
+ next.sendName = undefined;
269
+ next.sendSnapshotName = undefined;
270
+ }
271
+ }
272
+ prv.push(next);
273
+ return prv;
274
+ }, []);
275
+ };
276
+ // 管易根据订单号请求返回的platformCode会有多个订单号组合在一起的数据 排除其他的,返回当前订单号
277
+ exports.filterGyOrders = function (trades, order_no) {
278
+ var currentTrades = (trades || []).filter(function (item) {
279
+ return (item.platformCode || "").split(",").includes(order_no);
280
+ });
281
+ if (currentTrades.length) {
282
+ return currentTrades;
283
+ }
284
+ return [];
285
+ };
@@ -9,15 +9,9 @@ export declare const WLN_SYSTEM_ORDER_CONFIG: {
9
9
  width: number;
10
10
  }[];
11
11
  };
12
- export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
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, form: 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
- if (options.orderBackGoodsLevel !== "2") {
141
- var _next$items;
142
- // 反填子商品
143
- next === null || next === void 0 ? void 0 : (_next$items = next.items) === null || _next$items === void 0 ? void 0 : _next$items.forEach(function (item) {
144
- if (item.skuType === 'combine') {
145
- item.subItems.forEach(function (subItem) {
146
- var newSubItem = wrapItem(subItem, next === null || next === void 0 ? void 0 : next.tradeNo);
147
- // TODO: 调整下属性
148
- // newSubItem.batchId = item.batchId
149
- // newSubItem.isGift = item.isGift
150
- // newSubItem.qty = subItem.qty * item.qty
151
- prv.push(newSubItem);
152
- });
153
- } else {
154
- prv.push(wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo));
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
- } else {
158
- var _next$items2;
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, comList, form) {
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, form) {
305
- var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _wlnReissueCom$compon3, _detail$orders, _ref, _detail$orders2, _detail$orders2$;
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", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
376
- wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
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-beta.8",
3
+ "version": "2.7.6",
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": "540b1e9969b3f7dfd05773d0daccf36935c58b2c",
44
+ "gitHead": "28497f73db84e16b6e6ae0b280e8e4158a3f1731",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }
@@ -1,7 +0,0 @@
1
- declare type WarehouseType = {
2
- disabled: boolean;
3
- label: string;
4
- value: string;
5
- };
6
- export declare const getWarehouseDataAsync: () => Promise<WarehouseType[]>;
7
- export default getWarehouseDataAsync;
@@ -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;