@kmkf-fe-packages/kmkf-work-order-service-component 2.6.0 → 2.6.1-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 (3) hide show
  1. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +54 -34
  2. package/dist/esm/common/utils/tools.js +1 -1
  3. package/package.json +3 -3
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js CHANGED
@@ -399,7 +399,7 @@ var FormRender = function FormRender(props, ref) {
399
399
  }, [labelComponent, record]);
400
400
  var queryDetail = /*#__PURE__*/function () {
401
401
  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;
402
+ var workOrderId, shopId, shopList, record, orderNo, buyerId, buyerNick, jsonMap, _record$jsonMap4, newRecord, jsonMapOrderId, getCacheInfo, newFormValues, transData, initialValues, tradeIdUniqueKey, _record$jsonMap2, _record$jsonMap3, _userInfo$companyUser3, _companyUserConfig$pl, _companyUserConfig$pl2, _companyUserConfig$pl3, currentNodeTradeIdUniqueKey, _currentNodeTid, currentNodeExpressLogisticsCodeKey, currentNodeLogisticsCode, isSkx, _userInfo, companyUserConfig, hasWdt, _record$jsonMap5, _record$jsonMap6, _record$jsonMap7, initFormValues, _getCacheInfo, _getCacheInfo2, _getCacheInfo3, _getCacheInfo4, _orderNo, _shopId, orderNoField, _transData, _initialValues, antFormEl;
403
403
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
404
404
  while (1) switch (_context2.prev = _context2.next) {
405
405
  case 0:
@@ -429,7 +429,7 @@ var FormRender = function FormRender(props, ref) {
429
429
  return prv;
430
430
  }, {});
431
431
  if (!workOrderId) {
432
- _context2.next = 45;
432
+ _context2.next = 57;
433
433
  break;
434
434
  }
435
435
  // 先初始化端上内容
@@ -462,18 +462,24 @@ var FormRender = function FormRender(props, ref) {
462
462
  // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
463
463
  tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
464
464
  if (!newRecord.notAutoFillWithFirstSubmit) {
465
- _context2.next = 35;
465
+ _context2.next = 47;
466
466
  break;
467
467
  }
468
468
  currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
469
469
  _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
+ currentNodeExpressLogisticsCodeKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'EXPRESS_LOGISTICS_SELECT');
471
+ currentNodeLogisticsCode = record === null || record === void 0 ? void 0 : (_record$jsonMap3 = record.jsonMap) === null || _record$jsonMap3 === void 0 ? void 0 : _record$jsonMap3["".concat(currentNodeExpressLogisticsCodeKey, "_expressLogisticsCode")];
472
+ isSkx = ['TR3E2FYXFZCFANVG6O6AALSM'].includes(companyKey); // SKX 特殊处理逻辑
473
+ _userInfo = JSON.parse(localStorage.getItem('reduxData_userInfo') || '{}');
474
+ companyUserConfig = (_userInfo$companyUser3 = _userInfo === null || _userInfo === void 0 ? void 0 : _userInfo.companyUserConfig) !== null && _userInfo$companyUser3 !== void 0 ? _userInfo$companyUser3 : {};
475
+ 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;
470
476
  if (!_currentNodeTid) {
471
- _context2.next = 30;
477
+ _context2.next = 36;
472
478
  break;
473
479
  }
474
480
  queryLabels(_currentNodeTid, shopId);
475
481
  queryMemberLevels(_currentNodeTid, shopId);
476
- _context2.next = 28;
482
+ _context2.next = 34;
477
483
  return orderBack({
478
484
  companyKey: companyKey,
479
485
  order_no: _currentNodeTid,
@@ -487,11 +493,15 @@ var FormRender = function FormRender(props, ref) {
487
493
  callKey: 1,
488
494
  setLoading: setLoading
489
495
  });
490
- case 28:
491
- _context2.next = 32;
496
+ case 34:
497
+ _context2.next = 44;
492
498
  break;
493
- case 30:
494
- _context2.next = 32;
499
+ case 36:
500
+ if (!isSkx) {
501
+ _context2.next = 41;
502
+ break;
503
+ }
504
+ _context2.next = 39;
495
505
  return skxOrderBack({
496
506
  form: form,
497
507
  companyKey: companyKey,
@@ -499,22 +509,32 @@ var FormRender = function FormRender(props, ref) {
499
509
  componentOnBlur: componentOnBlur,
500
510
  jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
501
511
  });
502
- case 32:
512
+ case 39:
513
+ _context2.next = 44;
514
+ break;
515
+ case 41:
516
+ if (!(hasWdt && currentNodeLogisticsCode)) {
517
+ _context2.next = 44;
518
+ break;
519
+ }
520
+ _context2.next = 44;
521
+ return componentOnBlur(currentNodeLogisticsCode, 'expressLogisticsCode');
522
+ case 44:
503
523
  // 仅在依赖值有值且映射值为空时触发一次映射
504
524
  batchFillByMappingWhenTargetEmpty(initialValues);
505
- _context2.next = 43;
525
+ _context2.next = 55;
506
526
  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;
527
+ case 47:
528
+ if (!(tradeIdUniqueKey && shopId && record !== null && record !== void 0 && (_record$jsonMap4 = record.jsonMap) !== null && _record$jsonMap4 !== void 0 && _record$jsonMap4["".concat(tradeIdUniqueKey, "_tradeId")] && firstOrderBackfill)) {
529
+ _context2.next = 54;
510
530
  break;
511
531
  }
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;
532
+ queryLabels(record === null || record === void 0 ? void 0 : (_record$jsonMap5 = record.jsonMap) === null || _record$jsonMap5 === void 0 ? void 0 : _record$jsonMap5["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
533
+ queryMemberLevels(record === null || record === void 0 ? void 0 : (_record$jsonMap6 = record.jsonMap) === null || _record$jsonMap6 === void 0 ? void 0 : _record$jsonMap6["".concat(tradeIdUniqueKey, "_tradeId")], shopId);
534
+ _context2.next = 52;
515
535
  return orderBack({
516
536
  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")],
537
+ order_no: record === null || record === void 0 ? void 0 : (_record$jsonMap7 = record.jsonMap) === null || _record$jsonMap7 === void 0 ? void 0 : _record$jsonMap7["".concat(tradeIdUniqueKey, "_tradeId")],
518
538
  form: form,
519
539
  shopId: shopId,
520
540
  shopList: shopList,
@@ -525,16 +545,16 @@ var FormRender = function FormRender(props, ref) {
525
545
  callKey: 1,
526
546
  setLoading: setLoading
527
547
  });
528
- case 40:
529
- _context2.next = 43;
548
+ case 52:
549
+ _context2.next = 55;
530
550
  break;
531
- case 42:
551
+ case 54:
532
552
  // 如果没有订单反填，则单独更新remark
533
553
  fetchRemark(shopId, currentNodeTid);
534
- case 43:
535
- _context2.next = 68;
554
+ case 55:
555
+ _context2.next = 80;
536
556
  break;
537
- case 45:
557
+ case 57:
538
558
  fillByShopId(shopId);
539
559
  initFormValues = null;
540
560
  if (plat !== null && plat !== void 0 && plat.subOrderNo) {
@@ -553,7 +573,7 @@ var FormRender = function FormRender(props, ref) {
553
573
 
554
574
  // console.log(orderNo, initFormValues);
555
575
  if (!initFormValues) {
556
- _context2.next = 56;
576
+ _context2.next = 68;
557
577
  break;
558
578
  }
559
579
  form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -570,9 +590,9 @@ var FormRender = function FormRender(props, ref) {
570
590
  _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
571
591
  }
572
592
  fetchRemark(_shopId, _orderNo);
573
- _context2.next = 68;
593
+ _context2.next = 80;
574
594
  break;
575
- case 56:
595
+ case 68:
576
596
  _transData = calcWorkOrderList([{
577
597
  jsonMap: jsonMap
578
598
  }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
@@ -584,12 +604,12 @@ var FormRender = function FormRender(props, ref) {
584
604
  batchFillByMapping(_initialValues);
585
605
  //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
586
606
  if (!(orderNo && shopId)) {
587
- _context2.next = 67;
607
+ _context2.next = 79;
588
608
  break;
589
609
  }
590
610
  queryLabels(orderNo, shopId);
591
611
  queryMemberLevels(orderNo, shopId);
592
- _context2.next = 65;
612
+ _context2.next = 77;
593
613
  return orderBack({
594
614
  companyKey: companyKey,
595
615
  order_no: orderNo,
@@ -604,13 +624,13 @@ var FormRender = function FormRender(props, ref) {
604
624
  callKey: 2,
605
625
  setLoading: setLoading
606
626
  });
607
- case 65:
608
- _context2.next = 68;
627
+ case 77:
628
+ _context2.next = 80;
609
629
  break;
610
- case 67:
630
+ case 79:
611
631
  // 如果没有订单反填，则单独更新remark
612
632
  fetchRemark(shopId, currentNodeTid);
613
- case 68:
633
+ case 80:
614
634
  antFormEl = document.getElementsByClassName('ant-form');
615
635
  (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
616
636
  resetMappingHideComponents();
@@ -619,7 +639,7 @@ var FormRender = function FormRender(props, ref) {
619
639
  type: 'setaAutoSubmitFlag',
620
640
  payload: true
621
641
  });
622
- case 72:
642
+ case 84:
623
643
  case "end":
624
644
  return _context2.stop();
625
645
  }
package/dist/esm/common/utils/tools.js CHANGED
@@ -180,7 +180,7 @@ export var orderBack = /*#__PURE__*/function () {
180
180
  '6O47IBXFR26FJF4HUQ7WGO4H',
181
181
  //prod 陈健企业工单
182
182
  'TR3E2FYXFZCFANVG6O6AALSM' //prod 斯凯奇
183
- ].includes(companyKey)) && type === 'add')) {
183
+ ].includes(companyKey)))) {
184
184
  _context.next = 20;
185
185
  break;
186
186
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
3
- "version": "2.6.0",
3
+ "version": "2.6.1-beta.0",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -34,7 +34,7 @@
34
34
  "@ant-design/icons": "^4.7.0",
35
35
  "@kmkf-fe-packages/basic-components": "2.6.0",
36
36
  "@kmkf-fe-packages/kmkf-utils": "2.6.0",
37
- "@kmkf-fe-packages/services-components": "2.6.0",
37
+ "@kmkf-fe-packages/services-components": "2.6.1-beta.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": "271b117e3e4afe8fadcc540ebecb963017e789bf",
78
+ "gitHead": "6903bf454253c628b96e2582ff7ad757ea246795",
79
79
  "gitHooks": {
80
80
  "pre-commit": "lint-staged"
81
81
  }