@kmkf-fe-packages/kmkf-utils 2.7.2 → 2.7.3-beta.10

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
- 112311112
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
  // 表单默认值
@@ -21,6 +21,7 @@ var msgTypeCh = {
21
21
  logistics: "中通/圆通/申通售后群消息",
22
22
  negotiate: "协商售后",
23
23
  QN_LOGISTICS_INTERCEPTION: "物流拦截(平台)",
24
- GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息"
24
+ GET_SYS_ORDER_INFO: "聚水潭同步系统订单信息",
25
+ JST_ADD_MANUAL_ORDER: "聚水潭新增手工订单"
25
26
  };
26
27
  export default msgTypeCh;
@@ -1 +1,2 @@
1
1
  export * from './logisticsData';
2
+ export * from './warehouseData';
@@ -1 +1,2 @@
1
- export * from "./logisticsData";
1
+ export * from "./logisticsData";
2
+ export * from "./warehouseData";
@@ -0,0 +1,7 @@
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;
@@ -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
- // console.log("发货仓数据---", this.platform, list);
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";
@@ -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 };
@@ -132,6 +132,7 @@ export declare const kmOrderTransform: (detail: any, form: any) => {
132
132
  orderNo: any;
133
133
  orders: any;
134
134
  selectIds: any;
135
+ selectedRows: any;
135
136
  showOrderInfo: any;
136
137
  };
137
138
  kmLogistics: any;
@@ -401,11 +401,12 @@ export var filterKmOrders = function filterKmOrders(detail, order_no) {
401
401
 
402
402
  //km订单信息转换
403
403
  export var kmOrderTransform = function kmOrderTransform(detail, form) {
404
- var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _postingComponent$com, _trades$, _trades$find, _trades$find$call;
404
+ var _form$getFieldValue, _kmReissueCom$compone, _componentList$find, _componentList$find$c, _kmReissueGoodsCompon, _componentList$find2, _componentList$find2$, _kmReissueGoodsCompon2, _selectedSystemOrders, _postingComponent$com, _orderBackTrades$find, _orderBackTrades$find2;
405
405
  var trades = (detail === null || detail === void 0 ? void 0 : detail.orderDetailDtoList) || (detail === null || detail === void 0 ? void 0 : detail.trades) || [];
406
406
  var _ref = detail || {},
407
407
  orderNo = _ref.orderNo,
408
- componentList = _ref.componentList;
408
+ componentList = _ref.componentList,
409
+ matchLogisticsNo = _ref.matchLogisticsNo;
409
410
  var kmGoodsCom = (componentList || []).find(function (com) {
410
411
  return com.workOrderComponentType === "KM_GOODS";
411
412
  });
@@ -434,13 +435,24 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
434
435
  });
435
436
  var kmReissueGoodsComponentInitReason = (kmReissueGoodsComponent === null || kmReissueGoodsComponent === void 0 ? void 0 : (_kmReissueGoodsCompon2 = kmReissueGoodsComponent.componentConfig) === null || _kmReissueGoodsCompon2 === void 0 ? void 0 : _kmReissueGoodsCompon2.initReason) || "1";
436
437
  var kmPosting;
437
- if (onlyOneSystemOrder && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
438
- kmPosting = handleKmAddressIdentify(trades[0]);
438
+ var defaultOrder = trades !== null && trades !== void 0 && trades[0] ? [trades[0]] : [];
439
+ var matchedSystemOrders = matchLogisticsNo ? trades.filter(function (item) {
440
+ return "".concat((item === null || item === void 0 ? void 0 : item.outSid) || (item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
441
+ }) : [];
442
+ var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
443
+ return item.sid;
444
+ });
445
+ var selectedSystemOrders = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
446
+ var selectedRows = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
447
+ var orderBackTrades = selectedSystemOrders.length ? selectedSystemOrders : trades;
448
+ var selectedSystemOrderNo = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : (_selectedSystemOrders = selectedSystemOrders[0]) === null || _selectedSystemOrders === void 0 ? void 0 : _selectedSystemOrders.sid;
449
+ var shouldOrderBackSelectedGoods = !!matchedSystemOrders.length || onlyOneSystemOrder;
450
+ if (shouldOrderBackSelectedGoods && selectedSystemOrders.length && kmReissueGoodsComponent && kmReissueGoodsComponentInitReason === "1" && (postingComponent === null || postingComponent === void 0 ? void 0 : (_postingComponent$com = postingComponent.componentConfig) === null || _postingComponent$com === void 0 ? void 0 : _postingComponent$com.showField) === "km") {
451
+ kmPosting = handleKmAddressIdentify(selectedSystemOrders[0]);
439
452
  console.log("kmPosting", kmPosting);
440
453
  }
441
- var defaultOrder = trades !== null && trades !== void 0 && trades[0] ? [trades[0]] : [];
442
454
  return {
443
- kmSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? (_trades$ = trades[0]) === null || _trades$ === void 0 ? void 0 : _trades$.sid : undefined,
455
+ kmSystemOrderNo: selectedSystemOrderNo,
444
456
  kmSystemOrder: {
445
457
  //标记通过请求获取的值
446
458
  isRequest: true,
@@ -453,9 +465,17 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
453
465
  billTag: item.tags
454
466
  });
455
467
  }),
456
- selectIds: onlyOneSystemOrder ? trades.map(function (item) {
468
+ selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? trades.map(function (item) {
457
469
  return item.sid;
458
470
  }) : [],
471
+ selectedRows: selectedRows.map(function (item) {
472
+ return _objectSpread(_objectSpread({}, item), {}, {
473
+ billNo: item.sid,
474
+ sysStatus: item.sysStatus,
475
+ billType: item.type,
476
+ billTag: item.tags
477
+ });
478
+ }),
459
479
  showOrderInfo: trades.map(function (item) {
460
480
  return {
461
481
  billNo: item.sid,
@@ -465,35 +485,35 @@ export var kmOrderTransform = function kmOrderTransform(detail, form) {
465
485
  };
466
486
  })
467
487
  },
468
- kmLogistics: updateKmItemListHandle(trades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
469
- kmSendGood: updateKmItemListHandle(trades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
488
+ kmLogistics: updateKmItemListHandle(orderBackTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
489
+ kmSendGood: updateKmItemListHandle(orderBackTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
470
490
  kmGoods: {
471
491
  //标记通过请求获取的值
472
492
  isRequest: true,
473
493
  allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders,
474
494
  // 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
475
- orders: trades,
495
+ orders: orderBackTrades,
476
496
  orderNo: orderNo,
477
- 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) {
497
+ shopCode: (orderBackTrades === null || orderBackTrades === void 0 ? void 0 : (_orderBackTrades$find = orderBackTrades.find) === null || _orderBackTrades$find === void 0 ? void 0 : (_orderBackTrades$find2 = _orderBackTrades$find.call(orderBackTrades, function (item) {
478
498
  return item.shopCode;
479
- })) === null || _trades$find$call === void 0 ? void 0 : _trades$find$call.shopCode) || null,
480
- kmGoods: updateKmGoodsHandle(trades, {
499
+ })) === null || _orderBackTrades$find2 === void 0 ? void 0 : _orderBackTrades$find2.shopCode) || null,
500
+ kmGoods: updateKmGoodsHandle(orderBackTrades, {
481
501
  orderBackGoodsLevel: kmGoodsOrderBackGoodsLevel
482
502
  })
483
503
  },
484
- kmReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateKmGoodsHandle(defaultOrder, {
504
+ kmReissueGoods: selectedSystemOrders.length ? updateKmGoodsHandle(selectedSystemOrders, {
485
505
  orderBackGoodsLevel: kmReissueGoodsOrderBackGoodsLevel,
486
506
  canEdit: true
487
507
  }).filter(function (good) {
488
508
  return !isStrict || !orderNo || good.sid === orderNo;
489
509
  }) : [],
490
- kmReturnGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
510
+ kmReturnGoods: shouldOrderBackSelectedGoods ? updateKmGoodsHandle(selectedSystemOrders, {
491
511
  orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
492
512
  canEdit: true
493
513
  }, "KM_RETURN_GOODS").filter(function (good) {
494
514
  return !isStrict || !orderNo || good.sid === orderNo;
495
515
  }) : [],
496
- kmExchangeGoods: onlyOneSystemOrder ? updateKmGoodsHandle(defaultOrder, {
516
+ kmExchangeGoods: shouldOrderBackSelectedGoods ? updateKmGoodsHandle(selectedSystemOrders, {
497
517
  orderBackGoodsLevel: kmReturnGoodsOrderBackGoodsLevel,
498
518
  canEdit: true
499
519
  }).filter(function (good) {
@@ -17,9 +17,10 @@ interface OrderBackFormValuesI {
17
17
  formValue?: Record<string, unknown>;
18
18
  order_no?: string | null;
19
19
  detail: Record<string, unknown>;
20
- fromQNCreateWorkOrderByOrderNo: boolean;
20
+ fromQNCreateWorkOrderByOrderNo?: boolean;
21
+ skipOrderBackUniqueKeys?: string[];
21
22
  _get_order_fail_?: boolean;
22
23
  shopId?: string;
23
24
  }
24
- declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, }: OrderBackFormValuesI) => any;
25
+ declare const _default: ({ shopId, _get_order_fail_, detail, order_no, formValue, templateDetail, type, fromQNCreateWorkOrderByOrderNo, skipOrderBackUniqueKeys, }: OrderBackFormValuesI) => any;
25
26
  export default _default;
@@ -86,7 +86,9 @@ 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;
89
+ fromQNCreateWorkOrderByOrderNo = _ref$fromQNCreateWork === void 0 ? false : _ref$fromQNCreateWork,
90
+ _ref$skipOrderBackUni = _ref.skipOrderBackUniqueKeys,
91
+ skipOrderBackUniqueKeys = _ref$skipOrderBackUni === void 0 ? [] : _ref$skipOrderBackUni;
90
92
  var orderValues = !_get_order_fail_ ? ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (prv, next) {
91
93
  var _next$componentConfig, _ref2, _detail$expressLogist, _detail$returnLogisti, _next$componentConfig2, _next$componentConfig3, _next$componentConfig4;
92
94
  var uniqueKey = next.uniqueKey;
@@ -94,7 +96,7 @@ export default (function (_ref) {
94
96
  var city = null,
95
97
  town = null;
96
98
  // console.log("--订单返填数据重组", next.workOrderComponentType);
97
-
99
+ if (skipOrderBackUniqueKeys.includes(uniqueKey)) return prv;
98
100
  switch (next.workOrderComponentType) {
99
101
  case "TRADE_ID_INPUT":
100
102
  prv[uniqueKey] = (_next$componentConfig = next.componentConfig) !== null && _next$componentConfig !== void 0 && _next$componentConfig.toUpperCase ? (_ref2 = order_no || detail["orderNo"]) === null || _ref2 === void 0 ? void 0 : _ref2.toUpperCase() : order_no || detail["orderNo"];
@@ -58,6 +58,7 @@ export declare const wdtOrderTransform: (detail: any, form: any) => {
58
58
  orderNo: any;
59
59
  orders: any;
60
60
  selectIds: any;
61
+ selectedRows: any;
61
62
  showOrderInfo: any;
62
63
  };
63
64
  wdtReturnSystemOrder: {
@@ -513,7 +513,7 @@ export var wdtOrderBackFormValues = function wdtOrderBackFormValues() {
513
513
  };
514
514
  //wdt订单信息转换
515
515
  export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
516
- var _wdtReissueCom$compon, _form$getFieldValue, _detail$trades2, _currentTrades$, _currentTrades$find, _currentTrades$find$c, _wdtReturnOrders$find, _wdtReturnOrders$find2, _currentTrades$2;
516
+ var _wdtReissueCom$compon, _form$getFieldValue, _detail$trades2, _selectedSystemOrders, _orderBackTrades$find, _orderBackTrades$find2, _wdtReturnOrders$find, _wdtReturnOrders$find2, _orderBackTrades$;
517
517
  var orderNo = detail.orderNo,
518
518
  _detail$trades = detail.trades,
519
519
  currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
@@ -521,7 +521,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
521
521
  _detail$allOrders = detail.allOrders,
522
522
  allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
523
523
  _detail$wdtReturnOrde = detail.wdtReturnOrders,
524
- wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde;
524
+ wdtReturnOrders = _detail$wdtReturnOrde === void 0 ? [] : _detail$wdtReturnOrde,
525
+ matchLogisticsNo = detail.matchLogisticsNo;
525
526
  var wdtGoodsCom = (componentList || []).find(function (com) {
526
527
  return com.workOrderComponentType === "WDT_GOODS";
527
528
  });
@@ -532,6 +533,16 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
532
533
  var isStrict = wdtGoodsCom ? (_form$getFieldValue = form.getFieldValue(wdtGoodsCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
533
534
  var onlyOneSystemOrder = (detail === null || detail === void 0 ? void 0 : (_detail$trades2 = detail.trades) === null || _detail$trades2 === void 0 ? void 0 : _detail$trades2.length) === 1;
534
535
  var defaultOrder = currentTrades !== null && currentTrades !== void 0 && currentTrades[0] ? [currentTrades[0]] : [];
536
+ var matchedSystemOrders = matchLogisticsNo ? currentTrades.filter(function (item) {
537
+ return "".concat((item === null || item === void 0 ? void 0 : item.logisticsNo) || "").trim() === "".concat(matchLogisticsNo).trim();
538
+ }) : [];
539
+ var matchedSystemOrderIds = matchedSystemOrders.map(function (item) {
540
+ return item.tradeNo;
541
+ });
542
+ var selectedSystemOrders = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder || isReissueDefaultSelect ? defaultOrder : [];
543
+ var selectedRows = matchedSystemOrders.length ? matchedSystemOrders : onlyOneSystemOrder ? defaultOrder : [];
544
+ var orderBackTrades = selectedSystemOrders.length ? selectedSystemOrders : currentTrades;
545
+ var selectedSystemOrderNo = selectedSystemOrders === null || selectedSystemOrders === void 0 ? void 0 : (_selectedSystemOrders = selectedSystemOrders[0]) === null || _selectedSystemOrders === void 0 ? void 0 : _selectedSystemOrders.tradeNo;
535
546
  return {
536
547
  wdtSystemOrder: {
537
548
  //标记通过请求获取的值
@@ -546,9 +557,18 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
546
557
  logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
547
558
  });
548
559
  }),
549
- selectIds: onlyOneSystemOrder ? currentTrades.map(function (item) {
560
+ selectIds: matchedSystemOrderIds.length ? matchedSystemOrderIds : onlyOneSystemOrder ? currentTrades.map(function (item) {
550
561
  return item.tradeNo;
551
562
  }) : [],
563
+ selectedRows: selectedRows.map(function (item) {
564
+ return _objectSpread(_objectSpread({}, item), {}, {
565
+ billNo: item.tradeNo,
566
+ billType: WDT_ORDER_TYPE_MAP[item.tradeType],
567
+ billTag: item.tagName || item.tags,
568
+ // 网页版取tags,其他版本用tagName
569
+ logisticsName: ExpressData.getInstance("wdt").getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCode, false) || (item === null || item === void 0 ? void 0 : item.logisticsName)
570
+ });
571
+ }),
552
572
  showOrderInfo: currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.map(function (item) {
553
573
  return _objectSpread(_objectSpread({}, item), {}, {
554
574
  billNo: item.tradeNo,
@@ -569,8 +589,8 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
569
589
  }) : [],
570
590
  showOrderInfo: wdtReturnOrders || []
571
591
  },
572
- wdtSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
573
- wdtReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWdtGoodsHandle(defaultOrder).filter(function (good) {
592
+ wdtSystemOrderNo: selectedSystemOrderNo,
593
+ wdtReissueGoods: selectedSystemOrders.length ? updateWdtGoodsHandle(selectedSystemOrders).filter(function (good) {
574
594
  return !isStrict || !orderNo || good.srcTid === orderNo;
575
595
  }) : [],
576
596
  wdtGoods: {
@@ -578,12 +598,12 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
578
598
  isRequest: true,
579
599
  allOrders: allOrders,
580
600
  // 订单反填,要清空orders,存的是当前系统订单号勾选上的 订单
581
- orders: currentTrades,
601
+ orders: orderBackTrades,
582
602
  orderNo: orderNo,
583
- shopCode: (currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$find = currentTrades.find) === null || _currentTrades$find === void 0 ? void 0 : (_currentTrades$find$c = _currentTrades$find.call(currentTrades, function (item) {
603
+ shopCode: (orderBackTrades === null || orderBackTrades === void 0 ? void 0 : (_orderBackTrades$find = orderBackTrades.find) === null || _orderBackTrades$find === void 0 ? void 0 : (_orderBackTrades$find2 = _orderBackTrades$find.call(orderBackTrades, function (item) {
584
604
  return item.shopNo;
585
- })) === null || _currentTrades$find$c === void 0 ? void 0 : _currentTrades$find$c.shopNo) || null,
586
- wdtGoods: updateWdtGoodsHandle(currentTrades).filter(function (good) {
605
+ })) === null || _orderBackTrades$find2 === void 0 ? void 0 : _orderBackTrades$find2.shopNo) || null,
606
+ wdtGoods: updateWdtGoodsHandle(orderBackTrades).filter(function (good) {
587
607
  return !isStrict || !orderNo || good.srcTid === orderNo;
588
608
  })
589
609
  },
@@ -596,9 +616,9 @@ export var wdtOrderTransform = function wdtOrderTransform(detail, form) {
596
616
  })) === null || _wdtReturnOrders$find2 === void 0 ? void 0 : _wdtReturnOrders$find2.shopNo) || null,
597
617
  wdtAftersaleGoods: updateWdtAftersaleGoodsHandle(wdtReturnOrders)
598
618
  },
599
- wdtLogistics: updateWdtItemListHandle(currentTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
600
- wdtSendGood: updateWdtItemListHandle(currentTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
601
- shopCode: (_currentTrades$2 = currentTrades[0]) === null || _currentTrades$2 === void 0 ? void 0 : _currentTrades$2.shopNo
619
+ wdtLogistics: updateWdtItemListHandle(orderBackTrades, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
620
+ wdtSendGood: updateWdtItemListHandle(orderBackTrades, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
621
+ shopCode: (_orderBackTrades$ = orderBackTrades[0]) === null || _orderBackTrades$ === void 0 ? void 0 : _orderBackTrades$.shopNo
602
622
  // wdtSingingTime: detail?.receiptDate,
603
623
  // wdtSendTime:
604
624
  // detail?.orders?.[0]?.advancedDistributionInfos?.[0]?.deliveryDate,
@@ -3,15 +3,29 @@ 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: any, record: any) => any;
17
+ renderExport: (val: any, record: any) => any;
18
+ })[];
11
19
  };
12
- export declare const updateWlnGoodsHandle: (orders?: any[]) => any;
20
+ export declare const getIsPlatformCodesIncludeOrderNos: (platformCodes: string, orderNos: string) => boolean;
21
+ export declare const updateWlnGoodsHandle: (orders?: any[], options?: {
22
+ canEdit?: boolean;
23
+ orderBackGoodsLevel?: string;
24
+ }) => any;
13
25
  export declare const wlnOrderBackFormValues: (detail?: any, templateDetail?: any) => any;
14
- export declare const wlnOrderTransform: (detail: any) => {
26
+ export declare const wlnOrderTransform: (detail: any, form: any) => {
27
+ wlnSystemOrderNo: any;
28
+ wlnReissueGoods: any;
15
29
  wlnSystemOrder: {
16
30
  orderNo: any;
17
31
  orders: any;
@@ -13,8 +13,33 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
13
13
  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
14
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
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
+ import React from 'react';
16
17
  import ExpressData from "../expressData";
17
18
  import uuid from "./getUUid";
19
+ import isNull from "./isNull";
20
+ var renderPackageInfos = function renderPackageInfos(val, record, key) {
21
+ var _record$packageInfos;
22
+ var isExport = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
23
+ var res = val;
24
+ if (((_record$packageInfos = record.packageInfos) === null || _record$packageInfos === void 0 ? void 0 : _record$packageInfos.length) > 1) {
25
+ if (isExport) {
26
+ res = record.packageInfos.map(function (packageInfo, index) {
27
+ return "\u5305\u88F9".concat(index + 1, ": ").concat(packageInfo[key], ";");
28
+ }).join('\n');
29
+ } else {
30
+ res = record.packageInfos.map(function (packageInfo, index) {
31
+ return /*#__PURE__*/React.createElement('div', {
32
+ key: index
33
+ }, "\u5305\u88F9".concat(index + 1, ": ").concat(packageInfo[key]));
34
+ });
35
+ }
36
+ }
37
+ // console.log(`**** renderPackageInfos ${key}, ${isExport ? '导出' : '不是导出'}`, {
38
+ // record,
39
+ // res,
40
+ // })
41
+ return res;
42
+ };
18
43
  export var WLN_SYSTEM_ORDER_CONFIG = {
19
44
  key: "wlnSystemShowOrder",
20
45
  name: "万里牛",
@@ -32,45 +57,197 @@ export var WLN_SYSTEM_ORDER_CONFIG = {
32
57
  title: "标记",
33
58
  dataIndex: "billTag",
34
59
  width: 150
60
+ }, {
61
+ title: "是否拆分订单",
62
+ dataIndex: "splitTrade",
63
+ width: 150
64
+ }, {
65
+ title: "是否售后订单",
66
+ dataIndex: "exchangeTrade",
67
+ width: 150
68
+ }, {
69
+ title: "是否有退款",
70
+ dataIndex: "hasRefund",
71
+ width: 150
72
+ }, {
73
+ title: "是否预售订单",
74
+ dataIndex: "preSale",
75
+ width: 150
76
+ }, {
77
+ title: "合并前系统单号",
78
+ dataIndex: "mergeUids",
79
+ width: 150
80
+ }, {
81
+ title: "快递公司名称",
82
+ dataIndex: "logisticName",
83
+ width: 150,
84
+ render: function render(val, record) {
85
+ return renderPackageInfos(val, record, 'logisticName');
86
+ },
87
+ renderExport: function renderExport(val, record) {
88
+ return renderPackageInfos(val, record, 'logisticName', true);
89
+ }
90
+ }, {
91
+ title: "快递公司编码",
92
+ dataIndex: "logisticCode",
93
+ width: 150,
94
+ render: function render(val, record) {
95
+ return renderPackageInfos(val, record, 'logisticCode');
96
+ },
97
+ renderExport: function renderExport(val, record) {
98
+ return renderPackageInfos(val, record, 'logisticCode', true);
99
+ }
100
+ }, {
101
+ title: "快递单号",
102
+ dataIndex: "expressCode",
103
+ width: 150,
104
+ render: function render(val, record) {
105
+ return renderPackageInfos(val, record, 'expressCode');
106
+ },
107
+ renderExport: function renderExport(val, record) {
108
+ return renderPackageInfos(val, record, 'expressCode', true);
109
+ }
110
+ }, {
111
+ title: "发货仓名称",
112
+ dataIndex: "storageName",
113
+ width: 150
114
+ }, {
115
+ title: "发货仓编码",
116
+ dataIndex: "storageCode",
117
+ width: 150
118
+ }, {
119
+ title: "单据处理状态",
120
+ dataIndex: "processStatus",
121
+ width: 150
122
+ }, {
123
+ title: "线上单号",
124
+ dataIndex: "tpTid",
125
+ width: 150
35
126
  }]
36
127
  };
128
+ export var getIsPlatformCodesIncludeOrderNos = function getIsPlatformCodesIncludeOrderNos(platformCodes, orderNos) {
129
+ var getSortedList = function getSortedList(str) {
130
+ try {
131
+ var parts = str.split(";");
132
+ var bigInts = parts.map(BigInt);
133
+ var sortedBigInts = bigInts.sort(function (a, b) {
134
+ if (a < b) return -1;
135
+ if (a > b) return 1;
136
+ return 0;
137
+ });
138
+ return sortedBigInts.map(String).join(";");
139
+ } catch (error) {
140
+ return "";
141
+ }
142
+ };
143
+ var platformCodesSortStr = getSortedList(platformCodes || "");
144
+ var orderNosSortStr = getSortedList(orderNos || "");
145
+ console.log("***** platformCodesSortStr", {
146
+ platformCodesSortStr: platformCodesSortStr,
147
+ orderNosSortStr: orderNosSortStr
148
+ });
149
+ return platformCodesSortStr.includes(orderNosSortStr);
150
+ };
37
151
  export var updateWlnGoodsHandle = function updateWlnGoodsHandle() {
38
152
  var orders = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
153
+ var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
154
+ canEdit: false,
155
+ orderBackGoodsLevel: "1"
156
+ };
157
+ var wrapItem = function wrapItem(item, systemOrderNo) {
158
+ item.uuid = item.uuid || uuid();
159
+ item.systemOrderNo = systemOrderNo;
160
+ item.canDelete = true;
161
+ item.canEdit = !!options.canEdit;
162
+ var picPath = item.picPath,
163
+ itemId = item.itemId,
164
+ itemName = item.itemName,
165
+ skuId = item.skuId,
166
+ skuName = item.skuName,
167
+ isGift = item.isGift,
168
+ size = item.size,
169
+ payment = item.payment,
170
+ price = item.price,
171
+ others = _objectWithoutProperties(item, _excluded);
172
+ return _objectSpread(_objectSpread({}, others), {}, {
173
+ skuName: skuName,
174
+ pic: picPath,
175
+ name: itemName,
176
+ code: itemId,
177
+ sku: skuId,
178
+ money: payment || 0,
179
+ number: size,
180
+ share: price,
181
+ type: isGift
182
+ });
183
+ };
39
184
  var list = orders.reduce(function (prv, next) {
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
185
+ if (options.orderBackGoodsLevel !== "2") {
186
+ var _next$items;
187
+ // 反填子商品
188
+ next === null || next === void 0 ? void 0 : (_next$items = next.items) === null || _next$items === void 0 ? void 0 : _next$items.forEach(function (item) {
189
+ if (item.isPackage) {
190
+ item.subItems.forEach(function (subItem) {
191
+ var newSubItem = wrapItem(subItem, next === null || next === void 0 ? void 0 : next.tradeNo);
192
+ prv.push(newSubItem);
193
+ });
194
+ } else {
195
+ prv.push(wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo));
196
+ }
64
197
  });
65
- });
66
- prv.push.apply(prv, _toConsumableArray(goods));
198
+ } else {
199
+ var _next$items2;
200
+ // 反填组合商品
201
+ 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) {
202
+ return wrapItem(item, next === null || next === void 0 ? void 0 : next.tradeNo);
203
+ })) || [];
204
+ prv.push.apply(prv, _toConsumableArray(goods));
205
+ }
67
206
  return prv;
68
207
  }, []);
69
208
  return list;
70
209
  };
71
- var updateWlnItemListHandle = function updateWlnItemListHandle(list, type) {
210
+ var updateWlnItemListHandle = function updateWlnItemListHandle(list, type, comList, form) {
72
211
  var _newList;
73
- var newList = list === null || list === void 0 ? void 0 : list.reduce(function (prv, next) {
212
+ if (type === "logistics") {
213
+ var _comList$find, _currentCom$component;
214
+ 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) {
215
+ return item.workOrderComponentType === "WLN_LOGISTICS";
216
+ });
217
+ var notOrderBack = (currentCom === null || currentCom === void 0 ? void 0 : (_currentCom$component = currentCom.componentConfig) === null || _currentCom$component === void 0 ? void 0 : _currentCom$component.notOrderBack) || false;
218
+ if (notOrderBack) {
219
+ var _currentValue;
220
+ var currentValue = form.getFieldValue(currentCom.uniqueKey);
221
+ currentValue = (_currentValue = currentValue) !== null && _currentValue !== void 0 && _currentValue.length ? currentValue : [{
222
+ logisticsCode: "",
223
+ logisticsCompany: ""
224
+ }];
225
+ return currentValue;
226
+ }
227
+ } else if (type === "send") {
228
+ var _comList$find2, _currentCom$component2;
229
+ 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) {
230
+ return item.workOrderComponentType === "WLN_SEND_GOOD";
231
+ });
232
+ var _notOrderBack = (_currentCom === null || _currentCom === void 0 ? void 0 : (_currentCom$component2 = _currentCom.componentConfig) === null || _currentCom$component2 === void 0 ? void 0 : _currentCom$component2.notOrderBack) || false;
233
+ if (_notOrderBack) {
234
+ var _currentValue3;
235
+ var _currentValue2 = form.getFieldValue(_currentCom.uniqueKey);
236
+ _currentValue2 = (_currentValue3 = _currentValue2) !== null && _currentValue3 !== void 0 && _currentValue3.length ? _currentValue2 : [{
237
+ sendId: "",
238
+ sendName: ""
239
+ }];
240
+ return _currentValue2;
241
+ }
242
+ }
243
+ var packageInfos = [];
244
+ (list || []).map(function (item) {
245
+ item.packageInfos.forEach(function (packageInfo) {
246
+ packageInfos.push(_objectSpread(_objectSpread({}, item), packageInfo));
247
+ });
248
+ });
249
+ console.log('***** packageInfos', packageInfos);
250
+ var newList = packageInfos === null || packageInfos === void 0 ? void 0 : packageInfos.reduce(function (prv, next) {
74
251
  var items = (next.items || []).map(function (t) {
75
252
  return {
76
253
  title: (t === null || t === void 0 ? void 0 : t.itemName) || "",
@@ -147,6 +324,17 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
147
324
  case "WLN_SYSTEM_ORDER":
148
325
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder;
149
326
  break;
327
+ case "WLN_REISSUE_GOODS":
328
+ {
329
+ var initReason = !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? config.initReason : "1";
330
+ prv[uniqueKey] = {
331
+ wlnSystemOrder: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrder,
332
+ wlnReissueGoods: initReason === "2" ? [] : detail === null || detail === void 0 ? void 0 : detail.wlnReissueGoods,
333
+ wlnSystemOrderNo: detail === null || detail === void 0 ? void 0 : detail.wlnSystemOrderNo,
334
+ wlnReissueType: [initReason]
335
+ };
336
+ }
337
+ break;
150
338
  case "WLN_GOODS":
151
339
  prv[uniqueKey] = detail === null || detail === void 0 ? void 0 : detail.wlnGoods;
152
340
  break;
@@ -161,9 +349,48 @@ export var wlnOrderBackFormValues = function wlnOrderBackFormValues() {
161
349
  }, {});
162
350
  };
163
351
  //wln订单信息转换
164
- export var wlnOrderTransform = function wlnOrderTransform(detail) {
165
- var _detail$orders, _ref, _detail$orders2, _detail$orders2$;
352
+ export var wlnOrderTransform = function wlnOrderTransform(detail, form) {
353
+ var _form$getFieldValue, _wlnReissueCom$compon, _wlnGoodsCom$componen, _wlnReissueCom$compon2, _currentTrades$, _wlnReissueCom$compon3, _detail$orders, _ref, _detail$orders2, _detail$orders2$, _wlnGoodsCom$componen2;
354
+ var _detail$allOrders = detail.allOrders,
355
+ allOrders = _detail$allOrders === void 0 ? [] : _detail$allOrders,
356
+ orderNo = detail.orderNo,
357
+ _detail$trades = detail.trades,
358
+ currentTrades = _detail$trades === void 0 ? [] : _detail$trades,
359
+ componentList = detail.componentList;
360
+ var filterCurrentTrades = currentTrades === null || currentTrades === void 0 ? void 0 : currentTrades.filter(function (trade) {
361
+ return !trade.cancel;
362
+ });
363
+ var wlnGoodsCom = (componentList || []).find(function (com) {
364
+ return com.workOrderComponentType === "WLN_GOODS";
365
+ });
366
+ var wlnReissueCom = (componentList || []).find(function (com) {
367
+ return com.workOrderComponentType === "WLN_REISSUE_GOODS";
368
+ });
369
+ var isStrict = wlnReissueCom ? (_form$getFieldValue = form.getFieldValue(wlnReissueCom.uniqueKey)) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.isStrict : false;
370
+ var onlyOneSystemOrder = (filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.length) === 1;
371
+ var isReissueDefaultSelect = !!(wlnReissueCom !== null && wlnReissueCom !== void 0 && (_wlnReissueCom$compon = wlnReissueCom.componentConfig) !== null && _wlnReissueCom$compon !== void 0 && _wlnReissueCom$compon.showDefaultSelect);
372
+ var wlnGoodsOrderBackGoodsLevel = wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen === void 0 ? void 0 : _wlnGoodsCom$componen.orderBackGoodsLevel;
373
+ var wlnReissueGoodsOrderBackGoodsLevel = wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon2 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon2 === void 0 ? void 0 : _wlnReissueCom$compon2.orderBackGoodsLevel;
374
+ var newOrderList = filterCurrentTrades === null || filterCurrentTrades === void 0 ? void 0 : filterCurrentTrades.map(function (item) {
375
+ return _objectSpread({}, item);
376
+ });
377
+ var defaultOrder = newOrderList !== null && newOrderList !== void 0 && newOrderList[0] ? [newOrderList[0]] : [];
378
+
379
+ // console.log("**** ", {
380
+ // isStrict,
381
+ // onlyOneSystemOrder,
382
+ // isReissueDefaultSelect,
383
+ // wlnGoodsOrderBackGoodsLevel,
384
+ // wlnReissueGoodsOrderBackGoodsLevel,
385
+ // });
166
386
  return {
387
+ wlnSystemOrderNo: onlyOneSystemOrder || isReissueDefaultSelect ? currentTrades === null || currentTrades === void 0 ? void 0 : (_currentTrades$ = currentTrades[0]) === null || _currentTrades$ === void 0 ? void 0 : _currentTrades$.tradeNo : undefined,
388
+ wlnReissueGoods: onlyOneSystemOrder || isReissueDefaultSelect ? updateWlnGoodsHandle(defaultOrder, {
389
+ orderBackGoodsLevel: wlnReissueCom === null || wlnReissueCom === void 0 ? void 0 : (_wlnReissueCom$compon3 = wlnReissueCom.componentConfig) === null || _wlnReissueCom$compon3 === void 0 ? void 0 : _wlnReissueCom$compon3.orderBackGoodsLevel,
390
+ canEdit: true
391
+ }).filter(function (good) {
392
+ return !isStrict || !orderNo || getIsPlatformCodesIncludeOrderNos(good.platformCode, orderNo);
393
+ }) : [],
167
394
  wlnSystemOrder: {
168
395
  orderNo: detail === null || detail === void 0 ? void 0 : detail.tradeNo,
169
396
  orders: ((detail === null || detail === void 0 ? void 0 : detail.orders) || []).map(function (item) {
@@ -177,19 +404,21 @@ export var wlnOrderTransform = function wlnOrderTransform(detail) {
177
404
  return item.tradeNo;
178
405
  }) : [],
179
406
  showOrderInfo: (_ref = (detail === null || detail === void 0 ? void 0 : detail.orders) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
180
- return {
407
+ return _objectSpread(_objectSpread({}, item), {}, {
181
408
  billNo: item.tradeNo,
182
409
  billType: item.tradeType,
183
410
  billTag: item.mark
184
- };
411
+ });
185
412
  })
186
413
  },
187
414
  wlnGoods: {
188
415
  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),
416
+ wlnGoods: updateWlnGoodsHandle(detail === null || detail === void 0 ? void 0 : detail.orders, {
417
+ orderBackGoodsLevel: wlnGoodsCom === null || wlnGoodsCom === void 0 ? void 0 : (_wlnGoodsCom$componen2 = wlnGoodsCom.componentConfig) === null || _wlnGoodsCom$componen2 === void 0 ? void 0 : _wlnGoodsCom$componen2.orderBackGoodsLevel
418
+ }),
190
419
  allOrders: detail === null || detail === void 0 ? void 0 : detail.allOrders
191
420
  },
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")
421
+ wlnLogistics: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "logistics", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form),
422
+ wlnSendGood: updateWlnItemListHandle(detail === null || detail === void 0 ? void 0 : detail.orders, "send", (detail === null || detail === void 0 ? void 0 : detail.componentList) || [], form)
194
423
  };
195
424
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-utils",
3
- "version": "2.7.2",
3
+ "version": "2.7.3-beta.10",
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": "0935ddda3b736925b7e9cf3d6df86c85ef2f8048",
44
+ "gitHead": "a3b928789d7e0dcdba730abd31155cdfbeeb1709",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }