@kmkf-fe-packages/kmkf-work-order-service-component 2.3.13 → 2.3.14-alpha.0

package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts

@@ -14,6 +14,7 @@ declare type CurrentNodeProps = {
     queryRemarkList: () => void;
     autoSubmit?: boolean;
     isSuperAdmin?: boolean;
+    autoFillThirdPartyFields?: boolean;
 };
 declare const _default: React.ForwardRefExoticComponent<CurrentNodeProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -69,7 +69,8 @@ var CurrentNode = function CurrentNode(props, ref) {
     flowWorkOrderId = props.flowWorkOrderId,
     queryRemarkList = props.queryRemarkList,
     autoSubmit = props.autoSubmit,
-    onJumpPage = props.onJumpPage;
+    onJumpPage = props.onJumpPage,
+    autoFillThirdPartyFields = props.autoFillThirdPartyFields;
   var _useContext = useContext(Context),
     dispatch = _useContext.dispatch;
   // 是否是编辑状态
@@ -406,7 +407,8 @@ var CurrentNode = function CurrentNode(props, ref) {
     flowAllShowHideRules: allShowHideRules,
     isStartNodeWaiting: NodeType.START_NODE === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : _currentNodeDetail$no25.nodeType) && [NodeStatus.WAITING].includes(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowStatus),
     firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
-    autoSubmit: autoSubmit
+    autoSubmit: autoSubmit,
+    autoFillThirdPartyFields: autoFillThirdPartyFields
   })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
     flowEventData: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.flowEventData,
     shopList: shopList

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts

@@ -33,6 +33,7 @@ declare type FormRenderProps = {
     isErpUse?: boolean;
     autoSubmit?: boolean;
     isStartNodeWaiting?: boolean;
+    autoFillThirdPartyFields?: boolean;
 };
 declare const _default: React.ForwardRefExoticComponent<FormRenderProps & React.RefAttributes<unknown>>;
 export default _default;

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

@@ -3,6 +3,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -95,7 +96,16 @@ var FormRender = function FormRender(props, ref) {
     autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
     _props$isStartNodeWai = props.isStartNodeWaiting,
     isStartNodeWaiting = _props$isStartNodeWai === void 0 ? false : _props$isStartNodeWai,
-    onJumpPage = props.onJumpPage;
+    onJumpPage = props.onJumpPage,
+    autoFillThirdPartyFields = props.autoFillThirdPartyFields;
+  var notAutoFillFlag = useMemo(function () {
+    // autoFillThirdPartyFields=false 一票否决 → FALSE
+    if (autoFillThirdPartyFields === false) {
+      return false;
+    }
+    // 其余情况：notAutoFillWithFirstSubmit 或 preCreateAndNotModified 任一为 true → TRUE
+    return !!(record !== null && record !== void 0 && record.notAutoFillWithFirstSubmit || record !== null && record !== void 0 && record.preCreateAndNotModified);
+  }, [record === null || record === void 0 ? void 0 : record.notAutoFillWithFirstSubmit, record === null || record === void 0 ? void 0 : record.preCreateAndNotModified, autoFillThirdPartyFields]);
   var shopIdToUniqueKeyMap = useMemo(function () {
     var json = {};
     shopList.forEach(function (shop) {
@@ -399,7 +409,7 @@ var FormRender = function FormRender(props, ref) {
   }, [labelComponent, record]);
   var queryDetail = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-      var workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, jsonMap, _record$jsonMap3, newRecord, jsonMapOrderId, getCacheInfo, newFormValues, transData, initialValues, tradeIdUniqueKey, _record$jsonMap2, currentNodeTradeIdUniqueKey, _currentNodeTid, _record$jsonMap4, _record$jsonMap5, _record$jsonMap6, initFormValues, _getCacheInfo, _getCacheInfo2, _getCacheInfo3, _getCacheInfo4, _orderNo, _shopId, orderNoField, _transData, _initialValues, antFormEl;
+      var workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, jsonMap, newRecord, jsonMapOrderId, getCacheInfo, newFormValues, transData, initialValues, tradeIdUniqueKey, _record$jsonMap2, _record$jsonMap3, _record$jsonMap4, currentNodeTradeIdUniqueKey, _currentNodeTid, logisticsOrderBackSources, lastLogisticsOrderBackSource, preTradeId, tradeId, _iterator, _step, source, 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:
@@ -429,7 +439,7 @@ var FormRender = function FormRender(props, ref) {
               return prv;
             }, {});
             if (!workOrderId) {
-              _context2.next = 45;
+              _context2.next = 62;
               break;
             }
             // 先初始化端上内容
@@ -457,26 +467,52 @@ var FormRender = function FormRender(props, ref) {
             }));
             console.log('transData', get(transData, '0', {}));
             initialValues = get(transData, '0', {});
-            newRecord.preCreateAndNotModified && !newRecord.notAutoFillWithFirstSubmit && batchFillByMapping(initialValues);
+            newRecord.preCreateAndNotModified && !notAutoFillFlag && 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 = 35;
+            if (!notAutoFillFlag) {
+              _context2.next = 59;
               break;
             }
             currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
             _currentNodeTid = record === null || record === void 0 ? void 0 : (_record$jsonMap2 = record.jsonMap) === null || _record$jsonMap2 === void 0 ? void 0 : _record$jsonMap2["".concat(currentNodeTradeIdUniqueKey, "_tradeId")];
-            if (!_currentNodeTid) {
-              _context2.next = 30;
+            logisticsOrderBackSources = ((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []).reduce(function (cur, component) {
+              if (component.workOrderComponentType === 'EXPRESS_LOGISTICS_SELECT') {
+                var _initialValues$compon;
+                var logisticsCode = (_initialValues$compon = initialValues[component.uniqueKey]) === null || _initialValues$compon === void 0 ? void 0 : _initialValues$compon.order;
+                if (logisticsCode) {
+                  cur.push({
+                    logisticsCode: logisticsCode,
+                    uniqueKey: component.uniqueKey
+                  });
+                }
+              }
+              if (component.workOrderComponentType === 'LOGISTICS_INTERCEPTION') {
+                var _initialValues$compon2;
+                var _logisticsCode = (_initialValues$compon2 = initialValues[component.uniqueKey]) === null || _initialValues$compon2 === void 0 ? void 0 : _initialValues$compon2.interceptCode;
+                if (_logisticsCode) {
+                  cur.push({
+                    logisticsCode: _logisticsCode,
+                    uniqueKey: component.uniqueKey
+                  });
+                }
+              }
+              return cur;
+            }, []);
+            lastLogisticsOrderBackSource = logisticsOrderBackSources[logisticsOrderBackSources.length - 1];
+            preTradeId = tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap3 = record.jsonMap) !== null && _record$jsonMap3 !== void 0 && _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill ? record === null || record === void 0 ? void 0 : (_record$jsonMap4 = record.jsonMap) === null || _record$jsonMap4 === void 0 ? void 0 : _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")] : undefined;
+            tradeId = _currentNodeTid || preTradeId;
+            if (!tradeId) {
+              _context2.next = 34;
               break;
             }
-            queryLabels(_currentNodeTid, shopId);
-            queryMemberLevels(_currentNodeTid, shopId);
-            _context2.next = 28;
+            queryLabels(tradeId, shopId);
+            queryMemberLevels(tradeId, shopId);
+            _context2.next = 32;
             return orderBack({
               companyKey: companyKey,
-              order_no: _currentNodeTid,
+              order_no: tradeId,
               form: form,
               shopId: shopId,
               shopList: shopList,
@@ -485,13 +521,55 @@ var FormRender = function FormRender(props, ref) {
               fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
               plat: plat,
               callKey: 1,
-              setLoading: setLoading
+              setLoading: setLoading,
+              wdtMatchLogisticsNo: lastLogisticsOrderBackSource === null || lastLogisticsOrderBackSource === void 0 ? void 0 : lastLogisticsOrderBackSource.logisticsCode,
+              skipOrderBackUniqueKeys: lastLogisticsOrderBackSource !== null && lastLogisticsOrderBackSource !== void 0 && lastLogisticsOrderBackSource.uniqueKey ? [lastLogisticsOrderBackSource.uniqueKey] : []
             });
-          case 28:
-            _context2.next = 32;
+          case 32:
+            _context2.next = 56;
             break;
-          case 30:
-            _context2.next = 32;
+          case 34:
+            if (!logisticsOrderBackSources.length) {
+              _context2.next = 54;
+              break;
+            }
+            _iterator = _createForOfIteratorHelper(logisticsOrderBackSources);
+            _context2.prev = 36;
+            _iterator.s();
+          case 38:
+            if ((_step = _iterator.n()).done) {
+              _context2.next = 44;
+              break;
+            }
+            source = _step.value;
+            _context2.next = 42;
+            return onBlurExpressLogisticsCode({
+              form: form,
+              value: source.logisticsCode,
+              templateDetail: templateDetail,
+              setKmLoading: setKmLoading,
+              componentOnBlur: componentOnBlur,
+              sourceUniqueKey: source.uniqueKey
+            });
+          case 42:
+            _context2.next = 38;
+            break;
+          case 44:
+            _context2.next = 49;
+            break;
+          case 46:
+            _context2.prev = 46;
+            _context2.t0 = _context2["catch"](36);
+            _iterator.e(_context2.t0);
+          case 49:
+            _context2.prev = 49;
+            _iterator.f();
+            return _context2.finish(49);
+          case 52:
+            _context2.next = 56;
+            break;
+          case 54:
+            _context2.next = 56;
             return skxOrderBack({
               form: form,
               companyKey: companyKey,
@@ -499,42 +577,18 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur,
               jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
             });
-          case 32:
+          case 56:
             // 仅在依赖值有值且映射值为空时触发一次映射
             batchFillByMappingWhenTargetEmpty(initialValues);
-            _context2.next = 43;
-            break;
-          case 35:
-            if (!(tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap3 = record.jsonMap) !== null && _record$jsonMap3 !== void 0 && _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill)) {
-              _context2.next = 42;
-              break;
-            }
-            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);
-            _context2.next = 40;
-            return orderBack({
-              companyKey: companyKey,
-              order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")],
-              form: form,
-              shopId: shopId,
-              shopList: shopList,
-              templateDetail: templateDetail,
-              callback: orderBackReplace,
-              fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
-              plat: plat,
-              callKey: 1,
-              setLoading: setLoading
-            });
-          case 40:
-            _context2.next = 43;
+            _context2.next = 60;
             break;
-          case 42:
+          case 59:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
-          case 43:
-            _context2.next = 68;
+          case 60:
+            _context2.next = 85;
             break;
-          case 45:
+          case 62:
             fillByShopId(shopId);
             initFormValues = null;
             if (plat !== null && plat !== void 0 && plat.subOrderNo) {
@@ -553,7 +607,7 @@ var FormRender = function FormRender(props, ref) {
 
             // console.log(orderNo, initFormValues);
             if (!initFormValues) {
-              _context2.next = 56;
+              _context2.next = 73;
               break;
             }
             form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -570,9 +624,9 @@ var FormRender = function FormRender(props, ref) {
               _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 = 68;
+            _context2.next = 85;
             break;
-          case 56:
+          case 73:
             _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');
@@ -584,12 +638,12 @@ var FormRender = function FormRender(props, ref) {
             batchFillByMapping(_initialValues);
             //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
             if (!(orderNo && shopId)) {
-              _context2.next = 67;
+              _context2.next = 84;
               break;
             }
             queryLabels(orderNo, shopId);
             queryMemberLevels(orderNo, shopId);
-            _context2.next = 65;
+            _context2.next = 82;
             return orderBack({
               companyKey: companyKey,
               order_no: orderNo,
@@ -604,13 +658,13 @@ var FormRender = function FormRender(props, ref) {
               callKey: 2,
               setLoading: setLoading
             });
-          case 65:
-            _context2.next = 68;
+          case 82:
+            _context2.next = 85;
             break;
-          case 67:
+          case 84:
             // 如果没有订单反填，则单独更新remark
             fetchRemark(shopId, currentNodeTid);
-          case 68:
+          case 85:
             antFormEl = document.getElementsByClassName('ant-form');
             (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
             resetMappingHideComponents();
@@ -619,11 +673,11 @@ var FormRender = function FormRender(props, ref) {
               type: 'setaAutoSubmitFlag',
               payload: true
             });
-          case 72:
+          case 89:
           case "end":
             return _context2.stop();
         }
-      }, _callee2);
+      }, _callee2, null, [[36, 46, 49, 52]]);
     }));
     return function queryDetail(_x4) {
       return _ref3.apply(this, arguments);
@@ -640,7 +694,7 @@ var FormRender = function FormRender(props, ref) {
       buyerId: buyerId,
       buyerNick: buyerNick
     });
-  }, [workOrderId, record, shopId, isErpUse]);
+  }, [workOrderId, record, shopId, isErpUse, autoFillThirdPartyFields]);
 
   // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
   var resetMappingHideComponents = function resetMappingHideComponents() {
@@ -871,7 +925,7 @@ var FormRender = function FormRender(props, ref) {
 
   //订单返填
   var changeHandle = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_no) {
+    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(order_no, options) {
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -904,7 +958,9 @@ var FormRender = function FormRender(props, ref) {
                 }, 0);
               },
               callKey: 3,
-              setLoading: setLoading
+              setLoading: setLoading,
+              wdtMatchLogisticsNo: options === null || options === void 0 ? void 0 : options.wdtMatchLogisticsNo,
+              skipOrderBackUniqueKeys: options === null || options === void 0 ? void 0 : options.skipOrderBackUniqueKeys
             });
           case 5:
           case "end":
@@ -912,7 +968,7 @@ var FormRender = function FormRender(props, ref) {
         }
       }, _callee5);
     }));
-    return function changeHandle(_x9) {
+    return function changeHandle(_x9, _x10) {
       return _ref6.apply(this, arguments);
     };
   }();
@@ -1015,7 +1071,7 @@ var FormRender = function FormRender(props, ref) {
 
   //组件失焦事件
   var componentOnBlur = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(value, type, uniqueKey) {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(value, type, uniqueKey, options) {
       var promises;
       return _regeneratorRuntime().wrap(function _callee6$(_context6) {
         while (1) switch (_context6.prev = _context6.next) {
@@ -1041,36 +1097,43 @@ var FormRender = function FormRender(props, ref) {
               setKmLoading: setKmLoading
             });
           case 4:
-            _context6.next = 49;
+            _context6.next = 58;
             break;
           case 6:
             if (!(type === 'expressLogisticsCode')) {
-              _context6.next = 16;
+              _context6.next = 18;
+              break;
+            }
+            if ("".concat(value || '').trim()) {
+              _context6.next = 9;
               break;
             }
-            _context6.next = 9;
+            return _context6.abrupt("return");
+          case 9:
+            _context6.next = 11;
             return onBlurExpressLogisticsCode({
               form: form,
               value: value,
               templateDetail: templateDetail,
               setKmLoading: setKmLoading,
-              componentOnBlur: componentOnBlur
+              componentOnBlur: componentOnBlur,
+              sourceUniqueKey: uniqueKey
             });
-          case 9:
+          case 11:
             if (!['TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
             ].includes(companyKey)) {
-              _context6.next = 12;
+              _context6.next = 14;
               break;
             }
-            _context6.next = 12;
+            _context6.next = 14;
             return onBlurSkxLogisticsCode({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 12:
-            _context6.next = 14;
+          case 14:
+            _context6.next = 16;
             return onBlurReturnLogisticsCode({
               form: form,
               value: value,
@@ -1078,15 +1141,38 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur,
               orderBackRule: 'outSid'
             });
-          case 14:
-            _context6.next = 49;
-            break;
           case 16:
-            if (!(type === 'returnLogisticsCode')) {
+            _context6.next = 58;
+            break;
+          case 18:
+            if (!(type === 'interceptCode')) {
+              _context6.next = 25;
+              break;
+            }
+            if ("".concat(value || '').trim()) {
               _context6.next = 21;
               break;
             }
-            _context6.next = 19;
+            return _context6.abrupt("return");
+          case 21:
+            _context6.next = 23;
+            return onBlurExpressLogisticsCode({
+              form: form,
+              value: value,
+              templateDetail: templateDetail,
+              setKmLoading: setKmLoading,
+              componentOnBlur: componentOnBlur,
+              sourceUniqueKey: uniqueKey
+            });
+          case 23:
+            _context6.next = 58;
+            break;
+          case 25:
+            if (!(type === 'returnLogisticsCode')) {
+              _context6.next = 30;
+              break;
+            }
+            _context6.next = 28;
             return onBlurReturnLogisticsCode({
               form: form,
               value: value,
@@ -1094,57 +1180,57 @@ var FormRender = function FormRender(props, ref) {
               componentOnBlur: componentOnBlur,
               orderBackRule: 'logisticsCode'
             });
-          case 19:
-            _context6.next = 49;
+          case 28:
+            _context6.next = 58;
             break;
-          case 21:
+          case 30:
             if (!(type === 'skxOutboundNoticeNo')) {
-              _context6.next = 27;
+              _context6.next = 36;
               break;
             }
             //[SKX]ON出库通知单号  返填
             console.log('skxOutboundNoticeNo', value);
-            _context6.next = 25;
+            _context6.next = 34;
             return onBlurSkxOutboundNoticeNo({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 25:
-            _context6.next = 49;
+          case 34:
+            _context6.next = 58;
             break;
-          case 27:
+          case 36:
             if (!(type === 'skxReturnBillNo')) {
-              _context6.next = 32;
+              _context6.next = 41;
               break;
             }
-            _context6.next = 30;
+            _context6.next = 39;
             return onBlurSkxReturnBillNo({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 30:
-            _context6.next = 49;
+          case 39:
+            _context6.next = 58;
             break;
-          case 32:
+          case 41:
             if (!(type === 'skxReturnTHLogisticsCode')) {
-              _context6.next = 37;
+              _context6.next = 46;
               break;
             }
-            _context6.next = 35;
+            _context6.next = 44;
             return onBlurSkxReturnTHLogisticsCode({
               form: form,
               value: value,
               templateDetail: templateDetail,
               componentOnBlur: componentOnBlur
             });
-          case 35:
-            _context6.next = 49;
+          case 44:
+            _context6.next = 58;
             break;
-          case 37:
+          case 46:
             // 收集所有需要执行的异步操作
             promises = [];
             if (type === 'tradeId') {
@@ -1156,7 +1242,7 @@ var FormRender = function FormRender(props, ref) {
               promises.push(handleChangeTradeId(value));
             }
             if (value) {
-              _context6.next = 44;
+              _context6.next = 53;
               break;
             }
             setReplaceValue(function (prev) {
@@ -1167,24 +1253,24 @@ var FormRender = function FormRender(props, ref) {
             });
             replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
             return _context6.abrupt("return");
-          case 44:
+          case 53:
             promises.push(queryReplaceCount(_defineProperty({}, type, value), templateDetail));
             // TODO: ERP不走订单反弹逻辑
             if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
-              promises.push(changeHandle(value));
+              promises.push(changeHandle(value, options));
             }
             // 等待所有异步操作完成
-            _context6.next = 48;
+            _context6.next = 57;
             return Promise.all(promises);
-          case 48:
+          case 57:
             return _context6.abrupt("return", Promise.resolve());
-          case 49:
+          case 58:
           case "end":
             return _context6.stop();
         }
       }, _callee6);
     }));
-    return function componentOnBlur(_x10, _x11, _x12) {
+    return function componentOnBlur(_x11, _x12, _x13, _x14) {
       return _ref7.apply(this, arguments);
     };
   }();

package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts

@@ -5,12 +5,16 @@ export declare const onBlurErpAfterSaleTradeId: ({ form, value, templateDetail,
     templateDetail: any;
     setKmLoading: (loading: boolean) => void;
 }) => Promise<void>;
-export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, onlyGetTid, needTradeIdOrderBack, }: {
+export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail, setKmLoading, componentOnBlur, sourceUniqueKey, onlyGetTid, needTradeIdOrderBack, }: {
     form: FormInstance;
     value: string;
     templateDetail: any;
     setKmLoading: (loading: boolean) => void;
-    componentOnBlur: (value: any, type: string) => Promise<void>;
+    componentOnBlur: (value: any, type: string, uniqueKey?: string, options?: {
+        wdtMatchLogisticsNo?: string;
+        skipOrderBackUniqueKeys?: string[];
+    }) => Promise<void>;
+    sourceUniqueKey?: string | undefined;
     onlyGetTid?: boolean | undefined;
     needTradeIdOrderBack?: boolean | undefined;
 }) => Promise<any>;

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

@@ -47,11 +47,11 @@ export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
 export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
   var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
     var _kmErpVideoComponent$2;
-    var form, value, templateDetail, setKmLoading, componentOnBlur, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, _tradeIdComponent$com, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, oldValue, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
+    var form, value, templateDetail, setKmLoading, componentOnBlur, sourceUniqueKey, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, _tradeIdComponent$com, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          form = _ref3.form, value = _ref3.value, templateDetail = _ref3.templateDetail, setKmLoading = _ref3.setKmLoading, componentOnBlur = _ref3.componentOnBlur, _ref3$onlyGetTid = _ref3.onlyGetTid, onlyGetTid = _ref3$onlyGetTid === void 0 ? false : _ref3$onlyGetTid, _ref3$needTradeIdOrde = _ref3.needTradeIdOrderBack, needTradeIdOrderBack = _ref3$needTradeIdOrde === void 0 ? true : _ref3$needTradeIdOrde;
+          form = _ref3.form, value = _ref3.value, templateDetail = _ref3.templateDetail, setKmLoading = _ref3.setKmLoading, componentOnBlur = _ref3.componentOnBlur, sourceUniqueKey = _ref3.sourceUniqueKey, _ref3$onlyGetTid = _ref3.onlyGetTid, onlyGetTid = _ref3$onlyGetTid === void 0 ? false : _ref3$onlyGetTid, _ref3$needTradeIdOrde = _ref3.needTradeIdOrderBack, needTradeIdOrderBack = _ref3$needTradeIdOrde === void 0 ? true : _ref3$needTradeIdOrde;
           hasTradeIdComponent = templateDetail.componentDtoList.some(function (item) {
             return item.workOrderComponentType === 'TRADE_ID_INPUT';
           });
@@ -72,7 +72,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
           });
         case 6:
           if (!hasTradeIdComponent) {
-            _context2.next = 37;
+            _context2.next = 35;
             break;
           }
           hasKm = false;
@@ -106,63 +106,59 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
           }
           return _context2.abrupt("return");
         case 12:
-          oldValue = form.getFieldValue('0eVTfMGEyd');
           if (!hasWdt) {
-            _context2.next = 19;
+            _context2.next = 18;
             break;
           }
-          _context2.next = 16;
+          _context2.next = 15;
           return queryTidByWdtOutSid({
             outSid: value
           });
-        case 16:
+        case 15:
           _context2.t0 = _context2.sent;
-          _context2.next = 22;
-          break;
-        case 19:
           _context2.next = 21;
+          break;
+        case 18:
+          _context2.next = 20;
           return queryTidByOutSid({
             outSid: value
           });
-        case 21:
+        case 20:
           _context2.t0 = _context2.sent;
-        case 22:
+        case 21:
           res = _context2.t0;
           tradeId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.tid;
           if (!onlyGetTid) {
-            _context2.next = 26;
+            _context2.next = 25;
             break;
           }
           return _context2.abrupt("return", tradeId);
-        case 26:
+        case 25:
           if (tradeId) {
-            _context2.next = 28;
+            _context2.next = 27;
             break;
           }
           return _context2.abrupt("return");
-        case 28:
+        case 27:
           tradeIdComponent = templateDetail.componentDtoList.find(function (item) {
             return item.workOrderComponentType === 'TRADE_ID_INPUT';
           });
           newTradeId = tradeIdComponent !== null && tradeIdComponent !== void 0 && (_tradeIdComponent$com = tradeIdComponent.componentConfig) !== null && _tradeIdComponent$com !== void 0 && _tradeIdComponent$com.toUpperCase ? tradeId.toUpperCase() : tradeId;
-          form.setFieldsValue({
-            m3ap1EvEyd: newTradeId
-          });
+          form.setFieldsValue(_defineProperty({}, (tradeIdComponent === null || tradeIdComponent === void 0 ? void 0 : tradeIdComponent.uniqueKey) || 'm3ap1EvEyd', newTradeId));
           if (!needTradeIdOrderBack) {
-            _context2.next = 35;
+            _context2.next = 34;
             break;
           }
           // 创建一个异步操作的Promise
-          blurPromise = componentOnBlur(tradeId, 'tradeId'); // 等待异步操作完成后再执行setTimeout
-          _context2.next = 35;
+          blurPromise = componentOnBlur(tradeId, 'tradeId', undefined, {
+            wdtMatchLogisticsNo: value,
+            skipOrderBackUniqueKeys: sourceUniqueKey ? [sourceUniqueKey] : []
+          }); // 等待异步操作完成后再执行setTimeout
+          _context2.next = 34;
           return blurPromise;
-        case 35:
-          // 所有异步操作完成后执行
-          form.setFieldsValue({
-            '0eVTfMGEyd': oldValue
-          });
+        case 34:
           return _context2.abrupt("return", res.data);
-        case 37:
+        case 35:
         case "end":
           return _context2.stop();
       }

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -63,7 +63,7 @@ import { PlatForm } from "../WorkOrder/types";
 var Text = Typography.Text,
   Link = Typography.Link;
 var FlowTemplateDetail = function FlowTemplateDetail(props) {
-  var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$wo30, _currentNodeDetail$wo31, _JSON$parse, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$wo36, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$no31, _currentNodeDetail$no32;
+  var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$wo29, _currentNodeDetail$wo30, _JSON$parse, _currentNodeDetail$wo31, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$no31, _currentNodeDetail$no32;
   var flowTemplateKey = props.flowTemplateKey,
     _props$shopList = props.shopList,
     shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -82,6 +82,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     callbackAutoSubmitResult = props.callbackAutoSubmitResult,
     _props$otherInfo = props.otherInfo,
     otherInfo = _props$otherInfo === void 0 ? {} : _props$otherInfo;
+  var autoFillThirdPartyFields = otherInfo.autoFillThirdPartyFields;
   var _useContext = useContext(Context),
     dispatch = _useContext.dispatch;
   var flowRecordList = useSelector(selectFlowRecordList);
@@ -1179,17 +1180,19 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   };
   useEffect(function () {
     if (autoSubmit && !isEmpty(currentNodeDetail)) {
-      var _currentNodeDetail$wo25, _currentNodeDetail$wo26;
+      var _currentNodeDetail$wo25;
       // SKX首节点满足下列条件、此时批量提交会等订单数据反填再提交, 其余企业批量提交还是原先逻辑，不涉及订单数据反填
-      if (currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo25 !== void 0 && _currentNodeDetail$wo25.notAutoFillWithFirstSubmit && autoSubmitFlag) {
+      // 优先使用外部传入的 autoFillThirdPartyFields，未传时降级使用 record 中的 notAutoFillWithFirstSubmit
+      var effectiveAutoFill = autoFillThirdPartyFields !== undefined ? autoFillThirdPartyFields : currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo25 === void 0 ? void 0 : _currentNodeDetail$wo25.notAutoFillWithFirstSubmit;
+      if (effectiveAutoFill && autoSubmitFlag) {
         autoSubmitFn();
-      } else if (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo26 !== void 0 && _currentNodeDetail$wo26.notAutoFillWithFirstSubmit) && !autoSubmitFlag) {
+      } else if (!effectiveAutoFill && !autoSubmitFlag) {
         autoSubmitFn();
       }
     }
-  }, [currentNodeDetail, autoSubmitFlag]);
+  }, [currentNodeDetail, autoSubmitFlag, autoFillThirdPartyFields]);
   var isCurrentNodeHandler = useMemo(function () {
-    var _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo27, _currentNodeDetail$no25, _currentNodeDetail$no26;
+    var _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo26, _currentNodeDetail$no25, _currentNodeDetail$no26;
     return currentUserHasOperatorAuth({
       isSuperAdmin: isSuperAdmin,
       assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : _currentNodeDetail$no17.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no18 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.id] || [],
@@ -1197,7 +1200,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       currentUserKey: plat.userKey,
       staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no21 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no21 === void 0 ? void 0 : (_currentNodeDetail$no22 = _currentNodeDetail$no21.assistants) === null || _currentNodeDetail$no22 === void 0 ? void 0 : _currentNodeDetail$no22.staffIds) || [],
       operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no23 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no23 === void 0 ? void 0 : (_currentNodeDetail$no24 = _currentNodeDetail$no23.assistants) === null || _currentNodeDetail$no24 === void 0 ? void 0 : _currentNodeDetail$no24.operateDataPermission,
-      handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.handlerList) || [],
+      handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo26 === void 0 ? void 0 : _currentNodeDetail$wo26.handlerList) || [],
       isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no25 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no25 === void 0 ? void 0 : (_currentNodeDetail$no26 = _currentNodeDetail$no25.assistants) === null || _currentNodeDetail$no26 === void 0 ? void 0 : _currentNodeDetail$no26.isAllStaff
     });
   }, [currentNodeDetail, plat, assistantMap, useGroupMap]);
@@ -1206,9 +1209,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no27 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no27 === void 0 ? void 0 : (_currentNodeDetail$no28 = _currentNodeDetail$no27.relationEvent) === null || _currentNodeDetail$no28 === void 0 ? void 0 : _currentNodeDetail$no28.defaultShopUniqueKey);
   })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
   var ReportOrderRender = function ReportOrderRender(props) {
-    var _currentNodeDetail$wo28, _currentNodeDetail$wo29;
+    var _currentNodeDetail$wo27, _currentNodeDetail$wo28;
     var details = props.details;
-    var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo28 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo28 === void 0 ? void 0 : _currentNodeDetail$wo28.componentDtoList.filter(function (t) {
+    var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.componentDtoList.filter(function (t) {
       return !CANNOT_BACK_FILL.includes(t.workOrderComponentType || '');
     });
     //获取可以返填的组件值
@@ -1216,7 +1219,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
       transData = _calcWorkOrderList2[0];
     //获取表单显示值
-    var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo29 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo29 === void 0 ? void 0 : _currentNodeDetail$wo29.componentDtoList),
+    var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo28 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo28 === void 0 ? void 0 : _currentNodeDetail$wo28.componentDtoList),
       _calcWorkOrderList4 = _slicedToArray(_calcWorkOrderList3, 1),
       transDataall = _calcWorkOrderList4[0];
     return /*#__PURE__*/React.createElement("div", {
@@ -1411,14 +1414,14 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
   }), shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopName, "-", flowWorkOrderId), !['created', 'edit'].includes(privilege) && /*#__PURE__*/React.createElement(Button, {
     type: "link",
     onClick: handleFollow
-  }, !follow ? '关注' : '已关注'), plat.platform === PlatForm.XIAOZHI && ['2'].includes(String(otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType)) && ((otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo30 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo30 === void 0 ? void 0 : _currentNodeDetail$wo30.buyerOpenUid)) && /*#__PURE__*/React.createElement(JumpBuyer, {
+  }, !follow ? '关注' : '已关注'), plat.platform === PlatForm.XIAOZHI && ['2'].includes(String(otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType)) && ((otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo29 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo29 === void 0 ? void 0 : _currentNodeDetail$wo29.buyerOpenUid)) && /*#__PURE__*/React.createElement(JumpBuyer, {
     order_number: tid,
     shop: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.taobaoNick) || '',
-    buyer: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo31 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo31 === void 0 ? void 0 : _currentNodeDetail$wo31.buyerOpenUid),
+    buyer: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.buyerOpenUid) || (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo30 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo30 === void 0 ? void 0 : _currentNodeDetail$wo30.buyerOpenUid),
     platformType: otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType
-  })), /*#__PURE__*/React.createElement("div", null, (_JSON$parse = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo32 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo32 === void 0 ? void 0 : (_currentNodeDetail$wo33 = _currentNodeDetail$wo32.jsonMap) === null || _currentNodeDetail$wo33 === void 0 ? void 0 : _currentNodeDetail$wo33.flowTags) || '[]')) !== null && _JSON$parse !== void 0 && _JSON$parse.includes('AI_BUILD') ? /*#__PURE__*/React.createElement(Tag, {
+  })), /*#__PURE__*/React.createElement("div", null, (_JSON$parse = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo31 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo31 === void 0 ? void 0 : (_currentNodeDetail$wo32 = _currentNodeDetail$wo31.jsonMap) === null || _currentNodeDetail$wo32 === void 0 ? void 0 : _currentNodeDetail$wo32.flowTags) || '[]')) !== null && _JSON$parse !== void 0 && _JSON$parse.includes('AI_BUILD') ? /*#__PURE__*/React.createElement(Tag, {
     color: "blue"
-  }, "AI\u81EA\u52A8\u5EFA\u5355-".concat(WORK_ORDER_STATUS_AI_BUILD[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo34 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo34 === void 0 ? void 0 : (_currentNodeDetail$wo35 = _currentNodeDetail$wo34.jsonMap) === null || _currentNodeDetail$wo35 === void 0 ? void 0 : _currentNodeDetail$wo35.flowStatus])) : null)), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
+  }, "AI\u81EA\u52A8\u5EFA\u5355-".concat(WORK_ORDER_STATUS_AI_BUILD[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo33 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo33 === void 0 ? void 0 : (_currentNodeDetail$wo34 = _currentNodeDetail$wo33.jsonMap) === null || _currentNodeDetail$wo34 === void 0 ? void 0 : _currentNodeDetail$wo34.flowStatus])) : null)), flowStatus && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Row, {
     justify: 'space-between',
     className: "header"
   }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
@@ -1488,7 +1491,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       isSuperAdmin: isSuperAdmin
     }));
   }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, {
-    key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo36 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo36 === void 0 ? void 0 : _currentNodeDetail$wo36.id) || 'current-node'
+    key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo35 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo35 === void 0 ? void 0 : _currentNodeDetail$wo35.id) || 'current-node'
   }, /*#__PURE__*/React.createElement(CurrentNode, {
     ref: currentNodeRef,
     flowTemplateId: flowTemplateId,
@@ -1503,7 +1506,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     onReminder: handleReminder,
     queryRemarkList: queryRemarkList,
     autoSubmit: autoSubmit,
-    isSuperAdmin: isSuperAdmin
+    isSuperAdmin: isSuperAdmin,
+    autoFillThirdPartyFields: autoFillThirdPartyFields
   }))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && !['created', 'edit'].includes(privilege) && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
     readonly: readonly,
     handleOpenRemarkList: handleOpenRemarkList,

package/dist/esm/common/utils/tools.d.ts

@@ -39,7 +39,7 @@ export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], tem
     workOrderComponentType: string;
     uniqueKey: string;
 }[], type?: string) => any[];
-export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, }: any) => Promise<void>;
+export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, wdtMatchLogisticsNo, skipOrderBackUniqueKeys, }: any) => Promise<void>;
 export declare const imgResize: (url: string, w?: number, h?: number) => string;
 export declare const COMPONENT_MAP: {
     [key: string]: string;

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

@@ -143,11 +143,11 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
 //订单返填
 export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
-    var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _wdtReturnBillNoCompo, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _jkyOrder$value, _wdtReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, jkyOrder, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, jstInfo, skxInfo, skxReturnInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
+    var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, wdtMatchLogisticsNo, skipOrderBackUniqueKeys, shopId, trySetShopId, _res$data, res, _res$data2, _res$data3, JOIN_SHOP, hasFlagMap, _ref4, shopSourceStr, _ref4$thirdUserNick, thirdUserNick, thirdShopMainType, _kmVideoComponent$com, _wdtReturnBillNoCompo, _data$value, _data$value3, _data$value4, _jstOrder$value, _jstOrder$value2, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsE3Order$value, _kmOrder$value, _gyOrder$value, _jyOrder$value, _skxOrder$value, _skxReturnOrder$value, _jkyOrder$value, _wdtReturnOrder$value, _bsOrders$orders, _bsE3Orders$orderList, _wlnOrders$orders, _wdtOrders$trades, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, xiaozhiOrder, jstOrder, bsOrder, wlnOrder, wdtOrder, bsE3Order, kmOrder, gyOrder, jyOrder, skxOrder, skxReturnOrder, jkyOrder, kmVideoOrder, orderSubFormOrder, wdtReturnOrder, _data$value2, orderInfo, jstOrders, bsOrders, wlnOrders, wdtOrders, bsE3Orders, kmOrders, gyOrders, jyOrders, skxOrders, skxReturnOrders, jkyOrders, wdtReturnOrders, bsInfo, wlnInfo, bsE3Info, wdtInfo, kmInfo, orderSubFormInfo, gyInfo, jyInfo, jkyInfo, 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:
-          companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey;
+          companyKey = _ref.companyKey, order_no = _ref.order_no, form = _ref.form, propsShopid = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback, fromQNCreateWorkOrderByOrderNo = _ref.fromQNCreateWorkOrderByOrderNo, _ref$plat = _ref.plat, plat = _ref$plat === void 0 ? {} : _ref$plat, callbackShopId = _ref.callbackShopId, setLoading = _ref.setLoading, callKey = _ref.callKey, wdtMatchLogisticsNo = _ref.wdtMatchLogisticsNo, skipOrderBackUniqueKeys = _ref.skipOrderBackUniqueKeys;
           console.log('orderBack-run--', callKey, templateDetail);
           shopId = propsShopid; //如果是pc平台且没有shopId的情况下 获取shopId
           trySetShopId = function trySetShopId(_ref3) {
@@ -409,7 +409,8 @@ export var orderBack = /*#__PURE__*/function () {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no,
             allOrders: (wdtOrders === null || wdtOrders === void 0 ? void 0 : wdtOrders.trades) || [],
-            wdtReturnOrders: (wdtReturnOrders === null || wdtReturnOrders === void 0 ? void 0 : wdtReturnOrders.orderList) || []
+            wdtReturnOrders: (wdtReturnOrders === null || wdtReturnOrders === void 0 ? void 0 : wdtReturnOrders.orderList) || [],
+            matchLogisticsNo: wdtMatchLogisticsNo
           }), form);
           kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
             allOrders: (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.orderDetailDtoList) || (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.trades),
@@ -713,7 +714,8 @@ export var orderBack = /*#__PURE__*/function () {
             formValue: formValue,
             templateDetail: templateDetail,
             type: type,
-            fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo
+            fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
+            skipOrderBackUniqueKeys: skipOrderBackUniqueKeys
           });
           pushGyLog('values', values);
           // console.log('formValue', formValue);

package/dist/esm/model/logicFlow/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectGroupFlowList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("./types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/paymentWorkOrder/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectCurrentPaymentRecord: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectFlagPayModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -76,7 +71,6 @@ export declare const selectLogModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -90,7 +84,6 @@ export declare const selectPaymentFormModalVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -104,7 +97,6 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -118,7 +110,6 @@ export declare const selectRepeatWorkOrderList: ((state: {
     paymentWorkOrder: import("./types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {

package/dist/esm/model/singleShopWorkOrder/selector.d.ts

@@ -6,7 +6,6 @@ export declare const selectorSingleTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
     clearCache: () => void;
 }> & {
@@ -20,7 +19,6 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -34,7 +32,6 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -48,7 +45,6 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -62,7 +58,6 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("./types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
-    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.3.13",
+  "version": "2.3.14-alpha.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.3.11",
-    "@kmkf-fe-packages/kmkf-utils": "2.3.11",
-    "@kmkf-fe-packages/services-components": "2.3.11",
+    "@kmkf-fe-packages/basic-components": "2.3.14-alpha.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.3.14-alpha.0",
+    "@kmkf-fe-packages/services-components": "2.3.14-alpha.0",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eea0aa95b487e2f428af49abd0759a5763178c06",
+  "gitHead": "98cc0ab91af6e073526944221f75f0ba4d411717",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }