@kmkf-fe-packages/kmkf-work-order-service-component 2.4.0-rc.0 → 2.6.0-rc.0

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.
@@ -107,7 +107,8 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
107
107
  REFUND_TYPE: 'orderRefundType',
108
108
  EXECUTE_ACTION_TYPE: 'executeActionType',
109
109
  SKX_CREATE_TIME: 'dateTime',
110
- SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo'
110
+ SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo',
111
+ ERP_ORDER_STATUS: 'erpOrderStatus'
111
112
  };
112
113
  export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
113
114
  RATE: 'rate',
@@ -116,7 +117,8 @@ export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
116
117
  ITEM_SELECT: 'itemList',
117
118
  ITEM_SELECT_THIRD: 'itemList',
118
119
  ITEM_ID: 'itemList',
119
- ITEM_ENCODE: 'itemList'
120
+ ITEM_ENCODE: 'itemList',
121
+ ORDER_SUBFORM: 'subOrderList'
120
122
  };
121
123
  export var SUBMIT_COMPONENT_STATUS_MAP = {
122
124
  REISSUE_STATUS: {
@@ -1,15 +1,15 @@
1
1
  function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
2
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
3
- function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
- 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; }
5
- function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
6
- 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); }
7
2
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
8
3
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
9
4
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
10
5
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
11
6
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
12
7
  function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
8
+ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
+ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
10
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
11
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
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 { get, set } from 'lodash';
14
14
  import moment from 'moment';
15
15
  import V from 'voca';
@@ -18,6 +18,9 @@ import { findValueByField } from "./tools";
18
18
  import { DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING, DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING, SUBMIT_COMPONENT_STATUS_MAP, SUBMIT_COMPONENT_GOOD_STATUS_MAP, SUBMIT_COMPONENT_ERP_LOGISTICS_MAP, SUBMIT_COMPONENT_SEND_GOOD_MAP, SUBMIT_COMPONENT_GOODS_MAP, SUBMIT_COMPONENT_REISSUE_MAP, SUBMIT_COMPONENT_RETURN_GOODS_MAP, SUBMIT_COMPONENT_SYSTEM_ORDER_MAP } from "./constant";
19
19
  import cache from "../cache";
20
20
  import Monitor from 'kmkf-monitor';
21
+ import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
22
+ import { orderSubFormConstants } from '@kmkf-fe-packages/basic-components';
23
+ var getSelectWidgetMap = orderSubFormConstants.getSelectWidgetMap;
21
24
  var handleTradeIdInput = function handleTradeIdInput(_ref) {
22
25
  var addContent = _ref.addContent,
23
26
  upgradeParams = _ref.upgradeParams,
@@ -463,9 +466,32 @@ var handleSkxGoods = function handleSkxGoods(_ref36) {
463
466
  addContent('skxGoods', goods === null || goods === void 0 ? void 0 : goods.skxGoods);
464
467
  };
465
468
  };
466
- var handleBsExchangeGoods = function handleBsExchangeGoods(_ref37) {
469
+ var handleOrderSubForm = function handleOrderSubForm(_ref37) {
467
470
  var addContent = _ref37.addContent,
468
471
  getNowData = _ref37.getNowData;
472
+ return function (item) {
473
+ var _orderSubForm$subOrde;
474
+ var orderSubForm = getNowData(item.uniqueKey, {});
475
+ var selectWidgetMap = getSelectWidgetMap(ExpressData.getInstance());
476
+ var subOrderList = orderSubForm === null || orderSubForm === void 0 ? void 0 : (_orderSubForm$subOrde = orderSubForm.subOrderList) === null || _orderSubForm$subOrde === void 0 ? void 0 : _orderSubForm$subOrde.map(function (item) {
477
+ Object.keys(item).forEach(function (key) {
478
+ if (selectWidgetMap !== null && selectWidgetMap !== void 0 && selectWidgetMap[key]) {
479
+ var mapValue = selectWidgetMap === null || selectWidgetMap === void 0 ? void 0 : selectWidgetMap[key];
480
+ if (mapValue && typeof mapValue === 'function') {
481
+ item["".concat(key, "Desc")] = mapValue === null || mapValue === void 0 ? void 0 : mapValue(item[key]);
482
+ } else {
483
+ item["".concat(key, "Desc")] = mapValue === null || mapValue === void 0 ? void 0 : mapValue[item[key]];
484
+ }
485
+ }
486
+ });
487
+ return _objectSpread({}, item);
488
+ });
489
+ addContent('subOrderList', subOrderList);
490
+ };
491
+ };
492
+ var handleBsExchangeGoods = function handleBsExchangeGoods(_ref38) {
493
+ var addContent = _ref38.addContent,
494
+ getNowData = _ref38.getNowData;
469
495
  return function (item) {
470
496
  var _bsExchange$bsExchang;
471
497
  var bsExchange = getNowData(item.uniqueKey, {});
@@ -490,27 +516,27 @@ var handleBsExchangeGoods = function handleBsExchangeGoods(_ref37) {
490
516
  }
491
517
  };
492
518
  };
493
- var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref38) {
494
- var addContent = _ref38.addContent,
495
- getNowData = _ref38.getNowData;
519
+ var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref39) {
520
+ var addContent = _ref39.addContent,
521
+ getNowData = _ref39.getNowData;
496
522
  return function (item) {
497
523
  var wdtExchange = getNowData(item.uniqueKey, {});
498
524
  addContent('wdtExchangeGoods', wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods);
499
525
  addContent('shopCode', (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '');
500
526
  };
501
527
  };
502
- var handleJstExchangeGoods = function handleJstExchangeGoods(_ref39) {
503
- var addContent = _ref39.addContent,
504
- getNowData = _ref39.getNowData;
528
+ var handleJstExchangeGoods = function handleJstExchangeGoods(_ref40) {
529
+ var addContent = _ref40.addContent,
530
+ getNowData = _ref40.getNowData;
505
531
  return function (item) {
506
532
  var jstExchange = getNowData(item.uniqueKey, {});
507
533
  addContent('jstExchangeGoods', jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.jstExchangeGoods);
508
534
  addContent('shopCode', (jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.shopCode) || '');
509
535
  };
510
536
  };
511
- var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref40) {
512
- var addContent = _ref40.addContent,
513
- getNowData = _ref40.getNowData;
537
+ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref41) {
538
+ var addContent = _ref41.addContent,
539
+ getNowData = _ref41.getNowData;
514
540
  return function (item) {
515
541
  var reissue = getNowData(item.uniqueKey, {});
516
542
  addContent(SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].type, reissue === null || reissue === void 0 ? void 0 : reissue[SUBMIT_COMPONENT_REISSUE_MAP[item.workOrderComponentType].type]);
@@ -564,9 +590,9 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref40) {
564
590
  }
565
591
  };
566
592
  };
567
- var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref41) {
568
- var addContent = _ref41.addContent,
569
- getNowData = _ref41.getNowData;
593
+ var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref42) {
594
+ var addContent = _ref42.addContent,
595
+ getNowData = _ref42.getNowData;
570
596
  return function (item) {
571
597
  var currentReturn = getNowData(item.uniqueKey, {});
572
598
  var compType = item.workOrderComponentType;
@@ -575,9 +601,9 @@ var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref41) {
575
601
  addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
576
602
  };
577
603
  };
578
- var handleGYReturnGoods = function handleGYReturnGoods(_ref42) {
579
- var addContent = _ref42.addContent,
580
- getNowData = _ref42.getNowData;
604
+ var handleGYReturnGoods = function handleGYReturnGoods(_ref43) {
605
+ var addContent = _ref43.addContent,
606
+ getNowData = _ref43.getNowData;
581
607
  return function (item) {
582
608
  var currentReturn = getNowData(item.uniqueKey, {});
583
609
  var compType = item.workOrderComponentType;
@@ -587,9 +613,9 @@ var handleGYReturnGoods = function handleGYReturnGoods(_ref42) {
587
613
  addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
588
614
  };
589
615
  };
590
- var handleBsPosting = function handleBsPosting(_ref43) {
591
- var addContent = _ref43.addContent,
592
- getNowData = _ref43.getNowData;
616
+ var handleBsPosting = function handleBsPosting(_ref44) {
617
+ var addContent = _ref44.addContent,
618
+ getNowData = _ref44.getNowData;
593
619
  return function (item) {
594
620
  ['bsPostingProvince', 'bsPostingCity', 'bsPostingDistrict'].map(function (key, index) {
595
621
  addContent(key, getNowData("".concat(item.uniqueKey, ".postingAddress[").concat(index, "]"), ''));
@@ -599,9 +625,9 @@ var handleBsPosting = function handleBsPosting(_ref43) {
599
625
  addContent('bsPostingReceiverMobile', getNowData("".concat(item.uniqueKey, ".postingReceiverMobile"), ''));
600
626
  };
601
627
  };
602
- var handleSystemOrder = function handleSystemOrder(_ref44) {
603
- var addContent = _ref44.addContent,
604
- getNowData = _ref44.getNowData;
628
+ var handleSystemOrder = function handleSystemOrder(_ref45) {
629
+ var addContent = _ref45.addContent,
630
+ getNowData = _ref45.getNowData;
605
631
  return function (item) {
606
632
  var selectIds = getNowData("".concat(item.uniqueKey, ".selectIds"), '');
607
633
  var showOrderInfo = getNowData("".concat(item.uniqueKey, ".showOrderInfo"), []);
@@ -615,16 +641,16 @@ var handleSystemOrder = function handleSystemOrder(_ref44) {
615
641
  }));
616
642
  };
617
643
  };
618
- var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref45) {
619
- var addContent = _ref45.addContent,
620
- getNowData = _ref45.getNowData;
644
+ var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref46) {
645
+ var addContent = _ref46.addContent,
646
+ getNowData = _ref46.getNowData;
621
647
  return function (item) {
622
648
  addContent('buyerMessageNotice', getNowData(item.uniqueKey, '未通知'));
623
649
  };
624
650
  };
625
- var handleBsDeliveryNo = function handleBsDeliveryNo(_ref46) {
626
- var addContent = _ref46.addContent,
627
- getNowData = _ref46.getNowData;
651
+ var handleBsDeliveryNo = function handleBsDeliveryNo(_ref47) {
652
+ var addContent = _ref47.addContent,
653
+ getNowData = _ref47.getNowData;
628
654
  return function (item) {
629
655
  var deliveryNoList = getNowData(item.uniqueKey, []);
630
656
  addContent('deliveryNoList', deliveryNoList);
@@ -633,9 +659,9 @@ var handleBsDeliveryNo = function handleBsDeliveryNo(_ref46) {
633
659
  }));
634
660
  };
635
661
  };
636
- var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref47) {
637
- var addContent = _ref47.addContent,
638
- getNowData = _ref47.getNowData;
662
+ var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref48) {
663
+ var addContent = _ref48.addContent,
664
+ getNowData = _ref48.getNowData;
639
665
  return function (item) {
640
666
  var returnGoodsTradeItemList = getNowData(item.uniqueKey, []);
641
667
  addContent('returnGoodsTradeItemList', returnGoodsTradeItemList);
@@ -644,9 +670,9 @@ var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref47) {
644
670
  }));
645
671
  };
646
672
  };
647
- var handleErpTradeId = function handleErpTradeId(_ref48) {
648
- var addContent = _ref48.addContent,
649
- getNowData = _ref48.getNowData;
673
+ var handleErpTradeId = function handleErpTradeId(_ref49) {
674
+ var addContent = _ref49.addContent,
675
+ getNowData = _ref49.getNowData;
650
676
  return function (item) {
651
677
  var tradeItemList = getNowData(item.uniqueKey, []);
652
678
  addContent('tradeItemList', tradeItemList);
@@ -655,9 +681,9 @@ var handleErpTradeId = function handleErpTradeId(_ref48) {
655
681
  }));
656
682
  };
657
683
  };
658
- var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref49) {
659
- var addContent = _ref49.addContent,
660
- getNowData = _ref49.getNowData;
684
+ var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref50) {
685
+ var addContent = _ref50.addContent,
686
+ getNowData = _ref50.getNowData;
661
687
  return function (item) {
662
688
  var tradeItemList = getNowData(item.uniqueKey, []);
663
689
  addContent('erpAfterSaleTradeItemList', tradeItemList);
@@ -666,18 +692,18 @@ var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref49) {
666
692
  }));
667
693
  };
668
694
  };
669
- var handleWlnGoods = function handleWlnGoods(_ref50) {
670
- var addContent = _ref50.addContent,
671
- getNowData = _ref50.getNowData;
695
+ var handleWlnGoods = function handleWlnGoods(_ref51) {
696
+ var addContent = _ref51.addContent,
697
+ getNowData = _ref51.getNowData;
672
698
  return function (item) {
673
699
  var wlnGoods = getNowData(item.uniqueKey, {});
674
700
  addContent('wlnGoods', wlnGoods.wlnGoods);
675
701
  addContent('shopCode', (wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode) || '');
676
702
  };
677
703
  };
678
- var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref51) {
679
- var addContent = _ref51.addContent,
680
- getNowData = _ref51.getNowData;
704
+ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref52) {
705
+ var addContent = _ref52.addContent,
706
+ getNowData = _ref52.getNowData;
681
707
  return function (item) {
682
708
  ['bsE3SystemOrderNo', 'bsE3ReissueType', 'bsE3ReissueMemo', 'bsE3ReissueGoods'].map(function (key) {
683
709
  if (key === 'bsE3ReissueGoods') {
@@ -688,33 +714,33 @@ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref51) {
688
714
  });
689
715
  };
690
716
  };
691
- var handleWdtShopSelect = function handleWdtShopSelect(_ref52) {
692
- var addContent = _ref52.addContent,
693
- getNowData = _ref52.getNowData;
717
+ var handleWdtShopSelect = function handleWdtShopSelect(_ref53) {
718
+ var addContent = _ref53.addContent,
719
+ getNowData = _ref53.getNowData;
694
720
  return function (item) {
695
721
  ['shopCode'].map(function (key) {
696
722
  addContent(key, getNowData("".concat(item.uniqueKey), ''));
697
723
  });
698
724
  };
699
725
  };
700
- var handleDefault = function handleDefault(_ref53) {
701
- var addContent = _ref53.addContent,
702
- getNowData = _ref53.getNowData;
726
+ var handleDefault = function handleDefault(_ref54) {
727
+ var addContent = _ref54.addContent,
728
+ getNowData = _ref54.getNowData;
703
729
  return function (item) {
704
730
  addContent(V.camelCase(item.workOrderComponentType), getNowData(item.uniqueKey, ''));
705
731
  };
706
732
  };
707
- var handleStatusField = function handleStatusField(_ref54) {
708
- var addContent = _ref54.addContent,
709
- getNowData = _ref54.getNowData;
733
+ var handleStatusField = function handleStatusField(_ref55) {
734
+ var addContent = _ref55.addContent,
735
+ getNowData = _ref55.getNowData;
710
736
  return function (item) {
711
737
  addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey, ".status"), ''));
712
738
  addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].reason, getNowData("".concat(item.uniqueKey, ".reason"), ''));
713
739
  };
714
740
  };
715
- var handleGoodStatus = function handleGoodStatus(_ref55) {
716
- var addContent = _ref55.addContent,
717
- getNowData = _ref55.getNowData;
741
+ var handleGoodStatus = function handleGoodStatus(_ref56) {
742
+ var addContent = _ref56.addContent,
743
+ getNowData = _ref56.getNowData;
718
744
  return function (item) {
719
745
  addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].list, getNowData("".concat(item.uniqueKey), []));
720
746
  addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey), []).map(function (item) {
@@ -722,13 +748,13 @@ var handleGoodStatus = function handleGoodStatus(_ref55) {
722
748
  }));
723
749
  };
724
750
  };
725
- var processComponent = function processComponent(_ref56) {
726
- var params = _ref56.params,
727
- nowData = _ref56.nowData,
728
- updateFlag = _ref56.updateFlag,
729
- detail = _ref56.detail,
730
- accountName = _ref56.accountName,
731
- getValueByField = _ref56.getValueByField;
751
+ var processComponent = function processComponent(_ref57) {
752
+ var params = _ref57.params,
753
+ nowData = _ref57.nowData,
754
+ updateFlag = _ref57.updateFlag,
755
+ detail = _ref57.detail,
756
+ accountName = _ref57.accountName,
757
+ getValueByField = _ref57.getValueByField;
732
758
  return function (item) {
733
759
  var contentVoList = [];
734
760
  var uniqueKeyPrefix = "".concat(item.uniqueKey, "_");
@@ -781,6 +807,7 @@ var processComponent = function processComponent(_ref56) {
781
807
  case 'EXECUTE_ACTION_TYPE':
782
808
  case 'SKX_CREATE_TIME':
783
809
  case 'SKX_OUTBOUND_NOTICE_NO':
810
+ case 'ERP_ORDER_STATUS':
784
811
  wrapFn(handleOnlyAddContent);
785
812
  break;
786
813
  case 'RATE':
@@ -919,6 +946,9 @@ var processComponent = function processComponent(_ref56) {
919
946
  case 'SKX_GOODS':
920
947
  wrapFn(handleSkxGoods);
921
948
  break;
949
+ case 'ORDER_SUBFORM':
950
+ wrapFn(handleOrderSubForm);
951
+ break;
922
952
  case 'BS_EXCHANGE_GOODS':
923
953
  wrapFn(handleBsExchangeGoods);
924
954
  break;
@@ -21,7 +21,7 @@ import { message } from 'antd';
21
21
  import { get, last, cloneDeep, isEqual, set } from 'lodash';
22
22
  import { orderDetail, queryShopByTid } from "../../model/servers/api";
23
23
  import moment from 'moment';
24
- import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, setSessionStorage, skxOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
24
+ import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, setSessionStorage, skxOrderTransform, orderSubFormOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
25
25
  import Monitor from 'kmkf-monitor';
26
26
  import { PlatForm } from "../../model/flowTemplateDetail/types";
27
27
  import transformWorkOrderData from "./transformWorkOrderData";
@@ -63,7 +63,8 @@ var workTypeKeys = {
63
63
  NEW_PAYMENT_STATUS: 'newPaymentStatus',
64
64
  BUSINESS_ORDER_NO: 'businessOrderNo',
65
65
  PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
66
- EXECUTE_ACTION_TYPE: 'executeActionType'
66
+ EXECUTE_ACTION_TYPE: 'executeActionType',
67
+ ERP_ORDER_STATUS: 'erpOrderStatus'
67
68
  };
68
69
 
69
70
  // 根据组件类型获取组件的UniqueKey
@@ -139,7 +140,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
139
140
  //订单返填
140
141
  export var orderBack = /*#__PURE__*/function () {
141
142
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
142
- var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _skxOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, skxOrder, kmVideoOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, skxOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, gyInfo, jstInfo, skxInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
143
+ var order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, _res$data, res, shopInfo, _res$data3, _res$data4, _res$data5, JOIN_SHOP, hasFlagMap, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _skxOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, skxOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, skxOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jstInfo, skxInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
143
144
  return _regeneratorRuntime().wrap(function _callee$(_context) {
144
145
  while (1) switch (_context.prev = _context.next) {
145
146
  case 0:
@@ -258,13 +259,26 @@ export var orderBack = /*#__PURE__*/function () {
258
259
  } else {
259
260
  promise.push(Promise.resolve([]));
260
261
  }
262
+ // 子订单根据订单号/店铺获取
263
+ OrderSubFormComponent = templateDetail.componentDtoList.find(function (item) {
264
+ return item.workOrderComponentType === 'ORDER_SUBFORM';
265
+ });
266
+ if (OrderSubFormComponent) {
267
+ console.log('44444');
268
+ promise.push(servers.orderSubForm.getOrderSubFormDataAsync({
269
+ orderNo: order_no,
270
+ shopId: shopId
271
+ }));
272
+ } else {
273
+ promise.push(Promise.resolve([]));
274
+ }
261
275
 
262
276
  //需按照orderBackMap中的顺序结构
263
- _context.next = 34;
277
+ _context.next = 36;
264
278
  return Promise.allSettled(promise);
265
- case 34:
279
+ case 36:
266
280
  _yield$Promise$allSet = _context.sent;
267
- _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 11);
281
+ _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 12);
268
282
  data = _yield$Promise$allSet2[0];
269
283
  xiaozhiOrder = _yield$Promise$allSet2[1];
270
284
  jstOrder = _yield$Promise$allSet2[2];
@@ -276,6 +290,7 @@ export var orderBack = /*#__PURE__*/function () {
276
290
  gyOrder = _yield$Promise$allSet2[8];
277
291
  skxOrder = _yield$Promise$allSet2[9];
278
292
  kmVideoOrder = _yield$Promise$allSet2[10];
293
+ orderSubFormOrder = _yield$Promise$allSet2[11];
279
294
  // TODO: 针对订单支付方式是微信还是支付宝,后端接口返回一个message用来提示使用
280
295
  console.log('--订单反填数据--', {
281
296
  data: data,
@@ -288,7 +303,8 @@ export var orderBack = /*#__PURE__*/function () {
288
303
  kmOrder: kmOrder,
289
304
  gyOrder: gyOrder,
290
305
  skxOrder: skxOrder,
291
- kmVideoOrder: kmVideoOrder
306
+ kmVideoOrder: kmVideoOrder,
307
+ orderSubFormOrder: orderSubFormOrder
292
308
  });
293
309
  pushGyLog('gyOrder', gyOrder);
294
310
  if (data !== null && data !== void 0 && (_data$value = data.value) !== null && _data$value !== void 0 && _data$value.message) {
@@ -351,6 +367,12 @@ export var orderBack = /*#__PURE__*/function () {
351
367
  if (kmInfo) {
352
368
  kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
353
369
  }
370
+ orderSubFormInfo = orderSubFormOrderTransform({
371
+ subOrderList: (orderSubFormOrder === null || orderSubFormOrder === void 0 ? void 0 : orderSubFormOrder.value) || [],
372
+ orderNo: order_no,
373
+ allOrders: (orderSubFormOrder === null || orderSubFormOrder === void 0 ? void 0 : orderSubFormOrder.value) || [],
374
+ shopId: shopId
375
+ });
354
376
  gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
355
377
  allOrders: gyOrders === null || gyOrders === void 0 ? void 0 : gyOrders.trades,
356
378
  componentList: templateDetail.componentDtoList,
@@ -485,12 +507,13 @@ export var orderBack = /*#__PURE__*/function () {
485
507
  bsE3Order: bsE3Info,
486
508
  kmOrder: kmInfo,
487
509
  gyOrder: gyInfo,
488
- skxOrder: skxInfo
510
+ skxOrder: skxInfo,
511
+ orderSubFormOrder: orderSubFormInfo
489
512
  });
490
513
  pushGyLog('detail', detail);
491
514
  //抖音数据特殊处理
492
515
  if (!orderInfo) {
493
- _context.next = 124;
516
+ _context.next = 128;
494
517
  break;
495
518
  }
496
519
  if (shopSourceStr === 'FXG') {
@@ -502,7 +525,7 @@ export var orderBack = /*#__PURE__*/function () {
502
525
  hasSelectItem = HasErpItemSelectHandle(templateDetail);
503
526
  erpPromiseList = [];
504
527
  if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
505
- _context.next = 108;
528
+ _context.next = 112;
506
529
  break;
507
530
  }
508
531
  list = detail['itemList'];
@@ -520,10 +543,10 @@ export var orderBack = /*#__PURE__*/function () {
520
543
  resolve({});
521
544
  });
522
545
  });
523
- _context.prev = 98;
524
- _context.next = 101;
546
+ _context.prev = 102;
547
+ _context.next = 105;
525
548
  return Promise.all(promises);
526
- case 101:
549
+ case 105:
527
550
  erpPromiseList = _context.sent;
528
551
  detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
529
552
  return _objectSpread(_objectSpread({}, item), {}, {
@@ -533,25 +556,25 @@ export var orderBack = /*#__PURE__*/function () {
533
556
  })
534
557
  });
535
558
  });
536
- _context.next = 108;
559
+ _context.next = 112;
537
560
  break;
538
- case 105:
539
- _context.prev = 105;
540
- _context.t1 = _context["catch"](98);
561
+ case 109:
562
+ _context.prev = 109;
563
+ _context.t1 = _context["catch"](102);
541
564
  console.error('调用erp获取宝贝编码错误', _context.t1);
542
- case 108:
565
+ case 112:
543
566
  // 判断是否存在签收时间组件
544
567
  hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码,则调用接口获取签收时间
545
568
  if (!hasSigningDatetime) {
546
- _context.next = 124;
569
+ _context.next = 128;
547
570
  break;
548
571
  }
549
572
  if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
550
- _context.next = 123;
573
+ _context.next = 127;
551
574
  break;
552
575
  }
553
- _context.prev = 111;
554
- _context.next = 114;
576
+ _context.prev = 115;
577
+ _context.next = 118;
555
578
  return request({
556
579
  url: '/qy/logistics/logisticsSignTime',
557
580
  method: 'post',
@@ -561,21 +584,21 @@ export var orderBack = /*#__PURE__*/function () {
561
584
  mailNo: orderInfo.expressLogisticsCode
562
585
  }
563
586
  });
564
- case 114:
587
+ case 118:
565
588
  signDatetime = _context.sent;
566
589
  detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
567
- _context.next = 121;
590
+ _context.next = 125;
568
591
  break;
569
- case 118:
570
- _context.prev = 118;
571
- _context.t2 = _context["catch"](111);
592
+ case 122:
593
+ _context.prev = 122;
594
+ _context.t2 = _context["catch"](115);
572
595
  console.error('调用签收时间错误', _context.t2);
573
- case 121:
574
- _context.next = 124;
596
+ case 125:
597
+ _context.next = 128;
575
598
  break;
576
- case 123:
599
+ case 127:
577
600
  detail['tradeSigningDateTime'] = '';
578
- case 124:
601
+ case 128:
579
602
  values = orderBackFormValues({
580
603
  detail: detail,
581
604
  _get_order_fail_: !orderInfo,
@@ -620,21 +643,21 @@ export var orderBack = /*#__PURE__*/function () {
620
643
  shopId: shopId
621
644
  }));
622
645
  callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
623
- _context.next = 135;
646
+ _context.next = 139;
624
647
  break;
625
- case 132:
626
- _context.prev = 132;
648
+ case 136:
649
+ _context.prev = 136;
627
650
  _context.t3 = _context["catch"](25);
628
651
  console.error(_context.t3);
629
- case 135:
630
- _context.prev = 135;
652
+ case 139:
653
+ _context.prev = 139;
631
654
  setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
632
- return _context.finish(135);
633
- case 138:
655
+ return _context.finish(139);
656
+ case 142:
634
657
  case "end":
635
658
  return _context.stop();
636
659
  }
637
- }, _callee, null, [[5, 12, 15, 18], [25, 132, 135, 138], [98, 105], [111, 118]]);
660
+ }, _callee, null, [[5, 12, 15, 18], [25, 136, 139, 142], [102, 109], [115, 122]]);
638
661
  }));
639
662
  return function orderBack(_x) {
640
663
  return _ref2.apply(this, arguments);
@@ -213,22 +213,40 @@ var processSubForm = function processSubForm(getValue) {
213
213
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_productList")), []));
214
214
  };
215
215
  };
216
+ var processOrderSubForm = function processOrderSubForm(templateColumns) {
217
+ return function (getValue) {
218
+ return function (nex, config) {
219
+ var _values = {
220
+ subOrderList: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_subOrderList")), [])
221
+ };
222
+ var orderNo = '';
223
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
224
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
225
+ });
226
+ if (tradeId) {
227
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
228
+ }
229
+ _values.orderNo = orderNo;
230
+ return _defineProperty({}, nex.uniqueKey, _values);
231
+ };
232
+ };
233
+ };
216
234
  var processExpressLogisticsSelect = function processExpressLogisticsSelect(getValue) {
217
235
  return function (nex, config) {
218
- var _ref23;
219
- return _ref23 = {}, _defineProperty(_ref23, nex.uniqueKey, {
236
+ var _ref24;
237
+ return _ref24 = {}, _defineProperty(_ref24, nex.uniqueKey, {
220
238
  company: getValue("".concat(nex.uniqueKey, "_expressLogisticsCompany")),
221
239
  order: getValue("".concat(nex.uniqueKey, "_expressLogisticsCode"))
222
- }), _defineProperty(_ref23, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCompany"))), _defineProperty(_ref23, "".concat(nex.uniqueKey, "_expressLogisticsCode"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCode"))), _ref23;
240
+ }), _defineProperty(_ref24, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCompany"))), _defineProperty(_ref24, "".concat(nex.uniqueKey, "_expressLogisticsCode"), getValue("".concat(nex.uniqueKey, "_expressLogisticsCode"))), _ref24;
223
241
  };
