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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (16) hide show
  1. package/dist/esm/FlowTemplateDetailV2/common.js +1 -1
  2. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts +1 -0
  3. package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js +13 -10
  4. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts +1 -0
  5. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +72 -58
  6. package/dist/esm/FlowTemplateDetailV2/index.js +20 -16
  7. package/dist/esm/common/constant.d.ts +5 -29
  8. package/dist/esm/common/constant.js +21 -12
  9. package/dist/esm/common/utils/submitDataTransOldFormat.js +1 -0
  10. package/dist/esm/common/utils/tools.d.ts +1 -0
  11. package/dist/esm/common/utils/tools.js +59 -51
  12. package/dist/esm/common/utils/transformWorkOrderData.js +5 -0
  13. package/dist/esm/model/logicFlow/selector.d.ts +3 -0
  14. package/dist/esm/model/paymentWorkOrder/selector.d.ts +9 -0
  15. package/dist/esm/model/singleShopWorkOrder/selector.d.ts +5 -0
  16. package/package.json +5 -5
package/dist/esm/FlowTemplateDetailV2/common.js CHANGED
@@ -40,7 +40,7 @@ export var FLOW_STATUS_V2 = {
40
40
  RETURNING: '回退中'
41
41
  };
42
42
  //不能回填的组件type
43
- 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'];
43
+ 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', 'SWAP_OUT_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE', 'ORDER_TYPE', 'REFUND_TYPE', 'RETURN_EXCHANGE_GOODS_REVIEW_STATUS', 'EXECUTE_ACTION_TYPE'];
44
44
  export var verifyHandle = function verifyHandle(data, componentDtoList) {
45
45
  var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
46
46
  var res = {
package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.d.ts CHANGED
@@ -14,6 +14,7 @@ declare type CurrentNodeProps = {
14
14
  queryRemarkList: () => void;
15
15
  autoSubmit?: boolean;
16
16
  isSuperAdmin?: boolean;
17
+ autoFillThirdPartyFields?: boolean;
17
18
  };
18
19
  declare const _default: React.ForwardRefExoticComponent<CurrentNodeProps & React.RefAttributes<unknown>>;
19
20
  export default _default;
package/dist/esm/FlowTemplateDetailV2/components/CurrentNode/index.js CHANGED
@@ -69,7 +69,8 @@ var CurrentNode = function CurrentNode(props, ref) {
69
69
  flowWorkOrderId = props.flowWorkOrderId,
70
70
  queryRemarkList = props.queryRemarkList,
71
71
  autoSubmit = props.autoSubmit,
72
- onJumpPage = props.onJumpPage;
72
+ onJumpPage = props.onJumpPage,
73
+ autoFillThirdPartyFields = props.autoFillThirdPartyFields;
73
74
  var _useContext = useContext(Context),
74
75
  dispatch = _useContext.dispatch;
75
76
  // 是否是编辑状态
@@ -284,20 +285,23 @@ var CurrentNode = function CurrentNode(props, ref) {
284
285
  return _ref2.apply(this, arguments);
285
286
  };
286
287
  }();
288
+ var eventType = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType;
289
+ var eventConfig = SKIP_NODE_TYPES_CONFIG[eventType];
290
+ var shouldSkipByValidate = typeof eventConfig === 'boolean' || !(eventConfig !== null && eventConfig !== void 0 && eventConfig.validateFn) || eventConfig.validateFn(currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.nodeInfo);
291
+ var showSkipButton = eventType in SKIP_NODE_TYPES_CONFIG && flowStatus && [FlowStatus.FLOWING, FlowStatus.PROCESSING].includes(flowStatus) && shouldSkipByValidate;
287
292
  var handleSkip = /*#__PURE__*/function () {
288
293
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
289
- var title, config;
294
+ var title;
290
295
  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
291
296
  while (1) switch (_context4.prev = _context4.next) {
292
297
  case 0:
293
298
  title = '当前获取物流单号自动化任务正在执行中，确定要跳过吗？跳过后将无法获取物流信息';
294
- config = SKIP_NODE_TYPES_CONFIG[eventType];
295
- if (typeof config !== 'boolean') {
299
+ if (typeof eventConfig !== 'boolean') {
296
300
  title = /*#__PURE__*/React.createElement(React.Fragment, null, "\u5F53\u524D", /*#__PURE__*/React.createElement("span", {
297
301
  className: styles.highlight
298
- }, config.name), "\u81EA\u52A8\u5316\u4EFB\u52A1\u6B63\u5728\u6267\u884C\u4E2D\uFF0C\u786E\u5B9A\u8981\u8DF3\u8FC7\u5417\uFF1F\u8DF3\u8FC7\u540E\u5C06\u65E0\u6CD5\u83B7\u53D6", /*#__PURE__*/React.createElement("span", {
302
+ }, eventConfig.name), "\u81EA\u52A8\u5316\u4EFB\u52A1\u6B63\u5728\u6267\u884C\u4E2D\uFF0C\u786E\u5B9A\u8981\u8DF3\u8FC7\u5417\uFF1F\u8DF3\u8FC7\u540E\u5C06\u65E0\u6CD5\u83B7\u53D6", /*#__PURE__*/React.createElement("span", {
299
303
  className: styles.highlight
300
- }, config.tips));
304
+ }, eventConfig.tips));
301
305
  }
302
306
  Modal.confirm({
303
307
  title: title,
@@ -345,7 +349,7 @@ var CurrentNode = function CurrentNode(props, ref) {
345
349
  return onOk;
346
350
  }()
347
351
  });
348
- case 4:
352
+ case 3:
349
353
  case "end":
350
354
  return _context4.stop();
351
355
  }
@@ -357,13 +361,11 @@ var CurrentNode = function CurrentNode(props, ref) {
357
361
  }();
358
362
  var isArtificialNode = tag === 'artificial';
359
363
  var isAutoNode = tag === 'auto';
360
- var eventType = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$fl = currentNodeDetail.flowEventData) === null || _currentNodeDetail$fl === void 0 ? void 0 : _currentNodeDetail$fl.eventType;
361
364
  var isShowAutoNodeDetail = isAutoNode && ['ORDER_MEMO_MANY_RULES', 'AFTER_SALE_AUTO_RETURN_GOODS_AGREE_REJECT', 'AFTER_SALE_AUTO_REFUND_REJECT', 'LOGISTICS_INTERCEPT_MULTI_RULE', 'MESSAGE_NOTIFY_EVENT', 'DING_TALK_ROBOT_NOTIFY', 'HTTP_INVOKE', 'ORDER_MEMO', 'LBDJ_ONE_PRICE_ORDER'].includes(eventType);
362
365
  var showEdit = isArtificialNode && isCurrentNodeHandler && !readonly && (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus) === FlowStatus.COMPLETED;
363
366
  // TODO: 决策节点给后端修复数据加了一个入口
364
367
  // @ts-ignore
