@kmkf-fe-packages/kmkf-work-order-service-component 2.7.3-beta.0 → 2.7.3-beta.12

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 (11) hide show
  1. package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js +33 -50
  2. package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts +1 -1
  3. package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js +34 -20
  4. package/dist/esm/FlowTemplateDetailV2/components/XiaozhiConversation/index.d.ts +3 -1
  5. package/dist/esm/FlowTemplateDetailV2/components/XiaozhiConversation/index.js +18 -8
  6. package/dist/esm/FlowTemplateDetailV2/index.js +20 -16
  7. package/dist/esm/common/utils/tools.d.ts +1 -1
  8. package/dist/esm/common/utils/tools.js +31 -23
  9. package/dist/esm/common/utils/tools_constants.js +20 -5
  10. package/dist/esm/common/utils/transformWorkOrderData.js +27 -5
  11. package/package.json +5 -5
package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js CHANGED
@@ -442,7 +442,7 @@ var FormRender = function FormRender(props, ref) {
442
442
  return prv;
443
443
  }, {});
444
444
  if (!workOrderId) {
445
- _context2.next = 78;
445
+ _context2.next = 70;
446
446
  break;
447
447
  }
448
448
  // 先初始化端上内容
@@ -454,7 +454,7 @@ var FormRender = function FormRender(props, ref) {
454
454
  }
455
455
  return prv;
456
456
  }, ''); //获取保存时的订单缓存数据，解决用户显隐组件不展示二次编辑没有订单信息的问题
457
- getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
457
+ getCacheInfo = autoSubmit ? {} : JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
458
458
  newFormValues = _objectSpread({}, getCacheInfo[jsonMapOrderId] || {});
459
459
  newFormValues = reversalFormValues(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, newFormValues);
460
460
  newRecord.jsonMap = _objectSpread(_objectSpread(_objectSpread({}, newFormValues), jsonMap), newRecord.jsonMap);
@@ -475,7 +475,7 @@ var FormRender = function FormRender(props, ref) {
475
475
  // TODO: 非开始节点录入，都会有workOrderId,这里判断是否有前置组件含有订单号；如果存在订单号，进行订单反填。
476
476
  tradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList, 'TRADE_ID_INPUT');
477
477
  if (!notAutoFillFlag) {
478
- _context2.next = 74;
478
+ _context2.next = 66;
479
479
  break;
480
480
  }
481
481
  currentNodeTradeIdUniqueKey = findComponentUniqueKeyByType(templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList, 'TRADE_ID_INPUT');
@@ -526,11 +526,12 @@ var FormRender = function FormRender(props, ref) {
526
526
  plat: plat,
527
527
  callKey: 1,
528
528
  setLoading: setLoading,
529
- wdtMatchLogisticsNo: lastLogisticsOrderBackSource === null || lastLogisticsOrderBackSource === void 0 ? void 0 : lastLogisticsOrderBackSource.logisticsCode,
529
+ skipCache: autoSubmit,
530
+ matchLogisticsNo: lastLogisticsOrderBackSource === null || lastLogisticsOrderBackSource === void 0 ? void 0 : lastLogisticsOrderBackSource.logisticsCode,
530
531
  skipOrderBackUniqueKeys: lastLogisticsOrderBackSource !== null && lastLogisticsOrderBackSource !== void 0 && lastLogisticsOrderBackSource.uniqueKey ? [lastLogisticsOrderBackSource.uniqueKey] : []
531
532
  });
532
533
  case 33:
533
- _context2.next = 71;
534
+ _context2.next = 63;
534
535
  break;
535
536
  case 35:
