@kmkf-fe-packages/kmkf-utils 2.0.69 → 2.0.70

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.
Files changed (4) hide show
  1. package/dist/esm/utils/kmOrderBackFormValues.d.ts +7 -0
  2. package/dist/esm/utils/kmOrderBackFormValues.js +67 -5
  3. package/dist/esm/utils/unTransField.js +1 -1
  4. package/package.json +2 -2
package/dist/esm/utils/kmOrderBackFormValues.d.ts CHANGED
@@ -43,6 +43,7 @@ declare const KM_ORDER_TYPE_MAP: {
43
43
  };
44
44
  export declare const updateKmGoodsHandle: (orders?: any[], config?: {
45
45
  orderBackGoodsLevel?: string;
46
+ canEdit?: boolean;
46
47
  }) => any[];
47
48
  export declare const getKmOrderTypeValue: (key: keyof typeof KM_ORDER_TYPE_MAP) => string;
48
49
  declare const KM_ORDER_STATUS: {
@@ -70,20 +71,24 @@ export declare const KM_SYSTEM_ORDER_CONFIG: {
70
71
  title: string;
71
72
  width: number;
72
73
  render?: undefined;
74
+ renderExport?: undefined;
73
75
  } | {
74
76
  dataIndex: string;
75
77
  title: string;
76
78
  width: number;
77
79
  render: (val: keyof typeof KM_ORDER_STATUS) => string;
80
+ renderExport: (val: keyof typeof KM_ORDER_STATUS) => string;
78
81
  } | {
79
82
  dataIndex: string;
80
83
  title: string;
81
84
  width: number;
82
85
  render: (val: string[]) => string;
86
+ renderExport: (val: string[]) => string;
83
87
  })[];
84
88
  };
85
89
  export declare const filterKmOrders: (detail: any, order_no: string) => any;
86
90
  export declare const kmOrderTransform: (detail: any, form: any) => {
91
+ kmSystemOrderNo: any;
87
92
  kmSystemOrder: {
88
93
  orderNo: any;
89
94
  orders: any;
@@ -98,5 +103,7 @@ export declare const kmOrderTransform: (detail: any, form: any) => {
98
103
  shopCode: any;
99
104
  kmGoods: any[];
100
105
  };
106
+ kmReissueGoods: any[];
107
+ kmReturnGoods: any[];
101
108
  };
102
109
  export {};
package/dist/esm/utils/kmOrderBackFormValues.js CHANGED
@@ -11,6 +11,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
11
11
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
12
12
  function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
13
13
  import uuid from "./getUUid";
14
+ import isNull from "./isNull";
14
15
  export var kmOrderBackFormValues = function kmOrderBackFormValues() {
15
16
  var detail = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
16
17
  var templateDetail = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -30,6 +31,32 @@ export var kmOrderBackFormValues = function kmOrderBackFormValues() {
30
31
  case "KM_GOODS":
31
32
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.kmGoods;
32
33
  break;
34
+ case "KM_REISSUE_GOODS":
35
+ {
36
+ var _detail$kmGoods;
37
+ var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
38
+ prv[uniqueKey] = {
39
+ kmSystemOrder: detail === null || detail === void 0 ? void 0 : detail.kmSystemOrder,
40
+ kmReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.kmReissueGoods,
41
+ kmSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.kmSystemOrderNo,
42
+ kmReissueType: [initReason],
43
+ shopCode: detail === null || detail === void 0 ? void 0 : (_detail$kmGoods = detail.kmGoods) === null || _detail$kmGoods === void 0 ? void 0 : _detail$kmGoods.shopCode
44
+ };
45
+ }
46
+ break;
47
+ case "KM_RETURN_GOODS":
48
+ {
49
+ var _detail$kmGoods2;
50
+ var _initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
51
+ prv[uniqueKey] = {
52
+ kmSystemOrder: detail === null || detail === void 0 ? void 0 : detail.kmSystemOrder,
53
+ kmReturnGoods: _initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.kmReturnGoods,
54
+ kmSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.kmSystemOrderNo,
55
+ kmReturnType: [_initReason],
56
+ shopCode: detail === null || detail === void 0 ? void 0 : (_detail$kmGoods2 = detail.kmGoods) === null || _detail$kmGoods2 === void 0 ? void 0 : _detail$kmGoods2.shopCode
57
+ };
58
+ }
59
+ break;
33
60
  }
34
61
  return prv;
35
62
  }, {});
@@ -85,12 +112,15 @@ export var updateKmGoodsHandle = function updateKmGoodsHandle() {
85
112
  return _objectSpread(_objectSpread({}, item), {}, {
86
113
  sysTitle: item.title,
87
114
  title: item.platformTitle,
88
- num: item.itemNum,
115
+ num: item.itemNum || item.num,
116
+ realNum: item.itemNum || item.num,
117
+ desiredNum: item.itemNum || item.num,
89
118
  type: item.erpOrderType,
90
119
  itemSysId: item.sysItemId,
91
120
  skuSysId: item.sysSkuId,
92
121
  sysPicPath: item.picUrl,
93
122
  canDelete: true,
123
+ canEdit: !!config.canEdit,
94
124
  uuid: (_item$uuid = item.uuid) !== null && _item$uuid !== void 0 ? _item$uuid : uuid()
95
125
  });
96
126
  });
@@ -138,6 +168,10 @@ export var KM_SYSTEM_ORDER_CONFIG = {
138
168
  render: function render(val) {
139
169
  var types = typeof val === "string" ? val.split(",") : Array.isArray(val) ? val : [val];
140
170
  return types.map(getKmOrderTypeValue).join(",");
171
+ },
172
+ renderExport: function renderExport(val) {
173
+ var types = typeof val === "string" ? val.split(",") : Array.isArray(val) ? val : [val];
174
+ return types.map(getKmOrderTypeValue).join(",");
141
175
  }
142
176
  }, {
143
177
  dataIndex: "billNo",
@@ -149,6 +183,9 @@ export var KM_SYSTEM_ORDER_CONFIG = {
149
183
  width: 150,
150
184
  render: function render(val) {
151
185
  return KM_ORDER_STATUS[val] || val;
186
+ },
187
+ renderExport: function renderExport(val) {
188
+ return KM_ORDER_STATUS[val] || val;
152
189
  }
153
190
  }, {
154
191
  dataIndex: "billTag",
@@ -156,6 +193,9 @@ export var KM_SYSTEM_ORDER_CONFIG = {
156
193
  width: 150,
157
194
  render: function render(val) {
158
195
  return Array.isArray(val) ? val.join(",") : val;
196
+ },
197
+ renderExport: function renderExport(val) {
198
+ return Array.isArray(val) ? val.join(",") : val;
159
199
  }
160
200
  }]
161
201
  };
@@ -205,7 +245,7 @@ var updateKmItemListHandle = function updateKmItemListHandle(list, type, comList
205
245
  items: items
206
246
  };