365
368
  var showRestartAutoTask = tag === 'auto' && flowStatus === FlowStatus.PROCESSING || tag === 'judge' && ((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.getItem('__isDEV__')) === 'true';
366
- var showSkipButton = eventType in SKIP_NODE_TYPES_CONFIG && flowStatus && [FlowStatus.FLOWING, FlowStatus.PROCESSING].includes(flowStatus);
367
369
  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Header, {
368
370
  tag: tag,
369
371
  nodeName: nodeName,
@@ -417,7 +419,8 @@ var CurrentNode = function CurrentNode(props, ref) {
417
419
  flowAllShowHideRules: allShowHideRules,
418
420
  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),
419
421
  firstOrderBackfill: flowStatus !== FlowStatus.COMPLETED,
420
- autoSubmit: autoSubmit
422
+ autoSubmit: autoSubmit,
423
+ autoFillThirdPartyFields: autoFillThirdPartyFields
421
424
  })), isShowAutoNodeDetail && /*#__PURE__*/React.createElement(AutoTaskDetail, {
422
425
  flowEventData: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.flowEventData,
423
426
  shopList: shopList
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.d.ts CHANGED
@@ -33,6 +33,7 @@ declare type FormRenderProps = {
33
33
  isErpUse?: boolean;
34
34
  autoSubmit?: boolean;
35
35
  isStartNodeWaiting?: boolean;
36
+ autoFillThirdPartyFields?: boolean;
36
37
  };
37
38
  declare const _default: React.ForwardRefExoticComponent<FormRenderProps & React.RefAttributes<unknown>>;
38
39
  export default _default;
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js CHANGED
@@ -29,7 +29,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
29
29
  import 'moment/locale/zh-cn';
30
30
  import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
31
31
  // 重复检验不需要展示在顶部的
32
- INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, jkySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue } from "../../../common/utils/tools";
32
+ INNER_REPLACE_COMPONENT, reversalFormValues, wdtReturnBillNoBackValues, bsSystemOrderBackValues, kmSystemOrderBackValues, bsE3SystemOrderBackValues, wlnSystemOrderBackValues, gySystemOrderBackValues, jstSystemOrderBackValues, jySystemOrderBackValues, jkySystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, getMappingTargetValue, FIXED_FIELD_CAN_MODIFY_SHOP } from "../../../common/utils/tools";
33
33
  import { replaceCheck, orderDetail, queryLabelByTradeId, queryMemberLevel } from "../../../model/servers/api";
34
34
  import { factory } from '@kmkf-fe-packages/services-components';
35
35
  import { getExpression, formatDisplayConfig, isNull, LabelData, setSessionStorage } from '@kmkf-fe-packages/kmkf-utils';
