@kmkf-fe-packages/kmkf-work-order-service-component 2.2.4 → 2.2.6

package/dist/esm/common/utils/constant.js

@@ -107,7 +107,8 @@ export var DEFAULT_STRING_COMPONENT_TYPE_FIELD_MAPPING = {
   REFUND_TYPE: 'orderRefundType',
   EXECUTE_ACTION_TYPE: 'executeActionType',
   SKX_CREATE_TIME: 'dateTime',
-  SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo'
+  SKX_OUTBOUND_NOTICE_NO: 'skxOutboundNoticeNo',
+  ERP_ORDER_STATUS: 'erpOrderStatus'
 };
 export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
   RATE: 'rate',
@@ -116,7 +117,8 @@ export var DEFAULT_ARRAY_COMPONENT_TYPE_FIELD_MAPPING = {
   ITEM_SELECT: 'itemList',
   ITEM_SELECT_THIRD: 'itemList',
   ITEM_ID: 'itemList',
-  ITEM_ENCODE: 'itemList'
+  ITEM_ENCODE: 'itemList',
+  ORDER_SUBFORM: 'subOrderList'
 };
 export var SUBMIT_COMPONENT_STATUS_MAP = {
   REISSUE_STATUS: {

package/dist/esm/common/utils/submitDataTransOldFormat.js

@@ -1,15 +1,15 @@
 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); }
-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; }
-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; }
-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; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-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); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 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."); }
 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); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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; }
+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; }
+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; }
+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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+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); }
 import { get, set } from 'lodash';
 import moment from 'moment';
 import V from 'voca';
@@ -18,6 +18,9 @@ import { findValueByField } from "./tools";
 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";
 import cache from "../cache";
 import Monitor from 'kmkf-monitor';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import { orderSubFormConstants } from '@kmkf-fe-packages/basic-components';
+var getSelectWidgetMap = orderSubFormConstants.getSelectWidgetMap;
 var handleTradeIdInput = function handleTradeIdInput(_ref) {
   var addContent = _ref.addContent,
     upgradeParams = _ref.upgradeParams,
@@ -463,9 +466,32 @@ var handleSkxGoods = function handleSkxGoods(_ref36) {
     addContent('skxGoods', goods === null || goods === void 0 ? void 0 : goods.skxGoods);
   };
 };
-var handleBsExchangeGoods = function handleBsExchangeGoods(_ref37) {
+var handleOrderSubForm = function handleOrderSubForm(_ref37) {
   var addContent = _ref37.addContent,
     getNowData = _ref37.getNowData;
+  return function (item) {
+    var _orderSubForm$subOrde;
+    var orderSubForm = getNowData(item.uniqueKey, {});
+    var selectWidgetMap = getSelectWidgetMap(ExpressData.getInstance());
+    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) {
+      Object.keys(item).forEach(function (key) {
+        if (selectWidgetMap !== null && selectWidgetMap !== void 0 && selectWidgetMap[key]) {
+          var mapValue = selectWidgetMap === null || selectWidgetMap === void 0 ? void 0 : selectWidgetMap[key];
+          if (mapValue && typeof mapValue === 'function') {
+            item["".concat(key, "Desc")] = mapValue === null || mapValue === void 0 ? void 0 : mapValue(item[key]);
+          } else {
+            item["".concat(key, "Desc")] = mapValue === null || mapValue === void 0 ? void 0 : mapValue[item[key]];
+          }
+        }
+      });
+      return _objectSpread({}, item);
+    });
+    addContent('subOrderList', subOrderList);
+  };
+};
+var handleBsExchangeGoods = function handleBsExchangeGoods(_ref38) {
+  var addContent = _ref38.addContent,
+    getNowData = _ref38.getNowData;
   return function (item) {
     var _bsExchange$bsExchang;
     var bsExchange = getNowData(item.uniqueKey, {});
@@ -490,27 +516,27 @@ var handleBsExchangeGoods = function handleBsExchangeGoods(_ref37) {
     }
   };
 };
-var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref38) {
-  var addContent = _ref38.addContent,
-    getNowData = _ref38.getNowData;
+var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref39) {
+  var addContent = _ref39.addContent,
+    getNowData = _ref39.getNowData;
   return function (item) {
     var wdtExchange = getNowData(item.uniqueKey, {});
     addContent('wdtExchangeGoods', wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.wdtExchangeGoods);
     addContent('shopCode', (wdtExchange === null || wdtExchange === void 0 ? void 0 : wdtExchange.shopCode) || '');
   };
 };