536
537
  if (!isSkx) {
@@ -548,7 +549,7 @@ var FormRender = function FormRender(props, ref) {
548
549
  case 38:
549
550
  // 售后单反填
550
551
  afterSaleOrderBack(form, templateDetail);
551
- _context2.next = 71;
552
+ _context2.next = 63;
552
553
  break;
553
554
  case 41:
554
555
  if (!logisticsOrderBackSources.length) {
@@ -589,56 +590,34 @@ var FormRender = function FormRender(props, ref) {
589
590
  _iterator.f();
590
591
  return _context2.finish(57);
591
592
  case 60:
592
- _context2.next = 71;
593
+ _context2.next = 63;
593
594
  break;
594
595
  case 62:
595
596
  // 售后单反填
596
597
  afterSaleOrderBack(form, templateDetail);
597
- if (!isSkx) {
598
- _context2.next = 68;
599
- break;
600
- }
601
- _context2.next = 66;
602
- return skxOrderBack({
603
- form: form,
604
- companyKey: companyKey,
605
- templateDetail: templateDetail,
606
- componentOnBlur: componentOnBlur,
607
- jsonMap: record === null || record === void 0 ? void 0 : record.jsonMap
608
- });
609
- case 66:
610
- _context2.next = 71;
611
- break;
612
- case 68:
613
- if (!(hasWdt && currentNodeLogisticsCode)) {
614
- _context2.next = 71;
615
- break;
616
- }
617
- _context2.next = 71;
618
- return componentOnBlur(currentNodeLogisticsCode, 'expressLogisticsCode');
619
- case 71:
598
+ case 63:
620
599
  // 仅在依赖值有值且映射值为空时触发一次映射
621
600
  batchFillByMappingWhenTargetEmpty(initialValues);
622
- _context2.next = 76;
601
+ _context2.next = 68;
623
602
  break;
624
- case 74:
603
+ case 66:
625
604
  // 如果没有订单反填，则单独更新remark
626
605
  fetchRemark(shopId, currentNodeTid);
627
606
  // 售后单反填
628
607
  afterSaleOrderBack(form, templateDetail);
629
- case 76:
630
- _context2.next = 102;
608
+ case 68:
609
+ _context2.next = 94;
631
610
  break;
632
- case 78:
611
+ case 70:
633
612
  fillByShopId(shopId);
634
613
  initFormValues = null;
635
614
  if (plat !== null && plat !== void 0 && plat.subOrderNo) {
636
- _getCacheInfo = JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
615
+ _getCacheInfo = autoSubmit ? {} : JSON.parse(sessionStorage.getItem('cacheOmsOrderInfo') || '{}');
637
616
  if (plat !== null && plat !== void 0 && plat.subOrderNo && plat.buyerId) {
638
617
  initFormValues = (_getCacheInfo2 = _getCacheInfo["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo2 === void 0 ? void 0 : _getCacheInfo2[plat === null || plat === void 0 ? void 0 : plat.subOrderNo];
639
618
  }
640
619
  } else {
641
- _getCacheInfo3 = JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
620
+ _getCacheInfo3 = autoSubmit ? {} : JSON.parse(sessionStorage.getItem('cacheOrderInfo') || '{}');
642
621
  if (orderNo && plat.buyerId) {
643
622
  initFormValues = (_getCacheInfo4 = _getCacheInfo3["".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId)]) === null || _getCacheInfo4 === void 0 ? void 0 : _getCacheInfo4[orderNo];
644
623
  } else if (!orderNo && plat.buyerId) {
@@ -648,7 +627,7 @@ var FormRender = function FormRender(props, ref) {
648
627
 
649
628
  // console.log(orderNo, initFormValues);
650
629
  if (!initFormValues) {
651
- _context2.next = 89;
630
+ _context2.next = 81;
652
631
  break;
653
632
  }
654
633
  form.setFieldsValue(_objectSpread(_objectSpread({}, initFormValues), {}, {
@@ -665,9 +644,9 @@ var FormRender = function FormRender(props, ref) {
665
644
  _orderNo = orderNoField !== null && orderNoField !== void 0 && orderNoField.uniqueKey ? initFormValues[orderNoField === null || orderNoField === void 0 ? void 0 : orderNoField.uniqueKey] || _orderNo : _orderNo;
666
645
  }
667
646
  fetchRemark(_shopId, _orderNo);
668
- _context2.next = 102;
647
+ _context2.next = 94;
669
648
  break;
670
- case 89:
649
+ case 81:
671
650
  _transData = calcWorkOrderList([{
672
651
  jsonMap: jsonMap
673
652
  }], [].concat(_toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.preNodeComponentDtoList) || []), _toConsumableArray((templateDetail === null || templateDetail === void 0 ? void 0 : templateDetail.componentDtoList) || [])), 'init');
@@ -679,12 +658,12 @@ var FormRender = function FormRender(props, ref) {
679
658
  batchFillByMapping(_initialValues);
680
659
  //如果有订单号 订单返填 通过订单号入口进行工单录入，需要将订单数据反填到工单
681
660
  if (!(orderNo && shopId)) {
682
- _context2.next = 100;
661
+ _context2.next = 92;
683
662
  break;
684
663
  }
685
664
  queryLabels(orderNo, shopId);
686
665
  queryMemberLevels(orderNo, shopId);
687
- _context2.next = 98;
666
+ _context2.next = 90;
688
667
  return orderBack({
689
668
  companyKey: companyKey,
690
669
  order_no: orderNo,
@@ -697,17 +676,18 @@ var FormRender = function FormRender(props, ref) {
697
676
  // TODO: 只有在千牛端通过订单号录入工单的时候，订单备注不需要反填
698
677
  plat: plat,
699
678
  callKey: 2,
700
- setLoading: setLoading
679
+ setLoading: setLoading,
680
+ skipCache: autoSubmit
701
681
  });
702
- case 98:
703
- _context2.next = 102;
682
+ case 90:
683
+ _context2.next = 94;
704
684
  break;
705
- case 100:
685
+ case 92:
706
686
  // 如果没有订单反填，则单独更新remark
707
687
  fetchRemark(shopId, currentNodeTid);
708
688
  // 售后单反填
709
689
  afterSaleOrderBack(form, templateDetail);
710
- case 102:
690
+ case 94:
711
691
  antFormEl = document.getElementsByClassName('ant-form');
712
692
  (antFormEl === null || antFormEl === void 0 ? void 0 : antFormEl.length) > 0 && set(antFormEl, '0.scrollTop', 0);
713
693
  resetMappingHideComponents();
@@ -716,7 +696,7 @@ var FormRender = function FormRender(props, ref) {
716
696
  type: 'setaAutoSubmitFlag',
717
697
  payload: true
718
698
  });
719
- case 106:
699
+ case 98:
720
700
  case "end":
721
701
  return _context2.stop();
722
702
  }
@@ -1002,7 +982,8 @@ var FormRender = function FormRender(props, ref) {
1002
982
  },
1003
983
  callKey: 3,
1004
984
  setLoading: setLoading,
1005
- wdtMatchLogisticsNo: options === null || options === void 0 ? void 0 : options.wdtMatchLogisticsNo,
985
+ skipCache: autoSubmit,
986
+ matchLogisticsNo: options === null || options === void 0 ? void 0 : options.matchLogisticsNo,
1006
987
  skipOrderBackUniqueKeys: options === null || options === void 0 ? void 0 : options.skipOrderBackUniqueKeys
1007
988
  });
1008
989
  case 5:
@@ -1450,7 +1431,8 @@ var FormRender = function FormRender(props, ref) {
1450
1431
  }, 0);
1451
1432
  },
1452
1433
  callKey: 4,
1453
- setLoading: setLoading
1434
+ setLoading: setLoading,
1435
+ skipCache: autoSubmit
1454
1436
  });
1455
1437
  }
1456
1438
  } else {
@@ -1747,6 +1729,7 @@ var FormRender = function FormRender(props, ref) {
1747
1729
  var changeValuesCacheOrderInfo = throttle(function (value, tempLateList) {
1748
1730
  //如果店铺id不存在 不缓存
1749
1731
  if (!(value !== null && value !== void 0 && value.shopId)) return;
1732
+ if (autoSubmit) return;
1750
1733
  //如果是初始化创建工单 缓存信息
1751
1734
  if (!workOrderId && ['fxg', 'tb', 'ks', 'xiaozhi'].includes(plat.platform)) {
1752
1735
  var _findComponentUniqueK;
package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.d.ts CHANGED
@@ -11,7 +11,7 @@ export declare const onBlurExpressLogisticsCode: ({ form, value, templateDetail,
11
11
  templateDetail: any;
12
12
  setKmLoading: (loading: boolean) => void;
13
13
  componentOnBlur: (value: any, type: string, uniqueKey?: string, options?: {
14
- wdtMatchLogisticsNo?: string;
14
+ matchLogisticsNo?: string;
15
15
  skipOrderBackUniqueKeys?: string[];
16
16
  }) => Promise<void>;
17
17
  sourceUniqueKey?: string | undefined;
package/dist/esm/FlowTemplateDetailV2/components/FormRender/onBlur.js CHANGED
@@ -47,7 +47,7 @@ export var onBlurErpAfterSaleTradeId = /*#__PURE__*/function () {
47
47
  export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
48
48
  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
49
49
  var _kmErpVideoComponent$2;
50
- var form, value, templateDetail, setKmLoading, componentOnBlur, sourceUniqueKey, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, _tradeIdComponent$com, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
50
+ var form, value, templateDetail, setKmLoading, componentOnBlur, sourceUniqueKey, _ref3$onlyGetTid, onlyGetTid, _ref3$needTradeIdOrde, needTradeIdOrderBack, hasTradeIdComponent, kmErpVideoComponent, _res$data, _tradeIdComponent$com, hasKm, hasWdt, userInfo, _userInfo$companyUser, _companyUserConfig$pl, _companyUserConfig, _companyUserConfig$pl2, _companyUserConfig$pl3, _companyUserConfig$pl4, _companyUserConfig2, _companyUserConfig2$p, _companyUserConfig2$p2, companyUserConfig, wdtOrderBackTypes, kmOrderBackTypes, hasWdtOrderBackComponent, hasKmOrderBackComponent, shouldUseWdtOutSidQuery, res, tradeId, tradeIdComponent, newTradeId, blurPromise;
51
51
  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
52
52
  while (1) switch (_context2.prev = _context2.next) {
53
53
  case 0:
@@ -72,7 +72,7 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
72
72
  });
73
73
  case 6:
74
74
  if (!hasTradeIdComponent) {
75
- _context2.next = 35;
75
+ _context2.next = 41;
76
76
  break;
77
77
  }
78
78
  hasKm = false;
@@ -106,59 +106,73 @@ export var onBlurExpressLogisticsCode = /*#__PURE__*/function () {
106
106
  }
107
107
  return _context2.abrupt("return");
108
108
  case 12:
109
- if (!hasWdt) {
110
- _context2.next = 18;
109
+ wdtOrderBackTypes = ['WDT_SYSTEM_ORDER', 'WDT_GOODS', 'WDT_REISSUE_GOODS', 'WDT_LOGISTICS', 'WDT_SEND_GOOD'];
110
+ kmOrderBackTypes = ['KM_SYSTEM_ORDER', 'KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS', 'KM_EXCHANGE_GOODS', 'KM_LOGISTICS', 'KM_SEND_GOOD'];
111
+ hasWdtOrderBackComponent = templateDetail.componentDtoList.some(function (item) {
112
+ return wdtOrderBackTypes.includes(item.workOrderComponentType);
113
+ });
114
+ hasKmOrderBackComponent = templateDetail.componentDtoList.some(function (item) {
115
+ return kmOrderBackTypes.includes(item.workOrderComponentType);
116
+ });
117
+ shouldUseWdtOutSidQuery = hasWdt;
118
+ if (hasWdtOrderBackComponent && !hasKmOrderBackComponent) {
119
+ shouldUseWdtOutSidQuery = true;
120
+ } else if (hasKmOrderBackComponent && !hasWdtOrderBackComponent) {
121
+ shouldUseWdtOutSidQuery = false;
122
+ }
123
+ if (!shouldUseWdtOutSidQuery) {
124
+ _context2.next = 24;
111
125
  break;
112
126
  }
113
- _context2.next = 15;
127
+ _context2.next = 21;
114
128
  return queryTidByWdtOutSid({
115
129
  outSid: value
116
130
  });
117
- case 15:
131
+ case 21:
118
132
  _context2.t0 = _context2.sent;
119
- _context2.next = 21;
133
+ _context2.next = 27;
120
134
  break;
121
- case 18:
122
- _context2.next = 20;
135
+ case 24:
136
+ _context2.next = 26;
123
137
  return queryTidByOutSid({
124
138
  outSid: value
125
139
  });
126
- case 20:
140
+ case 26:
127
141
  _context2.t0 = _context2.sent;
128
- case 21:
142
+ case 27:
129
143
  res = _context2.t0;
130
144
  tradeId = res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.tid;
131
145
  if (!onlyGetTid) {
132
- _context2.next = 25;
146
+ _context2.next = 31;
133
147
  break;
134
148
  }
135
149
  return _context2.abrupt("return", tradeId);
136
- case 25:
150
+ case 31:
137
151
  if (tradeId) {
138
- _context2.next = 27;
152
+ _context2.next = 33;
139
153
  break;
140
154
  }
141
155
  return _context2.abrupt("return");
142
- case 27:
156
+ case 33:
143
157
  tradeIdComponent = templateDetail.componentDtoList.find(function (item) {
144
158
  return item.workOrderComponentType === 'TRADE_ID_INPUT';
145
159
  });
146
160
  newTradeId = tradeIdComponent !== null && tradeIdComponent !== void 0 && (_tradeIdComponent$com = tradeIdComponent.componentConfig) !== null && _tradeIdComponent$com !== void 0 && _tradeIdComponent$com.toUpperCase ? tradeId.toUpperCase() : tradeId;
147
161
  form.setFieldsValue(_defineProperty({}, (tradeIdComponent === null || tradeIdComponent === void 0 ? void 0 : tradeIdComponent.uniqueKey) || 'm3ap1EvEyd', newTradeId));
148
162
  if (!needTradeIdOrderBack) {
149
- _context2.next = 34;
163
+ _context2.next = 40;
150
164
  break;
151
165
  }
152
166
  // 创建一个异步操作的Promise
153
167
  blurPromise = componentOnBlur(tradeId, 'tradeId', undefined, {
154
- wdtMatchLogisticsNo: value,
168
+ matchLogisticsNo: value,
155
169
  skipOrderBackUniqueKeys: sourceUniqueKey ? [sourceUniqueKey] : []
156
170
  }); // 等待异步操作完成后再执行setTimeout
157
- _context2.next = 34;
171
+ _context2.next = 40;
158
172
  return blurPromise;
159
- case 34:
173
+ case 40:
160
174
  return _context2.abrupt("return", res.data);
161
- case 35:
175
+ case 41:
162
176
  case "end":
163
177
  return _context2.stop();
164
178
  }
package/dist/esm/FlowTemplateDetailV2/components/XiaozhiConversation/index.d.ts CHANGED
@@ -3,15 +3,17 @@ export interface JumpCustomerIconProps {
3
3
  tid: string;
4
4
  shopName: string;
5
5
  platformType: number;
6
+ buyer?: string;
6
7
  onJumpPage?: (data: {
7
8
  type: string;
8
9
  params: string;
9
10
  }) => void;
10
11
  }
11
- export declare const openCustomerDialog: ({ shopName, platformType, orderNumber, onJumpPage, }: {
12
+ export declare const openCustomerDialog: ({ shopName, platformType, orderNumber, buyer, onJumpPage, }: {
12
13
  shopName: string;
13
14
  platformType: number;
14
15
  orderNumber?: string | undefined;
16
+ buyer?: string | undefined;
15
17
  onJumpPage?: ((data: {
16
18
  type: string;
17
19
  params: string;
package/dist/esm/FlowTemplateDetailV2/components/XiaozhiConversation/index.js CHANGED
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import { Tooltip, Image } from 'antd';
3
3
  import { Base64 } from 'js-base64';
4
4
  import contact from "../../../common/imgs/contact.png";
5
- var SUPPORTED_PLATFORMS = [0, 2, 3, 5, 6];
5
+ var SUPPORTED_PLATFORMS = [0, 2, 3, 5, 6, 24];
6
6
  var platformTypeMap = {
7
7
  0: 1,
8
8
  // 淘宝
@@ -21,16 +21,23 @@ export var openCustomerDialog = function openCustomerDialog(_ref) {
21
21
  var shopName = _ref.shopName,
22
22
  platformType = _ref.platformType,
23
23
  orderNumber = _ref.orderNumber,
24
+ buyer = _ref.buyer,
24
25
  onJumpPage = _ref.onJumpPage;
25
26
  var type = platformTypeMap[platformType];
26
27
  if (!type) return;
28
+ var param = {
29
+ platformType: type,
30
+ shop: shopName,
31
+ order_number: orderNumber
32
+ };
33
+
34
+ // 京东、拼多多、抖音平台添加 buyer 参数
35
+ if ([2, 3, 6].includes(platformType)) {
36
+ param.buyer = buyer;
37
+ }
27
38
  var params = {
28
39
  event: 'open_buyers',
29
- param: {
30
- platformType: type,
31
- shop: shopName,
32
- order_number: orderNumber
33
- }
40
+ param: param
34
41
  };
35
42
  console.log(params);
36
43
  var jsonString = JSON.stringify(params);
@@ -44,6 +51,7 @@ var JumpCustomerIcon = function JumpCustomerIcon(_ref2) {
44
51
  var tid = _ref2.tid,
45
52
  shopName = _ref2.shopName,
46
53
  platformType = _ref2.platformType,
54
+ buyer = _ref2.buyer,
47
55
  onJumpPage = _ref2.onJumpPage;
48
56
  if (!tid || !SUPPORTED_PLATFORMS.includes(platformType)) {
49
57
  return null;
@@ -53,6 +61,7 @@ var JumpCustomerIcon = function JumpCustomerIcon(_ref2) {
53
61
  shopName: shopName,
54
62
  platformType: platformType,
55
63
  orderNumber: tid,
64
+ buyer: buyer,
56
65
  onJumpPage: onJumpPage
57
66
  });
58
67
  };
@@ -62,12 +71,13 @@ var JumpCustomerIcon = function JumpCustomerIcon(_ref2) {
62
71
  onClick: handleClick,
63
72
  style: {
64
73
  cursor: 'pointer',
65
- marginLeft: 8
74
+ position: 'relative',
75
+ top: '-2px'
66
76
  }
67
77
  }, /*#__PURE__*/React.createElement(Image, {
68
78
  src: contact,
69
79
  preview: false,
70
- width: 12
80
+ width: 14
71
81
  })));
72
82
  };
73
83
  export default JumpCustomerIcon;
package/dist/esm/FlowTemplateDetailV2/index.js CHANGED
@@ -62,7 +62,7 @@ import JumpCustomerIcon from "./components/XiaozhiConversation";
62
62
  var Text = Typography.Text,
63
63
  Link = Typography.Link;
64
64
  var FlowTemplateDetail = function FlowTemplateDetail(props) {
65
- 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
+ var _currentNodeDetail$wo, _currentNodeDetail$no, _document, _document$cookie, _currentNodeDetail$wo2, _currentNodeDetail$no16, _shopList$find, _currentNodeDetail$no29, _currentNodeDetail$no30, _currentNodeDetail$wo29, _currentNodeDetail$wo30, _currentNodeDetail$wo31, _JSON$parse, _currentNodeDetail$wo32, _currentNodeDetail$wo33, _currentNodeDetail$wo34, _currentNodeDetail$wo35, _currentNodeDetail$wo36, _currentNodeDetail$no31, _currentNodeDetail$no32;
66
66
  var flowTemplateKey = props.flowTemplateKey,
67
67
  _props$shopList = props.shopList,
68
68
  shopList = _props$shopList === void 0 ? [] : _props$shopList,
@@ -509,14 +509,16 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
509
509
  if (res.success) {
510
510
  handleSuccessCallBack('submit');
511
511
  //删除缓存的订单信息
512
- deleteCacheOrder({
513
- templateList: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.componentDtoList,
514
- values: formData,
515
- nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo.flowTemplateConfig.nodeId,
516
- flowTemplateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo.flowTemplateConfig.flowTemplateId,
517
- plat: plat,
518
- unDeleteOrderInfo: false
519
- });
512
+ if (!autoSubmit) {
513
+ deleteCacheOrder({
514
+ templateList: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo9 = currentNodeDetail.workOrderTemplateInfo) === null || _currentNodeDetail$wo9 === void 0 ? void 0 : _currentNodeDetail$wo9.componentDtoList,
515
+ values: formData,
516
+ nodeId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo.flowTemplateConfig.nodeId,
517
+ flowTemplateId: currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : currentNodeDetail.workOrderTemplateInfo.flowTemplateConfig.flowTemplateId,
518
+ plat: plat,
519
+ unDeleteOrderInfo: false
520
+ });
521
+ }
520
522
  if (!autoSubmit) {
521
523
  reFreshPanel();
522
524
  message.success('提交成功');
@@ -1383,7 +1385,8 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1383
1385
  header: /*#__PURE__*/React.createElement(React.Fragment, null, flowWorkOrderId && /*#__PURE__*/React.createElement("div", {
1384
1386
  style: {
1385
1387
  display: 'flex',
1386
- justifyContent: 'space-between'
1388
+ justifyContent: 'space-between',
1389
+ alignItems: 'center'
1387
1390
  }
1388
1391
  }, /*#__PURE__*/React.createElement("div", null, [PlatForm.PC, PlatForm.WEB].includes(plat.platform) && /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(PlatformAvatar, {
1389
1392
  type: shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopSource,
@@ -1393,22 +1396,23 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1393
1396
  }), shopItem === null || shopItem === void 0 ? void 0 : shopItem.shopName, "-"), /*#__PURE__*/React.createElement("span", null, flowWorkOrderId), !['created', 'edit'].includes(privilege) && /*#__PURE__*/React.createElement(Button, {
1394
1397
  type: "link",
1395
1398
  onClick: handleFollow
1396
- }, !follow ? '关注' : '已关注'), plat.platform === PlatForm.PC && shopItem && !shopItem.notJoin && /*#__PURE__*/React.createElement(JumpCustomerIcon, {
1399
+ }, !follow ? '关注' : '已关注'), plat.platform === PlatForm.PC && shopItem && !shopItem.notJoin && !readonly && /*#__PURE__*/React.createElement(JumpCustomerIcon, {
1397
1400
  tid: tid,
1398
1401
  shopName: shopItem.shopSource == 0 ? shopItem.thirdUserNick : shopItem.shopName,
1399
1402
  platformType: shopItem.shopSource,
1403
+ buyer: (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),
1400
1404
  onJumpPage: onJumpPage
1401
1405
  }), showImplementationEnter && /*#__PURE__*/React.createElement(Button, {
1402
1406
  onClick: openFeedbackModal,
1403
1407
  type: "link"
1404
- }, "\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, {
1408
+ }, "\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, {
1405
1409
  order_number: tid,
1406
1410
  shop: (otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.taobaoNick) || '',
1407
- 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),
1411
+ 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),
1408
1412
  platformType: otherInfo === null || otherInfo === void 0 ? void 0 : otherInfo.xzClientPlatformType
1409
- })), /*#__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, {
1413
+ })), /*#__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, {
1410
1414
  color: "blue"
1411
- }, "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, {
1415
+ }, "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, {
1412
1416
  justify: 'space-between',
1413
1417
  className: "header"
1414
1418
  }, /*#__PURE__*/React.createElement(Col, null, /*#__PURE__*/React.createElement("div", {
@@ -1477,7 +1481,7 @@ var FlowTemplateDetail = function FlowTemplateDetail(props) {
1477
1481
  isSuperAdmin: isSuperAdmin
1478
1482
  }));
1479
1483
  }), currentNodeDetail && /*#__PURE__*/React.createElement(Timeline.Item, {
1480
- key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo35 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo35 === void 0 ? void 0 : _currentNodeDetail$wo35.id) || 'current-node'
1484
+ key: (currentNodeDetail === null || currentNodeDetail === void 0 ? void 0 : (_currentNodeDetail$wo36 = currentNodeDetail.workOrder) === null || _currentNodeDetail$wo36 === void 0 ? void 0 : _currentNodeDetail$wo36.id) || 'current-node'
1481
1485
  }, /*#__PURE__*/React.createElement(CurrentNode, {
1482
1486
  ref: currentNodeRef,
1483
1487
  flowTemplateId: flowTemplateId,
package/dist/esm/common/utils/tools.d.ts CHANGED
@@ -40,7 +40,7 @@ export declare const calcWorkOrderList: (source: Partial<WorkOrderDetail>[], tem
40
40
  workOrderComponentType: string;
41
41
  uniqueKey: string;
42
42
  }[], type?: string) => any[];
43
- export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, wdtMatchLogisticsNo, skipOrderBackUniqueKeys, }: any) => Promise<void>;
43
+ export declare const orderBack: ({ companyKey, order_no, form, shopId: propsShopid, shopList, templateDetail, type, callback, fromQNCreateWorkOrderByOrderNo, plat, callbackShopId, setLoading, callKey, matchLogisticsNo, skipCache, skipOrderBackUniqueKeys, }: any) => Promise<void>;
44
44
  export declare const imgResize: (url: string, w?: number, h?: number) => string;
45
45
  export declare const COMPONENT_MAP: {
46
46
  [key: string]: string;
package/dist/esm/common/utils/tools.js CHANGED
@@ -146,11 +146,11 @@ var getBasicsOrderInfo = function getBasicsOrderInfo(orderInfo, xiaozhiOrder) {
146
146
  export var orderBack = /*#__PURE__*/function () {
147
147
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
148
148
  var _form$getFieldValue;
149
- var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, wdtMatchLogisticsNo, skipOrderBackUniqueKeys, 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, _value$selectIds, _value$showOrderInfo, _afterSaleOrders$valu, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, afterSaleOrders, 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, afterSalesOrderField, value, afterSalesOrderSelectOrder, afterSaleOrderInfo, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
149
+ var companyKey, order_no, form, propsShopid, shopList, templateDetail, _ref$type, type, callback, fromQNCreateWorkOrderByOrderNo, _ref$plat, plat, callbackShopId, setLoading, callKey, matchLogisticsNo, skipCache, skipOrderBackUniqueKeys, 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, _wdtInfo$wdtSystemOrd, _wdtInfo$wdtSystemOrd2, _gyOrders$trades, _jyOrders$trades, _jkyOrders$trades, _kmOrders$orderDetail, _kmInfo$kmSystemOrder, _kmInfo$kmSystemOrder2, _value$selectIds, _value$showOrderInfo, _afterSaleOrders$valu, promise, kmVideoComponent, OrderSubFormComponent, wdtReturnBillNoComponent, _yield$Promise$allSet, _yield$Promise$allSet2, data, afterSaleOrders, 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, afterSalesOrderField, value, afterSalesOrderSelectOrder, afterSaleOrderInfo, detail, hasSelectItem, erpPromiseList, list, promises, _detail$itemList, hasSigningDatetime, _signDatetime$data, signDatetime, values, paymentUniqueKey;
150
150
  return _regeneratorRuntime().wrap(function _callee$(_context) {
151
151
  while (1) switch (_context.prev = _context.next) {
152
152
  case 0:
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, wdtMatchLogisticsNo = _ref.wdtMatchLogisticsNo, skipOrderBackUniqueKeys = _ref.skipOrderBackUniqueKeys;
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, matchLogisticsNo = _ref.matchLogisticsNo, skipCache = _ref.skipCache, skipOrderBackUniqueKeys = _ref.skipOrderBackUniqueKeys;
154
154
  console.log('orderBack-run--', callKey, templateDetail);
155
155
  shopId = propsShopid;
156
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);
@@ -421,7 +421,10 @@ export var orderBack = /*#__PURE__*/function () {
421
421
  detail: bsOrders || {}
422
422
  });
423
423
  wlnInfo = wlnOrders && wlnOrderTransform(_objectSpread(_objectSpread({}, wlnOrders), {}, {
424
- allOrders: wlnOrders.orders
424
+ allOrders: wlnOrders.orders,
425
+ trades: wlnOrders.orders,
426
+ orderNo: order_no,
427
+ componentList: templateDetail.componentDtoList
425
428
  }), form);
426
429
  bsE3Info = bsE3Orders && bsE3OrderTransform(_objectSpread(_objectSpread({}, bsE3Orders), {}, {
427
430
  componentList: templateDetail.componentDtoList,
@@ -433,12 +436,13 @@ export var orderBack = /*#__PURE__*/function () {
433
436
  orderNo: order_no,
434
437
  allOrders: (wdtOrders === null || wdtOrders === void 0 ? void 0 : wdtOrders.trades) || [],
435
438
  wdtReturnOrders: (wdtReturnOrders === null || wdtReturnOrders === void 0 ? void 0 : wdtReturnOrders.orderList) || [],
436
- matchLogisticsNo: wdtMatchLogisticsNo
439
+ matchLogisticsNo: matchLogisticsNo
437
440
  }), form);
438
441
  kmInfo = kmOrders && kmOrderTransform(_objectSpread(_objectSpread({}, kmOrders), {}, {
439
442
  allOrders: (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.orderDetailDtoList) || (kmOrders === null || kmOrders === void 0 ? void 0 : kmOrders.trades),
440
443
  order_no: order_no,
441
- componentList: templateDetail.componentDtoList
444
+ componentList: templateDetail.componentDtoList,
445
+ matchLogisticsNo: matchLogisticsNo
442
446
  }), form);
443
447
  if (kmInfo) {
444
448
  kmInfo.kmVideo = kmVideoOrder === null || kmVideoOrder === void 0 ? void 0 : kmVideoOrder.value;
@@ -521,7 +525,7 @@ export var orderBack = /*#__PURE__*/function () {
521
525
  sendName: ''
522
526
  }];
523
527
  }
524
- if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$trades = wdtOrders.trades) === null || _wdtOrders$trades === void 0 ? void 0 : _wdtOrders$trades.length) > 1) {
528
+ if ((wdtOrders === null || wdtOrders === void 0 ? void 0 : (_wdtOrders$trades = wdtOrders.trades) === null || _wdtOrders$trades === void 0 ? void 0 : _wdtOrders$trades.length) > 1 && !(wdtInfo !== null && wdtInfo !== void 0 && (_wdtInfo$wdtSystemOrd = wdtInfo.wdtSystemOrder) !== null && _wdtInfo$wdtSystemOrd !== void 0 && (_wdtInfo$wdtSystemOrd2 = _wdtInfo$wdtSystemOrd.selectIds) !== null && _wdtInfo$wdtSystemOrd2 !== void 0 && _wdtInfo$wdtSystemOrd2.length)) {
525
529
  wdtInfo.wdtGoods = _objectSpread(_objectSpread({}, wdtInfo.wdtGoods), {}, {
526
530
  wdtGoods: [],
527
531
  orders: []
@@ -580,7 +584,7 @@ export var orderBack = /*#__PURE__*/function () {
580
584
  sendName: ''
581
585
  }];
582
586
  }
583
- if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1) {
587
+ if ((kmOrders === null || kmOrders === void 0 ? void 0 : (_kmOrders$orderDetail = kmOrders.orderDetailDtoList) === null || _kmOrders$orderDetail === void 0 ? void 0 : _kmOrders$orderDetail.length) > 1 && !(kmInfo !== null && kmInfo !== void 0 && (_kmInfo$kmSystemOrder = kmInfo.kmSystemOrder) !== null && _kmInfo$kmSystemOrder !== void 0 && (_kmInfo$kmSystemOrder2 = _kmInfo$kmSystemOrder.selectIds) !== null && _kmInfo$kmSystemOrder2 !== void 0 && _kmInfo$kmSystemOrder2.length)) {
584
588
  kmInfo.kmSendGood = [{
585
589
  sendId: '',
586
590
  sendName: ''
@@ -767,17 +771,19 @@ export var orderBack = /*#__PURE__*/function () {
767
771
  });
768
772
  }
769
773
  //缓存订单返填的信息，用来解决用户保存显隐返填组件，二次编辑订单信息丢失
770
- if (plat !== null && plat !== void 0 && plat.subOrderNo) {
771
- setSessionStorage.setCacheOmsOrderInfo({
772
- itemKey: "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId),
773
- itemValue: _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))
774
- });
775
- } else {
776
- setSessionStorage.setCacheOrderInfo({
777
- itemKey: "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId),
778
- itemValue: _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values)),
779
- ext: _defineProperty({}, order_no, values)
780
- });
774
+ if (!skipCache) {
775
+ if (plat !== null && plat !== void 0 && plat.subOrderNo) {
776
+ setSessionStorage.setCacheOmsOrderInfo({
777
+ itemKey: "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId),
778
+ itemValue: _defineProperty({}, plat === null || plat === void 0 ? void 0 : plat.subOrderNo, _objectSpread(_objectSpread({}, formValue), values))
779
+ });
780
+ } else {
781
+ setSessionStorage.setCacheOrderInfo({
782
+ itemKey: "".concat(templateDetail.flowTemplateConfig.flowTemplateId, "-").concat(plat.buyerId),
783
+ itemValue: _defineProperty({}, order_no, _objectSpread(_objectSpread({}, formValue), values)),
784
+ ext: _defineProperty({}, order_no, values)
785
+ });
786
+ }
781
787
  }
782
788
  }
783
789
  // console.log('orderback', values);
@@ -1357,18 +1363,20 @@ export var wlnSystemOrderBackValues = function wlnSystemOrderBackValues(_ref11)
1357
1363
  form = _ref11.form;
1358
1364
  //如果没有选择的值不返填，会有两种情况 1.有值为空 2.没有值 为空的时候需要返填
1359
1365
  if (!(value !== null && value !== void 0 && value.selectedRows)) return;
1360
- var bsGoodsComponent = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.filter(function (item) {
1366
+ var wlnGoodsComponent = (_templateList$compone6 = templateList.componentDtoList) === null || _templateList$compone6 === void 0 ? void 0 : _templateList$compone6.filter(function (item) {
1361
1367
  return ['WLN_GOODS', 'WLN_SEND_GOOD', 'WLN_LOGISTICS'].includes(item.workOrderComponentType);
1362
1368
  });
1363
- if (!(bsGoodsComponent !== null && bsGoodsComponent !== void 0 && bsGoodsComponent.length)) return;
1364
- var wlnGoodsValue = form.getFieldValue(bsGoodsComponent[0].uniqueKey);
1369
+ if (!(wlnGoodsComponent !== null && wlnGoodsComponent !== void 0 && wlnGoodsComponent.length)) return;
1370
+ var wlnGoodsValue = form.getFieldValue(wlnGoodsComponent[0].uniqueKey);
1365
1371
  var orderInfo = wlnOrderTransform({
1372
+ trades: value.selectedRows,
1366
1373
  orders: value.selectedRows,
1367
1374
  shopCode: wlnGoodsValue.shopCode,
1368
- allOrders: value === null || value === void 0 ? void 0 : value.orders
1375
+ allOrders: value === null || value === void 0 ? void 0 : value.orders,
1376
+ componentList: templateList.componentDtoList
1369
1377
  }, form);
1370
1378
  var values = wlnOrderBackFormValues(orderInfo, {
1371
- componentDtoList: bsGoodsComponent
1379
+ componentDtoList: wlnGoodsComponent
1372
1380
  });
1373
1381
  form.setFieldsValue(values);
1374
1382
  };
package/dist/esm/common/utils/tools_constants.js CHANGED
@@ -38,8 +38,23 @@ export var orderBackMap = function orderBackMap(_ref) {
38
38
  hasWln: {
39
39
  flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasWln),
40
40
  promiseRequest: function promiseRequest() {
41
+ var _templateDetail$compo;
42
+ // 是否需要拆分组合商品
43
+ var isSplit = (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.some(function (item) {
44
+ var _item$componentConfig;
45
+ return ['WLN_GOODS', 'WLN_REISSUE_GOODS'].includes(item.workOrderComponentType) && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.orderBackGoodsLevel) !== '2';
46
+ });
41
47
  return wlnOrderDetail({
42
- billCode: order_no
48
+ billCode: order_no,
49
+ isSplit: isSplit
50
+ }).then(function (data) {
51
+ if (data !== null && data !== void 0 && data.success) {
52
+ var _data$data;
53
+ if ((_data$data = data.data) !== null && _data$data !== void 0 && _data$data.tradeNo) {
54
+ data.data.tradeNo = order_no;
55
+ }
56
+ }
57
+ return data;
43
58
  });
44
59
  }
45
60
  },
@@ -65,11 +80,11 @@ export var orderBackMap = function orderBackMap(_ref) {
65
80
  hasKm: {
66
81
  flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasKm),
67
82
  promiseRequest: function promiseRequest() {
68
- var _templateDetail$compo;
83
+ var _templateDetail$compo2;
69
84
  // 是否需要明细的系统主商家编码
70
- var needDetailSysItemOuterId = (_templateDetail$compo = templateDetail.componentDtoList) === null || _templateDetail$compo === void 0 ? void 0 : _templateDetail$compo.some(function (item) {
71
- var _item$componentConfig;
72
- return ['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(item.workOrderComponentType) && ((_item$componentConfig = item.componentConfig) === null || _item$componentConfig === void 0 ? void 0 : _item$componentConfig.orderBackGoodsLevel) !== '2';
85
+ var needDetailSysItemOuterId = (_templateDetail$compo2 = templateDetail.componentDtoList) === null || _templateDetail$compo2 === void 0 ? void 0 : _templateDetail$compo2.some(function (item) {
86
+ var _item$componentConfig2;
87
+ return ['KM_GOODS', 'KM_REISSUE_GOODS', 'KM_RETURN_GOODS'].includes(item.workOrderComponentType) && ((_item$componentConfig2 = item.componentConfig) === null || _item$componentConfig2 === void 0 ? void 0 : _item$componentConfig2.orderBackGoodsLevel) !== '2';
73
88
  });
74
89
  return kmOrderDetail({
75
90
  tid: order_no,
package/dist/esm/common/utils/transformWorkOrderData.js CHANGED
@@ -1219,6 +1219,28 @@ var processJkyReissueGoods = function processJkyReissueGoods(templateColumns) {
1219
1219
  };
1220
1220
  };
1221
1221
  };
1222
+ var processWlnReissueGoods = function processWlnReissueGoods(templateColumns) {
1223
+ return function (getValue) {
1224
+ return function (nex, config) {
1225
+ var orderNo = '';
1226
+ var tradeId = templateColumns === null || templateColumns === void 0 ? void 0 : templateColumns.find(function (col) {
1227
+ return col.workOrderComponentType === 'TRADE_ID_INPUT';
1228
+ });
1229
+ if (tradeId) {
1230
+ orderNo = getValue("".concat(tradeId.uniqueKey, "_").concat(updateWorkTypeKeys[tradeId.workOrderComponentType]));
1231
+ }
1232
+ return _defineProperty({}, nex.uniqueKey, {
1233
+ wlnSystemOrder: {
1234
+ orderNo: orderNo
1235
+ },
1236
+ wlnReissueType: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnReissueType")), !isNull(config === null || config === void 0 ? void 0 : config.initReason) ? [config.initReason] : ['1']),
1237
+ wlnReissueGoods: jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_wlnReissueGoods")), []),
1238
+ shopCode: getValue("".concat(nex.uniqueKey, "_shopCode")),
1239
+ wlnSystemOrderNo: getValue("".concat(nex.uniqueKey, "_wlnSystemOrderNo"))
1240
+ });
1241
+ };
1242
+ };
1243
+ };
1222
1244
  var processGyReissueGoods = function processGyReissueGoods(templateColumns) {
1223
1245
  return function (getValue) {
1224
1246
  return function (nex, config) {
@@ -1312,14 +1334,14 @@ var processJstReturnGoods = function processJstReturnGoods(templateColumns) {
1312
1334
  };
1313
1335
  var processLabel = function processLabel(getValue) {
1314
1336
  return function (nex, config) {
1315
- var _ref85;
1316
- return _ref85 = {}, _defineProperty(_ref85, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref85, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref85;
1337
+ var _ref86;
1338
+ return _ref86 = {}, _defineProperty(_ref86, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _defineProperty(_ref86, "".concat(nex.uniqueKey, "_label"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_label")), [])), _ref86;
1317
1339
  };
1318
1340
  };
1319
1341
  var processMemberLevel = function processMemberLevel(getValue) {
1320
1342
  return function (nex, config) {
1321
- var _ref86;
1322
- return _ref86 = {}, _defineProperty(_ref86, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref86, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref86;
1343
+ var _ref87;
1344
+ return _ref87 = {}, _defineProperty(_ref87, nex.uniqueKey, jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _defineProperty(_ref87, "".concat(nex.uniqueKey, "_memberLevel"), jsonParseSecurity(getValue("".concat(nex.uniqueKey, "_memberLevel")), [])), _ref87;
1323
1345
  };
1324
1346
  };
1325
1347
  var processAfterSalesOrderId = function processAfterSalesOrderId(getValue) {
@@ -1387,7 +1409,7 @@ var transformWorkOrderData = function transformWorkOrderData(templateColumns) {
1387
1409
  SUBFORM: processSubForm,
1388
1410
  ERP_AFTER_SALES_ORDER_REVIEW_STATUS: processCallBackStatus,
1389
1411
  WLN_WAREHOUSING_STATUS: processSceneStatus,
1390
- WLN_REISSUE_GOODS: processJkyReissueGoods(templateColumns),
1412
+ WLN_REISSUE_GOODS: processWlnReissueGoods(templateColumns),
1391
1413
  EXPRESS_LOGISTICS_SELECT: processExpressLogisticsSelect,
1392
1414
  RETURN_LOGISTICS_SELECT: processReturnLogisticsSelect,
1393
1415
  REMARK_INPUT: processRemarkInput,
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.3-beta.0",
3
+ "version": "2.7.3-beta.12",
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.3-beta.0",
36
- "@kmkf-fe-packages/kmkf-utils": "2.7.3-beta.0",
37
- "@kmkf-fe-packages/services-components": "2.7.3-beta.0",
35
+ "@kmkf-fe-packages/basic-components": "2.7.3-beta.10",
36
+ "@kmkf-fe-packages/kmkf-utils": "2.7.3-beta.10",
37
+ "@kmkf-fe-packages/services-components": "2.7.3-beta.10",
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": "8c80641421cc67b5f77f17fbe4db443014610338",
78
+ "gitHead": "1d0f75d07bfb7697f8379903c544daa623fd0c46",
79
79
  "gitHooks": {
80
80
  "pre-commit": "lint-staged"
81
81
  }