@@ -95,7 +95,16 @@ var FormRender = function FormRender(props, ref) {
95
95
  autoSubmit = _props$autoSubmit === void 0 ? false : _props$autoSubmit,
96
96
  _props$isStartNodeWai = props.isStartNodeWaiting,
97
97
  isStartNodeWaiting = _props$isStartNodeWai === void 0 ? false : _props$isStartNodeWai,
98
- onJumpPage = props.onJumpPage;
98
+ onJumpPage = props.onJumpPage,
99
+ autoFillThirdPartyFields = props.autoFillThirdPartyFields;
100
+ var notAutoFillFlag = useMemo(function () {
101
+ // autoFillThirdPartyFields=false 一票否决 → FALSE
102
+ if (autoFillThirdPartyFields === false) {
103
+ return false;
104
+ }
105
+ // 其余情况：notAutoFillWithFirstSubmit 或 preCreateAndNotModified 任一为 true → TRUE
106
+ return !!(record !== null && record !== void 0 && record.notAutoFillWithFirstSubmit || record !== null && record !== void 0 && record.preCreateAndNotModified);
107
+ }, [record === null || record === void 0 ? void 0 : record.notAutoFillWithFirstSubmit, record === null || record === void 0 ? void 0 : record.preCreateAndNotModified, autoFillThirdPartyFields]);
99
108
  var shopIdToUniqueKeyMap = useMemo(function () {
100
109
  var json = {};
101
110
  shopList.forEach(function (shop) {
@@ -167,6 +176,9 @@ var FormRender = function FormRender(props, ref) {
167
176
  useEffect(function () {
168
177
  setShopId(currentShopId);
169
178
  }, [currentShopId]);
179
+ useEffect(function () {
180
+ form.setFieldsValue(_defineProperty({}, FIXED_FIELD_CAN_MODIFY_SHOP, isShowShopList));
181
+ }, [form, isShowShopList]);
170
182
  // TODO: 显影依赖
171
183
  var currentComponentDisplayStatus = useRef({});
172
184
  // TODO：所有组件显影标志
@@ -399,7 +411,7 @@ var FormRender = function FormRender(props, ref) {
399
411
  }, [labelComponent, record]);
400
412
  var queryDetail = /*#__PURE__*/function () {
401
413
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
402
- 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;
414
+ var workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, jsonMap, newRecord, jsonMapOrderId, getCacheInfo, newFormValues, transData, initialValues, tradeIdUniqueKey, _record$jsonMap2, _record$jsonMap3, _userInfo$companyUser3, _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, _record$jsonMap4, _record$jsonMap5, currentNodeTradeIdUniqueKey, _currentNodeTid, currentNodeExpressLogisticsCodeKey, currentNodeLogisticsCode, isSkx, _userInfo, companyUserConfig, hasWdt, preTradeId, tradeId, initFormValues, _getCacheInfo, _getCacheInfo2, _getCacheInfo3, _getCacheInfo4, _orderNo, _shopId, orderNoField, _transData, _initialValues, antFormEl;
403
415
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
404
416
  while (1) switch (_context2.prev = _context2.next) {
405
417
  case 0:
@@ -429,7 +441,7 @@ var FormRender = function FormRender(props, ref) {
429
441
  return prv;
430
442
  }, {});
431
443
  if (!workOrderId) {
432
- _context2.next = 45;
444
+ _context2.next = 52;
433
445
  break;
434
446
  }
435
447
  // 先初始化端上内容
@@ -457,26 +469,34 @@ var FormRender = function FormRender(props, ref) {
457
469
  }));
458
470
  console.log('transData', get(transData, '0', {}));
459
471
  initialValues = get(transData, '0', {});
460
- newRecord.preCreateAndNotModified && !newRecord.notAutoFillWithFirstSubmit && batchFillByMapping(initialValues);
472
+ newRecord.preCreateAndNotModified && !notAutoFillFlag && batchFillByMapping(initialValues);
461
473
  orderBackReplace(transData, templateDetail);
462
474
  // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
463
475
  tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
464
- if (!newRecord.notAutoFillWithFirstSubmit) {
465
- _context2.next = 35;
476
+ if (!notAutoFillFlag) {
477
+ _context2.next = 49;
466
478
  break;
467
479
  }
468
480
  currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
469
481
  _currentNodeTid = record === null || record === void 0 ? void 0 : (_record$jsonMap2 = record.jsonMap) === null || _record$jsonMap2 === void 0 ? void 0 : _record$jsonMap2["".concat(currentNodeTradeIdUniqueKey, "_tradeId")];
470
- if (!_currentNodeTid) {
471
- _context2.next = 30;
482
+ currentNodeExpressLogisticsCodeKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'EXPRESS_LOGISTICS_SELECT');
483
+ currentNodeLogisticsCode = record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(currentNodeExpressLogisticsCodeKey, "_expressLogisticsCode")];
484
+ isSkx = ['TR3E2FYXFZCFANVG6O6AALSM'].includes(companyKey); // SKX 特殊处理逻辑
485
+ _userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
486
+ companyUserConfig = (_userInfo$companyUser3 = _userInfo === null || _userInfo === void 0 ? void 0 : _userInfo.companyUserConfig) !== null && _userInfo$companyUser3 !== void 0 ? _userInfo$companyUser3 : {};
487
+ hasWdt = (_companyUserConfig$pl = companyUserConfig === null || companyUserConfig === void 0 ? void 0 : (_companyUserConfig$pl2 = companyUserConfig.plugins) === null || _companyUserConfig$pl2 === void 0 ? void 0 : (_companyUserConfig$pl3 = _companyUserConfig$pl2.wdt) === null || _companyUserConfig$pl3 === void 0 ? void 0 : _companyUserConfig$pl3.show) !== null && _companyUserConfig$pl !== void 0 ? _companyUserConfig$pl : false;
488
+ preTradeId = tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap4 = record.jsonMap) !== null && _record$jsonMap4 !== void 0 && _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill ? record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")] : undefined;
489
+ tradeId = _currentNodeTid || preTradeId;
490
+ if (!tradeId) {
491
+ _context2.next = 38;
472
492
  break;
473
493
  }
474
- queryLabels(_currentNodeTid, shopId);
475
- queryMemberLevels(_currentNodeTid, shopId);
476
- _context2.next = 28;
494
+ queryLabels(tradeId, shopId);
495
+ queryMemberLevels(tradeId, shopId);
496
+ _context2.next = 36;
477
497
  return orderBack({
478
498
  companyKey: companyKey,
479
- order_no: _currentNodeTid,
499
+ order_no: tradeId,
480
500
  form: form,
481
501
  shopId: shopId,
482
502
  shopList: shopList,
@@ -487,11 +507,15 @@ var FormRender = function FormRender(props, ref) {
487
507
  callKey: 1,
488
508
  setLoading: setLoading
489
509
  });
490
- case 28:
491
- _context2.next = 32;
510
+ case 36:
511
+ _context2.next = 46;
492
512
  break;
493
- case 30:
494
- _context2.next = 32;
513
+ case 38:
514
+ if (!isSkx) {
515
+ _context2.next = 43;
516
+ break;
517
+ }
518
+ _context2.next = 41;
495
519
  return skxOrderBack({
496
520
  form: form,
497
521
  companyKey: companyKey,
@@ -499,42 +523,28 @@ var FormRender = function FormRender(props, ref) {
499
523
  componentOnBlur: componentOnBlur,
500
524
  jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
501
525
  });
502
- case 32:
503
- // 仅在依赖值有值且映射值为空时触发一次映射
504
- batchFillByMappingWhenTargetEmpty(initialValues);
505
- _context2.next = 43;
526
+ case 41:
527
+ _context2.next = 46;
506
528
  break;
507
- case 35:
508
- if (!(tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap3 = record.jsonMap) !== null && _record$jsonMap3 !== void 0 && _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill)) {
509
- _context2.next = 42;
529
+ case 43:
530
+ if (!(hasWdt && currentNodeLogisticsCode)) {
531
+ _context2.next = 46;
510
532
  break;
511
533
  }
512
- 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);
513
- 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);
514
- _context2.next = 40;
515
- return orderBack({
516
- companyKey: companyKey,
517
- 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")],
518
- form: form,
519
- shopId: shopId,
520
- shopList: shopList,
521
- templateDetail: templateDetail,
522
- callback: orderBackReplace,
523
- fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
524
- plat: plat,
525
- callKey: 1,
526
- setLoading: setLoading
527
- });
528
- case 40:
529
- _context2.next = 43;
534
+ _context2.next = 46;
535
+ return componentOnBlur(currentNodeLogisticsCode, 'expressLogisticsCode');
536
+ case 46:
537
+ // 仅在依赖值有值且映射值为空时触发一次映射
538
+ batchFillByMappingWhenTargetEmpty(initialValues);
539
+ _context2.next = 50;
530
540
  break;
531
- case 42:
541
+ case 49:
532
542
  // 如果没有订单反填，则单独更新remark
533
543
  fetchRemark(shopId, currentNodeTid);
534
- case 43:
535
- _context2.next = 68;
544
+ case 50:
545
+ _context2.next = 75;
536
546
  break;
537
- case 45:
547
+ case 52:
538
548
  fillByShopId(shopId);
539
549
  initFormValues = null;
540
550
  if (plat !== null && plat !== void 0 && plat.subOrderNo) {
@@ -553,7 +563,7 @@ var FormRender = function FormRender(props, ref) {
553
563
 
554
564
  // console.log(orderNo, initFormValues);
555
565
  if (!initFormValues) {
556
- _context2.next = 56;
566
+ _context2.next = 63;
557
567
  break;
558
568
  }
559
569
  form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -570,9 +580,9 @@ var FormRender = function FormRender(props, ref) {
570
580
  _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
571
581
  }
572
582
  fetchRemark(_shopId, _orderNo);
573
- _context2.next = 68;
583
+ _context2.next = 75;
574
584
  break;
575
- case 56:
585
+ case 63:
576
586
  _transData = calcWorkOrderList([{
577
587
  jsonMap: jsonMap
578
588
  }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
@@ -584,12 +594,12 @@ var FormRender = function FormRender(props, ref) {
584
594
  batchFillByMapping(_initialValues);
585
595
  //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
586
596
  if (!(orderNo && shopId)) {
587
- _context2.next = 67;
597
+ _context2.next = 74;
588
598
  break;
589
599
  }
590
600
  queryLabels(orderNo, shopId);
591
601
  queryMemberLevels(orderNo, shopId);
592
- _context2.next = 65;
602
+ _context2.next = 72;
593
603
  return orderBack({
594
604
  companyKey: companyKey,
595
605
  order_no: orderNo,
@@ -604,13 +614,13 @@ var FormRender = function FormRender(props, ref) {
604
614
  callKey: 2,
605
615
  setLoading: setLoading
606
616
  });
607
- case 65:
608
- _context2.next = 68;
617
+ case 72:
618
+ _context2.next = 75;
609
619
  break;
610
- case 67:
620
+ case 74:
611
621
  // 如果没有订单反填，则单独更新remark
612
622
  fetchRemark(shopId, currentNodeTid);
613
- case 68:
623
+ case 75:
614
624
  antFormEl = document.getElementsByClassName('ant-form');
615
625
  (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
616
626
  resetMappingHideComponents();
@@ -619,7 +629,7 @@ var FormRender = function FormRender(props, ref) {
619
629
  type: 'setaAutoSubmitFlag',
620
630
  payload: true
621
631
  });
622
- case 72:
632
+ case 79:
623
633
  case "end":
624
634
  return _context2.stop();
625
635
  }
@@ -640,7 +650,7 @@ var FormRender = function FormRender(props, ref) {
640
650
  buyerId: buyerId,
641
651
  buyerNick: buyerNick
642
652
  });
643
- }, [workOrderId, record, shopId, isErpUse]);
653
+ }, [workOrderId, record, shopId, isErpUse, autoFillThirdPartyFields]);
644
654
 
645
655
  // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
646
656
  var resetMappingHideComponents = function resetMappingHideComponents() {
@@ -1403,7 +1413,7 @@ var FormRender = function FormRender(props, ref) {
1403
1413
  var _ref8 = (componentConfig === null || componentConfig === void 0 ? void 0 : componentConfig.status) || {},
1404
1414
  upgrade = _ref8.upgrade,
1405
1415
  created = _ref8.created;
1406
- if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID'].includes(workOrderComponentType)) {
1416
+ if (['REISSUE_TRADE_ID', 'EXCHANGE_TRADE_ID', 'ERP_AFTER_SALE_TRADE_ID', 'SWAP_OUT_TRADE_ID'].includes(workOrderComponentType)) {
1407
1417
  // 售后单id、补发单id和换货单id默认值是可见不可编辑（2）
1408
1418
  if (typeof upgrade !== 'number') {
1409
1419
  upgrade = 2;
@@ -1739,6 +1749,10 @@ var FormRender = function FormRender(props, ref) {
1739
1749
  }), /*#__PURE__*/React.createElement(Form.Item, {
1740
1750
  name: "fixed_field_buyerOpenUid",
1741
1751
  hidden: true
1752
+ }), /*#__PURE__*/React.createElement(Form.Item, {
1753
+ name: FIXED_FIELD_CAN_MODIFY_SHOP,
1754
+ hidden: true,
1755
+ initialValue: isShowShopList
1742
1756
  }), /*#__PURE__*/React.createElement(Form.Item, {
1743
1757
  name: "skx_return_billNo_blur_from",
1744
1758
  hidden: true
package/dist/esm/FlowTemplateDetailV2/index.js CHANGED
@@ -61,7 +61,7 @@ import Layout from "./components/Layout";
61
61
  var Text = Typography.Text,
62
62
  Link = Typography.Link;
63
63
  var FlowTemplateDetail = function FlowTemplateDetail(props) {
64
- var _currentNodeDetail$wo, _currentNodeDetail$no, _document, _document$cookie, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$wo30, _currentNodeDetail$wo31, _JSON$parse, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$wo36, _currentNodeDetail$no31, _currentNodeDetail$no32;
64
+ var _currentNodeDetail$wo, _currentNodeDetail$no, _document, _document$cookie, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$wo29, _currentNodeDetail$wo30, _JSON$parse, _currentNodeDetail$wo31, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$no31, _currentNodeDetail$no32;
65
65
  var flowTemplateKey = props.flowTemplateKey,
66
66
  _props$shopList = props.shopList,
67
67
  shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -80,6 +80,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
80
80
  callbackAutoSubmitResult = props.callbackAutoSubmitResult,
81
81
  _props$otherInfo = props.otherInfo,
82
82
  otherInfo = _props$otherInfo === void 0 ? {} : _props$otherInfo;
83
+ var autoFillThirdPartyFields = otherInfo.autoFillThirdPartyFields;
83
84
  var _useContext = useContext(Context),
84
85
  dispatch = _useContext.dispatch;
85
86
  var flowRecordList = useSelector(selectFlowRecordList);
@@ -1174,17 +1175,19 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1174
1175
  };
1175
1176
  useEffect(function () {
1176
1177
  if (autoSubmit && !isEmpty(currentNodeDetail)) {
1177
- var _currentNodeDetail$wo25, _currentNodeDetail$wo26;
1178
+ var _currentNodeDetail$wo25;
1178
1179
  // SKX首节点满足下列条件、此时批量提交会等订单数据反填再提交, 其余企业批量提交还是原先逻辑，不涉及订单数据反填
1179
- if (currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo25 !== void 0 && _currentNodeDetail$wo25.notAutoFillWithFirstSubmit && autoSubmitFlag) {
1180
+ // 优先使用外部传入的 autoFillThirdPartyFields，未传时降级使用 record 中的 notAutoFillWithFirstSubmit
1181
+ 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;
1182
+ if (effectiveAutoFill && autoSubmitFlag) {
1180
1183
  autoSubmitFn();
1181
- } else if (!(currentNodeDetail !== null && currentNodeDetail !== void 0 && (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) !== null && _currentNodeDetail$wo26 !== void 0 && _currentNodeDetail$wo26.notAutoFillWithFirstSubmit) && !autoSubmitFlag) {
1184
+ } else if (!effectiveAutoFill && !autoSubmitFlag) {
1182
1185
  autoSubmitFn();
1183
1186
  }
1184
1187
  }
1185
- }, [currentNodeDetail, autoSubmitFlag]);
1188
+ }, [currentNodeDetail, autoSubmitFlag, autoFillThirdPartyFields]);
1186
1189
  var isCurrentNodeHandler = useMemo(function () {
1187
- var _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo27, _currentNodeDetail$no25, _currentNodeDetail$no26;
1190
+ var _currentNodeDetail$no17, _currentNodeDetail$no18, _currentNodeDetail$no19, _currentNodeDetail$no20, _currentNodeDetail$no21, _currentNodeDetail$no22, _currentNodeDetail$no23, _currentNodeDetail$no24, _currentNodeDetail$wo26, _currentNodeDetail$no25, _currentNodeDetail$no26;
1188
1191
  return currentUserHasOperatorAuth({
1189
1192
  isSuperAdmin: isSuperAdmin,
1190
1193
  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] || [],
@@ -1192,7 +1195,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1192
1195
  currentUserKey: plat.userKey,
1193
1196
  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) || [],
1194
1197
  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,
1195
- handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.handlerList) || [],
1198
+ handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo26 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo26 === void 0 ? void 0 : _currentNodeDetail$wo26.handlerList) || [],
1196
1199
  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
1197
1200
  });
1198
1201
  }, [currentNodeDetail, plat, assistantMap, useGroupMap]);
@@ -1201,9 +1204,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1201
1204
  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);
1202
1205
  })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
1203
1206
  var ReportOrderRender = function ReportOrderRender(props) {
1204
- var _currentNodeDetail$wo28, _currentNodeDetail$wo29;
1207
+ var _currentNodeDetail$wo27, _currentNodeDetail$wo28;
1205
1208
  var details = props.details;
1206
- 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) {
1209
+ 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) {
1207
1210
  return !CANNOT_BACK_FILL.includes(t.workOrderComponentType || '');
1208
1211
  });
1209
1212
  //获取可以返填的组件值
@@ -1211,7 +1214,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1211
1214
  _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
1212
1215
  transData = _calcWorkOrderList2[0];
1213
1216
  //获取表单显示值
1214
- 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),
1217
+ 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),
1215
1218
  _calcWorkOrderList4 = _slicedToArray(_calcWorkOrderList3, 1),
1216
1219
  transDataall = _calcWorkOrderList4[0];
1217
1220
  return /*#__PURE__*/React.createElement("div", {
@@ -1392,14 +1395,14 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1392
1395
  }, !follow ? '关注' : '已关注'), showImplementationEnter && /*#__PURE__*/React.createElement(Button, {
1393
1396
  onClick: openFeedbackModal,
1394
1397
  type: "link"
1395
- }, "\u5FEB\u901F\u521B\u5EFA\u5B9E\u65BD\u5DE5\u5355"), 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, {
1398
+ }, "\u5FEB\u901F\u521B\u5EFA\u5B9E\u65BD\u5DE5\u5355"), 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, {
1396
1399
  order_number: tid,
1397
1400
  shop: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.taobaoNick) || '',
1398
- 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),
1401
+ 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),
1399
1402
  platformType: otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType
1400
- })), /*#__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, {
1403
+ })), /*#__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, {
1401
1404
  color: "blue"
1402
- }, "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, {
1405
+ }, "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, {
1403
1406
  justify: 'space-between',
1404
1407
  className: "header"
1405
1408
  }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
@@ -1468,7 +1471,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1468
1471
  isSuperAdmin: isSuperAdmin
1469
1472
  }));
1470
1473
  }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, {
1471
- key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo36 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo36 === void 0 ? void 0 : _currentNodeDetail$wo36.id) || 'current-node'
1474
+ key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo35 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo35 === void 0 ? void 0 : _currentNodeDetail$wo35.id) || 'current-node'
1472
1475
  }, /*#__PURE__*/React.createElement(CurrentNode, {
1473
1476
  ref: currentNodeRef,
1474
1477
  flowTemplateId: flowTemplateId,
@@ -1483,7 +1486,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1483
1486
  onReminder: handleReminder,
1484
1487
  queryRemarkList: queryRemarkList,
1485
1488
  autoSubmit: autoSubmit,
1486
- isSuperAdmin: isSuperAdmin
1489
+ isSuperAdmin: isSuperAdmin,
1490
+ autoFillThirdPartyFields: autoFillThirdPartyFields
1487
1491
  }))), (remarkList === null || remarkList === void 0 ? void 0 : remarkList.length) > 0 && !['created', 'edit'].includes(privilege) && /*#__PURE__*/React.createElement(RemarkShow, _extends({}, remarkList[0], {
1488
1492
  readonly: readonly,
1489
1493
  handleOpenRemarkList: handleOpenRemarkList,
package/dist/esm/common/constant.d.ts CHANGED
@@ -67,32 +67,8 @@ export declare const WORK_ORDER_STATUS_AI_BUILD: {
67
67
  STOPPING: string;
68
68
  COMPLETED: string;
69
69
  };
70
- export declare const SKIP_NODE_TYPES_CONFIG: {
71
- GY_OBTAIN_REISSUE_OR_EXCHANGE_ORDER: {
72
- name: string;
73
- tips: string;
74
- };
75
- JST_REISSUE_WORK_ORDER: {
76
- name: string;
77
- tips: string;
78
- };
79
- KM_ERP_REISSUE_WORK_ORDER: {
80
- name: string;
81
- tips: string;
82
- };
83
- KM_ERP_EXCHANGE_WORK_ORDER: {
84
- name: string;
85
- tips: string;
86
- };
87
- JKY_REISSUE_WORK_ORDER: {
88
- name: string;
89
- tips: string;
90
- };
91
- REISSUE_LOGISTICS_SYNC: boolean;
92
- BS_E3_REISSUE_LOGISTICS_SYNC: boolean;
93
- WDT_LOGISTICS_SYNC: boolean;
94
- GY_REISSUE_LOGISTICS_SYNC: boolean;
95
- KUAI_MAI_REISSUE_LOGISTICS_SYNC: boolean;
96
- JST_REISSUE_LOGISTICS_SYNC: boolean;
97
- JY_REISSUE_LOGISTICS_SYNC: boolean;
98
- };
70
+ export declare const SKIP_NODE_TYPES_CONFIG: Record<string, boolean | {
71
+ name: string;
72
+ tips: string;
73
+ validateFn?: (params: any) => boolean;
74
+ }>;
package/dist/esm/common/constant.js CHANGED
@@ -90,32 +90,41 @@ export var WORK_ORDER_STATUS_AI_BUILD = (_WORK_ORDER_STATUS_AI = {}, _defineProp
90
90
 
91
91
  //支持跳过的节点类型
92
92
  export var SKIP_NODE_TYPES_CONFIG = {
93
- 'GY_OBTAIN_REISSUE_OR_EXCHANGE_ORDER': {
93
+ GY_OBTAIN_REISSUE_OR_EXCHANGE_ORDER: {
94
94
  name: '获取补发/换货单id（管易退货单接口补发/换货）',
95
95
  tips: '补发单id/换货单id'
96
96
  },
97
- 'JST_REISSUE_WORK_ORDER': {
97
+ JST_REISSUE_WORK_ORDER: {
98
98
  name: '补发（聚水潭）',
99
99
  tips: '补发单id'
100
100
  },
101
- 'KM_ERP_REISSUE_WORK_ORDER': {
101
+ KM_ERP_REISSUE_WORK_ORDER: {
102
102
  name: '补发（快麦ERP）',
103
103
  tips: '补发单id'
104
104
  },
105
- 'KM_ERP_EXCHANGE_WORK_ORDER': {
105
+ KM_ERP_EXCHANGE_WORK_ORDER: {
106
106
  name: '换货（快麦ERP）',
107
107
  tips: '换货单id'
108
108
  },
109
- 'JKY_REISSUE_WORK_ORDER': {
109
+ JKY_REISSUE_WORK_ORDER: {
110
110
  name: '补发（聚客云）',
111
111
  tips: '补发单id'
112
112
  },
113
113
  // 旺店通 系统订单号
114
- 'REISSUE_LOGISTICS_SYNC': true,
115
- 'BS_E3_REISSUE_LOGISTICS_SYNC': true,
116
- 'WDT_LOGISTICS_SYNC': true,
117
- 'GY_REISSUE_LOGISTICS_SYNC': true,
118
- 'KUAI_MAI_REISSUE_LOGISTICS_SYNC': true,
119
- 'JST_REISSUE_LOGISTICS_SYNC': true,
120
- 'JY_REISSUE_LOGISTICS_SYNC': true
114
+ REISSUE_LOGISTICS_SYNC: true,
115
+ BS_E3_REISSUE_LOGISTICS_SYNC: true,
116
+ WDT_LOGISTICS_SYNC: true,
117
+ GY_REISSUE_LOGISTICS_SYNC: true,
118
+ KUAI_MAI_REISSUE_LOGISTICS_SYNC: true,
119
+ JST_REISSUE_LOGISTICS_SYNC: true,
120
+ JY_REISSUE_LOGISTICS_SYNC: true,
121
+ WDT_RETURN_EXCHANGE_WORK_ORDER: {
122
+ name: '退换货（旺店通）',
123
+ tips: '系统订单号',
124
+ validateFn: function validateFn(nodeInfo) {
125
+ var _nodeInfo$relationEve;
126
+ //只有换货的时候支持跳过
127
+ return ((_nodeInfo$relationEve = nodeInfo.relationEvent) === null || _nodeInfo$relationEve === void 0 ? void 0 : _nodeInfo$relationEve.type) === 3;
128
+ }
129
+ }
121
130
  };
package/dist/esm/common/utils/submitDataTransOldFormat.js CHANGED
@@ -1127,6 +1127,7 @@ var processComponent = function processComponent(_ref63) {
1127
1127
  break;
1128
1128
  case 'REISSUE_TRADE_ID':
1129
1129
  case 'EXCHANGE_TRADE_ID':
1130
+ case 'SWAP_OUT_TRADE_ID':
1130
1131
  wrapFn(handleErpTradeId);
1131
1132
  break;
1132
1133
  case 'ERP_AFTER_SALE_TRADE_ID':
package/dist/esm/common/utils/tools.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { PlatFormInfo } from '../../model/flowTemplateDetail/types';
2
+ export declare const FIXED_FIELD_CAN_MODIFY_SHOP = "fixed_field_canModifyShop";
2
3
  export declare const findComponentUniqueKeyByType: (componentDtoList: {
3
4
  workOrderComponentType: string;
4
5
  uniqueKey: string;
package/dist/esm/common/utils/tools.js CHANGED
@@ -35,6 +35,8 @@ import { platformMap } from "./constant";
35
35
  // 淘宝商品组件信息处理
36
36
 
37
37
  var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELECT', 'DATETIME', 'PICTURE', 'MULT_SELECT', 'ORDINARY_INVOICE'];
38
+ export var FIXED_FIELD_CAN_MODIFY_SHOP = 'fixed_field_canModifyShop';
39
+
38
40
  //表单提交单一字段映射
39
41
  var workTypeKeys = {
40
42
  SHOP_NAME_INPUT: 'shopName',
@@ -143,13 +145,18 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
143
145
  //订单返填
144
146
  export var orderBack = /*#__PURE__*/function () {
145
147
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
146
- 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;
148
+ var _form$getFieldValue;
149
+ var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, shopId, canModifyShopFieldValue, shouldTryAutoSetShopId, 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;
147
150
  return _regeneratorRuntime().wrap(function _callee$(_context) {
148
151
  while (1) switch (_context.prev = _context.next) {
149
152
  case 0:
150
153
  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;
151
154
  console.log('orderBack-run--', callKey, templateDetail);
152
- shopId = propsShopid; //如果是pc平台且没有shopId的情况下 获取shopId
155
+ shopId = propsShopid;
156
+ canModifyShopFieldValue = form === null || form === void 0 ? void 0 : (_form$getFieldValue = form.getFieldValue) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.call(form, FIXED_FIELD_CAN_MODIFY_SHOP);
157
+ shouldTryAutoSetShopId = canModifyShopFieldValue !== false;
158
+ console.log('canModifyShopFieldValue', canModifyShopFieldValue, 'shouldTryAutoSetShopId', shouldTryAutoSetShopId);
159
+ //如果是pc平台且没有shopId的情况下 获取shopId
153
160
  trySetShopId = function trySetShopId(_ref3) {
154
161
  var theShopId = _ref3.theShopId,
155
162
  theShopUniqueKey = _ref3.theShopUniqueKey,
@@ -175,22 +182,22 @@ export var orderBack = /*#__PURE__*/function () {
175
182
  //prod 陈健企业工单
176
183
  'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
177
184
  ].includes(companyKey));
178
- if (!(order_no && [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && (!!(plat !== null && plat !== void 0 && plat.bindERP) || ['SZF4ZGWZSNW6PYXMCIFEWBXT',
185
+ if (!(order_no && shouldTryAutoSetShopId && [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && (!!(plat !== null && plat !== void 0 && plat.bindERP) || ['SZF4ZGWZSNW6PYXMCIFEWBXT',
179
186
  //test 测马奔腾
180
187
  '6O47IBXFR26FJF4HUQ7WGO4H',
181
188
  //prod 陈健企业工单
182
189
  'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
183
- ].includes(companyKey)) && type === 'add')) {
184
- _context.next = 20;
190
+ ].includes(companyKey)))) {
191
+ _context.next = 23;
185
192
  break;
186
193
  }
187
194
  setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
188
- _context.prev = 7;
189
- _context.next = 10;
195
+ _context.prev = 10;
196
+ _context.next = 13;
190
197
  return queryShopByTid({
191
198
  tid: order_no
192
199
  });
193
- case 10:
200
+ case 13:
194
201
  res = _context.sent;
195
202
  if (res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && _res$data.shopId) {
196
203
  trySetShopId({
@@ -198,17 +205,17 @@ export var orderBack = /*#__PURE__*/function () {
198
205
  theShopId: res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.shopId
199
206
  });
200
207
  }
201
- _context.next = 17;
208
+ _context.next = 20;
202
209
  break;
203
- case 14:
204
- _context.prev = 14;
205
- _context.t0 = _context["catch"](7);
206
- console.error(_context.t0);
207
210
  case 17:
208
211
  _context.prev = 17;
209
- setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
210
- return _context.finish(17);
212
+ _context.t0 = _context["catch"](10);
213
+ console.error(_context.t0);
211
214
  case 20:
215
+ _context.prev = 20;
216
+ setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
217
+ return _context.finish(20);
218
+ case 23:
212
219
  //是否是对接平台，只有对接平台才能返填订单号
213
220
  JOIN_SHOP = shopList.find(function (item) {
214
221
  return !item.notJoin && item.shopId == shopId;
@@ -224,7 +231,7 @@ export var orderBack = /*#__PURE__*/function () {
224
231
  }).every(function (item) {
225
232
  return item === false;
226
233
  }))) {
227
- _context.next = 25;
234
+ _context.next = 28;
228
235
  break;
229
236
  }
230
237
  //处理店铺映射存在店铺信息却没有返填的问题
@@ -234,12 +241,12 @@ export var orderBack = /*#__PURE__*/function () {
234
241
  });
235
242
  }
236
243
  return _context.abrupt("return");
237
- case 25:
244
+ case 28:
238
245
  _ref4 = shopList.find(function (item) {
239
246
  return item.shopId == shopId;
240
247
  }) || {}, shopSourceStr = _ref4.shopSourceStr, _ref4$thirdUserNick = _ref4.thirdUserNick, thirdUserNick = _ref4$thirdUserNick === void 0 ? '' : _ref4$thirdUserNick, thirdShopMainType = _ref4.thirdShopMainType;
241
248
  setLoading === null || setLoading === void 0 ? void 0 : setLoading(true);
242
- _context.prev = 27;
249
+ _context.prev = 30;
243
250
  promise = [];
244
251
  if (!JOIN_SHOP || thirdShopMainType === '1' && shopSourceStr === 'JD') {
245
252
  promise.push(Promise.resolve([]));
@@ -309,9 +316,9 @@ export var orderBack = /*#__PURE__*/function () {
309
316
  }
310
317
 
311
318
  //需按照orderBackMap中的顺序结构
312
- _context.next = 41;
319
+ _context.next = 44;
313
320
  return Promise.allSettled(promise);
314
- case 41:
321
+ case 44:
315
322
  _yield$Promise$allSet = _context.sent;
316
323
  _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 16);
317
324
  data = _yield$Promise$allSet2[0];
@@ -620,7 +627,7 @@ export var orderBack = /*#__PURE__*/function () {
620
627
  pushGyLog('detail', detail);
621
628
  //抖音数据特殊处理
622
629
  if (!orderInfo) {
623
- _context.next = 150;
630
+ _context.next = 153;
624
631
  break;
625
632
  }
626
633
  if (shopSourceStr === 'FXG') {
@@ -632,7 +639,7 @@ export var orderBack = /*#__PURE__*/function () {
632
639
  hasSelectItem = HasErpItemSelectHandle(templateDetail);
633
640
  erpPromiseList = [];
634
641
  if (!(shopSourceStr === 'TAOBAO' && hasSelectItem)) {
635
- _context.next = 134;
642
+ _context.next = 137;
636
643
  break;
637
644
  }
638
645
  list = detail['itemList'];
@@ -650,10 +657,10 @@ export var orderBack = /*#__PURE__*/function () {
650
657
  resolve({});
651
658
  });
652
659
  });
653
- _context.prev = 124;
654
- _context.next = 127;
660
+ _context.prev = 127;
661
+ _context.next = 130;
655
662
  return Promise.all(promises);
656
- case 127:
663
+ case 130:
657
664
  erpPromiseList = _context.sent;
658
665
  detail['itemList'] = (_detail$itemList = detail['itemList']) === null || _detail$itemList === void 0 ? void 0 : _detail$itemList.map(function (item, index) {
659
666
  return _objectSpread(_objectSpread({}, item), {}, {
@@ -663,25 +670,25 @@ export var orderBack = /*#__PURE__*/function () {
663
670
  })
664
671
  });
665
672
  });
666
- _context.next = 134;
673
+ _context.next = 137;
667
674
  break;
668
- case 131:
669
- _context.prev = 131;
670
- _context.t1 = _context["catch"](124);
671
- console.error('调用erp获取宝贝编码错误', _context.t1);
672
675
  case 134:
676
+ _context.prev = 134;
677
+ _context.t1 = _context["catch"](127);
678
+ console.error('调用erp获取宝贝编码错误', _context.t1);
679
+ case 137:
673
680
  // 判断是否存在签收时间组件
674
681
  hasSigningDatetime = HasTradeSigningDatetime(templateDetail); // 如存在签收时间组件且订单也有返回相应物流单号跟物流公司编码，则调用接口获取签收时间
675
682
  if (!hasSigningDatetime) {
676
- _context.next = 150;
683
+ _context.next = 153;
677
684
  break;
678
685
  }
679
686
  if (!(orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCompany && orderInfo !== null && orderInfo !== void 0 && orderInfo.expressLogisticsCode)) {
680
- _context.next = 149;
687
+ _context.next = 152;
681
688
  break;
682
689
  }
683
- _context.prev = 137;
684
- _context.next = 140;
690
+ _context.prev = 140;
691
+ _context.next = 143;
685
692
  return request({
686
693
  url: '/qy/logistics/logisticsSignTime',
687
694
  method: 'post',
@@ -691,21 +698,21 @@ export var orderBack = /*#__PURE__*/function () {
691
698
  mailNo: orderInfo.expressLogisticsCode
692
699
  }
693
700
  });
694
- case 140:
701
+ case 143:
695
702
  signDatetime = _context.sent;
696
703
  detail['tradeSigningDateTime'] = signDatetime === null || signDatetime === void 0 ? void 0 : (_signDatetime$data = signDatetime.data) === null || _signDatetime$data === void 0 ? void 0 : _signDatetime$data.signTime;
697
- _context.next = 147;
704
+ _context.next = 150;
698
705
  break;
699
- case 144:
700
- _context.prev = 144;
701
- _context.t2 = _context["catch"](137);
702
- console.error('调用签收时间错误', _context.t2);
703
706
  case 147:
704
- _context.next = 150;
707
+ _context.prev = 147;
708
+ _context.t2 = _context["catch"](140);
709
+ console.error('调用签收时间错误', _context.t2);
710
+ case 150:
711
+ _context.next = 153;
705
712
  break;
706
- case 149:
713
+ case 152:
707
714
  detail['tradeSigningDateTime'] = '';
708
- case 150:
715
+ case 153:
709
716
  values = orderBackFormValues({
710
717
  detail: detail,
711
718
  _get_order_fail_: !orderInfo,
@@ -758,21 +765,21 @@ export var orderBack = /*#__PURE__*/function () {
758
765
  shopId: shopId
759
766
  }));
760
767
  callback === null || callback === void 0 ? void 0 : callback(detail, templateDetail);
761
- _context.next = 162;
768
+ _context.next = 165;
762
769
  break;
763
- case 159:
764
- _context.prev = 159;
765
- _context.t3 = _context["catch"](27);
766
- console.error(_context.t3);
767
770
  case 162:
768
771
  _context.prev = 162;
769
- setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
770
- return _context.finish(162);
772
+ _context.t3 = _context["catch"](30);
773
+ console.error(_context.t3);
771
774
  case 165:
775
+ _context.prev = 165;
776
+ setLoading === null || setLoading === void 0 ? void 0 : setLoading(false);
777
+ return _context.finish(165);
778
+ case 168:
772
779
  case "end":
773
780
  return _context.stop();
774
781
  }
775
- }, _callee, null, [[7, 14, 17, 20], [27, 159, 162, 165], [124, 131], [137, 144]]);
782
+ }, _callee, null, [[10, 17, 20, 23], [30, 162, 165, 168], [127, 134], [140, 147]]);
776
783
  }));
777
784
  return function orderBack(_x) {
778
785
  return _ref2.apply(this, arguments);
@@ -1127,6 +1134,7 @@ export var reversalFormValues = function reversalFormValues() {
1127
1134
  prv["".concat(next.uniqueKey, "_returnGoodsTradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
1128
1135
  break;
1129
1136
  case 'REISSUE_TRADE_ID':
1137
+ case 'SWAP_OUT_TRADE_ID':
1130
1138
  case 'EXCHANGE_TRADE_ID':
1131
1139
  prv["".concat(next.uniqueKey, "_tradeItemList")] = JSON.stringify(values[next.uniqueKey] || []);
1132
1140
  break;
package/dist/esm/common/utils/transformWorkOrderData.js CHANGED
@@ -1040,6 +1040,10 @@ var processErpTradeId = function processErpTradeId(getValue) {
1040
1040
  EXCHANGE_TRADE_ID: {
1041
1041
  key: 'tradeItemList',
1042
1042
  defaultValue: []
1043
+ },
1044
+ SWAP_OUT_TRADE_ID: {
1045
+ key: 'tradeItemList',
1046
+ defaultValue: []
1043
1047
  }
1044
1048
  };
1045
1049
  return _defineProperty({}, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_").concat(SYSTEM_ORDER_MAP[nex.workOrderComponentType].key)), SYSTEM_ORDER_MAP[nex.workOrderComponentType].defaultValue));
@@ -1462,6 +1466,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
1462
1466
  RETURN_GOODS_TRADE_ID: processErpTradeId,
1463
1467
  BS_DELIVERY_NO: processErpTradeId,
1464
1468
  REISSUE_TRADE_ID: processErpTradeId,
1469
+ SWAP_OUT_TRADE_ID: processErpTradeId,
1465
1470
  ERP_AFTER_SALE_TRADE_ID: processErpTradeId,
1466
1471
  EXCHANGE_TRADE_ID: processErpTradeId,
1467
1472
  WLN_GOODS: processWlnGoods(templateColumns),
package/dist/esm/model/logicFlow/selector.d.ts CHANGED
@@ -6,6 +6,7 @@ export declare const selectFlowList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("./types").LogicFlowState;
9
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
9
10
  }) => import("./types").LogicFlow[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").LogicFlow[], {
10
11
  clearCache: () => void;
11
12
  }> & {
@@ -19,6 +20,7 @@ export declare const selectGroupFlowList: ((state: {
19
20
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
20
21
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
21
22
  logicFlow: import("./types").LogicFlowState;
23
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
22
24
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
23
25
  clearCache: () => void;
24
26
  }> & {
@@ -32,6 +34,7 @@ export declare const selectFlowTemplateGroupWorkOrderTemplateList: ((state: {
32
34
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
33
35
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
34
36
  logicFlow: import("./types").LogicFlowState;
37
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
35
38
  }) => import("./types").Option[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").LogicFlowState) => import("./types").Option[], {
36
39
  clearCache: () => void;
37
40
  }> & {
package/dist/esm/model/paymentWorkOrder/selector.d.ts CHANGED
@@ -6,6 +6,7 @@ export declare const selectPaymentWorkOrderExamineModalVisible: ((state: {
6
6
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
8
8
  logicFlow: import("../logicFlow/types").LogicFlowState;
9
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
9
10
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
10
11
  clearCache: () => void;
11
12
  }> & {
@@ -19,6 +20,7 @@ export declare const selectCurrentPaymentRecord: ((state: {
19
20
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
20
21
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
21
22
  logicFlow: import("../logicFlow/types").LogicFlowState;
23
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
22
24
  }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => any, {
23
25
  clearCache: () => void;
24
26
  }> & {
@@ -32,6 +34,7 @@ export declare const selectPaymentWorkOrderUnExamineModalVisible: ((state: {
32
34
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
33
35
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
34
36
  logicFlow: import("../logicFlow/types").LogicFlowState;
37
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
35
38
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
36
39
  clearCache: () => void;
37
40
  }> & {
@@ -45,6 +48,7 @@ export declare const selectDeletePaymentWorkOrderVisible: ((state: {
45
48
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
46
49
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
47
50
  logicFlow: import("../logicFlow/types").LogicFlowState;
51
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
48
52
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
49
53
  clearCache: () => void;
50
54
  }> & {
@@ -58,6 +62,7 @@ export declare const selectFlagPayModalVisible: ((state: {
58
62
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
59
63
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
60
64
  logicFlow: import("../logicFlow/types").LogicFlowState;
65
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
61
66
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
62
67
  clearCache: () => void;
63
68
  }> & {
@@ -71,6 +76,7 @@ export declare const selectLogModalVisible: ((state: {
71
76
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
72
77
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
73
78
  logicFlow: import("../logicFlow/types").LogicFlowState;
79
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
74
80
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
75
81
  clearCache: () => void;
76
82
  }> & {
@@ -84,6 +90,7 @@ export declare const selectPaymentFormModalVisible: ((state: {
84
90
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
85
91
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
86
92
  logicFlow: import("../logicFlow/types").LogicFlowState;
93
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
87
94
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
88
95
  clearCache: () => void;
89
96
  }> & {
@@ -97,6 +104,7 @@ export declare const selectRepeatVisible: ((state: {
97
104
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
98
105
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
99
106
  logicFlow: import("../logicFlow/types").LogicFlowState;
107
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
100
108
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => boolean, {
101
109
  clearCache: () => void;
102
110
  }> & {
@@ -110,6 +118,7 @@ export declare const selectRepeatWorkOrderList: ((state: {
110
118
  paymentWorkOrder: import("./types").PaymentWorkOrderState;
111
119
  singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
112
120
  logicFlow: import("../logicFlow/types").LogicFlowState;
121
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
113
122
  }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").PaymentWorkOrderState) => string[], {
114
123
  clearCache: () => void;
115
124
  }> & {
package/dist/esm/model/singleShopWorkOrder/selector.d.ts CHANGED
@@ -6,6 +6,7 @@ export declare const selectorSingleTemplateList: ((state: {
6
6
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
7
7
  singleWorkOrder: import("./types").SingleWorkOrderState;
8
8
  logicFlow: import("../logicFlow/types").LogicFlowState;
9
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
9
10
  }) => import("./types").SelectI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => import("./types").SelectI[], {
10
11
  clearCache: () => void;
11
12
  }> & {
@@ -19,6 +20,7 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
19
20
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
20
21
  singleWorkOrder: import("./types").SingleWorkOrderState;
21
22
  logicFlow: import("../logicFlow/types").LogicFlowState;
23
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
22
24
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
23
25
  clearCache: () => void;
24
26
  }> & {
@@ -32,6 +34,7 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
32
34
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
33
35
  singleWorkOrder: import("./types").SingleWorkOrderState;
34
36
  logicFlow: import("../logicFlow/types").LogicFlowState;
37
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
35
38
  }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => any, {
36
39
  clearCache: () => void;
37
40
  }> & {
@@ -45,6 +48,7 @@ export declare const selectorTemplateId: ((state: {
45
48
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
46
49
  singleWorkOrder: import("./types").SingleWorkOrderState;
47
50
  logicFlow: import("../logicFlow/types").LogicFlowState;
51
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
48
52
  }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => string, {
49
53
  clearCache: () => void;
50
54
  }> & {
@@ -58,6 +62,7 @@ export declare const selectorFormModalVisible: ((state: {
58
62
  paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
59
63
  singleWorkOrder: import("./types").SingleWorkOrderState;
60
64
  logicFlow: import("../logicFlow/types").LogicFlowState;
65
+ flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
61
66
  }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").SingleWorkOrderState) => boolean, {
62
67
  clearCache: () => void;
63
68
  }> & {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.7.0",
3
+ "version": "2.7.2-rc.0",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -32,9 +32,9 @@
32
32
  },
33
33
  "dependencies": {
34
34
  "@ant-design/icons": "^4.7.0",
35
- "@kmkf-fe-packages/basic-components": "2.7.0",
36
- "@kmkf-fe-packages/kmkf-utils": "2.6.0",
37
- "@kmkf-fe-packages/services-components": "2.7.0",
35
+ "@kmkf-fe-packages/basic-components": "2.7.2-rc.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "2.7.2-rc.0",
37
+ "@kmkf-fe-packages/services-components": "2.7.2-rc.0",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -75,7 +75,7 @@
75
75
  "publishConfig": {
76
76
  "access": "public"
77
77
  },
78
- "gitHead": "d54565625fe23336f505c9312cea19b57e653149",
78
+ "gitHead": "4f2299ac2ee476193a52c6920905684288ee1c71",
79
79
  "gitHooks": {
80
80
  "pre-commit": "lint-staged"
81
81
  }