@kmkf-fe-packages/kmkf-work-order-service-component 2.7.0-rc.0 → 2.9.0-rc.0

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

@@ -489,9 +489,17 @@ var handleOrderSubForm = function handleOrderSubForm(_ref37) {
     addContent('subOrderList', subOrderList);
   };
 };
-var handleBsExchangeGoods = function handleBsExchangeGoods(_ref38) {
+var handleSkxReturnGoods = function handleSkxReturnGoods(_ref38) {
   var addContent = _ref38.addContent,
     getNowData = _ref38.getNowData;
+  return function (item) {
+    var goods = getNowData(item.uniqueKey, {});
+    addContent('skxReturnGoods', goods === null || goods === void 0 ? void 0 : goods.skxReturnGoods);
+  };
+};
+var handleBsExchangeGoods = function handleBsExchangeGoods(_ref39) {
+  var addContent = _ref39.addContent,
+    getNowData = _ref39.getNowData;
   return function (item) {
     var _bsExchange$bsExchang;
     var bsExchange = getNowData(item.uniqueKey, {});
@@ -516,27 +524,27 @@ var handleBsExchangeGoods = function handleBsExchangeGoods(_ref38) {
     }
   };
 };
-var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref39) {
-  var addContent = _ref39.addContent,
-    getNowData = _ref39.getNowData;
+var handleWdtExchangeGoods = function handleWdtExchangeGoods(_ref40) {
+  var addContent = _ref40.addContent,
+    getNowData = _ref40.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(_ref40) {
-  var addContent = _ref40.addContent,
-    getNowData = _ref40.getNowData;
+var handleJstExchangeGoods = function handleJstExchangeGoods(_ref41) {
+  var addContent = _ref41.addContent,
+    getNowData = _ref41.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(_ref41) {
-  var addContent = _ref41.addContent,
-    getNowData = _ref41.getNowData;
+var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref42) {
+  var addContent = _ref42.addContent,
+    getNowData = _ref42.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]);
@@ -590,9 +598,9 @@ var handleBsOrWdtReissueGoods = function handleBsOrWdtReissueGoods(_ref41) {
     }
   };
 };
-var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref42) {
-  var addContent = _ref42.addContent,
-    getNowData = _ref42.getNowData;
+var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_ref43) {
+  var addContent = _ref43.addContent,
+    getNowData = _ref43.getNowData;
   return function (item) {
     var currentReturn = getNowData(item.uniqueKey, {});
     var compType = item.workOrderComponentType;
@@ -601,9 +609,9 @@ var handleBsOrWdtReturnGoods = function handleBsOrWdtReturnGoods(_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 handleGYReturnGoods = function handleGYReturnGoods(_ref43) {
-  var addContent = _ref43.addContent,
-    getNowData = _ref43.getNowData;
+var handleGYReturnGoods = function handleGYReturnGoods(_ref44) {
+  var addContent = _ref44.addContent,
+    getNowData = _ref44.getNowData;
   return function (item) {
     var currentReturn = getNowData(item.uniqueKey, {});
     var compType = item.workOrderComponentType;
@@ -613,9 +621,9 @@ var handleGYReturnGoods = function handleGYReturnGoods(_ref43) {
     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(_ref44) {
-  var addContent = _ref44.addContent,
-    getNowData = _ref44.getNowData;
+var handleBsPosting = function handleBsPosting(_ref45) {
+  var addContent = _ref45.addContent,
+    getNowData = _ref45.getNowData;
   return function (item) {
     ['bsPostingProvince', 'bsPostingCity', 'bsPostingDistrict'].map(function (key, index) {
       addContent(key, getNowData("".concat(item.uniqueKey, ".postingAddress[").concat(index, "]"), ''));
@@ -625,9 +633,9 @@ var handleBsPosting = function handleBsPosting(_ref44) {
     addContent('bsPostingReceiverMobile', getNowData("".concat(item.uniqueKey, ".postingReceiverMobile"), ''));
   };
 };
-var handleSystemOrder = function handleSystemOrder(_ref45) {
-  var addContent = _ref45.addContent,
-    getNowData = _ref45.getNowData;
+var handleSystemOrder = function handleSystemOrder(_ref46) {
+  var addContent = _ref46.addContent,
+    getNowData = _ref46.getNowData;
   return function (item) {
     var selectIds = getNowData("".concat(item.uniqueKey, ".selectIds"), '');
     var showOrderInfo = getNowData("".concat(item.uniqueKey, ".showOrderInfo"), []);
@@ -641,16 +649,16 @@ var handleSystemOrder = function handleSystemOrder(_ref45) {
     }));
   };
 };
-var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref46) {
-  var addContent = _ref46.addContent,
-    getNowData = _ref46.getNowData;
+var handleBuyerMessageNotice = function handleBuyerMessageNotice(_ref47) {
+  var addContent = _ref47.addContent,
+    getNowData = _ref47.getNowData;
   return function (item) {
     addContent('buyerMessageNotice', getNowData(item.uniqueKey, '未通知'));
   };
 };
-var handleBsDeliveryNo = function handleBsDeliveryNo(_ref47) {
-  var addContent = _ref47.addContent,
-    getNowData = _ref47.getNowData;
+var handleBsDeliveryNo = function handleBsDeliveryNo(_ref48) {
+  var addContent = _ref48.addContent,
+    getNowData = _ref48.getNowData;
   return function (item) {
     var deliveryNoList = getNowData(item.uniqueKey, []);
     addContent('deliveryNoList', deliveryNoList);
@@ -659,9 +667,9 @@ var handleBsDeliveryNo = function handleBsDeliveryNo(_ref47) {
     }));
   };
 };
-var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref48) {
-  var addContent = _ref48.addContent,
-    getNowData = _ref48.getNowData;
+var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref49) {
+  var addContent = _ref49.addContent,
+    getNowData = _ref49.getNowData;
   return function (item) {
     var returnGoodsTradeItemList = getNowData(item.uniqueKey, []);
     addContent('returnGoodsTradeItemList', returnGoodsTradeItemList);
@@ -670,9 +678,9 @@ var handleReturnGoodsTradeId = function handleReturnGoodsTradeId(_ref48) {
     }));
   };
 };
-var handleErpTradeId = function handleErpTradeId(_ref49) {
-  var addContent = _ref49.addContent,
-    getNowData = _ref49.getNowData;
+var handleErpTradeId = function handleErpTradeId(_ref50) {
+  var addContent = _ref50.addContent,
+    getNowData = _ref50.getNowData;
   return function (item) {
     var tradeItemList = getNowData(item.uniqueKey, []);
     addContent('tradeItemList', tradeItemList);
@@ -681,9 +689,9 @@ var handleErpTradeId = function handleErpTradeId(_ref49) {
     }));
   };
 };
-var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref50) {
-  var addContent = _ref50.addContent,
-    getNowData = _ref50.getNowData;
+var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref51) {
+  var addContent = _ref51.addContent,
+    getNowData = _ref51.getNowData;
   return function (item) {
     var tradeItemList = getNowData(item.uniqueKey, []);
     addContent('erpAfterSaleTradeItemList', tradeItemList);
@@ -692,18 +700,18 @@ var handleErpAfterSelfTradeId = function handleErpAfterSelfTradeId(_ref50) {
     }));
   };
 };
-var handleWlnGoods = function handleWlnGoods(_ref51) {
-  var addContent = _ref51.addContent,
-    getNowData = _ref51.getNowData;
+var handleWlnGoods = function handleWlnGoods(_ref52) {
+  var addContent = _ref52.addContent,
+    getNowData = _ref52.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(_ref52) {
-  var addContent = _ref52.addContent,
-    getNowData = _ref52.getNowData;
+var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref53) {
+  var addContent = _ref53.addContent,
+    getNowData = _ref53.getNowData;
   return function (item) {
     ['bsE3SystemOrderNo', 'bsE3ReissueType', 'bsE3ReissueMemo', 'bsE3ReissueGoods'].map(function (key) {
       if (key === 'bsE3ReissueGoods') {
@@ -714,33 +722,33 @@ var handleBsE3ReissueGoods = function handleBsE3ReissueGoods(_ref52) {
     });
   };
 };
-var handleWdtShopSelect = function handleWdtShopSelect(_ref53) {
-  var addContent = _ref53.addContent,
-    getNowData = _ref53.getNowData;
+var handleWdtShopSelect = function handleWdtShopSelect(_ref54) {
+  var addContent = _ref54.addContent,
+    getNowData = _ref54.getNowData;
   return function (item) {
     ['shopCode'].map(function (key) {
       addContent(key, getNowData("".concat(item.uniqueKey), ''));
     });
   };
 };
-var handleDefault = function handleDefault(_ref54) {
-  var addContent = _ref54.addContent,
-    getNowData = _ref54.getNowData;
+var handleDefault = function handleDefault(_ref55) {
+  var addContent = _ref55.addContent,
+    getNowData = _ref55.getNowData;
   return function (item) {
     addContent(V.camelCase(item.workOrderComponentType), getNowData(item.uniqueKey, ''));
   };
 };
-var handleStatusField = function handleStatusField(_ref55) {
-  var addContent = _ref55.addContent,
-    getNowData = _ref55.getNowData;
+var handleStatusField = function handleStatusField(_ref56) {
+  var addContent = _ref56.addContent,
+    getNowData = _ref56.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(_ref56) {
-  var addContent = _ref56.addContent,
-    getNowData = _ref56.getNowData;
+var handleGoodStatus = function handleGoodStatus(_ref57) {
+  var addContent = _ref57.addContent,
+    getNowData = _ref57.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) {
@@ -748,13 +756,13 @@ var handleGoodStatus = function handleGoodStatus(_ref56) {
     }));
   };
 };
-var processComponent = function processComponent(_ref57) {
-  var params = _ref57.params,
-    nowData = _ref57.nowData,
-    updateFlag = _ref57.updateFlag,
-    detail = _ref57.detail,
-    accountName = _ref57.accountName,
-    getValueByField = _ref57.getValueByField;
+var processComponent = function processComponent(_ref58) {
+  var params = _ref58.params,
+    nowData = _ref58.nowData,
+    updateFlag = _ref58.updateFlag,
+    detail = _ref58.detail,
+    accountName = _ref58.accountName,
+    getValueByField = _ref58.getValueByField;
   return function (item) {
     var contentVoList = [];
     var uniqueKeyPrefix = "".concat(item.uniqueKey, "_");
@@ -808,6 +816,7 @@ var processComponent = function processComponent(_ref57) {
       case 'SKX_CREATE_TIME':
       case 'SKX_OUTBOUND_NOTICE_NO':
       case 'ERP_ORDER_STATUS':
+      case 'SKX_RETURN_BILL_NO':
         wrapFn(handleOnlyAddContent);
         break;
       case 'RATE':
@@ -916,6 +925,7 @@ var processComponent = function processComponent(_ref57) {
       case 'KM_LOGISTICS':
       case 'GY_LOGISTICS':
       case 'SKX_LOGISTICS':
+      case 'SKX_RETURN_LOGISTICS':
         wrapFn(handleErpLogistics);
         break;
       case 'BS_SEND_GOOD':
@@ -949,6 +959,9 @@ var processComponent = function processComponent(_ref57) {
       case 'ORDER_SUBFORM':
         wrapFn(handleOrderSubForm);
         break;
+      case 'SKX_RETURN_GOODS':
+        wrapFn(handleSkxReturnGoods);
+        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, orderSubFormOrderTransform } 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, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import transformWorkOrderData from "./transformWorkOrderData";
@@ -140,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, 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;
+    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, _skxReturnOrder$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, skxReturnOrder, kmVideoOrder, orderSubFormOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, skxOrders, skxReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jstInfo, skxInfo, skxReturnInfo, 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:
@@ -278,7 +278,7 @@ export var orderBack = /*#__PURE__*/function () {
           return Promise.allSettled(promise);
         case 36:
           _yield$Promise$allSet = _context.sent;
-          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 12);
+          _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 13);
           data = _yield$Promise$allSet2[0];
           xiaozhiOrder = _yield$Promise$allSet2[1];
           jstOrder = _yield$Promise$allSet2[2];
@@ -289,8 +289,9 @@ export var orderBack = /*#__PURE__*/function () {
           kmOrder = _yield$Promise$allSet2[7];
           gyOrder = _yield$Promise$allSet2[8];
           skxOrder = _yield$Promise$allSet2[9];
-          kmVideoOrder = _yield$Promise$allSet2[10];
-          orderSubFormOrder = _yield$Promise$allSet2[11];
+          skxReturnOrder = _yield$Promise$allSet2[10];
+          kmVideoOrder = _yield$Promise$allSet2[11];
+          orderSubFormOrder = _yield$Promise$allSet2[12];
           // TODO: 针对订单支付方式是微信还是支付宝，后端接口返回一个message用来提示使用
           console.log('--订单反填数据--', {
             data: data,
@@ -303,6 +304,7 @@ export var orderBack = /*#__PURE__*/function () {
             kmOrder: kmOrder,
             gyOrder: gyOrder,
             skxOrder: skxOrder,
+            skxReturnOrder: skxReturnOrder,
             kmVideoOrder: kmVideoOrder,
             orderSubFormOrder: orderSubFormOrder
           });
@@ -324,6 +326,7 @@ export var orderBack = /*#__PURE__*/function () {
           kmOrders = kmOrder === null || kmOrder === void 0 ? void 0 : (_kmOrder$value = kmOrder.value) === null || _kmOrder$value === void 0 ? void 0 : _kmOrder$value.data;
           gyOrders = gyOrder === null || gyOrder === void 0 ? void 0 : (_gyOrder$value = gyOrder.value) === null || _gyOrder$value === void 0 ? void 0 : _gyOrder$value.data;
           skxOrders = skxOrder === null || skxOrder === void 0 ? void 0 : (_skxOrder$value = skxOrder.value) === null || _skxOrder$value === void 0 ? void 0 : _skxOrder$value.data;
+          skxReturnOrders = skxReturnOrder === null || skxReturnOrder === void 0 ? void 0 : (_skxReturnOrder$value = skxReturnOrder.value) === null || _skxReturnOrder$value === void 0 ? void 0 : _skxReturnOrder$value.data;
           console.log('skxOrders', {
             skxOrders: skxOrders,
             skxOrder: skxOrder
@@ -334,9 +337,10 @@ export var orderBack = /*#__PURE__*/function () {
           if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
           if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
           if (skxOrders) skxOrders.trades = (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.orderDetailInfoList) || []; //需要看实际接口返回字段
+          if (skxReturnOrders) skxReturnOrders.trades = (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.skqReturnOrderDetailInfoDtos) || [];
           pushGyLog('gyOrders', gyOrders);
           Monitor.automaticReport({
-            message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\n        \u5E97\u94FAid:").concat(shopId, ",\n        \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo || {}), ",\n        jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders || {}), ",\n        bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders || {}), ",\n        wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders || {}), ",\n        wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders || {}), ",\n        bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders || {}), ",\n        km\u4FE1\u606F:").concat(JSON.stringify(kmOrders || {}), ",\n        \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n      ")
+            message: "orderBack:\u8BA2\u5355\u53F7:".concat(order_no, ",\n        \u5E97\u94FAid:").concat(shopId, ",\n        \u8BA2\u5355\u4FE1\u606F\uFF1A").concat(JSON.stringify(orderInfo || {}), ",\n        jst\u4FE1\u606F:").concat(JSON.stringify(jstOrders || {}), ",\n        bs\u4FE1\u606F:").concat(JSON.stringify(bsOrders || {}), ",\n        wln\u4FE1\u606F:").concat(JSON.stringify(wlnOrders || {}), ",\n        wdt\u4FE1\u606F:").concat(JSON.stringify(wdtOrders || {}), ",\n        bsE3\u4FE1\u606F:").concat(JSON.stringify(bsE3Orders || {}), ",\n        km\u4FE1\u606F:").concat(JSON.stringify(kmOrders || {}), ",\n        skxReturn\u4FE1\u606F:").concat(JSON.stringify(skxReturnOrders || {}), ",\n        \u7BA1\u6613\u4FE1\u606F:").concat(JSON.stringify(gyOrders || []), "\n      ")
           });
           if (bsOrders && plat !== null && plat !== void 0 && plat.subOrderNo) {
             bsOrders.orders = bsOrders.orders.filter(function (item) {
@@ -389,6 +393,11 @@ export var orderBack = /*#__PURE__*/function () {
             orderNo: order_no,
             allOrders: (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.trades) || []
           }), form);
+          skxReturnInfo = skxReturnOrders && skxReturnOrderTransform(_objectSpread(_objectSpread({}, skxReturnOrders), {}, {
+            componentList: templateDetail.componentDtoList,
+            orderNo: order_no,
+            allOrders: (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.trades) || []
+          }), form);
           if ((bsOrders === null || bsOrders === void 0 ? void 0 : (_bsOrders$orders = bsOrders.orders) === null || _bsOrders$orders === void 0 ? void 0 : _bsOrders$orders.length) > 1) {
             bsInfo.bsGoods = _objectSpread(_objectSpread({}, bsInfo.bsGoods), {}, {
               bsGoods: []
@@ -496,6 +505,13 @@ export var orderBack = /*#__PURE__*/function () {
               logisticsCode: ''
             }];
           }
+          // if (skxReturnOrders?.trades && skxReturnOrders.trades.length > 1) {
+          //   skxReturnInfo.skxReturnGoods = {
+          //     ...skxReturnInfo.skxReturnGoods,
+          //     skxReturnGoods: [],
+          //   };
+          //   skxReturnInfo.skxLogistics = [{ logisticsCompany: null, logisticsCode: '' }];
+          // }
 
           //获取当前表单字段
           formValue = form.getFieldsValue();
@@ -508,12 +524,13 @@ export var orderBack = /*#__PURE__*/function () {
             kmOrder: kmInfo,
             gyOrder: gyInfo,
             skxOrder: skxInfo,
-            orderSubFormOrder: orderSubFormInfo
+            orderSubFormOrder: orderSubFormInfo,
+            skxReturnOrder: skxReturnInfo
           });
           pushGyLog('detail', detail);
           //抖音数据特殊处理
           if (!orderInfo) {
-            _context.next = 128;
+            _context.next = 132;
             break;
           }
           if (shopSourceStr === 'FXG') {
@@ -525,7 +542,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 112;
+            _context.next = 116;
             break;
           }
           list = detail['itemList'];
@@ -543,10 +560,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 102;
-          _context.next = 105;
+          _context.prev = 106;
+          _context.next = 109;
           return Promise.all(promises);
-        case 105:
+        case 109:
           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), {}, {
@@ -556,25 +573,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 112;
+          _context.next = 116;
           break;
-        case 109:
-          _context.prev = 109;
-          _context.t1 = _context["catch"](102);
+        case 113:
+          _context.prev = 113;
+          _context.t1 = _context["catch"](106);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 112:
+        case 116:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 128;
+            _context.next = 132;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 127;
+            _context.next = 131;
             break;
           }
-          _context.prev = 115;
-          _context.next = 118;
+          _context.prev = 119;
+          _context.next = 122;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -584,21 +601,21 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 118:
+        case 122:
           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 = 125;
+          _context.next = 129;
           break;
-        case 122:
-          _context.prev = 122;
-          _context.t2 = _context["catch"](115);
+        case 126:
+          _context.prev = 126;
+          _context.t2 = _context["catch"](119);
           console.error('调用签收时间错误', _context.t2);
-        case 125:
-          _context.next = 128;
+        case 129:
+          _context.next = 132;
           break;
-        case 127:
+        case 131:
           detail['tradeSigningDateTime'] = '';
-        case 128:
+        case 132:
           values = orderBackFormValues({
             detail: detail,
             _get_order_fail_: !orderInfo,
@@ -643,21 +660,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 139;
+          _context.next = 143;
           break;
-        case 136:
-          _context.prev = 136;
+        case 140:
+          _context.prev = 140;
           _context.t3 = _context["catch"](25);
           console.error(_context.t3);
-        case 139:
-          _context.prev = 139;
+        case 143:
+          _context.prev = 143;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(139);
-        case 142:
+          return _context.finish(143);
+        case 146:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 12, 15, 18], [25, 136, 139, 142], [102, 109], [115, 122]]);
+    }, _callee, null, [[5, 12, 15, 18], [25, 140, 143, 146], [106, 113], [119, 126]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);
@@ -809,7 +826,7 @@ export var submitParams = function submitParams(_ref4) {
     }, operateParams)
   };
   if (update) {
-    var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4, _currentNodeDetail$wo5, _currentNodeDetail$wo6;
+    var _currentNodeDetail$wo, _currentNodeDetail$wo2, _currentNodeDetail$wo3, _currentNodeDetail$wo4, _currentNodeDetail$wo5, _currentNodeDetail$wo6, _currentNodeDetail$wo7;
     params.updateInfo = {
       templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo === void 0 ? void 0 : _currentNodeDetail$wo.templateId,
       workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo2 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo2 === void 0 ? void 0 : _currentNodeDetail$wo2.id,
@@ -853,25 +870,33 @@ export var submitParams = function submitParams(_ref4) {
         dataValue: false
       });
     }
+    // TODO: 兼容后端导入Excel之后，订单未反填问题
+    if (update && currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo7 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo7 !== void 0 && _currentNodeDetail$wo7.notAutoFillWithFirstSubmit) {
+      updateList.push({
+        dataKey: 'notAutoFillWithFirstSubmit',
+        oldValue: true,
+        dataValue: false
+      });
+    }
     params.updateInfo.updateList = updateList;
     params.updateInfo.needTransForm = params.needTransForm;
     delete params.workOrderUpdateKeyVos;
     delete params.needTransForm;
   } else {
-    var _Object$keys, _currentNodeDetail$wo7, _currentNodeDetail$wo8, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17;
+    var _Object$keys, _currentNodeDetail$wo8, _currentNodeDetail$wo9, _currentNodeDetail$wo10, _currentNodeDetail$wo11, _currentNodeDetail$wo12, _currentNodeDetail$wo13, _currentNodeDetail$wo14, _currentNodeDetail$wo15, _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$wo18;
     // TODO: 新保存工单
     // 获取当前表单中非空字段
     var finalComponentList = (_Object$keys = Object.keys(formData)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.filter(function (i) {
       return !isNull(formData[i]);
     });
     // 获取非空字段对应的组件
-    var finalDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo7 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo7 === void 0 ? void 0 : (_currentNodeDetail$wo8 = _currentNodeDetail$wo7.componentDtoList) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : _currentNodeDetail$wo8.filter(function (item) {
+    var finalDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo8 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo8 === void 0 ? void 0 : (_currentNodeDetail$wo9 = _currentNodeDetail$wo8.componentDtoList) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.filter(function (item) {
       return finalComponentList.includes(item.uniqueKey) || item.workOrderComponentType === 'BUYER_MESSAGE_NOTICE';
     });
     set(newTemplateDetail, 'componentDtoList', finalDtoList);
     params.workOrder = {
-      templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.uniqueKey,
-      handleWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id,
+      templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.uniqueKey,
+      handleWorkOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.id,
       buyerNick: plat === null || plat === void 0 ? void 0 : plat.buyerNick,
       buyerOpenUid: plat === null || plat === void 0 ? void 0 : plat.buyerId,
       shopUniqueKey: shopUniqueKey,
@@ -881,13 +906,13 @@ export var submitParams = function submitParams(_ref4) {
     };
 
     // 判断是否有订单号组建，订单号数据需要特殊处理
-    var tradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : (_currentNodeDetail$wo12 = _currentNodeDetail$wo11.componentDtoList) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : (_currentNodeDetail$wo13 = _currentNodeDetail$wo12.find(function (item) {
+    var tradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : (_currentNodeDetail$wo13 = _currentNodeDetail$wo12.componentDtoList) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : (_currentNodeDetail$wo14 = _currentNodeDetail$wo13.find(function (item) {
       return item.workOrderComponentType === 'TRADE_ID_INPUT';
-    })) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.uniqueKey;
+    })) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.uniqueKey;
     // 判断是否有订单号组建，订单号数据需要特殊处理
-    var paymentTradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : (_currentNodeDetail$wo15 = _currentNodeDetail$wo14.componentDtoList) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : (_currentNodeDetail$wo16 = _currentNodeDetail$wo15.find(function (item) {
+    var paymentTradeIdUniqueKey = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : (_currentNodeDetail$wo16 = _currentNodeDetail$wo15.componentDtoList) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : (_currentNodeDetail$wo17 = _currentNodeDetail$wo16.find(function (item) {
       return item.workOrderComponentType === 'ENTERPRISE_PAYMENT';
-    })) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : _currentNodeDetail$wo16.uniqueKey;
+    })) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : _currentNodeDetail$wo17.uniqueKey;
     if (paymentTradeIdUniqueKey) {
       var _formData;
       params.workOrder.tid = formData === null || formData === void 0 ? void 0 : (_formData = formData["".concat(paymentTradeIdUniqueKey)]) === null || _formData === void 0 ? void 0 : _formData.enterprisePaymentTid;
@@ -898,7 +923,7 @@ export var submitParams = function submitParams(_ref4) {
     if (formData !== null && formData !== void 0 && formData['fixed_field_buyerOpenUid']) {
       params.workOrder.buyerOpenUid = formData === null || formData === void 0 ? void 0 : formData['fixed_field_buyerOpenUid'];
     }
-    params.workOrder.workOrderComponents = submitDataTransOldFormat(formData, newTemplateDetail, !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo17 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo17 !== void 0 && _currentNodeDetail$wo17.id), currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder, params.workOrder, (plat === null || plat === void 0 ? void 0 : plat.accountName) || '');
+    params.workOrder.workOrderComponents = submitDataTransOldFormat(formData, newTemplateDetail, !!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo18 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo18 !== void 0 && _currentNodeDetail$wo18.id), currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrder, params.workOrder, (plat === null || plat === void 0 ? void 0 : plat.accountName) || '');
     //端上有买家id 就返填当前买家 即使不是当前买家的订单
     if (plat.platform !== PlatForm.PC && plat !== null && plat !== void 0 && plat.buyerId) {
       params.workOrder.buyerOpenUid = plat === null || plat === void 0 ? void 0 : plat.buyerId;
@@ -1024,6 +1049,9 @@ export var reversalFormValues = function reversalFormValues() {
       case 'SKX_GOODS':
         prv["".concat(next.uniqueKey, "_skxGoods")] = JSON.stringify(values[next.uniqueKey]['_skxGoods']);
         break;
+      case 'SKX_RETURN_GOODS':
+        prv["".concat(next.uniqueKey, "_skxReturnGoods")] = JSON.stringify(values[next.uniqueKey]['_skxReturnGoods']);
+        break;
     }
     return prv;
   }, {});

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

@@ -1,5 +1,5 @@
 import { HasFilterHandle } from "./tools";
-import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail } from "../../model/servers/api";
+import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, skxOrderDetail, skxReturnOrderDetail } from "../../model/servers/api";
 import { servers } from '@kmkf-fe-packages/kmkf-utils';
 var orderBackKeyListMap = {
   hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
@@ -9,7 +9,8 @@ var orderBackKeyListMap = {
   hasBsE3: ['BS_E3_SYSTEM_ORDER', 'BS_E3_GOODS', 'BS_E3_REISSUE_GOODS', 'BS_E3_LOGISTICS', 'BS_E3_SEND_GOOD'],
   hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
   hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS', 'GY_RETURN_GOODS', 'GY_LOGISTICS'],
-  hasSkx: ['SKX_OUTBOUND_NOTICE_NO']
+  hasSkx: ['SKX_OUTBOUND_NOTICE_NO'],
+  hasSkxReturn: ['SKX_RETURN_BILL_NO']
 };
 export var orderBackMap = function orderBackMap(_ref) {
   var templateDetail = _ref.templateDetail,
@@ -84,6 +85,15 @@ export var orderBackMap = function orderBackMap(_ref) {
           tid: order_no
         });
       }
+    },
+    // 根据系统订单号反填，所以只要判断是否有系统订单号就行
+    hasSkxReturn: {
+      flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasSkxReturn),
+      promiseRequest: function promiseRequest() {
+        return skxReturnOrderDetail({
+          tid: order_no
+        });
+      }
     }
   };
 };