207
247
  if (type === "logistics") {
208
- params.logisticsCompany = next === null || next === void 0 ? void 0 : next.expressCompanyId;
248
+ params.logisticsCompany = next === null || next === void 0 ? void 0 : next.logisticsCompanyId;
209
249
  params.logisticsCode = next === null || next === void 0 ? void 0 : next.outSid;
210
250
  } else if (type === "send") {
211
251
  params.sendId = next.warehouseId;
@@ -271,11 +311,15 @@ export var filterKmOrders = function filterKmOrders(detail, order_no) {
271
311
 
272
312
  //km订单信息转换
273
313
  export var kmOrderTransform = function kmOrderTransform(detail, form) {
274
- var _componentList$find, _componentList$find$c, _trades$find, _trades$find$call;
314
+ var _form$getFieldValue, _componentList$find, _componentList$find$c, _componentList$find2, _componentList$find2$, _componentList$find3, _componentList$find3$, _trades$, _trades$find, _trades$find$call;
275
315
  var trades = (detail === null || detail === void 0 ? void 0 : detail.orderDetailDtoList) || (detail === null || detail === void 0 ? void 0 : detail.trades) || [];
276
316
  var _ref = detail || {},
277
317
  orderNo = _ref.orderNo,
278
318
  componentList = _ref.componentList;
319
+ var kmGoodsCom = (componentList || []).find(function (com) {
320
+ return com.workOrderComponentType === "KM_GOODS";
321
+ });
322
+ var isStrict = kmGoodsCom ? (_form$getFieldValue = form.getFieldValue(kmGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
279
323
  var onlyOneSystemOrder = (trades === null || trades === void 0 ? void 0 : trades.length) === 1;
280
324
  console.log("kmOrderTransform---", {
281
325
  detail: detail,
@@ -284,7 +328,14 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
284
328
  var kmGoodsOrderBackGoodsLevel = (_componentList$find = componentList.find(function (item) {
285
329
  return item.workOrderComponentType === "KM_GOODS";
286
330
  })) === null || _componentList$find === void 0 ? void 0 : (_componentList$find$c = _componentList$find.componentConfig) === null || _componentList$find$c === void 0 ? void 0 : _componentList$find$c.orderBackGoodsLevel;
331
+ var kmReissueGoodsOrderBackGoodsLevel = (_componentList$find2 = componentList.find(function (item) {
332
+ return item.workOrderComponentType === "KM_REISSUE_GOODS";
333
+ })) === null || _componentList$find2 === void 0 ? void 0 : (_componentList$find2$ = _componentList$find2.componentConfig) === null || _componentList$find2$ === void 0 ? void 0 : _componentList$find2$.orderBackGoodsLevel;
334
+ var kmReturnGoodsOrderBackGoodsLevel = (_componentList$find3 = componentList.find(function (item) {
335
+ return item.workOrderComponentType === "KM_RETURN_GOODS";
336
+ })) === null || _componentList$find3 === void 0 ? void 0 : (_componentList$find3$ = _componentList$find3.componentConfig) === null || _componentList$find3$ === void 0 ? void 0 : _componentList$find3$.orderBackGoodsLevel;
287
337
  return {
338
+ kmSystemOrderNo: onlyOneSystemOrder ? (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.sid : undefined,
288
339
  kmSystemOrder: {
289
340
  orderNo: detail === null || detail === void 0 ? void 0 : detail.order_no,
290
341
  orders: trades.map(function (item) {
@@ -316,10 +367,21 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
316
367
  shopCode: (trades === null || trades === void 0 ? void 0 : (_trades$find = trades.find) === null || _trades$find === void 0 ? void 0 : (_trades$find$call = _trades$find.call(trades, function (item) {
317
368
  return item.shopCode;
318
369
  })) === null || _trades$find$call === void 0 ? void 0 : _trades$find$call.shopCode) || null,
319
- // kmGoods: updateKmGoodsHandle(trades),
320
370
  kmGoods: updateKmGoodsHandle(trades, {
321
371
  orderBackGoodsLevel: kmGoodsOrderBackGoodsLevel
322
372
  })
323
- }
373
+ },
374
+ kmReissueGoods: onlyOneSystemOrder ? updateKmGoodsHandle([trades[0]], {
375
+ orderBackGoodsLevel: kmReissueGoodsOrderBackGoodsLevel,
376
+ canEdit: true
377
+ }).filter(function (good) {
378
+ return !isStrict || !orderNo || good.sid === orderNo;
379
+ }) : [],
380
+ kmReturnGoods: onlyOneSystemOrder ? updateKmGoodsHandle([trades[0]], {
381
+ orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
382
+ canEdit: true
383
+ }).filter(function (good) {
384
+ return !isStrict || !orderNo || good.sid === orderNo;
385
+ }) : []
324
386
  };
325
387
  };
package/dist/esm/utils/unTransField.js CHANGED
@@ -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", "orderRefundType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "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", "label", "kmSendGood", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus"].reduce(function (cur, nxt) {
2
+ return ["itemList", "itemId", "supplierName", "numIid", "aloneItemId", "aloneItemEncode", "jstItemList", "logisticsCompany", "logisticsCode", "supplyId", "supplyName", "sendId", "sendName", "dateTime", "basicMultSelect", "memberLevel", "erpOrderType", "orderRefundType", "checkbox", "multSelect", "rate", "picture", "pictureProList", "file", "wdtGoods", "wdtReissueType", "wdtSystemOrderNo", "wdtReissueGoods", "wdtSendGood", "wdtSendId", "wdtSendName", "wdtLogisticsCode", "wdtSystemShowOrder", "wdtSystemSelectIds", "wdtLogisticsCompany", "wdtLogisticsList", "wdtReturnGoods", "wdtReturnType", "wdtExchangeGoods", "bsSendGood", "bsSendId", "bsSendName", "bsGoods", "bsExchangeType", "bsExchangeReturnGoods", "bsExchangeSwapOutGoods", "bsExchangeGiftGoods", "bsReissueType", "bsReissueGoods", "bsReturnGoods", "bsReturnType", "bsLogisticsList", "bsLogisticsCompany", "bsLogisticsCode", "kmSystemShowOrder", "bsSystemShowOrder", "bsSystemSelectIds", "bsE3SystemOrderNo", "bsE3SystemShowOrder", "bsE3SystemSelectIds", "bsE3Goods", "bsE3ReissueGoods", "bsE3ReissueType", "reissueLogisticsList", "reissueLogisticsCompany", "reissueLogisticsCode", "deliveryNoList", "deliveryNoIds", "returnGoodsStatusList", "returnGoodsTradeIdList", "returnGoodsTradeItemList", "tradeIdList", "tradeItemList", "wlnLogisticsList", "wlnLogisticsCompany", "wlnLogisticsCode", "wlnSystemShowOrder", "wlnSystemSelectIds", "wlnGoods", "wlnSendGood", "wlnSendId", "wlnSendName", "exchangeReason", "flowTag", "returnGoodsStatusList", "returnGoodsStatusValue", "exchangeReason", "exchangeStatusValue", "inStockStatusItemList", "inStockStatusList", "bsE3InStockStatusItemList", "bsE3InStockStatusList", "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", "label", "kmSendGood", "kmSendId", "kmSendName", "kmGoods", "gyGoods", "gyReissueType", "gySystemOrderNo", "gyReissueGoods", "gySendGood", "gySendId", "gySendName", "gyLogisticsCode", "gySystemShowOrder", "gySystemSelectIds", "gyLogisticsCompany", "gyLogisticsList", "gyReturnGoods", "gyReturnType", "gyExchangeGoods", "kmLogisticsList", "jstGoods", "jstSendGood", "jstReissueType", "jstReissueGoods", "jstSystemOrderNo", "jstLogisticsList", "jstSystemShowOrder", "jstSystemSelectIds", "jstReturnGoods", "jstReturnType", "jstExchangeGoods", "trajectoryApiStatus", "kmReissueGoods", "kmReissueType", "kmReturnGoods", "kmReturnType"].reduce(function (cur, nxt) {
3
3
  return cur || (key === null || key === void 0 ? void 0 : key.includes(nxt));
4
4
  }, false);
5
5
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.0.69",
3
+ "version": "2.0.70",
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": "849c6b27a93834b71ca0c08e426b60e62a9085ef",
44
+ "gitHead": "ac9f5f259a7f5f992ee0a0cbe5096f6530a98e48",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }