@kmkf-fe-packages/kmkf-work-order-service-component 2.2.44-beta.5 → 2.2.44-beta.51

package/dist/esm/FlowTemplateDetailV2/common.js

@@ -27,7 +27,8 @@ export var getFlowOperate = {
   REMINDER: '催单',
   AI_BUILD: 'AI自动建单',
   CANCEL_REMINDER: '取消催单',
-  AUTO_TASK_RETRY: '自动任务重试'
+  AUTO_TASK_RETRY: '自动任务重试',
+  JUMP: '跳过'
 };
 export var FLOW_STATUS_V2 = {
   WAIT_COMMIT: '待提交',
@@ -39,7 +40,7 @@ export var FLOW_STATUS_V2 = {
   RETURNING: '回退中'
 };
 //不能回填的组件type
-export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
+export var CANNOT_BACK_FILL = ['LOGISTICS_TRAJECTORY', 'LOGISTICS_TRAJECTORY_MORE', 'BUYER_MESSAGE_NOTICE', 'MSG_STATUS', 'NEW_PAYMENT_STATUS', 'REISSUE_STATUS', 'REISSUE_LOGISTICS', 'RETURN_GOODS_STATUS', 'RETURN_GOODS_TRADE_ID', 'ADJUST_WORK_ORDER_STATUS', 'INVOICE_STATUS', 'INVOICING_STATUS', 'EXCHANGE_STATUS', 'WAREHOUSING_STATUS', 'BS_E3_WAREHOUSING_STATUS', 'WDT_WAREHOUSING_STATUS', 'JKY_WAREHOUSING_STATUS', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
 export var verifyHandle = function verifyHandle(data, componentDtoList) {
   var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
   var res = {

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

@@ -3,10 +3,6 @@ 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _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); }); }; }
@@ -17,10 +13,14 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeHandle, useContext } from 'react';
 import { ConfigProvider, Form, Space, Tag } from 'antd';
 import { useWhyDidYouUpdate, useDebounceFn } from 'ahooks';
@@ -111,6 +111,16 @@ var FormRender = function FormRender(props, ref) {
   var mappingConfig = useMemo(function () {
     return getMappingConfigByTemplateDetail(templateDetail);
   }, [templateDetail]);
+  var componentTypeMap = useMemo(function () {
+    var componentList = [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []));
+    var map = {};
+    componentList.forEach(function (item) {
+      if (item !== null && item !== void 0 && item.uniqueKey) {
+        map[item.uniqueKey] = item.workOrderComponentType;
+      }
+    });
+    return map;
+  }, [templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList]);
   var activeLogisticsComponents = useMemo(function () {
     return templateDetail.componentDtoList.filter(function (item) {
       var _item$componentConfig;
@@ -189,7 +199,9 @@ var FormRender = function FormRender(props, ref) {
       });
       var transData = calcWorkOrderList([record], preNodeComponentDtoList);
       preNodeForm.setFieldsValue(_objectSpread({}, get(transData, '0', {})));
-      record.preCreateAndNotModified && fillByShopId(get(transData, '0', {}).shopId);
+      if (record.preCreateAndNotModified && !record.notAutoFillWithFirstSubmit) {
+        fillByShopId(get(transData, '0', {}).shopId);
+      }
     }
   }, [record]);
   // 过滤打款组件订单与支付宝账号重复校验结果
@@ -445,7 +457,7 @@ var FormRender = function FormRender(props, ref) {
             }));
             console.log('transData', get(transData, '0', {}));
             initialValues = get(transData, '0', {});
-            newRecord.preCreateAndNotModified && batchFillByMapping(initialValues);
+            newRecord.preCreateAndNotModified && !newRecord.notAutoFillWithFirstSubmit && batchFillByMapping(initialValues);
             orderBackReplace(transData, templateDetail);
             // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
             tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
@@ -675,17 +687,19 @@ var FormRender = function FormRender(props, ref) {
 
   // 依赖值有值且目标映射值为空时才触发映射
   var batchFillByMappingWhenTargetEmpty = function batchFillByMappingWhenTargetEmpty(values) {
-    var componentList = [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []));
-    var _loop = function _loop(key) {
-      var _componentList$find, _mappingConfig$config;
-      var workOrderComponentType = (_componentList$find = componentList.find(function (t) {
-        return t.uniqueKey === key;
-      })) === null || _componentList$find === void 0 ? void 0 : _componentList$find.workOrderComponentType;
-      var triggerValue = getMappingTargetValue(values[key], workOrderComponentType);
-      if (isEmptyMappingValue(triggerValue)) return "continue";
-      var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[key];
+    for (var _i2 = 0, _Object$entries = Object.entries(values); _i2 < _Object$entries.length; _i2++) {
+      var _mappingConfig$config;
+      var _Object$entries$_i = _slicedToArray(_Object$entries[_i2], 2),
+        _triggerUniqueKey = _Object$entries$_i[0],
+        rawValue = _Object$entries$_i[1];
+      var workOrderComponentType = componentTypeMap[_triggerUniqueKey];
+      // TODO: 店铺需要一层数据转化
+      var mappingKey = _triggerUniqueKey === 'shopId' ? 'SHOP_SELECT_MAPPING' : _triggerUniqueKey;
+      var triggerValue = _triggerUniqueKey === 'shopId' ? getMappingTargetValue(rawValue ? shopIdToUniqueKeyMap[rawValue] : '', mappingKey) : getMappingTargetValue(rawValue, workOrderComponentType);
+      if (isEmptyMappingValue(triggerValue)) continue;
+      var mapping = (_mappingConfig$config = mappingConfig.config) === null || _mappingConfig$config === void 0 ? void 0 : _mappingConfig$config[mappingKey];
       var targetValues = mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue];
-      if (!targetValues) return "continue";
+      if (!targetValues) continue;
       var patch = {};
       for (var targetKey in targetValues) {
         if (isEmptyMappingValue(form.getFieldValue(targetKey))) {
@@ -695,19 +709,12 @@ var FormRender = function FormRender(props, ref) {
       if (!isEmpty(patch)) {
         form.setFieldsValue(patch);
       }
-    };
-    for (var _key2 in values) {
-      var _ret = _loop(_key2);
-      if (_ret === "continue") continue;
     }
   };
   // 组件映射
   var fillByMapping = function fillByMapping(triggerUniqueKey, value) {
-    var _componentList$find2, _mappingConfig$config2;
-    var componentList = [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || []));
-    var workOrderComponentType = (_componentList$find2 = componentList.find(function (t) {
-      return t.uniqueKey === triggerUniqueKey;
-    })) === null || _componentList$find2 === void 0 ? void 0 : _componentList$find2.workOrderComponentType;
+    var _mappingConfig$config2;
+    var workOrderComponentType = componentTypeMap[triggerUniqueKey];
     var triggerValue = getMappingTargetValue(value, workOrderComponentType);
 
     // 如果有映射关系，则修改对应组件的值
@@ -716,8 +723,8 @@ var FormRender = function FormRender(props, ref) {
       form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
     } else {
       var resetSet = new Set();
-      for (var _key3 in mapping) {
-        for (var uniqueKey in mapping[_key3]) {
+      for (var _key2 in mapping) {
+        for (var uniqueKey in mapping[_key2]) {
           resetSet.add(uniqueKey);
         }
       }
@@ -1407,7 +1414,7 @@ var FormRender = function FormRender(props, ref) {
         newComponentConfig['disabled'] = componentCanEdit;
       }
       if (workOrderComponentType === 'ENTERPRISE_PAYMENT') {
-        newComponentConfig['disabled'] = disabled || !canModifyPayment;
+        newComponentConfig['disabled'] = disabled || componentCanEdit || !canModifyPayment;
       }
       if (['RADIO', 'SELECT', 'MULT_SELECT'].includes(workOrderComponentType)) {
         var _mappingConfig$readon;

package/dist/esm/FlowTemplateDetailV2/index.js

@@ -62,7 +62,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$no14, _shopList$find, _currentNodeDetail$wo31, _currentNodeDetail$wo32, _JSON$parse, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$wo36, _currentNodeDetail$no27, _currentNodeDetail$no28, _currentNodeDetail$no29, _currentNodeDetail$no30;
+  var _currentNodeDetail$wo, _currentNodeDetail$no, _currentNodeDetail$wo2, _currentNodeDetail$no14, _shopList$find, _currentNodeDetail$wo31, _currentNodeDetail$wo32, _JSON$parse, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$wo36, _currentNodeDetail$wo37, _currentNodeDetail$no27, _currentNodeDetail$no28, _currentNodeDetail$no29, _currentNodeDetail$no30;
   var flowTemplateKey = props.flowTemplateKey,
     _props$shopList = props.shopList,
     shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -1362,7 +1362,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
     })))
   })), /*#__PURE__*/React.createElement(Timeline, null, flowRecordList.map(function (flowRecord, index) {
     var canWithdraw = currentNodeCanWithdraw(index) && !readonly && flowStatus !== FlowStatus.FLOWING;
-    return /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(NodeItem, {
+    return /*#__PURE__*/React.createElement(Timeline.Item, {
+      key: flowRecord.nodeId
+    }, /*#__PURE__*/React.createElement(NodeItem, {
       flowTemplateKey: flowTemplateKey,
       flowTemplateId: flowTemplateId,
       flowWorkOrderId: flowWorkOrderIdState,
@@ -1385,7 +1387,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
       eventNodeType: flowRecord.eventNodeType,
       isSuperAdmin: isSuperAdmin
     }));
-  }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, null, /*#__PURE__*/React.createElement(CurrentNode, {
+  }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, {
+    key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo37 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo37 === void 0 ? void 0 : _currentNodeDetail$wo37.id) || 'current-node'
+  }, /*#__PURE__*/React.createElement(CurrentNode, {
     ref: currentNodeRef,
     flowTemplateId: flowTemplateId,
     flowWorkOrderId: flowWorkOrderIdState,

package/dist/esm/LBOrderDetail/detail/OrderInfo.js

@@ -167,6 +167,28 @@ export var DETAIL_ITEM_LIST = [{
   title: '期望上门时间',
   dataIndex: 'expectedVisitTime',
   render: renderTime
+}, {
+  title: '物流公司名称',
+  dataIndex: 'logisticsCompany',
+  render: function render(value) {
+    var newValue = value ? JSON.parse(value) : '';
+    return Array.isArray(newValue) ? newValue === null || newValue === void 0 ? void 0 : newValue.map(function (item, index) {
+      return /*#__PURE__*/React.createElement("p", {
+        key: index
+      }, "\u5305\u88F9", index + 1, "\uFF1A", item.logisticsName);
+    }) : newValue;
+  }
+}, {
+  title: '物流单号',
+  dataIndex: 'logisticsNo',
+  render: function render(value) {
+    var newValue = value ? JSON.parse(value) : '';
+    return Array.isArray(newValue) ? newValue === null || newValue === void 0 ? void 0 : newValue.map(function (item, index) {
+      return /*#__PURE__*/React.createElement("p", {
+        key: index
+      }, "\u5305\u88F9", index + 1, "\uFF1A", item.logisticsNo);
+    }) : newValue;
+  }
 },
 // {
 //   title: '是否核销单',
@@ -555,6 +577,53 @@ var detailItemListMap = {};
 DETAIL_ITEM_LIST.forEach(function (item) {
   detailItemListMap[item.dataIndex] = item;
 });
+
+/** 全局 tableColumns 缓存，供所有 OrderInfo 复用，减少 queryColumns 请求 */
+var CACHE_TTL_MS = 5 * 60 * 1000; // 5 分钟失效
+var sharedTableColumnsCache = null;
+var fetchColumnsPromise = null;
+function getCachedColumns() {
+  if (!sharedTableColumnsCache) return null;
+  if (Date.now() - sharedTableColumnsCache.timestamp >= CACHE_TTL_MS) return null;
+  return sharedTableColumnsCache.columns;
+}
+function fetchAndCacheColumns() {
+  var cached = getCachedColumns();
+  if (cached) return Promise.resolve(cached);
+  if (fetchColumnsPromise) return fetchColumnsPromise;
+  fetchColumnsPromise = queryColumns().then(function (_ref) {
+    var _data$, _data$$queryInfo;
+    var data = _ref.data;
+    if (data !== null && data !== void 0 && (_data$ = data[0]) !== null && _data$ !== void 0 && (_data$$queryInfo = _data$.queryInfo) !== null && _data$$queryInfo !== void 0 && _data$$queryInfo.length) {
+      try {
+        var newColumns = [];
+        var list = JSON.parse(JSON.parse(data[0].queryInfo));
+        list.forEach(function (item) {
+          if (!item.show) return;
+          if (detailItemListMap[item.dataIndex]) {
+            newColumns.push(detailItemListMap[item.dataIndex]);
+          }
+        });
+        return newColumns;
+      } catch (err) {
+        console.debug('parse Error: ', err);
+        return DETAIL_ITEM_LIST;
+      }
+    }
+    return DETAIL_ITEM_LIST;
+  }).catch(function (err) {
+    console.debug(err);
+    return DETAIL_ITEM_LIST;
+  }).then(function (columns) {
+    sharedTableColumnsCache = {
+      columns: columns,
+      timestamp: Date.now()
+    };
+    fetchColumnsPromise = null;
+    return columns;
+  });
+  return fetchColumnsPromise;
+}
 var renderDetailItem = function renderDetailItem(record, item, effects) {
   var isTable = 'children' in item && item.children;
   var value = isTable ? record[item.dataIndex] : record.main[item.dataIndex];
@@ -566,12 +635,19 @@ var renderDetailItem = function renderDetailItem(record, item, effects) {
     className: styles.detailItemTitle
   }, item.title, "\uFF1A"), /*#__PURE__*/React.createElement("span", null, 'render' in item && item.render ? item.render(value, record, item, effects) : value));
 };
-var tableColumns;
 var OrderInfo = function OrderInfo(props) {
   var _React$useState = React.useState(),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     orderInfo = _React$useState2[0],
     setOrderInfo = _React$useState2[1];
+  // 复用全局缓存，有则用缓存（含 5 分钟有效期），无则走 fetchAndCacheColumns 拉取并写入缓存
+  var _React$useState3 = React.useState(function () {
+      var _getCachedColumns;
+      return (_getCachedColumns = getCachedColumns()) !== null && _getCachedColumns !== void 0 ? _getCachedColumns : [];
+    }),
+    _React$useState4 = _slicedToArray(_React$useState3, 2),
+    tableColumns = _React$useState4[0],
+    setTableColumns = _React$useState4[1];
   React.useEffect(function () {
     if (props.id) {
       queryInstallationRepairDetail(props.id).then(function (res) {
@@ -594,31 +670,9 @@ var OrderInfo = function OrderInfo(props) {
     return;
   }, [props.id]);
   React.useEffect(function () {
-    if (!tableColumns || tableColumns.length === 0) {
-      queryColumns().then(function (_ref) {
-        var _data$, _data$$queryInfo;
-        var data = _ref.data;
-        if (data !== null && data !== void 0 && (_data$ = data[0]) !== null && _data$ !== void 0 && (_data$$queryInfo = _data$.queryInfo) !== null && _data$$queryInfo !== void 0 && _data$$queryInfo.length) {
-          try {
-            var newColumns = [];
-            var list = JSON.parse(JSON.parse(data[0].queryInfo));
-            list.forEach(function (item) {
-              if (!item.show) return;
-              if (detailItemListMap[item.dataIndex]) {
-                newColumns.push(detailItemListMap[item.dataIndex]);
-              }
-            });
-            tableColumns = newColumns;
-          } catch (err) {
-            console.debug('parse Error: ', err);
-          }
-        } else {
-          tableColumns = DETAIL_ITEM_LIST;
-        }
-      }).catch(console.debug);
-    }
+    fetchAndCacheColumns().then(setTableColumns);
   }, []);
-  return orderInfo && tableColumns ? /*#__PURE__*/React.createElement("div", null, tableColumns.map(function (item) {
+  return orderInfo && tableColumns.length > 0 ? /*#__PURE__*/React.createElement("div", null, tableColumns.map(function (item) {
     return renderDetailItem(orderInfo, item, {
       shopList: props.shopList
     });

package/dist/esm/LBOrderDetail/index.js

@@ -9,7 +9,6 @@ import React, { useState } from 'react';
 import { CloseOutlined } from '@ant-design/icons';
 import LBOrderDetail from "./detail/index";
 import { useWindowSize } from '@kmkf-fe-packages/kmkf-utils';
-console.log("\uD83D\uDE80 ~ index.tsx:7 ~ useWindowSize:", useWindowSize);
 export * from "./detail/types";
 export * from "./detail/OrderInfo";
 export * from "./detail/ServiceProgress";

package/dist/esm/WorkOrder/components/WorkOrderList/index.js

@@ -184,6 +184,10 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
     var _JSON$parse, _JSON$parse$plugins, _JSON$parse$plugins$w;
     return ((_JSON$parse = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$plugins = _JSON$parse.plugins) === null || _JSON$parse$plugins === void 0 ? void 0 : (_JSON$parse$plugins$w = _JSON$parse$plugins.wdt) === null || _JSON$parse$plugins$w === void 0 ? void 0 : _JSON$parse$plugins$w.show) || false;
   });
+  var hasBindJst = useAppSelector(function (state) {
+    var _JSON$parse2, _JSON$parse2$plugins, _JSON$parse2$plugins$;
+    return ((_JSON$parse2 = JSON.parse(state.workOrder.userInfo.companyUserConfig || '{}')) === null || _JSON$parse2 === void 0 ? void 0 : (_JSON$parse2$plugins = _JSON$parse2.plugins) === null || _JSON$parse2$plugins === void 0 ? void 0 : (_JSON$parse2$plugins$ = _JSON$parse2$plugins.jst) === null || _JSON$parse2$plugins$ === void 0 ? void 0 : _JSON$parse2$plugins$.show) || false;
+  });
   var hasSuperAdminRole = useAppSelector(function (state) {
     return state.workOrder.userInfo.hasSuperAdminRole;
   });
@@ -667,7 +671,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
       shopId: shopId,
       userKey: userKey,
       companyKey: companyKey,
-      bindERP: bindERP || hasBindWdt,
+      bindERP: bindERP || hasBindWdt || hasBindJst,
       hasSuperAdminRole: hasSuperAdminRole
     },
     otherInfo: _objectSpread(_objectSpread({}, otherInfo), {}, {

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

@@ -218,6 +218,10 @@ export var SUBMIT_COMPONENT_GOOD_STATUS_MAP = {
   WDT_WAREHOUSING_STATUS: {
     list: 'wdtInStockStatusItemList',
     status: 'wdtInStockStatusList'
+  },
+  JKY_WAREHOUSING_STATUS: {
+    list: 'jkyInStockStatusItemList',
+    status: 'jkyInStockStatusList'
   }
 };
 export var SUBMIT_COMPONENT_ERP_LOGISTICS_MAP = {

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

@@ -900,6 +900,7 @@ var processComponent = function processComponent(_ref60) {
       case 'BS_E3_WAREHOUSING_STATUS':
       case 'MSG_STATUS':
       case 'WDT_WAREHOUSING_STATUS':
+      case 'JKY_WAREHOUSING_STATUS':
         wrapFn(handleGoodStatus);
         break;
       case 'TRADE_ID_INPUT':

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

@@ -21,7 +21,7 @@ import { message } from 'antd';
 import { get, last, cloneDeep, isEqual, set } from 'lodash';
 import { orderDetail, queryShopByTid } from "../../model/servers/api";
 import moment from 'moment';
-import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, jkyOrderTransform, filterJkyOrders, jkyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
+import { AddressData, ExpressData, ExpressInterceptData, orderBackFormValues, bsOrderBackFormValues, kmOrderBackFormValues, bsE3OrderBackFormValues, wlnOrderBackFormValues, wdtOrderBackFormValues, jstOrderBackFormValues, request, isNull, bsOrderTransform, bsE3OrderTransform, jstOrderTransform, filterJstOrders, wlnOrderTransform, wdtOrderTransform, kmOrderTransform, filterBsE3Orders, filterWdtOrders, filterKmOrders, unTransField, transMultSelectOptions, gyOrderBackFormValues, gyOrderTransform, filterGyOrders, filterJyOrders, setSessionStorage, jyOrderTransform, jyOrderBackFormValues, jkyOrderTransform, jkyOrderBackFormValues, skxOrderTransform, orderSubFormOrderTransform, skxReturnOrderTransform } from '@kmkf-fe-packages/kmkf-utils';
 import Monitor from 'kmkf-monitor';
 import { PlatForm } from "../../model/flowTemplateDetail/types";
 import transformWorkOrderData from "./transformWorkOrderData";
@@ -369,7 +369,9 @@ export var orderBack = /*#__PURE__*/function () {
           jyOrders = jyOrder === null || jyOrder === void 0 ? void 0 : (_jyOrder$value = jyOrder.value) === null || _jyOrder$value === void 0 ? void 0 : _jyOrder$value.data;
           skxOrders = skxOrder === null || skxOrder === void 0 ? void 0 : (_skxOrder$value = skxOrder.value) === null || _skxOrder$value === void 0 ? void 0 : _skxOrder$value.data;
           skxReturnOrders = skxReturnOrder === null || skxReturnOrder === void 0 ? void 0 : (_skxReturnOrder$value = skxReturnOrder.value) === null || _skxReturnOrder$value === void 0 ? void 0 : _skxReturnOrder$value.data;
-          jkyOrders = jkyOrder === null || jkyOrder === void 0 ? void 0 : (_jkyOrder$value = jkyOrder.value) === null || _jkyOrder$value === void 0 ? void 0 : _jkyOrder$value.data;
+          jkyOrders = {
+            trades: (jkyOrder === null || jkyOrder === void 0 ? void 0 : (_jkyOrder$value = jkyOrder.value) === null || _jkyOrder$value === void 0 ? void 0 : _jkyOrder$value.data) || []
+          };
           wdtReturnOrders = wdtReturnOrder === null || wdtReturnOrder === void 0 ? void 0 : (_wdtReturnOrder$value = wdtReturnOrder.value) === null || _wdtReturnOrder$value === void 0 ? void 0 : _wdtReturnOrder$value.data;
           console.log('skxOrders', {
             skxOrders: skxOrders,
@@ -381,7 +383,6 @@ export var orderBack = /*#__PURE__*/function () {
           if (gyOrders) gyOrders.trades = filterGyOrders(gyOrders, order_no);
           if (jstOrders) jstOrders.trades = filterJstOrders(jstOrders, order_no);
           if (jyOrders) jyOrders.trades = filterJyOrders(jyOrders, order_no);
-          if (jkyOrders) jkyOrders.trades = filterJkyOrders(jkyOrders, order_no);
           if (skxOrders) skxOrders.trades = (skxOrders === null || skxOrders === void 0 ? void 0 : skxOrders.orderDetailInfoList) || []; //需要看实际接口返回字段
           if (skxReturnOrders) skxReturnOrders.trades = (skxReturnOrders === null || skxReturnOrders === void 0 ? void 0 : skxReturnOrders.skqReturnOrderDetailInfoDtos) || [];
           pushGyLog('gyOrders', gyOrders);
@@ -435,11 +436,13 @@ export var orderBack = /*#__PURE__*/function () {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
+          console.log('jkyOrders', jkyOrders);
           jkyInfo = jkyOrders && jkyOrderTransform(_objectSpread(_objectSpread({}, jkyOrders), {}, {
             allOrders: jkyOrders === null || jkyOrders === void 0 ? void 0 : jkyOrders.trades,
             componentList: templateDetail.componentDtoList,
             orderNo: order_no
           }), form);
+          console.log('jkyInfo', jkyInfo);
           jstInfo = jstOrders && jstOrderTransform(_objectSpread(_objectSpread({}, jstOrders), {}, {
             componentList: templateDetail.componentDtoList,
             orderNo: order_no,
@@ -611,12 +614,13 @@ export var orderBack = /*#__PURE__*/function () {
             jyOrder: jyInfo,
             skxOrder: skxInfo,
             orderSubFormOrder: orderSubFormInfo,
-            skxReturnOrder: skxReturnInfo
+            skxReturnOrder: skxReturnInfo,
+            jkyOrder: jkyInfo
           });
           pushGyLog('detail', detail);
           //抖音数据特殊处理
           if (!orderInfo) {
-            _context.next = 149;
+            _context.next = 150;
             break;
           }
           if (shopSourceStr === 'FXG') {
@@ -628,7 +632,7 @@ export var orderBack = /*#__PURE__*/function () {
           hasSelectItem = HasErpItemSelectHandle(templateDetail);
           erpPromiseList = [];
           if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
-            _context.next = 133;
+            _context.next = 134;
             break;
           }
           list = detail['itemList'];
@@ -646,10 +650,10 @@ export var orderBack = /*#__PURE__*/function () {
               resolve({});
             });
           });
-          _context.prev = 123;
-          _context.next = 126;
+          _context.prev = 124;
+          _context.next = 127;
           return Promise.all(promises);
-        case 126:
+        case 127:
           erpPromiseList = _context.sent;
           detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
             return _objectSpread(_objectSpread({}, item), {}, {
@@ -659,25 +663,25 @@ export var orderBack = /*#__PURE__*/function () {
               })
             });
           });
-          _context.next = 133;
+          _context.next = 134;
           break;
-        case 130:
-          _context.prev = 130;
-          _context.t1 = _context["catch"](123);
+        case 131:
+          _context.prev = 131;
+          _context.t1 = _context["catch"](124);
           console.error('调用erp获取宝贝编码错误', _context.t1);
-        case 133:
+        case 134:
           // 判断是否存在签收时间组件
           hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
           if (!hasSigningDatetime) {
-            _context.next = 149;
+            _context.next = 150;
             break;
           }
           if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
-            _context.next = 148;
+            _context.next = 149;
             break;
           }
-          _context.prev = 136;
-          _context.next = 139;
+          _context.prev = 137;
+          _context.next = 140;
           return request({
             url: '/qy/logistics/logisticsSignTime',
             method: 'post',
@@ -687,21 +691,21 @@ export var orderBack = /*#__PURE__*/function () {
               mailNo: orderInfo.expressLogisticsCode
             }
           });
-        case 139:
+        case 140:
           signDatetime = _context.sent;
           detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
-          _context.next = 146;
+          _context.next = 147;
           break;
-        case 143:
-          _context.prev = 143;
-          _context.t2 = _context["catch"](136);
+        case 144:
+          _context.prev = 144;
+          _context.t2 = _context["catch"](137);
           console.error('调用签收时间错误', _context.t2);
-        case 146:
-          _context.next = 149;
+        case 147:
+          _context.next = 150;
           break;
-        case 148:
-          detail['tradeSigningDateTime'] = '';
         case 149:
+          detail['tradeSigningDateTime'] = '';
+        case 150:
           values = orderBackFormValues({
             detail: detail,
             _get_order_fail_: !orderInfo,
@@ -754,21 +758,21 @@ export var orderBack = /*#__PURE__*/function () {
             shopId: shopId
           }));
           callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
-          _context.next = 161;
+          _context.next = 162;
           break;
-        case 158:
-          _context.prev = 158;
+        case 159:
+          _context.prev = 159;
           _context.t3 = _context["catch"](27);
           console.error(_context.t3);
-        case 161:
-          _context.prev = 161;
+        case 162:
+          _context.prev = 162;
           setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
-          return _context.finish(161);
-        case 164:
+          return _context.finish(162);
+        case 165:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[7, 14, 17, 20], [27, 158, 161, 164], [123, 130], [136, 143]]);
+    }, _callee, null, [[7, 14, 17, 20], [27, 159, 162, 165], [124, 131], [137, 144]]);
   }));
   return function orderBack(_x) {
     return _ref2.apply(this, arguments);

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

@@ -460,7 +460,8 @@ var processSceneStatus = function processSceneStatus(getValue) {
       WAREHOUSING_STATUS: 'inStockStatusItemList',
       BS_E3_WAREHOUSING_STATUS: 'bsE3InStockStatusItemList',
       MSG_STATUS: 'msgStatusValues',
-      WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList'
+      WDT_WAREHOUSING_STATUS: 'wdtInStockStatusItemList',
+      JKY_WAREHOUSING_STATUS: 'jkyInStockStatusItemList'
     };
     return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(STATUS_LIST_MAP[nex.workOrderComponentType])), []));
   };
@@ -1356,6 +1357,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
       BS_E3_WAREHOUSING_STATUS: processSceneStatus,
       MSG_STATUS: processSceneStatus,
       WDT_WAREHOUSING_STATUS: processSceneStatus,
+      JKY_WAREHOUSING_STATUS: processSceneStatus,
       BS_LOGISTICS: processErpLogistics,
       WLN_LOGISTICS: processErpLogistics,
       WDT_LOGISTICS: processErpLogistics,

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

@@ -6,6 +6,7 @@ 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;
 }> & {
@@ -19,6 +20,7 @@ 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;
 }> & {
@@ -32,6 +34,7 @@ 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,6 +6,7 @@ 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;
 }> & {
@@ -19,6 +20,7 @@ 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;
 }> & {
@@ -32,6 +34,7 @@ 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;
 }> & {
@@ -45,6 +48,7 @@ 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;
 }> & {
@@ -58,6 +62,7 @@ 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;
 }> & {
@@ -71,6 +76,7 @@ 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;
 }> & {
@@ -84,6 +90,7 @@ 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;
 }> & {
@@ -97,6 +104,7 @@ 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;
 }> & {
@@ -110,6 +118,7 @@ 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,6 +6,7 @@ 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;
 }> & {
@@ -19,6 +20,7 @@ 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;
 }> & {
@@ -32,6 +34,7 @@ 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;
 }> & {
@@ -45,6 +48,7 @@ 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;
 }> & {
@@ -58,6 +62,7 @@ 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.2.44-beta.5",
+  "version": "2.2.44-beta.51",
   "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.2.44-beta.5",
-    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.5",
-    "@kmkf-fe-packages/services-components": "2.2.44-beta.5",
+    "@kmkf-fe-packages/basic-components": "2.2.44-beta.50",
+    "@kmkf-fe-packages/kmkf-utils": "2.2.44-beta.50",
+    "@kmkf-fe-packages/services-components": "2.2.44-beta.51",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "fde30aaab981f9e1daa670688f360d25d4cced05",
+  "gitHead": "0a0f6ca9182adec86b091d8cbd963b4c55b4a90a",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }