@kmkf-fe-packages/kmkf-work-order-service-component 1.5.1 → 1.6.0-beta.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 (9) hide show
  1. package/README.md +1 -1
  2. package/dist/esm/FlowTemplateDetail/common.js +1 -1
  3. package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.js +4 -0
  4. package/dist/esm/FlowTemplateDetail/components/FormRender/index.js +59 -17
  5. package/dist/esm/FlowTemplateDetail/index.js +55 -26
  6. package/dist/esm/common/utils/tools.js +27 -19
  7. package/dist/esm/index.d.ts +1 -1
  8. package/dist/esm/index.js +1 -1
  9. package/package.json +5 -5
package/README.md CHANGED
@@ -63,4 +63,4 @@ const Text = ()=>{
63
63
 
64
64
  ```
65
65
 
66
- | 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
66
+ | 字段 | 说明 | 数据类型 | | ----------------- | ---------------- | ------------------------------------ | | platform | 平台 | TAOBAO =淘宝\|FXG=抖音\|PDD=拼多多\| | | shopId | 店铺 ID | number | | buyerNick | 买家昵称 | string | | buyerId | 买家 id | string | | orderNo | 订单 id | string | | onEmpowerCallback | 授权弹框点击回调 | function |
package/dist/esm/FlowTemplateDetail/common.js CHANGED
@@ -52,7 +52,7 @@ export var FLOW_STATUS_V2 = {
52
52
  CLOSED: '已关闭'
53
53
  };
54
54
  //不能回填的组件type
55
- 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', 'EXCHANGE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE'];
55
+ 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', 'EXCHANGE_TRADE_ID', 'REISSUE_TRADE_ID', 'LOGISTICS_INTERCEPTION', 'LOGISTICS_INTERCEPTION_MORE'];
56
56
  export var verifyHandle = function verifyHandle(data, componentDtoList) {
57
57
  var _componentDtoList$fin, _componentDtoList$fin2, _data$paymentUniqueKe, _data$paymentUniqueKe2;
58
58
  var res = {
package/dist/esm/FlowTemplateDetail/components/CurrentNode/index.js CHANGED
@@ -40,6 +40,10 @@ var CurrentNode = function CurrentNode(props, ref) {
40
40
  batchFillByMapping: function batchFillByMapping(values) {
41
41
  var _formRenderRef$curren, _formRenderRef$curren2;
42
42
  (_formRenderRef$curren = formRenderRef.current) === null || _formRenderRef$curren === void 0 ? void 0 : (_formRenderRef$curren2 = _formRenderRef$curren.batchFillByMapping) === null || _formRenderRef$curren2 === void 0 ? void 0 : _formRenderRef$curren2.call(_formRenderRef$curren, values);
43
+ },
44
+ getReplaceValue: function getReplaceValue() {
45
+ var _formRenderRef$curren3;
46
+ return (_formRenderRef$curren3 = formRenderRef.current) === null || _formRenderRef$curren3 === void 0 ? void 0 : _formRenderRef$curren3.getReplaceValue();
43
47
  }
44
48
  };
45
49
  }, []);
package/dist/esm/FlowTemplateDetail/components/FormRender/index.js CHANGED
@@ -28,7 +28,7 @@ import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, grou
28
28
  import 'moment/locale/zh-cn';
29
29
  import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
30
30
  // 重复检验不需要展示在顶部的
31
- INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo } from "../../../common/utils/tools";
31
+ INNER_REPLACE_COMPONENT, reversalFormValues, bsSystemOrderBackValues, wlnSystemOrderBackValues, getMappingConfigByTemplateDetail, wdtSystemOrderBackValues, setLogisticsInfo, COMPONENT_MAP } from "../../../common/utils/tools";
32
32
  import { replaceCheck, orderDetail, queryLabelByTradeId } from "../../../model/servers/api";
33
33
  import { factory } from '@kmkf-fe-packages/services-components';
34
34
  import { getExpression, formatDisplayConfig, isNull, LabelData } from '@kmkf-fe-packages/kmkf-utils';
@@ -53,7 +53,8 @@ var FormRender = function FormRender(props, ref) {
53
53
  var _Object$keys2;
54
54
  useImperativeHandle(ref, function () {
55
55
  return {
56
- batchFillByMapping: batchFillByMapping
56
+ batchFillByMapping: batchFillByMapping,
57
+ getReplaceValue: getReplaceValue
57
58
  };
58
59
  }, []);
59
60
  var shopList = props.shopList,
@@ -94,6 +95,7 @@ var FormRender = function FormRender(props, ref) {
94
95
  });
95
96
  }, [templateDetail]);
96
97
  var finallyMappdingHideComponents = useRef(mappingConfig.hideComponents);
98
+ var replaceValueRef = useRef();
97
99
  var _useState = useState(mappingConfig.hideComponents),
98
100
  _useState2 = _slicedToArray(_useState, 2),
99
101
  mappdingHideComponents = _useState2[0],
@@ -192,7 +194,7 @@ var FormRender = function FormRender(props, ref) {
192
194
  var obj = {};
193
195
  Object.keys(params).forEach(function (key) {
194
196
  var _params$key;
195
- if (params[key] && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
197
+ if (params[key] && typeof params[key] === 'string' && ((_params$key = params[key]) === null || _params$key === void 0 ? void 0 : _params$key.indexOf('*')) > -1) {
196
198
  obj[key] = 0;
197
199
  }
198
200
  });
@@ -212,7 +214,7 @@ var FormRender = function FormRender(props, ref) {
212
214
  case 2:
213
215
  needCheckComponentList = getReplaceWarnValues(templateDetail, componentValue);
214
216
  if (!needCheckComponentList.length) {
215
- _context.next = 11;
217
+ _context.next = 12;
216
218
  break;
217
219
  }
218
220
  params = {
@@ -236,7 +238,8 @@ var FormRender = function FormRender(props, ref) {
236
238
  setReplaceValue(function (prev) {
237
239
  return _objectSpread(_objectSpread({}, prev), resultParams);
238
240
  });
239
- case 11:
241
+ replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), resultParams);
242
+ case 12:
240
243
  case "end":
241
244
  return _context.stop();
242
245
  }
@@ -246,6 +249,9 @@ var FormRender = function FormRender(props, ref) {
246
249
  return _ref.apply(this, arguments);
247
250
  };
248
251
  }();
252
+ var getReplaceValue = function getReplaceValue() {
253
+ return replaceValueRef.current;
254
+ };
249
255
 
250
256
  // 更新备注
251
257
  var fetchRemark = function fetchRemark(shopId, orderNo) {
@@ -369,7 +375,7 @@ var FormRender = function FormRender(props, ref) {
369
375
  // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
370
376
  var tradeIdUniqueKey = hasComponent(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
371
377
  if (tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap2 = record.jsonMap) !== null && _record$jsonMap2 !== void 0 && _record$jsonMap2["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill) {
372
- var _record$jsonMap3, _record$jsonMap4;
378
+ var _record$jsonMap3;
373
379
  orderBack({
374
380
  order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(tradeIdUniqueKey, "_tradeId")],
375
381
  form: form,
@@ -380,7 +386,6 @@ var FormRender = function FormRender(props, ref) {
380
386
  fromQNCreateWorkOrderByOrderNo: fromQNCreateWorkOrderByOrderNo,
381
387
  plat: plat
382
388
  });
383
- 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);
384
389
  } else {
385
390
  // 如果没有订单反填，则单独更新remark
386
391
  fetchRemark(shopId, currentNodeTid);
@@ -443,7 +448,6 @@ var FormRender = function FormRender(props, ref) {
443
448
  // TODO: 只有在千牛端通过订单号录入工单的时候，订单备注不需要反填
444
449
  plat: plat
445
450
  });
446
- queryLabels(orderNo, shopId);
447
451
  } else {
448
452
  // 如果没有订单反填，则单独更新remark
449
453
  fetchRemark(shopId, currentNodeTid);
@@ -454,8 +458,45 @@ var FormRender = function FormRender(props, ref) {
454
458
  (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
455
459
  resetMappdingHideComponents();
456
460
  };
461
+ var repeatWarningDataSchema = function repeatWarningDataSchema(formValue, templateDetail) {
462
+ var getKeyByValue = function getKeyByValue(value) {
463
+ return Object.keys(COMPONENT_MAP).find(function (key) {
464
+ return COMPONENT_MAP[key] === value;
465
+ });
466
+ };
467
+ var needRepeatWarnComponent = Object.values(COMPONENT_MAP);
468
+ return templateDetail.componentDtoList.reduce(function (cur, nxt) {
469
+ if (needRepeatWarnComponent !== null && needRepeatWarnComponent !== void 0 && needRepeatWarnComponent.includes(nxt === null || nxt === void 0 ? void 0 : nxt.workOrderComponentType)) {
470
+ var instance = factory(nxt.workOrderComponentType, {
471
+ id: nxt.uniqueKey,
472
+ name: nxt.name,
473
+ componentConfig: nxt.componentConfig,
474
+ effects: {},
475
+ type: nxt.workOrderComponentType
476
+ });
477
+ var _id = instance === null || instance === void 0 ? void 0 : instance.id;
478
+ var value = formValue[_id];
479
+ var _key = getKeyByValue(nxt.workOrderComponentType);
480
+ // TODO: 如果是订单号组件, 将值设置为orderNo
481
+ if (nxt.workOrderComponentType === 'TRADE_ID_INPUT') {
482
+ _key = 'orderNo';
483
+ }
484
+ if (_key) {
485
+ cur[_key] = value;
486
+ }
487
+ }
488
+ return cur;
489
+ }, {});
490
+ };
457
491
  useEffect(function () {
458
- if (isErpUse) return;
492
+ if (isErpUse && templateDetail) {
493
+ var formValue = form.getFieldsValue(true);
494
+ console.debug('表单内容值', formValue);
495
+ // TODO: 拼装需要重复提醒的组件数据格式
496
+ var value = repeatWarningDataSchema(formValue, templateDetail);
497
+ console.debug('重复提醒转换之后数据', value);
498
+ return orderBackReplace(value, templateDetail);
499
+ }
459
500
  queryDetail({
460
501
  workOrderId: workOrderId,
461
502
  shopId: shopId,
@@ -465,7 +506,7 @@ var FormRender = function FormRender(props, ref) {
465
506
  buyerId: buyerId,
466
507
  buyerNick: buyerNick
467
508
  });
468
- }, [workOrderId, record, shopId, isErpUse]);
509
+ }, [workOrderId, record, shopId, isErpUse, templateDetail]);
469
510
 
470
511
  // 重置映射隐藏的组件, 目前只有单选、下拉组件可能会因为映射关系隐藏
471
512
  var resetMappdingHideComponents = function resetMappdingHideComponents() {
@@ -496,8 +537,8 @@ var FormRender = function FormRender(props, ref) {
496
537
 
497
538
  // 批量映射
498
539
  var batchFillByMapping = function batchFillByMapping(values) {
499
- for (var _key in values) {
500
- fillByMapping(_key, values[_key]);
540
+ for (var _key2 in values) {
541
+ fillByMapping(_key2, values[_key2]);
501
542
  }
502
543
  };
503
544
  // 组件映射
@@ -510,8 +551,8 @@ var FormRender = function FormRender(props, ref) {
510
551
  form.setFieldsValue(mapping === null || mapping === void 0 ? void 0 : mapping[triggerValue]);
511
552
  } else {
512
553
  var resetSet = new Set();
513
- for (var _key2 in mapping) {
514
- for (var uniqueKey in mapping[_key2]) {
554
+ for (var _key3 in mapping) {
555
+ for (var uniqueKey in mapping[_key3]) {
515
556
  resetSet.add(uniqueKey);
516
557
  }
517
558
  }
@@ -662,20 +703,21 @@ var FormRender = function FormRender(props, ref) {
662
703
  handleChangeTradeId(value);
663
704
  }
664
705
  if (value) {
665
- _context3.next = 5;
706
+ _context3.next = 6;
666
707
  break;
667
708
  }
668
709
  setReplaceValue(function (prev) {
669
710
  return _objectSpread(_objectSpread({}, prev), {}, _defineProperty({}, type, 0));
670
711
  });
712
+ replaceValueRef.current = _objectSpread(_objectSpread({}, replaceValue), {}, _defineProperty({}, type, 0));
671
713
  return _context3.abrupt("return");
672
- case 5:
714
+ case 6:
673
715
  queryReplaceCount(_defineProperty({}, type, value), templateDetail);
674
716
  // TODO: ERP不走订单反弹逻辑
675
717
  if ((type === 'tradeId' || type === 'enterprisePaymentTid') && !isErpUse) {
676
718
  changeHandle(value);
677
719
  }
678
- case 7:
720
+ case 8:
679
721
  case "end":
680
722
  return _context3.stop();
681
723
  }
package/dist/esm/FlowTemplateDetail/index.js CHANGED
@@ -46,6 +46,7 @@ import { useSignal } from "../hooks/useSignal";
46
46
  import { verifyHandle, submitParams, FLOW_STATUS_V2, getTag, currentUserHasOperatorAuth, CANNOT_BACK_FILL } from "./common";
47
47
  import { saveWorkOrder, submitWorkOrder, addRemark, stopWorkOrder, closeWorkOrder, startWorkOrder, forwardWorkOrder, returnWorkOrder, withDrawWorkOrder, reminder, cancelReminder } from "../model/flowTemplateDetail/api";
48
48
  import RenderDetail from "./components/RenderDetail";
49
+ import { COMPONENT_MAP } from "../common/utils/tools";
49
50
  import { orderDetail } from "../model/servers/api";
50
51
  import cache from "../common/cache";
51
52
  import "./index.less";
@@ -517,6 +518,12 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
517
518
  }();
518
519
  // 行动点操作
519
520
  var handleAction = function handleAction(status) {
521
+ //保存和提交校验重复订单禁止提交规则
522
+ var isReplace = checkOnlySubmit();
523
+ if (isReplace) {
524
+ return message.error('重复订单无法提交');
525
+ }
526
+ // return;
520
527
  dispatch(setAction(status));
521
528
  if (status === 'save') {
522
529
  handleSave();
@@ -527,6 +534,28 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
527
534
  handleStart();
528
535
  }
529
536
  };
537
+ var checkOnlySubmit = function checkOnlySubmit() {
538
+ var _currentNodeRef$curre, _currentNodeDetail$wo10;
539
+ var replaceValue = currentNodeRef === null || currentNodeRef === void 0 ? void 0 : (_currentNodeRef$curre = currentNodeRef.current) === null || _currentNodeRef$curre === void 0 ? void 0 : _currentNodeRef$curre.getReplaceValue();
540
+ var componentList = ((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.componentDtoList) || []).filter(function (t) {
541
+ var _t$componentConfig;
542
+ return (_t$componentConfig = t.componentConfig) === null || _t$componentConfig === void 0 ? void 0 : _t$componentConfig.repeatCheck;
543
+ });
544
+ if (replaceValue && componentList.length) {
545
+ var val = Object.keys(COMPONENT_MAP).reduce(function (prv, key) {
546
+ if (replaceValue[key]) {
547
+ prv[COMPONENT_MAP[key]] = replaceValue[key];
548
+ }
549
+ return prv;
550
+ }, {});
551
+ return componentList.some(function (item) {
552
+ var _item$workOrderCompon;
553
+ return val[(_item$workOrderCompon = item === null || item === void 0 ? void 0 : item.workOrderComponentType) !== null && _item$workOrderCompon !== void 0 ? _item$workOrderCompon : ''];
554
+ });
555
+ } else {
556
+ return false;
557
+ }
558
+ };
530
559
  var handleOpenRemarkList = function handleOpenRemarkList() {
531
560
  dispatch(setVisibleRemarkList(true));
532
561
  };
@@ -579,7 +608,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
579
608
  // 暂停工单
580
609
  var handleStop = /*#__PURE__*/function () {
581
610
  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(formData) {
582
- var _currentNodeDetail$no4, _currentNodeDetail$wo10, _res$data6, _res$data6$failList, res, _res$data7, _res$data7$failList, _res$data7$failList$;
611
+ var _currentNodeDetail$no4, _currentNodeDetail$wo11, _res$data6, _res$data6$failList, res, _res$data7, _res$data7$failList, _res$data7$failList$;
583
612
  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
584
613
  while (1) switch (_context6.prev = _context6.next) {
585
614
  case 0:
@@ -590,7 +619,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
590
619
  nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no4 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no4 === void 0 ? void 0 : _currentNodeDetail$no4.id,
591
620
  flowWorkOrderId: flowWorkOrderIdState,
592
621
  flowTemplateId: flowTemplateId,
593
- workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo10 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo10 === void 0 ? void 0 : _currentNodeDetail$wo10.id
622
+ workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.id
594
623
  })
595
624
  }));
596
625
  case 3:
@@ -635,19 +664,19 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
635
664
  // 关闭工单
636
665
  var handleClose = /*#__PURE__*/function () {
637
666
  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7(formData) {
638
- var _currentNodeDetail$wo11, _currentNodeDetail$no5, _currentNodeDetail$wo12, _res$data8, _res$data8$failList, res, _res$data9, _res$data9$failList, _res$data9$failList$;
667
+ var _currentNodeDetail$wo12, _currentNodeDetail$no5, _currentNodeDetail$wo13, _res$data8, _res$data8$failList, res, _res$data9, _res$data9$failList, _res$data9$failList$;
639
668
  return _regeneratorRuntime().wrap(function _callee7$(_context7) {
640
669
  while (1) switch (_context7.prev = _context7.next) {
641
670
  case 0:
642
671
  _context7.prev = 0;
643
672
  _context7.next = 3;
644
673
  return closeWorkOrder(_objectSpread(_objectSpread({}, formData), {}, {
645
- workOrderFlowStatus: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo11 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo11 === void 0 ? void 0 : _currentNodeDetail$wo11.flowStatus,
674
+ workOrderFlowStatus: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.flowStatus,
646
675
  operateParams: _objectSpread(_objectSpread({}, operateParams), {}, {
647
676
  nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no5 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no5 === void 0 ? void 0 : _currentNodeDetail$no5.id,
648
677
  flowWorkOrderId: flowWorkOrderIdState,
649
678
  flowTemplateId: flowTemplateId,
650
- workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo12 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo12 === void 0 ? void 0 : _currentNodeDetail$wo12.id
679
+ workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo13 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.id
651
680
  })
652
681
  }));
653
682
  case 3:
@@ -687,7 +716,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
687
716
  // 转交处理人
688
717
  var handleForWard = /*#__PURE__*/function () {
689
718
  var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8(formData) {
690
- var _currentNodeDetail$no6, _currentNodeDetail$wo13, _res$data10, _res$data10$failList, res, _res$data11, _res$data11$failList, _res$data11$failList$;
719
+ var _currentNodeDetail$no6, _currentNodeDetail$wo14, _res$data10, _res$data10$failList, res, _res$data11, _res$data11$failList, _res$data11$failList$;
691
720
  return _regeneratorRuntime().wrap(function _callee8$(_context8) {
692
721
  while (1) switch (_context8.prev = _context8.next) {
693
722
  case 0:
@@ -698,7 +727,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
698
727
  nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no6 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no6 === void 0 ? void 0 : _currentNodeDetail$no6.id,
699
728
  flowWorkOrderId: flowWorkOrderIdState,
700
729
  flowTemplateId: flowTemplateId,
701
- workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo13 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo13 === void 0 ? void 0 : _currentNodeDetail$wo13.id
730
+ workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.id
702
731
  })
703
732
  }));
704
733
  case 3:
@@ -738,7 +767,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
738
767
  // 驳回
739
768
  var handleReturnWorkOrder = /*#__PURE__*/function () {
740
769
  var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(formData) {
741
- var _currentNodeDetail$no7, _currentNodeDetail$wo14, _res$data12, _res$data12$failList, res, _res$data13, _res$data13$failList, _res$data13$failList$;
770
+ var _currentNodeDetail$no7, _currentNodeDetail$wo15, _res$data12, _res$data12$failList, res, _res$data13, _res$data13$failList, _res$data13$failList$;
742
771
  return _regeneratorRuntime().wrap(function _callee9$(_context9) {
743
772
  while (1) switch (_context9.prev = _context9.next) {
744
773
  case 0:
@@ -749,7 +778,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
749
778
  nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no7 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no7 === void 0 ? void 0 : _currentNodeDetail$no7.id,
750
779
  flowWorkOrderId: flowWorkOrderIdState,
751
780
  flowTemplateId: flowTemplateId,
752
- workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo14 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo14 === void 0 ? void 0 : _currentNodeDetail$wo14.id
781
+ workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : _currentNodeDetail$wo15.id
753
782
  })
754
783
  }));
755
784
  case 3:
@@ -789,7 +818,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
789
818
  // 撤回
790
819
  var handleWithdraw = /*#__PURE__*/function () {
791
820
  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10(formData) {
792
- var _currentNodeDetail$no8, _currentNodeDetail$wo15, _res$data14, _res$data14$failList, res, _res$data15, _res$data15$failList, _res$data15$failList$;
821
+ var _currentNodeDetail$no8, _currentNodeDetail$wo16, _res$data14, _res$data14$failList, res, _res$data15, _res$data15$failList, _res$data15$failList$;
793
822
  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
794
823
  while (1) switch (_context10.prev = _context10.next) {
795
824
  case 0:
@@ -801,7 +830,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
801
830
  nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no8 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no8 === void 0 ? void 0 : _currentNodeDetail$no8.id,
802
831
  flowWorkOrderId: flowWorkOrderIdState,
803
832
  flowTemplateId: flowTemplateId,
804
- workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo15 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo15 === void 0 ? void 0 : _currentNodeDetail$wo15.id
833
+ workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo16 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : _currentNodeDetail$wo16.id
805
834
  })
806
835
  }));
807
836
  case 3:
@@ -845,27 +874,27 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
845
874
  //催单
846
875
  var handleReminder = /*#__PURE__*/function () {
847
876
  var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11(type) {
848
- var _currentNodeDetail$wo16, _currentNodeDetail$wo17, _currentNodeDetail$no9, _currentNodeDetail$wo18, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$no10, _currentNodeDetail$wo22, api, flowTags, newFlowTags, params, res;
877
+ var _currentNodeDetail$wo17, _currentNodeDetail$wo18, _currentNodeDetail$no9, _currentNodeDetail$wo19, _currentNodeDetail$wo20, _currentNodeDetail$wo21, _currentNodeDetail$wo22, _currentNodeDetail$no10, _currentNodeDetail$wo23, api, flowTags, newFlowTags, params, res;
849
878
  return _regeneratorRuntime().wrap(function _callee11$(_context11) {
850
879
  while (1) switch (_context11.prev = _context11.next) {
851
880
  case 0:
852
881
  _context11.prev = 0;
853
882
  dispatch(setLoading(true));
854
883
  api = type === 'reminder' ? reminder : cancelReminder;
855
- flowTags = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo16 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo16 === void 0 ? void 0 : (_currentNodeDetail$wo17 = _currentNodeDetail$wo16.jsonMap) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : _currentNodeDetail$wo17.flowTags) || '[]');
884
+ flowTags = JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo17 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo17 === void 0 ? void 0 : (_currentNodeDetail$wo18 = _currentNodeDetail$wo17.jsonMap) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : _currentNodeDetail$wo18.flowTags) || '[]');
856
885
  newFlowTags = type === 'reminder' ? flowTags.concat('REMINDER') : flowTags.filter(function (t) {
857
886
  return t !== 'REMINDER';
858
887
  });
859
888
  params = {
860
889
  updateInfo: {
861
890
  nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no9 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no9 === void 0 ? void 0 : _currentNodeDetail$no9.id,
862
- templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo18 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo18 === void 0 ? void 0 : _currentNodeDetail$wo18.templateId,
863
- workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo19 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : _currentNodeDetail$wo19.id,
891
+ templateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo19 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo19 === void 0 ? void 0 : _currentNodeDetail$wo19.templateId,
892
+ workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo20 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo20 === void 0 ? void 0 : _currentNodeDetail$wo20.id,
864
893
  updateList: [{
865
894
  dataKey: 'flowTags',
866
895
  name: '标签',
867
896
  dataValue: newFlowTags,
868
- oldValue: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo20 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo20 === void 0 ? void 0 : (_currentNodeDetail$wo21 = _currentNodeDetail$wo20.jsonMap) === null || _currentNodeDetail$wo21 === void 0 ? void 0 : _currentNodeDetail$wo21.flowTags) || '[]')
897
+ oldValue: JSON.parse((currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo21 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo21 === void 0 ? void 0 : (_currentNodeDetail$wo22 = _currentNodeDetail$wo21.jsonMap) === null || _currentNodeDetail$wo22 === void 0 ? void 0 : _currentNodeDetail$wo22.flowTags) || '[]')
869
898
  }],
870
899
  updateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.workOrderUpdateTime,
871
900
  needTransForm: false
@@ -873,7 +902,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
873
902
  operateParams: {
874
903
  nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no10 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no10 === void 0 ? void 0 : _currentNodeDetail$no10.id,
875
904
  flowWorkOrderId: flowWorkOrderIdState,
876
- workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo22 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo22 === void 0 ? void 0 : _currentNodeDetail$wo22.id,
905
+ workOrderId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.id,
877
906
  flowTemplateId: flowTemplateId,
878
907
  workOrderUpdateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.workOrderUpdateTime,
879
908
  flowWorkOrderUpdateTime: operateParams === null || operateParams === void 0 ? void 0 : operateParams.flowWorkOrderUpdateTime
@@ -926,7 +955,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
926
955
 
927
956
  // 填充表单
928
957
  var handleFillWorkOrder = function handleFillWorkOrder(details) {
929
- var _currentNodeRef$curre, _currentNodeRef$curre2;
958
+ var _currentNodeRef$curre2, _currentNodeRef$curre3;
930
959
  //返填去掉店铺返填，防止端上覆盖店铺信息
931
960
  var shopId = details.shopId,
932
961
  ohter = _objectWithoutProperties(details, _excluded);
@@ -934,7 +963,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
934
963
  form.setFieldsValue(_objectSpread(_objectSpread({}, formData), ohter));
935
964
  message.success('填充成功');
936
965
  // 填充表单后触发映射
937
- (_currentNodeRef$curre = currentNodeRef.current) === null || _currentNodeRef$curre === void 0 ? void 0 : (_currentNodeRef$curre2 = _currentNodeRef$curre.batchFillByMapping) === null || _currentNodeRef$curre2 === void 0 ? void 0 : _currentNodeRef$curre2.call(_currentNodeRef$curre, form.getFieldsValue());
966
+ (_currentNodeRef$curre2 = currentNodeRef.current) === null || _currentNodeRef$curre2 === void 0 ? void 0 : (_currentNodeRef$curre3 = _currentNodeRef$curre2.batchFillByMapping) === null || _currentNodeRef$curre3 === void 0 ? void 0 : _currentNodeRef$curre3.call(_currentNodeRef$curre2, form.getFieldsValue());
938
967
  };
939
968
  // 查询备注记录
940
969
  var queryRemarkList = function queryRemarkList() {
@@ -966,21 +995,21 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
966
995
  dispatch(setPlat(plat));
967
996
  }, [plat]);
968
997
  useEffect(function () {
969
- var _currentNodeDetail$wo23;
970
- if (autoSubmit && !isNull(currentNodeDetail) && flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo23 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo23 === void 0 ? void 0 : _currentNodeDetail$wo23.flowWorkOrderId)) {
998
+ var _currentNodeDetail$wo24;
999
+ if (autoSubmit && !isNull(currentNodeDetail) && flowWorkOrderId === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.flowWorkOrderId)) {
971
1000
  setTimeout(function () {
972
1001
  handleSubmit();
973
1002
  }, 0);
974
1003
  }
975
1004
  }, [currentNodeDetail]);
976
1005
  var isCurrentNodeHandler = useMemo(function () {
977
- var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo24, _currentNodeDetail$no17, _currentNodeDetail$no18;
1006
+ var _currentNodeDetail$no11, _currentNodeDetail$no12, _currentNodeDetail$no13, _currentNodeDetail$no14, _currentNodeDetail$no15, _currentNodeDetail$no16, _currentNodeDetail$wo25, _currentNodeDetail$no17, _currentNodeDetail$no18;
978
1007
  return currentUserHasOperatorAuth({
979
1008
  assistantList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no11 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no11 === void 0 ? void 0 : _currentNodeDetail$no11.id) && assistantMap[currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no12 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no12 === void 0 ? void 0 : _currentNodeDetail$no12.id] || [],
980
1009
  currentUserKey: plat.userKey,
981
1010
  staffIds: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no13 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no13 === void 0 ? void 0 : (_currentNodeDetail$no14 = _currentNodeDetail$no13.assistants) === null || _currentNodeDetail$no14 === void 0 ? void 0 : _currentNodeDetail$no14.staffIds) || [],
982
1011
  operateDataPermission: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no15 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no15 === void 0 ? void 0 : (_currentNodeDetail$no16 = _currentNodeDetail$no15.assistants) === null || _currentNodeDetail$no16 === void 0 ? void 0 : _currentNodeDetail$no16.operateDataPermission,
983
- handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo24 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo24 === void 0 ? void 0 : _currentNodeDetail$wo24.handlerList) || [],
1012
+ handlerList: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo25 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo25 === void 0 ? void 0 : _currentNodeDetail$wo25.handlerList) || [],
984
1013
  isAllStaff: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no17 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no17 === void 0 ? void 0 : (_currentNodeDetail$no18 = _currentNodeDetail$no17.assistants) === null || _currentNodeDetail$no18 === void 0 ? void 0 : _currentNodeDetail$no18.isAllStaff
985
1014
  });
986
1015
  }, [currentNodeDetail, plat, assistantMap]);
@@ -989,9 +1018,9 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
989
1018
  return item.accessToken === (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$no19 = currentNodeDetail.nodeInfo) === null || _currentNodeDetail$no19 === void 0 ? void 0 : (_currentNodeDetail$no20 = _currentNodeDetail$no19.relationEvent) === null || _currentNodeDetail$no20 === void 0 ? void 0 : _currentNodeDetail$no20.defaultShopUniqueKey);
990
1019
  })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopId;
991
1020
  var ReportOrderRender = function ReportOrderRender(props) {
992
- var _currentNodeDetail$wo25, _currentNodeDetail$wo26;
1021
+ var _currentNodeDetail$wo26, _currentNodeDetail$wo27;
993
1022
  var details = props.details;
994
- var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo25 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo25 === void 0 ? void 0 : _currentNodeDetail$wo25.componentDtoList.filter(function (t) {
1023
+ var componentDtoList = currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo26 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo26 === void 0 ? void 0 : _currentNodeDetail$wo26.componentDtoList.filter(function (t) {
995
1024
  return !CANNOT_BACK_FILL.includes(t.workOrderComponentType || '');
996
1025
  });
997
1026
  //获取可以返填的组件值
@@ -999,7 +1028,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
999
1028
  _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
1000
1029
  transData = _calcWorkOrderList2[0];
1001
1030
  //获取表单显示值
1002
- var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo26 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo26 === void 0 ? void 0 : _currentNodeDetail$wo26.componentDtoList),
1031
+ var _calcWorkOrderList3 = calcWorkOrderList([details], currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo27 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo27 === void 0 ? void 0 : _currentNodeDetail$wo27.componentDtoList),
1003
1032
  _calcWorkOrderList4 = _slicedToArray(_calcWorkOrderList3, 1),
1004
1033
  transDataall = _calcWorkOrderList4[0];
1005
1034
  return /*#__PURE__*/React.createElement("div", {
package/dist/esm/common/utils/tools.js CHANGED
@@ -459,6 +459,12 @@ export var submitDataTransOldFormat = function submitDataTransOldFormat(nowData,
459
459
  content: get(nowData, "".concat(item.uniqueKey, ".postingAddress[2]"), ''),
460
460
  name: item.name
461
461
  });
462
+ } else if (item.workOrderComponentType === 'SUBFORM') {
463
+ contentVoList.push({
464
+ uniqueKey: "".concat(item.uniqueKey, "_productList"),
465
+ content: get(nowData, "".concat(item.uniqueKey), []),
466
+ name: item.name
467
+ });
462
468
  } else if (item.workOrderComponentType === 'ITEM_SELECT') {
463
469
  contentVoList.push({
464
470
  uniqueKey: "".concat(item.uniqueKey, "_itemList"),
@@ -1295,36 +1301,38 @@ var transDataSource = function transDataSource(templateColumns) {
1295
1301
  address: _address2,
1296
1302
  detail: item.jsonMap["".concat(nex.uniqueKey, "_address")]
1297
1303
  }));
1304
+ } else if (nex.workOrderComponentType === 'SUBFORM') {
1305
+ return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_productList")], [])));
1298
1306
  } else if (nex.workOrderComponentType === 'EXPRESS_LOGISTICS_SELECT') {
1299
- var _objectSpread20;
1300
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread20 = {}, _defineProperty(_objectSpread20, "".concat(nex.uniqueKey), {
1307
+ var _objectSpread21;
1308
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
1301
1309
  company: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")],
1302
1310
  order: item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]
1303
- }), _defineProperty(_objectSpread20, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")]), _defineProperty(_objectSpread20, "".concat(nex.uniqueKey, "_expressLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]), _objectSpread20));
1311
+ }), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_expressLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCompany")]), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_expressLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_expressLogisticsCode")]), _objectSpread21));
1304
1312
  } else if (nex.workOrderComponentType === 'RETURN_LOGISTICS_SELECT') {
1305
- var _objectSpread21;
1306
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread21 = {}, _defineProperty(_objectSpread21, "".concat(nex.uniqueKey), {
1313
+ var _objectSpread22;
1314
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread22 = {}, _defineProperty(_objectSpread22, "".concat(nex.uniqueKey), {
1307
1315
  company: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")],
1308
1316
  order: item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]
1309
- }), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")]), _defineProperty(_objectSpread21, "".concat(nex.uniqueKey, "_returnLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]), _objectSpread21));
1317
+ }), _defineProperty(_objectSpread22, "".concat(nex.uniqueKey, "_returnLogisticsCompany"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCompany")]), _defineProperty(_objectSpread22, "".concat(nex.uniqueKey, "_returnLogisticsCode"), item.jsonMap["".concat(nex.uniqueKey, "_returnLogisticsCode")]), _objectSpread22));
1310
1318
  } else if (nex.workOrderComponentType === 'REMARK_INPUT') {
1311
1319
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), {
1312
1320
  flag: item.jsonMap["".concat(nex.uniqueKey, "_flag")] ? +item.jsonMap["".concat(nex.uniqueKey, "_flag")] : config !== null && config !== void 0 && config.flag ? +(config === null || config === void 0 ? void 0 : config.flag) : '',
1313
1321
  remark: item.jsonMap["".concat(nex.uniqueKey, "_remark")] || (config === null || config === void 0 ? void 0 : config.remark) || ''
1314
1322
  }));
1315
1323
  } else if (nex.workOrderComponentType === 'STATUS') {
1316
- var _objectSpread23;
1317
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread23 = {}, _defineProperty(_objectSpread23, "".concat(nex.uniqueKey), {
1324
+ var _objectSpread24;
1325
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread24 = {}, _defineProperty(_objectSpread24, "".concat(nex.uniqueKey), {
1318
1326
  status: item.jsonMap["".concat(nex.uniqueKey, "_status")] || (config === null || config === void 0 ? void 0 : config.status),
1319
1327
  customerService: jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_customerService")], item.jsonMap["".concat(nex.uniqueKey, "_customerService")])
1320
- }), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread23, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread23));
1328
+ }), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_processTime"), item.jsonMap['processTime']), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_lastProcessingTime"), item.jsonMap['lastProcessingTime']), _objectSpread24));
1321
1329
  } else if (nex.workOrderComponentType === 'ORDINARY_INVOICE') {
1322
- var _objectSpread24;
1323
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread24 = {}, _defineProperty(_objectSpread24, "".concat(nex.uniqueKey), {
1330
+ var _objectSpread25;
1331
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread25 = {}, _defineProperty(_objectSpread25, "".concat(nex.uniqueKey), {
1324
1332
  ordinaryMoney: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")],
1325
1333
  ordinarySerial: item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")],
1326
1334
  ordinaryTaitou: item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]
1327
- }), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinaryMoney"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")] ? Number(item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")]).toFixed(2) : null), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinarySerial"), item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")]), _defineProperty(_objectSpread24, "".concat(nex.uniqueKey, "_ordinaryTaitou"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]), _objectSpread24));
1335
+ }), _defineProperty(_objectSpread25, "".concat(nex.uniqueKey, "_ordinaryMoney"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")] ? Number(item.jsonMap["".concat(nex.uniqueKey, "_ordinaryMoney")]).toFixed(2) : null), _defineProperty(_objectSpread25, "".concat(nex.uniqueKey, "_ordinarySerial"), item.jsonMap["".concat(nex.uniqueKey, "_ordinarySerial")]), _defineProperty(_objectSpread25, "".concat(nex.uniqueKey, "_ordinaryTaitou"), item.jsonMap["".concat(nex.uniqueKey, "_ordinaryTaitou")]), _objectSpread25));
1328
1336
  } else if (nex.workOrderComponentType === 'LOGISTICS_INTERCEPTION') {
1329
1337
  var _address3 = [transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptProvince")]), transTextToNumber(item.jsonMap["".concat(nex.uniqueKey, "_interceptCity")])];
1330
1338
  //兼容地址是只有省市的
@@ -1372,8 +1380,8 @@ var transDataSource = function transDataSource(templateColumns) {
1372
1380
  });
1373
1381
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), _itemList));
1374
1382
  } else if (nex.workOrderComponentType === 'ENTERPRISE_PAYMENT') {
1375
- var _objectSpread33;
1376
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread33 = {}, _defineProperty(_objectSpread33, "".concat(nex.uniqueKey), {
1383
+ var _objectSpread34;
1384
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread34 = {}, _defineProperty(_objectSpread34, "".concat(nex.uniqueKey), {
1377
1385
  enterprisePaymentAlipayNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")],
1378
1386
  enterprisePaymentAlipayNo: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")],
1379
1387
  enterprisePaymentBuyerNick: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")],
@@ -1381,7 +1389,7 @@ var transDataSource = function transDataSource(templateColumns) {
1381
1389
  enterprisePaymentRefundFee: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")],
1382
1390
  enterprisePaymentStatus: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")],
1383
1391
  enterprisePaymentTid: item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]
1384
- }), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread33, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread33));
1392
+ }), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNick")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentAlipayNo")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentBuyerNick")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentRefundFee"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentRefundFee")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentStatus"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentStatus")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentTime"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTime")]), _defineProperty(_objectSpread34, "".concat(nex.uniqueKey, "_enterprisePaymentTid"), item.jsonMap["".concat(nex.uniqueKey, "_enterprisePaymentTid")]), _objectSpread34));
1385
1393
  } else if (nex.workOrderComponentType === 'JST_LOGISTICS') {
1386
1394
  var _itemList2 = jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_jstItemList")], [{
1387
1395
  logisticsCompany: null,
@@ -1658,8 +1666,8 @@ var transDataSource = function transDataSource(templateColumns) {
1658
1666
  wdtSystemOrderNo: item.jsonMap["".concat(nex.uniqueKey, "_wdtSystemOrderNo")]
1659
1667
  }));
1660
1668
  } else if (nex.workOrderComponentType === 'LABEL') {
1661
- var _objectSpread55;
1662
- return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread55 = {}, _defineProperty(_objectSpread55, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _defineProperty(_objectSpread55, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _objectSpread55));
1669
+ var _objectSpread56;
1670
+ return _objectSpread(_objectSpread({}, cur), {}, (_objectSpread56 = {}, _defineProperty(_objectSpread56, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _defineProperty(_objectSpread56, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_label")], [])), _objectSpread56));
1663
1671
  } else if (nex.workOrderComponentType === 'AFTER_SALES_ORDER_ID') {
1664
1672
  return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_afterSalesOrderId")]));
1665
1673
  }
@@ -1683,7 +1691,7 @@ export var calcWorkOrderList = function calcWorkOrderList(source, templateColumn
1683
1691
  //订单返填
1684
1692
  export var orderBack = /*#__PURE__*/function () {
1685
1693
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
1686
- var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread58, _cacheOrderInfo;
1694
+ var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, JOIN_SHOP, hasBs, hasWdt, hasWln, _ref3, shopSourceStr, _ref3$thirdUserNick, thirdUserNick, _data$value, _jstOrder$value, _jstOrder$value$data, _bsOrder$value, _wlnOrder$value, _wdtOrder$value, _bsOrders$orders, _wlnOrders$orders, _wdtOrders$trades, promise, hasJst, _yield$Promise$allSet, _yield$Promise$allSet2, data, jstOrder, bsOrder, wlnOrder, wdtOrder, orderInfo, jstInfo, bsOrders, wlnOrders, wdtOrders, bsInfo, wlnInfo, wdtInfo, formValue, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, values, _templateDetail$compo, paymentUniqueKey, cacheOrderInfo, _objectSpread59, _cacheOrderInfo;
1687
1695
  return _regeneratorRuntime().wrap(function _callee$(_context) {
1688
1696
  while (1) switch (_context.prev = _context.next) {
1689
1697
  case 0:
@@ -1925,7 +1933,7 @@ export var orderBack = /*#__PURE__*/function () {
1925
1933
  sessionStorage.setItem('cacheOmsOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, cacheOrderInfo), {}, _defineProperty({}, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))))));
1926
1934
  } else {
1927
1935
  _cacheOrderInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
1928
- sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread58 = {}, _defineProperty(_objectSpread58, order_no, values), _defineProperty(_objectSpread58, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread58))));
1936
+ sessionStorage.setItem('cacheOrderInfo', JSON.stringify(_objectSpread(_objectSpread({}, _cacheOrderInfo), {}, (_objectSpread59 = {}, _defineProperty(_objectSpread59, order_no, values), _defineProperty(_objectSpread59, "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId), _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values))), _objectSpread59))));
1929
1937
  }
1930
1938
  }
1931
1939
  // console.log('orderback', values);
package/dist/esm/index.d.ts CHANGED
@@ -5,8 +5,8 @@ export { default as FormRender } from './FormRender';
5
5
  export { default as FormRenderTemplateId } from './FormRenderTemplateId';
6
6
  export { default as FlowWorkOrderDetail } from './FlowTemplateDetail';
7
7
  export { default as TradeList } from './TradeList';
8
- export { default as WdtTradeList } from './WdtTradeList';
9
8
  export { default as FlowFormRender } from './FlowTemplateDetail/components/FormRender';
9
+ export { default as WdtTradeList } from './WdtTradeList';
10
10
  export * as utils from './common/utils/tools';
11
11
  export * as arithmetic from './common/utils/arithmetic';
12
12
  export * from './WorkOrder/types';
package/dist/esm/index.js CHANGED
@@ -15,8 +15,8 @@ export { default as FormRender } from "./FormRender";
15
15
  export { default as FormRenderTemplateId } from "./FormRenderTemplateId";
16
16
  export { default as FlowWorkOrderDetail } from "./FlowTemplateDetail";
17
17
  export { default as TradeList } from "./TradeList";
18
- export { default as WdtTradeList } from "./WdtTradeList";
19
18
  export { default as FlowFormRender } from "./FlowTemplateDetail/components/FormRender";
19
+ export { default as WdtTradeList } from "./WdtTradeList";
20
20
  import * as _utils from "./common/utils/tools";
21
21
  export { _utils as utils };
22
22
  import * as _arithmetic from "./common/utils/arithmetic";
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "1.5.1",
3
+ "version": "1.6.0-beta.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": "1.5.0",
36
- "@kmkf-fe-packages/kmkf-utils": "1.5.0",
37
- "@kmkf-fe-packages/services-components": "1.5.0",
35
+ "@kmkf-fe-packages/basic-components": "1.6.0-beta.0",
36
+ "@kmkf-fe-packages/kmkf-utils": "1.6.0-beta.0",
37
+ "@kmkf-fe-packages/services-components": "1.6.0-beta.0",
38
38
  "@reduxjs/toolkit": "^1.8.5",
39
39
  "ahooks": "^3.7.4",
40
40
  "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
73
73
  "publishConfig": {
74
74
  "access": "public"
75
75
  },
76
- "gitHead": "70b86b6de711bd80c9c26b47f1b7b9e93ba2f38f",
76
+ "gitHead": "e39cdc4d4529c5cceff316525f091538d04861f7",
77
77
  "gitHooks": {
78
78
  "pre-commit": "lint-staged"
79
79
  }