-var handleJstExchangeGoods = function handleJstExchangeGoods(_ref39) {
-  var addContent = _ref39.addContent,
-    getNowData = _ref39.getNowData;
+var handleJstExchangeGoods = function handleJstExchangeGoods(_ref40) {
+  var addContent = _ref40.addContent,
+    getNowData = _ref40.getNowData;
   return function (item) {
     var jstExchange = getNowData(item.uniqueKey, {});
     addContent('jstExchangeGoods', jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.jstExchangeGoods);
     addContent('shopCode', (jstExchange === null || jstExchange === void 0 ? void 0 : jstExchange.shopCode) || '');
   };
 };
-var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref40) {
-  var addContent = _ref40.addContent,
-    getNowData = _ref40.getNowData;
+var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref41) {
+  var addContent = _ref41.addContent,
+    getNowData = _ref41.getNowData;
   return function (item) {
     var reissue = getNowData(item.uniqueKey, {});
     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) {
     }
   };
 };
-var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref41) {
-  var addContent = _ref41.addContent,
-    getNowData = _ref41.getNowData;
+var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref42) {
+  var addContent = _ref42.addContent,
+    getNowData = _ref42.getNowData;
   return function (item) {
     var currentReturn = getNowData(item.uniqueKey, {});
     var compType = item.workOrderComponentType;
@@ -575,9 +601,9 @@ var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref41) {
     addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
   };
 };
-var handleGYReturnGoods = function handleGYReturnGoods(_ref42) {
-  var addContent = _ref42.addContent,
-    getNowData = _ref42.getNowData;
+var handleGYReturnGoods = function handleGYReturnGoods(_ref43) {
+  var addContent = _ref43.addContent,
+    getNowData = _ref43.getNowData;
   return function (item) {
     var currentReturn = getNowData(item.uniqueKey, {});
     var compType = item.workOrderComponentType;
@@ -587,9 +613,9 @@ var handleGYReturnGoods = function handleGYReturnGoods(_ref42) {
     addContent(SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey, (currentReturn === null || currentReturn === void 0 ? void 0 : currentReturn[SUBMIT_COMPONENT_RETURN_GOODS_MAP[compType].shopCodeKey]) || '');
   };
 };
-var handleBsPosting = function handleBsPosting(_ref43) {
-  var addContent = _ref43.addContent,
-    getNowData = _ref43.getNowData;
+var handleBsPosting = function handleBsPosting(_ref44) {
+  var addContent = _ref44.addContent,
+    getNowData = _ref44.getNowData;
   return function (item) {
     ['bsPostingProvince', 'bsPostingCity', 'bsPostingDistrict'].map(function (key, index) {
       addContent(key, getNowData("".concat(item.uniqueKey, ".postingAddress[").concat(index, "]"), ''));
@@ -599,9 +625,9 @@ var handleBsPosting = function handleBsPosting(_ref43) {
     addContent('bsPostingReceiverMobile', getNowData("".concat(item.uniqueKey, ".postingReceiverMobile"), ''));
   };
 };
-var handleSystemOrder = function handleSystemOrder(_ref44) {
-  var addContent = _ref44.addContent,
-    getNowData = _ref44.getNowData;
+var handleSystemOrder = function handleSystemOrder(_ref45) {
+  var addContent = _ref45.addContent,
+    getNowData = _ref45.getNowData;
   return function (item) {
     var selectIds = getNowData("".concat(item.uniqueKey, ".selectIds"), '');
     var showOrderInfo = getNowData("".concat(item.uniqueKey, ".showOrderInfo"), []);
@@ -615,16 +641,16 @@ var handleSystemOrder = function handleSystemOrder(_ref44) {
     }));
   };
 };
-var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref45) {
-  var addContent = _ref45.addContent,
-    getNowData = _ref45.getNowData;
+var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref46) {
+  var addContent = _ref46.addContent,
+    getNowData = _ref46.getNowData;
   return function (item) {
     addContent('buyerMessageNotice', getNowData(item.uniqueKey, '未通知'));
   };
 };
-var handleBsDeliveryNo = function handleBsDeliveryNo(_ref46) {
-  var addContent = _ref46.addContent,
-    getNowData = _ref46.getNowData;
+var handleBsDeliveryNo = function handleBsDeliveryNo(_ref47) {
+  var addContent = _ref47.addContent,
+    getNowData = _ref47.getNowData;
   return function (item) {
     var deliveryNoList = getNowData(item.uniqueKey, []);
     addContent('deliveryNoList', deliveryNoList);
@@ -633,9 +659,9 @@ var handleBsDeliveryNo = function handleBsDeliveryNo(_ref46) {
     }));
   };
 };
-var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref47) {
-  var addContent = _ref47.addContent,
-    getNowData = _ref47.getNowData;
+var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref48) {
+  var addContent = _ref48.addContent,
+    getNowData = _ref48.getNowData;
   return function (item) {
     var returnGoodsTradeItemList = getNowData(item.uniqueKey, []);
     addContent('returnGoodsTradeItemList', returnGoodsTradeItemList);
@@ -644,9 +670,9 @@ var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref47) {
     }));
   };
 };
-var handleErpTradeId = function handleErpTradeId(_ref48) {
-  var addContent = _ref48.addContent,
-    getNowData = _ref48.getNowData;
+var handleErpTradeId = function handleErpTradeId(_ref49) {
+  var addContent = _ref49.addContent,
+    getNowData = _ref49.getNowData;
   return function (item) {
     var tradeItemList = getNowData(item.uniqueKey, []);
     addContent('tradeItemList', tradeItemList);
@@ -655,9 +681,9 @@ var handleErpTradeId = function handleErpTradeId(_ref48) {
     }));
   };
 };
-var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref49) {
-  var addContent = _ref49.addContent,
-    getNowData = _ref49.getNowData;
+var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref50) {
+  var addContent = _ref50.addContent,
+    getNowData = _ref50.getNowData;
   return function (item) {
     var tradeItemList = getNowData(item.uniqueKey, []);
     addContent('erpAfterSaleTradeItemList', tradeItemList);
@@ -666,18 +692,18 @@ var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref49) {
     }));
   };
 };
-var handleWlnGoods = function handleWlnGoods(_ref50) {
-  var addContent = _ref50.addContent,
-    getNowData = _ref50.getNowData;
+var handleWlnGoods = function handleWlnGoods(_ref51) {
+  var addContent = _ref51.addContent,
+    getNowData = _ref51.getNowData;
   return function (item) {
     var wlnGoods = getNowData(item.uniqueKey, {});
     addContent('wlnGoods', wlnGoods.wlnGoods);
     addContent('shopCode', (wlnGoods === null || wlnGoods === void 0 ? void 0 : wlnGoods.shopCode) || '');
   };
 };
-var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref51) {
-  var addContent = _ref51.addContent,
-    getNowData = _ref51.getNowData;
+var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref52) {
+  var addContent = _ref52.addContent,
+    getNowData = _ref52.getNowData;
   return function (item) {
     ['bsE3SystemOrderNo', 'bsE3ReissueType', 'bsE3ReissueMemo', 'bsE3ReissueGoods'].map(function (key) {
       if (key === 'bsE3ReissueGoods') {
@@ -688,33 +714,33 @@ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref51) {
     });
   };
 };
-var handleWdtShopSelect = function handleWdtShopSelect(_ref52) {
-  var addContent = _ref52.addContent,
-    getNowData = _ref52.getNowData;
+var handleWdtShopSelect = function handleWdtShopSelect(_ref53) {
+  var addContent = _ref53.addContent,
+    getNowData = _ref53.getNowData;
   return function (item) {
     ['shopCode'].map(function (key) {
       addContent(key, getNowData("".concat(item.uniqueKey), ''));
     });
   };
 };
-var handleDefault = function handleDefault(_ref53) {
-  var addContent = _ref53.addContent,
-    getNowData = _ref53.getNowData;
+var handleDefault = function handleDefault(_ref54) {
+  var addContent = _ref54.addContent,
+    getNowData = _ref54.getNowData;
   return function (item) {
     addContent(V.camelCase(item.workOrderComponentType), getNowData(item.uniqueKey, ''));
   };
 };
-var handleStatusField = function handleStatusField(_ref54) {
-  var addContent = _ref54.addContent,
-    getNowData = _ref54.getNowData;
+var handleStatusField = function handleStatusField(_ref55) {
+  var addContent = _ref55.addContent,
+    getNowData = _ref55.getNowData;
   return function (item) {
     addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].status, getNowData("".concat(item.uniqueKey, ".status"), ''));
     addContent(SUBMIT_COMPONENT_STATUS_MAP[item.workOrderComponentType].reason, getNowData("".concat(item.uniqueKey, ".reason"), ''));
   };
 };
-var handleGoodStatus = function handleGoodStatus(_ref55) {
-  var addContent = _ref55.addContent,
-    getNowData = _ref55.getNowData;
+var handleGoodStatus = function handleGoodStatus(_ref56) {
+  var addContent = _ref56.addContent,
+    getNowData = _ref56.getNowData;
   return function (item) {
     addContent(SUBMIT_COMPONENT_GOOD_STATUS_MAP[item.workOrderComponentType].list, getNowData("".concat(item.uniqueKey), []));
     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) {
     }));
   };
 };
-var processComponent = function processComponent(_ref56) {
-  var params = _ref56.params,
-    nowData = _ref56.nowData,
-    updateFlag = _ref56.updateFlag,
-    detail = _ref56.detail,
-    accountName = _ref56.accountName,
-    getValueByField = _ref56.getValueByField;
+var processComponent = function processComponent(_ref57) {
+  var params = _ref57.params,
+    nowData = _ref57.nowData,
+    updateFlag = _ref57.updateFlag,
+    detail = _ref57.detail,
+    accountName = _ref57.accountName,
+    getValueByField = _ref57.getValueByField;
   return function (item) {
     var contentVoList = [];
     var uniqueKeyPrefix = "".concat(item.uniqueKey, "_");
@@ -781,6 +807,7 @@ var processComponent = function processComponent(_ref56) {
       case 'EXECUTE_ACTION_TYPE':
       case 'SKX_CREATE_TIME':
       case 'SKX_OUTBOUND_NOTICE_NO':
+      case 'ERP_ORDER_STATUS':
         wrapFn(handleOnlyAddContent);
         break;
       case 'RATE':
@@ -919,6 +946,9 @@ var processComponent = function processComponent(_ref56) {
       case 'SKX_GOODS':
         wrapFn(handleSkxGoods);
         break;
+      case 'ORDER_SUBFORM':
+        wrapFn(handleOrderSubForm);
+        break;
       case 'BS_EXCHANGE_GOODS':
         wrapFn(handleBsExchangeGoods);
         break;

package/dist/esm/common/utils/tools.js

@@ -21,7 +21,7 @@ import { message } from 'antd';
 import { get, last, cloneDeep, isEqual, set } from 'lodash';
 import { orderDetail, queryShopByTid } from "../../model/servers/api";
 import moment from 'moment';
-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';
+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';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import transformWorkOrderData from "./transformWorkOrderData";
@@ -63,7 +63,8 @@ var workTypeKeys = {
   NEW_PAYMENT_STATUS: 'newPaymentStatus',
   BUSINESS_ORDER_NO: 'businessOrderNo',
   PAYMENT_VOUCHER_CODE: 'paymentVoucherCode',
-  EXECUTE_ACTION_TYPE: 'executeActionType'
+  EXECUTE_ACTION_TYPE: 'executeActionType',
+  ERP_ORDER_STATUS: 'erpOrderStatus'
 };
 
 // 根据组件类型获取组件的UniqueKey
@@ -139,7 +140,7 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    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;
+    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;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -258,13 +259,26 @@ export var orderBack = /*#__PURE__*/function () {
           } else {
             promise.push(Promise.resolve([]));
           }
+          //  子订单根据订单号/店铺获取
+          OrderSubFormComponent = templateDetail.componentDtoList.find(function (item) {
+            return item.workOrderComponentType === 'ORDER_SUBFORM';
+          });
+          if (OrderSubFormComponent) {
+            console.log('44444');
+            promise.push(servers.orderSubForm.getOrderSubFormDataAsync({
+              orderNo: order_no,
+              shopId: shopId
+            }));
+          } else {
+            promise.push(Promise.resolve([]));
+          }
 
           //需按照orderBackMap中的顺序结构
-          _context.next = 34;
+          _context.next = 36;
           return Promise.allSettled(promise);
-        case 34:
+        case 36:
           _yield$Promise$allSet = _context.sent;
-          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 11);
+          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 12);
           data = _yield$Promise$allSet2[0];
           xiaozhiOrder = _yield$Promise$allSet2[1];
           jstOrder = _yield$Promise$allSet2[2];
@@ -276,6 +290,7 @@ export var orderBack = /*#__PURE__*/function () {
           gyOrder = _yield$Promise$allSet2[8];
           skxOrder = _yield$Promise$allSet2[9];
           kmVideoOrder = _yield$Promise$allSet2[10];
+          orderSubFormOrder = _yield$Promise$allSet2[11];
           // TODO: 针对订单支付方式是微信还是支付宝，后端接口返回一个message用来提示使用
           console.log('--订单反填数据--', {
             data: data,
@@ -288,7 +303,8 @@ export var orderBack = /*#__PURE__*/function () {
             kmOrder: kmOrder,
             gyOrder: gyOrder,
             skxOrder: skxOrder,
-            kmVideoOrder: kmVideoOrder
+            kmVideoOrder: kmVideoOrder,
+            orderSubFormOrder: orderSubFormOrder
           });
           pushGyLog('gyOrder', gyOrder);
           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 () {
           if (kmInfo) {
             kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
           }
+          orderSubFormInfo = orderSubFormOrderTransform({
+            subOrderList: (orderSubFormOrder === null || orderSubFormOrder === void 0 ? void 0 : orderSubFormOrder.value) || [],
+            orderNo: order_no,
+            allOrders: (orderSubFormOrder === null || orderSubFormOrder === void 0 ? void 0 : orderSubFormOrder.value) || [],
+            shopId: shopId
+          });
           gyInfo = gyOrders && gyOrderTransform(_objectSpread(_objectSpread({}, gyOrders), {}, {
             allOrders: gyOrders === null || gyOrders === void 0 ? void 0 : gyOrders.trades,
             componentList: templateDetail.componentDtoList,
@@ -485,12 +507,13 @@ export var orderBack = /*#__PURE__*/function () {
             bsE3Order: bsE3Info,
             kmOrder: kmInfo,
             gyOrder: gyInfo,
-            skxOrder: skxInfo
+            skxOrder: skxInfo,
+            orderSubFormOrder: orderSubFormInfo
           });
           pushGyLog('detail', detail);
           //抖音数据特殊处理
           if (!orderInfo) {
-            _context.next = 124;
+            _context.next = 128;
             break;
           }
           if (shopSourceStr === 'FXG') {
@@ -502,7 +525,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 108;
+            _context.next = 112;
             break;
           }
           list = detail['itemList'];
@@ -520,10 +543,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 98;
-          _context.next = 101;
+          _context.prev = 102;
+          _context.next = 105;
           return Promise.all(promises);
-        case 101:
+        case 105:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -533,25 +556,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 108;
+          _context.next = 112;
           break;
-        case 105:
-          _context.prev = 105;
-          _context.t1 = _context["catch"](98);
+        case 109:
+          _context.prev = 109;
+          _context.t1 = _context["catch"](102);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 108:
+        case 112:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 124;
+            _context.next = 128;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 123;
+            _context.next = 127;
             break;
           }
-          _context.prev = 111;
-          _context.next = 114;
+          _context.prev = 115;
+          _context.next = 118;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -561,21 +584,21 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 114:
+        case 118:
           signDatetime = _context.sent;
           detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
-          _context.next = 121;
+          _context.next = 125;
           break;
-        case 118:
-          _context.prev = 118;
-          _context.t2 = _context["catch"](111);
+        case 122:
+          _context.prev = 122;
+          _context.t2 = _context["catch"](115);
           console.error('调用签收时间错误', _context.t2);
-        case 121:
-          _context.next = 124;
+        case 125:
+          _context.next = 128;
           break;
-        case 123:
+        case 127:
           detail['tradeSigningDateTime'] = '';
-        case 124:
+        case 128:
           values = orderBackFormValues({
             detail: detail,
             _get_order_fail_: !orderInfo,
@@ -620,21 +643,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 135;
+          _context.next = 139;
           break;
-        case 132:
-          _context.prev = 132;
+        case 136:
+          _context.prev = 136;
           _context.t3 = _context["catch"](25);
           console.error(_context.t3);
-        case 135:
-          _context.prev = 135;
+        case 139:
+          _context.prev = 139;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(135);
-        case 138:
+          return _context.finish(139);
+        case 142:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 12, 15, 18], [25, 132, 135, 138], [98, 105], [111, 118]]);
+    }, _callee, null, [[5, 12, 15, 18], [25, 136, 139, 142], [102, 109], [115, 122]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);