224
242
  };
225
243
  var processReturnLogisticsSelect = function processReturnLogisticsSelect(getValue) {
226
244
  return function (nex, config) {
227
- var _ref24;
228
- return _ref24 = {}, _defineProperty(_ref24, nex.uniqueKey, {
245
+ var _ref25;
246
+ return _ref25 = {}, _defineProperty(_ref25, nex.uniqueKey, {
229
247
  company: getValue("".concat(nex.uniqueKey, "_returnLogisticsCompany")),
230
248
  order: getValue("".concat(nex.uniqueKey, "_returnLogisticsCode"))
231
- }), _defineProperty(_ref24, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCompany"))), _defineProperty(_ref24, "".concat(nex.uniqueKey, "_returnLogisticsCode"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCode"))), _ref24;
249
+ }), _defineProperty(_ref25, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCompany"))), _defineProperty(_ref25, "".concat(nex.uniqueKey, "_returnLogisticsCode"), getValue("".concat(nex.uniqueKey, "_returnLogisticsCode"))), _ref25;
232
250
  };
233
251
  };
234
252
  var processRemarkInput = function processRemarkInput(getValue) {
@@ -243,25 +261,25 @@ var processRemarkInput = function processRemarkInput(getValue) {
243
261
  };
244
262
  var processStatus = function processStatus(getValue) {
245
263
  return function (nex, config) {
246
- var _ref26;
264
+ var _ref27;
247
265
  var customerService = getValue("".concat(nex.uniqueKey, "_customerService"));
248
- return _ref26 = {}, _defineProperty(_ref26, nex.uniqueKey, {
266
+ return _ref27 = {}, _defineProperty(_ref27, nex.uniqueKey, {
249
267
  status: getValue("".concat(nex.uniqueKey, "_status")) || (config === null || config === void 0 ? void 0 : config.status),
250
268
  customerService: jsonParseSecurity(customerService, customerService)
251
- }), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_processTime"), getValue('processTime')), _defineProperty(_ref26, "".concat(nex.uniqueKey, "_lastProcessingTime"), getValue('lastProcessingTime')), _ref26;
269
+ }), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_processTime"), getValue('processTime')), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_lastProcessingTime"), getValue('lastProcessingTime')), _ref27;
252
270
  };
253
271
  };
254
272
  var processOrdinaryInvoice = function processOrdinaryInvoice(getValue) {
255
273
  return function (nex, config) {
256
- var _ref27;
274
+ var _ref28;
257
275
  var ordinaryMoney = getValue("".concat(nex.uniqueKey, "_ordinaryMoney"));
258
276
  var ordinarySerial = getValue("".concat(nex.uniqueKey, "_ordinarySerial"));
259
277
  var ordinaryTaitou = getValue("".concat(nex.uniqueKey, "_ordinaryTaitou"));
260
- return _ref27 = {}, _defineProperty(_ref27, nex.uniqueKey, {
278
+ return _ref28 = {}, _defineProperty(_ref28, nex.uniqueKey, {
261
279
  ordinaryMoney: ordinaryMoney,
262
280
  ordinarySerial: ordinarySerial,
263
281
  ordinaryTaitou: ordinaryTaitou
264
- }), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinaryMoney"), ordinaryMoney ? Number(ordinaryMoney).toFixed(2) : null), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinarySerial"), ordinarySerial), _defineProperty(_ref27, "".concat(nex.uniqueKey, "_ordinaryTaitou"), ordinaryTaitou), _ref27;
282
+ }), _defineProperty(_ref28, "".concat(nex.uniqueKey, "_ordinaryMoney"), ordinaryMoney ? Number(ordinaryMoney).toFixed(2) : null), _defineProperty(_ref28, "".concat(nex.uniqueKey, "_ordinarySerial"), ordinarySerial), _defineProperty(_ref28, "".concat(nex.uniqueKey, "_ordinaryTaitou"), ordinaryTaitou), _ref28;
265
283
  };
266
284
  };
267
285
  var processLogisticsInterception = function processLogisticsInterception(getValue) {
@@ -318,12 +336,12 @@ var processItemSelectThird = function processItemSelectThird(getValue) {
318
336
  };
319
337
  var processEnterPrisePayment = function processEnterPrisePayment(getValue) {
320
338
  return function (nex, config) {
321
- var _ref34;
339
+ var _ref35;
322
340
  var subFields = ['enterprisePaymentAlipayNick', 'enterprisePaymentAlipayNo', 'enterprisePaymentBuyerNick', 'enterprisePaymentBuyerOpenUid', 'enterprisePaymentRefundFee', 'enterprisePaymentStatus', 'enterprisePaymentTid'];
323
341
  var map = subFields.reduce(function (cur, nxt) {
324
342
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, nxt, getValue("".concat(nex.uniqueKey, "_").concat(nxt))));
325
343
  }, {});
326
- return _ref34 = {}, _defineProperty(_ref34, nex.uniqueKey, map), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref34, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref34;
344
+ return _ref35 = {}, _defineProperty(_ref35, nex.uniqueKey, map), _defineProperty(_ref35, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"))), _defineProperty(_ref35, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"))), _defineProperty(_ref35, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"))), _defineProperty(_ref35, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"))), _defineProperty(_ref35, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentStatus"))), _defineProperty(_ref35, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTime"))), _defineProperty(_ref35, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), getValue("".concat(nex.uniqueKey, "_enterprisePaymentTid"))), _ref35;
327
345
  };
328
346
  };
329
347
  var processJstLogistics = function processJstLogistics(getValue) {
@@ -811,6 +829,11 @@ var processOrderType = function processOrderType(getValue) {
811
829
  return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_erpOrderType")) || (config === null || config === void 0 ? void 0 : config.select));
812
830
  };
813
831
  };
832
+ var processErpOrderStatus = function processErpOrderStatus(getValue) {
833
+ return function (nex, config) {
834
+ return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_erpOrderStatus")) || (config === null || config === void 0 ? void 0 : config.select));
835
+ };
836
+ };
814
837
  var processRefundType = function processRefundType(getValue) {
815
838
  return function (nex, config) {
816
839
  return _defineProperty({}, nex.uniqueKey, getValue("".concat(nex.uniqueKey, "_orderRefundType")) || (config === null || config === void 0 ? void 0 : config.select));
@@ -1026,14 +1049,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
1026
1049
  };
1027
1050
  var processLabel = function processLabel(getValue) {
1028
1051
  return function (nex, config) {
1029
- var _ref72;
1030
- return _ref72 = {}, _defineProperty(_ref72, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref72, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref72;
1052
+ var _ref74;
1053
+ return _ref74 = {}, _defineProperty(_ref74, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref74, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref74;
1031
1054
  };
1032
1055
  };
1033
1056
  var processMemberLevel = function processMemberLevel(getValue) {
1034
1057
  return function (nex, config) {
1035
- var _ref73;
1036
- return _ref73 = {}, _defineProperty(_ref73, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref73, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref73;
1058
+ var _ref75;
1059
+ return _ref75 = {}, _defineProperty(_ref75, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref75, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref75;
1037
1060
  };
1038
1061
  };
1039
1062
  var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1150,6 +1173,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
1150
1173
  GY_SEND_GOOD: processErpSendGood,
1151
1174
  BS_POSTING: processBsPosting,
1152
1175
  BS_GOODS: processBsGoods,
1176
+ ORDER_SUBFORM: processOrderSubForm(templateColumns),
1153
1177
  WDT_GOODS: processWdtGoods(templateColumns),
1154
1178
  BS_E3_GOODS: processBsE3Goods(templateColumns),
1155
1179
  GY_GOODS: processGyGoods(templateColumns),
@@ -1172,6 +1196,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
1172
1196
  GY_SYSTEM_ORDER: processErpSystemOrder,
1173
1197
  BUYER_MESSAGE_NOTICE: processBuyerMessageNotice,
1174
1198
  ORDER_TYPE: processOrderType,
1199
+ ERP_ORDER_STATUS: processErpOrderStatus,
1175
1200
  REFUND_TYPE: processRefundType,
1176
1201
  RETURN_GOODS_TRADE_ID: processErpTradeId,
1177
1202
  BS_DELIVERY_NO: processErpTradeId,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.4.0-rc.0",
3
+ "version": "2.6.0-rc.0",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "2.4.0-rc.0",
36
- "@kmkf-fe-packages/kmkf-utils": "2.4.0-rc.0",
37
- "@kmkf-fe-packages/services-components": "2.4.0-rc.0",
35
+ "@kmkf-fe-packages/basic-components": "2.5.0-rc.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "2.5.0-rc.0",
37
+ "@kmkf-fe-packages/services-components": "2.6.0-rc.0",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
73
73
  "publishConfig": {
74
74
  "access": "public"
75
75
  },
76
- "gitHead": "7feef13871ed0ec0a49b5a30a5886cbf3d90cd5e",
76
+ "gitHead": "aedc6405e1932ddfbca73a5c85c487df12f543bc",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }