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

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -43,7 +43,7 @@ import { jsonParseSecurity, findComponentUniqueKeyByType } from "../../../common
 import { NEED_CLEAR_FIELDS_WHEN_SHOP_ID_CHANGE } from "../../constant";
 import { Context } from "../../context";
 import { orderBackKmAddress } from "./constants";
-import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo } from "./onBlur";
+import { onBlurExpressLogisticsCode, onBlurErpAfterSaleTradeId, onBlurSkxOutboundNoticeNo, onBlurSkxReturnBillNo, onBlurSkxLogisticsCode } from "./onBlur";
 import { findAllDependencies } from "./component-dependency-finder";
 import { findValueDependencies } from "./value-mapping-finder";
 // 记录显隐触发隐藏的组件。显示后，重新出发一遍映射规则
@@ -378,160 +378,215 @@ var FormRender = function FormRender(props, ref) {
       setLabelList(jsonParseSecurity(record === null || record === void 0 ? void 0 : (_record$jsonMap = record.jsonMap) === null || _record$jsonMap === void 0 ? void 0 : _record$jsonMap["".concat(labelComponent === null || labelComponent === void 0 ? void 0 : labelComponent.uniqueKey, "_label")], []));
     }
   }, [labelComponent, record]);
-  var queryDetail = function queryDetail(_ref2) {
-    var workOrderId = _ref2.workOrderId,
-      shopId = _ref2.shopId,
-      shopList = _ref2.shopList,
-      record = _ref2.record,
-      orderNo = _ref2.orderNo,
-      buyerId = _ref2.buyerId,
-      buyerNick = _ref2.buyerNick;
-    if (isOrderBackShopId) {
-      setIsOrderBackShopId(false);
-      return;
-    }
-    form.resetFields();
-    //获取一些默认数据
-    var jsonMap = templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList.reduce(function (prv, next) {
-      if (next.workOrderComponentType === 'TRADE_ID_INPUT') {
-        prv["".concat(next.uniqueKey, "_tradeId")] = orderNo;
-      }
-      if (next.workOrderComponentType === 'BUYER_NICK_INPUT') {
-        prv["".concat(next.uniqueKey, "_buyerOpenUid")] = buyerId;
-        prv["".concat(next.uniqueKey, "_buyerNick")] = buyerNick;
-      }
-      if (next.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
-        prv["".concat(next.uniqueKey, "_enterprisePaymentTid")] = orderNo || '';
-        prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = buyerId;
-        prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerNick")] = buyerNick;
-      }
-      return prv;
-    }, {});
-    if (workOrderId) {
-      var _record$jsonMap2;
-      // 先初始化端上内容
-      var newRecord = cloneDeep(record);
-      var jsonMapOrderId = Object.keys(newRecord.jsonMap).reduce(function (prv, next) {
-        var arrText = next.split('_');
-        if (arrText[arrText.length - 1] === 'tradeId') {
-          prv = newRecord.jsonMap[next];
-        }
-        return prv;
-      }, '');
-      //获取保存时的订单缓存数据，解决用户显隐组件不展示二次编辑没有订单信息的问题
-      var getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
-      var newFormValues = _objectSpread({}, getCacheInfo[jsonMapOrderId] || {});
-      newFormValues = reversalFormValues(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, newFormValues);
-      newRecord.jsonMap = _objectSpread(_objectSpread(_objectSpread({}, newFormValues), jsonMap), newRecord.jsonMap);
-      var transData = calcWorkOrderList([newRecord], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), newRecord.preCreateAndNotModified ? 'init' : 'edit' // TODO: 修复非首节点录入时丢失初始值问题
-      );
-      // console.log(newRecord.jsonMap, newFormValues, transData);
-
-      form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
-        shopId: shopId,
-        shopName: newRecord.shopName,
-        submitter: newRecord.submitter,
-        created: newRecord.created,
-        processTime: newRecord.processTime
-      }));
-      var initialValues = get(transData, '0', {});
-      newRecord.preCreateAndNotModified && batchFillByMapping(initialValues);
-      orderBackReplace(transData, templateDetail);
-      // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
-      var tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
-      if (tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
-        var _record$jsonMap3, _record$jsonMap4, _record$jsonMap5;
-        orderBack({
-          order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")],
-          form: form,
-          shopId: shopId,
-          shopList: shopList,
-          templateDetail: templateDetail,
-          callback: orderBackReplace,
-          fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
-          plat: plat,
-          callKey: 1,
-          setLoading: setLoading
-        });
-        queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
-        queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
-      } else {
-        // 如果没有订单反填，则单独更新remark
-        fetchRemark(shopId, currentNodeTid);
-      }
-    } else {
-      fillByShopId(shopId);
-      var initFormValues = null;
-      if (plat !== null && plat !== void 0 && plat.subOrderNo) {
-        var _getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
-        if (plat !== null && plat !== void 0 && plat.subOrderNo && plat.buyerId) {
-          var _getCacheInfo2;
-          initFormValues = (_getCacheInfo2 = _getCacheInfo["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo2 === void 0 ? void 0 : _getCacheInfo2[plat === null || plat === void 0 ? void 0 : plat.subOrderNo];
-        }
-      } else {
-        var _getCacheInfo3 = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
-        if (orderNo && plat.buyerId) {
-          var _getCacheInfo4;
-          initFormValues = (_getCacheInfo4 = _getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo4 === void 0 ? void 0 : _getCacheInfo4[orderNo];
-        } else if (!orderNo && plat.buyerId) {
-          initFormValues = Object.values(_getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)] || {})[0];
-        }
-      }
+  var queryDetail = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+      var workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, jsonMap, _record$jsonMap5, newRecord, jsonMapOrderId, getCacheInfo, newFormValues, transData, initialValues, tradeIdUniqueKey, _record$jsonMap2, _record$jsonMap3, _record$jsonMap4, _tradeIdUniqueKey, _record$jsonMap6, _record$jsonMap7, _record$jsonMap8, initFormValues, _getCacheInfo, _getCacheInfo2, _getCacheInfo3, _getCacheInfo4, _orderNo, _shopId, orderNoField, _transData, _initialValues, antFormEl;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            workOrderId = _ref2.workOrderId, shopId = _ref2.shopId, shopList = _ref2.shopList, record = _ref2.record, orderNo = _ref2.orderNo, buyerId = _ref2.buyerId, buyerNick = _ref2.buyerNick;
+            if (!isOrderBackShopId) {
+              _context2.next = 4;
+              break;
+            }
+            setIsOrderBackShopId(false);
+            return _context2.abrupt("return");
+          case 4:
+            form.resetFields();
+            //获取一些默认数据
+            jsonMap = templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList.reduce(function (prv, next) {
+              if (next.workOrderComponentType === 'TRADE_ID_INPUT') {
+                prv["".concat(next.uniqueKey, "_tradeId")] = orderNo;
+              }
+              if (next.workOrderComponentType === 'BUYER_NICK_INPUT') {
+                prv["".concat(next.uniqueKey, "_buyerOpenUid")] = buyerId;
+                prv["".concat(next.uniqueKey, "_buyerNick")] = buyerNick;
+              }
+              if (next.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
+                prv["".concat(next.uniqueKey, "_enterprisePaymentTid")] = orderNo || '';
+                prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerOpenUid")] = buyerId;
+                prv["".concat(next.uniqueKey, "_enterprisePaymentBuyerNick")] = buyerNick;
+              }
+              return prv;
+            }, {});
+            if (!workOrderId) {
+              _context2.next = 37;
+              break;
+            }
+            // 先初始化端上内容
+            newRecord = cloneDeep(record);
+            jsonMapOrderId = Object.keys(newRecord.jsonMap).reduce(function (prv, next) {
+              var arrText = next.split('_');
+              if (arrText[arrText.length - 1] === 'tradeId') {
+                prv = newRecord.jsonMap[next];
+              }
+              return prv;
+            }, ''); //获取保存时的订单缓存数据，解决用户显隐组件不展示二次编辑没有订单信息的问题
+            getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
+            newFormValues = _objectSpread({}, getCacheInfo[jsonMapOrderId] || {});
+            newFormValues = reversalFormValues(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, newFormValues);
+            newRecord.jsonMap = _objectSpread(_objectSpread(_objectSpread({}, newFormValues), jsonMap), newRecord.jsonMap);
+            transData = calcWorkOrderList([newRecord], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), newRecord.preCreateAndNotModified ? 'init' : 'edit' // TODO: 修复非首节点录入时丢失初始值问题
+            ); // console.log(newRecord.jsonMap, newFormValues, transData);
 
-      // console.log(orderNo, initFormValues);
-      if (initFormValues) {
-        form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
-          shopId: shopId
-        }));
-        // 没有触发订单反填的情况下，更新备注,
-        // PS: orderNo 和 shopId 可能需要从initFormValues中获取
-        var _orderNo = orderNo;
-        var _shopId = shopId || initFormValues['shopId'];
-        if (!_orderNo) {
-          var orderNoField = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).find(function (item) {
-            return (item === null || item === void 0 ? void 0 : item.workOrderComponentType) === 'TRADE_ID_INPUT';
-          });
-          _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
-        }
-        fetchRemark(_shopId, _orderNo);
-      } else {
-        var _transData = calcWorkOrderList([{
-          jsonMap: jsonMap
-        }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
-        var _initialValues = get(_transData, '0', {});
-        form.setFieldsValue(_objectSpread(_objectSpread({}, _initialValues), {}, {
-          shopId: shopId
-        }));
-        // 默认值触发映射
-        batchFillByMapping(_initialValues);
-        //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
+            form.setFieldsValue(_objectSpread(_objectSpread({}, get(transData, '0', {})), {}, {
+              shopId: shopId,
+              shopName: newRecord.shopName,
+              submitter: newRecord.submitter,
+              created: newRecord.created,
+              processTime: newRecord.processTime
+            }));
+            initialValues = get(transData, '0', {});
+            newRecord.preCreateAndNotModified && batchFillByMapping(initialValues);
+            orderBackReplace(transData, templateDetail);
+            // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
+            tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
+            if (!newRecord.notAutoFillWithFirstSubmit) {
+              _context2.next = 27;
+              break;
+            }
+            _tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
+            queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap2 = record.jsonMap) === null || _record$jsonMap2 === void 0 ? void 0 : _record$jsonMap2["".concat(_tradeIdUniqueKey, "_tradeId")], shopId);
+            queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(_tradeIdUniqueKey, "_tradeId")], shopId);
+            _context2.next = 25;
+            return orderBack({
+              order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(_tradeIdUniqueKey, "_tradeId")],
+              form: form,
+              shopId: shopId,
+              shopList: shopList,
+              templateDetail: templateDetail,
+              callback: orderBackReplace,
+              fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
+              plat: plat,
+              callKey: 1,
+              setLoading: setLoading
+            });
+          case 25:
+            _context2.next = 35;
+            break;
+          case 27:
+            if (!(tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap5 = record.jsonMap) !== null && _record$jsonMap5 !== void 0 && _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill)) {
+              _context2.next = 34;
+              break;
+            }
+            queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
+            queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap7 = record.jsonMap) === null || _record$jsonMap7 === void 0 ? void 0 : _record$jsonMap7["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
+            _context2.next = 32;
+            return orderBack({
+              order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap8 = record.jsonMap) === null || _record$jsonMap8 === void 0 ? void 0 : _record$jsonMap8["".concat(tradeIdUniqueKey, "_tradeId")],
+              form: form,
+              shopId: shopId,
+              shopList: shopList,
+              templateDetail: templateDetail,
+              callback: orderBackReplace,
+              fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
+              plat: plat,
+              callKey: 1,
+              setLoading: setLoading
+            });
+          case 32:
+            _context2.next = 35;
+            break;
+          case 34:
+            // 如果没有订单反填，则单独更新remark
+            fetchRemark(shopId, currentNodeTid);
+          case 35:
+            _context2.next = 60;
+            break;
+          case 37:
+            fillByShopId(shopId);
+            initFormValues = null;
+            if (plat !== null && plat !== void 0 && plat.subOrderNo) {
+              _getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
+              if (plat !== null && plat !== void 0 && plat.subOrderNo && plat.buyerId) {
+                initFormValues = (_getCacheInfo2 = _getCacheInfo["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo2 === void 0 ? void 0 : _getCacheInfo2[plat === null || plat === void 0 ? void 0 : plat.subOrderNo];
+              }
+            } else {
+              _getCacheInfo3 = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
+              if (orderNo && plat.buyerId) {
+                initFormValues = (_getCacheInfo4 = _getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo4 === void 0 ? void 0 : _getCacheInfo4[orderNo];
+              } else if (!orderNo && plat.buyerId) {
+                initFormValues = Object.values(_getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)] || {})[0];
+              }
+            }
 
-        if (orderNo && shopId) {
-          orderBack({
-            order_no: orderNo,
-            form: form,
-            shopId: shopId,
-            shopList: shopList,
-            templateDetail: templateDetail,
-            callback: orderBackReplace,
-            fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
-            // TODO: 只有在千牛端通过订单号录入工单的时候，订单备注不需要反填
-            plat: plat,
-            callKey: 2,
-            setLoading: setLoading
-          });
-          queryLabels(orderNo, shopId);
-          queryMemberLevels(orderNo, shopId);
-        } else {
-          // 如果没有订单反填，则单独更新remark
-          fetchRemark(shopId, currentNodeTid);
+            // console.log(orderNo, initFormValues);
+            if (!initFormValues) {
+              _context2.next = 48;
+              break;
+            }
+            form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
+              shopId: shopId
+            }));
+            // 没有触发订单反填的情况下，更新备注,
+            // PS: orderNo 和 shopId 可能需要从initFormValues中获取
+            _orderNo = orderNo;
+            _shopId = shopId || initFormValues['shopId'];
+            if (!_orderNo) {
+              orderNoField = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).find(function (item) {
+                return (item === null || item === void 0 ? void 0 : item.workOrderComponentType) === 'TRADE_ID_INPUT';
+              });
+              _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
+            }
+            fetchRemark(_shopId, _orderNo);
+            _context2.next = 60;
+            break;
+          case 48:
+            _transData = calcWorkOrderList([{
+              jsonMap: jsonMap
+            }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
+            _initialValues = get(_transData, '0', {});
+            form.setFieldsValue(_objectSpread(_objectSpread({}, _initialValues), {}, {
+              shopId: shopId
+            }));
+            // 默认值触发映射
+            batchFillByMapping(_initialValues);
+            //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
+            if (!(orderNo && shopId)) {
+              _context2.next = 59;
+              break;
+            }
+            queryLabels(orderNo, shopId);
+            queryMemberLevels(orderNo, shopId);
+            _context2.next = 57;
+            return orderBack({
+              order_no: orderNo,
+              form: form,
+              shopId: shopId,
+              shopList: shopList,
+              templateDetail: templateDetail,
+              callback: orderBackReplace,
+              fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
+              // TODO: 只有在千牛端通过订单号录入工单的时候，订单备注不需要反填
+              plat: plat,
+              callKey: 2,
+              setLoading: setLoading
+            });
+          case 57:
+            _context2.next = 60;
+            break;
+          case 59:
+            // 如果没有订单反填，则单独更新remark
+            fetchRemark(shopId, currentNodeTid);
+          case 60:
+            antFormEl = document.getElementsByClassName('ant-form');
+            (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
+            resetMappingHideComponents();
+            // TODO: 临时方案，解决批量提交时未带入订单反填数据
+            dispatch({
+              type: 'setaAutoSubmitFlag',
+              payload: true
+            });
+          case 64:
+          case "end":
+            return _context2.stop();
         }
-      }
-    }
-    var antFormEl = document.getElementsByClassName('ant-form');
-    (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
-    resetMappingHideComponents();
-  };
+      }, _callee2);
+    }));
+    return function queryDetail(_x4) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
     if (isErpUse) return;
     queryDetail({
@@ -631,26 +686,26 @@ var FormRender = function FormRender(props, ref) {
 
   // 查询标签
   var queryLabels = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(tid, shopId) {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(tid, shopId) {
       var oldLabelList, _yield$queryLabelByTr, _yield$queryLabelByTr2, data;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             if (!isNull(labelComponent)) {
-              _context2.next = 2;
+              _context3.next = 2;
               break;
             }
-            return _context2.abrupt("return", console.debug('当前节点不需要查询标签'));
+            return _context3.abrupt("return", console.debug('当前节点不需要查询标签'));
           case 2:
             if (shopId) {
-              _context2.next = 4;
+              _context3.next = 4;
               break;
             }
-            return _context2.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
+            return _context3.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
           case 4:
             oldLabelList = form.getFieldValue("".concat(labelComponent.uniqueKey));
             if (tid) {
-              _context2.next = 9;
+              _context3.next = 9;
               break;
             }
             setLabelList(function (list) {
@@ -660,15 +715,15 @@ var FormRender = function FormRender(props, ref) {
             if (oldLabelList.length !== 0) {
               form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), []));
             }
-            return _context2.abrupt("return", console.debug('查询标签缺少必要参数-tradeId'));
+            return _context3.abrupt("return", console.debug('查询标签缺少必要参数-tradeId'));
           case 9:
-            _context2.next = 11;
+            _context3.next = 11;
             return queryLabelByTradeId({
               tid: tid,
               shopId: shopId
             });
           case 11:
-            _yield$queryLabelByTr = _context2.sent;
+            _yield$queryLabelByTr = _context3.sent;
             _yield$queryLabelByTr2 = _yield$queryLabelByTr.data;
             data = _yield$queryLabelByTr2 === void 0 ? [] : _yield$queryLabelByTr2;
             setLabelList(function (list) {
@@ -680,50 +735,50 @@ var FormRender = function FormRender(props, ref) {
             }
           case 16:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
-    return function queryLabels(_x4, _x5) {
-      return _ref3.apply(this, arguments);
+    return function queryLabels(_x5, _x6) {
+      return _ref4.apply(this, arguments);
     };
   }();
   // 查询会员等级
   var queryMemberLevels = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(tid, shopId) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(tid, shopId) {
       var oldMemberLevel, _yield$queryMemberLev, _yield$queryMemberLev2, data;
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
             if (!isNull(memberLevelComponent)) {
-              _context3.next = 2;
+              _context4.next = 2;
               break;
             }
-            return _context3.abrupt("return", console.debug('当前节点不需要查询会员等级'));
+            return _context4.abrupt("return", console.debug('当前节点不需要查询会员等级'));
           case 2:
             if (shopId) {
-              _context3.next = 4;
+              _context4.next = 4;
               break;
             }
-            return _context3.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
+            return _context4.abrupt("return", console.debug('查询标签缺少必要参数-shopId'));
           case 4:
             oldMemberLevel = form.getFieldValue("".concat(labelComponent.uniqueKey));
             if (tid) {
-              _context3.next = 8;
+              _context4.next = 8;
               break;
             }
             if (oldMemberLevel.length !== 0) {
               form.setFieldsValue(_defineProperty({}, "".concat(labelComponent.uniqueKey), []));
             }
-            return _context3.abrupt("return", console.debug('查询标签缺少必要参数-tradeId'));
+            return _context4.abrupt("return", console.debug('查询标签缺少必要参数-tradeId'));
           case 8:
-            _context3.next = 10;
+            _context4.next = 10;
             return queryMemberLevel({
               tid: tid,
               shopId: shopId
             });
           case 10:
-            _yield$queryMemberLev = _context3.sent;
+            _yield$queryMemberLev = _context4.sent;
             _yield$queryMemberLev2 = _yield$queryMemberLev.data;
             data = _yield$queryMemberLev2 === void 0 ? [] : _yield$queryMemberLev2;
             if (!isEqual(oldMemberLevel, data)) {
@@ -731,31 +786,31 @@ var FormRender = function FormRender(props, ref) {
             }
           case 14:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
-    return function queryMemberLevels(_x6, _x7) {
-      return _ref4.apply(this, arguments);
+    return function queryMemberLevels(_x7, _x8) {
+      return _ref5.apply(this, arguments);
     };
   }();
 
   //订单返填
   var changeHandle = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(order_no) {
-      return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_no) {
+      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             if (order_no) {
-              _context4.next = 2;
+              _context5.next = 2;
               break;
             }
-            return _context4.abrupt("return");
+            return _context5.abrupt("return");
           case 2:
             // console.log('[订单返填 changeHandle order_no ] >', order_no);
 
             sessionStorage.setItem('order_no_test', order_no);
-            _context4.next = 5;
+            _context5.next = 5;
             return orderBack({
               order_no: order_no,
               form: form,
@@ -778,12 +833,12 @@ var FormRender = function FormRender(props, ref) {
             });
           case 5:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
-    return function changeHandle(_x8) {
-      return _ref5.apply(this, arguments);
+    return function changeHandle(_x9) {
+      return _ref6.apply(this, arguments);
     };
   }();
   // 组件值变化
@@ -864,16 +919,16 @@ var FormRender = function FormRender(props, ref) {
 
   //组件失焦事件
   var componentOnBlur = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(value, type) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(value, type) {
       var promises;
-      return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
             if (!(type === 'erpAfterSaleTradeId')) {
-              _context5.next = 5;
+              _context6.next = 5;
               break;
             }
-            _context5.next = 3;
+            _context6.next = 3;
             return onBlurErpAfterSaleTradeId({
               form: form,
               value: value,
@@ -881,14 +936,14 @@ var FormRender = function FormRender(props, ref) {
               setKmLoading: setKmLoading
             });
           case 3:
-            _context5.next = 28;
+            _context6.next = 36;
             break;
           case 5:
             if (!(type === 'expressLogisticsCode')) {
-              _context5.next = 10;
+              _context6.next = 13;
               break;
             }
-            _context5.next = 8;
+            _context6.next = 8;
             return onBlurExpressLogisticsCode({
               form: form,
               value: value,
@@ -897,26 +952,53 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur
             });
           case 8:
-            _context5.next = 28;
+            if (!['TR3E2FYXFZCFANVG6O6AALSM', 'SZF4ZGWZSNW6PYXMCIFEWBXT'].includes(companyKey)) {
+              _context6.next = 11;
+              break;
+            }
+            _context6.next = 11;
+            return onBlurSkxLogisticsCode({
+              form: form,
+              value: value,
+              templateDetail: templateDetail,
+              componentOnBlur: componentOnBlur
+            });
+          case 11:
+            _context6.next = 36;
             break;
-          case 10:
+          case 13:
             if (!(type === 'skxOutboundNoticeNo')) {
-              _context5.next = 16;
+              _context6.next = 19;
               break;
             }
             //[SKX]ON出库通知单号  返填
             console.log('skxOutboundNoticeNo', value);
-            _context5.next = 14;
+            _context6.next = 17;
             return onBlurSkxOutboundNoticeNo({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 14:
-            _context5.next = 28;
+          case 17:
+            _context6.next = 36;
             break;
-          case 16:
+          case 19:
+            if (!(type === 'skxReturnBillNo')) {
+              _context6.next = 24;
+              break;
+            }
+            _context6.next = 22;
+            return onBlurSkxReturnBillNo({
+              form: form,
+              value: value,
+              templateDetail: templateDetail,
+              componentOnBlur: componentOnBlur
+            });
+          case 22:
+            _context6.next = 36;
+            break;
+          case 24:
             // 收集所有需要执行的异步操作
             promises = [];
             if (type === 'tradeId') {
@@ -928,7 +1010,7 @@ var FormRender = function FormRender(props, ref) {
               promises.push(handleChangeTradeId(value));
             }
             if (value) {
-              _context5.next = 23;
+              _context6.next = 31;
               break;
             }
             setReplaceValue(function (prev) {
@@ -938,26 +1020,26 @@ var FormRender = function FormRender(props, ref) {
               return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
             });
             replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
-            return _context5.abrupt("return");
-          case 23:
+            return _context6.abrupt("return");
+          case 31:
             promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
             // TODO: ERP不走订单反弹逻辑
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
               promises.push(changeHandle(value));
             }
             // 等待所有异步操作完成
-            _context5.next = 27;
+            _context6.next = 35;
             return Promise.all(promises);
-          case 27:
-            return _context5.abrupt("return", Promise.resolve());
-          case 28:
+          case 35:
+            return _context6.abrupt("return", Promise.resolve());
+          case 36:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
-    return function componentOnBlur(_x9, _x10) {
-      return _ref6.apply(this, arguments);
+    return function componentOnBlur(_x10, _x11) {
+      return _ref7.apply(this, arguments);
     };
   }();
   // 切换店铺
@@ -1005,7 +1087,7 @@ var FormRender = function FormRender(props, ref) {
     }
     //如果有bs组件 设置成初始值
     var hasBs = get(templateDetail, 'componentDtoList', []).some(function (item) {
-      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'SKX_LOGISTICS'].includes(item.workOrderComponentType);
+      return ['BS_LOGISTICS', 'BS_E3_LOGISTICS', 'BS_SEND_GOOD', 'BS_E3_SEND_GOOD', 'WDT_LOGISTICS', 'WDT_SEND_GOOD', 'WLN_LOGISTICS', 'WLN_SEND_GOOD', 'KM_LOGISTICS', 'KM_SEND_GOOD', 'GY_SEND_GOOD', 'GY_LOGISTICS', 'SKX_LOGISTICS', 'SKX_RETURN_LOGISTICS'].includes(item.workOrderComponentType);
     });
     if (hasBs) {
       var bsValue = get(templateDetail, 'componentDtoList', []).reduce(function (prv, next) {
@@ -1022,6 +1104,12 @@ var FormRender = function FormRender(props, ref) {
               logisticsCode: null
             }];
             break;
+          case 'SKX_RETURN_LOGISTICS':
+            prv[next.uniqueKey] = [{
+              skxReturnLogisticsCompany: null,
+              skxReturnLogisticsCode: null
+            }];
+            break;
           case 'BS_SEND_GOOD':
           case 'BS_E3_SEND_GOOD':
           case 'WLN_SEND_GOOD':
@@ -1155,9 +1243,9 @@ var FormRender = function FormRender(props, ref) {
       var newComponentConfig = _objectSpread(_objectSpread({}, componentConfig), {}, {
         disabled: disabled
       });
-      var _ref7 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
-        upgrade = _ref7.upgrade,
-        created = _ref7.created;
+      var _ref8 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
+        upgrade = _ref8.upgrade,
+        created = _ref8.created;
       if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
         // 售后单id、补发单id和换货单id默认值是可见不可编辑（2）
         if (typeof upgrade !== 'number') {
@@ -1226,8 +1314,8 @@ var FormRender = function FormRender(props, ref) {
         return /*#__PURE__*/React.createElement(Form.Item, {
           noStyle: true,
           dependencies: _toConsumableArray(new Set(dependencies.concat(currentDependenciesMappingComponent)))
-        }, function (_ref8) {
-          var getFieldValue = _ref8.getFieldValue;
+        }, function (_ref9) {
+          var getFieldValue = _ref9.getFieldValue;
           var show = currentIdDependenceOtherFields === null || currentIdDependenceOtherFields === void 0 ? void 0 : currentIdDependenceOtherFields.reduce(function (cur, nxt) {
             // 如果有一项满足展示条件则展示
             if (cur) {